Skip to content

Commit

Permalink
storyboard->strings
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Ilin committed Mar 17, 2020
1 parent 6fa1145 commit d99983e
Show file tree
Hide file tree
Showing 14 changed files with 95 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .twosky.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"AdguardExtension/AdguardApp/UI/ViewControllers/MainTabBar/ComplexProtection",
"AdguardExtension/AdguardApp/UI/ViewControllers/MainTabBar/MainMenu/Settings",
"AdguardExtension/AdguardApp/UI/ViewControllers/MainTabBar/MainMenu/ListOfRules",
"AdguardExtension/AdguardApp/UI/ViewControllers/RateApp/RateApp"
"AdguardExtension/AdguardApp/UI/ViewControllers/RateApp"
]
}
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Class = "UILabel"; text = "Safari ads protection"; ObjectID = "28V-ha-qHw"; */
/* Class = "UILabel"; text = "Safari protection"; ObjectID = "28V-ha-qHw"; */
"28V-ha-qHw.text" = "Safari protection";

/* Class = "UILabel"; text = "requests"; ObjectID = "WAp-Xx-eXF"; */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
/* Class = "UILabel"; text = "Set custom DNS settings"; ObjectID = "3lB-T7-fSO"; */
"3lB-T7-fSO.text" = "Set custom DNS settings";

/* Class = "UINavigationItem"; title = "DNS encryption"; ObjectID = "4rw-Lb-MJH"; */
"4rw-Lb-MJH.title" = "DNS encryption";

/* Class = "UITextField"; placeholder = "IP, sdns://, https:// or tls://"; ObjectID = "6Tx-Oh-hyu"; Note = "(Add Custom Filter) url hint"; */
"6Tx-Oh-hyu.placeholder" = "IP, sdns://, https:// or tls://";

Expand All @@ -31,9 +28,6 @@
/* Class = "UIButton"; normalTitle = "DNS-over-HTTPS"; ObjectID = "DrO-hc-ilW"; */
"DrO-hc-ilW.normalTitle" = "DNS-over-HTTPS";

/* Class = "UINavigationItem"; title = "Customize blocking"; ObjectID = "Edw-bD-gDt"; */
"Edw-bD-gDt.title" = "Customize blocking";

/* Class = "UILabel"; text = "Advanced network settings"; ObjectID = "FUx-XP-SzD"; */
"FUx-XP-SzD.text" = "Advanced network settings";

Expand All @@ -46,7 +40,7 @@
/* Class = "UILabel"; text = "Add a filter"; ObjectID = "NX4-vI-1WP"; */
"NX4-vI-1WP.text" = "Add a filter";

/* Class = "UILabel"; text = "Enable this module to block tracking domains and encrypt your DNS traffic"; ObjectID = "PFY-Cq-NFN"; */
/* Class = "UILabel"; text = "Enable this module to block tracking domains and encrypt your DNS traffic"; ObjectID = "PFY-Cq-NFN"; Note = "No more than 100 symbols"; */
"PFY-Cq-NFN.text" = "Enable this module to block tracking domains and encrypt your DNS traffic";

/* Class = "UILabel"; text = "Tracking protection"; ObjectID = "QYv-iX-uIo"; */
Expand All @@ -58,9 +52,6 @@
/* Class = "UILabel"; text = "Allowlist"; ObjectID = "Wml-J6-ced"; */
"Wml-J6-ced.text" = "Allowlist";

/* Class = "UILabel"; text = "Recommended DNS providers"; ObjectID = "ZCR-6u-jrf"; */
"ZCR-6u-jrf.text" = "Recommended DNS providers";

/* Class = "UIButton"; normalTitle = "CANCEL"; ObjectID = "ZdD-yx-6ph"; Note = "(AddCustomFilterController) cancel button"; */
"ZdD-yx-6ph.normalTitle" = "CANCEL";

Expand All @@ -70,6 +61,9 @@
/* Class = "UIButton"; normalTitle = "DNS-over-TLS"; ObjectID = "Zn0-J3-lVl"; */
"Zn0-J3-lVl.normalTitle" = "DNS-over-TLS";

/* Class = "UILabel"; text = "DNS encryption"; ObjectID = "c9G-jn-5ym"; */
"c9G-jn-5ym.text" = "DNS encryption";

/* Class = "UILabel"; text = "Server"; ObjectID = "csw-3H-3tU"; */
"csw-3H-3tU.text" = "Server";

Expand Down Expand Up @@ -109,6 +103,9 @@
/* Class = "UILabel"; text = "Customize blocking"; ObjectID = "pC4-RU-DaD"; */
"pC4-RU-DaD.text" = "Customize blocking";

/* Class = "UILabel"; text = "DNS Filters"; ObjectID = "pXa-VP-4yy"; */
"pXa-VP-4yy.text" = "DNS Filters";

