diff --git a/Classes/da.lproj/BuschJaegerSettingsView.xib b/Classes/da.lproj/BuschJaegerSettingsView.xib
index b583fb14b..e1e69c380 100644
--- a/Classes/da.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/da.lproj/BuschJaegerSettingsView.xib
@@ -47,7 +47,6 @@
 								<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>
@@ -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>
@@ -78,6 +76,7 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">3</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -87,13 +86,13 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
 								<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 +122,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"/>
@@ -138,7 +136,6 @@
 								<int key="NSvFlags">274</int>
 								<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>
@@ -160,7 +157,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 100}</string>
 								<reference key="NSSuperview" ref="290853868"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="978723389"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="446909226"/>
@@ -177,7 +173,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"/>
@@ -192,7 +187,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>
@@ -214,7 +208,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 40}</string>
 								<reference key="NSSuperview" ref="558519328"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="446909226"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -230,7 +223,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"/>
@@ -245,7 +237,6 @@
 								<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>
@@ -257,7 +248,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">
@@ -269,7 +259,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="508446153"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -494,61 +483,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">
diff --git a/Classes/de.lproj/BuschJaegerSettingsView.xib b/Classes/de.lproj/BuschJaegerSettingsView.xib
index b6da61f3a..65d3e648c 100644
--- a/Classes/de.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/de.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -68,14 +68,16 @@
 								<int key="IBUIContentMode">7</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">Schnellkonfiguration mit QR-Code</string>
+								<string key="IBUIText">Schnell- konfiguration mit QR-Code</string>
 								<object class="NSColor" key="IBUITextColor" id="475419136">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/en.lproj/BuschJaegerSettingsView.xib b/Classes/en.lproj/BuschJaegerSettingsView.xib
index b583fb14b..3df4b7abb 100644
--- a/Classes/en.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/en.lproj/BuschJaegerSettingsView.xib
@@ -47,7 +47,6 @@
 								<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>
@@ -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>
@@ -77,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -87,13 +87,13 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
 								<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 +123,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"/>
@@ -138,7 +137,6 @@
 								<int key="NSvFlags">274</int>
 								<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>
@@ -160,7 +158,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 100}</string>
 								<reference key="NSSuperview" ref="290853868"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="978723389"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="446909226"/>
@@ -177,7 +174,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"/>
@@ -192,7 +188,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>
@@ -214,7 +209,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 40}</string>
 								<reference key="NSSuperview" ref="558519328"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="446909226"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -230,7 +224,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"/>
@@ -245,7 +238,6 @@
 								<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>
@@ -257,7 +249,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">
@@ -269,7 +260,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="508446153"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -494,61 +484,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">
diff --git a/Classes/es.lproj/BuschJaegerSettingsView.xib b/Classes/es.lproj/BuschJaegerSettingsView.xib
index c54f1be10..887ff0de1 100644
--- a/Classes/es.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/es.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/fi.lproj/BuschJaegerSettingsView.xib b/Classes/fi.lproj/BuschJaegerSettingsView.xib
index fd094b0f7..b2d793766 100644
--- a/Classes/fi.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/fi.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -35,7 +35,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="823940774">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">272</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="432106977">
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -256,6 +259,7 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
+				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="508446153"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -485,7 +489,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/fr.lproj/BuschJaegerSettingsView.xib b/Classes/fr.lproj/BuschJaegerSettingsView.xib
index 34460e236..f7c3a5037 100644
--- a/Classes/fr.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/fr.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/it.lproj/BuschJaegerSettingsView.xib b/Classes/it.lproj/BuschJaegerSettingsView.xib
index 7dc8d6a28..646075c38 100644
--- a/Classes/it.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/it.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/nb.lproj/BuschJaegerSettingsView.xib b/Classes/nb.lproj/BuschJaegerSettingsView.xib
new file mode 100644
index 000000000..afdbff245
--- /dev/null
+++ b/Classes/nb.lproj/BuschJaegerSettingsView.xib
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1552</int>
+		<string key="IBDocument.SystemVersion">12C60</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</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">2083</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUIActivityIndicatorView</string>
+			<string>IBUIButton</string>
+			<string>IBUIImageView</string>
+			<string>IBUILabel</string>
+			<string>IBUIView</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="823940774">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">272</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="432106977">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="681245415">
+								<reference key="NSNextResponder" ref="432106977"/>
+								<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">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">bj_barcode.png</string>
+								</object>
+							</object>
+							<object class="IBUILabel" id="549870177">
+								<reference key="NSNextResponder" ref="432106977"/>
+								<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>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">Hurtig- konfigurasjon med QR-kode</string>
+								<object class="NSColor" key="IBUITextColor" id="475419136">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">0</int>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
+									<int key="type">1</int>
+									<double key="pointSize">24</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="153354414">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">24</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
+							</object>
+							<object class="IBUIButton" id="931069643">
+								<reference key="NSNextResponder" ref="432106977"/>
+								<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">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<object class="NSColor" key="IBUINormalTitleShadowColor" id="459298159">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC41AA</bytes>
+								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="26925302">
+									<int key="type">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="316540384">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+						</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"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="290853868">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUILabel" id="978723389">
+								<reference key="NSNextResponder" ref="290853868"/>
+								<int key="NSvFlags">274</int>
+								<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>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">Last inn konfigurasjon på nytt</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>
+							<object class="IBUIButton" id="463635404">
+								<reference key="NSNextResponder" ref="290853868"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 100}</string>
+								<reference key="NSSuperview" ref="290853868"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="978723389"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="446909226"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleShadowColor" ref="459298159"/>
+								<reference key="IBUIFontDescription" ref="26925302"/>
+								<reference key="IBUIFont" ref="316540384"/>
+							</object>
+						</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"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="558519328">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">269</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUILabel" id="870767854">
+								<reference key="NSNextResponder" ref="558519328"/>
+								<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>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">Back</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>
+							<object class="IBUIButton" id="1058981027">
+								<reference key="NSNextResponder" ref="558519328"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 40}</string>
+								<reference key="NSSuperview" ref="558519328"/>
+								<reference key="NSWindow"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="446909226"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleShadowColor" ref="459298159"/>
+								<reference key="IBUIFontDescription" ref="26925302"/>
+								<reference key="IBUIFont" ref="316540384"/>
+							</object>
+						</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"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="508446153">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">274</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIActivityIndicatorView" id="759552209">
+								<reference key="NSNextResponder" ref="508446153"/>
+								<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>
+								<bool key="IBUIHidesWhenStopped">NO</bool>
+								<bool key="IBUIAnimating">YES</bool>
+								<int key="IBUIStyle">0</int>
+							</object>
+						</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">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwLjQ1AA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</array>
+				<string key="NSFrameSize">{320, 460}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="508446153"/>
+				<string key="NSReuseIdentifierKey">_NS:9</string>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MC4xMTc2NDcwNTg4IDAuMTY0NzA1ODgyNCAwLjIxOTYwNzg0MzEAA</bytes>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="823940774"/>
+					</object>
+					<int key="connectionID">5</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">scanButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="432106977"/>
+					</object>
+					<int key="connectionID">12</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="558519328"/>
+					</object>
+					<int key="connectionID">19</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">waitView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="508446153"/>
+					</object>
+					<int key="connectionID">24</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">manualButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="290853868"/>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onScanClick:</string>
+						<reference key="source" ref="931069643"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onBackClick:</string>
+						<reference key="source" ref="1058981027"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">21</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onManualClick:</string>
+						<reference key="source" ref="463635404"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">30</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="823940774"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="432106977"/>
+							<reference ref="558519328"/>
+							<reference ref="508446153"/>
+							<reference ref="290853868"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="432106977"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="681245415"/>
+							<reference ref="931069643"/>
+							<reference ref="549870177"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Scan Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="931069643"/>
+						<reference key="parent" ref="432106977"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="681245415"/>
+						<reference key="parent" ref="432106977"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="549870177"/>
+						<reference key="parent" ref="432106977"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="558519328"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="870767854"/>
+							<reference ref="1058981027"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Back Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="870767854"/>
+						<reference key="parent" ref="558519328"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="1058981027"/>
+						<reference key="parent" ref="558519328"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="508446153"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="759552209"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Wait View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="759552209"/>
+						<reference key="parent" ref="508446153"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="290853868"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="978723389"/>
+							<reference ref="463635404"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Manual Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="978723389"/>
+						<reference key="parent" ref="290853868"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="463635404"/>
+						<reference key="parent" ref="290853868"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">BuschJaegerSettingsView</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="16.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<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="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>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="9.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<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>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1552" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<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">{310, 310}</string>
+		</object>
+		<string key="IBCocoaTouchPluginVersion">2083</string>
+	</data>
+</archive>
diff --git a/welcome.ldb/Resources/Classes/BuschJaegerSettingsView/1/BuschJaegerSettingsView.xib b/Classes/nb_NO.lproj/BuschJaegerSettingsView.xib
similarity index 98%
rename from welcome.ldb/Resources/Classes/BuschJaegerSettingsView/1/BuschJaegerSettingsView.xib
rename to Classes/nb_NO.lproj/BuschJaegerSettingsView.xib
index 29aaa6d85..095788fb1 100644
--- a/welcome.ldb/Resources/Classes/BuschJaegerSettingsView/1/BuschJaegerSettingsView.xib
+++ b/Classes/nb_NO.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -68,14 +68,16 @@
 								<int key="IBUIContentMode">7</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">Quick configuration with QR-code</string>
