am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '63c3068ac343cec183bff4afd5fd05dbbf3ccede':
Bump revision number for all system images
diff --git a/apps/Fallback/res/values-sl/strings.xml b/apps/Fallback/res/values-sl/strings.xml
index 16f30ab..322f466 100644
--- a/apps/Fallback/res/values-sl/strings.xml
+++ b/apps/Fallback/res/values-sl/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="appTitle" msgid="161410001913116606">"Nadomestna aplikacija"</string>
+ <string name="appTitle" msgid="161410001913116606">"Nadomestni program"</string>
<string name="title" msgid="8156274565006125136">"Dejanje ni podprto."</string>
<string name="error" msgid="6539615832923362301">"To dejanje trenutno še ni podprto."</string>
</resources>
diff --git a/tools/recovery_l10n/res/values-sk/strings.xml b/tools/recovery_l10n/res/values-sk/strings.xml
index cae6bce..e55f83f 100644
--- a/tools/recovery_l10n/res/values-sk/strings.xml
+++ b/tools/recovery_l10n/res/values-sk/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="7864047928003865598">"Inštalácia aktualizácie systému..."</string>
+ <string name="recovery_installing" msgid="7864047928003865598">"Prebieha inštalácia aktualizácie systému..."</string>
<string name="recovery_erasing" msgid="4612809744968710197">"Prebieha mazanie..."</string>
<string name="recovery_no_command" msgid="1915703879031023455">"Žiadny príkaz."</string>
<string name="recovery_error" msgid="4550265746256727080">"Chyba!"</string>