/* Class = "UILabel"; text = "Security filters, DNS privacy, custom filters, etc."; ObjectID = "pY3-X6-fFy"; */
"pY3-X6-fFy.text" = "Security filters, DNS privacy, custom filters, etc.";

Expand All @@ -124,11 +121,11 @@
/* Class = "UILabel"; text = "DNS server address"; ObjectID = "seX-mS-3mU"; */
"seX-mS-3mU.text" = "DNS server address";

/* Class = "UILabel"; text = "Customize blocking"; ObjectID = "vDF-5j-uJn"; */
"vDF-5j-uJn.text" = "Customize blocking";

/* Class = "UILabel"; text = "Select protocol"; ObjectID = "vJt-Jd-BI2"; */
"vJt-Jd-BI2.text" = "Select protocol";

/* Class = "UINavigationItem"; title = "DNS Filters"; ObjectID = "w0g-Xg-HG0"; */
"w0g-Xg-HG0.title" = "DNS Filters";

/* Class = "UILabel"; text = "Filters and exceptions"; ObjectID = "xiD-h8-XrC"; */
"xiD-h8-XrC.text" = "Filters and exceptions";
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* Class = "UILabel"; text = "Unblock ads everywhere except for the websites from this list"; ObjectID = "2B3-GC-e1o"; */
"2B3-GC-e1o.text" = "Unblock ads everywhere except for the websites from this list";

/* Class = "UILabel"; text = "Add a filter"; ObjectID = "2wy-vg-qvr"; */
"2wy-vg-qvr.text" = "Add a filter";

Expand Down Expand Up @@ -46,14 +49,17 @@
/* Class = "UILabel"; text = "Filter URL:"; ObjectID = "Z16-OR-tjl"; */
"Z16-OR-tjl.text" = "Filter URL:";

/* Class = "UILabel"; text = "Invert the Allowlist"; ObjectID = "ZOt-rF-DQo"; */
"ZOt-rF-DQo.text" = "Invert the Allowlist";

/* Class = "UILabel"; text = "Version"; ObjectID = "cTI-39-Vwx"; */
"cTI-39-Vwx.text" = "Version";

/* Class = "UILabel"; text = "Add custom filter lists here"; ObjectID = "eAd-RZ-bHN"; */
"eAd-RZ-bHN.text" = "Add custom filter lists here";

/* Class = "UILabel"; text = "Safari Whitelist"; ObjectID = "f3z-Yh-zY2"; */
"f3z-Yh-zY2.text" = "Safari Whitelist";
/* Class = "UILabel"; text = "Allowlist"; ObjectID = "f3z-Yh-zY2"; */
"f3z-Yh-zY2.text" = "Allowlist";

/* Class = "UINavigationItem"; title = "Filters"; ObjectID = "gbf-TL-LXR"; Note = "(Filters Screen) Title"; */
"gbf-TL-LXR.title" = "Filters";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
/* Class = "UITextView"; text = "free"; ObjectID = "l1g-hs-4EK"; */
"l1g-hs-4EK.text" = "free";

/* Class = "UINavigationItem"; title = "Protection"; ObjectID = "mwP-h9-R34"; */
"mwP-h9-R34.title" = "Protection";

/* Class = "UILabel"; text = "This module protects you from tracking system-wide. It encrypts your DNS queries and blocks tracking domains in all apps, not just in Safari"; ObjectID = "teo-vm-NRJ"; */
"teo-vm-NRJ.text" = "This module protects you from tracking system-wide. It encrypts your DNS queries and blocks tracking domains in all apps, not just in Safari";

/* Class = "UILabel"; text = "This module blocks ads and trackers on websites opened in Safari. You can choose among different filter lists or add your own in the settings below"; ObjectID = "vlx-BS-A2y"; */
"vlx-BS-A2y.text" = "This module blocks ads and trackers on websites opened in Safari. You can choose among different filter lists or add your own in the settings below";

/* Class = "UILabel"; text = "Protection"; ObjectID = "wyK-CX-EwT"; */
"wyK-CX-EwT.text" = "Protection";
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
/* Class = "UILabel"; text = "Manage License"; ObjectID = "5Xe-d5-8tj"; Note = "(About Screen) menu item"; */
"5Xe-d5-8tj.text" = "Manage License";

/* Class = "UILabel"; text = "Acknowledgments"; ObjectID = "8KQ-Ga-zhs"; */
"8KQ-Ga-zhs.text" = "Acknowledgments";

/* Class = "UIBarButtonItem"; title = "Log in"; ObjectID = "CqW-k3-vqO"; */
"CqW-k3-vqO.title" = "Log in";