+								<string key="IBUIText">Hurtigkonfigurasjon med QR-kode</string>
 								<object class="NSColor" key="IBUITextColor" id="475419136">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -141,7 +144,7 @@
 								<int key="IBUIContentMode">7</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">Reload configuration</string>
+								<string key="IBUIText">Last inn konfigurasjon på nytt</string>
 								<reference key="IBUITextColor" ref="475419136"/>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/nl.lproj/BuschJaegerSettingsView.xib b/Classes/nl.lproj/BuschJaegerSettingsView.xib
index 874a89b8a..a2ec6920a 100644
--- a/Classes/nl.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/nl.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/pl.lproj/BuschJaegerSettingsView.xib b/Classes/pl.lproj/BuschJaegerSettingsView.xib
index 7cff5078c..369ff90ac 100644
--- a/Classes/pl.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/pl.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/ru.lproj/BuschJaegerSettingsView.xib b/Classes/ru.lproj/BuschJaegerSettingsView.xib
index 56bd0e83f..bbf71b829 100644
--- a/Classes/ru.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/ru.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/sv.lproj/BuschJaegerSettingsView.xib b/Classes/sv.lproj/BuschJaegerSettingsView.xib
index 6d0283670..1cdebea81 100644
--- a/Classes/sv.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/sv.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Classes/zh-Hans.lproj/BuschJaegerSettingsView.xib b/Classes/zh-Hans.lproj/BuschJaegerSettingsView.xib
index b583fb14b..8ee273780 100644
--- a/Classes/zh-Hans.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/zh-Hans.lproj/BuschJaegerSettingsView.xib
@@ -35,7 +35,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="823940774">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">272</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="432106977">
@@ -47,7 +47,6 @@
 								<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>
@@ -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>
@@ -70,14 +68,16 @@
 								<int key="IBUIContentMode">7</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">Quick configuration with QR-code</string>
+								<string key="IBUIText">使用 QR 码快速配置</string>
 								<object class="NSColor" key="IBUITextColor" id="475419136">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -87,13 +87,13 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
 								<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 +123,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"/>
@@ -138,7 +137,6 @@
 								<int key="NSvFlags">274</int>
 								<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>
@@ -146,7 +144,7 @@
 								<int key="IBUIContentMode">7</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">Reload configuration</string>
+								<string key="IBUIText">重新加载设置</string>
 								<reference key="IBUITextColor" ref="475419136"/>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
@@ -160,7 +158,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 100}</string>
 								<reference key="NSSuperview" ref="290853868"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="978723389"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="446909226"/>
@@ -177,7 +174,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"/>
@@ -192,7 +188,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>
@@ -214,7 +209,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{280, 40}</string>
 								<reference key="NSSuperview" ref="558519328"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="446909226"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -230,7 +224,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"/>
@@ -245,7 +238,6 @@
 								<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>
@@ -257,7 +249,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">
@@ -268,8 +259,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="508446153"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -494,61 +483,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">
diff --git a/Classes/zh_CN.lproj/BuschJaegerSettingsView.xib b/Classes/zh_CN.lproj/BuschJaegerSettingsView.xib
index 896392b21..8ee273780 100644
--- a/Classes/zh_CN.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/zh_CN.lproj/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -485,7 +488,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/Resources/zh-Hans.lproj/Localizable.strings b/Resources/zh-Hans.lproj/Localizable.strings
new file mode 100644
index 000000000..c44e1edf1
Binary files /dev/null and b/Resources/zh-Hans.lproj/Localizable.strings differ
diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist
index eaa9b9d5d..142c627d4 100644
--- a/Settings.bundle/Root.plist
+++ b/Settings.bundle/Root.plist
@@ -84,7 +84,7 @@
 			<key>Key</key>
 			<string>ringtone_preference</string>
 			<key>Title</key>
-			<string>Ringtone building</string>
+			<string>Ringtone</string>
 			<key>Titles</key>
 			<array>
 				<string>Ringtone 1</string>
@@ -110,7 +110,7 @@
 			<key>Key</key>
 			<string>level_ringtone_preference</string>
 			<key>Title</key>
-			<string>Ringtone appartment</string>
+			<string>Level Ringtone</string>
 			<key>Titles</key>
 			<array>
 				<string>Ringtone 1</string>
diff --git a/Settings.bundle/de.lproj/Root.strings b/Settings.bundle/de.lproj/Root.strings
index a0c40b898..7f2310676 100644
--- a/Settings.bundle/de.lproj/Root.strings
+++ b/Settings.bundle/de.lproj/Root.strings
@@ -25,6 +25,9 @@
 /* Ringtone */
 "Ringtone" = "Klingelton Gebäude";
 
+"Ringtone 1" = "Klingelton 1";
+
+
 /* Sounds */
 "Sounds" = "Systemeinstellungen";
 
@@ -41,4 +44,4 @@
 "Wizard" = "Wizard";
 
 /* User name */
-"User name" = "Username";
\ No newline at end of file
+"User name" = "Benutzername";
\ No newline at end of file
diff --git a/Settings.bundle/nb.lproj/Root.strings b/Settings.bundle/nb.lproj/Root.strings
new file mode 100644
index 000000000..a34635e4a
Binary files /dev/null and b/Settings.bundle/nb.lproj/Root.strings differ
diff --git a/Settings.bundle/nb_NO.lproj/Root.strings b/Settings.bundle/nb_NO.lproj/Root.strings
new file mode 100644
index 000000000..d04ad4a68
Binary files /dev/null and b/Settings.bundle/nb_NO.lproj/Root.strings differ
diff --git a/Settings.bundle/zh-Hans.lproj/Root.strings b/Settings.bundle/zh-Hans.lproj/Root.strings
new file mode 100644
index 000000000..0e41be945
Binary files /dev/null and b/Settings.bundle/zh-Hans.lproj/Root.strings differ
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 8be4222e6..738bbd219 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -620,8 +620,6 @@
 		D2DB3F9016BB9EE60017955B /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/BuschJaegerSettingsView.xib; sourceTree = "<group>"; };
 		D2DB3F9116BB9F130017955B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D2DB3F9216BB9F190017955B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
-		D2DB3F9316BB9F1E0017955B /* da */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = da; path = da.lproj/BuschJaegerSettingsView.xib; sourceTree = "<group>"; };
-		D2DB3F9416BB9F1E0017955B /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D2DB3F9516BB9F230017955B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D2DB3F9616BB9F2A0017955B /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D2DB3F9716BB9F300017955B /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -638,6 +636,8 @@
 		D2DB3FA216BB9F720017955B /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/BuschJaegerSettingsView.xib; sourceTree = "<group>"; };
 		D2DB3FA316BB9F750017955B /* pl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pl; path = pl.lproj/BuschJaegerSettingsView.xib; sourceTree = "<group>"; };
 		D2DB3FA416BB9F7B0017955B /* fi */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fi; path = fi.lproj/BuschJaegerSettingsView.xib; sourceTree = "<group>"; };
+		D2DB3FA516BC03C80017955B /* nb */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nb; path = nb.lproj/BuschJaegerSettingsView.xib; sourceTree = "<group>"; };
+		D2DB3FA616BC03C80017955B /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D304B3E916661793002DB909 /* BuschJaegerWelcomeView~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "BuschJaegerWelcomeView~ipad.xib"; sourceTree = "<group>"; };
 		D30B88C116B82A86003550ED /* bj_glow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bj_glow.png; path = Resources/bj_glow.png; sourceTree = "<group>"; };
 		D30B88C516B82AA1003550ED /* noimage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = noimage.png; path = Resources/noimage.png; sourceTree = "<group>"; };
@@ -1646,6 +1646,7 @@
 				pl,
 				fi,
 				"zh-Hans",
+				nb,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
@@ -1952,7 +1953,6 @@
 				D2DB3F8F16BB99BB0017955B /* de */,
 				D2DB3F9116BB9F130017955B /* fr */,
 				D2DB3F9216BB9F190017955B /* es */,
-				D2DB3F9416BB9F1E0017955B /* da */,
 				D2DB3F9516BB9F230017955B /* it */,
 				D2DB3F9616BB9F2A0017955B /* sv */,
 				D2DB3F9716BB9F300017955B /* nl */,
@@ -1960,6 +1960,7 @@
 				D2DB3F9916BB9F3A0017955B /* pl */,
 				D2DB3F9A16BB9F420017955B /* fi */,
 				D2DB3F9C16BB9F4E0017955B /* zh-Hans */,
