From e10f027edac901873f4c888b596ec5721dfa8748 Mon Sep 17 00:00:00 2001
From: Nodir Temirkhodjaev <nodir.temir@gmail.com>
Date: Sat, 20 Jan 2018 15:39:08 +0500
Subject: [PATCH] UI: AddressesPage: Update translations.

---
 src/ui/i18n/i18n_ru.qm             | Bin 9895 -> 10091 bytes
 src/ui/i18n/i18n_ru.ts             |  40 ++++++++++++++++++-----------
 src/ui/qml/pages/AddressesPage.qml |   4 +--
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/ui/i18n/i18n_ru.qm b/src/ui/i18n/i18n_ru.qm
index 140bebcd1003fd2afb151ff3e198e03971bdd88d..00adfb400313b68753f7cac787d9472044f30278 100644
GIT binary patch
delta 1128
zcma)4eN0t#7=G@(zjHs%Js)u4a^Z6MxZodsum!U-43Y`dxM1E=5|_~j%Ui-2ZA3#+
zcNIw&W2IdQt;CE%G=(MLKSeE2Z<!0Z#w=~khT0~poSHbzt%vSk{nyUUp7Z{G@B6&Z
z`@HACvf1E{<nV1kDh7O;fj}Oh{sB}S2V9>6%VL0g23Sr^djqH@dXE6B#{mB+B4hub
z5dG_!p9wMW36K<oWU$8jCZvEtUKLW80K|<rW^6;rMaD^K2rPUB2x~e5t&aeD9V(6Y
zi91jwPXGybP*waF;L%XEnfI<MsOe;bj66Ksuo1{fK;5PkHi%-^+~a_)2R-l36E|bB
zp&YQcnF>dTIh;R^{#?_Rj-!CnFpZ_<0$Ee$`&REn#AV8<?=X*_0g$=UJpRiyVz<Tf
z9_RCZZz;Un4k#xr^$9*eD-ofgdLZ2=c2|A@B>KgkHVLp^7Xx=m>6sIUKYfl;w~Esf
z7S>mb*@t9$*Dr2;%MntFB704qx(Vsn2R8u6sC2^Fz(ES7sL?_UNf*YMm8(m?o&N}s
zH(D)y?2>ub8k~BOn;EjMdx8cyLe>pdvWvtx`g*Og<VzfQ(t5ezI1TtX;x=c6zq56p
zd7XAWV;gFkVeb!Z(@|<nJZ3u=TSa@#_M`=5$#U8E>`mfq>+Suuz0^8oKls^2AiKmq
z*7XhR58H2t7V&<@VeG%jx)Y9~+Q-P(=$L-(YkDI)X1^LG&r5P<24ifOv(6F29N@_^
zj_ElfuWh?RQ-bpL5hkh|<O3C*l=*`^&`#N&b@E`z9q#d-Q<o?(`*&xDrcmfoXW!4n
ztRCm=AkB9h&N+?fS*&=kZl!>j;`{qo3aC;1Ln|2z<-x9U3cjFJymOQNlc$x|@Cdin
zrEFTU0I)>k=x$c}y61h5C_f!_b9*l+=Wq1^$=%A;;>&C#RCPCF{eHC|#RQlXb=5&H
zklL@-?)#Gau&HZW_XFmq)wQSjceqE?_I-!woUY!hVZHRDmT_(PWhPwL@&-vHb;i-(
zp&i=Q!NqOUPL5EJDAS@bI+6OQo;n$!fE9Xqc^Q4Xq&H0RKD}ChtNSb+d0XFEL?^w8
z`gl7B@|E%*%&oA{?584Ilm~_jL{O_<B(g=mC=^SCAp&B#Sj=asFff1m@V}>}BA-zz
z&&!yzglO<9-%cJ_`Fcwm8((b=t;w!zY6&$rg<2xLIiBIL>y&+Awn+G&B(DDySEfJj
F{0A8J6hi<2

delta 968
zcmX9+drVVz7(H$8ZEtVy0}7>5S`Z}LGEEj^It3CE?G~X?qM{fcI!#7|E}4Jmf*_`f
zL=8bBt4ziogy93x&>*1yjG3X6O-aBSf{$gB07@WP3{1dR;z9m8_q)IEalUiDsho=&
zPsau)05Jnd=m)Y^0P25${}y213~Y=5j&fi#amhU(ml*#NDChx_<A{utGay`GPIMQ9
z*7K|zgXkS)-VnqrFZ<?0tQ7!ZW)a;HWIkbR4<l>U9w4ac$SO+%v^ivZe*p9k;FoU#
zQK#Y0cmc$nga0t!?Ul%@;Q;pm6b33exCpxsk%T)2XXZW!EN5}{J2sAyFc9zoQiWl4
zcPE!iUc{w)4M(c40yeLqCw>`_<S~9!P=}D+kW%V0_6`E@G#h*Wc}^TLIUDZ)E|+Qb
z>ncFGZ7Pj&lVYY&94_Vm5}_gcS5mw#d|x2~=4qkzHCsA;!j;QANHt#QziFZdO~TYC
zGPRo)X8+;}j=|7R2Iua4@!F3wfVErv!xrEoN5wwxeqx9CxR+Teh2pbEzW{Qj+0?=*
ziAm<1d%NgN*nD6E1+W&I51QFsh+f2mNpmE2j0+E#$5-B>0O=uzF)8S@)DM0`dCptH
zUyoA8Pc1`z<QTodG91}XnH!{-RCY<+DP1V~nOr^6rH&_*rAF$h{gZX`(tPn6?p$v5
zHvi9E3$5uzpRte8I<)V1Y9d>wZgjIgEGK#x<G7qOynv8PDxT8U=rQ?t7ZcQj^2PNv
zq!o}`t4PzS$?ci1I3U}mizKu(%~q``957;Q`J0$HYMW}O*s*tQa~d)3zT%oZN-R;_
zZ$>ycPe~4MqnM4#@>(Cw`cPT_EeXbcrIZD`XwC!W(3VsLVd{JT0f(ft)Gz4#uk!G!
zgKmAHJeqA`!E$9XW1QHistt^_8|un917J|p?U!66I;|Ep{l)>g>X&8BfN`r@($8yf
z_|>YWHo97<zRhF3_(1bK=b;&=wH58`Bi1Zn9yc4*+RjwdsAJmgu2kYWtuI0)oG0`p
z10gChq5FL6DA<@D7~s3BNk3J8pB6mU>(Y53@jLY1DsGf;k~fzUGEv)2p*rQ`&b300
P*7?$YN9t7FJ8ka(&*l3*

diff --git a/src/ui/i18n/i18n_ru.ts b/src/ui/i18n/i18n_ru.ts
index 87828074..cd1db763 100644
--- a/src/ui/i18n/i18n_ru.ts
+++ b/src/ui/i18n/i18n_ru.ts
@@ -80,27 +80,27 @@
 <context>
     <name>FortSettings</name>
     <message>
-        <location filename="../fortsettings.cpp" line="174"/>
+        <location filename="../fortsettings.cpp" line="178"/>
         <source>Can&apos;t write .ini file</source>
         <translation>Не удалось записать .ini файл</translation>
     </message>
     <message>
-        <location filename="../fortsettings.cpp" line="180"/>
+        <location filename="../fortsettings.cpp" line="184"/>
         <source>Can&apos;t rename old backup .conf file</source>
         <translation>Не удалось переименовать старый бэкап .conf файла</translation>
     </message>
     <message>
-        <location filename="../fortsettings.cpp" line="185"/>
+        <location filename="../fortsettings.cpp" line="189"/>
         <source>Can&apos;t create backup .conf file</source>
         <translation>Не удалось создать бэкап .conf файла</translation>
     </message>
     <message>
-        <location filename="../fortsettings.cpp" line="190"/>
+        <location filename="../fortsettings.cpp" line="194"/>
         <source>Can&apos;t rename backup .conf file</source>
         <translation>Не удалось переименовать бэкап .conf файла</translation>
     </message>
     <message>
-        <location filename="../fortsettings.cpp" line="205"/>
+        <location filename="../fortsettings.cpp" line="211"/>
         <source>Can&apos;t write .conf file</source>
         <translation>Не удалось записать .conf файл</translation>
     </message>
@@ -113,28 +113,28 @@
         <translation>Ошибка в строке %1: %2</translation>
     </message>
     <message>
-        <location filename="../util/net/ip4range.cpp" line="100"/>
+        <location filename="../util/net/ip4range.cpp" line="102"/>
         <source>Bad format</source>
         <translation>Некорректный формат</translation>
     </message>
     <message>
-        <location filename="../util/net/ip4range.cpp" line="118"/>
+        <location filename="../util/net/ip4range.cpp" line="120"/>
         <source>Bad IP address</source>
         <translation>Некорректный IP адрес</translation>
     </message>
     <message>
-        <location filename="../util/net/ip4range.cpp" line="125"/>
+        <location filename="../util/net/ip4range.cpp" line="127"/>
         <source>Bad second IP address</source>
         <translation>Некорректный второй IP адрес</translation>
     </message>
     <message>
-        <location filename="../util/net/ip4range.cpp" line="129"/>
+        <location filename="../util/net/ip4range.cpp" line="131"/>
         <source>Bad range</source>
         <translation>Некорректный диапазон</translation>
     </message>
     <message>
-        <location filename="../util/net/ip4range.cpp" line="110"/>
-        <location filename="../util/net/ip4range.cpp" line="137"/>
+        <location filename="../util/net/ip4range.cpp" line="112"/>
+        <location filename="../util/net/ip4range.cpp" line="139"/>
         <source>Bad mask</source>
         <translation>Некорректная маска</translation>
     </message>
@@ -247,22 +247,22 @@
         <translation>Показ блокированных приложений</translation>
     </message>
     <message>
-        <location filename="../qml/pages/AddressesPage.qml" line="20"/>
+        <location filename="../qml/pages/addresses/AddressGroupRow.qml" line="17"/>
         <source>Include</source>
         <translation>Включить</translation>
     </message>
     <message>
-        <location filename="../qml/pages/AddressesPage.qml" line="26"/>
+        <location filename="../qml/pages/addresses/AddressGroupRow.qml" line="23"/>
         <source>Include All</source>
         <translation>Включить все</translation>
     </message>
     <message>
-        <location filename="../qml/pages/AddressesPage.qml" line="37"/>
+        <location filename="../qml/pages/addresses/AddressGroupRow.qml" line="42"/>
         <source>Exclude</source>
         <translation>Исключить</translation>
     </message>
     <message>
-        <location filename="../qml/pages/AddressesPage.qml" line="43"/>
+        <location filename="../qml/pages/addresses/AddressGroupRow.qml" line="48"/>
         <source>Exclude All</source>
         <translation>Исключить все</translation>
     </message>
@@ -668,5 +668,15 @@
         <source>Sum</source>
         <translation>Сумма</translation>
     </message>
+    <message>
+        <location filename="../qml/pages/AddressesPage.qml" line="20"/>
+        <source>Internet Addresses</source>
+        <translation>Адреса Интернета</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AddressesPage.qml" line="25"/>
+        <source>Allowed Internet Addresses</source>
+        <translation>Разрешённые адреса Интернета</translation>
+    </message>
 </context>
 </TS>
diff --git a/src/ui/qml/pages/AddressesPage.qml b/src/ui/qml/pages/AddressesPage.qml
index 993457e6..e2c06c73 100644
--- a/src/ui/qml/pages/AddressesPage.qml
+++ b/src/ui/qml/pages/AddressesPage.qml
@@ -17,12 +17,12 @@ BasePage {
             TabButton {
                 icon.source: "qrc:/images/world.png"
                 text: translationManager.dummyBool
-                      && qsTranslate("qml", "Internet")
+                      && qsTranslate("qml", "Internet Addresses")
             }
             TabButton {
                 icon.source: "qrc:/images/world_link.png"
                 text: translationManager.dummyBool
-                      && qsTranslate("qml", "Filter Internet")
+                      && qsTranslate("qml", "Allowed Internet Addresses")
             }
         }