Converge user-facing messages in a single file and allow for localization. iOS-specific flow.mm redundant and replaced with flow.cpp.

Author: philip-lamb

.gitignore

@@ -1,18 +1,67 @@
+#### OS-generated caches and resources
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+### git merge conflict files
+*.orig
+
+#### Intermediate build products
+*.o
+
+#### Intermediate Language products
+*.dex
+*.class
+
+# Android Studio
+**/.gradle/
+**/.idea/caches
+**/.idea/deploymentTargetDropDown.xml
+**/.idea/libraries
+**/.idea/workspace.xml
+**/.idea/navEditor.xml
+**/.idea/assetWizardSettings.xml
+**/captures/
+**/.externalNativeBuild/
+**/.cxx/
+local.properties
+
+# MonoDevelop/Xamarin Studio
+*.userprefs
+
+# Visual Studio
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+.vscode/settings.json
+
+# Xcode
+xcuserdata/
+*.mode1*
+*.pbxuser
+*.xccheckout
+*.xcscmblueprint
+
+# Dependencies
 depends/ios/include/ARX/
 depends/ios/lib/libARX.a
 depends/ios/Frameworks/opencv2.framework
 depends/macos/Frameworks/ARX.framework/
 depends/macos/Frameworks/opencv2.framework
+depends/android/artoolkitx
+
+# Build files
 Linux/build/
 iOS/user-config.xcconfig
 iOS/build/
 macOS/user-config.xcconfig
 macOS/build/
-xcuserdata/
-*.xcscmblueprint
-local.properties
-Android/app/.cxx
 Android/app/build
 Android/build
-Android/.gradle
-depends/android/artoolkitx
+
+# Other

Android/.idea/deploymentTargetDropDown.xml