+				D2DB3FA616BC03C80017955B /* nb */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1969,7 +1970,6 @@
 			children = (
 				D2D7FD5F16A52F6A0031322D /* en */,
 				D2DB3F9016BB9EE60017955B /* de */,
-				D2DB3F9316BB9F1E0017955B /* da */,
 				D2DB3F9B16BB9F4E0017955B /* zh-Hans */,
 				D2DB3F9D16BB9F670017955B /* fr */,
 				D2DB3F9E16BB9F690017955B /* es */,
@@ -1979,6 +1979,7 @@
 				D2DB3FA216BB9F720017955B /* ru */,
 				D2DB3FA316BB9F750017955B /* pl */,
 				D2DB3FA416BB9F7B0017955B /* fi */,
+				D2DB3FA516BC03C80017955B /* nb */,
 			);
 			name = BuschJaegerSettingsView.xib;
 			sourceTree = "<group>";
diff --git a/nb.lproj/Localizable.strings b/nb.lproj/Localizable.strings
new file mode 100644
index 000000000..d00eeb1f3
Binary files /dev/null and b/nb.lproj/Localizable.strings differ
diff --git a/welcome-de.loc/Contents.plist b/welcome-de.loc/Contents.plist
index d340b31e0..517ac4f30 100644
--- a/welcome-de.loc/Contents.plist
+++ b/welcome-de.loc/Contents.plist
@@ -735,6 +735,8 @@
 							<string>10.text</string>
 							<key>localizations</key>
 							<dict>
+								<key>de</key>
+								<string>Schnellkonfiguration mit QR-Code</string>
 								<key>en</key>
 								<string>Quick configuration with QR-code</string>
 							</dict>
@@ -777,6 +779,8 @@
 							<string>26.text</string>
 							<key>localizations</key>
 							<dict>
+								<key>de</key>
+								<string>Konfiguration neu laden</string>
 								<key>en</key>
 								<string>Reload configuration</string>
 							</dict>
@@ -1194,7 +1198,7 @@
 							<key>localizations</key>
 							<dict>
 								<key>de</key>
-								<string>Username</string>
+								<string>Benutzername</string>
 								<key>en</key>
 								<string>User name</string>
 							</dict>
diff --git a/welcome-es.loc/Contents.plist b/welcome-es.loc/Contents.plist
index fd13eba5a..c3d79786d 100644
--- a/welcome-es.loc/Contents.plist
+++ b/welcome-es.loc/Contents.plist
@@ -737,6 +737,8 @@
 							<dict>
 								<key>en</key>
 								<string>Quick configuration with QR-code</string>
+								<key>es</key>
+								<string>Configuración rápida con el código QR</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -779,6 +781,8 @@
 							<dict>
 								<key>en</key>
 								<string>Reload configuration</string>
+								<key>es</key>
+								<string>Volver a cargar la configuración</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -902,6 +906,8 @@
 							<dict>
 								<key>en</key>
 								<string>Version</string>
+								<key>es</key>
+								<string>Versión</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -923,6 +929,8 @@
 							<dict>
 								<key>en</key>
 								<string>Always active</string>
+								<key>es</key>
+								<string>Siempre activo</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -944,6 +952,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide light switch</string>
+								<key>es</key>
+								<string>Ocultar el interruptor de luz</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -965,6 +975,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide door opener</string>
+								<key>es</key>
+								<string>Ocultar el abridor de puerta</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1028,6 +1040,8 @@
 							<dict>
 								<key>en</key>
 								<string>Level Ringtone</string>
+								<key>es</key>
+								<string>Timbre de la vivienda</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1049,6 +1063,8 @@
 							<dict>
 								<key>en</key>
 								<string>Ringtone appartment</string>
+								<key>es</key>
+								<string>Timbre del edificio</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1070,6 +1086,8 @@
 							<dict>
 								<key>en</key>
 								<string>System settings</string>
+								<key>es</key>
+								<string>Ajustes del sistema</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1091,6 +1109,8 @@
 							<dict>
 								<key>en</key>
 								<string>Password</string>
+								<key>es</key>
+								<string>Contraseña</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1112,6 +1132,8 @@
 							<dict>
 								<key>en</key>
 								<string>IP gateway address</string>
+								<key>es</key>
+								<string>Dirección del Gateway IP</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1177,6 +1199,8 @@
 							<dict>
 								<key>en</key>
 								<string>User name</string>
+								<key>es</key>
+								<string>Nombre de usuario</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
diff --git a/welcome-it.loc/Contents.plist b/welcome-it.loc/Contents.plist
index 0848bbae2..d718b573c 100644
--- a/welcome-it.loc/Contents.plist
+++ b/welcome-it.loc/Contents.plist
@@ -737,6 +737,8 @@
 							<dict>
 								<key>en</key>
 								<string>Quick configuration with QR-code</string>
+								<key>it</key>
+								<string>Configurazione rapida con codice QR</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -779,6 +781,8 @@
 							<dict>
 								<key>en</key>
 								<string>Reload configuration</string>
+								<key>it</key>
+								<string>Ricarica configurazione</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -902,6 +906,8 @@
 							<dict>
 								<key>en</key>
 								<string>Version</string>
+								<key>it</key>
+								<string>Versione</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -923,6 +929,8 @@
 							<dict>
 								<key>en</key>
 								<string>Always active</string>
+								<key>it</key>
+								<string>Sempre attivo</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -944,6 +952,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide light switch</string>
+								<key>it</key>
+								<string>Nascondi interruttori luce</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -965,6 +975,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide door opener</string>
+								<key>it</key>
+								<string>Nascondi apriporta</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1028,6 +1040,8 @@
 							<dict>
 								<key>en</key>
 								<string>Level Ringtone</string>
+								<key>it</key>
+								<string>Suoneria appartamento</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1049,6 +1063,8 @@
 							<dict>
 								<key>en</key>
 								<string>Ringtone appartment</string>
+								<key>it</key>
+								<string>Suoneria edificio</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1070,6 +1086,8 @@
 							<dict>
 								<key>en</key>
 								<string>System settings</string>
+								<key>it</key>
+								<string>Impostazioni sistema</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1091,6 +1109,8 @@
 							<dict>
 								<key>en</key>
 								<string>Password</string>
+								<key>it</key>
+								<string>Password</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1112,6 +1132,8 @@
 							<dict>
 								<key>en</key>
 								<string>IP gateway address</string>
+								<key>it</key>
+								<string>Indirizzo gateway IP</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1177,6 +1199,8 @@
 							<dict>
 								<key>en</key>
 								<string>User name</string>
+								<key>it</key>
+								<string>Nome utente</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
diff --git a/welcome-nl.loc/Contents.plist b/welcome-nl.loc/Contents.plist
index 555aa56ec..51d71639e 100644
--- a/welcome-nl.loc/Contents.plist
+++ b/welcome-nl.loc/Contents.plist
@@ -737,6 +737,8 @@
 							<dict>
 								<key>en</key>
 								<string>Quick configuration with QR-code</string>
+								<key>nl</key>
+								<string>Snelle configuratie met QR-code</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -779,6 +781,8 @@
 							<dict>
 								<key>en</key>
 								<string>Reload configuration</string>
+								<key>nl</key>
+								<string>Configuratie opnieuw laden</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -902,6 +906,8 @@
 							<dict>
 								<key>en</key>
 								<string>Version</string>
+								<key>nl</key>
+								<string>Versie</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -923,6 +929,8 @@
 							<dict>
 								<key>en</key>
 								<string>Always active</string>
+								<key>nl</key>
+								<string>Altijd actief</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -944,6 +952,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide light switch</string>
+								<key>nl</key>
+								<string>Lichtschakelaar verbergen</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -965,6 +975,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide door opener</string>
+								<key>nl</key>
+								<string>Deuropener verbergen</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1028,6 +1040,8 @@
 							<dict>
 								<key>en</key>
 								<string>Level Ringtone</string>
+								<key>nl</key>
+								<string>Beltoon appartement</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1049,6 +1063,8 @@
 							<dict>
 								<key>en</key>
 								<string>Ringtone appartment</string>
+								<key>nl</key>
+								<string>Beltoon gebouw</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1070,6 +1086,8 @@
 							<dict>
 								<key>en</key>
 								<string>System settings</string>
+								<key>nl</key>
+								<string>Systeeminstellingen</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1091,6 +1109,8 @@
 							<dict>
 								<key>en</key>
 								<string>Password</string>
+								<key>nl</key>
+								<string>Wachtwoord</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1112,6 +1132,8 @@
 							<dict>
 								<key>en</key>
 								<string>IP gateway address</string>
+								<key>nl</key>
+								<string>IP-gateway adres</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1177,6 +1199,8 @@
 							<dict>
 								<key>en</key>
 								<string>User name</string>
