From 95098ff74ca0866b9bd8a139b655f07f16c5a89f Mon Sep 17 00:00:00 2001
From: Axel Hecht <axel@pike.org>
Date: Fri, 14 Dec 2018 23:21:12 +0100
Subject: [PATCH] Make l10n paths more common, add l10n.toml config for checks
 (#882)

Looking good.
---
 ..._localpages.xml => localpages_strings.xml} |  0
 ...FirefoxReality_strings.xml => strings.xml} |  0
 ..._localpages.xml => localpages_strings.xml} |  0
 ...FirefoxReality_strings.xml => strings.xml} |  0
 ..._localpages.xml => localpages_strings.xml} |  0
 ...FirefoxReality_strings.xml => strings.xml} |  0
 ..._localpages.xml => localpages_strings.xml} |  0
 ...FirefoxReality_strings.xml => strings.xml} |  0
 ..._localpages.xml => localpages_strings.xml} |  0
 ...FirefoxReality_strings.xml => strings.xml} |  0
 ..._localpages.xml => localpages_strings.xml} |  0
 ...FirefoxReality_strings.xml => strings.xml} |  2 +-
 ..._localpages.xml => localpages_strings.xml} |  0
 ...FirefoxReality_strings.xml => strings.xml} |  0
 ..._localpages.xml => localpages_strings.xml} |  0
 ...FirefoxReality_strings.xml => strings.xml} |  0
 ...{localpages.xml => localpages_strings.xml} |  0
 l10n.toml                                     | 23 +++++++++++++++++++
 18 files changed, 24 insertions(+), 1 deletion(-)
 rename app/src/main/res/values-de/{FirefoxReality_localpages.xml => localpages_strings.xml} (100%)
 rename app/src/main/res/values-de/{FirefoxReality_strings.xml => strings.xml} (100%)
 rename app/src/main/res/values-es/{FirefoxReality_localpages.xml => localpages_strings.xml} (100%)
 rename app/src/main/res/values-es/{FirefoxReality_strings.xml => strings.xml} (100%)
 rename app/src/main/res/values-fr/{FirefoxReality_localpages.xml => localpages_strings.xml} (100%)
 rename app/src/main/res/values-fr/{FirefoxReality_strings.xml => strings.xml} (100%)
 rename app/src/main/res/values-it/{FirefoxReality_localpages.xml => localpages_strings.xml} (100%)
 rename app/src/main/res/values-it/{FirefoxReality_strings.xml => strings.xml} (100%)
 rename app/src/main/res/values-ja/{FirefoxReality_localpages.xml => localpages_strings.xml} (100%)
 rename app/src/main/res/values-ja/{FirefoxReality_strings.xml => strings.xml} (100%)
 rename app/src/main/res/values-ko/{FirefoxReality_localpages.xml => localpages_strings.xml} (100%)
 rename app/src/main/res/values-ko/{FirefoxReality_strings.xml => strings.xml} (99%)
 rename app/src/main/res/values-zh-rCN/{FirefoxReality_localpages.xml => localpages_strings.xml} (100%)
 rename app/src/main/res/values-zh-rCN/{FirefoxReality_strings.xml => strings.xml} (100%)
 rename app/src/main/res/values-zh-rTW/{FirefoxReality_localpages.xml => localpages_strings.xml} (100%)
 rename app/src/main/res/values-zh-rTW/{FirefoxReality_strings.xml => strings.xml} (100%)
 rename app/src/main/res/values/{localpages.xml => localpages_strings.xml} (100%)
 create mode 100644 l10n.toml