@@ -115,6 +115,8 @@ set(SOURCE
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/fileUploader.h
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/flow.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/flow.hpp
+    ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/loc_strings.cpp
+    ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/loc_strings.hpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/prefs.hpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/prefsNull.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/prefsAndroid.cpp

Android/app/src/main/cpp/CMakeLists.txt

@@ -3,6 +3,7 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.InputType;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,6 +23,8 @@
 import java.util.List;
 
 public class CameraCalibrationSettingsFragment extends PreferenceFragmentCompat {
+
+    static final String LOGTAG = "CameraCalibrationSettingsFragment";
     @Override
     @SuppressWarnings("ConstantConditions")
     public void onCreatePreferences(Bundle savedInstanceState, @Nullable String rootKey) {
@@ -84,15 +87,19 @@ protected static void setCameraInputList(ListPreference lp) {
         List<String> entriesList = new ArrayList<>();
         List<String> entryValuesList = new ArrayList<>();
         int cameraCount = ARX_jni.arwCreateVideoSourceInfoList("-module=Android");
+        Log.d(LOGTAG, "setCameraInputList: cameraCount=" + cameraCount);
         for (int i = 0; i < cameraCount; i++) {
             String[] name = new String[1];
             String[] model = new String[1];
             String[] UID = new String[1];
             int[] flags = new int[1];
             String[] openToken = new String[1];
             if (ARX_jni.arwGetVideoSourceInfoListEntry(i, name, model, UID, flags, openToken)) {
+                Log.d(LOGTAG, "setCameraInputList: Entry " + i + " name=" + name[0] + ", model='" + model[0] + "', UID='"+ UID[0] + "', flags=0x" + Integer.toHexString(flags[0]) + ", openToken='"+ openToken[0] + "'.");
                 entriesList.add(name[0]);
                 entryValuesList.add(openToken[0]);
+            } else {
+                Log.e(LOGTAG, "setCameraInputList: arwGetVideoSourceInfoListEntry error.\n");
             }
         }
         lp.setEntries(entriesList.toArray(new String[0]));

Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationSettingsFragment.java

@@ -124,6 +124,8 @@ set(SOURCE
     ../fileUploader.h
     ../flow.cpp
     ../flow.hpp
+    ../loc_strings.cpp
+    ../loc_strings.hpp
     ../prefs.hpp
     ../prefsLibConfig.cpp
     ../prefsNull.cpp

Linux/CMakeLists.txt

@@ -73,7 +73,7 @@
 #include "Eden/EdenGLFont.h"
 
 #include "prefs.hpp"
-
+#include "loc_strings.hpp"
 
 #include "calib_camera.h"
 
@@ -234,7 +234,7 @@ static void startVideo(void)
 #ifdef ANDROID
     if (SDL_AndroidRequestPermission("android.permission.CAMERA") != SDL_TRUE) {
         ARLOGe("Error: Unable to open video source.\n");
-        EdenMessageShow((const unsigned char *)"Welcome to artoolkitX Camera Calibrator\n(c)2023 artoolkitX Contributors.\n\nUnable to open video source.\n\nPress 'p' for settings and help.");
+        EdenMessageShow((const unsigned char *)LOC_STRING(loc_string::VideoOpenErrorTouchscreen));
         return;  
     }
 #endif
@@ -254,7 +254,11 @@ static void startVideo(void)
         vs->configure(buf, true, NULL, NULL, 0);
         if (!vs->open()) {
             ARLOGe("Error: Unable to open video source.\n");
-            EdenMessageShow((const unsigned char *)"Welcome to artoolkitX Camera Calibrator\n(c)2023 artoolkitX Contributors.\n\nUnable to open video source.\n\nPress 'p' for settings and help.");
+#ifdef ANDROID
+            EdenMessageShow((const unsigned char *)LOC_STRING(loc_string::VideoOpenErrorTouchscreen));
+#else
+            EdenMessageShow((const unsigned char *)LOC_STRING(loc_string::VideoOpenError));
+#endif
         }
     }
     gPostVideoSetupDone = false;

calib_camera.cpp

@@ -47,6 +47,7 @@
 #include <Eden/EdenMessage.h>
 #include <ARX/AR/ar.h>
 #include <ARX/ARUtil/time.h>
+#include "loc_strings.hpp"
 
 //
 // Globals.
@@ -240,9 +241,17 @@ static void *flowThread(void *arg)
 	while (!gStop) {
 
 		if (flowStateGet() == FLOW_STATE_WELCOME) {
-			EdenMessageShow((const unsigned char *)"Welcome to artoolkitX Camera Calibrator\n(c)2023 artoolkitX Contributors.\n\nPress 'space' to begin a calibration run.\n\nPress 'p' for settings and help.");
+#if ARX_TARGET_PLATFORM_IOS || ARX_TARGET_PLATFORM_ANDROID
+			EdenMessageShow((const unsigned char *)LOC_STRING(loc_string::IntroTouchscreen));
+#else
+			EdenMessageShow((const unsigned char *)LOC_STRING(loc_string::Intro));
+#endif
 		} else {
-			EdenMessageShow((const unsigned char *)"Press 'space' to begin a calibration run.\n\nPress 'p' for settings and help.");
+#if ARX_TARGET_PLATFORM_IOS || ARX_TARGET_PLATFORM_ANDROID
+			EdenMessageShow((const unsigned char *)LOC_STRING(loc_string::ReintroTouchscreen));
+#else
+			EdenMessageShow((const unsigned char *)LOC_STRING(loc_string::Reintro));
+#endif
 		}
 		flowSetEventMask((EVENT_t)(EVENT_TOUCH | EVENT_MODAL));
 		event = flowWaitForEvent();
@@ -262,7 +271,7 @@ static void *flowThread(void *arg)
 		flowSetEventMask((EVENT_t)(EVENT_TOUCH|EVENT_BACK_BUTTON));
 
 		do {
-			snprintf((char *)statusBarMessage, STATUS_BAR_MESSAGE_BUFFER_LEN, "Capturing image %d/%d", gFlowCalib->calibImageCount() + 1, gFlowCalib->calibImageCountMax());
+			snprintf((char *)statusBarMessage, STATUS_BAR_MESSAGE_BUFFER_LEN, LOC_STRING(loc_string::CalibCapturing), gFlowCalib->calibImageCount() + 1, gFlowCalib->calibImageCountMax());
 			event = flowWaitForEvent();
 			if (gStop) break;
 			if (event == EVENT_TOUCH) {
@@ -291,7 +300,7 @@ static void *flowThread(void *arg)
 
 			flowSetEventMask(EVENT_TOUCH);
             flowStateSet(FLOW_STATE_DONE);
-			EdenMessageShow((const unsigned char *)"Calibration canceled");
+			EdenMessageShow((const unsigned char *)LOC_STRING(loc_string::CalibCanceled));
 			flowWaitForEvent();
 			if (gStop) break;
 			EdenMessageHide();
@@ -302,7 +311,7 @@ static void *flowThread(void *arg)
 
 			flowSetEventMask(EVENT_NONE);
 			flowStateSet(FLOW_STATE_CALIBRATING);
-			EdenMessageShow((const unsigned char *)"Calculating camera parameters...");
+			EdenMessageShow((const unsigned char *)LOC_STRING(loc_string::CalibCalculating));
 			gFlowCalib->calib(&param, &err_min, &err_avg, &err_max);
     		EdenMessageHide();
 
@@ -313,7 +322,7 @@ static void *flowThread(void *arg)
 			flowSetEventMask(EVENT_TOUCH);
 			flowStateSet(FLOW_STATE_DONE);
 			unsigned char *buf;
-			asprintf((char **)&buf, "Camera parameters calculated (error min=%.3f, avg=%.3f, max=%.3f)", err_min, err_avg, err_max);
+			asprintf((char **)&buf, LOC_STRING(loc_string::CalibResults), err_min, err_avg, err_max);
 			EdenMessageShow(buf);
 			free(buf);
 			flowWaitForEvent();

flow.cpp

@@ -65,6 +65,7 @@
 
 
 #include "prefs.hpp"
+#include "loc_strings.hpp"
 
 //#import "draw.h"
 
@@ -468,7 +469,7 @@ - (void)startVideo
         vs->configure(buf, true, NULL, NULL, 0);
         if (!vs->open()) {
             ARLOGe("Error: Unable to open video source.\n");
-            EdenMessageShow(((const unsigned char *)NSLocalizedString(@"VideoOpenError",@"Welcome message when unable to open video source").UTF8String));
+            EdenMessageShow(((const unsigned char *)LOC_STRING(loc_string::VideoOpenErrorTouchscreen)));
         }
     }
     gPostVideoSetupDone = false;

iOS/ARViewController.mm

@@ -23,12 +23,13 @@
 		4A0E117C1E8B3A150074C280 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0E117B1E8B3A150074C280 /* AudioToolbox.framework */; };
 		4A0E11841E8CAAFA0074C280 /* prefsNull.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A0E11831E8CAAFA0074C280 /* prefsNull.cpp */; };
 		4A0EBFCF1EC3E37600B0D585 /* prefDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4A0EBFCE1EC3E37600B0D585 /* prefDefaults.plist */; };
+		4A17ED942A958DCD009FAA72 /* loc_strings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A17ED932A958DCD009FAA72 /* loc_strings.cpp */; };
+		4A17ED962A959299009FAA72 /* flow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A17ED952A959299009FAA72 /* flow.cpp */; };
 		4A47934C1E80CDBE002C3631 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A47934B1E80CDBE002C3631 /* main.m */; };
 		4A47934F1E80CDBE002C3631 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A47934E1E80CDBE002C3631 /* AppDelegate.m */; };
 		4A47936C1E80CF96002C3631 /* ARViewOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4793661E80CF96002C3631 /* ARViewOverlay.m */; };
 		4A47936D1E80CF96002C3631 /* CameraFocusView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4793681E80CF96002C3631 /* CameraFocusView.m */; };
 		4A47936E1E80CF96002C3631 /* SettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A47936A1E80CF96002C3631 /* SettingsViewController.mm */; };