+								<key>nl</key>
+								<string>Gebruikersnaam</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
diff --git a/welcome-pl.loc/Contents.plist b/welcome-pl.loc/Contents.plist
index 287f46708..2fea0e5c9 100644
--- a/welcome-pl.loc/Contents.plist
+++ b/welcome-pl.loc/Contents.plist
@@ -737,6 +737,8 @@
 							<dict>
 								<key>en</key>
 								<string>Quick configuration with QR-code</string>
+								<key>pl</key>
+								<string>Szybka konfiguracja z kodem QR</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -779,6 +781,8 @@
 							<dict>
 								<key>en</key>
 								<string>Reload configuration</string>
+								<key>pl</key>
+								<string>Załaduj konfigurację na nowo</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -902,6 +906,8 @@
 							<dict>
 								<key>en</key>
 								<string>Version</string>
+								<key>pl</key>
+								<string>Wersja</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -923,6 +929,8 @@
 							<dict>
 								<key>en</key>
 								<string>Always active</string>
+								<key>pl</key>
+								<string>Zawsze aktywny</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -944,6 +952,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide light switch</string>
+								<key>pl</key>
+								<string>Ukryj wyłącznik oświetleniowy</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -965,6 +975,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide door opener</string>
+								<key>pl</key>
+								<string>Ukryj elektrozaczep</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1028,6 +1040,8 @@
 							<dict>
 								<key>en</key>
 								<string>Level Ringtone</string>
+								<key>pl</key>
+								<string>Dźwięk dzwonka w mieszkaniu</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1049,6 +1063,8 @@
 							<dict>
 								<key>en</key>
 								<string>Ringtone appartment</string>
+								<key>pl</key>
+								<string>Dźwięk dzwonka w budynku</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1070,6 +1086,8 @@
 							<dict>
 								<key>en</key>
 								<string>System settings</string>
+								<key>pl</key>
+								<string>Ustawienia systemowe</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1091,6 +1109,8 @@
 							<dict>
 								<key>en</key>
 								<string>Password</string>
+								<key>pl</key>
+								<string>Hasło</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1112,6 +1132,8 @@
 							<dict>
 								<key>en</key>
 								<string>IP gateway address</string>
+								<key>pl</key>
+								<string>Adres bramy sieciowej IP</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1177,6 +1199,8 @@
 							<dict>
 								<key>en</key>
 								<string>User name</string>
+								<key>pl</key>
+								<string>Nazwa użytkownika</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
diff --git a/welcome-ru.loc/Contents.plist b/welcome-ru.loc/Contents.plist
index 43614e5c0..ebf84b192 100644
--- a/welcome-ru.loc/Contents.plist
+++ b/welcome-ru.loc/Contents.plist
@@ -737,6 +737,8 @@
 							<dict>
 								<key>en</key>
 								<string>Quick configuration with QR-code</string>
+								<key>ru</key>
+								<string>Быстрая конфигурация с помощью QR-кода</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -779,6 +781,8 @@
 							<dict>
 								<key>en</key>
 								<string>Reload configuration</string>
+								<key>ru</key>
+								<string>Загрузить конфигурацию заново</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -902,6 +906,8 @@
 							<dict>
 								<key>en</key>
 								<string>Version</string>
+								<key>ru</key>
+								<string>Версия</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -923,6 +929,8 @@
 							<dict>
 								<key>en</key>
 								<string>Always active</string>
+								<key>ru</key>
+								<string>Всегда активен</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -944,6 +952,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide light switch</string>
+								<key>ru</key>
+								<string>Скрыть выключатель света</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -965,6 +975,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide door opener</string>
+								<key>ru</key>
+								<string>Скрыть устройство открытия двери</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1028,6 +1040,8 @@
 							<dict>
 								<key>en</key>
 								<string>Level Ringtone</string>
+								<key>ru</key>
+								<string>Звонок для квартиры</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1049,6 +1063,8 @@
 							<dict>
 								<key>en</key>
 								<string>Ringtone appartment</string>
+								<key>ru</key>
+								<string>Звонок для здания</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1070,6 +1086,8 @@
 							<dict>
 								<key>en</key>
 								<string>System settings</string>
+								<key>ru</key>
+								<string>Системные настройки</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1091,6 +1109,8 @@
 							<dict>
 								<key>en</key>
 								<string>Password</string>
+								<key>ru</key>
+								<string>Пароль</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1112,6 +1132,8 @@
 							<dict>
 								<key>en</key>
 								<string>IP gateway address</string>
+								<key>ru</key>
+								<string>Адрес межсетевого интерфейса IP</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1177,6 +1199,8 @@
 							<dict>
 								<key>en</key>
 								<string>User name</string>
+								<key>ru</key>
+								<string>Имя пользователя</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
diff --git a/welcome-sv.loc/Contents.plist b/welcome-sv.loc/Contents.plist
index f88d66c8e..c6c04cfda 100644
--- a/welcome-sv.loc/Contents.plist
+++ b/welcome-sv.loc/Contents.plist
@@ -737,6 +737,8 @@
 							<dict>
 								<key>en</key>
 								<string>Quick configuration with QR-code</string>
+								<key>sv</key>
+								<string>Snabbkonfiguration med QR-kod</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -779,6 +781,8 @@
 							<dict>
 								<key>en</key>
 								<string>Reload configuration</string>
+								<key>sv</key>
+								<string>Ladda konfigurationen på nytt</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -902,6 +906,8 @@
 							<dict>
 								<key>en</key>
 								<string>Version</string>
+								<key>sv</key>
+								<string>Version</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -923,6 +929,8 @@
 							<dict>
 								<key>en</key>
 								<string>Always active</string>
+								<key>sv</key>
+								<string>Alltid aktiv</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -944,6 +952,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide light switch</string>
+								<key>sv</key>
+								<string>Dölja ljusbrytare</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -965,6 +975,8 @@
 							<dict>
 								<key>en</key>
 								<string>Hide door opener</string>
+								<key>sv</key>
+								<string>Dölja dörröppnare</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1028,6 +1040,8 @@
 							<dict>
 								<key>en</key>
 								<string>Level Ringtone</string>
+								<key>sv</key>
+								<string>Signal lägenhet</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1049,6 +1063,8 @@
 							<dict>
 								<key>en</key>
 								<string>Ringtone appartment</string>
+								<key>sv</key>
+								<string>Signal byggnad</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1070,6 +1086,8 @@
 							<dict>
 								<key>en</key>
 								<string>System settings</string>
+								<key>sv</key>
+								<string>Systeminställningar</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1091,6 +1109,8 @@
 							<dict>
 								<key>en</key>
 								<string>Password</string>
+								<key>sv</key>
+								<string>Lösenord</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1112,6 +1132,8 @@
 							<dict>
 								<key>en</key>
 								<string>IP gateway address</string>
+								<key>sv</key>
+								<string>IP-gateway adress</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1177,6 +1199,8 @@
 							<dict>
 								<key>en</key>
 								<string>User name</string>
+								<key>sv</key>
+								<string>Användarnamn	</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
diff --git a/welcome-zh-Hans.loc/Contents.plist b/welcome-zh-Hans.loc/Contents.plist
new file mode 100644
index 000000000..c5d6aa18c
--- /dev/null
+++ b/welcome-zh-Hans.loc/Contents.plist
@@ -0,0 +1,1246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>bundles</key>
+	<array>
+		<dict>
+			<key>associated Xcode projects</key>
+			<array>
+				<string>../linphone.xcodeproj</string>
+			</array>
+			<key>change date</key>
+			<date>2001-01-01T00:00:00Z</date>
+			<key>class</key>
+			<string>BLBundleObject</string>
+			<key>errors</key>
+			<array/>
+			<key>files</key>
+			<array>
+				<dict>
+					<key>attachments</key>
+					<dict>
+						<key>backup</key>
+						<dict>
+							<key>1</key>
+							<dict>
+								<key>class</key>
+								<string>BLWrapperHandle</string>
+								<key>name</key>
+								<string>Resources/Localizable/1/Localizable.strings</string>
+							</dict>
+						</dict>
+					</dict>
+					<key>change date</key>
+					<date>2013-01-31T13:17:37Z</date>
+					<key>class</key>
+					<string>BLStringsFileObject</string>
+					<key>errors</key>
+					<array/>
+					<key>flags</key>
+					<integer>0</integer>
+					<key>hash</key>
+					<string>5aab746c7cc97fd896f82e540eb51e27
+</string>
+					<key>name</key>
+					<string>Localizable.strings</string>
+					<key>objects</key>
+					<array>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>%@ is busy</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>%@ is busy</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Answer</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Answer</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Cannot make call</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Cannot make call</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Connection issue: %@</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Connection issue: %@</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Continue</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Continue</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Either configure a SIP proxy server from settings prior to place a call or use a valid SIP address (I.E sip:john@example.net)</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Either configure a SIP proxy server from settings prior to place a call or use a valid SIP address (I.E sip:john@example.net)</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>History delete error</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>History delete error</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>History provisioning error</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>History provisioning error</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>IC_MSG</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>IC_MSG</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>IM_MSG</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>IM_MSG</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Invalid configuration file</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Invalid configuration file</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Invalid SIP address</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Invalid SIP address</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>It seems you have not configured any proxy server from settings</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>It seems you have not configured any proxy server from settings</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Network Error</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Network Error</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Never remind</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Never remind</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>No microphone</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>No microphone</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Ok</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Ok</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Please terminate GSM call</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Please terminate GSM call</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Provisioning error</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Provisioning error</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Provisioning Success</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Provisioning Success</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Show</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Show</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Surveillance issue</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Surveillance issue</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>The providing configuration is successfully applied</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>The providing configuration is successfully applied</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>There is no network connection available, enable WIFI or WWAN prior to place a call</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>There is no network connection available, enable WIFI or WWAN prior to place a call</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Unknown</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Unknown</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Unknown issue when saving configuration</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Unknown issue when saving configuration</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Warning</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Warning</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>You can't call this camera</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>You can't call this camera</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>You need to plug a microphone to your device to use this application.</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>You need to plug a microphone to your device to use this application.</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+					</array>
+					<key>plist file</key>
+					<false/>
+					<key>snapshots</key>
+					<dict/>
+					<key>versions</key>
+					<dict>
+						<key>en</key>
+						<string>1</string>
+					</dict>
+				</dict>
+			</array>
+			<key>flags</key>
+			<integer>0</integer>
+			<key>name</key>
+			<string>Resources</string>
+			<key>naming style</key>
+			<integer>1</integer>
+			<key>referencing style</key>
+			<integer>1</integer>
+			<key>user name</key>
+			<string>Resources</string>
+		</dict>
+		<dict>
+			<key>associated Xcode projects</key>
+			<array>
+				<string>../linphone.xcodeproj</string>
+			</array>
+			<key>change date</key>
+			<date>2001-01-01T00:00:00Z</date>
+			<key>class</key>
+			<string>BLBundleObject</string>
+			<key>errors</key>
+			<array/>
+			<key>files</key>
+			<array>
+				<dict>
+					<key>attachments</key>
+					<dict>
+						<key>backup</key>
+						<dict>
+							<key>2</key>
+							<dict>
+								<key>class</key>
+								<string>BLWrapperHandle</string>
+								<key>name</key>
+								<string>Classes/BuschJaegerSettingsView/2/BuschJaegerSettingsView.xib</string>
+							</dict>
+						</dict>
+					</dict>
+					<key>change date</key>
+					<date>2013-02-01T13:55:08Z</date>
+					<key>class</key>
+					<string>BLNibFileObject</string>
+					<key>errors</key>
+					<array/>
+					<key>flags</key>
+					<integer>0</integer>
+					<key>hash</key>
+					<string>8aaf9695ef80750a75bd0d9a8f4149e2
+</string>
+					<key>name</key>
+					<string>BuschJaegerSettingsView.xib</string>
+					<key>objects</key>
+					<array>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Class = "IBUILabel"; text = "Quick configuration with QR-code"; ObjectID = "10";</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>10.text</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Quick configuration with QR-code</string>
+								<key>zh-Hans</key>
+								<string>使用 QR 码快速配置</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Class = "IBUILabel"; text = "Back"; ObjectID = "15";</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>15.text</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Back</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Class = "IBUILabel"; text = "Reload configuration"; ObjectID = "26";</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>26.text</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Reload configuration</string>
+								<key>zh-Hans</key>
+								<string>重新加载设置</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+					</array>
+					<key>snapshots</key>
+					<dict/>
+					<key>versions</key>
+					<dict>
+						<key>de</key>
+						<string>2</string>
+						<key>en</key>
+						<string>2</string>
+						<key>es</key>
+						<string>2</string>
+						<key>fi</key>
+						<string>2</string>
+						<key>fr</key>
+						<string>2</string>
+						<key>it</key>
+						<string>2</string>
+						<key>nl</key>
+						<string>2</string>
+						<key>pl</key>
+						<string>2</string>
+						<key>ru</key>
+						<string>2</string>
+						<key>sv</key>
+						<string>2</string>
+						<key>zh_CN</key>
+						<string>2</string>
+					</dict>
+				</dict>
+			</array>
+			<key>flags</key>
+			<integer>0</integer>
+			<key>name</key>
+			<string>Classes</string>
+			<key>naming style</key>
+			<integer>1</integer>
+			<key>referencing style</key>
+			<integer>1</integer>
+			<key>user name</key>
+			<string>Classes</string>
+		</dict>
+		<dict>
+			<key>associated Xcode projects</key>
+			<array/>
+			<key>change date</key>
+			<date>2001-01-01T00:00:00Z</date>
+			<key>class</key>
+			<string>BLBundleObject</string>
+			<key>errors</key>
+			<array/>
+			<key>files</key>
+			<array>
+				<dict>
+					<key>attachments</key>
+					<dict>
+						<key>backup</key>
+						<dict>
+							<key>1</key>
+							<dict>
+								<key>class</key>
+								<string>BLWrapperHandle</string>
+								<key>name</key>
+								<string>Settings.bundle/Root/1/Root.strings</string>
+							</dict>
+						</dict>
+					</dict>
+					<key>change date</key>
+					<date>2013-01-31T14:14:30Z</date>
+					<key>class</key>
+					<string>BLStringsFileObject</string>
+					<key>errors</key>
+					<array/>
+					<key>flags</key>
+					<integer>0</integer>
+					<key>hash</key>
+					<string>3aa7ccf800a8d209e8439266e4be9e78
+</string>
+					<key>name</key>
+					<string>Root.strings</string>
+					<key>objects</key>
+					<array>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Battery alert</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Battery alert</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Battery alert</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Version</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Version</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Version</string>
+								<key>zh-Hans</key>
+								<string>版本</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Background mode</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Background mode</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Always active</string>
+								<key>zh-Hans</key>
+								<string>总是激活</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Hide Switch Light</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Hide Switch Light</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Hide light switch</string>
+								<key>zh-Hans</key>
+								<string>隐藏灯开关</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Hide Lock door</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Hide Lock door</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Hide door opener</string>
+								<key>zh-Hans</key>
+								<string>隐藏开门器</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Advanced</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Advanced</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Advanced</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Welcome must be restarted for changes to take effect</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Welcome must be restarted for changes to take effect</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Welcome must be restarted for changes to take effect</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Level Ringtone</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Level Ringtone</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Level Ringtone</string>
+								<key>zh-Hans</key>
+								<string>住宅铃声</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Ringtone</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Ringtone</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Ringtone appartment</string>
+								<key>zh-Hans</key>
+								<string>大楼铃声</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Sounds</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Sounds</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>System settings</string>
+								<key>zh-Hans</key>
+								<string>系统设置</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Password</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Password</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Password</string>
+								<key>zh-Hans</key>
+								<string>密码</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>IP-Gateway</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>IP-Gateway</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>IP gateway address</string>
+								<key>zh-Hans</key>
+								<string>IP 网关地址</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>SIP account</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>SIP account</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Network settings</string>
+								<key>zh-Hans</key>
+								<string>网络设置</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Wizard</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Wizard</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Wizard</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>User name</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>User name</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>User name</string>
+								<key>zh-Hans</key>
+								<string>用户名</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+					</array>
+					<key>plist file</key>
+					<false/>
+					<key>snapshots</key>
+					<dict/>
+					<key>versions</key>
+					<dict>
+						<key>en</key>
+						<string>1</string>
+					</dict>
+				</dict>
+			</array>
+			<key>flags</key>
+			<integer>0</integer>
+			<key>name</key>
+			<string>Settings.bundle</string>
+			<key>naming style</key>
+			<integer>1</integer>
+			<key>referencing style</key>
+			<integer>1</integer>
+			<key>user name</key>
+			<string>Settings.bundle</string>
+		</dict>
+	</array>
+	<key>languages</key>
+	<array>
+		<string>en</string>
+		<string>zh-Hans</string>
+	</array>
+	<key>preferences</key>
+	<dict/>
+	<key>reference language</key>
+	<string>en</string>
+	<key>supports preview</key>
+	<true/>
+	<key>version</key>
+	<integer>4</integer>
+</dict>
+</plist>
diff --git a/welcome-zh-Hans.loc/Resources/Classes/BuschJaegerSettingsView/2/BuschJaegerSettingsView.xib b/welcome-zh-Hans.loc/Resources/Classes/BuschJaegerSettingsView/2/BuschJaegerSettingsView.xib
new file mode 100644
index 000000000..2501bb447
--- /dev/null
+++ b/welcome-zh-Hans.loc/Resources/Classes/BuschJaegerSettingsView/2/BuschJaegerSettingsView.xib
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1552</int>
+		<string key="IBDocument.SystemVersion">12C60</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</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">2083</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUIActivityIndicatorView</string>
+			<string>IBUIButton</string>
+			<string>IBUIImageView</string>
+			<string>IBUILabel</string>
+			<string>IBUIView</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="823940774">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">272</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="432106977">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="681245415">
+								<reference key="NSNextResponder" ref="432106977"/>
+								<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">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">bj_barcode.png</string>
+								</object>
+							</object>
+							<object class="IBUILabel" id="549870177">
+								<reference key="NSNextResponder" ref="432106977"/>
+								<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>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">Quick configuration with QR-code</string>
+								<object class="NSColor" key="IBUITextColor" id="475419136">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">0</int>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
+									<int key="type">1</int>
+									<double key="pointSize">24</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="153354414">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">24</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
+							</object>
+							<object class="IBUIButton" id="931069643">
+								<reference key="NSNextResponder" ref="432106977"/>
+								<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">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<object class="NSColor" key="IBUINormalTitleShadowColor" id="459298159">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC41AA</bytes>
+								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="26925302">
+									<int key="type">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="316540384">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+						</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"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="290853868">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUILabel" id="978723389">
+								<reference key="NSNextResponder" ref="290853868"/>
+								<int key="NSvFlags">274</int>
+								<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>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</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>
+							<object class="IBUIButton" id="463635404">
+								<reference key="NSNextResponder" ref="290853868"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 100}</string>
+								<reference key="NSSuperview" ref="290853868"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="978723389"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="446909226"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleShadowColor" ref="459298159"/>
+								<reference key="IBUIFontDescription" ref="26925302"/>
+								<reference key="IBUIFont" ref="316540384"/>
+							</object>
+						</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"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="558519328">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">269</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUILabel" id="870767854">
+								<reference key="NSNextResponder" ref="558519328"/>
+								<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>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">Back</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>
+							<object class="IBUIButton" id="1058981027">
+								<reference key="NSNextResponder" ref="558519328"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 40}</string>
+								<reference key="NSSuperview" ref="558519328"/>
+								<reference key="NSWindow"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="446909226"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleShadowColor" ref="459298159"/>
+								<reference key="IBUIFontDescription" ref="26925302"/>
+								<reference key="IBUIFont" ref="316540384"/>
+							</object>
+						</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"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="508446153">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">274</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIActivityIndicatorView" id="759552209">
+								<reference key="NSNextResponder" ref="508446153"/>
+								<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>
+								<bool key="IBUIHidesWhenStopped">NO</bool>
+								<bool key="IBUIAnimating">YES</bool>
+								<int key="IBUIStyle">0</int>
+							</object>
+						</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">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwLjQ1AA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</array>
+				<string key="NSFrameSize">{320, 460}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="508446153"/>
+				<string key="NSReuseIdentifierKey">_NS:9</string>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MC4xMTc2NDcwNTg4IDAuMTY0NzA1ODgyNCAwLjIxOTYwNzg0MzEAA</bytes>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="823940774"/>
+					</object>
+					<int key="connectionID">5</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">scanButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="432106977"/>
+					</object>
+					<int key="connectionID">12</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="558519328"/>
+					</object>
+					<int key="connectionID">19</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">waitView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="508446153"/>
+					</object>
+					<int key="connectionID">24</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">manualButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="290853868"/>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onScanClick:</string>
+						<reference key="source" ref="931069643"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onBackClick:</string>
+						<reference key="source" ref="1058981027"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">21</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onManualClick:</string>
+						<reference key="source" ref="463635404"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">30</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="823940774"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="432106977"/>
+							<reference ref="558519328"/>
+							<reference ref="508446153"/>
+							<reference ref="290853868"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="432106977"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="681245415"/>
+							<reference ref="931069643"/>
+							<reference ref="549870177"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Scan Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="931069643"/>
+						<reference key="parent" ref="432106977"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="681245415"/>
+						<reference key="parent" ref="432106977"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="549870177"/>
+						<reference key="parent" ref="432106977"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="558519328"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="870767854"/>
+							<reference ref="1058981027"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Back Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="870767854"/>
+						<reference key="parent" ref="558519328"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="1058981027"/>
+						<reference key="parent" ref="558519328"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="508446153"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="759552209"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Wait View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="759552209"/>
+						<reference key="parent" ref="508446153"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="290853868"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="978723389"/>
+							<reference ref="463635404"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Manual Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="978723389"/>
+						<reference key="parent" ref="290853868"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="463635404"/>
+						<reference key="parent" ref="290853868"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">BuschJaegerSettingsView</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="16.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<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="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>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="9.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<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>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1552" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<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">{310, 310}</string>
+		</object>
+		<string key="IBCocoaTouchPluginVersion">2083</string>
+	</data>
+</archive>
diff --git a/welcome-zh-Hans.loc/Resources/Resources/Localizable/1/Localizable.strings b/welcome-zh-Hans.loc/Resources/Resources/Localizable/1/Localizable.strings
new file mode 100644
index 000000000..d00eeb1f3
Binary files /dev/null and b/welcome-zh-Hans.loc/Resources/Resources/Localizable/1/Localizable.strings differ
diff --git a/welcome-zh-Hans.loc/Resources/Settings.bundle/Root/1/Root.strings b/welcome-zh-Hans.loc/Resources/Settings.bundle/Root/1/Root.strings
new file mode 100644
index 000000000..8ef93b80e
--- /dev/null
+++ b/welcome-zh-Hans.loc/Resources/Settings.bundle/Root/1/Root.strings
@@ -0,0 +1,44 @@
+/* Battery alert */
+"Battery alert" = "Battery alert";
+
+/* Version */
+"Version" = "Version";
+
+/* Background mode */
+"Background mode" = "Always active";
+
+/* Hide Switch Light */
+"Hide Switch Light" = "Hide light switch";
+
+/* Hide Lock door */
+"Hide Lock door" = "Hide door opener";
+
+/* Advanced */
+"Advanced" = "Advanced";
+
+/* Welcome must be restarted for changes to take effect */
+"Welcome must be restarted for changes to take effect" = "Welcome must be restarted for changes to take effect";
+
+/* Level Ringtone */
+"Level Ringtone" = "Level Ringtone";
+
+/* Ringtone */
+"Ringtone" = "Ringtone appartment";
+
+/* Sounds */
+"Sounds" = "System settings";
+
+/* Password */
+"Password" = "Password";
+
+/* IP-Gateway */
+"IP-Gateway" = "IP gateway address";
+
+/* SIP account */
+"SIP account" = "Network settings";
+
+/* Wizard */
+"Wizard" = "Wizard";
+
+/* User name */
+"User name" = "User name";
\ No newline at end of file
diff --git a/welcome-zh_CN.loc/Contents.plist b/welcome-zh_CN.loc/Contents.plist
index 0ed4262d9..94b2bff2f 100644
--- a/welcome-zh_CN.loc/Contents.plist
+++ b/welcome-zh_CN.loc/Contents.plist
@@ -696,17 +696,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>1</key>
+							<key>2</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/BuschJaegerSettingsView/1/BuschJaegerSettingsView.xib</string>
+								<string>Classes/BuschJaegerSettingsView/2/BuschJaegerSettingsView.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2013-01-31T14:06:15Z</date>
+					<date>2013-02-01T13:55:08Z</date>
 					<key>class</key>
 					<string>BLNibFileObject</string>
 					<key>errors</key>
