From: Dirk Brenken <dev@brenken.org>
Date: Mon, 5 Mar 2018 11:26:19 +0000 (+0100)
Subject: Merge pull request #1662 from dibdot/travelmate
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=41b7a90e079b4c652889825370521008ca841a48;hp=898b8a9904f597be38eb7e80201ee958bab65668

Merge pull request #1662 from dibdot/travelmate

luci-app-travelmate: fixes for new QR code template
---

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index dc5ab62cc..aef0a9fa9 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -251,7 +251,7 @@ e9.rmempty = true
 
 e10 = e:option(Flag, "adb_notify", translate("Email Notification"),
 	translate("Send notification emails in case of a processing error or if domain count is &le; 0.<br />")
-	.. translate("Please note: this needs additional 'mstmp' package installation and setup."))
+	.. translate("Please note: this needs additional 'msmtp' package installation and setup."))
 e10.default = e10.disabled
 e10.rmempty = true
 
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index 21b717f36..88adcc892 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -236,7 +236,7 @@ msgstr ""
 "Per favore modifica questo file direttamente in una sessione al terminale."
 
 msgid ""
-"Please note: this needs additional 'mstmp' package installation and setup."
+"Please note: this needs additional 'msmtp' package installation and setup."
 msgstr ""
 
 msgid "Please update your adblock config file to use this package.<br />"
@@ -275,7 +275,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Size of the download queue to handle downloads & list processing in parallel "
+"Size of the download queue to handle downloads &amp; list processing in parallel "
 "(default '4').<br />"
 msgstr ""
 
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index 5929a2bf8..60c5a9a54 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -256,9 +256,9 @@ msgid "Please edit this file directly in a terminal session."
 msgstr "ターミナル セッションで直接このファイルを編集してください。"
 
 msgid ""
-"Please note: this needs additional 'mstmp' package installation and setup."
+"Please note: this needs additional 'msmtp' package installation and setup."
 msgstr ""
-"注意: これには、追加で 'mstmp' のインストールとセットアップが必要です。"
+"注意: これには、追加で 'msmtp' のインストールとセットアップが必要です。"
 
 msgid "Please update your adblock config file to use this package.<br />"
 msgstr ""
@@ -301,7 +301,7 @@ msgstr ""
 "処理エラーまたはドメイン カウントが0以下の場合、メールを送信します。<br />"
 
 msgid ""
-"Size of the download queue to handle downloads & list processing in parallel "
+"Size of the download queue to handle downloads &amp; list processing in parallel "
 "(default '4').<br />"
 msgstr ""
 "ダウンロードの制御とリストの処理を同時並行的に行うダウンロード キューのサイズ"
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index aae656271..7eb6e3ebc 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -229,7 +229,7 @@ msgid "Please edit this file directly in a terminal session."
 msgstr "Por favor edite esse arquivo direto em uma sessão de terminal."
 
 msgid ""
-"Please note: this needs additional 'mstmp' package installation and setup."
+"Please note: this needs additional 'msmtp' package installation and setup."
 msgstr ""
 
 msgid "Please update your adblock config file to use this package.<br />"
@@ -267,7 +267,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Size of the download queue to handle downloads & list processing in parallel "
+"Size of the download queue to handle downloads &amp; list processing in parallel "
 "(default '4').<br />"
 msgstr ""
 
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index 50eb94526..6e80e80b3 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -260,8 +260,8 @@ msgid "Please edit this file directly in a terminal session."
 msgstr "Отредактируйте данный файл, строго в терминале."
 
 msgid ""
-"Please note: this needs additional 'mstmp' package installation and setup."
-msgstr "Внимание: это потребует дополнительной установки пакета 'mstmp'."
+"Please note: this needs additional 'msmtp' package installation and setup."
+msgstr "Внимание: это потребует дополнительной установки пакета 'msmtp'."
 
 msgid "Please update your adblock config file to use this package.<br />"
 msgstr "Обновите config файл Adblock, чтобы использовать этот пакет.<br />"
@@ -303,7 +303,7 @@ msgstr ""
 "&le; 0.<br />"
 
 msgid ""
-"Size of the download queue to handle downloads & list processing in parallel "
+"Size of the download queue to handle downloads &amp; list processing in parallel "
 "(default '4').<br />"
 msgstr ""
 "Значение очереди загрузки для выполнения параллельных загрузок (по умолчанию "
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 4b23e3fdb..d875a69f9 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -218,7 +218,7 @@ msgid "Please edit this file directly in a terminal session."
 msgstr "Vänligen redigera den här filen direkt i en terminal-session."
 
 msgid ""
-"Please note: this needs additional 'mstmp' package installation and setup."
+"Please note: this needs additional 'msmtp' package installation and setup."
 msgstr ""
 
 msgid "Please update your adblock config file to use this package.<br />"
@@ -256,7 +256,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Size of the download queue to handle downloads & list processing in parallel "
+"Size of the download queue to handle downloads &amp; list processing in parallel "
 "(default '4').<br />"
 msgstr ""
 
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 4a65e2d47..5a93f8f07 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -210,7 +210,7 @@ msgid "Please edit this file directly in a terminal session."
 msgstr ""
 
 msgid ""
-"Please note: this needs additional 'mstmp' package installation and setup."
+"Please note: this needs additional 'msmtp' package installation and setup."
 msgstr ""
 
 msgid "Please update your adblock config file to use this package.<br />"
@@ -248,7 +248,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Size of the download queue to handle downloads & list processing in parallel "
+"Size of the download queue to handle downloads &amp; list processing in parallel "
 "(default '4').<br />"
 msgstr ""
 
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 3dc4fafd3..1d7dc2b19 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -228,7 +228,7 @@ msgid "Please edit this file directly in a terminal session."
 msgstr "请在终端会话中直接编辑此文件。"
 
 msgid ""
-"Please note: this needs additional 'mstmp' package installation and setup."
+"Please note: this needs additional 'msmtp' package installation and setup."
 msgstr ""
 
 msgid "Please update your adblock config file to use this package.<br />"
@@ -266,7 +266,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Size of the download queue to handle downloads & list processing in parallel "
+"Size of the download queue to handle downloads &amp; list processing in parallel "
 "(default '4').<br />"
 msgstr ""
 
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index d668ebdb1..da00842d5 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -228,7 +228,7 @@ msgid "Please edit this file directly in a terminal session."
 msgstr "請在終端會話中直接編輯此檔案。"
 
 msgid ""
-"Please note: this needs additional 'mstmp' package installation and setup."
+"Please note: this needs additional 'msmtp' package installation and setup."
 msgstr ""
 
 msgid "Please update your adblock config file to use this package.<br />"
@@ -266,7 +266,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Size of the download queue to handle downloads & list processing in parallel "
+"Size of the download queue to handle downloads &amp; list processing in parallel "
 "(default '4').<br />"
 msgstr ""
 
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
index 920dc6afb..4b1a070d1 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -93,7 +93,7 @@ function configCheck()
 
 			local trackingNumber = uci:get("mwan3", iface, "track_ip")
 			overview[iface]["tracking"] = 0
-			if #trackingNumber > 0 then
+			if trackingNumber and #trackingNumber > 0 then
 				overview[iface]["tracking"] = #trackingNumber
 				overview[iface]["reliability"] = false
 				local reliabilityNumber = tonumber(uci:get("mwan3", iface, "reliability"))
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
index 6dc3d1274..86b5ac696 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
@@ -15,30 +15,27 @@ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_
 				for ( var iface in status.interfaces)
 				{
 					var state = '';
-					var css = '';
 					switch (status.interfaces[iface].status)
 					{
 						case 'online':
 							state = '<%:Online (tracking active)%>';
-							css = 'wanon';
 							break;
 						case 'notMonitored':
 							state = '<%:Online (tracking off)%>';
-							css = 'wanon';
 							break;
 						case 'offline':
 							state = '<%:Offline%>';
-							css = 'wanoff';
 							break;
 						default:
 							state = '<%:Disabled%>';
-							css = 'wanoff';
 							break;
 					}
 					statusview += String.format(
-						'<span class="%s"><strong>%s</strong><br />%s</span>',
-						css,
-						iface,
+						'<div><strong>Interface: </strong>%s</div>',
+						iface
+					);
+					statusview += String.format(
+						'<div><strong>Status: </strong>%s</div></br></br>',
 						state
 					);
 				}
@@ -53,36 +50,8 @@ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_
 //]]></script>
 
 <fieldset id="interface_field" class="cbi-section">
-	<legend><%:MWAN Interface Live Status%></legend>
-	<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
+	<legend><%:MWAN Interfaces%></legend>
+	<div id="mwan_status_text">
+		<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%>
+	</div>
 </fieldset>
-
-<style type="text/css">
-  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: 1044px;
-  }
-  #mwan_status_text {
-	display: table;
-	font-size: 14px;
-	margin: auto;
-	max-width: 1044px;
-	min-width: 246px;
-	width: 100%;
-  }
-  .wanon {
-	background-color: rgb(144, 240, 144);
-  }
-  .wanoff {
-	background-color: rgb(240, 144, 144);
-  }
-  .wanon, .wanoff {
-	border-radius: 60px;
-	box-shadow: 0px 2px 5px -3px;
-	float: left;
-	margin: 8px 3px 0px 3px;
-	min-height: 30px;
-	min-width: 235px;
-	padding: 5px 10px 8px 10px;
-	text-align: center;
-  }
-</style>
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm
index 21e59a801..cb476967f 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm
@@ -14,98 +14,7 @@
 </ul>
 
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null,
-		function(x, status)
-		{
-			var legend = document.getElementById('diag-rc-legend');
-			var statusDiv = document.getElementById('diag-rc-output');
-			legend.style.display = 'none';
-			if (status.interfaces)
-			{
-				var statusview = '';
-				for ( var iface in status.interfaces)
-				{
-					var state = '';
-					var css = '';
-					switch (status.interfaces[iface].status)
-					{
-						case 'online':
-							state = '<%:Online (tracking active)%>';
-							css = 'wanon';
-							break;
-						case 'notMonitored':
-							state = '<%:Online (tracking off)%>';
-							css = 'wanon';
-							break;
-						case 'offline':
-							state = '<%:Offline%>';
-							css = 'wanoff';
-							break;
-						default:
-							state = '<%:Disabled%>';
-							css = 'wanoff';
-							break;
-					}
-					statusview += String.format(
-						'<span class="%s"><strong>%s</strong><br />%s</span>',
-						css,
-						iface,
-						state
-					);
-				}
-				statusDiv.innerHTML = statusview;
-			}
-			else
-			{
-				statusDiv.innerHTML = '<strong><%:No MWAN interfaces found%></strong>';
-			}
-		}
-	);
-//]]></script>
 
-<div class="cbi-map">
-	<h2 name="content"><%:MWAN Status - Interface%></h2>
-	<%if not require("luci.sys").init.enabled("mwan3") then%>
-	<div><strong><%:INFO: MWAN not running%></strong></div>
-	<%end%>
-	<fieldset class="cbi-section">
-		<legend id="diag-rc-legend"><%:Collecting data...%></legend>
-		<span id="diag-rc-output">
-			<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" />
-		</span>
-	</fieldset>
-</div>
-
-<style type="text/css">
-  #mwan_status_text {
-	display: table;
-	font-size: 14px;
-	margin: auto;
-	max-width: 1044px;
-	min-width: 246px;
-	width: 100%;
-  }
-  .wanon {
-	background-color: rgb(144, 240, 144);
-  }
-  .wanoff {
-	background-color: rgb(240, 144, 144);
-  }
-  .wanon, .wanoff {
-	border-radius: 60px;
-	box-shadow: 0px 2px 5px -3px;
-	float: left;
-	margin: 8px 3px 0px 3px;
-	min-height: 30px;
-	min-width: 235px;
-	padding: 5px 10px 8px 10px;
-	text-align: center;
-  }
-  #mwan_statuslog_text {
-	padding: 20px;
-	text-align: left;
-  }
-</style>
+<%+mwan/overview_status_interface%>
 
 <%+footer%>
diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po
index 56e3badab..30f34ef30 100644
--- a/applications/luci-app-travelmate/po/ja/travelmate.po
+++ b/applications/luci-app-travelmate/po/ja/travelmate.po
@@ -7,11 +7,14 @@ msgstr ""
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.5\n"
+"X-Generator: Poedit 2.0.6\n"
 "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Language: ja\n"
 
+msgid "AP QR-Codes"
+msgstr "AP QR-コード"
+
 msgid "Actions"
 msgstr "操作"
 
@@ -43,6 +46,16 @@ msgstr "BSSID"
 msgid "Back to overview"
 msgstr "概要へ戻る"
 
+msgid "Captive Portal Detection"
+msgstr "キャプティブポータル検知"
+
+msgid ""
+"Check the internet availability, log captive portal redirections and keep "
+"the uplink connection 'alive'."
+msgstr ""
+"インターネットの利用可否を確認し、キャプティブポータル リダイレクトを記録して"
+"アップリンク接続を 'alive' として保持します。"
+
 msgid "Cipher"
 msgstr "暗号化方式"
 
@@ -135,13 +148,18 @@ msgid "Force a manual uplink rescan / reconnect in 'trigger' mode."
 msgstr ""
 "'trigger' モード時に、手動でアップリンクの再スキャンと再接続を行います。"
 
-msgid "How long should travelmate wait for a successful wlan interface reload."
+msgid ""
+"Here you'll find the QR codes from all of your configured Access Points. It "
+"allows you to connect your Android or iOS devices to your router's WiFi "
+"using the QR code shown below."
 msgstr ""
-"無線LAN インターフェースのリロードが成功するまでの、Travelmate の待機時間で"
-"す。"
+"ここには、構成済みの全アクセスポイントの QR コードを表示しています。以下の "
+"QR コードを使用して、 Android または iOS デバイスをルータの WiFi に接続するこ"
+"とができます。"
 
-msgid "How many times should travelmate try to connect to an Uplink."
-msgstr "Travelmate がアップリンクへの接続を試行する回数です。"
+msgid ""
+"How long should travelmate wait for a successful wlan uplink connection."
+msgstr "Travelmate が無線アップリンクへの接続成功を待つ時間です。"
 
 msgid "Identity"
 msgstr "ID"
@@ -171,6 +189,13 @@ msgstr "最終実行日時"
 msgid "Manual Rescan"
 msgstr "手動再スキャン"
 
+msgid ""
+"Minimum signal quality threshold as percent for conditional uplink (dis-) "
+"connections."
+msgstr ""
+"条件付きアップリンク接続（または切断）のための、シグナル品質閾値の下限（%）で"
+"す。"
+
 msgid "Move down"
 msgstr "下へ"
 
@@ -233,6 +258,9 @@ msgstr "再スキャン"
 msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
 msgstr "Travelmate が指定された無線に接続するよう制御します。（例: 'radio0'）"
 
+msgid "Retry limit to connect to an uplink."
+msgstr "アップリンクへの接続を試行する回数です。"
+
 msgid "Runtime Information"
 msgstr "実行情報"
 
@@ -248,6 +276,9 @@ msgstr "保存"
 msgid "Scan"
 msgstr "スキャン:"
 
+msgid "Signal Quality Threshold"
+msgstr "シグナル品質閾値"
+
 msgid "Signal strength"
 msgstr "信号強度"
 
@@ -298,24 +329,20 @@ msgstr ""
 msgid "Timeout in seconds between retries in 'automatic' mode."
 msgstr "'automatic' モード時に接続を確認または再試行する間隔（秒）です。"
 
-msgid "To disable this feature set it to '0' which means unlimited retries."
-msgstr ""
-"この機能を無効にして接続の再試行を無制限にする場合、 '0' を設定します。"
-
 msgid "Travelmate"
 msgstr "Travelmate"
 
 msgid "Travelmate Logfile"
 msgstr "Travelmate ログファイル"
 
-msgid "Travelmate Status"
-msgstr "Travelmate ステータス"
+msgid "Travelmate Status (Quality)"
+msgstr "Travelmate ステータス（品質）"
 
 msgid "Travelmate Version"
 msgstr "Travelmate バージョン"
 
-msgid "Trigger delay"
-msgstr "トリガー遅延"
+msgid "Trigger Delay"
+msgstr "トリガ遅延"
 
 msgid "Unknown"
 msgstr "不明"
@@ -365,20 +392,8 @@ msgstr ""
 "ファイアウォールの wan ゾーンに追加します。このステップは、一度だけ実行される"
 "必要があります。"
 
-msgid "connected"
-msgstr "接続済"
-
-msgid "error"
-msgstr "エラー"
-
 msgid "hidden"
 msgstr "（不明）"
 
 msgid "n/a"
 msgstr "利用不可"
-
-msgid "not connected"
-msgstr "未接続"
-
-msgid "running"
-msgstr "実行中"
diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po
index cf17b024e..7cb6ac061 100644
--- a/applications/luci-app-travelmate/po/pt-br/travelmate.po
+++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po
@@ -12,6 +12,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Language: pt_BR\n"
 
+msgid "AP QR-Codes"
+msgstr ""
+
 msgid "Actions"
 msgstr ""
 
@@ -43,6 +46,14 @@ msgstr ""
 msgid "Back to overview"
 msgstr ""
 
+msgid "Captive Portal Detection"
+msgstr ""
+
+msgid ""
+"Check the internet availability, log captive portal redirections and keep "
+"the uplink connection 'alive'."
+msgstr ""
+
 msgid "Cipher"
 msgstr ""
 
@@ -129,10 +140,14 @@ msgstr ""
 msgid "Force a manual uplink rescan / reconnect in 'trigger' mode."
 msgstr ""
 
-msgid "How long should travelmate wait for a successful wlan interface reload."
+msgid ""
+"Here you'll find the QR codes from all of your configured Access Points. It "
+"allows you to connect your Android or iOS devices to your router's WiFi "
+"using the QR code shown below."
 msgstr ""
 
-msgid "How many times should travelmate try to connect to an Uplink."
+msgid ""
+"How long should travelmate wait for a successful wlan uplink connection."
 msgstr ""
 
 msgid "Identity"
@@ -161,6 +176,11 @@ msgstr ""
 msgid "Manual Rescan"
 msgstr ""
 
+msgid ""
+"Minimum signal quality threshold as percent for conditional uplink (dis-) "
+"connections."
+msgstr ""
+
 msgid "Move down"
 msgstr ""
 
@@ -219,6 +239,9 @@ msgstr ""
 msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
 msgstr ""
 
+msgid "Retry limit to connect to an uplink."
+msgstr ""
+
 msgid "Runtime Information"
 msgstr ""
 
@@ -234,6 +257,9 @@ msgstr ""
 msgid "Scan"
 msgstr ""
 
+msgid "Signal Quality Threshold"
+msgstr ""
+
 msgid "Signal strength"
 msgstr ""
 
@@ -274,22 +300,19 @@ msgstr ""
 msgid "Timeout in seconds between retries in 'automatic' mode."
 msgstr ""
 
-msgid "To disable this feature set it to '0' which means unlimited retries."
-msgstr ""
-
 msgid "Travelmate"
 msgstr "Travelmate"
 
 msgid "Travelmate Logfile"
 msgstr ""
 
-msgid "Travelmate Status"
+msgid "Travelmate Status (Quality)"
 msgstr ""
 
 msgid "Travelmate Version"
 msgstr ""
 
-msgid "Trigger delay"
+msgid "Trigger Delay"
 msgstr ""
 
 msgid "Unknown"
@@ -338,24 +361,12 @@ msgid ""
 "add it to the wan zone of the firewall. This step has only to be done once."
 msgstr ""
 
-msgid "connected"
-msgstr ""
-
-msgid "error"
-msgstr ""
-
 msgid "hidden"
 msgstr ""
 
 msgid "n/a"
 msgstr ""
 
-msgid "not connected"
-msgstr ""
-
-msgid "running"
-msgstr ""
-
 #~ msgid ""
 #~ "Brief advice: Create a wwan interface, configure it to use dhcp and add "
 #~ "it to the wan zone in firewall. Create the wifi interfaces to be used "
diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po
index fe0e47647..0b04e2783 100644
--- a/applications/luci-app-travelmate/po/ru/travelmate.po
+++ b/applications/luci-app-travelmate/po/ru/travelmate.po
@@ -15,6 +15,9 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
+msgid "AP QR-Codes"
+msgstr ""
+
 msgid "Actions"
 msgstr "Действия"
 
@@ -46,6 +49,14 @@ msgstr "BSSID"
 msgid "Back to overview"
 msgstr "Назад в меню"
 
+msgid "Captive Portal Detection"
+msgstr ""
+
+msgid ""
+"Check the internet availability, log captive portal redirections and keep "
+"the uplink connection 'alive'."
+msgstr ""
+
 msgid "Cipher"
 msgstr "Алгоритм шифрования"
 
@@ -138,13 +149,15 @@ msgstr ""
 "Принудительно выполнить повторное сканирование/повторное подключение внешних "
 "сетей в режиме 'ручной'."
 
-msgid "How long should travelmate wait for a successful wlan interface reload."
+msgid ""
+"Here you'll find the QR codes from all of your configured Access Points. It "
+"allows you to connect your Android or iOS devices to your router's WiFi "
+"using the QR code shown below."
 msgstr ""
-"Временная задержка необходима TravelMate для полной перезагрузки wlan "
-"интерфейса."
 
-msgid "How many times should travelmate try to connect to an Uplink."
-msgstr "Сколько раз TravelMate должен пытаться подключиться к сети. "
+msgid ""
+"How long should travelmate wait for a successful wlan uplink connection."
+msgstr ""
 
 msgid "Identity"
 msgstr "Идентификация EAP"
@@ -174,6 +187,11 @@ msgstr "Дата последнего запуска"
 msgid "Manual Rescan"
 msgstr "Поиск сети вручную"
 
+msgid ""
+"Minimum signal quality threshold as percent for conditional uplink (dis-) "
+"connections."
+msgstr ""
+
 msgid "Move down"
 msgstr "Переместить вниз"
 
@@ -238,6 +256,9 @@ msgstr "Пересканировать"
 msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
 msgstr "Выделить TravelMate-у конкретное Wi-Fi устройство, например 'radio0'."
 
+msgid "Retry limit to connect to an uplink."
+msgstr ""
+
 msgid "Runtime Information"
 msgstr "Информация о состоянии"
 
@@ -253,6 +274,9 @@ msgstr "Сохранить"
 msgid "Scan"
 msgstr "Поиск"
 
+msgid "Signal Quality Threshold"
+msgstr ""
+
 msgid "Signal strength"
 msgstr "Мощность сигнала"
 
@@ -305,25 +329,20 @@ msgstr ""
 "Время ожидания в секундах между повторными попытками соединения в режиме "
 "'автоматически'."
 
-msgid "To disable this feature set it to '0' which means unlimited retries."
-msgstr ""
-"<br />Чтобы отключить эту функцию, установите значение '0', что означает "
-"неограниченное количество попыток."
-
 msgid "Travelmate"
 msgstr "TravelMate"
 
 msgid "Travelmate Logfile"
 msgstr "Системный журнал TravelMate"
 
-msgid "Travelmate Status"
-msgstr "Состояние Travelmate"
+msgid "Travelmate Status (Quality)"
+msgstr ""
 
 msgid "Travelmate Version"
 msgstr "Версия TravelMate"
 
-msgid "Trigger delay"
-msgstr "Задержка запуска"
+msgid "Trigger Delay"
+msgstr ""
 
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -371,20 +390,40 @@ msgid ""
 "add it to the wan zone of the firewall. This step has only to be done once."
 msgstr "добавить в wan зону межсетевого экрана. Можно сделать только один раз."
 
-msgid "connected"
-msgstr "подключен"
-
-msgid "error"
-msgstr "ошибка"
-
 msgid "hidden"
 msgstr "скрытый"
 
 msgid "n/a"
 msgstr "нет данных"
 
-msgid "not connected"
-msgstr "не подключено"
+#~ msgid ""
+#~ "How long should travelmate wait for a successful wlan interface reload."
+#~ msgstr ""
+#~ "Временная задержка необходима TravelMate для полной перезагрузки wlan "
+#~ "интерфейса."
+
+#~ msgid "How many times should travelmate try to connect to an Uplink."
+#~ msgstr "Сколько раз TravelMate должен пытаться подключиться к сети. "
+
+#~ msgid "To disable this feature set it to '0' which means unlimited retries."
+#~ msgstr ""
+#~ "<br />Чтобы отключить эту функцию, установите значение '0', что означает "
+#~ "неограниченное количество попыток."
+
+#~ msgid "Travelmate Status"
+#~ msgstr "Состояние Travelmate"
+
+#~ msgid "Trigger delay"
+#~ msgstr "Задержка запуска"
+
+#~ msgid "connected"
+#~ msgstr "подключен"
+
+#~ msgid "error"
+#~ msgstr "ошибка"
+
+#~ msgid "not connected"
+#~ msgstr "не подключено"
 
-msgid "running"
-msgstr "работает"
+#~ msgid "running"
+#~ msgstr "работает"
diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot
index aeefa491d..e27c61a9d 100644
--- a/applications/luci-app-travelmate/po/templates/travelmate.pot
+++ b/applications/luci-app-travelmate/po/templates/travelmate.pot
@@ -1,6 +1,9 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
+msgid "AP QR-Codes"
+msgstr ""
+
 msgid "Actions"
 msgstr ""
 
@@ -32,6 +35,14 @@ msgstr ""
 msgid "Back to overview"
 msgstr ""
 
+msgid "Captive Portal Detection"
+msgstr ""
+
+msgid ""
+"Check the internet availability, log captive portal redirections and keep "
+"the uplink connection 'alive'."
+msgstr ""
+
 msgid "Cipher"
 msgstr ""
 
@@ -118,10 +129,14 @@ msgstr ""
 msgid "Force a manual uplink rescan / reconnect in 'trigger' mode."
 msgstr ""
 
-msgid "How long should travelmate wait for a successful wlan interface reload."
+msgid ""
+"Here you'll find the QR codes from all of your configured Access Points. It "
+"allows you to connect your Android or iOS devices to your router's WiFi "
+"using the QR code shown below."
 msgstr ""
 
-msgid "How many times should travelmate try to connect to an Uplink."
+msgid ""
+"How long should travelmate wait for a successful wlan uplink connection."
 msgstr ""
 
 msgid "Identity"
@@ -150,6 +165,11 @@ msgstr ""
 msgid "Manual Rescan"
 msgstr ""
 
+msgid ""
+"Minimum signal quality threshold as percent for conditional uplink (dis-) "
+"connections."
+msgstr ""
+
 msgid "Move down"
 msgstr ""
 
@@ -208,6 +228,9 @@ msgstr ""
 msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
 msgstr ""
 
+msgid "Retry limit to connect to an uplink."
+msgstr ""
+
 msgid "Runtime Information"
 msgstr ""
 
@@ -223,6 +246,9 @@ msgstr ""
 msgid "Scan"
 msgstr ""
 
+msgid "Signal Quality Threshold"
+msgstr ""
+
 msgid "Signal strength"
 msgstr ""
 
@@ -263,22 +289,19 @@ msgstr ""
 msgid "Timeout in seconds between retries in 'automatic' mode."
 msgstr ""
 
-msgid "To disable this feature set it to '0' which means unlimited retries."
-msgstr ""
-
 msgid "Travelmate"
 msgstr ""
 
 msgid "Travelmate Logfile"
 msgstr ""
 
-msgid "Travelmate Status"
+msgid "Travelmate Status (Quality)"
 msgstr ""
 
 msgid "Travelmate Version"
 msgstr ""
 
-msgid "Trigger delay"
+msgid "Trigger Delay"
 msgstr ""
 
 msgid "Unknown"
@@ -327,20 +350,8 @@ msgid ""
 "add it to the wan zone of the firewall. This step has only to be done once."
 msgstr ""
 
-msgid "connected"
-msgstr ""
-
-msgid "error"
-msgstr ""
-
 msgid "hidden"
 msgstr ""
 
 msgid "n/a"
 msgstr ""
-
-msgid "not connected"
-msgstr ""
-
-msgid "running"
-msgstr ""
diff --git a/contrib/package/community-profiles/files/etc/config/profile_potsdam b/contrib/package/community-profiles/files/etc/config/profile_potsdam
index 9bdb60323..6a8f1f14b 100644
--- a/contrib/package/community-profiles/files/etc/config/profile_potsdam
+++ b/contrib/package/community-profiles/files/etc/config/profile_potsdam
@@ -1,7 +1,7 @@
 config 'community' 'profile'
 	option 'name' 'Freifunk Potsdam'
 	option 'homepage' 'http://potsdam.freifunk.net'
-	option 'ssid' 'Freifunk-Potsdam-XXX-YYY'
+	option 'ssid' 'freifunk-potsdam.de'
 	option 'mesh_network' '10.22.0.0/16'
 	option 'splash_network' '192.168.22.0/24'
 	option 'splash_prefix' '24'
diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua
index 9ea8e369d..c8ec5364e 100644
--- a/modules/luci-base/luasrc/model/network.lua
+++ b/modules/luci-base/luasrc/model/network.lua
@@ -543,6 +543,9 @@ end
 function del_network(self, n)
 	local r = _uci:delete("network", n)
 	if r then