-		4A4793861E80CFD4002C3631 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4A4793731E80CFD4002C3631 /* Localizable.strings */; };
 		4A4793871E80CFD4002C3631 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A4793751E80CFD4002C3631 /* Images.xcassets */; };
 		4A4793881E80CFD4002C3631 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4A4793761E80CFD4002C3631 /* [email protected] */; };
 		4A4793891E80CFD4002C3631 /* Iris-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 4A4793771E80CFD4002C3631 /* Iris-iPad.png */; };
@@ -44,7 +45,6 @@
 		4A47939E1E80D195002C3631 /* calc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4793981E80D195002C3631 /* calc.cpp */; };
 		4A47939F1E80D195002C3631 /* Calibration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A47939A1E80D195002C3631 /* Calibration.cpp */; };
 		4A4793A01E80D195002C3631 /* fileUploader.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A47939C1E80D195002C3631 /* fileUploader.c */; };
-		4A4793A51E80D85A002C3631 /* flow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A4793A41E80D85A002C3631 /* flow.mm */; };
 		4A4793CE1E80D945002C3631 /* EdenTime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A4793B21E80D945002C3631 /* EdenTime.c */; };
 		4A4793CF1E80D945002C3631 /* EdenUtil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A4793B41E80D945002C3631 /* EdenUtil.c */; };
 		4A79ED8420A5249C0087591E /* EdenUIInput.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A79ED8220A5249C0087591E /* EdenUIInput.c */; };
