diff --git a/Classes/BuschJaegerManualSettingsView.m b/Classes/BuschJaegerManualSettingsView.m
index 71ffb13cb..8203a4e77 100644
--- a/Classes/BuschJaegerManualSettingsView.m
+++ b/Classes/BuschJaegerManualSettingsView.m
@@ -107,7 +107,7 @@
 - (IBAction)onValidClick:(id)sender {
     if([[addressField text] length] && [[usernameField text] length] && [[passwordField text] length]) {
         [[BuschJaegerMainView instance].navigationController popViewControllerAnimated:FALSE];
-        [[BuschJaegerMainView instance].settingsView setConfiguration:[addressField text] username:[usernameField text] password:[passwordField text]];
+        [[BuschJaegerMainView instance].settingsView reloadConfiguration];
     }
 }
 
diff --git a/Classes/BuschJaegerSettingsView.h b/Classes/BuschJaegerSettingsView.h
index 3b122a67f..eb4643197 100644
--- a/Classes/BuschJaegerSettingsView.h
+++ b/Classes/BuschJaegerSettingsView.h
@@ -36,6 +36,6 @@
 - (IBAction)onManualClick:(id)sender;
 - (IBAction)onBackClick:(id)sender;
 
-- (void)setConfiguration:(NSString*)address username:(NSString*)username password:(NSString*)password;
+- (void)reloadConfiguration;
 
 @end
diff --git a/Classes/BuschJaegerSettingsView.m b/Classes/BuschJaegerSettingsView.m
index 868372bb1..b5ef4c297 100644
--- a/Classes/BuschJaegerSettingsView.m
+++ b/Classes/BuschJaegerSettingsView.m
@@ -117,8 +117,7 @@
 }
 
 - (IBAction)onManualClick:(id)sender {
-    [[BuschJaegerMainView instance].manualSettingsView reset];
-    [[BuschJaegerMainView instance].navigationController  pushViewController:[BuschJaegerMainView instance].manualSettingsView animated:FALSE];
+    [self reloadConfiguration];
 }
 
 - (IBAction)onBackClick:(id)sender {
@@ -128,17 +127,24 @@
 
 #pragma mark -
 
-- (void)setConfiguration:(NSString*)address username:(NSString*)username password:(NSString*)password {
+- (void)reloadConfiguration {
+
+    NSString *address = [[NSUserDefaults standardUserDefaults] stringForKey:@"ipgateway_preference"];
+    NSString *username = [[NSUserDefaults standardUserDefaults] stringForKey:@"username_preference"];
+    NSString *password = [[NSUserDefaults standardUserDefaults] stringForKey:@"password_preference"];
     
-    NSRange range = [address rangeOfString:@"http://"];
-    if (range.location == NSNotFound)
-    {
-        address = [@"http://" stringByAppendingString:address];
-    }
+    if ([address length] != 0 && [username length] != 0 && [password length] != 0) {
     
-    NSString *dataString = [NSString stringWithFormat:@"URL=%@/config.ini USER=%@ PW=%@", address, username, password];
-    if([[[LinphoneManager instance] configuration] parseQRCode:dataString delegate:self]) {
-        [waitView setHidden:FALSE];
+        NSRange range = [address rangeOfString:@"http://"];
+        if (range.location == NSNotFound)
+        {
+            address = [@"http://" stringByAppendingString:address];
+        }
+    
+        NSString *dataString = [NSString stringWithFormat:@"URL=%@/config.ini USER=%@ PW=%@", address, username, password];
+        if([[[LinphoneManager instance] configuration] parseQRCode:dataString delegate:self]) {
+            [waitView setHidden:FALSE];
+        }
     }
 }
 
diff --git a/Classes/BuschJaegerSettingsView.xib b/Classes/en.lproj/BuschJaegerSettingsView.xib
similarity index 83%
rename from Classes/BuschJaegerSettingsView.xib
rename to Classes/en.lproj/BuschJaegerSettingsView.xib
index ba35638fa..d80985ae6 100644
--- a/Classes/BuschJaegerSettingsView.xib
+++ b/Classes/en.lproj/BuschJaegerSettingsView.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11G56</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
-		<string key="IBDocument.AppKitVersion">1138.51</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<string key="IBDocument.SystemVersion">12C60</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2844</string>
+		<string key="IBDocument.AppKitVersion">1187.34</string>
+		<string key="IBDocument.HIToolboxVersion">625.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1926</string>
+			<string key="NS.object.0">1930</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
@@ -47,12 +47,11 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{20, 13}, {74, 74}}</string>
 								<reference key="NSSuperview" ref="432106977"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="549870177"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<object class="NSCustomResource" key="IBUIImage" id="444927610">
+								<object class="NSCustomResource" key="IBUIImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">bj_barcode.png</string>
 								</object>
@@ -62,7 +61,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrame">{{102, 0}, {178, 100}}</string>
 								<reference key="NSSuperview" ref="432106977"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="290853868"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -93,7 +91,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 100}</string>
 								<reference key="NSSuperview" ref="432106977"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="681245415"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor" id="446909226">
@@ -123,7 +120,6 @@
 						</array>
 						<string key="NSFrame">{{20, 20}, {280, 100}}</string>
 						<reference key="NSSuperview" ref="823940774"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="931069643"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="446909226"/>
@@ -133,24 +129,11 @@
 						<reference key="NSNextResponder" ref="823940774"/>
 						<int key="NSvFlags">290</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="108362131">
-								<reference key="NSNextResponder" ref="290853868"/>
-								<int key="NSvFlags">-2147483356</int>
-								<string key="NSFrame">{{20, 13}, {74, 74}}</string>
-								<reference key="NSSuperview" ref="290853868"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="978723389"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<reference key="IBUIImage" ref="444927610"/>
-							</object>
 							<object class="IBUILabel" id="978723389">
 								<reference key="NSNextResponder" ref="290853868"/>
 								<int key="NSvFlags">274</int>
-								<string key="NSFrame">{{102, 0}, {178, 100}}</string>
+								<string key="NSFrame">{{20, 0}, {240, 100}}</string>
 								<reference key="NSSuperview" ref="290853868"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="558519328"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -158,11 +141,12 @@
 								<int key="IBUIContentMode">7</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">Manual pairing</string>
+								<string key="IBUIText">Reload Configuration</string>
 								<reference key="IBUITextColor" ref="475419136"/>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
 							</object>
@@ -171,8 +155,7 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 100}</string>
 								<reference key="NSSuperview" ref="290853868"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="108362131"/>