@@ -714,7 +714,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>b1e91037d07ea3cba150bcb9f9a033ca
+					<string>8aaf9695ef80750a75bd0d9a8f4149e2
 </string>
 					<key>name</key>
 					<string>BuschJaegerSettingsView.xib</string>
@@ -793,27 +793,27 @@
 					<key>versions</key>
 					<dict>
 						<key>de</key>
-						<string>1</string>
+						<string>2</string>
 						<key>en</key>
-						<string>1</string>
+						<string>2</string>
 						<key>es</key>
-						<string>1</string>
+						<string>2</string>
 						<key>fi</key>
-						<string>1</string>
+						<string>2</string>
 						<key>fr</key>
-						<string>1</string>
+						<string>2</string>
 						<key>it</key>
-						<string>1</string>
+						<string>2</string>
 						<key>nl</key>
-						<string>1</string>
+						<string>2</string>
 						<key>pl</key>
-						<string>1</string>
+						<string>2</string>
 						<key>ru</key>
-						<string>1</string>
+						<string>2</string>
 						<key>sv</key>
-						<string>1</string>
+						<string>2</string>
 						<key>zh_CN</key>
-						<string>1</string>
+						<string>2</string>
 					</dict>
 				</dict>
 			</array>
diff --git a/welcome-zh_CN.loc/Resources/Classes/BuschJaegerSettingsView/2/BuschJaegerSettingsView.xib b/welcome-zh_CN.loc/Resources/Classes/BuschJaegerSettingsView/2/BuschJaegerSettingsView.xib
new file mode 100644
index 000000000..2501bb447
--- /dev/null
+++ b/welcome-zh_CN.loc/Resources/Classes/BuschJaegerSettingsView/2/BuschJaegerSettingsView.xib
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1552</int>
+		<string key="IBDocument.SystemVersion">12C60</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</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">2083</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUIActivityIndicatorView</string>
+			<string>IBUIButton</string>
+			<string>IBUIImageView</string>
+			<string>IBUILabel</string>
+			<string>IBUIView</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="823940774">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">272</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="432106977">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="681245415">
+								<reference key="NSNextResponder" ref="432106977"/>
+								<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">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">bj_barcode.png</string>
+								</object>
+							</object>
+							<object class="IBUILabel" id="549870177">
+								<reference key="NSNextResponder" ref="432106977"/>
+								<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>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">Quick configuration with QR-code</string>
+								<object class="NSColor" key="IBUITextColor" id="475419136">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">0</int>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
+									<int key="type">1</int>
+									<double key="pointSize">24</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="153354414">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">24</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
+							</object>
+							<object class="IBUIButton" id="931069643">
+								<reference key="NSNextResponder" ref="432106977"/>
+								<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">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<object class="NSColor" key="IBUINormalTitleShadowColor" id="459298159">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC41AA</bytes>
+								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="26925302">
+									<int key="type">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="316540384">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+						</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"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="290853868">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUILabel" id="978723389">
+								<reference key="NSNextResponder" ref="290853868"/>
+								<int key="NSvFlags">274</int>
+								<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>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</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>
+							<object class="IBUIButton" id="463635404">
+								<reference key="NSNextResponder" ref="290853868"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 100}</string>
+								<reference key="NSSuperview" ref="290853868"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="978723389"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="446909226"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleShadowColor" ref="459298159"/>
+								<reference key="IBUIFontDescription" ref="26925302"/>
+								<reference key="IBUIFont" ref="316540384"/>
+							</object>
+						</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"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="558519328">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">269</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUILabel" id="870767854">
+								<reference key="NSNextResponder" ref="558519328"/>
+								<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>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">Back</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>
+							<object class="IBUIButton" id="1058981027">
+								<reference key="NSNextResponder" ref="558519328"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 40}</string>
+								<reference key="NSSuperview" ref="558519328"/>
+								<reference key="NSWindow"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="446909226"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleShadowColor" ref="459298159"/>
+								<reference key="IBUIFontDescription" ref="26925302"/>
+								<reference key="IBUIFont" ref="316540384"/>
+							</object>
+						</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"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="508446153">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">274</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIActivityIndicatorView" id="759552209">
+								<reference key="NSNextResponder" ref="508446153"/>
+								<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>
+								<bool key="IBUIHidesWhenStopped">NO</bool>
+								<bool key="IBUIAnimating">YES</bool>
+								<int key="IBUIStyle">0</int>
+							</object>
+						</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">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwLjQ1AA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</array>
+				<string key="NSFrameSize">{320, 460}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="508446153"/>
+				<string key="NSReuseIdentifierKey">_NS:9</string>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MC4xMTc2NDcwNTg4IDAuMTY0NzA1ODgyNCAwLjIxOTYwNzg0MzEAA</bytes>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="823940774"/>
+					</object>
+					<int key="connectionID">5</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">scanButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="432106977"/>
+					</object>
+					<int key="connectionID">12</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="558519328"/>
+					</object>
+					<int key="connectionID">19</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">waitView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="508446153"/>
+					</object>
+					<int key="connectionID">24</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">manualButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="290853868"/>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onScanClick:</string>
+						<reference key="source" ref="931069643"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onBackClick:</string>
+						<reference key="source" ref="1058981027"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">21</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onManualClick:</string>
+						<reference key="source" ref="463635404"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">30</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="823940774"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="432106977"/>
+							<reference ref="558519328"/>
+							<reference ref="508446153"/>
+							<reference ref="290853868"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="432106977"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="681245415"/>
+							<reference ref="931069643"/>
+							<reference ref="549870177"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Scan Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="931069643"/>
+						<reference key="parent" ref="432106977"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="681245415"/>
+						<reference key="parent" ref="432106977"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="549870177"/>
+						<reference key="parent" ref="432106977"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="558519328"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="870767854"/>
+							<reference ref="1058981027"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Back Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="870767854"/>
+						<reference key="parent" ref="558519328"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="1058981027"/>
+						<reference key="parent" ref="558519328"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="508446153"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="759552209"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Wait View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="759552209"/>
+						<reference key="parent" ref="508446153"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="290853868"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="978723389"/>
+							<reference ref="463635404"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Manual Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="978723389"/>
+						<reference key="parent" ref="290853868"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="463635404"/>
+						<reference key="parent" ref="290853868"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">BuschJaegerSettingsView</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="16.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<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="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>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="9.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<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>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1552" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<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">{310, 310}</string>
+		</object>
+		<string key="IBCocoaTouchPluginVersion">2083</string>
+	</data>
+</archive>
diff --git a/welcome.ldb/Contents.plist b/welcome.ldb/Contents.plist
index 849e5575c..781dcaafe 100644
--- a/welcome.ldb/Contents.plist
+++ b/welcome.ldb/Contents.plist
@@ -762,17 +762,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>1</key>
+							<key>3</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/BuschJaegerSettingsView/1/BuschJaegerSettingsView.xib</string>
+								<string>Classes/BuschJaegerSettingsView/3/BuschJaegerSettingsView.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2013-01-31T14:06:15Z</date>
+					<date>2013-02-01T13:57:34Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -782,7 +782,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>b1e91037d07ea3cba150bcb9f9a033ca
+					<string>ed045ff11b74930fa59551dd08129fc2
 </string>
 					<key>name</key>
 					<string>BuschJaegerSettingsView.xib</string>