@@ -88,6 +88,9 @@
 		4A0E117B1E8B3A150074C280 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		4A0E11831E8CAAFA0074C280 /* prefsNull.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = prefsNull.cpp; path = ../prefsNull.cpp; sourceTree = "<group>"; };
 		4A0EBFCE1EC3E37600B0D585 /* prefDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = prefDefaults.plist; sourceTree = "<group>"; };
+		4A17ED922A958DCD009FAA72 /* loc_strings.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = loc_strings.hpp; path = ../loc_strings.hpp; sourceTree = "<group>"; };
+		4A17ED932A958DCD009FAA72 /* loc_strings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = loc_strings.cpp; path = ../loc_strings.cpp; sourceTree = "<group>"; };
+		4A17ED952A959299009FAA72 /* flow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = flow.cpp; path = ../flow.cpp; sourceTree = "<group>"; };
 		4A4793471E80CDBE002C3631 /* artoolkitX Camera Calibration Utility.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "artoolkitX Camera Calibration Utility.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4A47934B1E80CDBE002C3631 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		4A47934D1E80CDBE002C3631 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -99,7 +102,6 @@
 		4A4793681E80CF96002C3631 /* CameraFocusView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CameraFocusView.m; sourceTree = "<group>"; };
 		4A4793691E80CF96002C3631 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
 		4A47936A1E80CF96002C3631 /* SettingsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsViewController.mm; sourceTree = "<group>"; };
-		4A4793741E80CFD4002C3631 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Localizable.strings; sourceTree = "<group>"; };
 		4A4793751E80CFD4002C3631 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		4A4793761E80CFD4002C3631 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		4A4793771E80CFD4002C3631 /* Iris-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Iris-iPad.png"; sourceTree = "<group>"; };
@@ -118,7 +120,6 @@
 		4A47939B1E80D195002C3631 /* Calibration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Calibration.hpp; path = ../Calibration.hpp; sourceTree = "<group>"; };
 		4A47939C1E80D195002C3631 /* fileUploader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fileUploader.c; path = ../fileUploader.c; sourceTree = "<group>"; };
 		4A47939D1E80D195002C3631 /* fileUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fileUploader.h; path = ../fileUploader.h; sourceTree = "<group>"; };
-		4A4793A41E80D85A002C3631 /* flow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = flow.mm; sourceTree = "<group>"; };
 		4A4793A61E80D867002C3631 /* flow.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = flow.hpp; path = ../flow.hpp; sourceTree = "<group>"; };
 		4A4793A91E80D945002C3631 /* Eden.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Eden.h; sourceTree = "<group>"; };
 		4A4793AA1E80D945002C3631 /* EdenError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EdenError.h; sourceTree = "<group>"; };
@@ -247,8 +248,10 @@
 				4A47939A1E80D195002C3631 /* Calibration.cpp */,
 				4A47939D1E80D195002C3631 /* fileUploader.h */,
 				4A47939C1E80D195002C3631 /* fileUploader.c */,