+								<reference key="NSNextKeyView" ref="978723389"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="446909226"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -188,7 +171,6 @@
 						</array>
 						<string key="NSFrame">{{20, 128}, {280, 100}}</string>
 						<reference key="NSSuperview" ref="823940774"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="463635404"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="446909226"/>
@@ -203,7 +185,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 40}</string>
 								<reference key="NSSuperview" ref="558519328"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1058981027"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -225,8 +206,7 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 40}</string>
 								<reference key="NSSuperview" ref="558519328"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="508446153"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="446909226"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -242,7 +222,6 @@
 						</array>
 						<string key="NSFrame">{{20, 410}, {280, 40}}</string>
 						<reference key="NSSuperview" ref="823940774"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="870767854"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="446909226"/>
@@ -257,7 +236,7 @@
 								<int key="NSvFlags">301</int>
 								<string key="NSFrame">{{142, 211}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="508446153"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="432106977"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -268,7 +247,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="823940774"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="759552209"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -280,8 +258,7 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="432106977"/>
+				<reference key="NSNextKeyView" ref="508446153"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -456,7 +433,6 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="978723389"/>
 							<reference ref="463635404"/>
-							<reference ref="108362131"/>
 						</array>
 						<reference key="parent" ref="823940774"/>
 						<string key="objectName">Manual Button View</string>
@@ -466,11 +442,6 @@
 						<reference key="object" ref="978723389"/>
 						<reference key="parent" ref="290853868"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">28</int>
-						<reference key="object" ref="108362131"/>
-						<reference key="parent" ref="290853868"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">27</int>
 						<reference key="object" ref="463635404"/>
@@ -492,9 +463,13 @@
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<object class="NSMutableAttributedString" key="26.notes">
+					<object class="NSMutableString" key="NSString">
+						<characters key="NS.bytes"/>
+					</object>
+				</object>
 				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="27.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -507,61 +482,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">31</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">BuschJaegerSettingsView</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onManualClick:">id</string>
-						<string key="onScanClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onManualClick:">
-							<string key="name">onManualClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onScanClick:">
-							<string key="name">onScanClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="backButton">UIView</string>
-						<string key="manualButton">UIView</string>
-						<string key="scanButton">UIView</string>
-						<string key="waitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="manualButton">
-							<string key="name">manualButton</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="scanButton">
-							<string key="name">scanButton</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="waitView">
-							<string key="name">waitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/BuschJaegerSettingsView.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
@@ -572,8 +493,8 @@
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NS.key.0">bj_barcode.png</string>
-			<string key="NS.object.0">{148, 148}</string>
+			<string key="NS.object.0">{310, 310}</string>
 		</object>
-		<string key="IBCocoaTouchPluginVersion">1926</string>
+		<string key="IBCocoaTouchPluginVersion">1930</string>
 	</data>
 </archive>
diff --git a/buschjaeger-Info.plist b/buschjaeger-Info.plist
index c97e7ff7c..9b93b0148 100644
--- a/buschjaeger-Info.plist
+++ b/buschjaeger-Info.plist
@@ -45,11 +45,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.1</string>
+	<string>0.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.5.1</string>
+	<string>0.5.2</string>
 	<key>NSMainNibFile</key>
 	<string>BuschJaegerApp</string>
 	<key>NSMainNibFile~ipad</key>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 696ea99b1..7f2509079 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -111,6 +111,8 @@
 		7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; };
 		70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; };
 		70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F413E147EB002BA2C0 /* QuartzCore.framework */; };