@@ -806,7 +806,7 @@
 							<key>localizations</key>
 							<dict>
 								<key>de</key>
-								<string>Schnellkonfiguration mit QR-Code</string>
+								<string>Schnell- konfiguration mit QR-Code</string>
 								<key>en</key>
 								<string>Quick configuration with QR-code</string>
 								<key>es</key>
@@ -817,6 +817,10 @@
 								<string>Configuration rapide avec code QR</string>
 								<key>it</key>
 								<string>Configurazione rapida con codice QR</string>
+								<key>nb</key>
+								<string>Hurtig- konfigurasjon med QR-kode</string>
+								<key>nb_NO</key>
+								<string>Hurtigkonfigurasjon med QR-kode</string>
 								<key>nl</key>
 								<string>Snelle configuratie met QR-code</string>
 								<key>pl</key>
@@ -825,6 +829,8 @@
 								<string>Быстрая конфигурация с помощью QR-кода</string>
 								<key>sv</key>
 								<string>Snabbkonfiguration med QR-kod</string>
+								<key>zh-Hans</key>
+								<string>使用 QR 码快速配置</string>
 								<key>zh_CN</key>
 								<string>使用 QR 码快速配置</string>
 							</dict>
@@ -883,6 +889,10 @@
 								<string>Recharger la configuration</string>
 								<key>it</key>
 								<string>Ricarica configurazione</string>
+								<key>nb</key>
+								<string>Last inn konfigurasjon på nytt</string>
+								<key>nb_NO</key>
+								<string>Last inn konfigurasjon på nytt</string>
 								<key>nl</key>
 								<string>Configuratie opnieuw laden</string>
 								<key>pl</key>
@@ -891,6 +901,8 @@
 								<string>Загрузить конфигурацию заново</string>
 								<key>sv</key>
 								<string>Ladda konfigurationen på nytt</string>
+								<key>zh-Hans</key>
+								<string>重新加载设置</string>
 								<key>zh_CN</key>
 								<string>重新加载设置</string>
 							</dict>
@@ -905,27 +917,33 @@
 					<key>versions</key>
 					<dict>
 						<key>de</key>
-						<string>1</string>
+						<string>3</string>
 						<key>en</key>
-						<string>1</string>
+						<string>3</string>
 						<key>es</key>
-						<string>1</string>
+						<string>3</string>
 						<key>fi</key>
-						<string>1</string>
+						<string>3</string>
 						<key>fr</key>
-						<string>1</string>
+						<string>3</string>
 						<key>it</key>
-						<string>1</string>
+						<string>3</string>
+						<key>nb</key>
+						<string>3</string>
+						<key>nb_NO</key>
+						<string>3</string>
 						<key>nl</key>
-						<string>1</string>
+						<string>3</string>
 						<key>pl</key>
-						<string>1</string>
+						<string>3</string>
 						<key>ru</key>
-						<string>1</string>
+						<string>3</string>
 						<key>sv</key>
-						<string>1</string>
+						<string>3</string>
+						<key>zh-Hans</key>
+						<string>3</string>
 						<key>zh_CN</key>
-						<string>1</string>
+						<string>3</string>
 					</dict>
 				</dict>
 			</array>
@@ -1036,6 +1054,8 @@
 								<string>Version</string>
 								<key>it</key>
 								<string>Versione</string>
+								<key>nb</key>
+								<string>Versjon</string>
 								<key>nl</key>
 								<string>Versie</string>
 								<key>pl</key>