+				4A17ED922A958DCD009FAA72 /* loc_strings.hpp */,
+				4A17ED932A958DCD009FAA72 /* loc_strings.cpp */,
 				4A4793A61E80D867002C3631 /* flow.hpp */,
-				4A4793A41E80D85A002C3631 /* flow.mm */,
+				4A17ED952A959299009FAA72 /* flow.cpp */,
 				4A0AB6821E81DFCE00F6EBB9 /* prefs.hpp */,
 				4A0E11831E8CAAFA0074C280 /* prefsNull.cpp */,
 				4A4793671E80CF96002C3631 /* CameraFocusView.h */,
@@ -288,7 +291,6 @@
 		4A4793721E80CFD4002C3631 /* en.lproj */ = {
 			isa = PBXGroup;
 			children = (
-				4A4793731E80CFD4002C3631 /* Localizable.strings */,
 			);
 			path = en.lproj;
 			sourceTree = "<group>";
@@ -435,7 +437,6 @@
 				4A4793931E80CFD4002C3631 /* reveal-icon.png in Resources */,
 				4A4793911E80CFD4002C3631 /* printa4.pdf in Resources */,
 				4A47938A1E80CFD4002C3631 /* [email protected] in Resources */,
-				4A4793861E80CFD4002C3631 /* Localizable.strings in Resources */,
 				4A4793881E80CFD4002C3631 /* [email protected] in Resources */,
 				4A0EBFCF1EC3E37600B0D585 /* prefDefaults.plist in Resources */,
 				4A4793891E80CFD4002C3631 /* Iris-iPad.png in Resources */,
@@ -451,12 +452,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				4ADE9C1F1E8887CF00F04AC0 /* glut_hel12.c in Sources */,
-				4A4793A51E80D85A002C3631 /* flow.mm in Sources */,
 				4A47934F1E80CDBE002C3631 /* AppDelegate.m in Sources */,
 				4ADE9C261E8887CF00F04AC0 /* glut_tr24.c in Sources */,
 				4A47936C1E80CF96002C3631 /* ARViewOverlay.m in Sources */,
 				4A47939E1E80D195002C3631 /* calc.cpp in Sources */,
 				4A4793CE1E80D945002C3631 /* EdenTime.c in Sources */,
+				4A17ED942A958DCD009FAA72 /* loc_strings.cpp in Sources */,
 				4A0AB6811E81DA6900F6EBB9 /* ARViewController.mm in Sources */,
 				4ADE9C251E8887CF00F04AC0 /* glut_tr10.c in Sources */,
 				4A47936D1E80CF96002C3631 /* CameraFocusView.m in Sources */,
@@ -467,6 +468,7 @@
 				4ADE9C191E8887B200F04AC0 /* readtex.c in Sources */,
 				4ADE9C1C1E8887CF00F04AC0 /* glut_bitmap.c in Sources */,
 				4ADE9C231E8887CF00F04AC0 /* glut_stroke.c in Sources */,
+				4A17ED962A959299009FAA72 /* flow.cpp in Sources */,
 				4A0E11841E8CAAFA0074C280 /* prefsNull.cpp in Sources */,
 				4A47934C1E80CDBE002C3631 /* main.m in Sources */,
 				4A4793A01E80D195002C3631 /* fileUploader.c in Sources */,
@@ -486,17 +488,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXVariantGroup section */
-		4A4793731E80CFD4002C3631 /* Localizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				4A4793741E80CFD4002C3631 /* en */,
-			);
-			name = Localizable.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
 		4A47935C1E80CDBF002C3631 /* Debug */ = {
 			isa = XCBuildConfiguration;