+		D2D7FD5D16A52F6A0031322D /* BuschJaegerSettingsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2D7FD6016A52F6A0031322D /* BuschJaegerSettingsView.xib */; };
+		D2D7FD5E16A52F6A0031322D /* BuschJaegerSettingsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2D7FD6016A52F6A0031322D /* BuschJaegerSettingsView.xib */; };
 		D304B3EA16661793002DB909 /* BuschJaegerWelcomeView~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D304B3E916661793002DB909 /* BuschJaegerWelcomeView~ipad.xib */; };
 		D304B3EB16661793002DB909 /* BuschJaegerWelcomeView~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D304B3E916661793002DB909 /* BuschJaegerWelcomeView~ipad.xib */; };
 		D30B942316358C7F00D53C46 /* BuschJaegerManualSettingsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D30B942216358C7F00D53C46 /* BuschJaegerManualSettingsView.xib */; };
@@ -213,8 +215,6 @@
 		D37CD31215E21E330028869A /* BuschJaegerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD30215E21E320028869A /* BuschJaegerConfiguration.m */; };
 		D37CD31715E21E330028869A /* BuschJaegerSettingsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD30715E21E320028869A /* BuschJaegerSettingsView.m */; };
 		D37CD31815E21E330028869A /* BuschJaegerSettingsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD30715E21E320028869A /* BuschJaegerSettingsView.m */; };
-		D37CD31915E21E330028869A /* BuschJaegerSettingsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D37CD30815E21E330028869A /* BuschJaegerSettingsView.xib */; };
-		D37CD31A15E21E330028869A /* BuschJaegerSettingsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D37CD30815E21E330028869A /* BuschJaegerSettingsView.xib */; };
 		D37CD31B15E21E330028869A /* BuschJaegerUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD30A15E21E330028869A /* BuschJaegerUtils.m */; };
 		D37CD31C15E21E330028869A /* BuschJaegerUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD30A15E21E330028869A /* BuschJaegerUtils.m */; };
 		D37CD32815E220620028869A /* buschjaeger_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = D37CD32315E220620028869A /* buschjaeger_icon_57.png */; };