@@ -1044,6 +1064,8 @@
 								<string>Версия</string>
 								<key>sv</key>
 								<string>Version</string>
+								<key>zh-Hans</key>
+								<string>版本</string>
 								<key>zh_CN</key>
 								<string>版本</string>
 							</dict>
@@ -1079,6 +1101,8 @@
 								<string>Toujours actif</string>
 								<key>it</key>
 								<string>Sempre attivo</string>
+								<key>nb</key>
+								<string>Alltid aktiv</string>
 								<key>nl</key>
 								<string>Altijd actief</string>
 								<key>pl</key>
@@ -1087,6 +1111,8 @@
 								<string>Всегда активен</string>
 								<key>sv</key>
 								<string>Alltid aktiv</string>
+								<key>zh-Hans</key>
+								<string>总是激活</string>
 								<key>zh_CN</key>
 								<string>总是激活</string>
 							</dict>
@@ -1122,6 +1148,8 @@
 								<string>Masquer l'interrupteur</string>
 								<key>it</key>
 								<string>Nascondi interruttori luce</string>
+								<key>nb</key>
+								<string>Skjul lysbryter</string>
 								<key>nl</key>
 								<string>Lichtschakelaar verbergen</string>
 								<key>pl</key>
@@ -1130,6 +1158,8 @@
 								<string>Скрыть выключатель света</string>
 								<key>sv</key>
 								<string>Dölja ljusbrytare</string>
+								<key>zh-Hans</key>
+								<string>隐藏灯开关</string>
 								<key>zh_CN</key>
 								<string>隐藏灯开关</string>
 							</dict>
@@ -1165,6 +1195,8 @@
 								<string>Masquer le système d'ouverture de porte</string>
 								<key>it</key>
 								<string>Nascondi apriporta</string>
+								<key>nb</key>
+								<string>Skjul døråpner</string>
 								<key>nl</key>
 								<string>Deuropener verbergen</string>
 								<key>pl</key>
@@ -1173,6 +1205,8 @@
 								<string>Скрыть устройство открытия двери</string>
 								<key>sv</key>
 								<string>Dölja dörröppnare</string>
+								<key>zh-Hans</key>
+								<string>隐藏开门器</string>
 								<key>zh_CN</key>
 								<string>隐藏开门器</string>
 							</dict>
@@ -1254,6 +1288,8 @@
 								<string>Mélodie de sonnerie appartement</string>
 								<key>it</key>
 								<string>Suoneria appartamento</string>
+								<key>nb</key>
+								<string>Ringetone bolig</string>
 								<key>nl</key>
 								<string>Beltoon appartement</string>
 								<key>pl</key>
@@ -1262,6 +1298,8 @@
 								<string>Звонок для квартиры</string>
 								<key>sv</key>
 								<string>Signal lägenhet</string>
+								<key>zh-Hans</key>
+								<string>住宅铃声</string>
 								<key>zh_CN</key>
 								<string>住宅铃声</string>
 							</dict>
@@ -1297,6 +1335,8 @@
 								<string>Mélodie de sonnerie bâtiment</string>
 								<key>it</key>
 								<string>Suoneria edificio</string>
+								<key>nb</key>
+								<string>Ringetone bygning</string>
 								<key>nl</key>
 								<string>Beltoon gebouw</string>
 								<key>pl</key>
@@ -1305,6 +1345,8 @@
 								<string>Звонок для здания</string>
 								<key>sv</key>
 								<string>Signal byggnad</string>
+								<key>zh-Hans</key>
+								<string>大楼铃声</string>
 								<key>zh_CN</key>
 								<string>大楼铃声</string>
 							</dict>
@@ -1340,6 +1382,8 @@
 								<string>Configuration système</string>
 								<key>it</key>
 								<string>Impostazioni sistema</string>
+								<key>nb</key>
+								<string>Systeminnstillinger</string>
 								<key>nl</key>
 								<string>Systeeminstellingen</string>
 								<key>pl</key>
@@ -1348,6 +1392,8 @@
 								<string>Системные настройки</string>
 								<key>sv</key>
 								<string>Systeminställningar</string>
+								<key>zh-Hans</key>
+								<string>系统设置</string>
 								<key>zh_CN</key>
 								<string>系统设置</string>
 							</dict>
@@ -1383,6 +1429,8 @@
 								<string>Mot de passe</string>
 								<key>it</key>
 								<string>Password</string>
+								<key>nb</key>
+								<string>Passord</string>
 								<key>nl</key>
 								<string>Wachtwoord</string>
 								<key>pl</key>
@@ -1391,6 +1439,8 @@
 								<string>Пароль</string>
 								<key>sv</key>
 								<string>Lösenord</string>
+								<key>zh-Hans</key>
+								<string>密码</string>
 								<key>zh_CN</key>
 								<string>密码</string>
 							</dict>
@@ -1426,6 +1476,8 @@
 								<string>Adresse de passerelle IP</string>
 								<key>it</key>
 								<string>Indirizzo gateway IP</string>
+								<key>nb</key>
+								<string>IP-gateway-adresse</string>
 								<key>nl</key>
 								<string>IP-gateway adres</string>
 								<key>pl</key>
@@ -1434,6 +1486,8 @@
 								<string>Адрес межсетевого интерфейса IP</string>
 								<key>sv</key>
 								<string>IP-gateway adress</string>
+								<key>zh-Hans</key>
+								<string>IP 网关地址</string>
 								<key>zh_CN</key>
 								<string>IP 网关地址</string>
 							</dict>
@@ -1469,6 +1523,8 @@
 								<string>Configuration réseau</string>
 								<key>it</key>
 								<string>Impostazioni rete</string>
+								<key>nb</key>
+								<string>Nettverksinnstillinger</string>
 								<key>nl</key>
 								<string>Netwerkinstellingen</string>
 								<key>pl</key>
@@ -1477,6 +1533,8 @@
 								<string>Настройки сети</string>
 								<key>sv</key>
 								<string>Nätverksinställningar</string>
+								<key>zh-Hans</key>
+								<string>网络设置</string>
 								<key>zh_CN</key>
 								<string>网络设置	</string>
 							</dict>
@@ -1524,7 +1582,7 @@
 							<key>localizations</key>
 							<dict>
 								<key>de</key>
-								<string>Username</string>
+								<string>Benutzername</string>
 								<key>en</key>
 								<string>User name</string>
 								<key>es</key>
@@ -1535,6 +1593,8 @@
 								<string>Nom d'utilisateur</string>
 								<key>it</key>
 								<string>Nome utente</string>
+								<key>nb</key>
+								<string>Brukernavn</string>
 								<key>nl</key>
 								<string>Gebruikersnaam</string>
 								<key>pl</key>
@@ -1543,6 +1603,8 @@
 								<string>Имя пользователя</string>
 								<key>sv</key>
 								<string>Användarnamn	</string>
+								<key>zh-Hans</key>
+								<string>用户名</string>
 								<key>zh_CN</key>
 								<string>用户名</string>
 							</dict>
@@ -1588,6 +1650,9 @@
 		<string>ru</string>
 		<string>sv</string>
 		<string>es</string>
+		<string>zh-Hans</string>
+		<string>nb_NO</string>
+		<string>nb</string>
 	</array>
 	<key>preferences</key>
 	<dict>
diff --git a/welcome-zh_CN.loc/Resources/Classes/BuschJaegerSettingsView/1/BuschJaegerSettingsView.xib b/welcome.ldb/Resources/Classes/BuschJaegerSettingsView/3/BuschJaegerSettingsView.xib
similarity index 98%
rename from welcome-zh_CN.loc/Resources/Classes/BuschJaegerSettingsView/1/BuschJaegerSettingsView.xib
rename to welcome.ldb/Resources/Classes/BuschJaegerSettingsView/3/BuschJaegerSettingsView.xib
index 29aaa6d85..3df4b7abb 100644
--- a/welcome-zh_CN.loc/Resources/Classes/BuschJaegerSettingsView/1/BuschJaegerSettingsView.xib
+++ b/welcome.ldb/Resources/Classes/BuschJaegerSettingsView/3/BuschJaegerSettingsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<int key="IBDocument.SystemTarget">1552</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
@@ -35,7 +35,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="823940774">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">272</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="432106977">
@@ -75,7 +75,9 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<float key="IBUIMinimumFontSize">10</float>
+								<float key="IBUIMinimumFontSize">18</float>
+								<int key="IBUINumberOfLines">3</int>
+								<int key="IBUILineBreakMode">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="398741963">
 									<int key="type">1</int>
 									<double key="pointSize">24</double>
@@ -85,6 +87,7 @@
 									<double key="NSSize">24</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<double key="preferredMaxLayoutWidth">178</double>
 							</object>
 							<object class="IBUIButton" id="931069643">
 								<reference key="NSNextResponder" ref="432106977"/>
@@ -256,6 +259,7 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
+				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="508446153"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -485,7 +489,7 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
+			<real value="1552" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>