i18n: sync translations, add location annotatations

Thanks to a recent commit, the translation files will now
have info about locations where the string is used. That
can help is deciding the correct translation, as all contexts
are more easily found.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

5 files changed, 365 insertions, 0 deletions

diff --git a/applications/luci-app-dnscrypt-proxy/po/ja/dnscrypt-proxy.po b/applications/luci-app-dnscrypt-proxy/po/ja/dnscrypt-proxy.po
index e35efa871b..7c2bcd490a 100644
--- a/applications/luci-app-dnscrypt-proxy/po/ja/dnscrypt-proxy.po
+++ b/applications/luci-app-dnscrypt-proxy/po/ja/dnscrypt-proxy.po
@@ -12,25 +12,33 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Language: ja\n"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:139
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:161
 msgid "-------"
 msgstr "（利用不可）"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:17
 msgid "Advanced"
 msgstr "詳細"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:215
 msgid "Alternate Resolver List"
 msgstr "代替 リゾルバ リスト"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:258
 msgid ""
 "Apply DNSCrypt-Proxy specific settings to the Dnsmasq configuration.<br />"
 msgstr "Dnsmasq の構成に、DNSCrypt-Proxy を指定する設定を適用します。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:228
 msgid "Blacklist"
 msgstr "ブラックリスト"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:233
 msgid "Block IPv6"
 msgstr "IPv6 のブロック"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:169
 msgid ""
 "By default the DNSCrypt-Proxy startup will be triggered by ifup events of "
 "'All' available network interfaces.<br />"
@@ -38,9 +46,11 @@ msgstr ""
 "デフォルトでは、 DNSCrypt-Proxy は利用可能な全ネットワーク インターフェース"
 "の ifup イベントによりトリガされ起動します。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:59
 msgid "Configuration of the DNSCrypt-Proxy package."
 msgstr "DNSCrypt-Proxy パッケージの設定です。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:146
 msgid ""
 "Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS "
 "upstream timeouts with multiple DNSCrypt instances.<br />"
@@ -49,60 +59,81 @@ msgstr ""
 "用するため、 'options timeout:1' を含めた '/etc/resolv-crypt.conf' を作成しま"
 "す。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:150
 msgid "Create Config File"
 msgstr "設定ファイルの作成"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:145
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:158
 msgid "Create Custom Config File"
 msgstr "カスタム設定ファイルの作成"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:245
 msgid "DNS Query Logfile"
 msgstr "DNS クエリ ログファイル"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:14
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:58
 msgid "DNSCrypt-Proxy"
 msgstr "DNSCrypt-Proxy"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:37
 msgid "DNSCrypt-Proxy Logfile"
 msgstr "DNSCrypt-Proxy ログファイル"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:26
 msgid "DNSCrypt-Proxy Resolver List"
 msgstr "DNSCrypt-Proxy リゾルバ リスト"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:102
 msgid "Default Resolver List"
 msgstr "デフォルト リゾルバ リスト"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:234
 msgid "Disable IPv6 to speed up DNSCrypt-Proxy."
 msgstr "DNSCrypt-Proxy の高速化のため、IPv6 を無効化します。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:254
 msgid "Dnsmasq Options"
 msgstr "Dnsmasq オプション"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:124
 msgid ""
 "Download the current resolver list from 'github.com/dyne/dnscrypt-proxy'."
 msgstr ""
 "現在のリゾルバ リストを 'github.com/dyne/dnscrypt-proxy' からダウンロードしま"
 "す。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:18
 msgid "Edit DNSCrypt-Proxy Configuration"
 msgstr "DNSCrypt-Proxy 設定の編集"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:19
 msgid "Edit Dnsmasq Configuration"
 msgstr "Dnsmasq 設定の編集"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:20
 msgid "Edit Resolvcrypt Configuration"
 msgstr "Resolvcrypt 設定の編集"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:240
 msgid "Enable Caching to speed up DNSCcrypt-Proxy."
 msgstr "DNSCrypt-Proxy の高速化のため、キャッシュ機能を有効化します。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:220
 msgid "Ephemeral Keys"
 msgstr "一時的なキー"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:114
 msgid "File Checksum"
 msgstr "ファイル チェックサム"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:106
 msgid "File Date"
 msgstr "ファイル日付"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:60
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:147
 msgid ""
 "For further information <a href=\"%s\" target=\"_blank\">see the wiki "
 "online</a>"
@@ -110,31 +141,41 @@ msgstr ""
 "詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン Wiki</a> を確認して"
 "ください。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:97
 msgid "General Options"
 msgstr "全般オプション"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:189
 msgid "IP Address"
 msgstr "IP アドレス"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:221
 msgid "Improve privacy by using an ephemeral public key for each query."
 msgstr ""
 "クエリ毎に一時的な公開鍵を使用することにより、プライバシーを向上します。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:9
 msgid "Input file not found, please check your configuration."
 msgstr "入力ファイルが見つかりません。設定を確認してください。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:185
 msgid "Instance Options"
 msgstr "インスタンス オプション"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:239
 msgid "Local Cache"
 msgstr "ローカル キャッシュ"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:229
 msgid ""
 "Local blacklists allow you to block abuse sites by domains or ip addresses."
 msgstr ""
 "ローカル ブラックリストは、不正なサイトをドメイン名または IP アドレスによって"
 "ブロックすることが可能です。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:246
 msgid ""
 "Log the received DNS queries to a file, so you can watch in real-time what "
 "is happening on the network."
@@ -142,6 +183,7 @@ msgstr ""
 "受信した DNS クエリをファイルに記録します。これにより、ネットワークで何が起き"
 "ているかをリアルタイムに把握することが可能です。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:201
 msgid ""
 "Name of the remote DNS service for resolving queries incl. Location, DNSSEC- "
 "and NOLOG-Flag."