/* Class = "UILabel"; text = "Forum"; ObjectID = "KkR-EM-giI"; */
"KkR-EM-giI.text" = "Forum";
/* Class = "UILabel"; text = "Manage License"; ObjectID = "K2a-tW-P6P"; */
"K2a-tW-P6P.text" = "Manage License";

/* Class = "UILabel"; text = "Video Tutorial"; ObjectID = "RqV-y2-sfF"; */
"RqV-y2-sfF.text" = "Video Tutorial";

/* Class = "UILabel"; text = "Video Tutorial"; ObjectID = "NVi-wQ-2Pn"; Note = "About Screen"; */
"NVi-wQ-2Pn.text" = "Video Tutorial";
/* Class = "UILabel"; text = "Developer’s Website"; ObjectID = "SJc-cd-hKd"; */
"SJc-cd-hKd.text" = "Developer’s Website";

/* Class = "UINavigationItem"; title = "About"; ObjectID = "ncc-Hk-ota"; Note = "(About Screen) Title"; */
"ncc-Hk-ota.title" = "About";
/* Class = "UILabel"; text = "Acknowledgments"; ObjectID = "o0X-Zy-4g6"; */
"o0X-Zy-4g6.text" = "Acknowledgments";

/* Class = "UILabel"; text = "Developer’s Website"; ObjectID = "xMf-b0-Cfp"; */
"xMf-b0-Cfp.text" = "Developer’s Website";
/* Class = "UILabel"; text = "Forum"; ObjectID = "oFL-ch-4PY"; */
"oFL-ch-4PY.text" = "Forum";
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,6 @@
<outlet property="delegate" destination="bEE-nS-r3u" id="WpS-OU-N0B"/>
</connections>
</tableView>
<navigationItem key="navigationItem" title=" " id="bZf-6u-czc"/>
<connections>
<outlet property="bugreportCell" destination="eR8-Ok-i9o" id="XNk-wj-2Rr"/>
<outlet property="safariProtectionLabel" destination="8SW-O3-k5y" id="ZkE-dJ-wHn"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* Class = "UINavigationItem"; title = "AdGuard Premium"; ObjectID = "0Zf-Ng-gYi"; */
"0Zf-Ng-gYi.title" = "AdGuard Premium";

/* Class = "UILabel"; text = "Code from the authentication app:"; ObjectID = "53G-qY-SZ5"; */
"53G-qY-SZ5.text" = "Code from the authentication app:";

Expand All @@ -10,7 +7,7 @@
/* Class = "UIBarButtonItem"; title = "Logout"; ObjectID = "70b-CS-wqh"; */
"70b-CS-wqh.title" = "Logout";

/* Class = "UILabel"; text = "Set your own rules"; ObjectID = "FLH-Qd-Atk"; */
/* Class = "UILabel"; text = "All Premium features are available"; ObjectID = "FLH-Qd-Atk"; */
"FLH-Qd-Atk.text" = "All Premium features are available";

/* Class = "UILabel"; text = "Set your own rules"; ObjectID = "KOP-vw-FG7"; */
Expand Down Expand Up @@ -46,7 +43,7 @@
/* Class = "UILabel"; text = "Tracking protection"; ObjectID = "gLL-6o-GGa"; */
"gLL-6o-GGa.text" = "Tracking protection";

/* Class = "UILabel"; text = "You are subscribed"; ObjectID = "hjF-1C-hFa"; */
/* Class = "UILabel"; text = "Premium is activated"; ObjectID = "hjF-1C-hFa"; */
"hjF-1C-hFa.text" = "Premium is activated";

/* Class = "UIButton"; normalTitle = "Restore purchase"; ObjectID = "mR4-EU-MFx"; */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
/* Class = "UIButton"; normalTitle = "Select"; ObjectID = "HFf-Yp-hjB"; */
"HFf-Yp-hjB.normalTitle" = "Select";

/* Class = "UILabel"; text = "OK"; ObjectID = "ST7-Ut-0aa"; */
"ST7-Ut-0aa.text" = "OK";

/* Class = "UIButton"; normalTitle = "REMOVE"; ObjectID = "Tei-uI-6Gr"; */
"Tei-uI-6Gr.normalTitle" = "REMOVE";

Expand All @@ -24,6 +27,3 @@

/* Class = "UILabel"; text = "Domain:"; ObjectID = "x7r-Ln-XiZ"; */
"x7r-Ln-XiZ.text" = "Domain:";

/* Class = "UIButton"; normalTitle = "OK"; ObjectID = "zRm-I7-37E"; */
"zRm-I7-37E.normalTitle" = "OK";
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/* Class = "UILabel"; text = "Dark"; ObjectID = "FzS-e3-CK1"; */
"FzS-e3-CK1.text" = "Dark";

/* Class = "UILabel"; text = "How deep does the rabbit hole go?"; ObjectID = "GBd-dx-t46"; */
/* Class = "UILabel"; text = "Don't change them unless you know what you're doing"; ObjectID = "GBd-dx-t46"; */
"GBd-dx-t46.text" = "Don't change them unless you know what you're doing";

/* Class = "UILabel"; text = "Split-Tunnel"; ObjectID = "GGp-kp-YJI"; */
Expand Down Expand Up @@ -67,9 +67,6 @@
/* Class = "UILabel"; text = "Show status bar"; ObjectID = "aoV-et-2ku"; */
"aoV-et-2ku.text" = "Show status bar";

/* Class = "UILabel"; text = "Invert the Whitelist"; ObjectID = "bVh-Of-Oxm"; */
"bVh-Of-Oxm.text" = "Invert the Whitelist";

/* Class = "UILabel"; text = "Advanced settings"; ObjectID = "eIa-RB-Phv"; */
"eIa-RB-Phv.text" = "Advanced settings";

Expand All @@ -91,9 +88,6 @@
/* Class = "UILabel"; text = "Light"; ObjectID = "ocH-QT-NRZ"; */
"ocH-QT-NRZ.text" = "Light";

/* Class = "UILabel"; text = "Unblock ads everywhere except for the websites from this list"; ObjectID = "q05-UZ-zAB"; */
"q05-UZ-zAB.text" = "Unblock ads everywhere except for the websites from this list";

/* Class = "UILabel"; text = "Enables additional settings for advanced users"; ObjectID = "qUy-uy-QiF"; */
"qUy-uy-QiF.text" = "Enables additional settings for advanced users";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
/* Class = "UILabel"; text = "What is AdGuard?"; ObjectID = "NQS-fl-oOe"; */
"NQS-fl-oOe.text" = "What is AdGuard?";

/* Class = "UILabel"; text = "Settings"; ObjectID = "UJb-NW-d5B"; */
"UJb-NW-d5B.text" = "Settings";

/* Class = "UITableViewController"; title = "Settings"; ObjectID = "bEE-nS-r3u"; */
"bEE-nS-r3u.title" = "Settings";

/* Class = "UILabel"; text = "Tracking protection"; ObjectID = "r4M-ec-gKY"; */
"r4M-ec-gKY.text" = "Tracking protection";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<segue destination="wQn-A0-Ee1" kind="show" id="dNv-i9-Y6S"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Thank you for installing AdGuard!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hak-o1-HWp" customClass="ThemableLabel" customModule="Adguard" customModuleProvider="target">
<rect key="frame" x="24" y="323" width="366" height="60"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Thank you for installing AdGuard!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hak-o1-HWp" customClass="ThemableLabel" customModule="Adguard" customModuleProvider="target">
<rect key="frame" x="24" y="154" width="272" height="60"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="25"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -245,8 +245,8 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x8j-Ba-Gwf">
<rect key="frame" x="414" y="0.0" width="414" height="256"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AdGuard is able to filter any type of content, and you can tune the filtering to exactly suit your needs." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="thP-lV-BhN" customClass="ThemableLabel" customModule="Adguard" customModuleProvider="target">
<rect key="frame" x="24" y="42.333333333333371" width="366" height="61"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AdGuard is able to filter any type of content, and you can tune the filtering to exactly suit your needs." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="thP-lV-BhN" customClass="ThemableLabel" customModule="Adguard" customModuleProvider="target">
<rect key="frame" x="24" y="42.5" width="272" height="61"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -574,8 +574,8 @@
</constraint>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tap on Safari and chose the “Content blockers” menu item" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QL3-U7-vA8" userLabel="Safari Label" customClass="ThemableLabel" customModule="Adguard" customModuleProvider="target">
<rect key="frame" x="32" y="0.0" width="334" height="38.333333333333336"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tap on Safari and chose the “Content blockers” menu item" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QL3-U7-vA8" userLabel="Safari Label" customClass="ThemableLabel" customModule="Adguard" customModuleProvider="target">
<rect key="frame" x="32" y="0.0" width="240" height="38.5"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="24" id="BSj-Mz-wbx"/>
</constraints>
Expand Down Expand Up @@ -616,8 +616,8 @@
</constraint>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Switch “On“ all of content blockers and come back to our app!" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eyJ-Xh-OdS" userLabel="Switch Label" customClass="ThemableLabel" customModule="Adguard" customModuleProvider="target">
<rect key="frame" x="32" y="0.0" width="334" height="57.333333333333336"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Switch on all of content blockers and come back to our app!" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eyJ-Xh-OdS" userLabel="Switch Label" customClass="ThemableLabel" customModule="Adguard" customModuleProvider="target">
<rect key="frame" x="32" y="0.0" width="240" height="38.5"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="24" id="M8R-ge-1ef"/>
</constraints>
Expand Down
Loading

0 comments on commit d99983e

Please sign in to comment.