+		_uci:delete_all("luci", "ifstate",
+			function(s) return (s.interface == n) end)
+
 		_uci:delete_all("network", "alias",
 			function(s) return (s.interface == n) end)
 
@@ -998,7 +1001,10 @@ function protocol.ip6addrs(self)
 
 	if type(addrs) == "table" then
 		for n, addr in ipairs(addrs) do
-			if type(addr["local-address"]) == "table" then
+			if type(addr["local-address"]) == "table" and
+			   type(addr["local-address"].mask) == "number" and
+			   type(addr["local-address"].address) == "string"
+			then
 				rv[#rv+1] = "%s/%d" %{
 					addr["local-address"].address,
 					addr["local-address"].mask
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 4fc71cefa..8e7a3b066 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -16,6 +16,7 @@ local has_firewall = fs.access("/etc/config/firewall")
 m = Map("network", translate("Interfaces") .. " - " .. arg[1]:upper(), translate("On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."))
 m.redirect = luci.dispatcher.build_url("admin", "network", "network")
 m:chain("wireless")
+m:chain("luci")
 
 if has_firewall then
 	m:chain("firewall")
@@ -27,18 +28,52 @@ fw.init(m.uci)
 
 local net = nw:get_network(arg[1])
 
+local function set_ifstate(name, option, value)
+	local found = false
+
+	m.uci:foreach("luci", "ifstate", function (s)
+		if s.interface == name then
+			m.uci:set("luci", s[".name"], option, value)
+			found = true
+			return false
+		end
+	end)
+
+	if not found then
+		local sid = m.uci:add("luci", "ifstate")
+		m.uci:set("luci", sid, "interface", name)
+		m.uci:set("luci", sid, option, value)
+	end
+
+	m.uci:save("luci")
+end
+
+local function get_ifstate(name, option)
+	local val
+
+	m.uci:foreach("luci", "ifstate", function (s)
+		if s.interface == name then
+			val = m.uci:get("luci", s[".name"], option)
+			return false
+		end
+	end)
+
+	return val
+end
+
 local function backup_ifnames(is_bridge)
-	if not net:is_floating() and not m:get(net:name(), "_orig_ifname") then
+	if not net:is_floating() and not get_ifstate(net:name(), "ifname") then
 		local ifcs = net:get_interfaces() or { net:get_interface() }
 		if ifcs then
 			local _, ifn
 			local ifns = { }
 			for _, ifn in ipairs(ifcs) do
-				ifns[#ifns+1] = ifn:name()
+				local wif = ifn:get_wifinet()
+				ifns[#ifns+1] = wif and wif:id() or ifn:name()
 			end
 			if #ifns > 0 then
-				m:set(net:name(), "_orig_ifname", table.concat(ifns, " "))
-				m:set(net:name(), "_orig_bridge", tostring(net:is_bridge()))
+				set_ifstate(net:name(), "ifname", table.concat(ifns, " "))
+				set_ifstate(net:name(), "bridge", tostring(net:is_bridge()))
 			end
 		end
 	end
@@ -84,10 +119,10 @@ if m:formvalue("cbid.network.%s._switch" % net:name()) then
 		elseif net:is_floating() and not proto:is_floating() then
 			-- if we have backup data, then re-add all orphaned interfaces
 			-- from it and restore the bridge choice
-			local br = (m:get(net:name(), "_orig_bridge") == "true")
+			local br = (get_ifstate(net:name(), "bridge") == "true")
 			local ifn
 			local ifns = { }
-			for ifn in ut.imatch(m:get(net:name(), "_orig_ifname")) do
+			for ifn in ut.imatch(get_ifstate(net:name(), "ifname")) do
 				ifn = nw:get_interface(ifn)
 				if ifn and not ifn:get_network() then
 					proto:add_interface(ifn)
@@ -114,9 +149,7 @@ if m:formvalue("cbid.network.%s._switch" % net:name()) then
 		for k, v in pairs(m:get(net:name())) do
 			if k:sub(1,1) ~= "." and
 			   k ~= "type" and
-			   k ~= "ifname" and
-			   k ~= "_orig_ifname" and
-			   k ~= "_orig_bridge"
+			   k ~= "ifname"
 			then
 				m:del(net:name(), k)
 			end