diff --git a/Classes/de.lproj/BuschJaegerSettingsView.xib b/Classes/de.lproj/BuschJaegerSettingsView.xib
index 65d3e648c..57f9132a8 100644
--- a/Classes/de.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/de.lproj/BuschJaegerSettingsView.xib
@@ -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">
@@ -149,9 +149,11 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">2</int>
 								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
+								<double key="preferredMaxLayoutWidth">240</double>
 							</object>
 							<object class="IBUIButton" id="463635404">
 								<reference key="NSNextResponder" ref="290853868"/>
@@ -259,6 +261,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">
diff --git a/Classes/es.lproj/BuschJaegerSettingsView.xib b/Classes/es.lproj/BuschJaegerSettingsView.xib
index 887ff0de1..0499b0540 100644
--- a/Classes/es.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/es.lproj/BuschJaegerSettingsView.xib
@@ -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">
@@ -149,9 +149,11 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">2</int>
 								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
+								<double key="preferredMaxLayoutWidth">240</double>
 							</object>
 							<object class="IBUIButton" id="463635404">
 								<reference key="NSNextResponder" ref="290853868"/>
@@ -259,6 +261,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">
diff --git a/Classes/fi.lproj/BuschJaegerSettingsView.xib b/Classes/fi.lproj/BuschJaegerSettingsView.xib
index b2d793766..0a53bd883 100644
--- a/Classes/fi.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/fi.lproj/BuschJaegerSettingsView.xib
@@ -149,9 +149,11 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">2</int>
 								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
+								<double key="preferredMaxLayoutWidth">240</double>
 							</object>
 							<object class="IBUIButton" id="463635404">
 								<reference key="NSNextResponder" ref="290853868"/>
diff --git a/Classes/fr.lproj/BuschJaegerSettingsView.xib b/Classes/fr.lproj/BuschJaegerSettingsView.xib
index f7c3a5037..5e961b8f8 100644
--- a/Classes/fr.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/fr.lproj/BuschJaegerSettingsView.xib
@@ -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">
@@ -149,9 +149,11 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">2</int>
 								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
+								<double key="preferredMaxLayoutWidth">240</double>
 							</object>
 							<object class="IBUIButton" id="463635404">
 								<reference key="NSNextResponder" ref="290853868"/>
@@ -259,6 +261,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">
diff --git a/Classes/it.lproj/BuschJaegerSettingsView.xib b/Classes/it.lproj/BuschJaegerSettingsView.xib
index 646075c38..c2d8ec0de 100644
--- a/Classes/it.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/it.lproj/BuschJaegerSettingsView.xib
@@ -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">
@@ -259,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">
diff --git a/Classes/nb.lproj/BuschJaegerSettingsView.xib b/Classes/nb.lproj/BuschJaegerSettingsView.xib
index afdbff245..127b48785 100644
--- a/Classes/nb.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/nb.lproj/BuschJaegerSettingsView.xib
@@ -154,9 +154,11 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">2</int>
 								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
+								<double key="preferredMaxLayoutWidth">240</double>
 							</object>
 							<object class="IBUIButton" id="463635404">
 								<reference key="NSNextResponder" ref="290853868"/>
diff --git a/Classes/nl.lproj/BuschJaegerSettingsView.xib b/Classes/nl.lproj/BuschJaegerSettingsView.xib
index a2ec6920a..a435a06d5 100644
--- a/Classes/nl.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/nl.lproj/BuschJaegerSettingsView.xib
@@ -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">
@@ -149,9 +149,11 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">2</int>
 								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
+								<double key="preferredMaxLayoutWidth">240</double>
 							</object>
 							<object class="IBUIButton" id="463635404">
 								<reference key="NSNextResponder" ref="290853868"/>
@@ -259,6 +261,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">
diff --git a/Classes/pl.lproj/BuschJaegerSettingsView.xib b/Classes/pl.lproj/BuschJaegerSettingsView.xib
index 369ff90ac..a76ef260d 100644
--- a/Classes/pl.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/pl.lproj/BuschJaegerSettingsView.xib
@@ -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">
@@ -149,9 +149,11 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">2</int>
 								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
+								<double key="preferredMaxLayoutWidth">240</double>
 							</object>
 							<object class="IBUIButton" id="463635404">
 								<reference key="NSNextResponder" ref="290853868"/>
@@ -259,6 +261,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">
diff --git a/Classes/ru.lproj/BuschJaegerSettingsView.xib b/Classes/ru.lproj/BuschJaegerSettingsView.xib
index bbf71b829..846d8686e 100644
--- a/Classes/ru.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/ru.lproj/BuschJaegerSettingsView.xib
@@ -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">
@@ -149,9 +149,11 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">3</int>
 								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
+								<double key="preferredMaxLayoutWidth">240</double>
 							</object>
 							<object class="IBUIButton" id="463635404">
 								<reference key="NSNextResponder" ref="290853868"/>
@@ -259,6 +261,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">
diff --git a/Classes/sv.lproj/BuschJaegerSettingsView.xib b/Classes/sv.lproj/BuschJaegerSettingsView.xib
index 1cdebea81..cc8cbbced 100644
--- a/Classes/sv.lproj/BuschJaegerSettingsView.xib
+++ b/Classes/sv.lproj/BuschJaegerSettingsView.xib
@@ -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">
@@ -68,7 +68,7 @@
 								<int key="IBUIContentMode">7</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">Snabbkonfiguration med QR-kod</string>
+								<string key="IBUIText">Snabb- konfiguration med QR-kod</string>
 								<object class="NSColor" key="IBUITextColor" id="475419136">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
@@ -149,9 +149,11 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">2</int>
 								<int key="IBUITextAlignment">1</int>
 								<reference key="IBUIFontDescription" ref="398741963"/>
 								<reference key="IBUIFont" ref="153354414"/>
+								<double key="preferredMaxLayoutWidth">240</double>
 							</object>
 							<object class="IBUIButton" id="463635404">
 								<reference key="NSNextResponder" ref="290853868"/>
@@ -259,6 +261,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">
diff --git a/Classes/zh-Hans.lproj/BuschJaegerSettingsView.xib b/Classes/zh-Hans.lproj/BuschJaegerSettingsView.xib
index 8ee273780..776a8b2ab 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">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">272</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="432106977">
@@ -259,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">
diff --git a/welcome.ldb/Contents.plist b/welcome.ldb/Contents.plist
index 781dcaafe..f1a15ce27 100644
--- a/welcome.ldb/Contents.plist
+++ b/welcome.ldb/Contents.plist
@@ -819,8 +819,6 @@
 								<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>
@@ -828,11 +826,9 @@
 								<key>ru</key>
 								<string>Быстрая конфигурация с помощью QR-кода</string>
 								<key>sv</key>
-								<string>Snabbkonfiguration med QR-kod</string>
+								<string>Snabb- konfiguration med QR-kod</string>
 								<key>zh-Hans</key>
 								<string>使用 QR 码快速配置</string>
-								<key>zh_CN</key>
-								<string>使用 QR 码快速配置</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -891,8 +887,6 @@
 								<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>
@@ -903,8 +897,6 @@
 								<string>Ladda konfigurationen på nytt</string>
 								<key>zh-Hans</key>
 								<string>重新加载设置</string>
-								<key>zh_CN</key>
-								<string>重新加载设置</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1066,8 +1058,6 @@
 								<string>Version</string>
 								<key>zh-Hans</key>
 								<string>版本</string>
-								<key>zh_CN</key>
-								<string>版本</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1113,8 +1103,6 @@
 								<string>Alltid aktiv</string>
 								<key>zh-Hans</key>
 								<string>总是激活</string>
-								<key>zh_CN</key>
-								<string>总是激活</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1160,8 +1148,6 @@
 								<string>Dölja ljusbrytare</string>
 								<key>zh-Hans</key>
 								<string>隐藏灯开关</string>
-								<key>zh_CN</key>
-								<string>隐藏灯开关</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1207,8 +1193,6 @@
 								<string>Dölja dörröppnare</string>
 								<key>zh-Hans</key>
 								<string>隐藏开门器</string>
-								<key>zh_CN</key>
-								<string>隐藏开门器</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1300,8 +1284,6 @@
 								<string>Signal lägenhet</string>
 								<key>zh-Hans</key>
 								<string>住宅铃声</string>
-								<key>zh_CN</key>
-								<string>住宅铃声</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1347,8 +1329,6 @@
 								<string>Signal byggnad</string>
 								<key>zh-Hans</key>
 								<string>大楼铃声</string>
-								<key>zh_CN</key>
-								<string>大楼铃声</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1394,8 +1374,6 @@
 								<string>Systeminställningar</string>
 								<key>zh-Hans</key>
 								<string>系统设置</string>
-								<key>zh_CN</key>
-								<string>系统设置</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1441,8 +1419,6 @@
 								<string>Lösenord</string>
 								<key>zh-Hans</key>
 								<string>密码</string>
-								<key>zh_CN</key>
-								<string>密码</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1488,8 +1464,6 @@
 								<string>IP-gateway adress</string>
 								<key>zh-Hans</key>
 								<string>IP 网关地址</string>
-								<key>zh_CN</key>
-								<string>IP 网关地址</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1535,8 +1509,6 @@
 								<string>Nätverksinställningar</string>
 								<key>zh-Hans</key>
 								<string>网络设置</string>
-								<key>zh_CN</key>
-								<string>网络设置	</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1605,8 +1577,6 @@
 								<string>Användarnamn	</string>
 								<key>zh-Hans</key>
 								<string>用户名</string>
-								<key>zh_CN</key>
-								<string>用户名</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -1642,7 +1612,6 @@
 		<string>en</string>
 		<string>fr</string>
 		<string>de</string>
-		<string>zh_CN</string>
 		<string>fi</string>
 		<string>it</string>
 		<string>nl</string>
@@ -1651,7 +1620,6 @@
 		<string>sv</string>
 		<string>es</string>
 		<string>zh-Hans</string>
-		<string>nb_NO</string>
 		<string>nb</string>
 	</array>
 	<key>preferences</key>