diff --git a/app/src/main/res/values-de/FirefoxReality_localpages.xml b/app/src/main/res/values-de/localpages_strings.xml
similarity index 100%
rename from app/src/main/res/values-de/FirefoxReality_localpages.xml
rename to app/src/main/res/values-de/localpages_strings.xml
diff --git a/app/src/main/res/values-de/FirefoxReality_strings.xml b/app/src/main/res/values-de/strings.xml
similarity index 100%
rename from app/src/main/res/values-de/FirefoxReality_strings.xml
rename to app/src/main/res/values-de/strings.xml
diff --git a/app/src/main/res/values-es/FirefoxReality_localpages.xml b/app/src/main/res/values-es/localpages_strings.xml
similarity index 100%
rename from app/src/main/res/values-es/FirefoxReality_localpages.xml
rename to app/src/main/res/values-es/localpages_strings.xml
diff --git a/app/src/main/res/values-es/FirefoxReality_strings.xml b/app/src/main/res/values-es/strings.xml
similarity index 100%
rename from app/src/main/res/values-es/FirefoxReality_strings.xml
rename to app/src/main/res/values-es/strings.xml
diff --git a/app/src/main/res/values-fr/FirefoxReality_localpages.xml b/app/src/main/res/values-fr/localpages_strings.xml
similarity index 100%
rename from app/src/main/res/values-fr/FirefoxReality_localpages.xml
rename to app/src/main/res/values-fr/localpages_strings.xml
diff --git a/app/src/main/res/values-fr/FirefoxReality_strings.xml b/app/src/main/res/values-fr/strings.xml
similarity index 100%
rename from app/src/main/res/values-fr/FirefoxReality_strings.xml
rename to app/src/main/res/values-fr/strings.xml
diff --git a/app/src/main/res/values-it/FirefoxReality_localpages.xml b/app/src/main/res/values-it/localpages_strings.xml
similarity index 100%
rename from app/src/main/res/values-it/FirefoxReality_localpages.xml
rename to app/src/main/res/values-it/localpages_strings.xml
diff --git a/app/src/main/res/values-it/FirefoxReality_strings.xml b/app/src/main/res/values-it/strings.xml
similarity index 100%
rename from app/src/main/res/values-it/FirefoxReality_strings.xml
rename to app/src/main/res/values-it/strings.xml
diff --git a/app/src/main/res/values-ja/FirefoxReality_localpages.xml b/app/src/main/res/values-ja/localpages_strings.xml
similarity index 100%
rename from app/src/main/res/values-ja/FirefoxReality_localpages.xml
rename to app/src/main/res/values-ja/localpages_strings.xml
diff --git a/app/src/main/res/values-ja/FirefoxReality_strings.xml b/app/src/main/res/values-ja/strings.xml
similarity index 100%
rename from app/src/main/res/values-ja/FirefoxReality_strings.xml
rename to app/src/main/res/values-ja/strings.xml
diff --git a/app/src/main/res/values-ko/FirefoxReality_localpages.xml b/app/src/main/res/values-ko/localpages_strings.xml
similarity index 100%
rename from app/src/main/res/values-ko/FirefoxReality_localpages.xml
rename to app/src/main/res/values-ko/localpages_strings.xml
diff --git a/app/src/main/res/values-ko/FirefoxReality_strings.xml b/app/src/main/res/values-ko/strings.xml
similarity index 99%
rename from app/src/main/res/values-ko/FirefoxReality_strings.xml
rename to app/src/main/res/values-ko/strings.xml
index bb2f73495..a97217f26 100644
--- a/app/src/main/res/values-ko/FirefoxReality_strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -47,7 +47,7 @@
 	<!-- This string will be displayed in a dialog box presented to the user when the application
          needs to request permission to access the device's external storage such as the
          sdcard. '%1$s' will be replaced at runtime with the website's domain name. -->
-	<string name="permission_persistent_storage">%S가 영구 저장 장치에 데이터를 저장하도록 허용하겠습니까?</string>
+	<string name="permission_persistent_storage">%1$s가 영구 저장 장치에 데이터를 저장하도록 허용하겠습니까?</string>
 	
 	<!-- This string is displayed in the Settings dialog box and how
          the user can know which version of the application they are currently running.
diff --git a/app/src/main/res/values-zh-rCN/FirefoxReality_localpages.xml b/app/src/main/res/values-zh-rCN/localpages_strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rCN/FirefoxReality_localpages.xml
rename to app/src/main/res/values-zh-rCN/localpages_strings.xml
diff --git a/app/src/main/res/values-zh-rCN/FirefoxReality_strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rCN/FirefoxReality_strings.xml
rename to app/src/main/res/values-zh-rCN/strings.xml
diff --git a/app/src/main/res/values-zh-rTW/FirefoxReality_localpages.xml b/app/src/main/res/values-zh-rTW/localpages_strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rTW/FirefoxReality_localpages.xml
rename to app/src/main/res/values-zh-rTW/localpages_strings.xml
diff --git a/app/src/main/res/values-zh-rTW/FirefoxReality_strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rTW/FirefoxReality_strings.xml
rename to app/src/main/res/values-zh-rTW/strings.xml
diff --git a/app/src/main/res/values/localpages.xml b/app/src/main/res/values/localpages_strings.xml
similarity index 100%
rename from app/src/main/res/values/localpages.xml
rename to app/src/main/res/values/localpages_strings.xml
diff --git a/l10n.toml b/l10n.toml
new file mode 100644
index 000000000..964253a5c
--- /dev/null
+++ b/l10n.toml
@@ -0,0 +1,23 @@
+
+basepath = "."
+
+locales = [
+"de",
+"es",
+"fr",
+"it",
+"ja",
+"ko",
+"zh-CN",
+"zh-TW",
+]
+
+[env]
+
+[[paths]]
+  reference = "app/src/main/res/values/strings.xml"
+  l10n = "app/src/main/res/values-{android_locale}/strings.xml"
+  
+  [[paths]]
+    reference = "app/src/main/res/values/localpages_strings.xml"
+    l10n = "app/src/main/res/values-{android_locale}/localpages_strings.xml"