merge default IOS-1824
authorbuff <andreas@pep-project.org>
Mon, 02 Mar 2020 10:32:14 +0100
branchIOS-1824
changeset 12018c1556ed6456e
parent 12009 fea8ae61c64e
parent 12014 52faf52ffe81
child 12021 ebd8112000e5
child 12032 8b9b2d4248c1
merge default
pEpForiOS.xcodeproj/project.pbxproj
     1.1 --- a/pEpForiOS.xcodeproj/project.pbxproj	Mon Mar 02 02:39:17 2020 +0100
     1.2 +++ b/pEpForiOS.xcodeproj/project.pbxproj	Mon Mar 02 10:32:14 2020 +0100
     1.3 @@ -622,7 +622,6 @@
     1.4  		158A565624052280003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/NothingSelected.strings; sourceTree = "<group>"; };
     1.5  		158A565724052280003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Settings.strings; sourceTree = "<group>"; };
     1.6  		158A565824052280003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/AccountCreation.strings; sourceTree = "<group>"; };
     1.7 -		158A565924052281003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Handshake.strings; sourceTree = "<group>"; };
     1.8  		158A565A24052281003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
     1.9  		158A565B24052281003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/FolderViews.strings; sourceTree = "<group>"; };
    1.10  		158A565C24052281003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Reusable.strings; sourceTree = "<group>"; };
    1.11 @@ -631,7 +630,6 @@
    1.12  		158A565F24052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/NothingSelected.strings; sourceTree = "<group>"; };
    1.13  		158A566024052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Settings.strings; sourceTree = "<group>"; };
    1.14  		158A566124052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/AccountCreation.strings; sourceTree = "<group>"; };
    1.15 -		158A566224052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Handshake.strings; sourceTree = "<group>"; };
    1.16  		158A566324052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
    1.17  		158A566424052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/FolderViews.strings; sourceTree = "<group>"; };
    1.18  		158A566524052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Reusable.strings; sourceTree = "<group>"; };
    1.19 @@ -642,7 +640,6 @@
    1.20  		158A566A2405236E003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/NothingSelected.strings; sourceTree = "<group>"; };
    1.21  		158A566B2405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Settings.strings; sourceTree = "<group>"; };
    1.22  		158A566C2405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/AccountCreation.strings; sourceTree = "<group>"; };
    1.23 -		158A566D2405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Handshake.strings; sourceTree = "<group>"; };
    1.24  		158A566E2405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
    1.25  		158A566F2405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/FolderViews.strings; sourceTree = "<group>"; };
    1.26  		158A56702405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Reusable.strings; sourceTree = "<group>"; };
    1.27 @@ -1826,15 +1823,6 @@
    1.28  			path = Reusable;
    1.29  			sourceTree = "<group>";
    1.30  		};
    1.31 -		4304FCFD1EBB8C2C0086DADA /* LanguageList */ = {
    1.32 -			isa = PBXGroup;
    1.33 -			children = (
    1.34 -				B70D32A7205BCC2D0094A92A /* CellsAndSections */,
    1.35 -				4304FCFE1EBB8C5A0086DADA /* LanguageListViewController.swift */,
    1.36 -			);
    1.37 -			path = LanguageList;
    1.38 -			sourceTree = "<group>";
    1.39 -		};
    1.40  		430D73601E9CBD0600EA6FA9 /* Background */ = {
    1.41  			isa = PBXGroup;
    1.42  			children = (
    1.43 @@ -3084,7 +3072,6 @@
    1.44  				152A39D121905C3E00D9F8E4 /* AttachmentViewModel.swift in Sources */,
    1.45  				4330278E1F7BABFF00D685F8 /* GradientView.swift in Sources */,
    1.46  				3AD2CBC923FD92650003A536 /* AccountSettingsViewModel.swift in Sources */,
    1.47 -				434F40961EB0DB5E002FBF0D /* HandshakePartnerTableViewCellViewModel.swift in Sources */,
    1.48  				152A39E121905C3E00D9F8E4 /* RecipientCellViewModel+FieldType.swift in Sources */,
    1.49  				4351C2CC1F4441190053381F /* cmark_ctype.c in Sources */,
    1.50  				152A39DB21905C3E00D9F8E4 /* CellViewModel.swift in Sources */,
     2.1 --- a/pEpForiOS/ca.lproj/FolderViews.strings	Mon Mar 02 02:39:17 2020 +0100
     2.2 +++ b/pEpForiOS/ca.lproj/FolderViews.strings	Mon Mar 02 10:32:14 2020 +0100
     2.3 @@ -1,3 +1,3 @@
     2.4 -
     2.5  /* Class = "UIButton"; normalTitle = "Add Account"; ObjectID = "NEj-lZ-p6O"; */
     2.6  "NEj-lZ-p6O.normalTitle" = "Add Account";
     2.7 +
     3.1 --- a/pEpForiOS/ca.lproj/Localizable.strings	Mon Mar 02 02:39:17 2020 +0100
     3.2 +++ b/pEpForiOS/ca.lproj/Localizable.strings	Mon Mar 02 10:32:14 2020 +0100
     3.3 @@ -25,12 +25,14 @@
     3.4  
     3.5  /* alert action 3
     3.6     Alert cancel button title before trusting an account
     3.7 +   Cancel
     3.8     Cancel button title for manual account setup
     3.9     Cancel button title of pEp protection toggle action sheet
    3.10     Cancel for an alert view
    3.11     Cancel in button in Login View
    3.12     Cancel reset account identity button title
    3.13     Cancel title button
    3.14 +   Cancel trust change to be undone
    3.15     compose email cancel
    3.16     Default cancel button text
    3.17     EmailList action title
    3.18 @@ -38,6 +40,7 @@
    3.19     keySyncWizard animation view cancel button title
    3.20     Message actions
    3.21     MoveToFolderViewController NavigationBar canel button title
    3.22 +   possible private status action
    3.23     UIUtils.presentActionSheetWithContactOptions.button.title Cancel */
    3.24  "Cancel" = "Cancel·lar";
    3.25  
    3.26 @@ -63,7 +66,8 @@
    3.27  /* keysync alert leave device group disable */
    3.28  "Disable" = "Disable";
    3.29  
    3.30 -/* Disable Protection button title of pEp protection toggle action sheet */
    3.31 +/* Disable Protection
    3.32 +   Disable Protection button title of pEp protection toggle action sheet */
    3.33  "Disable Protection" = "Deshabilitar protecció";
    3.34  
    3.35  /* enable p≡p Sync with other devices in the group */
    3.36 @@ -171,7 +175,8 @@
    3.37     privacyStatusTitle yellow */
    3.38  "Secure" = "Segur";
    3.39  
    3.40 -/* Settings view title */
    3.41 +/* acction sheet title 2
    3.42 +   Settings view title */
    3.43  "Settings" = "Configuració";
    3.44  
    3.45  /* Compose field title */
    3.46 @@ -213,7 +218,9 @@
    3.47  /* Privacy status title */
    3.48  "Under Attack" = "Atacat";
    3.49  
    3.50 -/* Privacy status title */
    3.51 +/* Privacy status title
    3.52 +   privacyStatusDescription no_color
    3.53 +   privacyStatusTitle no_color */
    3.54  "Unknown" = "Desconegut";
    3.55  
    3.56  /* Privacy status title */
     4.1 --- a/pEpForiOS/ca.lproj/NothingSelected.strings	Mon Mar 02 02:39:17 2020 +0100
     4.2 +++ b/pEpForiOS/ca.lproj/NothingSelected.strings	Mon Mar 02 10:32:14 2020 +0100
     4.3 @@ -1,3 +1,3 @@
     4.4 -
     4.5  /* Class = "UILabel"; text = "Nothing Selected"; ObjectID = "Rk5-l1-Vt8"; Note = "Don't localize"; */
     4.6  "Rk5-l1-Vt8.text" = "Nothing Selected";
     4.7 +
     5.1 --- a/pEpForiOS/ca.lproj/Reusable.strings	Mon Mar 02 02:39:17 2020 +0100
     5.2 +++ b/pEpForiOS/ca.lproj/Reusable.strings	Mon Mar 02 10:32:14 2020 +0100
     5.3 @@ -1,3 +1,11 @@
     5.4 +/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
     5.5 +"aAW-1y-cXc.text" = "Name";
     5.6 +
     5.7 +/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
     5.8 +"ckp-rp-1Pd.text" = "Label";
     5.9 +
    5.10 +/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
    5.11 +"emU-WV-Kap.normalTitle" = "Button";
    5.12  
    5.13  /* Class = "UILabel"; text = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda."; ObjectID = "GC3-wG-GHD"; */
    5.14  "GC3-wG-GHD.text" = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.";
    5.15 @@ -5,6 +13,9 @@
    5.16  /* Class = "UINavigationItem"; title = "Add to Contacts"; ObjectID = "Jan-ZA-zMd"; */
    5.17  "Jan-ZA-zMd.title" = "Add to Contacts";
    5.18  
    5.19 +/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
    5.20 +"kNd-Jx-X9l.text" = "Label";
    5.21 +
    5.22  /* Class = "UILabel"; text = "Label"; ObjectID = "KYt-Qv-FPp"; */
    5.23  "KYt-Qv-FPp.text" = "Label";
    5.24  
    5.25 @@ -14,20 +25,9 @@
    5.26  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "Rgh-E1-f1w"; */
    5.27  "Rgh-E1-f1w.normalTitle" = "Button";
    5.28  
    5.29 -/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
    5.30 -"aAW-1y-cXc.text" = "Name";
    5.31 -
    5.32 -/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
    5.33 -"ckp-rp-1Pd.text" = "Label";
    5.34 -
    5.35 -/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
    5.36 -"emU-WV-Kap.normalTitle" = "Button";
    5.37 -
    5.38 -/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
    5.39 -"kNd-Jx-X9l.text" = "Label";
    5.40 -
    5.41  /* Class = "UILabel"; text = "Label"; ObjectID = "rPi-Px-Pyp"; */
    5.42  "rPi-Px-Pyp.text" = "Label";
    5.43  
    5.44  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "w5A-sP-MB2"; */
    5.45  "w5A-sP-MB2.normalTitle" = "Button";
    5.46 +
     6.1 --- a/pEpForiOS/de.lproj/Localizable.strings	Mon Mar 02 02:39:17 2020 +0100
     6.2 +++ b/pEpForiOS/de.lproj/Localizable.strings	Mon Mar 02 10:32:14 2020 +0100
     6.3 @@ -72,12 +72,14 @@
     6.4  
     6.5  /* alert action 3
     6.6     Alert cancel button title before trusting an account
     6.7 +   Cancel
     6.8     Cancel button title for manual account setup
     6.9     Cancel button title of pEp protection toggle action sheet
    6.10     Cancel for an alert view
    6.11     Cancel in button in Login View
    6.12     Cancel reset account identity button title
    6.13     Cancel title button
    6.14 +   Cancel trust change to be undone
    6.15     compose email cancel
    6.16     Default cancel button text
    6.17     EmailList action title
    6.18 @@ -85,6 +87,7 @@
    6.19     keySyncWizard animation view cancel button title
    6.20     Message actions
    6.21     MoveToFolderViewController NavigationBar canel button title
    6.22 +   possible private status action
    6.23     UIUtils.presentActionSheetWithContactOptions.button.title Cancel */
    6.24  "Cancel" = "Abbrechen";
    6.25  
    6.26 @@ -136,7 +139,8 @@
    6.27  /* keysync alert leave device group disable */
    6.28  "Disable" = "Deaktivieren";
    6.29  
    6.30 -/* Disable Protection button title of pEp protection toggle action sheet */
    6.31 +/* Disable Protection
    6.32 +   Disable Protection button title of pEp protection toggle action sheet */
    6.33  "Disable Protection" = "Schutz abschalten";
    6.34  
    6.35  /* ComposeTableView: button to decide to discharge changes made on a drafted mail. */
    6.36 @@ -157,7 +161,8 @@
    6.37  /* title for subject protection */
    6.38  "Enable Protected Subject" = "Geschützten Betreff aktivieren";
    6.39  
    6.40 -/* Enable Protection button title of pEp protection toggle action sheet */
    6.41 +/* Enable Protection
    6.42 +   Enable Protection button title of pEp protection toggle action sheet */
    6.43  "Enable Protection" = "Schutz aktivieren";
    6.44  
    6.45  /* Title of error alert shown to the user in case a message could not be sent
    6.46 @@ -450,7 +455,8 @@
    6.47  /* Settings: Cell (button) title for entering fingerprints that are made own keys */
    6.48  "Set Own Key" = "Eigenen Schlüssel festlegen";
    6.49  
    6.50 -/* Settings view title */
    6.51 +/* acction sheet title 2
    6.52 +   Settings view title */
    6.53  "Settings" = "Einstellungen";
    6.54  
    6.55  /* Login */
    6.56 @@ -571,7 +577,9 @@
    6.57  /* Displayed attachment filename if unknown */
    6.58  "unknown" = "unbekannt";
    6.59  
    6.60 -/* Privacy status title */
    6.61 +/* Privacy status title
    6.62 +   privacyStatusDescription no_color
    6.63 +   privacyStatusTitle no_color */
    6.64  "Unknown" = "Unbekannt";
    6.65  
    6.66  /* file name used for unnamed attachments */
     7.1 --- a/pEpForiOS/en.lproj/Settings.strings	Mon Mar 02 02:39:17 2020 +0100
     7.2 +++ b/pEpForiOS/en.lproj/Settings.strings	Mon Mar 02 10:32:14 2020 +0100
     7.3 @@ -1,81 +1,27 @@
     7.4 -/* Class = "UILabel"; text = "Detail"; ObjectID = "0Qq-nB-Xso"; */
     7.5 -"0Qq-nB-Xso.text" = "Detail";
     7.6 -
     7.7 -/* Class = "UIViewController"; title = "Extra Keys"; ObjectID = "4fP-ku-UtU"; */
     7.8 -"4fP-ku-UtU.title" = "Extra Keys";
     7.9 -
    7.10 -/* Class = "UILabel"; text = "Email"; ObjectID = "7Lp-ph-4lC"; */
    7.11 -"7Lp-ph-4lC.text" = "Email";
    7.12 -
    7.13 -/* Class = "UILabel"; text = "Fingerprint"; ObjectID = "8ib-BO-jFp"; */
    7.14 -"8ib-BO-jFp.text" = "Fingerprint";
    7.15 -
    7.16 -/* Class = "UILabel"; text = "Label"; ObjectID = "Ag8-Qj-N8l"; */
    7.17 -"Ag8-Qj-N8l.text" = "Label";
    7.18 -
    7.19 -/* Class = "UILabel"; text = "Title"; ObjectID = "D99-2G-2i2"; */
    7.20 -"D99-2G-2i2.text" = "Title";
    7.21 -
    7.22 -/* Class = "UILabel"; text = "Transport Security:"; ObjectID = "daw-LF-EZF"; */
    7.23 +/* Class = "UILabel"; text = "Transport Security"; ObjectID = "daw-LF-EZF"; */
    7.24  "daw-LF-EZF.text" = "Transport Security:";
    7.25  
    7.26 -/* Class = "UILabel"; text = "Server:"; ObjectID = "DQ0-sB-CRx"; */
    7.27 +/* Class = "UILabel"; text = "Server"; ObjectID = "DQ0-sB-CRx"; */
    7.28  "DQ0-sB-CRx.text" = "Server:";
    7.29  
    7.30 -/* Class = "UILabel"; text = "KeySync"; ObjectID = "E8I-np-XGR"; */
    7.31 -"E8I-np-XGR.text" = "KeySync";
    7.32 -
    7.33 -/* Class = "UILabel"; text = "Password:"; ObjectID = "En6-h6-xZD"; */
    7.34 +/* Class = "UILabel"; text = "Password"; ObjectID = "En6-h6-xZD"; */
    7.35  "En6-h6-xZD.text" = "Password:";
    7.36  
    7.37 -/* Class = "UILabel"; text = "Transport Security:"; ObjectID = "hAL-c1-ngD"; */
    7.38 +/* Class = "UILabel"; text = "Transport Security"; ObjectID = "hAL-c1-ngD"; */
    7.39  "hAL-c1-ngD.text" = "Transport Security:";
    7.40  
    7.41 -/* Class = "UILabel"; text = "Title"; ObjectID = "hHr-Jq-PRg"; */
    7.42 -"hHr-Jq-PRg.text" = "Title";
    7.43 -
    7.44 -/* Class = "UIButton"; normalTitle = "add fingerprint"; ObjectID = "J2v-Vi-URg"; */
    7.45 -"J2v-Vi-URg.normalTitle" = "add fingerprint";
    7.46 -
    7.47 -/* Class = "UIButton"; normalTitle = "Set Own Key"; ObjectID = "lzc-xZ-iKm"; */
    7.48 -"lzc-xZ-iKm.normalTitle" = "Set Own Key";
    7.49 -
    7.50 -/* Class = "UITableViewSection"; headerTitle = "Section-4"; ObjectID = "NDe-dz-nXc"; */
    7.51 -"NDe-dz-nXc.headerTitle" = "Section-4";
    7.52 -
    7.53 -/* Class = "UILabel"; text = "Email:"; ObjectID = "Ne5-6o-O4F"; */
    7.54 +/* Class = "UILabel"; text = "Email"; ObjectID = "Ne5-6o-O4F"; */
    7.55  "Ne5-6o-O4F.text" = "Email:";
    7.56  
    7.57 -/* Class = "UILabel"; text = "Title"; ObjectID = "Pdx-rN-QPm"; */
    7.58 -"Pdx-rN-QPm.text" = "Title";
    7.59 -
    7.60 -/* Class = "UILabel"; text = "Name:"; ObjectID = "QcW-va-Qh4"; */
    7.61 +/* Class = "UILabel"; text = "Name"; ObjectID = "QcW-va-Qh4"; */
    7.62  "QcW-va-Qh4.text" = "Name:";
    7.63  
    7.64 -/* Class = "UILabel"; text = "set_own_key Error"; ObjectID = "ujL-Pa-uXD"; Note = "Don't localize this"; */
    7.65 -"ujL-Pa-uXD.text" = "set_own_key Error";
    7.66 -
    7.67 -/* Class = "UILabel"; text = "Port:"; ObjectID = "Vdb-LS-4JH"; */
    7.68 +/* Class = "UILabel"; text = "Port"; ObjectID = "Vdb-LS-4JH"; */
    7.69  "Vdb-LS-4JH.text" = "Port:";
    7.70  
    7.71 -/* Class = "UILabel"; text = "Title"; ObjectID = "vjp-2e-dTM"; */
    7.72 -"vjp-2e-dTM.text" = "Title";
    7.73 -
    7.74 -/* Class = "UILabel"; text = "Server:"; ObjectID = "weI-Bw-0PK"; */
    7.75 +/* Class = "UILabel"; text = "Server"; ObjectID = "weI-Bw-0PK"; */
    7.76  "weI-Bw-0PK.text" = "Server:";
    7.77  
    7.78 -/* Class = "UILabel"; text = "OAuth2 Reauthorization"; ObjectID = "wxK-W7-y8D"; */
    7.79 -"wxK-W7-y8D.text" = "OAuth2 Reauthorization";
    7.80 -
    7.81 -/* Class = "UILabel"; text = "Label"; ObjectID = "X0Z-Ju-XOO"; */
    7.82 -"X0Z-Ju-XOO.text" = "Label";
    7.83 -
    7.84 -/* Class = "UILabel"; text = "Title"; ObjectID = "xiv-OD-YNL"; */
    7.85 -"xiv-OD-YNL.text" = "Title";
    7.86 -
    7.87 -/* Class = "UILabel"; text = "Username:"; ObjectID = "YGG-ns-Pes"; */
    7.88 -"YGG-ns-Pes.text" = "Username:";
    7.89 -
    7.90 -/* Class = "UILabel"; text = "Port:"; ObjectID = "zDb-ax-ng4"; */
    7.91 +/* Class = "UILabel"; text = "Port"; ObjectID = "zDb-ax-ng4"; */
    7.92  "zDb-ax-ng4.text" = "Port:";
    7.93  
     8.1 --- a/pEpForiOS/es.lproj/AccountCreation.strings	Mon Mar 02 02:39:17 2020 +0100
     8.2 +++ b/pEpForiOS/es.lproj/AccountCreation.strings	Mon Mar 02 10:32:14 2020 +0100
     8.3 @@ -4,9 +4,6 @@
     8.4  /* Class = "UILabel"; text = "p≡p Sync"; ObjectID = "DEp-6Y-fcV"; */
     8.5  "DEp-6Y-fcV.text" = "p≡p Sync";
     8.6  
     8.7 -/* Class = "UIButton"; normalTitle = "Manual Setup"; ObjectID = "JT1-ND-6bH"; */
     8.8 -"JT1-ND-6bH.normalTitle" = "";
     8.9 -
    8.10  /* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "Sub-2j-OvV"; */
    8.11  "Sub-2j-OvV.normalTitle" = "Cancelar";
    8.12  
     9.1 --- a/pEpForiOS/es.lproj/FolderViews.strings	Mon Mar 02 02:39:17 2020 +0100
     9.2 +++ b/pEpForiOS/es.lproj/FolderViews.strings	Mon Mar 02 10:32:14 2020 +0100
     9.3 @@ -1,3 +1,3 @@
     9.4 -
     9.5  /* Class = "UIButton"; normalTitle = "Add Account"; ObjectID = "NEj-lZ-p6O"; */
     9.6  "NEj-lZ-p6O.normalTitle" = "Add Account";
     9.7 +
    10.1 --- a/pEpForiOS/es.lproj/Localizable.strings	Mon Mar 02 02:39:17 2020 +0100
    10.2 +++ b/pEpForiOS/es.lproj/Localizable.strings	Mon Mar 02 10:32:14 2020 +0100
    10.3 @@ -25,12 +25,14 @@
    10.4  
    10.5  /* alert action 3
    10.6     Alert cancel button title before trusting an account
    10.7 +   Cancel
    10.8     Cancel button title for manual account setup
    10.9     Cancel button title of pEp protection toggle action sheet
   10.10     Cancel for an alert view
   10.11     Cancel in button in Login View
   10.12     Cancel reset account identity button title
   10.13     Cancel title button
   10.14 +   Cancel trust change to be undone
   10.15     compose email cancel
   10.16     Default cancel button text
   10.17     EmailList action title
   10.18 @@ -38,6 +40,7 @@
   10.19     keySyncWizard animation view cancel button title
   10.20     Message actions
   10.21     MoveToFolderViewController NavigationBar canel button title
   10.22 +   possible private status action
   10.23     UIUtils.presentActionSheetWithContactOptions.button.title Cancel */
   10.24  "Cancel" = "Cancelar";
   10.25  
   10.26 @@ -63,7 +66,8 @@
   10.27  /* keysync alert leave device group disable */
   10.28  "Disable" = "Desactivar";
   10.29  
   10.30 -/* Disable Protection button title of pEp protection toggle action sheet */
   10.31 +/* Disable Protection
   10.32 +   Disable Protection button title of pEp protection toggle action sheet */
   10.33  "Disable Protection" = "Deshabitar protección";
   10.34  
   10.35  /* enable p≡p Sync with other devices in the group */
   10.36 @@ -171,7 +175,8 @@
   10.37     privacyStatusTitle yellow */
   10.38  "Secure" = "Seguro";
   10.39  
   10.40 -/* Settings view title */
   10.41 +/* acction sheet title 2
   10.42 +   Settings view title */
   10.43  "Settings" = "Configuración";
   10.44  
   10.45  /* Compose field title */
   10.46 @@ -213,7 +218,9 @@
   10.47  /* Privacy status title */
   10.48  "Under Attack" = "Falsificado";
   10.49  
   10.50 -/* Privacy status title */
   10.51 +/* Privacy status title
   10.52 +   privacyStatusDescription no_color
   10.53 +   privacyStatusTitle no_color */
   10.54  "Unknown" = "Desconocido";
   10.55  
   10.56  /* Privacy status title */
    11.1 --- a/pEpForiOS/es.lproj/NothingSelected.strings	Mon Mar 02 02:39:17 2020 +0100
    11.2 +++ b/pEpForiOS/es.lproj/NothingSelected.strings	Mon Mar 02 10:32:14 2020 +0100
    11.3 @@ -1,3 +1,3 @@
    11.4 -
    11.5  /* Class = "UILabel"; text = "Nothing Selected"; ObjectID = "Rk5-l1-Vt8"; Note = "Don't localize"; */
    11.6  "Rk5-l1-Vt8.text" = "Nothing Selected";
    11.7 +
    12.1 --- a/pEpForiOS/es.lproj/Reusable.strings	Mon Mar 02 02:39:17 2020 +0100
    12.2 +++ b/pEpForiOS/es.lproj/Reusable.strings	Mon Mar 02 10:32:14 2020 +0100
    12.3 @@ -1,3 +1,11 @@
    12.4 +/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
    12.5 +"aAW-1y-cXc.text" = "Name";
    12.6 +
    12.7 +/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
    12.8 +"ckp-rp-1Pd.text" = "Label";
    12.9 +
   12.10 +/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
   12.11 +"emU-WV-Kap.normalTitle" = "Button";
   12.12  
   12.13  /* Class = "UILabel"; text = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda."; ObjectID = "GC3-wG-GHD"; */
   12.14  "GC3-wG-GHD.text" = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.";
   12.15 @@ -5,6 +13,9 @@
   12.16  /* Class = "UINavigationItem"; title = "Add to Contacts"; ObjectID = "Jan-ZA-zMd"; */
   12.17  "Jan-ZA-zMd.title" = "Add to Contacts";
   12.18  
   12.19 +/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
   12.20 +"kNd-Jx-X9l.text" = "Label";
   12.21 +
   12.22  /* Class = "UILabel"; text = "Label"; ObjectID = "KYt-Qv-FPp"; */
   12.23  "KYt-Qv-FPp.text" = "Label";
   12.24  
   12.25 @@ -14,20 +25,9 @@
   12.26  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "Rgh-E1-f1w"; */
   12.27  "Rgh-E1-f1w.normalTitle" = "Button";
   12.28  
   12.29 -/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
   12.30 -"aAW-1y-cXc.text" = "Name";
   12.31 -
   12.32 -/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
   12.33 -"ckp-rp-1Pd.text" = "Label";
   12.34 -
   12.35 -/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
   12.36 -"emU-WV-Kap.normalTitle" = "Button";
   12.37 -
   12.38 -/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
   12.39 -"kNd-Jx-X9l.text" = "Label";
   12.40 -
   12.41  /* Class = "UILabel"; text = "Label"; ObjectID = "rPi-Px-Pyp"; */
   12.42  "rPi-Px-Pyp.text" = "Label";
   12.43  
   12.44  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "w5A-sP-MB2"; */
   12.45  "w5A-sP-MB2.normalTitle" = "Button";
   12.46 +
    13.1 --- a/pEpForiOS/fr.lproj/FolderViews.strings	Mon Mar 02 02:39:17 2020 +0100
    13.2 +++ b/pEpForiOS/fr.lproj/FolderViews.strings	Mon Mar 02 10:32:14 2020 +0100
    13.3 @@ -1,3 +1,3 @@
    13.4 -
    13.5  /* Class = "UIButton"; normalTitle = "Add Account"; ObjectID = "NEj-lZ-p6O"; */
    13.6  "NEj-lZ-p6O.normalTitle" = "Add Account";
    13.7 +
    14.1 --- a/pEpForiOS/fr.lproj/Localizable.strings	Mon Mar 02 02:39:17 2020 +0100
    14.2 +++ b/pEpForiOS/fr.lproj/Localizable.strings	Mon Mar 02 10:32:14 2020 +0100
    14.3 @@ -29,12 +29,14 @@
    14.4  
    14.5  /* alert action 3
    14.6     Alert cancel button title before trusting an account
    14.7 +   Cancel
    14.8     Cancel button title for manual account setup
    14.9     Cancel button title of pEp protection toggle action sheet
   14.10     Cancel for an alert view
   14.11     Cancel in button in Login View
   14.12     Cancel reset account identity button title
   14.13     Cancel title button
   14.14 +   Cancel trust change to be undone
   14.15     compose email cancel
   14.16     Default cancel button text
   14.17     EmailList action title
   14.18 @@ -42,6 +44,7 @@
   14.19     keySyncWizard animation view cancel button title
   14.20     Message actions
   14.21     MoveToFolderViewController NavigationBar canel button title
   14.22 +   possible private status action
   14.23     UIUtils.presentActionSheetWithContactOptions.button.title Cancel */
   14.24  "Cancel" = "Annuler";
   14.25  
   14.26 @@ -74,13 +77,15 @@
   14.27  /* keysync alert leave device group disable */
   14.28  "Disable" = "Désactiver";
   14.29  
   14.30 -/* Disable Protection button title of pEp protection toggle action sheet */
   14.31 +/* Disable Protection
   14.32 +   Disable Protection button title of pEp protection toggle action sheet */
   14.33  "Disable Protection" = "Désactivez la protection";
   14.34  
   14.35  /* enable p≡p Sync with other devices in the group */
   14.36  "Enable p≡p Sync" = "Enable p≡p Sync";
   14.37  
   14.38 -/* Enable Protection button title of pEp protection toggle action sheet */
   14.39 +/* Enable Protection
   14.40 +   Enable Protection button title of pEp protection toggle action sheet */
   14.41  "Enable Protection" = "Activer la protection";
   14.42  
   14.43  /* Finish button title for manual account SMTP setup
   14.44 @@ -195,7 +200,8 @@
   14.45     privacyStatusTitle green */
   14.46  "Secure & Trusted" = "Sécurisé & Authentique";
   14.47  
   14.48 -/* Settings view title */
   14.49 +/* acction sheet title 2
   14.50 +   Settings view title */
   14.51  "Settings" = "Paramètres";
   14.52  
   14.53  /* Title manual account SMTP setup */
   14.54 @@ -250,7 +256,9 @@
   14.55  /* Displayed attachment filename if unknown */
   14.56  "unknown" = "Indéterminé";
   14.57  
   14.58 -/* Privacy status title */
   14.59 +/* Privacy status title
   14.60 +   privacyStatusDescription no_color
   14.61 +   privacyStatusTitle no_color */
   14.62  "Unknown" = "Indéterminé";
   14.63  
   14.64  /* Privacy status title */
    15.1 --- a/pEpForiOS/fr.lproj/NothingSelected.strings	Mon Mar 02 02:39:17 2020 +0100
    15.2 +++ b/pEpForiOS/fr.lproj/NothingSelected.strings	Mon Mar 02 10:32:14 2020 +0100
    15.3 @@ -1,3 +1,3 @@
    15.4 -
    15.5  /* Class = "UILabel"; text = "Nothing Selected"; ObjectID = "Rk5-l1-Vt8"; Note = "Don't localize"; */
    15.6  "Rk5-l1-Vt8.text" = "Nothing Selected";
    15.7 +
    16.1 --- a/pEpForiOS/fr.lproj/Reusable.strings	Mon Mar 02 02:39:17 2020 +0100
    16.2 +++ b/pEpForiOS/fr.lproj/Reusable.strings	Mon Mar 02 10:32:14 2020 +0100
    16.3 @@ -1,3 +1,11 @@
    16.4 +/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
    16.5 +"aAW-1y-cXc.text" = "Name";
    16.6 +
    16.7 +/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
    16.8 +"ckp-rp-1Pd.text" = "Label";
    16.9 +
   16.10 +/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
   16.11 +"emU-WV-Kap.normalTitle" = "Button";
   16.12  
   16.13  /* Class = "UILabel"; text = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda."; ObjectID = "GC3-wG-GHD"; */
   16.14  "GC3-wG-GHD.text" = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.";
   16.15 @@ -5,6 +13,9 @@
   16.16  /* Class = "UINavigationItem"; title = "Add to Contacts"; ObjectID = "Jan-ZA-zMd"; */
   16.17  "Jan-ZA-zMd.title" = "Add to Contacts";
   16.18  
   16.19 +/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
   16.20 +"kNd-Jx-X9l.text" = "Label";
   16.21 +
   16.22  /* Class = "UILabel"; text = "Label"; ObjectID = "KYt-Qv-FPp"; */
   16.23  "KYt-Qv-FPp.text" = "Label";
   16.24  
   16.25 @@ -14,20 +25,9 @@
   16.26  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "Rgh-E1-f1w"; */
   16.27  "Rgh-E1-f1w.normalTitle" = "Button";
   16.28  
   16.29 -/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
   16.30 -"aAW-1y-cXc.text" = "Name";
   16.31 -
   16.32 -/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
   16.33 -"ckp-rp-1Pd.text" = "Label";
   16.34 -
   16.35 -/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
   16.36 -"emU-WV-Kap.normalTitle" = "Button";
   16.37 -
   16.38 -/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
   16.39 -"kNd-Jx-X9l.text" = "Label";
   16.40 -
   16.41  /* Class = "UILabel"; text = "Label"; ObjectID = "rPi-Px-Pyp"; */
   16.42  "rPi-Px-Pyp.text" = "Label";
   16.43  
   16.44  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "w5A-sP-MB2"; */
   16.45  "w5A-sP-MB2.normalTitle" = "Button";
   16.46 +
    17.1 --- a/pEpForiOS/nl.lproj/FolderViews.strings	Mon Mar 02 02:39:17 2020 +0100
    17.2 +++ b/pEpForiOS/nl.lproj/FolderViews.strings	Mon Mar 02 10:32:14 2020 +0100
    17.3 @@ -1,3 +1,3 @@
    17.4 -
    17.5  /* Class = "UIButton"; normalTitle = "Add Account"; ObjectID = "NEj-lZ-p6O"; */
    17.6  "NEj-lZ-p6O.normalTitle" = "Add Account";
    17.7 +
    18.1 --- a/pEpForiOS/nl.lproj/Localizable.strings	Mon Mar 02 02:39:17 2020 +0100
    18.2 +++ b/pEpForiOS/nl.lproj/Localizable.strings	Mon Mar 02 10:32:14 2020 +0100
    18.3 @@ -25,12 +25,14 @@
    18.4  
    18.5  /* alert action 3
    18.6     Alert cancel button title before trusting an account
    18.7 +   Cancel
    18.8     Cancel button title for manual account setup
    18.9     Cancel button title of pEp protection toggle action sheet
   18.10     Cancel for an alert view
   18.11     Cancel in button in Login View
   18.12     Cancel reset account identity button title
   18.13     Cancel title button
   18.14 +   Cancel trust change to be undone
   18.15     compose email cancel
   18.16     Default cancel button text
   18.17     EmailList action title
   18.18 @@ -38,6 +40,7 @@
   18.19     keySyncWizard animation view cancel button title
   18.20     Message actions
   18.21     MoveToFolderViewController NavigationBar canel button title
   18.22 +   possible private status action
   18.23     UIUtils.presentActionSheetWithContactOptions.button.title Cancel */
   18.24  "Cancel" = "Annuleren";
   18.25  
   18.26 @@ -168,7 +171,8 @@
   18.27     privacyStatusTitle yellow */
   18.28  "Secure" = "Veilig";
   18.29  
   18.30 -/* Settings view title */
   18.31 +/* acction sheet title 2
   18.32 +   Settings view title */
   18.33  "Settings" = "Instellingen";
   18.34  
   18.35  /* Compose field title */
   18.36 @@ -210,7 +214,9 @@
   18.37  /* Privacy status title */
   18.38  "Under Attack" = "Aangevallen";
   18.39  
   18.40 -/* Privacy status title */
   18.41 +/* Privacy status title
   18.42 +   privacyStatusDescription no_color
   18.43 +   privacyStatusTitle no_color */
   18.44  "Unknown" = "Onbekend";
   18.45  
   18.46  /* Privacy status title */
    19.1 --- a/pEpForiOS/nl.lproj/NothingSelected.strings	Mon Mar 02 02:39:17 2020 +0100
    19.2 +++ b/pEpForiOS/nl.lproj/NothingSelected.strings	Mon Mar 02 10:32:14 2020 +0100
    19.3 @@ -1,3 +1,3 @@
    19.4 -
    19.5  /* Class = "UILabel"; text = "Nothing Selected"; ObjectID = "Rk5-l1-Vt8"; Note = "Don't localize"; */
    19.6  "Rk5-l1-Vt8.text" = "Nothing Selected";
    19.7 +
    20.1 --- a/pEpForiOS/nl.lproj/Reusable.strings	Mon Mar 02 02:39:17 2020 +0100
    20.2 +++ b/pEpForiOS/nl.lproj/Reusable.strings	Mon Mar 02 10:32:14 2020 +0100
    20.3 @@ -1,3 +1,11 @@
    20.4 +/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
    20.5 +"aAW-1y-cXc.text" = "Name";
    20.6 +
    20.7 +/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
    20.8 +"ckp-rp-1Pd.text" = "Label";
    20.9 +
   20.10 +/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
   20.11 +"emU-WV-Kap.normalTitle" = "Button";
   20.12  
   20.13  /* Class = "UILabel"; text = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda."; ObjectID = "GC3-wG-GHD"; */
   20.14  "GC3-wG-GHD.text" = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.";
   20.15 @@ -5,6 +13,9 @@
   20.16  /* Class = "UINavigationItem"; title = "Add to Contacts"; ObjectID = "Jan-ZA-zMd"; */
   20.17  "Jan-ZA-zMd.title" = "Add to Contacts";
   20.18  
   20.19 +/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
   20.20 +"kNd-Jx-X9l.text" = "Label";
   20.21 +
   20.22  /* Class = "UILabel"; text = "Label"; ObjectID = "KYt-Qv-FPp"; */
   20.23  "KYt-Qv-FPp.text" = "Label";
   20.24  
   20.25 @@ -14,20 +25,9 @@
   20.26  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "Rgh-E1-f1w"; */
   20.27  "Rgh-E1-f1w.normalTitle" = "Button";
   20.28  
   20.29 -/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
   20.30 -"aAW-1y-cXc.text" = "Name";
   20.31 -
   20.32 -/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
   20.33 -"ckp-rp-1Pd.text" = "Label";
   20.34 -
   20.35 -/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
   20.36 -"emU-WV-Kap.normalTitle" = "Button";
   20.37 -
   20.38 -/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
   20.39 -"kNd-Jx-X9l.text" = "Label";
   20.40 -
   20.41  /* Class = "UILabel"; text = "Label"; ObjectID = "rPi-Px-Pyp"; */
   20.42  "rPi-Px-Pyp.text" = "Label";
   20.43  
   20.44  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "w5A-sP-MB2"; */
   20.45  "w5A-sP-MB2.normalTitle" = "Button";
   20.46 +
    21.1 --- a/pEpForiOS/tr.lproj/FolderViews.strings	Mon Mar 02 02:39:17 2020 +0100
    21.2 +++ b/pEpForiOS/tr.lproj/FolderViews.strings	Mon Mar 02 10:32:14 2020 +0100
    21.3 @@ -1,3 +1,3 @@
    21.4 -
    21.5  /* Class = "UIButton"; normalTitle = "Add Account"; ObjectID = "NEj-lZ-p6O"; */
    21.6  "NEj-lZ-p6O.normalTitle" = "Add Account";
    21.7 +
    22.1 --- a/pEpForiOS/tr.lproj/Localizable.strings	Mon Mar 02 02:39:17 2020 +0100
    22.2 +++ b/pEpForiOS/tr.lproj/Localizable.strings	Mon Mar 02 10:32:14 2020 +0100
    22.3 @@ -25,12 +25,14 @@
    22.4  
    22.5  /* alert action 3
    22.6     Alert cancel button title before trusting an account
    22.7 +   Cancel
    22.8     Cancel button title for manual account setup
    22.9     Cancel button title of pEp protection toggle action sheet
   22.10     Cancel for an alert view
   22.11     Cancel in button in Login View
   22.12     Cancel reset account identity button title
   22.13     Cancel title button
   22.14 +   Cancel trust change to be undone
   22.15     compose email cancel
   22.16     Default cancel button text
   22.17     EmailList action title
   22.18 @@ -38,6 +40,7 @@
   22.19     keySyncWizard animation view cancel button title
   22.20     Message actions
   22.21     MoveToFolderViewController NavigationBar canel button title
   22.22 +   possible private status action
   22.23     UIUtils.presentActionSheetWithContactOptions.button.title Cancel */
   22.24  "Cancel" = "Vazgeç";
   22.25  
   22.26 @@ -63,7 +66,8 @@
   22.27  /* keysync alert leave device group disable */
   22.28  "Disable" = "Kapat";
   22.29  
   22.30 -/* Disable Protection button title of pEp protection toggle action sheet */
   22.31 +/* Disable Protection
   22.32 +   Disable Protection button title of pEp protection toggle action sheet */
   22.33  "Disable Protection" = "Korunmayı devre dışı bırak";
   22.34  
   22.35  /* enable p≡p Sync with other devices in the group */
   22.36 @@ -171,7 +175,8 @@
   22.37     privacyStatusTitle yellow */
   22.38  "Secure" = "Güvenli";
   22.39  
   22.40 -/* Settings view title */
   22.41 +/* acction sheet title 2
   22.42 +   Settings view title */
   22.43  "Settings" = "Ayarlar";
   22.44  
   22.45  /* Title manual account SMTP setup */
   22.46 @@ -216,7 +221,9 @@
   22.47  /* Privacy status title */
   22.48  "Under Attack" = "Saldırı altında";
   22.49  
   22.50 -/* Privacy status title */
   22.51 +/* Privacy status title
   22.52 +   privacyStatusDescription no_color
   22.53 +   privacyStatusTitle no_color */
   22.54  "Unknown" = "Bilinmeyen";
   22.55  
   22.56  /* Privacy status title */
    23.1 --- a/pEpForiOS/tr.lproj/NothingSelected.strings	Mon Mar 02 02:39:17 2020 +0100
    23.2 +++ b/pEpForiOS/tr.lproj/NothingSelected.strings	Mon Mar 02 10:32:14 2020 +0100
    23.3 @@ -1,3 +1,3 @@
    23.4 -
    23.5  /* Class = "UILabel"; text = "Nothing Selected"; ObjectID = "Rk5-l1-Vt8"; Note = "Don't localize"; */
    23.6  "Rk5-l1-Vt8.text" = "Nothing Selected";
    23.7 +
    24.1 --- a/pEpForiOS/tr.lproj/Reusable.strings	Mon Mar 02 02:39:17 2020 +0100
    24.2 +++ b/pEpForiOS/tr.lproj/Reusable.strings	Mon Mar 02 10:32:14 2020 +0100
    24.3 @@ -1,3 +1,11 @@
    24.4 +/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
    24.5 +"aAW-1y-cXc.text" = "Name";
    24.6 +
    24.7 +/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
    24.8 +"ckp-rp-1Pd.text" = "Label";
    24.9 +
   24.10 +/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
   24.11 +"emU-WV-Kap.normalTitle" = "Button";
   24.12  
   24.13  /* Class = "UILabel"; text = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda."; ObjectID = "GC3-wG-GHD"; */
   24.14  "GC3-wG-GHD.text" = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.";
   24.15 @@ -5,6 +13,9 @@
   24.16  /* Class = "UINavigationItem"; title = "Add to Contacts"; ObjectID = "Jan-ZA-zMd"; */
   24.17  "Jan-ZA-zMd.title" = "Add to Contacts";
   24.18  
   24.19 +/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
   24.20 +"kNd-Jx-X9l.text" = "Label";
   24.21 +
   24.22  /* Class = "UILabel"; text = "Label"; ObjectID = "KYt-Qv-FPp"; */
   24.23  "KYt-Qv-FPp.text" = "Label";
   24.24  
   24.25 @@ -14,20 +25,9 @@
   24.26  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "Rgh-E1-f1w"; */
   24.27  "Rgh-E1-f1w.normalTitle" = "Button";
   24.28  
   24.29 -/* Class = "UILabel"; text = "Name"; ObjectID = "aAW-1y-cXc"; */
   24.30 -"aAW-1y-cXc.text" = "Name";
   24.31 -
   24.32 -/* Class = "UILabel"; text = "Label"; ObjectID = "ckp-rp-1Pd"; */
   24.33 -"ckp-rp-1Pd.text" = "Label";
   24.34 -
   24.35 -/* Class = "UIButton"; normalTitle = "Button"; ObjectID = "emU-WV-Kap"; */
   24.36 -"emU-WV-Kap.normalTitle" = "Button";
   24.37 -
   24.38 -/* Class = "UILabel"; text = "Label"; ObjectID = "kNd-Jx-X9l"; */
   24.39 -"kNd-Jx-X9l.text" = "Label";
   24.40 -
   24.41  /* Class = "UILabel"; text = "Label"; ObjectID = "rPi-Px-Pyp"; */
   24.42  "rPi-Px-Pyp.text" = "Label";
   24.43  
   24.44  /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "w5A-sP-MB2"; */
   24.45  "w5A-sP-MB2.normalTitle" = "Button";
   24.46 +