@@ -590,6 +590,7 @@
 		70E542F413E147EB002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		8D1107310486CEB800E47090 /* buschjaeger-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "buschjaeger-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
 		C9B3A6FD15B485DB006F52EE /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = Utils/Utils.h; sourceTree = "<group>"; };
+		D2D7FD5F16A52F6A0031322D /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/BuschJaegerSettingsView.xib; sourceTree = "<group>"; };
 		D304B3E916661793002DB909 /* BuschJaegerWelcomeView~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "BuschJaegerWelcomeView~ipad.xib"; sourceTree = "<group>"; };
 		D30B942216358C7F00D53C46 /* BuschJaegerManualSettingsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BuschJaegerManualSettingsView.xib; sourceTree = "<group>"; };
 		D30B942616358DD600D53C46 /* BuschJaegerManualSettingsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerManualSettingsView.h; sourceTree = "<group>"; };
@@ -655,7 +656,6 @@
 		D37CD30215E21E320028869A /* BuschJaegerConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerConfiguration.m; sourceTree = "<group>"; };
 		D37CD30615E21E320028869A /* BuschJaegerSettingsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerSettingsView.h; sourceTree = "<group>"; };
 		D37CD30715E21E320028869A /* BuschJaegerSettingsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerSettingsView.m; sourceTree = "<group>"; };
-		D37CD30815E21E330028869A /* BuschJaegerSettingsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BuschJaegerSettingsView.xib; sourceTree = "<group>"; };
 		D37CD30915E21E330028869A /* BuschJaegerUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerUtils.h; sourceTree = "<group>"; };
 		D37CD30A15E21E330028869A /* BuschJaegerUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerUtils.m; sourceTree = "<group>"; };
 		D37CD32315E220620028869A /* buschjaeger_icon_57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = buschjaeger_icon_57.png; path = Resources/buschjaeger_icon_57.png; sourceTree = "<group>"; };
@@ -885,7 +885,7 @@
 				D30B942216358C7F00D53C46 /* BuschJaegerManualSettingsView.xib */,
 				D37CD30615E21E320028869A /* BuschJaegerSettingsView.h */,
 				D37CD30715E21E320028869A /* BuschJaegerSettingsView.m */,
-				D37CD30815E21E330028869A /* BuschJaegerSettingsView.xib */,
+				D2D7FD6016A52F6A0031322D /* BuschJaegerSettingsView.xib */,
 				D37CD39F15E245290028869A /* BuschJaegerStationTableViewController.h */,
 				D37CD3A015E2452B0028869A /* BuschJaegerStationTableViewController.m */,
 				D37CD30915E21E330028869A /* BuschJaegerUtils.h */,
@@ -1602,7 +1602,7 @@
 				D37CD2F115E21CB30028869A /* bj_settings.png in Resources */,
 				D37CD2F315E21CB30028869A /* bj_start_call.png in Resources */,
 				D37CD30F15E21E330028869A /* BuschJaegerCallView.xib in Resources */,
-				D37CD31915E21E330028869A /* BuschJaegerSettingsView.xib in Resources */,
+				D2D7FD5D16A52F6A0031322D /* BuschJaegerSettingsView.xib in Resources */,
 				D37CD32815E220620028869A /* buschjaeger_icon_57.png in Resources */,
 				D37CD32A15E220620028869A /* buschjaeger_icon_57@2x.png in Resources */,
 				D37CD32C15E220620028869A /* buschjaeger_icon_72.png in Resources */,
@@ -1663,7 +1663,7 @@
 				D37CD2F215E21CB30028869A /* bj_settings.png in Resources */,
 				D37CD2F415E21CB30028869A /* bj_start_call.png in Resources */,
 				D37CD31015E21E330028869A /* BuschJaegerCallView.xib in Resources */,
-				D37CD31A15E21E330028869A /* BuschJaegerSettingsView.xib in Resources */,
+				D2D7FD5E16A52F6A0031322D /* BuschJaegerSettingsView.xib in Resources */,
 				D37CD32915E220620028869A /* buschjaeger_icon_57.png in Resources */,
 				D37CD32B15E220620028869A /* buschjaeger_icon_57@2x.png in Resources */,
 				D37CD32D15E220620028869A /* buschjaeger_icon_72.png in Resources */,
@@ -1866,6 +1866,14 @@
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
+		D2D7FD6016A52F6A0031322D /* BuschJaegerSettingsView.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D2D7FD5F16A52F6A0031322D /* en */,
+			);
+			name = BuschJaegerSettingsView.xib;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */