merge in nyc-release history after reset to nyc-dev
diff --git a/tools/recovery_l10n/res/values-eu-rES/strings.xml b/tools/recovery_l10n/res/values-eu-rES/strings.xml
index 16d1ad6..5540469 100644
--- a/tools/recovery_l10n/res/values-eu-rES/strings.xml
+++ b/tools/recovery_l10n/res/values-eu-rES/strings.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="recovery_installing" msgid="2013591905463558223">"Sistemaren eguneratzea instalatzen…"</string>
+ <string name="recovery_installing" msgid="2013591905463558223">"Sistemaren eguneratzea instalatzen"</string>
<string name="recovery_erasing" msgid="7334826894904037088">"Eduki guztia ezabatzen"</string>
<string name="recovery_no_command" msgid="4465476568623024327">"Ez dago agindurik"</string>
<string name="recovery_error" msgid="5748178989622716736">"Errorea"</string>
- <string name="recovery_installing_security" msgid="9184031299717114342">"Segurtasun-eguneratzea instalatzen…"</string>
+ <string name="recovery_installing_security" msgid="9184031299717114342">"Segurtasun-eguneratzea instalatzen"</string>
</resources>
diff --git a/tools/recovery_l10n/res/values-in/strings.xml b/tools/recovery_l10n/res/values-in/strings.xml
index bbda9fa..0e56e0d 100644
--- a/tools/recovery_l10n/res/values-in/strings.xml
+++ b/tools/recovery_l10n/res/values-in/strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="recovery_installing" msgid="2013591905463558223">"Memasang pemutakhiran sistem"</string>
+ <string name="recovery_installing" msgid="2013591905463558223">"Memasang pembaruan sistem"</string>
<string name="recovery_erasing" msgid="7334826894904037088">"Menghapus"</string>
<string name="recovery_no_command" msgid="4465476568623024327">"Tidak ada perintah"</string>
<string name="recovery_error" msgid="5748178989622716736">"Error!"</string>
diff --git a/tools/recovery_l10n/res/values-zh-rCN/strings.xml b/tools/recovery_l10n/res/values-zh-rCN/strings.xml
index d48ddae..e061497 100644
--- a/tools/recovery_l10n/res/values-zh-rCN/strings.xml
+++ b/tools/recovery_l10n/res/values-zh-rCN/strings.xml
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- no translation found for recovery_installing (2013591905463558223) -->
- <skip />
- <!-- no translation found for recovery_erasing (7334826894904037088) -->
- <skip />
- <!-- no translation found for recovery_no_command (4465476568623024327) -->
- <skip />
+ <string name="recovery_installing" msgid="2013591905463558223">"正在安装系统更新"</string>
+ <string name="recovery_erasing" msgid="7334826894904037088">"正在清空"</string>
+ <string name="recovery_no_command" msgid="4465476568623024327">"无命令"</string>
<string name="recovery_error" msgid="5748178989622716736">"出错了！"</string>
- <!-- no translation found for recovery_installing_security (9184031299717114342) -->
- <skip />
+ <string name="recovery_installing_security" msgid="9184031299717114342">"正在安装安全更新"</string>
</resources>