@@ -149,19 +191,24 @@ msgstr ""
 "クエリの名前解決を行う、ロケーション, DNSSECの有無, NOLOG フラグを含めたリ"
 "モート DNS サービスの名前です。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:137
 msgid "No SSL support available.<br />"
 msgstr "利用可能な SSL サポートがありません。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:21
 msgid "No default resolver list and no SSL support available.<br />"
 msgstr ""
 "デフォルトのリゾルバ リストと、利用可能な SSL サポートがありません。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:15
 msgid "Overview"
 msgstr "概要"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:160
 msgid "Please edit the file manually in the 'Advanced' section."
 msgstr "'詳細' タブで手動でファイルを編集してください。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:138
 msgid ""
 "Please install a 'libustream-ssl' library to download the current resolver "
 "list from 'github.com/dyne/dnscrypt-proxy'."
@@ -169,6 +216,7 @@ msgstr ""
 "現在のリゾルバ リストを 'github.com/dyne/dnscrypt-proxy' からダウンロードする"
 "ために、 'libustream-ssl' ライブラリをインストールしてください。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:22
 msgid ""
 "Please install a resolver list to '/usr/share/dnscrypt-proxy/dnscrypt-"
 "resolvers.csv' to use this package."
@@ -176,6 +224,7 @@ msgstr ""
 "このパッケージを利用するには、リゾルバ リストを '/usr/share/dnscrypt-proxy/"
 "dnscrypt-resolvers.csv' にインストールしてください。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:259
 msgid ""
 "Please note: This may change the values for 'noresolv', 'resolvfile', "
 "'allservers' and the list 'server' settings."
@@ -183,33 +232,46 @@ msgstr ""
 "注: これは、 'noresolv' および 'resolvfile', 'allservers', 'list server' の設"
 "定値を変更する場合があります。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:194
 msgid "Port"
 msgstr "ポート"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:125
 msgid "Refresh List"
 msgstr "リストのリフレッシュ"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:123
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:136
 msgid "Refresh Resolver List"
 msgstr "リゾルバ リストのリフレッシュ"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:200
 msgid "Resolver (LOC/SEC/NOLOG)"
 msgstr "リゾルバ（LOC/SEC/NOLOG）"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:17
 msgid "Save"
 msgstr "保存"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:216
 msgid "Specify a non-default Resolver List."
 msgstr "デフォルトとは異なるリゾルバ リストを設定します。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:168
 msgid "Startup Trigger"
 msgstr "スタートアップ トリガ"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:159
 msgid "The config file '/etc/resolv-crypt.conf' already exist.<br />"
 msgstr "設定ファイル '/etc/resolv-crypt.conf' は既に存在しています。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:195
 msgid "The listening port for DNS queries."
 msgstr "DNS クエリを待ち受けるポートです。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:190
 msgid ""
 "The local IPv4 or IPv6 address. The latter one should be specified within "
 "brackets, e.g. '[::1]'."
@@ -217,6 +279,7 @@ msgstr ""
 "ローカルの IPv4 または IPv6 アドレスです。 IPv6 アドレスの場合、ブラケット "
 "\"[ ]\" を含めて記述される必要があります（例: '[::1]'）。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:230
 msgid ""
 "The value for this property is the blocklist type and path to the file, e."
 "g.'domains:/path/to/dbl.txt' or 'ips:/path/to/ipbl.txt'."
@@ -225,6 +288,7 @@ msgstr ""
 "です。（例: 'domains:/path/to/domainlist.txt' または 'ips:/path/to/iplist."
 "txt'）"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main DNSCrypt-Proxy "
 "configuration file (/etc/config/dnscrypt-proxy)."
@@ -232,6 +296,7 @@ msgstr ""
 "このフォームでは、メインの DNSCrypt-Proxy 設定ファイル (/etc/config/dnscrypt-"
 "proxy) の内容を変更することができます。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main Dnsmasq configuration "
 "file (/etc/config/dhcp)."
@@ -239,6 +304,7 @@ msgstr ""
 "このフォームでは、メインの Dnsmasq 設定ファイル (/etc/config/dhcp) の内容を変"
 "更することができます。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the resolv-crypt configuration "
 "file (/etc/resolv-crypt.conf)."
@@ -246,10 +312,12 @@ msgstr ""
 "このフォームでは、 resolv-crypt 設定ファイル（/etc/resolv-crypt.conf）の内容"
 "を変更することができます。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/view_reslist.htm:10
 msgid "This form shows the content of the current DNSCrypt Resolver List."
 msgstr ""
 "このフォームには、現在の DNSCrypt リゾルバ リストの内容が表示されます。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/logread.htm:10
 msgid ""
 "This form shows the syslog output, pre-filtered for DNSCrypt-Proxy related "
 "messages only."
@@ -257,6 +325,7 @@ msgstr ""
 "このフォームには、システムログ内の DNSCrypt-Proxy に関連するメッセージのみが"
 "表示されます。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:222
 msgid ""
 "This option requires extra CPU cycles and is useless with most DNSCrypt "
 "server."
@@ -264,6 +333,7 @@ msgstr ""
 "このオプションは、通常よりも CPU リソースを多く使用するほか、ほとんどの "
 "DNSCrypt サーバーでは不要なものです。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:170
 msgid ""
 "To restrict the trigger, select only the relevant network interface. Usually "
 "the 'wan' interface should work for most users."
@@ -271,11 +341,14 @@ msgstr ""
 "トリガを限定するには、適切なインターフェースを選択してください。通常、 'wan' "
 "インターフェースがほとんどのユーザーに適しています。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:257
 msgid "Transfer Options To Dnsmasq"
 msgstr "Dnsmasq の転送オプション"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:16
 msgid "View Logfile"
 msgstr "ログファイルの確認"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:21
 msgid "View Resolver List"
 msgstr "リゾルバ リストの確認"
diff --git a/applications/luci-app-dnscrypt-proxy/po/ru/dnscrypt-proxy.po b/applications/luci-app-dnscrypt-proxy/po/ru/dnscrypt-proxy.po
index 1b5e364dde..2785e48273 100644
--- a/applications/luci-app-dnscrypt-proxy/po/ru/dnscrypt-proxy.po
+++ b/applications/luci-app-dnscrypt-proxy/po/ru/dnscrypt-proxy.po
@@ -15,36 +15,46 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:139
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:161
 msgid "-------"
 msgstr "-------"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:17
 msgid "Advanced"
 msgstr "Дополнительно"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:215
 msgid "Alternate Resolver List"
 msgstr "Альтернативный список разрешенных серверов"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:258
 msgid ""
 "Apply DNSCrypt-Proxy specific settings to the Dnsmasq configuration.<br />"
 msgstr ""
 "Применить специальные настройки DNSCrypt-Proxy для Dnsmasq config файла.<br /"
 ">"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:228
 msgid "Blacklist"
 msgstr "Чёрный список"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:233
 msgid "Block IPv6"
 msgstr "Блокировать IPv6"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:169
 msgid ""
 "By default the DNSCrypt-Proxy startup will be triggered by ifup events of "
 "'All' available network interfaces.<br />"
 msgstr ""
 "По дефолту DNSCrypt-Proxy стартует на всех доступных интерфейсах 'All'.<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:59
 msgid "Configuration of the DNSCrypt-Proxy package."
 msgstr "Настройка DNSCrypt-Proxy. "
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:146
 msgid ""
 "Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS "
 "upstream timeouts with multiple DNSCrypt instances.<br />"
@@ -53,59 +63,80 @@ msgstr ""
 "для уменьшения времени ожидания ответов DNS серверов внешней сети с "
 "многократной обработкой запросов DNSCrypt-ом.<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:150
 msgid "Create Config File"
 msgstr "Создать сonfig файл"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:145
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:158
 msgid "Create Custom Config File"
 msgstr "Создать config"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:245
 msgid "DNS Query Logfile"
 msgstr "Файл системного журнала запроса DNS"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:14
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:58
 msgid "DNSCrypt-Proxy"
 msgstr "DNSCrypt-Proxy"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:37
 msgid "DNSCrypt-Proxy Logfile"
 msgstr "Файл системного журнала DNSCrypt-Proxy"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:26
 msgid "DNSCrypt-Proxy Resolver List"
 msgstr "DNSCrypt-Proxy список разрешенных серверов"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:102
 msgid "Default Resolver List"
 msgstr "Дефолтный список разрешенных серверов"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:234
 msgid "Disable IPv6 to speed up DNSCrypt-Proxy."
 msgstr "Отключить IPv6 для DNSCrypt-Proxy."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:254
 msgid "Dnsmasq Options"
 msgstr "Настройка Dnsmasq"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:124
 msgid ""
 "Download the current resolver list from 'github.com/dyne/dnscrypt-proxy'."
 msgstr ""
 "Загрузить текущий список клиентов  из 'github.com/dyne/dnscrypt-proxy'."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:18
 msgid "Edit DNSCrypt-Proxy Configuration"
 msgstr "Настройка config файла DNSCrypt-Proxy"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:19
 msgid "Edit Dnsmasq Configuration"
 msgstr "Настройка config файла Dnsmasq"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:20
 msgid "Edit Resolvcrypt Configuration"
 msgstr "Настройка config файла Resolvcrypt"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:240
 msgid "Enable Caching to speed up DNSCcrypt-Proxy."
 msgstr "Включить кэширование для ускорения DNSCcrypt-Proxy."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:220
 msgid "Ephemeral Keys"
 msgstr "Эфемерные ключи"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:114
 msgid "File Checksum"
 msgstr "Контрольная сумма файла"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:106
 msgid "File Date"
 msgstr "Дата и время<br />создания файла"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:60
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:147
 msgid ""
 "For further information <a href=\"%s\" target=\"_blank\">see the wiki "
 "online</a>"
@@ -113,32 +144,42 @@ msgstr ""
 "Для более подробной информации <a href=\"%s\" target=\"_blank\">обратитесь к "
 "wiki онлайн</a>."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:97
 msgid "General Options"
 msgstr "Основные настройки"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:189
 msgid "IP Address"
 msgstr "IP-Адрес"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:221
 msgid "Improve privacy by using an ephemeral public key for each query."
 msgstr ""
 "Улучшить безопасность, используя эфемерный Публичный ключ для каждого "
 "запроса."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:9
 msgid "Input file not found, please check your configuration."
 msgstr "Config файл не найден, настройте config файл."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:185
 msgid "Instance Options"
 msgstr "Дополнительные настройки"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:239
 msgid "Local Cache"
 msgstr "Локальный кэш"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:229
 msgid ""
 "Local blacklists allow you to block abuse sites by domains or ip addresses."
 msgstr ""
 "Локальные Черные списки, позволяют блокировать сайты по их доменам или IP-"
 "адресам."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:246
 msgid ""
 "Log the received DNS queries to a file, so you can watch in real-time what "
 "is happening on the network."
@@ -146,6 +187,7 @@ msgstr ""
 "Записывайте в журнал полученные запросы DNS. Таким образом, Вы сможете "
 "наблюдать в режиме реального времени, что происходит в сети."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:201
 msgid ""
 "Name of the remote DNS service for resolving queries incl. Location, DNSSEC- "
 "and NOLOG-Flag."
@@ -153,18 +195,23 @@ msgstr ""
 "Имя удаленного сервера DNS для разрешения запросов к нему.<br /"
 ">Расположение, DNSSEC- и NOLOG-Flag (LOC/SEC/NOLOG)."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:137
 msgid "No SSL support available.<br />"
 msgstr "Отсутствует поддержка SSL.<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:21
 msgid "No default resolver list and no SSL support available.<br />"
 msgstr "Отсутствует список разрешенных серверов и не поддерживается SSL.<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:15
 msgid "Overview"
 msgstr "Главное меню"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:160
 msgid "Please edit the file manually in the 'Advanced' section."
 msgstr "Отредактируйте файл вручную в разделе 'Дополнительно'."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:138
 msgid ""
 "Please install a 'libustream-ssl' library to download the current resolver "
 "list from 'github.com/dyne/dnscrypt-proxy'."
@@ -172,6 +219,7 @@ msgstr ""
 "Установите библиотеку 'libustream-ssl', чтобы скачать текущий список "
 "клиентов с адреса 'github.com/dyne/dnscrypt-proxy'."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:22
 msgid ""
 "Please install a resolver list to '/usr/share/dnscrypt-proxy/dnscrypt-"
 "resolvers.csv' to use this package."
@@ -179,6 +227,7 @@ msgstr ""
 "Установите список разрешенных серверов в /usr/share/dnscrypt-proxy/dnscrypt-"
 "resolvers.csv для использования данного сервиса."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:259
 msgid ""
 "Please note: This may change the values for 'noresolv', 'resolvfile', "
 "'allservers' and the list 'server' settings."
@@ -186,39 +235,53 @@ msgstr ""
 "Примечание: Этот режим, может изменить значения для 'noresolv', "
 "'resolvfile', 'allservers' и параметры настройки списка 'серверов'."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:194
 msgid "Port"
 msgstr "Порт"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:125
 msgid "Refresh List"
 msgstr "Обновить список"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:123
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:136
 msgid "Refresh Resolver List"
 msgstr "Обновить список разрешенных серверов"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:200
 msgid "Resolver (LOC/SEC/NOLOG)"
 msgstr "Разрешено<br />(LOC/SEC/NOLOG)"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:17
 msgid "Save"
 msgstr "Сохранить"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:216
 msgid "Specify a non-default Resolver List."
 msgstr "Специальный не дефолтный список разрешенных серверов."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:168
 msgid "Startup Trigger"
 msgstr "Назначить"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:159
 msgid "The config file '/etc/resolv-crypt.conf' already exist.<br />"
 msgstr "Config файл /etc/resolv-crypt.conf уже существует.<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:195
 msgid "The listening port for DNS queries."
 msgstr "Прослушивание порта для DNS запросов."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:190
 msgid ""
 "The local IPv4 or IPv6 address. The latter one should be specified within "
 "brackets, e.g. '[::1]'."
 msgstr ""
 "Локальные IPv4 или IPv6 адреса. Заключить в скобки, как образец '[::1]'."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:230
 msgid ""
 "The value for this property is the blocklist type and path to the file, e."
 "g.'domains:/path/to/dbl.txt' or 'ips:/path/to/ipbl.txt'."
@@ -227,6 +290,7 @@ msgstr ""
 "его списка и указав путь к файлу соответствующим образом 'domains:/path/to/"
 "dbl.txt' или 'ips:/path/to/ipbl.txt'."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main DNSCrypt-Proxy "
 "configuration file (/etc/config/dnscrypt-proxy)."
@@ -234,6 +298,7 @@ msgstr ""
 "Страница позволяет изменять содержимое config файла DNSCrypt-Proxy (/etc/"
 "config/dnscrypt-proxy)."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main Dnsmasq configuration "
 "file (/etc/config/dhcp)."
@@ -241,6 +306,7 @@ msgstr ""
 "Страница позволяет изменять содержимое config файла Dnsmasq (/etc/config/"
 "dhcp)."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the resolv-crypt configuration "
 "file (/etc/resolv-crypt.conf)."
@@ -248,10 +314,12 @@ msgstr ""
 "Страница позволяет изменять содержимое config файла resolv-crypt (/etc/"
 "resolv-crypt.conf)."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/view_reslist.htm:10
 msgid "This form shows the content of the current DNSCrypt Resolver List."
 msgstr ""
 "Страница демонстрирует содержимое DNSCrypt списка разрешенных серверов."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/logread.htm:10
 msgid ""
 "This form shows the syslog output, pre-filtered for DNSCrypt-Proxy related "
 "messages only."
@@ -259,12 +327,14 @@ msgstr ""
 "Страница показывает вывод системного журнала, предварительно фильтруемый "
 "только для DNSCrypt-Proxy."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:222
 msgid ""
 "This option requires extra CPU cycles and is useless with most DNSCrypt "
 "server."
 msgstr ""
 "Этот режим нагружает CPU и большинством DNSCrypt серверов не поддерживается."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:170
 msgid ""
 "To restrict the trigger, select only the relevant network interface. Usually "
 "the 'wan' interface should work for most users."
@@ -272,11 +342,14 @@ msgstr ""
 "Выберите только соответствующий сетевой интерфейс.<br />Обычно интерфейса "
 "'wan', достаточно для большинства пользователей."
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:257
 msgid "Transfer Options To Dnsmasq"
 msgstr "Режим передачи Dnsmasq-у"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:16
 msgid "View Logfile"
 msgstr "Показать системный журнал"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:21
 msgid "View Resolver List"
 msgstr "Список разрешенных серверов"
diff --git a/applications/luci-app-dnscrypt-proxy/po/templates/dnscrypt-proxy.pot b/applications/luci-app-dnscrypt-proxy/po/templates/dnscrypt-proxy.pot
index 8302f48ec2..f31cf1ecc7 100644
--- a/applications/luci-app-dnscrypt-proxy/po/templates/dnscrypt-proxy.pot
+++ b/applications/luci-app-dnscrypt-proxy/po/templates/dnscrypt-proxy.pot
@@ -1,229 +1,302 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:139
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:161
 msgid "-------"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:17
 msgid "Advanced"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:215
 msgid "Alternate Resolver List"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:258
 msgid ""
 "Apply DNSCrypt-Proxy specific settings to the Dnsmasq configuration.<br />"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:228
 msgid "Blacklist"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:233
 msgid "Block IPv6"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:169
 msgid ""
 "By default the DNSCrypt-Proxy startup will be triggered by ifup events of "
 "'All' available network interfaces.<br />"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:59
 msgid "Configuration of the DNSCrypt-Proxy package."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:146
 msgid ""
 "Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS "
 "upstream timeouts with multiple DNSCrypt instances.<br />"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:150
 msgid "Create Config File"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:145
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:158
 msgid "Create Custom Config File"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:245
 msgid "DNS Query Logfile"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:14
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:58
 msgid "DNSCrypt-Proxy"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:37
 msgid "DNSCrypt-Proxy Logfile"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:26
 msgid "DNSCrypt-Proxy Resolver List"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:102
 msgid "Default Resolver List"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:234
 msgid "Disable IPv6 to speed up DNSCrypt-Proxy."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:254
 msgid "Dnsmasq Options"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:124
 msgid ""
 "Download the current resolver list from 'github.com/dyne/dnscrypt-proxy'."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:18
 msgid "Edit DNSCrypt-Proxy Configuration"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:19
 msgid "Edit Dnsmasq Configuration"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:20
 msgid "Edit Resolvcrypt Configuration"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:240
 msgid "Enable Caching to speed up DNSCcrypt-Proxy."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:220
 msgid "Ephemeral Keys"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:114
 msgid "File Checksum"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:106
 msgid "File Date"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:60
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:147
 msgid ""
 "For further information <a href=\"%s\" target=\"_blank\">see the wiki "
 "online</a>"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:97
 msgid "General Options"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:189
 msgid "IP Address"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:221
 msgid "Improve privacy by using an ephemeral public key for each query."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:9
 msgid "Input file not found, please check your configuration."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:185
 msgid "Instance Options"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:239
 msgid "Local Cache"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:229
 msgid ""
 "Local blacklists allow you to block abuse sites by domains or ip addresses."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:246
 msgid ""
 "Log the received DNS queries to a file, so you can watch in real-time what "
 "is happening on the network."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:201
 msgid ""
 "Name of the remote DNS service for resolving queries incl. Location, DNSSEC- "
 "and NOLOG-Flag."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:137
 msgid "No SSL support available.<br />"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:21
 msgid "No default resolver list and no SSL support available.<br />"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:15
 msgid "Overview"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:160
 msgid "Please edit the file manually in the 'Advanced' section."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:138
 msgid ""
 "Please install a 'libustream-ssl' library to download the current resolver "
 "list from 'github.com/dyne/dnscrypt-proxy'."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:22
 msgid ""
 "Please install a resolver list to '/usr/share/dnscrypt-proxy/dnscrypt-"
 "resolvers.csv' to use this package."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:259
 msgid ""
 "Please note: This may change the values for 'noresolv', 'resolvfile', "
 "'allservers' and the list 'server' settings."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:194
 msgid "Port"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:125
 msgid "Refresh List"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:123
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:136
 msgid "Refresh Resolver List"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:200
 msgid "Resolver (LOC/SEC/NOLOG)"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:17
 msgid "Save"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:216
 msgid "Specify a non-default Resolver List."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:168
 msgid "Startup Trigger"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:159
 msgid "The config file '/etc/resolv-crypt.conf' already exist.<br />"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:195
 msgid "The listening port for DNS queries."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:190
 msgid ""
 "The local IPv4 or IPv6 address. The latter one should be specified within "
 "brackets, e.g. '[::1]'."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:230
 msgid ""
 "The value for this property is the blocklist type and path to the file, e."
 "g.'domains:/path/to/dbl.txt' or 'ips:/path/to/ipbl.txt'."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main DNSCrypt-Proxy "
 "configuration file (/etc/config/dnscrypt-proxy)."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main Dnsmasq configuration "
 "file (/etc/config/dhcp)."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the resolv-crypt configuration "
 "file (/etc/resolv-crypt.conf)."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/view_reslist.htm:10
 msgid "This form shows the content of the current DNSCrypt Resolver List."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/logread.htm:10
 msgid ""
 "This form shows the syslog output, pre-filtered for DNSCrypt-Proxy related "
 "messages only."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:222
 msgid ""
 "This option requires extra CPU cycles and is useless with most DNSCrypt "
 "server."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:170
 msgid ""
 "To restrict the trigger, select only the relevant network interface. Usually "
 "the 'wan' interface should work for most users."
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:257
 msgid "Transfer Options To Dnsmasq"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:16
 msgid "View Logfile"
 msgstr ""
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:21
 msgid "View Resolver List"
 msgstr ""
diff --git a/applications/luci-app-dnscrypt-proxy/po/zh-cn/dnscrypt-proxy.po b/applications/luci-app-dnscrypt-proxy/po/zh-cn/dnscrypt-proxy.po
index 1b830f11e7..cd791a1419 100644
--- a/applications/luci-app-dnscrypt-proxy/po/zh-cn/dnscrypt-proxy.po
+++ b/applications/luci-app-dnscrypt-proxy/po/zh-cn/dnscrypt-proxy.po
@@ -11,25 +11,33 @@ msgstr ""
 "PO-Revision-Date: 2018-08-07 18:40+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:139
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:161
 msgid "-------"
 msgstr "-------"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:17
 msgid "Advanced"
 msgstr "高级"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:215
 msgid "Alternate Resolver List"
 msgstr "备用解析服务器列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:258
 msgid ""
 "Apply DNSCrypt-Proxy specific settings to the Dnsmasq configuration.<br />"
 msgstr "将特定于 DNSCrypt-Proxy 的设置应用到 Dnsmasq 配置。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:228
 msgid "Blacklist"
 msgstr "黑名单"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:233
 msgid "Block IPv6"
 msgstr "阻止 IPv6"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:169
 msgid ""
 "By default the DNSCrypt-Proxy startup will be triggered by ifup events of "
 "'All' available network interfaces.<br />"
@@ -37,9 +45,11 @@ msgstr ""
 "默认情况下，DNSCrypt-Proxy 启动将由“All”所有可用网络接口的 ifup 事件触发。"
 "<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:59
 msgid "Configuration of the DNSCrypt-Proxy package."
 msgstr "配置 DNSCrypt-Proxy 包。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:146
 msgid ""
 "Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS "
 "upstream timeouts with multiple DNSCrypt instances.<br />"
@@ -47,107 +57,144 @@ msgstr ""
 "创建“/etc/resolv-crypt.conf”时使用“options timeout:1”选项，用多个 DNSCrypt 实"
 "例来减少 DNS 上游发生超时的情况。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:150
 msgid "Create Config File"
 msgstr "创建配置文件"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:145
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:158
 msgid "Create Custom Config File"
 msgstr "创建自定义配置文件"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:245
 msgid "DNS Query Logfile"
 msgstr "DNS 查询日志文件"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:14
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:58
 msgid "DNSCrypt-Proxy"
 msgstr "DNSCrypt-Proxy"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:37
 msgid "DNSCrypt-Proxy Logfile"
 msgstr "DNSCrypt-Proxy 日志文件"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:26
 msgid "DNSCrypt-Proxy Resolver List"
 msgstr "DNSCrypt-Proxy 解析服务器列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:102
 msgid "Default Resolver List"
 msgstr "默认解析服务器列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:234
 msgid "Disable IPv6 to speed up DNSCrypt-Proxy."
 msgstr "禁用 IPv6 以加速 DNSCrypt-Proxy。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:254
 msgid "Dnsmasq Options"
 msgstr "Dnsmasq 选项"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:124
 msgid ""
 "Download the current resolver list from 'github.com/dyne/dnscrypt-proxy'."
 msgstr "从“github.com/dyne/DNSCrypt-Proxy”下载当前的解析服务器列表。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:18
 msgid "Edit DNSCrypt-Proxy Configuration"
 msgstr "编辑 DNSCrypt-Proxy 配置"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:19
 msgid "Edit Dnsmasq Configuration"
 msgstr "编辑 Dnsmasq 配置"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:20
 msgid "Edit Resolvcrypt Configuration"
 msgstr "编辑 Resolvcrypt 配置"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:240
 msgid "Enable Caching to speed up DNSCcrypt-Proxy."
 msgstr "启用缓存以加速 DNSCcrypt-Proxy。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:220
 msgid "Ephemeral Keys"
 msgstr "临时密钥"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:114
 msgid "File Checksum"
 msgstr "文件校验和"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:106
 msgid "File Date"
 msgstr "文件日期"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:60
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:147
 msgid ""
 "For further information <a href=\"%s\" target=\"_blank\">see the wiki "
 "online</a>"
 msgstr "详细信息请<a href=\"%s\" target=\"_blank\">查看在线 wiki</a>"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:97
 msgid "General Options"
 msgstr "常规选项"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:189
 msgid "IP Address"
 msgstr "IP 地址"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:221
 msgid "Improve privacy by using an ephemeral public key for each query."
 msgstr "每次查询使用不同的临时公钥，以增强隐私。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:9
 msgid "Input file not found, please check your configuration."
 msgstr "未找到输入文件，请检查您的配置。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:185
 msgid "Instance Options"
 msgstr "实例选项"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:239
 msgid "Local Cache"
 msgstr "本地缓存"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:229
 msgid ""
 "Local blacklists allow you to block abuse sites by domains or ip addresses."
 msgstr "本地黑名单，允许您按域名或 IP 地址拦截有害网站。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:246
 msgid ""
 "Log the received DNS queries to a file, so you can watch in real-time what "
 "is happening on the network."
 msgstr "将收到的 DNS 查询记录到文件中，以便您可以实时查看网络上发生的情况。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:201
 msgid ""
 "Name of the remote DNS service for resolving queries incl. Location, DNSSEC- "
 "and NOLOG-Flag."
 msgstr "用于解析 DNS 查询的远程服务器名称，包括位置、DNSSEC- 和 NOLOG-Flag。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:137
 msgid "No SSL support available.<br />"
 msgstr "无 SSL 支持。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:21
 msgid "No default resolver list and no SSL support available.<br />"
 msgstr "无默认解析服务器列表，也无 SSL 支持。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:15
 msgid "Overview"
 msgstr "概述"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:160
 msgid "Please edit the file manually in the 'Advanced' section."
 msgstr "请在“高级”部分中手动编辑文件。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:138
 msgid ""
 "Please install a 'libustream-ssl' library to download the current resolver "
 "list from 'github.com/dyne/dnscrypt-proxy'."
@@ -155,6 +202,7 @@ msgstr ""
 "要从“github.com/dyne/DNSCrypt-Proxy”下载当前的解析服务器列表，请安"
 "装“libustream-ssl”库。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:22
 msgid ""
 "Please install a resolver list to '/usr/share/dnscrypt-proxy/dnscrypt-"
 "resolvers.csv' to use this package."
@@ -162,6 +210,7 @@ msgstr ""
 "要使用此程序，请将解析服务器列表放到“/usr/share/DNSCrypt-Proxy/dnscrypt-"
 "resolvers.csv”。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:259
 msgid ""
 "Please note: This may change the values for 'noresolv', 'resolvfile', "
 "'allservers' and the list 'server' settings."
@@ -169,38 +218,52 @@ msgstr ""
 "请注意：这可能会更改“noresolv”、“resolvfile”、“allservers”和“server”列表的设"
 "置值。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:194
 msgid "Port"
 msgstr "端口"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:125
 msgid "Refresh List"
 msgstr "刷新列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:123
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:136
 msgid "Refresh Resolver List"
 msgstr "刷新解析服务器列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:200
 msgid "Resolver (LOC/SEC/NOLOG)"
 msgstr "解析服务器（LOC/SEC/NOLOG）"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:17
 msgid "Save"
 msgstr "保存"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:216
 msgid "Specify a non-default Resolver List."
 msgstr "指定非默认的解析服务器列表。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:168
 msgid "Startup Trigger"
 msgstr "启动触发器"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:159
 msgid "The config file '/etc/resolv-crypt.conf' already exist.<br />"
 msgstr "配置文件“/etc/resolv-crypt.conf”已经存在。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:195
 msgid "The listening port for DNS queries."
 msgstr "DNS 查询的监听端口。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:190
 msgid ""
 "The local IPv4 or IPv6 address. The latter one should be specified within "
 "brackets, e.g. '[::1]'."
 msgstr "本地 IPv4 或 IPv6 地址。后者应用方括号括起，如“[::1]”。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:230
 msgid ""
 "The value for this property is the blocklist type and path to the file, e."
 "g.'domains:/path/to/dbl.txt' or 'ips:/path/to/ipbl.txt'."
@@ -208,6 +271,7 @@ msgstr ""
 "此属性的值是拦截列表的类型和文件的路径，例如“domains:/path/to/dbl."
 "txt”或“ips:/path/to/ipbl.txt”。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main DNSCrypt-Proxy "
 "configuration file (/etc/config/dnscrypt-proxy)."
@@ -215,41 +279,50 @@ msgstr ""
 "此表单允许您修改主 DNSCrypt-Proxy 配置文件（/etc/config/dnscrypt-proxy）的内"
 "容。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main Dnsmasq configuration "
 "file (/etc/config/dhcp)."
 msgstr "此表单允许您修改主 Dnsmasq 配置文件（/etc/config/dhcp）的内容。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the resolv-crypt configuration "
 "file (/etc/resolv-crypt.conf)."
 msgstr ""
 "此表单允许您修改 resolv-crypt 配置文件（/etc/resolv-crypt.conf）的内容。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/view_reslist.htm:10
 msgid "This form shows the content of the current DNSCrypt Resolver List."
 msgstr "此表单显示当前 DNSCrypt 的解析服务器列表。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/logread.htm:10
 msgid ""
 "This form shows the syslog output, pre-filtered for DNSCrypt-Proxy related "
 "messages only."
 msgstr "此表单显示 syslog 输出，仅针对 DNSCrypt-Proxy 相关消息进行预过滤。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:222
 msgid ""
 "This option requires extra CPU cycles and is useless with most DNSCrypt "
 "server."
 msgstr "此选项需要额外的 CPU 周期，对大多数 DNSCrypt 服务器都没用。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:170
 msgid ""
 "To restrict the trigger, select only the relevant network interface. Usually "
 "the 'wan' interface should work for most users."
 msgstr ""
 "要限制触发器，请只选择相关的网络接口。通常，“wan”接口应该适用于大多数用户。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:257
 msgid "Transfer Options To Dnsmasq"
 msgstr "转移选项到 Dnsmasq "
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:16
 msgid "View Logfile"
 msgstr "查看日志文件"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:21
 msgid "View Resolver List"
 msgstr "查看解析服务器列表"
diff --git a/applications/luci-app-dnscrypt-proxy/po/zh-tw/dnscrypt-proxy.po b/applications/luci-app-dnscrypt-proxy/po/zh-tw/dnscrypt-proxy.po
index 032444d729..34669aa5e8 100644
--- a/applications/luci-app-dnscrypt-proxy/po/zh-tw/dnscrypt-proxy.po
+++ b/applications/luci-app-dnscrypt-proxy/po/zh-tw/dnscrypt-proxy.po
@@ -11,25 +11,33 @@ msgstr ""
 "PO-Revision-Date: 2018-08-07 18:40+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:139
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:161
 msgid "-------"
 msgstr "-------"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:17
 msgid "Advanced"
 msgstr "高階"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:215
 msgid "Alternate Resolver List"
 msgstr "備用解析伺服器列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:258
 msgid ""
 "Apply DNSCrypt-Proxy specific settings to the Dnsmasq configuration.<br />"
 msgstr "將特定於 DNSCrypt-Proxy 的設定應用到 Dnsmasq 配置。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:228
 msgid "Blacklist"
 msgstr "黑名單"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:233
 msgid "Block IPv6"
 msgstr "阻止 IPv6"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:169
 msgid ""
 "By default the DNSCrypt-Proxy startup will be triggered by ifup events of "
 "'All' available network interfaces.<br />"
@@ -37,9 +45,11 @@ msgstr ""
 "預設情況下，DNSCrypt-Proxy 啟動將由“All”所有可用網路介面的 ifup 事件觸發。"
 "<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:59
 msgid "Configuration of the DNSCrypt-Proxy package."
 msgstr "配置 DNSCrypt-Proxy 包。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:146
 msgid ""
 "Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS "
 "upstream timeouts with multiple DNSCrypt instances.<br />"
@@ -47,107 +57,144 @@ msgstr ""
 "建立“/etc/resolv-crypt.conf”時使用“options timeout:1”選項，用多個 DNSCrypt 實"
 "例來減少 DNS 上游發生超時的情況。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:150
 msgid "Create Config File"
 msgstr "建立配置檔案"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:145
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:158
 msgid "Create Custom Config File"
 msgstr "建立自訂配置檔案"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:245
 msgid "DNS Query Logfile"
 msgstr "DNS 查詢日誌檔案"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:14
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:58
 msgid "DNSCrypt-Proxy"
 msgstr "DNSCrypt-Proxy"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:37
 msgid "DNSCrypt-Proxy Logfile"
 msgstr "DNSCrypt-Proxy 日誌檔案"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:26
 msgid "DNSCrypt-Proxy Resolver List"
 msgstr "DNSCrypt-Proxy 解析伺服器列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:102
 msgid "Default Resolver List"
 msgstr "預設解析伺服器列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:234
 msgid "Disable IPv6 to speed up DNSCrypt-Proxy."
 msgstr "禁用 IPv6 以加速 DNSCrypt-Proxy。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:254
 msgid "Dnsmasq Options"
 msgstr "Dnsmasq 選項"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:124
 msgid ""
 "Download the current resolver list from 'github.com/dyne/dnscrypt-proxy'."
 msgstr "從“github.com/dyne/DNSCrypt-Proxy”下載當前的解析伺服器列表。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:18
 msgid "Edit DNSCrypt-Proxy Configuration"
 msgstr "編輯 DNSCrypt-Proxy 配置"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:19
 msgid "Edit Dnsmasq Configuration"
 msgstr "編輯 Dnsmasq 配置"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:20
 msgid "Edit Resolvcrypt Configuration"
 msgstr "編輯 Resolvcrypt 配置"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:240
 msgid "Enable Caching to speed up DNSCcrypt-Proxy."
 msgstr "啟用快取以加速 DNSCcrypt-Proxy。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:220
 msgid "Ephemeral Keys"
 msgstr "臨時金鑰"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:114
 msgid "File Checksum"
 msgstr "檔案校驗和"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:106
 msgid "File Date"
 msgstr "檔案日期"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:60
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:147
 msgid ""
 "For further information <a href=\"%s\" target=\"_blank\">see the wiki "
 "online</a>"
 msgstr "詳細資訊請<a href=\"%s\" target=\"_blank\">檢視線上 wiki</a>"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:97
 msgid "General Options"
 msgstr "常規選項"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:189
 msgid "IP Address"
 msgstr "IP 位址"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:221
 msgid "Improve privacy by using an ephemeral public key for each query."
 msgstr "每次查詢使用不同的臨時公鑰，以增強隱私。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:9
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:9
 msgid "Input file not found, please check your configuration."
 msgstr "未找到輸入檔案，請檢查您的配置。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:185
 msgid "Instance Options"
 msgstr "例項選項"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:239
 msgid "Local Cache"
 msgstr "本地快取"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:229
 msgid ""
 "Local blacklists allow you to block abuse sites by domains or ip addresses."
 msgstr "本地黑名單，允許您按域名或 IP 位址攔截有害網站。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:246
 msgid ""
 "Log the received DNS queries to a file, so you can watch in real-time what "
 "is happening on the network."
 msgstr "將收到的 DNS 查詢記錄到檔案中，以便您可以實時檢視網路上發生的情況。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:201
 msgid ""
 "Name of the remote DNS service for resolving queries incl. Location, DNSSEC- "
 "and NOLOG-Flag."
 msgstr "用於解析 DNS 查詢的遠端伺服器名稱，包括位置、DNSSEC- 和 NOLOG-Flag。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:137
 msgid "No SSL support available.<br />"
 msgstr "無 SSL 支援。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:21
 msgid "No default resolver list and no SSL support available.<br />"
 msgstr "無預設解析伺服器列表，也無 SSL 支援。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:15
 msgid "Overview"
 msgstr "概述"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:160
 msgid "Please edit the file manually in the 'Advanced' section."
 msgstr "請在“高階”部分中手動編輯檔案。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:138
 msgid ""
 "Please install a 'libustream-ssl' library to download the current resolver "
 "list from 'github.com/dyne/dnscrypt-proxy'."
@@ -155,6 +202,7 @@ msgstr ""
 "要從“github.com/dyne/DNSCrypt-Proxy”下載當前的解析伺服器列表，請安"
 "裝“libustream-ssl”庫。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:22
 msgid ""
 "Please install a resolver list to '/usr/share/dnscrypt-proxy/dnscrypt-"
 "resolvers.csv' to use this package."
@@ -162,6 +210,7 @@ msgstr ""
 "要使用此程式，請將解析伺服器列表放到“/usr/share/DNSCrypt-Proxy/dnscrypt-"
 "resolvers.csv”。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:259
 msgid ""
 "Please note: This may change the values for 'noresolv', 'resolvfile', "
 "'allservers' and the list 'server' settings."
@@ -169,38 +218,52 @@ msgstr ""
 "請注意：這可能會更改“noresolv”、“resolvfile”、“allservers”和“server”列表的設"
 "置值。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:194
 msgid "Port"
 msgstr "埠"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:125
 msgid "Refresh List"
 msgstr "重新整理列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:123
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:136
 msgid "Refresh Resolver List"
 msgstr "重新整理解析伺服器列表"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:200
 msgid "Resolver (LOC/SEC/NOLOG)"
 msgstr "解析伺服器（LOC/SEC/NOLOG）"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:17
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:17
 msgid "Save"
 msgstr "儲存"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:216
 msgid "Specify a non-default Resolver List."
 msgstr "指定非預設的解析伺服器列表。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:168
 msgid "Startup Trigger"
 msgstr "啟動觸發器"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:159
 msgid "The config file '/etc/resolv-crypt.conf' already exist.<br />"
 msgstr "配置檔案“/etc/resolv-crypt.conf”已經存在。<br />"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:195
 msgid "The listening port for DNS queries."
 msgstr "DNS 查詢的監聽埠。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:190
 msgid ""
 "The local IPv4 or IPv6 address. The latter one should be specified within "
 "brackets, e.g. '[::1]'."
 msgstr "本地 IPv4 或 IPv6 位址。後者應用方括號括起，如“[::1]”。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:230
 msgid ""
 "The value for this property is the blocklist type and path to the file, e."
 "g.'domains:/path/to/dbl.txt' or 'ips:/path/to/ipbl.txt'."
@@ -208,6 +271,7 @@ msgstr ""
 "此屬性的值是攔截列表的型別和檔案的路徑，例如“domains:/path/to/dbl."
 "txt”或“ips:/path/to/ipbl.txt”。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/configuration_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main DNSCrypt-Proxy "
 "configuration file (/etc/config/dnscrypt-proxy)."
@@ -215,41 +279,50 @@ msgstr ""
 "此表單允許您修改主 DNSCrypt-Proxy 配置檔案（/etc/config/dnscrypt-proxy）的內"
 "容。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_dnsmasq_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the main Dnsmasq configuration "
 "file (/etc/config/dhcp)."
 msgstr "此表單允許您修改主 Dnsmasq 配置檔案（/etc/config/dhcp）的內容。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/cfg_resolvcrypt_tab.lua:21
 msgid ""
 "This form allows you to modify the content of the resolv-crypt configuration "
 "file (/etc/resolv-crypt.conf)."
 msgstr ""
 "此表單允許您修改 resolv-crypt 配置檔案（/etc/resolv-crypt.conf）的內容。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/view_reslist.htm:10
 msgid "This form shows the content of the current DNSCrypt Resolver List."
 msgstr "此表單顯示當前 DNSCrypt 的解析伺服器列表。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/view/dnscrypt-proxy/logread.htm:10
 msgid ""
 "This form shows the syslog output, pre-filtered for DNSCrypt-Proxy related "
 "messages only."
 msgstr "此表單顯示 syslog 輸出，僅針對 DNSCrypt-Proxy 相關訊息進行預過濾。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:222
 msgid ""
 "This option requires extra CPU cycles and is useless with most DNSCrypt "
 "server."
 msgstr "此選項需要額外的 CPU 週期，對大多數 DNSCrypt 伺服器都沒用。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:170
 msgid ""
 "To restrict the trigger, select only the relevant network interface. Usually "
 "the 'wan' interface should work for most users."
 msgstr ""
 "要限制觸發器，請只選擇相關的網路介面。通常，“wan”介面應該適用於大多數使用者。"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua:257
 msgid "Transfer Options To Dnsmasq"
 msgstr "轉移選項到 Dnsmasq "
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:16
 msgid "View Logfile"
 msgstr "檢視日誌檔案"
 
+#: applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua:21
 msgid "View Resolver List"
 msgstr "檢視解析伺服器列表"