summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml2
-rw-r--r--core/res/res/drawable/blank_tile.pngbin0 -> 557 bytes
-rw-r--r--core/res/res/drawable/loading_tile.pngbin0 -> 729 bytes
-rw-r--r--core/res/res/drawable/no_tile_128.pngbin0 -> 1392 bytes
-rw-r--r--core/res/res/layout/alert_dialog_progress.xml8
-rw-r--r--core/res/res/values-cs/strings.xml24
-rw-r--r--core/res/res/values-de/strings.xml48
-rw-r--r--core/res/res/values-es/strings.xml36
-rw-r--r--core/res/res/values-fr/strings.xml34
-rw-r--r--core/res/res/values-it/strings.xml26
-rw-r--r--core/res/res/values-ja/strings.xml84
-rw-r--r--core/res/res/values-ko/strings.xml24
-rw-r--r--core/res/res/values-nl/strings.xml122
-rw-r--r--core/res/res/values-pl/strings.xml36
-rw-r--r--core/res/res/values-ru/strings.xml24
-rw-r--r--core/res/res/values-zh-rCN/arrays.xml32
-rw-r--r--core/res/res/values-zh-rTW/arrays.xml32
-rw-r--r--core/res/res/values/attrs.xml12
-rw-r--r--core/res/res/values/attrs_manifest.xml26
-rw-r--r--core/res/res/values/strings.xml5
20 files changed, 226 insertions, 349 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 3a70d9a..9f6ebed 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -203,12 +203,14 @@
<!-- Allows an application to create mock location providers for testing -->
<permission android:name="android.permission.ACCESS_MOCK_LOCATION"
android:permissionGroup="android.permission-group.LOCATION"
+ android:protectionLevel="dangerous"
android:label="@string/permlab_accessMockLocation"
android:description="@string/permdesc_accessMockLocation" />
<!-- Allows an application to access extra location provider commands -->
<permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"
android:permissionGroup="android.permission-group.LOCATION"
+ android:protectionLevel="normal"
android:label="@string/permlab_accessLocationExtraCommands"
android:description="@string/permdesc_accessLocationExtraCommands" />
diff --git a/core/res/res/drawable/blank_tile.png b/core/res/res/drawable/blank_tile.png
new file mode 100644
index 0000000..63b9296
--- /dev/null
+++ b/core/res/res/drawable/blank_tile.png
Binary files differ
diff --git a/core/res/res/drawable/loading_tile.png b/core/res/res/drawable/loading_tile.png
new file mode 100644
index 0000000..f5a80c9
--- /dev/null
+++ b/core/res/res/drawable/loading_tile.png
Binary files differ
diff --git a/core/res/res/drawable/no_tile_128.png b/core/res/res/drawable/no_tile_128.png
new file mode 100644
index 0000000..a9b007d
--- /dev/null
+++ b/core/res/res/drawable/no_tile_128.png
Binary files differ
diff --git a/core/res/res/layout/alert_dialog_progress.xml b/core/res/res/layout/alert_dialog_progress.xml
index 9279eff..d2bb691 100644
--- a/core/res/res/layout/alert_dialog_progress.xml
+++ b/core/res/res/layout/alert_dialog_progress.xml
@@ -21,7 +21,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dip"
- android:layout_marginBottom="12dip"
+ android:layout_marginBottom="1dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_centerHorizontal="true" />
@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="12dip"
- android:layout_marginLeft="15dip"
+ android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_alignParentLeft="true"
android:layout_below="@id/progress"
@@ -40,9 +40,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="12dip"
- android:layout_marginLeft="10dip"
+ android:layout_marginLeft="50dip"
android:layout_marginRight="15dip"
- android:layout_alignParentRight="true"
+ android:layout_alignParentLeft="true"
android:layout_below="@id/progress"
/>
</RelativeLayout>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index b3fca3e..35a3f9a 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -54,16 +54,11 @@
<string name="CLIRDefaultOffNextCallOff">"Ve výchozím nastavení není identifikace volajícího omezena. Příští hovor: Neomezeno"</string>
<string name="serviceNotProvisioned">"Služba není zřízena."</string>
<string name="CLIRPermanent">"Nelze změnit nastavení identifikace volajícího."</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="RestrictedChangedTitle">"Omezený přístup byl změněn."</string>
+ <string name="RestrictedOnData">"Datová služba je zablokována."</string>
+ <string name="RestrictedOnEmergency">"Tísňová linka je zablokována."</string>
+ <string name="RestrictedOnNormal">"Hlasová služba a služba SMS jsou zablokovány."</string>
+ <string name="RestrictedOnAll">"Veškeré hlasové služby a služby SMS jsou zablokovány."</string>
<string name="serviceClassVoice">"Hlas"</string>
<string name="serviceClassData">"Data"</string>
<string name="serviceClassFAX">"FAX"</string>
@@ -410,8 +405,7 @@
<string name="lockscreen_missing_sim_instructions">"Prosím vložte kartu SIM."</string>
<string name="lockscreen_network_locked_message">"Síť je blokována"</string>
<string name="lockscreen_sim_puk_locked_message">"Karta SIM je zablokována pomocí kódu PUK."</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
+ <string name="lockscreen_sim_puk_locked_instructions">"Další informace naleznete v uživatelské příručce, nebo kontaktujte podporu zákazníků."</string>
<string name="lockscreen_sim_locked_message">"Karta SIM je zablokována."</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"Odblokování karty SIM..."</string>
<string name="lockscreen_too_many_failed_attempts_dialog_message">"<xliff:g id="NUMBER_0">%d</xliff:g>krát jste nakreslili nesprávné bezpečnostní gesto. "\n\n"Opakujte prosím akci za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"Další"</string>
<string name="ime_action_done">"Hotovo"</string>
<string name="ime_action_default">"Spustit"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"Vytočit číslo"\n" <xliff:g id="NUMBER">%s</xliff:g>."</string>
+ <string name="create_contact_using">"Vytvořit kontakt"\n"pro <xliff:g id="NUMBER">%s</xliff:g>."</string>
</resources>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index 54e8864..4d813b4 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -43,7 +43,7 @@
<string name="needPuk2">"Geben Sie zum Entsperren der SIM-Karte den PUK2 ein."</string>
<string name="ClipMmi">"Anrufer-ID für eingehenden Anruf"</string>
<string name="ClirMmi">"Anrufer-ID für abgehenden Anruf"</string>
- <string name="CfMmi">"Anrufweiterleitung"</string>
+ <string name="CfMmi">"Rufweiterleitung"</string>
<string name="CwMmi">"Anklopfen"</string>
<string name="BaMmi">"Anrufsperre"</string>
<string name="PwdMmi">"Passwort-Änderung"</string>
@@ -54,16 +54,11 @@
<string name="CLIRDefaultOffNextCallOff">"Anrufer-ID ist standardmäßig nicht beschränkt. Nächster Anruf: Nicht beschränkt"</string>
<string name="serviceNotProvisioned">"Dienst nicht eingerichtet."</string>
<string name="CLIRPermanent">"Die Einstellung für die Anrufer-ID kann nicht geändert werden."</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="RestrictedChangedTitle">"Eingeschränkter Zugriff geändert"</string>
+ <string name="RestrictedOnData">"Daten-Dienst ist gesperrt."</string>
+ <string name="RestrictedOnEmergency">"Notruf ist gesperrt."</string>
+ <string name="RestrictedOnNormal">"Sprach-/SMS-Dienst ist gesperrt."</string>
+ <string name="RestrictedOnAll">"Alle Sprach-/SMS-Dienste sind gesperrt."</string>
<string name="serviceClassVoice">"Sprachnotiz"</string>
<string name="serviceClassData">"Daten"</string>
<string name="serviceClassFAX">"FAX"</string>
@@ -113,9 +108,9 @@
<string name="global_action_toggle_silent_mode">"Lautlos"</string>
<string name="global_action_silent_mode_on_status">"Ton ist bereits AUS"</string>
<string name="global_action_silent_mode_off_status">"Ton ist momentan AN"</string>
- <string name="global_actions_toggle_airplane_mode">"Flugzeugmodus"</string>
- <string name="global_actions_airplane_mode_on_status">"Flugzeugmodus ist AN"</string>
- <string name="global_actions_airplane_mode_off_status">"Flugzeugmodus ist AUS"</string>
+ <string name="global_actions_toggle_airplane_mode">"Flugmodus"</string>
+ <string name="global_actions_airplane_mode_on_status">"Flugmodus ist AN"</string>
+ <string name="global_actions_airplane_mode_off_status">"Flugmodus ist AUS"</string>
<string name="safeMode">"Abgesicherter Modus"</string>
<string name="android_system_label">"Android System"</string>
<string name="permgrouplab_costMoney">"Kostenpflichtige Dienste"</string>
@@ -258,7 +253,7 @@
<string name="permdesc_accessLocationExtraCommands">"Zugriff auf zusätzliche Dienstanbieterbefehle für Standort. Schädliche Anwendungen könnten so die Funktionsweise von GPS oder anderen Standortquellen beeinträchtigen."</string>
<string name="permlab_accessFineLocation">"genauer (GPS-) Standort"</string>
<string name="permdesc_accessFineLocation">"Zugriff auf genaue Standortquellen wie GPS auf dem Telefon (falls verfügbar). Schädliche Anwendungen können damit bestimmen, so Sie sich befinden und so Ihren Akku zusätzlich belasten."</string>
- <string name="permlab_accessCoarseLocation">"Ungefährer (netzwerkbasierter) Standort"</string>
+ <string name="permlab_accessCoarseLocation">"ungefährer (netzwerkbasierter) Standort"</string>
<string name="permdesc_accessCoarseLocation">"Greift auf Quellen mit ungefähren Standortbestimmungen wie die Datenbank des Mobilfunknetzwerks zu, um falls möglich den ungefähren Standort des Telefons zu bestimmen. Schädliche Anwendungen können damit herauszufinden, wo Sie sich ungefähr befinden."</string>
<string name="permlab_accessSurfaceFlinger">"Auf SurfaceFlinger zugreifen"</string>
<string name="permdesc_accessSurfaceFlinger">"Ermöglicht einer Anwendung, die systemnahen SurfaceFlinger-Funktionen zu verwenden."</string>
@@ -289,13 +284,13 @@
<string name="permlab_callPrivileged">"Alle Telefonnummern direkt anrufen"</string>
<string name="permdesc_callPrivileged">"Ermöglicht der Anwendung, ohne Ihr Eingreifen eine beliebige Telefonnummer zu wählen, einschließlich Notfallnummern. Schädliche Anwendungen können so unnötige und illegale Anrufe an Notdienste tätigen."</string>
<string name="permlab_locationUpdates">"Benachrichtigungen für Standortaktualisierung steuern"</string>
- <string name="permdesc_locationUpdates">"Ermöglicht die Aktivierung/Deaktivierung der Radio-Benachrichtigungen über Standort-Updates. Nicht für normale Anwendungen vorgesehen."</string>
+ <string name="permdesc_locationUpdates">"Ermöglicht die Aktivierung/Deaktivierung der Mobilfunkbenachrichtigungen über Standort-Updates. Nicht für normale Anwendungen vorgesehen."</string>
<string name="permlab_checkinProperties">"Auf Check-In-Eigenschaften zugreifen"</string>
<string name="permdesc_checkinProperties">"Ermöglicht den Schreib-/Lesezugriff auf vom Check-In-Service hochgeladene Elemente. Nicht für normale Anwendungen vorgesehen."</string>
<string name="permlab_bindGadget">"Widgets auswählen"</string>
<string name="permdesc_bindGadget">"Ermöglicht der Anwendung, dem System zu melden, welche Widgets von welcher Anwendung verwendet werden können. Mit dieser Berechtigung können Anwendungen anderen Anwendungen Zugriff auf persönliche Daten gewähren. Nicht für normale Anwendungen vorgesehen."</string>
<string name="permlab_modifyPhoneState">"Telefonstatus ändern"</string>
- <string name="permdesc_modifyPhoneState">"Ermöglicht einer Anwendung, die Telefonfunktionen des Gerätes zu steuern. Eine Anwendung mit dieser Berechtigung kann unter anderem das Netzwerk wechseln oder das Radio des Telefons ein- und ausschalten, ohne Sie darüber zu informieren."</string>
+ <string name="permdesc_modifyPhoneState">"Ermöglicht einer Anwendung, die Telefonfunktionen des Gerätes zu steuern. Eine Anwendung mit dieser Berechtigung kann unter anderem das Netzwerk wechseln oder die Mobilfunkverbindung des Telefons ein- und ausschalten, ohne Sie darüber zu informieren."</string>
<string name="permlab_readPhoneState">"Telefonstatus lesen"</string>
<string name="permdesc_readPhoneState">"Ermöglicht der Anwendung, auf die Telefonfunktionen des Gerätes zuzugreifen. Eine Anwendung mit dieser Berechtigung kann unter anderem bestimmen, welche Telefonnummer dieses Telefon verwendet, ob ein Anruf aktiv ist oder mit welcher Nummer der Anrufer verbunden ist."</string>
<string name="permlab_wakeLock">"Standby-Modus deaktivieren"</string>
@@ -393,12 +388,12 @@
</string-array>
<string name="keyguard_password_enter_pin_code">"PIN-Code eingeben"</string>
<string name="keyguard_password_wrong_pin_code">"Falscher PIN-Code!"</string>
- <string name="keyguard_label_text">"Drücken Sie zum Entsperren auf \"Menü\" und dann auf \"0\"."</string>
+ <string name="keyguard_label_text">"Drücken Sie zum Entsperren die Menütaste und dann auf \"0\"."</string>
<string name="emergency_call_dialog_number_for_display">"Notrufnummer"</string>
<string name="lockscreen_carrier_default">"(kein Dienst)"</string>
<string name="lockscreen_screen_locked">"Display gesperrt."</string>
- <string name="lockscreen_instructions_when_pattern_enabled">"Drücken Sie auf \"Menü\", um das Telefon zu entsperren oder einen Notruf zu tätigen."</string>
- <string name="lockscreen_instructions_when_pattern_disabled">"Drücken Sie zum Entsperren auf \"Menü\"."</string>
+ <string name="lockscreen_instructions_when_pattern_enabled">"Drücken Sie die Menütaste, um das Telefon zu entsperren oder einen Notruf zu tätigen."</string>
+ <string name="lockscreen_instructions_when_pattern_disabled">"Zum Entsperren die Menütaste drücken"</string>
<string name="lockscreen_pattern_instructions">"Schema für Entsperrung zeichnen"</string>
<string name="lockscreen_emergency_call">"Notruf"</string>
<string name="lockscreen_pattern_correct">"Korrekt!"</string>
@@ -410,8 +405,7 @@
<string name="lockscreen_missing_sim_instructions">"Bitte legen Sie eine SIM-Karte ein."</string>
<string name="lockscreen_network_locked_message">"Netzwerk gesperrt"</string>
<string name="lockscreen_sim_puk_locked_message">"SIM-Karte ist gesperrt. PUK-Eingabe erforderlich."</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
+ <string name="lockscreen_sim_puk_locked_instructions">"Weitere Informationen finden Sie in der Bedienungsanleitung oder wenden Sie sich an den Kundendienst."</string>
<string name="lockscreen_sim_locked_message">"SIM-Karte ist gesperrt."</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"SIM-Karte wird entsperrt..."</string>
<string name="lockscreen_too_many_failed_attempts_dialog_message">"Sie haben Ihr Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. "\n\n"Versuchen Sie es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string>
@@ -582,7 +576,7 @@
<string name="Noon">"Mittag"</string>
<string name="midnight">"Mitternacht"</string>
<string name="Midnight">"Mitternacht"</string>
- <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>
+ <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>
<!-- no translation found for month (7026169712234774086) -->
<skip />
<string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g>. <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
@@ -712,7 +706,7 @@
<string name="dialog_alert_title">"Achtung"</string>
<string name="capital_on">"EIN"</string>
<string name="capital_off">"AUS"</string>
- <string name="whichApplication">"Aktion beenden mit"</string>
+ <string name="whichApplication">"Aktion durchführen mit"</string>
<string name="alwaysUse">"Standardmäßig für diese Aktion verwenden."</string>
<string name="clearDefaultHintMsg">"Löschen Sie die Standardeinstellungen unter \"Starteinstellungen &gt; Anwendungen &gt; Anwendungen verwalten\"."</string>
<string name="chooseActivity">"Aktion auswählen"</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"Weiter"</string>
<string name="ime_action_done">"Fertig"</string>
<string name="ime_action_default">"Ausführen"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"Nummer"\n"mit <xliff:g id="NUMBER">%s</xliff:g> wählen"</string>
+ <string name="create_contact_using">"Neuer Kontakt"\n"mit <xliff:g id="NUMBER">%s</xliff:g> erstellen"</string>
</resources>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index 8cacdc4..9e97b4c 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -53,17 +53,12 @@
<string name="CLIRDefaultOffNextCallOn">"El ID de emisor presenta el valor predeterminado de no restringido. Siguiente llamada: Restringido"</string>
<string name="CLIRDefaultOffNextCallOff">"El ID de emisor presenta el valor predeterminado de no restringido. Siguiente llamada: No restringido"</string>
<string name="serviceNotProvisioned">"El servicio no se suministra."</string>
- <string name="CLIRPermanent">"El ID del emisor no se puede modificar."</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="CLIRPermanent">"El ID de emisor no se puede modificar."</string>
+ <string name="RestrictedChangedTitle">"El acceso restringido se ha modificado."</string>
+ <string name="RestrictedOnData">"El servicio de datos está bloqueado."</string>
+ <string name="RestrictedOnEmergency">"El servicio de emergencia está bloqueado."</string>
+ <string name="RestrictedOnNormal">"El servicio de voz y SMS está bloqueado."</string>
+ <string name="RestrictedOnAll">"Todos los servicios de voz y SMS están bloqueados."</string>
<string name="serviceClassVoice">"Voz"</string>
<string name="serviceClassData">"Datos"</string>
<string name="serviceClassFAX">"FAX"</string>
@@ -393,12 +388,12 @@
</string-array>
<string name="keyguard_password_enter_pin_code">"Introduce el código PIN"</string>
<string name="keyguard_password_wrong_pin_code">"El código PIN es incorrecto."</string>
- <string name="keyguard_label_text">"Para desbloquear el teléfono, pulsa la tecla de menú y, a continuación, pulsa 0."</string>
+ <string name="keyguard_label_text">"Para desbloquear el teléfono, pulsa la tecla Menu y, a continuación, pulsa 0."</string>
<string name="emergency_call_dialog_number_for_display">"Número de emergencia"</string>
<string name="lockscreen_carrier_default">"(Sin cobertura)"</string>
<string name="lockscreen_screen_locked">"Pantalla bloqueada"</string>
- <string name="lockscreen_instructions_when_pattern_enabled">"Pulsa la tecla de menú para desbloquear el teléfono o realizar una llamada de emergencia."</string>
- <string name="lockscreen_instructions_when_pattern_disabled">"Pulsa la tecla de menú para desbloquear la pantalla."</string>
+ <string name="lockscreen_instructions_when_pattern_enabled">"Pulsa la tecla Menu para desbloquear el teléfono o realizar una llamada de emergencia."</string>
+ <string name="lockscreen_instructions_when_pattern_disabled">"Pulsa la tecla Menu para desbloquear la pantalla."</string>
<string name="lockscreen_pattern_instructions">"Dibujar patrón de desbloqueo"</string>
<string name="lockscreen_emergency_call">"Llamada de emergencia"</string>
<string name="lockscreen_pattern_correct">"Correcto"</string>
@@ -410,8 +405,7 @@
<string name="lockscreen_missing_sim_instructions">"Inserta una tarjeta SIM."</string>
<string name="lockscreen_network_locked_message">"Bloqueada para la red"</string>
<string name="lockscreen_sim_puk_locked_message">"La tarjeta SIM está bloqueada con el código PUK."</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
+ <string name="lockscreen_sim_puk_locked_instructions">"Consulta la guía del usuario o ponte en contacto con el servicio de atención al cliente."</string>
<string name="lockscreen_sim_locked_message">"La tarjeta SIM está bloqueada."</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"Desbloqueando tarjeta SIM..."</string>
<string name="lockscreen_too_many_failed_attempts_dialog_message">"Has realizado <xliff:g id="NUMBER_0">%d</xliff:g> intentos fallidos de creación de un patrón de desbloqueo. "\n\n"Inténtalo de nuevo dentro de <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string>
@@ -582,7 +576,7 @@
<string name="Noon">"Mediodía"</string>
<string name="midnight">"medianoche"</string>
<string name="Midnight">"Medianoche"</string>
- <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>
+ <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>
<!-- no translation found for month (7026169712234774086) -->
<skip />
<string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>
@@ -798,7 +792,7 @@
<string name="activity_list_empty">"No se ha encontrado ninguna actividad coincidente."</string>
<string name="permlab_pkgUsageStats">"actualizar estadísticas de uso de componentes"</string>
<string name="permdesc_pkgUsageStats">"Permite la modificación de estadísticas recopiladas sobre el uso de componentes. No está destinado al uso por parte de aplicaciones normales."</string>
- <string name="tutorial_double_tap_to_zoom_message_short">"Pulsa dos veces para acceder al control de zoom."</string>
+ <string name="tutorial_double_tap_to_zoom_message_short">"Da dos toques para acceder al control de zoom."</string>
<string name="gadget_host_error_inflating">"Error al aumentar el widget"</string>
<string name="ime_action_go">"Ir"</string>
<string name="ime_action_search">"Buscar"</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"Siguiente"</string>
<string name="ime_action_done">"Hecho"</string>
<string name="ime_action_default">"Ejecutar"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"Marcar número"\n"con <xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="create_contact_using">"Crear un contacto"\n"a partir de <xliff:g id="NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 6e76fe7..46d63e3 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -54,16 +54,11 @@
<string name="CLIRDefaultOffNextCallOff">"Par défaut, les identifiants d\'appelant ne sont pas restreints. Appel suivant : non restreint"</string>
<string name="serviceNotProvisioned">"Ce service n\'est pas pris en charge."</string>
<string name="CLIRPermanent">"Le paramètre Identifiant d\'appelant ne peut pas être modifié."</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="RestrictedChangedTitle">"L\'accès limité a été modifié."</string>
+ <string name="RestrictedOnData">"Le service de données est bloqué."</string>
+ <string name="RestrictedOnEmergency">"Le service d\'appel d\'urgence est bloqué."</string>
+ <string name="RestrictedOnNormal">"Le service vocal/SMS est bloqué."</string>
+ <string name="RestrictedOnAll">"Tous les services vocaux/SMS sont bloqués."</string>
<string name="serviceClassVoice">"Voix"</string>
<string name="serviceClassData">"Données"</string>
<string name="serviceClassFAX">"Télécopie"</string>
@@ -350,7 +345,7 @@
<string name="permdesc_writeDictionary">"Permet à une application d\'enregistrer de nouveaux mots dans le dictionnaire personnel de l\'utilisateur."</string>
<string-array name="phoneTypes">
<item>"Domicile"</item>
- <item>"Mobile"</item>
+ <item>"Portable"</item>
<item>"Bureau"</item>
<item>"Télécopie bureau"</item>
<item>"Télécopie domicile"</item>
@@ -410,8 +405,7 @@
<string name="lockscreen_missing_sim_instructions">"Insérez une carte SIM."</string>
<string name="lockscreen_network_locked_message">"Réseau verrouillé"</string>
<string name="lockscreen_sim_puk_locked_message">"La carte SIM est verrouillée par code PUK."</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
+ <string name="lockscreen_sim_puk_locked_instructions">"Veuillez consulter le guide d\'utilisation ou contacter l\'assistance clientèle."</string>
<string name="lockscreen_sim_locked_message">"Téléphone verrouillé"</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"Déblocage de la carte SIM..."</string>
<string name="lockscreen_too_many_failed_attempts_dialog_message">"Vous avez mal reproduit le motif de déverrouillage <xliff:g id="NUMBER_0">%d</xliff:g> fois. "\n\n"Veuillez réessayer dans <xliff:g id="NUMBER_1">%d</xliff:g> secondes."</string>
@@ -534,8 +528,8 @@
<string name="days">"jours"</string>
<string name="hour">"heure"</string>
<string name="hours">"heures"</string>
- <string name="minute">"mn"</string>
- <string name="minutes">"mn"</string>
+ <string name="minute">"min"</string>
+ <string name="minutes">"min"</string>
<string name="second">"s"</string>
<string name="seconds">"s"</string>
<string name="week">"semaine"</string>
@@ -582,7 +576,7 @@
<string name="Noon">"Midi"</string>
<string name="midnight">"minuit"</string>
<string name="Midnight">"Minuit"</string>
- <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>
+ <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>
<!-- no translation found for month (7026169712234774086) -->
<skip />
<string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
@@ -794,7 +788,7 @@
<string name="ext_media_safe_unmount_notification_title">"La carte SD peut être retirée en toute sécurité"</string>
<string name="ext_media_safe_unmount_notification_message">"Vous pouvez désormais retirer la carte SD en toute sécurité."</string>
<string name="ext_media_nomedia_notification_title">"Carte SD manquante"</string>
- <string name="ext_media_nomedia_notification_message">"La carte SD a été retirée. Insérez une autre carte pour augmenter la capacité de stockage de votre appareil."</string>
+ <string name="ext_media_nomedia_notification_message">"Carte SD manquante. Insérez une autre carte pour augmenter la capacité de stockage."</string>
<string name="activity_list_empty">"Aucune activité correspondante trouvée"</string>
<string name="permlab_pkgUsageStats">"mettre à jour les données statistiques du composant"</string>
<string name="permdesc_pkgUsageStats">"Permet de modifier les données statistiques collectées du composant. Cette option n\'est pas utilisée par les applications standard."</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"Suivant"</string>
<string name="ime_action_done">"Terminé"</string>
<string name="ime_action_default">"Exécuter"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"Composer le numéro"\n"en utilisant <xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="create_contact_using">"Ajouter un contact"\n"en utilisant <xliff:g id="NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index 50e25c0..f80a4f4 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -54,16 +54,11 @@
<string name="CLIRDefaultOffNextCallOff">"ID chiamante generalmente non limitato. Prossima chiamata: non limitato"</string>
<string name="serviceNotProvisioned">"Servizio non fornito."</string>
<string name="CLIRPermanent">"Impossibile modificare l\'impostazione dell\'ID del chiamante."</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="RestrictedChangedTitle">"Accesso limitato modificato"</string>
+ <string name="RestrictedOnData">"Il servizio dati è bloccato."</string>
+ <string name="RestrictedOnEmergency">"Il servizio di emergenza è bloccato."</string>
+ <string name="RestrictedOnNormal">"Il servizio vocale/SMS è bloccato."</string>
+ <string name="RestrictedOnAll">"Tutti i servizi vocali/SMS sono bloccati."</string>
<string name="serviceClassVoice">"Voce"</string>
<string name="serviceClassData">"Dati"</string>
<string name="serviceClassFAX">"FAX"</string>
@@ -410,8 +405,7 @@
<string name="lockscreen_missing_sim_instructions">"Inserisci una SIM."</string>
<string name="lockscreen_network_locked_message">"Rete bloccata"</string>
<string name="lockscreen_sim_puk_locked_message">"La SIM è bloccata tramite PUK."</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
+ <string name="lockscreen_sim_puk_locked_instructions">"Consulta il Manuale utente o contatta il servizio clienti."</string>
<string name="lockscreen_sim_locked_message">"La SIM è bloccata."</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"Sblocco SIM..."</string>
<string name="lockscreen_too_many_failed_attempts_dialog_message">"<xliff:g id="NUMBER_0">%d</xliff:g> tentativi di inserimento della sequenza di sblocco. "\n\n"Riprova fra <xliff:g id="NUMBER_1">%d</xliff:g> secondi."</string>
@@ -582,7 +576,7 @@
<string name="Noon">"Mezzogiorno"</string>
<string name="midnight">"mezzanotte"</string>
<string name="Midnight">"Mezzanotte"</string>
- <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>
+ <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>
<!-- no translation found for month (7026169712234774086) -->
<skip />
<string name="month_day_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"Avanti"</string>
<string name="ime_action_done">"Fine"</string>
<string name="ime_action_default">"Esegui"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"Componi numero"\n"utilizzando <xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="create_contact_using">"Crea contatto"\n"utilizzando <xliff:g id="NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index ccc7f19..36a3b75 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -42,8 +42,8 @@
<string name="needPuk">"SIMカードはPUKでロックされています。ロックを解除するにはPUKコードを入力してください。"</string>
<string name="needPuk2">"SIMカードのロック解除のためPUK2を入力します。"</string>
<string name="ClipMmi">"着信時の発信者番号"</string>
- <string name="ClirMmi">"発信時の発信者番号"</string>
- <string name="CfMmi">"電話の転送"</string>
+ <string name="ClirMmi">"発信者番号"</string>
+ <string name="CfMmi">"着信転送"</string>
<string name="CwMmi">"通話中着信"</string>
<string name="BaMmi">"発信制限"</string>
<string name="PwdMmi">"パスワードの変更"</string>
@@ -54,16 +54,11 @@
<string name="CLIRDefaultOffNextCallOff">"既定: 発信者番号通知、次の発信: 通知"</string>
<string name="serviceNotProvisioned">"提供可能なサービスがありません。"</string>
<string name="CLIRPermanent">"発信者番号の設定は変更できません。"</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="RestrictedChangedTitle">"アクセス制限が変更されました"</string>
+ <string name="RestrictedOnData">"データサービスがブロックされています。"</string>
+ <string name="RestrictedOnEmergency">"緊急サービスがブロックされています。"</string>
+ <string name="RestrictedOnNormal">"音声/SMSサービスがブロックされています。"</string>
+ <string name="RestrictedOnAll">"すべての音声/SMSサービスがブロックされています。"</string>
<string name="serviceClassVoice">"音声"</string>
<string name="serviceClassData">"データ"</string>
<string name="serviceClassFAX">"FAX"</string>
@@ -143,7 +138,7 @@
<string name="permlab_expandStatusBar">"ステータスバーの拡大/縮小"</string>
<string name="permdesc_expandStatusBar">"ステータスバーの拡大や縮小をアプリケーションに許可します。"</string>
<string name="permlab_processOutgoingCalls">"発信の傍受"</string>
- <string name="permdesc_processOutgoingCalls">"通話の発信とダイヤルする番号の変更とをアプリケーションに許可します。悪意のあるアプリケーションが発信を監視、転送、阻止する恐れがあります。"</string>
+ <string name="permdesc_processOutgoingCalls">"通話発信とダイヤルする番号の変更をアプリケーションに許可します。悪意のあるアプリケーションが発信を監視、転送、阻止する恐れがあります。"</string>
<string name="permlab_receiveSms">"SMSの受信"</string>
<string name="permdesc_receiveSms">"SMSメッセージの受信と処理をアプリケーションに許可します。悪意のあるアプリケーションがメッセージを監視したり、表示せずに削除する恐れがあります。"</string>
<string name="permlab_receiveMms">"MMSの受信"</string>
@@ -410,8 +405,7 @@
<string name="lockscreen_missing_sim_instructions">"SIMカードを挿入してください。"</string>
<string name="lockscreen_network_locked_message">"ネットワークがロックされました"</string>
<string name="lockscreen_sim_puk_locked_message">"SIMカードはPUKでロックされています。"</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
+ <string name="lockscreen_sim_puk_locked_instructions">"ユーザーガイドを参照するか、お客様サポートにお問い合わせください。"</string>
<string name="lockscreen_sim_locked_message">"SIMカードはロックされています。"</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"SIMカードのロック解除中..."</string>
<string name="lockscreen_too_many_failed_attempts_dialog_message">"ロック解除のパターンは<xliff:g id="NUMBER_0">%d</xliff:g>回とも正しく指定されていません。"\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>秒後にもう一度指定してください。"</string>
@@ -572,11 +566,11 @@
<string name="date_time">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>"</string>
<string name="relative_time">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>"</string>
<string name="time_wday">"<xliff:g id="WEEKDAY">%2$s</xliff:g>、<xliff:g id="TIME_RANGE">%1$s</xliff:g>"</string>
- <string name="full_date_month_first" format="date">"<xliff:g id="YEAR">yyyy</xliff:g>'/'<xliff:g id="MONTH">MMMM</xliff:g>'/'<xliff:g id="DAY">d</xliff:g>"</string>
+ <string name="full_date_month_first" format="date">"<xliff:g id="MONTH">MMMM</xliff:g><xliff:g id="DAY">d</xliff:g>'日 '<xliff:g id="YEAR">yyyy</xliff:g>"</string>
<string name="full_date_day_first" format="date">"<xliff:g id="YEAR">yyyy</xliff:g>'年'<xliff:g id="MONTH">MMMM</xliff:g>'月'<xliff:g id="DAY">d</xliff:g>'日'"</string>
<string name="medium_date_month_first" format="date">"<xliff:g id="MONTH">MMM</xliff:g>'/'<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>'年'"</string>
<string name="medium_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>'/'<xliff:g id="MONTH">MMM</xliff:g>'/'<xliff:g id="YEAR">yyyy</xliff:g>"</string>
- <string name="twelve_hour_time_format" format="date">"<xliff:g id="HOUR">h</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>' '<xliff:g id="AMPM">a</xliff:g>"</string>
+ <string name="twelve_hour_time_format" format="date">"<xliff:g id="AMPM">a</xliff:g><xliff:g id="HOUR">h</xliff:g>'時'<xliff:g id="MINUTE">mm</xliff:g>'分'"</string>
<string name="twenty_four_hour_time_format" format="date">"<xliff:g id="HOUR">HH</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>"</string>
<string name="noon">"正午"</string>
<string name="Noon">"正午"</string>
@@ -586,16 +580,16 @@
<!-- no translation found for month (7026169712234774086) -->
<skip />
<string name="month_day_year">"<xliff:g id="YEAR">%Y</xliff:g>年<xliff:g id="MONTH">%B</xliff:g><xliff:g id="DAY">%-d</xliff:g>日"</string>
- <string name="month_year">"<xliff:g id="YEAR">%Y</xliff:g>年<xliff:g id="MONTH">%B</xliff:g>月"</string>
+ <string name="month_year">"<xliff:g id="YEAR">%Y</xliff:g>年<xliff:g id="MONTH">%B</xliff:g>"</string>
<string name="time_of_day">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g>"</string>
<string name="date_and_time">"<xliff:g id="YEAR">%Y</xliff:g>/<xliff:g id="MONTH">%B</xliff:g>/<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g>"</string>
- <string name="same_year_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日～<xliff:g id="MONTH2">%7$s</xliff:g>月<xliff:g id="DAY2">%8$s</xliff:g>日"</string>
+ <string name="same_year_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>"</string>
<string name="same_year_wday1_md1_wday2_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string>
- <string name="same_year_mdy1_mdy2">"<xliff:g id="YEAR">%9$s</xliff:g>年<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日～<xliff:g id="MONTH2">%7$s</xliff:g>月<xliff:g id="DAY2">%8$s</xliff:g>日"</string>
+ <string name="same_year_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR">%9$s</xliff:g>"</string>
<string name="same_year_wday1_mdy1_wday2_mdy2">"<xliff:g id="YEAR">%9$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string>
- <string name="same_year_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日<xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>月<xliff:g id="DAY2">%8$s</xliff:g>日<xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="same_year_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="TIME2">%10$s</xliff:g>"</string>
<string name="same_year_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="same_year_mdy1_time1_mdy2_time2">"<xliff:g id="YEAR1">%4$s</xliff:g>年<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日 <xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>年<xliff:g id="MONTH2">%7$s</xliff:g>月<xliff:g id="DAY2">%8$s</xliff:g>日 <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="same_year_mdy1_time1_mdy2_time2">"<xliff:g id="YEAR1">%4$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>/<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="TIME2">%10$s</xliff:g>"</string>
<string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="YEAR1">%4$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>/<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string>
<string name="numeric_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>"</string>
<string name="numeric_wday1_md1_wday2_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string>
@@ -607,7 +601,7 @@
<string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="YEAR1">%4$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>/<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string>
<string name="same_month_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日～<xliff:g id="DAY2">%8$s</xliff:g>日"</string>
<string name="same_month_wday1_md1_wday2_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string>
- <string name="same_month_mdy1_mdy2">"<xliff:g id="YEAR2">%9$s</xliff:g>年<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日～<xliff:g id="DAY2">%8$s</xliff:g>日"</string>
+ <string name="same_month_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g> - <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>"</string>
<string name="same_month_wday1_mdy1_wday2_mdy2">"<xliff:g id="YEAR1">%4$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>/<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string>
<string name="same_month_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string>
<string name="same_month_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string>
@@ -625,13 +619,13 @@
<string name="day_of_week_long_thursday">"木曜日"</string>
<string name="day_of_week_long_friday">"金曜日"</string>
<string name="day_of_week_long_saturday">"土曜日"</string>
- <string name="day_of_week_medium_sunday">"（日）"</string>
- <string name="day_of_week_medium_monday">"（月）"</string>
- <string name="day_of_week_medium_tuesday">"（火）"</string>
- <string name="day_of_week_medium_wednesday">"（水）"</string>
- <string name="day_of_week_medium_thursday">"（木）"</string>
- <string name="day_of_week_medium_friday">"（金）"</string>
- <string name="day_of_week_medium_saturday">"（土）"</string>
+ <string name="day_of_week_medium_sunday">"(日)"</string>
+ <string name="day_of_week_medium_monday">"(月)"</string>
+ <string name="day_of_week_medium_tuesday">"(火)"</string>
+ <string name="day_of_week_medium_wednesday">"(水)"</string>
+ <string name="day_of_week_medium_thursday">"(木)"</string>
+ <string name="day_of_week_medium_friday">"(金)"</string>
+ <string name="day_of_week_medium_saturday">"(土)"</string>
<string name="day_of_week_short_sunday">"日"</string>
<string name="day_of_week_short_monday">"月"</string>
<string name="day_of_week_short_tuesday">"火"</string>
@@ -665,18 +659,18 @@
<string name="month_long_october">"10月"</string>
<string name="month_long_november">"11月"</string>
<string name="month_long_december">"12月"</string>
- <string name="month_medium_january">"1月"</string>
- <string name="month_medium_february">"2月"</string>
- <string name="month_medium_march">"3月"</string>
- <string name="month_medium_april">"4月"</string>
- <string name="month_medium_may">"5月"</string>
- <string name="month_medium_june">"6月"</string>
- <string name="month_medium_july">"7月"</string>
- <string name="month_medium_august">"8月"</string>
- <string name="month_medium_september">"9月"</string>
- <string name="month_medium_october">"10月"</string>
- <string name="month_medium_november">"11月"</string>
- <string name="month_medium_december">"12月"</string>
+ <string name="month_medium_january">"1"</string>
+ <string name="month_medium_february">"2"</string>
+ <string name="month_medium_march">"3"</string>
+ <string name="month_medium_april">"4"</string>
+ <string name="month_medium_may">"5"</string>
+ <string name="month_medium_june">"6"</string>
+ <string name="month_medium_july">"7"</string>
+ <string name="month_medium_august">"8"</string>
+ <string name="month_medium_september">"9"</string>
+ <string name="month_medium_october">"10"</string>
+ <string name="month_medium_november">"11"</string>
+ <string name="month_medium_december">"12"</string>
<string name="month_shortest_january">"1"</string>
<string name="month_shortest_february">"2"</string>
<string name="month_shortest_march">"3"</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"次へ"</string>
<string name="ime_action_done">"完了"</string>
<string name="ime_action_default">"実行"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"<xliff:g id="NUMBER">%s</xliff:g>を使って"\n"発信"</string>
+ <string name="create_contact_using">"<xliff:g id="NUMBER">%s</xliff:g>を使って"\n"連絡先を新規登録"</string>
</resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index f44332a..96b897a 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -54,16 +54,11 @@
<string name="CLIRDefaultOffNextCallOff">"발신자 번호가 기본적으로 제한되지 않음으로 설정됩니다. 다음 통화: 제한되지 않음"</string>
<string name="serviceNotProvisioned">"서비스가 준비되지 않았습니다."</string>
<string name="CLIRPermanent">"발신자 번호 설정을 변경할 수 없습니다."</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="RestrictedChangedTitle">"제한된 액세스가 변경되었습니다."</string>
+ <string name="RestrictedOnData">"데이터 서비스가 차단되었습니다."</string>
+ <string name="RestrictedOnEmergency">"응급 서비스가 차단되었습니다."</string>
+ <string name="RestrictedOnNormal">"음성/SMS 서비스가 차단되었습니다."</string>
+ <string name="RestrictedOnAll">"모든 음성/SMS 서비스가 차단되었습니다."</string>
<string name="serviceClassVoice">"음성"</string>
<string name="serviceClassData">"데이터"</string>
<string name="serviceClassFAX">"팩스"</string>
@@ -410,8 +405,7 @@
<string name="lockscreen_missing_sim_instructions">"SIM 카드를 삽입하세요."</string>
<string name="lockscreen_network_locked_message">"네트워크 잠김"</string>
<string name="lockscreen_sim_puk_locked_message">"SIM 카드의 PUK가 잠겨 있습니다."</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
+ <string name="lockscreen_sim_puk_locked_instructions">"사용자 가이드를 참조하거나 고객지원팀에 문의하세요."</string>
<string name="lockscreen_sim_locked_message">"SIM 카드가 잠겨 있습니다."</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"SIM 카드 잠금해제 중..."</string>
<string name="lockscreen_too_many_failed_attempts_dialog_message">"잠금해제 패턴을 <xliff:g id="NUMBER_0">%d</xliff:g>회 잘못 가져왔습니다. "\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>초 후에 다시 시도하세요."</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"다음"</string>
<string name="ime_action_done">"완료"</string>
<string name="ime_action_default">"실행"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"다음 번호로 전화걸기"\n": <xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="create_contact_using">"다음 번호로 주소록 만들기"\n": <xliff:g id="NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index fc7ddca..3a9e32c 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -39,7 +39,7 @@
<string name="badPuk">"De PUK-code die u heeft ingevoerd, is onjuist."</string>
<string name="mismatchPin">"De PIN-codes die u heeft ingevoerd, komen niet overeen."</string>
<string name="invalidPin">"Voer een PIN-code van 4 tot 8 cijfers in."</string>
- <string name="needPuk">"Uw SIM-kaart is geblokkeerd met de PUK-code. Typ de PUK-code om de blokkering op te heffen."</string>
+ <string name="needPuk">"Uw SIM-kaart is vergrendeld met de PUK-code. Typ de PUK-code om te ontgrendelen."</string>
<string name="needPuk2">"Voer de PUK2-code in om de SIM-kaart te ontgrendelen."</string>
<string name="ClipMmi">"Inkomende beller-id"</string>
<string name="ClirMmi">"Uitgaande beller-id"</string>
@@ -54,16 +54,11 @@
<string name="CLIRDefaultOffNextCallOff">"Beller-id standaard ingesteld op \'onbeperkt\'. Volgende oproep: onbeperkt."</string>
<string name="serviceNotProvisioned">"Service niet voorzien."</string>
<string name="CLIRPermanent">"De instelling voor beller-id kan niet worden gewijzigd."</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="RestrictedChangedTitle">"Beperkte toegang gewijzigd"</string>
+ <string name="RestrictedOnData">"Gegevensservice is geblokkeerd."</string>
+ <string name="RestrictedOnEmergency">"Alarmservice is geblokkeerd."</string>
+ <string name="RestrictedOnNormal">"Spraak-/SMS-service is geblokkeerd."</string>
+ <string name="RestrictedOnAll">"Alle spraak-/SMS-services zijn geblokkeerd."</string>
<string name="serviceClassVoice">"Spraak"</string>
<string name="serviceClassData">"Gegevens"</string>
<string name="serviceClassFAX">"FAX"</string>
@@ -102,13 +97,13 @@
<string name="silent_mode">"Stille modus"</string>
<string name="turn_on_radio">"Draadloos inschakelen"</string>
<string name="turn_off_radio">"Draadloos uitschakelen"</string>
- <string name="screen_lock">"Schermblokkering"</string>
+ <string name="screen_lock">"Schermvergrendeling"</string>
<string name="power_off">"Uitschakelen"</string>
<string name="shutdown_progress">"Uitschakelen..."</string>
<string name="shutdown_confirm">"Uw telefoon wordt uitgeschakeld."</string>
<string name="no_recent_tasks">"Geen recente toepassingen."</string>
<string name="global_actions">"Telefoonopties"</string>
- <string name="global_action_lock">"Schermblokkering"</string>
+ <string name="global_action_lock">"Schermvergrendeling"</string>
<string name="global_action_power_off">"Uitschakelen"</string>
<string name="global_action_toggle_silent_mode">"Stille modus"</string>
<string name="global_action_silent_mode_on_status">"Geluid is UIT"</string>
@@ -332,8 +327,8 @@
<string name="permdesc_bluetoothAdmin">"Hiermee kan een toepassing de lokale Bluetooth-telefoon configureren en externe apparaten zoeken en aansluiten."</string>
<string name="permlab_bluetooth">"Bluetooth-verbindingen maken"</string>
<string name="permdesc_bluetooth">"Hiermee kan een toepassing de configuratie van een lokale Bluetooth-telefoon bekijken en verbindingen met gekoppelde apparaten maken en accepteren."</string>
- <string name="permlab_disableKeyguard">"toetsblokkering uitschakelen"</string>
- <string name="permdesc_disableKeyguard">"Hiermee kan een toepassing de toetsblokkering en bijbehorende wachtwoordbeveiliging uitschakelen. Een voorbeeld: de telefoon schakelt de toetsblokkering uit als er een oproep binnenkomt en schakelt de toetsblokkering weer in als de oproep is beëindigd."</string>
+ <string name="permlab_disableKeyguard">"toetsvergrendeling uitschakelen"</string>
+ <string name="permdesc_disableKeyguard">"Hiermee kan een toepassing de toetsvergrendeling en bijbehorende wachtwoordbeveiliging uitschakelen. Een voorbeeld: de telefoon schakelt de toetsvergrendeling uit als er een oproep binnenkomt en schakelt de toetsvergrendeling weer in als de oproep is beëindigd."</string>
<string name="permlab_readSyncSettings">"synchronisatie-instellingen lezen"</string>
<string name="permdesc_readSyncSettings">"Hiermee kan een toepassing de synchronisatie-instellingen lezen, bijvoorbeeld of de synchronisatie van contacten is ingeschakeld."</string>
<string name="permlab_writeSyncSettings">"synchronisatie-instellingen schrijven"</string>
@@ -396,7 +391,7 @@
<string name="keyguard_label_text">"Druk op \'Menu\' en vervolgens op 0 om te ontgrendelen."</string>
<string name="emergency_call_dialog_number_for_display">"Alarmnummer"</string>
<string name="lockscreen_carrier_default">"(Geen service)"</string>
- <string name="lockscreen_screen_locked">"Scherm geblokkeerd."</string>
+ <string name="lockscreen_screen_locked">"Scherm vergrendeld."</string>
<string name="lockscreen_instructions_when_pattern_enabled">"Druk op \'Menu\' om te ontgrendelen of noodoproep te plaatsen."</string>
<string name="lockscreen_instructions_when_pattern_disabled">"Druk op \'Menu\' om te ontgrendelen."</string>
<string name="lockscreen_pattern_instructions">"Patroon tekenen om te ontgrendelen"</string>
@@ -408,14 +403,13 @@
<string name="lockscreen_missing_sim_message_short">"Geen SIM-kaart."</string>
<string name="lockscreen_missing_sim_message">"Geen SIM-kaart in telefoon."</string>
<string name="lockscreen_missing_sim_instructions">"Plaats een SIM-kaart."</string>
- <string name="lockscreen_network_locked_message">"Netwerk geblokkeerd"</string>
- <string name="lockscreen_sim_puk_locked_message">"SIM-kaart is geblokkeerd met PUK-code."</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
- <string name="lockscreen_sim_locked_message">"SIM-kaart is geblokkeerd."</string>
+ <string name="lockscreen_network_locked_message">"Netwerk vergrendeld"</string>
+ <string name="lockscreen_sim_puk_locked_message">"SIM-kaart is vergrendeld met PUK-code."</string>
+ <string name="lockscreen_sim_puk_locked_instructions">"Raadpleeg de gebruikershandleiding of neem contact op met de klantenservice."</string>
+ <string name="lockscreen_sim_locked_message">"SIM-kaart is vergrendeld."</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"SIM-kaart ontgrendelen..."</string>
- <string name="lockscreen_too_many_failed_attempts_dialog_message">"U heeft uw deblokkeringspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string>
- <string name="lockscreen_failed_attempts_almost_glogin">"U heeft uw deblokkeringspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. Na nog eens <xliff:g id="NUMBER_1">%d</xliff:g> mislukte pogingen, wordt u gevraagd om uw telefoon te ontgrendelen met uw Google aanmelding."\n\n" Probeer het over <xliff:g id="NUMBER_2">%d</xliff:g> seconden opnieuw."</string>
+ <string name="lockscreen_too_many_failed_attempts_dialog_message">"U heeft uw ontgrendelingspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string>
+ <string name="lockscreen_failed_attempts_almost_glogin">"U heeft uw ontgrendelingspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. Na nog eens <xliff:g id="NUMBER_1">%d</xliff:g> mislukte pogingen, wordt u gevraagd om uw telefoon te ontgrendelen met uw Google aanmelding."\n\n" Probeer het over <xliff:g id="NUMBER_2">%d</xliff:g> seconden opnieuw."</string>
<string name="lockscreen_too_many_failed_attempts_countdown">"Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string>
<string name="lockscreen_forgot_pattern_button_text">"Patroon vergeten?"</string>
<string name="lockscreen_glogin_too_many_attempts">"Te veel patroonpogingen!"</string>
@@ -560,62 +554,62 @@
<string name="VideoView_error_button">"OK"</string>
<string name="am">"am"</string>
<string name="pm">"pm"</string>
- <string name="numeric_date">"<xliff:g id="MONTH">%m</xliff:g>/<xliff:g id="DAY">%d</xliff:g>/<xliff:g id="YEAR">%Y</xliff:g>"</string>
- <string name="wday1_date1_time1_wday2_date2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="DATE1">%2$s</xliff:g>, <xliff:g id="TIME1">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%4$s</xliff:g>, <xliff:g id="DATE2">%5$s</xliff:g>, <xliff:g id="TIME2">%6$s</xliff:g>"</string>
- <string name="wday1_date1_wday2_date2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="DATE1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%4$s</xliff:g>, <xliff:g id="DATE2">%5$s</xliff:g>"</string>
+ <string name="numeric_date">"<xliff:g id="DAY">%d</xliff:g>-<xliff:g id="MONTH">%m</xliff:g>-<xliff:g id="YEAR">%Y</xliff:g>"</string>
+ <string name="wday1_date1_time1_wday2_date2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DATE1">%2$s</xliff:g>, <xliff:g id="TIME1">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%4$s</xliff:g> <xliff:g id="DATE2">%5$s</xliff:g>, <xliff:g id="TIME2">%6$s</xliff:g>"</string>
+ <string name="wday1_date1_wday2_date2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DATE1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%4$s</xliff:g> <xliff:g id="DATE2">%5$s</xliff:g>"</string>
<string name="date1_time1_date2_time2">"<xliff:g id="DATE1">%2$s</xliff:g>, <xliff:g id="TIME1">%3$s</xliff:g> – <xliff:g id="DATE2">%5$s</xliff:g>, <xliff:g id="TIME2">%6$s</xliff:g>"</string>
<string name="date1_date2">"<xliff:g id="DATE1">%2$s</xliff:g> – <xliff:g id="DATE2">%5$s</xliff:g>"</string>
<string name="time1_time2">"<xliff:g id="TIME1">%1$s</xliff:g> – <xliff:g id="TIME2">%2$s</xliff:g>"</string>
- <string name="time_wday_date">"<xliff:g id="TIME_RANGE">%1$s</xliff:g>, <xliff:g id="WEEKDAY">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>"</string>
- <string name="wday_date">"<xliff:g id="WEEKDAY">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>"</string>
+ <string name="time_wday_date">"<xliff:g id="TIME_RANGE">%1$s</xliff:g>, <xliff:g id="WEEKDAY">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
+ <string name="wday_date">"<xliff:g id="WEEKDAY">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
<string name="time_date">"<xliff:g id="TIME_RANGE">%1$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>"</string>
<string name="date_time">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
<string name="relative_time">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
<string name="time_wday">"<xliff:g id="TIME_RANGE">%1$s</xliff:g>, <xliff:g id="WEEKDAY">%2$s</xliff:g>"</string>
- <string name="full_date_month_first" format="date">"<xliff:g id="MONTH">MMMM</xliff:g>' '<xliff:g id="DAY">d</xliff:g>', '<xliff:g id="YEAR">yyyy</xliff:g>"</string>
- <string name="full_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMMM</xliff:g>', '<xliff:g id="YEAR">yyyy</xliff:g>"</string>
- <string name="medium_date_month_first" format="date">"<xliff:g id="MONTH">MMM</xliff:g>' '<xliff:g id="DAY">d</xliff:g>', '<xliff:g id="YEAR">yyyy</xliff:g>"</string>
- <string name="medium_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMM</xliff:g>', '<xliff:g id="YEAR">yyyy</xliff:g>"</string>
+ <string name="full_date_month_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMMM</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>"</string>
+ <string name="full_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMMM</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>"</string>
+ <string name="medium_date_month_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMM</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>"</string>
+ <string name="medium_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMM</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>"</string>
<string name="twelve_hour_time_format" format="date">"<xliff:g id="HOUR">h</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>' '<xliff:g id="AMPM">a</xliff:g>"</string>
<string name="twenty_four_hour_time_format" format="date">"<xliff:g id="HOUR">HH</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>"</string>
<string name="noon">"twaalf uur \'s middags"</string>
<string name="Noon">"Twaalf uur \'s middags"</string>
<string name="midnight">"middernacht"</string>
<string name="Midnight">"Middernacht"</string>
- <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>
+ <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>
<!-- no translation found for month (7026169712234774086) -->
<skip />
- <string name="month_day_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>
+ <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
<string name="month_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
<string name="time_of_day">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g>"</string>
- <string name="date_and_time">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>
- <string name="same_year_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>"</string>
- <string name="same_year_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>"</string>
- <string name="same_year_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR">%9$s</xliff:g>"</string>
- <string name="same_year_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR">%9$s</xliff:g>"</string>
- <string name="same_year_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="same_year_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="same_year_mdy1_time1_mdy2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="numeric_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>"</string>
- <string name="numeric_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g>"</string>
- <string name="numeric_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>/<xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>/<xliff:g id="YEAR2">%9$s</xliff:g>"</string>
- <string name="numeric_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g>/<xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g>/<xliff:g id="YEAR2">%9$s</xliff:g>"</string>
- <string name="numeric_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="numeric_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="numeric_mdy1_time1_mdy2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>/<xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>/<xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g>/<xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g>/<xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="same_month_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>"</string>
- <string name="same_month_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>"</string>
- <string name="same_month_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>"</string>
- <string name="same_month_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>"</string>
- <string name="same_month_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="same_month_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="same_month_mdy1_time1_mdy2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="abbrev_month_day_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>
+ <string name="date_and_time">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g> <xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
+ <string name="same_year_md1_md2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>"</string>
+ <string name="same_year_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>"</string>
+ <string name="same_year_mdy1_mdy2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR">%9$s</xliff:g>"</string>
+ <string name="same_year_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR">%9$s</xliff:g>"</string>
+ <string name="same_year_md1_time1_md2_time2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="same_year_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="same_year_mdy1_time1_mdy2_time2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="numeric_md1_md2">"<xliff:g id="DAY1">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>"</string>
+ <string name="numeric_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>"</string>
+ <string name="numeric_mdy1_mdy2">"<xliff:g id="DAY1">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>-<xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>-<xliff:g id="YEAR2">%9$s</xliff:g>"</string>
+ <string name="numeric_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>-<xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>-<xliff:g id="YEAR2">%9$s</xliff:g>"</string>
+ <string name="numeric_md1_time1_md2_time2">"<xliff:g id="DAY1">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="numeric_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="numeric_mdy1_time1_mdy2_time2">"<xliff:g id="DAY1">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>-<xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>-<xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>-<xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>-<xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="same_month_md1_md2">"<xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>"</string>
+ <string name="same_month_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>"</string>
+ <string name="same_month_mdy1_mdy2">"<xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>"</string>
+ <string name="same_month_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>"</string>
+ <string name="same_month_md1_time1_md2_time2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="same_month_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="same_month_mdy1_time1_mdy2_time2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
+ <string name="abbrev_month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
<string name="abbrev_month_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
- <string name="abbrev_month_day">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>
+ <string name="abbrev_month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%b</xliff:g>"</string>
<!-- no translation found for abbrev_month (3131032032850777433) -->
<skip />
<string name="day_of_week_long_sunday">"Zondag"</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"Volgende"</string>
<string name="ime_action_done">"Gereed"</string>
<string name="ime_action_default">"Uitvoeren"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"Nummer bellen"\n"met <xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="create_contact_using">"Contact maken"\n"met <xliff:g id="NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index 9ac2795..50d245b 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -54,16 +54,11 @@
<string name="CLIRDefaultOffNextCallOff">"Identyfikator dzwoniącego ustawiony jest domyślnie na „nie zastrzeżony”. Następne połączenie: nie zastrzeżony"</string>
<string name="serviceNotProvisioned">"Usługa nie jest świadczona."</string>
<string name="CLIRPermanent">"Nie można zmienić ustawienia identyfikatora dzwoniącego."</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="RestrictedChangedTitle">"Zmieniono ograniczenie dostępu"</string>
+ <string name="RestrictedOnData">"Usługa transmisji danych jest zablokowana."</string>
+ <string name="RestrictedOnEmergency">"Usługa połączeń alarmowych jest zablokowana."</string>
+ <string name="RestrictedOnNormal">"Usługa głosowa/SMS jest zablokowana."</string>
+ <string name="RestrictedOnAll">"Wszystkie usługi głosowe/SMS są zablokowane."</string>
<string name="serviceClassVoice">"Głos"</string>
<string name="serviceClassData">"Dane"</string>
<string name="serviceClassFAX">"FAKS"</string>
@@ -410,8 +405,7 @@
<string name="lockscreen_missing_sim_instructions">"Włóż kartę SIM."</string>
<string name="lockscreen_network_locked_message">"Sieć zablokowana"</string>
<string name="lockscreen_sim_puk_locked_message">"Karta SIM jest zablokowana kodem PUK."</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
+ <string name="lockscreen_sim_puk_locked_instructions">"Zapoznaj się z instrukcją obsługi lub skontaktuj się z działem obsługi klienta."</string>
<string name="lockscreen_sim_locked_message">"Karta SIM jest zablokowana."</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"Odblokowywanie karty SIM..."</string>
<string name="lockscreen_too_many_failed_attempts_dialog_message">"Wzór odblokowania został nieprawidłowo narysowany <xliff:g id="NUMBER_0">%d</xliff:g> razy. "\n\n"Spróbuj ponownie za <xliff:g id="NUMBER_1">%d</xliff:g> sekund."</string>
@@ -431,7 +425,7 @@
<string name="hour_cap_ampm">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string>
<string name="status_bar_clear_all_button">"Wyczyść powiadomienia"</string>
<string name="status_bar_no_notifications_title">"Brak powiadomień"</string>
- <string name="status_bar_ongoing_events_title">"Trwające"</string>
+ <string name="status_bar_ongoing_events_title">"Bieżące"</string>
<string name="status_bar_latest_events_title">"Powiadomienia"</string>
<string name="battery_status_text_percent_format">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
<string name="battery_status_charging">"Ładowanie..."</string>
@@ -582,10 +576,10 @@
<string name="Noon">"Południe"</string>
<string name="midnight">"północ"</string>
<string name="Midnight">"Północ"</string>
- <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>
+ <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>
<!-- no translation found for month (7026169712234774086) -->
<skip />
- <string name="month_day_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>
+ <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
<string name="month_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
<string name="time_of_day">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g>"</string>
<string name="date_and_time">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>
@@ -613,7 +607,7 @@
<string name="same_month_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
<string name="same_month_mdy1_time1_mdy2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
<string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>
- <string name="abbrev_month_day_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>
+ <string name="abbrev_month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
<string name="abbrev_month_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>
<string name="abbrev_month_day">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>
<!-- no translation found for abbrev_month (3131032032850777433) -->
@@ -721,8 +715,8 @@
<string name="aerr_application">"Aplikacja <xliff:g id="APPLICATION">%1$s</xliff:g> (proces <xliff:g id="PROCESS">%2$s</xliff:g>) została niespodziewanie zatrzymana. Spróbuj ponownie."</string>
<string name="aerr_process">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> został niespodziewanie zatrzymany. Spróbuj ponownie."</string>
<string name="anr_title">"Przepraszamy!"</string>
- <string name="anr_activity_application">"<xliff:g id="ACTIVITY">%1$s</xliff:g> (w aplikacji <xliff:g id="APPLICATION">%2$s</xliff:g>) nie odpowiada."</string>
- <string name="anr_activity_process">"<xliff:g id="ACTIVITY">%1$s</xliff:g> (w procesie <xliff:g id="PROCESS">%2$s</xliff:g>) nie odpowiada."</string>
+ <string name="anr_activity_application">"Działanie <xliff:g id="ACTIVITY">%1$s</xliff:g> (w aplikacji <xliff:g id="APPLICATION">%2$s</xliff:g>) nie odpowiada."</string>
+ <string name="anr_activity_process">"Działanie <xliff:g id="ACTIVITY">%1$s</xliff:g> (w procesie <xliff:g id="PROCESS">%2$s</xliff:g>) nie odpowiada."</string>
<string name="anr_application_process">"Aplikacja <xliff:g id="APPLICATION">%1$s</xliff:g> (w procesie <xliff:g id="PROCESS">%2$s</xliff:g>) nie odpowiada."</string>
<string name="anr_process">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> nie odpowiada."</string>
<string name="force_close">"Wymuś zamknięcie"</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"Dalej"</string>
<string name="ime_action_done">"Gotowe"</string>
<string name="ime_action_default">"Wykonaj"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"Połącz"\n"z numerem <xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="create_contact_using">"Utwórz kontakt"\n"dla numeru <xliff:g id="NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 07b58ed..fac6cb7 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -54,16 +54,11 @@
<string name="CLIRDefaultOffNextCallOff">"Идентификатор звонящего по умолчанию не ограничен. Следующий вызов: не ограничен"</string>
<string name="serviceNotProvisioned">"Услуга не предоставляется."</string>
<string name="CLIRPermanent">"Нельзя изменить настройки идентификатора звонящего."</string>
- <!-- no translation found for RestrictedChangedTitle (5592189398956187498) -->
- <skip />
- <!-- no translation found for RestrictedOnData (8653794784690065540) -->
- <skip />
- <!-- no translation found for RestrictedOnEmergency (6581163779072833665) -->
- <skip />
- <!-- no translation found for RestrictedOnNormal (2045364908281990708) -->
- <skip />
- <!-- no translation found for RestrictedOnAll (4923139582141626159) -->
- <skip />
+ <string name="RestrictedChangedTitle">"Ограничения доступа изменены"</string>
+ <string name="RestrictedOnData">"Служба данных заблокирована."</string>
+ <string name="RestrictedOnEmergency">"Аварийная служба заблокирована."</string>
+ <string name="RestrictedOnNormal">"Служба передачи SMS/голосовых сообщений заблокирована."</string>
+ <string name="RestrictedOnAll">"Все службы передачи SMS/голосовых сообщений заблокированы."</string>
<string name="serviceClassVoice">"Голос"</string>
<string name="serviceClassData">"Данные"</string>
<string name="serviceClassFAX">"ФАКС"</string>
@@ -410,8 +405,7 @@
<string name="lockscreen_missing_sim_instructions">"Вставьте SIM-карту."</string>
<string name="lockscreen_network_locked_message">"Заблокирована сетью"</string>
<string name="lockscreen_sim_puk_locked_message">"SIM-карта заблокирована PUK-кодом."</string>
- <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) -->
- <skip />
+ <string name="lockscreen_sim_puk_locked_instructions">"См. руководство пользователя или свяжитесь со службой поддержки."</string>
<string name="lockscreen_sim_locked_message">"SIM-карта заблокирована."</string>
<string name="lockscreen_sim_unlock_progress_dialog_message">"Разблокировка SIM-карты..."</string>
<string name="lockscreen_too_many_failed_attempts_dialog_message">"Вы неправильно воспроизвели комбинацию разблокировки <xliff:g id="NUMBER_0">%d</xliff:g> раз. "\n\n"Повторите попытку через <xliff:g id="NUMBER_1">%d</xliff:g> сек."</string>
@@ -806,8 +800,6 @@
<string name="ime_action_next">"Далее"</string>
<string name="ime_action_done">"Готово"</string>
<string name="ime_action_default">"Выполнить"</string>
- <!-- no translation found for dial_number_using (5789176425167573586) -->
- <skip />
- <!-- no translation found for create_contact_using (4947405226788104538) -->
- <skip />
+ <string name="dial_number_using">"Набрать номер"\n"<xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="create_contact_using">"Создать контакт"\n"с номером <xliff:g id="NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/core/res/res/values-zh-rCN/arrays.xml b/core/res/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index 16da6d9..0000000
--- a/core/res/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
- <!-- Do not translate. -->
- <integer-array name="maps_starting_lat_lng">
- <item>39937795</item>
- <item>116387224</item>
- </integer-array>
- <!-- Do not translate. -->
- <integer-array name="maps_starting_zoom">
- <item>2</item>
- </integer-array>
-
-</resources>
diff --git a/core/res/res/values-zh-rTW/arrays.xml b/core/res/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index be0795b..0000000
--- a/core/res/res/values-zh-rTW/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
- <!-- Do not translate. -->
- <integer-array name="maps_starting_lat_lng">
- <item>25022112</item>
- <item>121478019</item>
- </integer-array>
- <!-- Do not translate. -->
- <integer-array name="maps_starting_zoom">
- <item>3</item>
- </integer-array>
-
-</resources>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 9b38d0a..4258804 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -850,12 +850,12 @@
<enum name="KEYCODE_MENU" value="82" />
<enum name="KEYCODE_NOTIFICATION" value="83" />
<enum name="KEYCODE_SEARCH" value="84" />
- <enum name="KEYCODE_PLAYPAUSE" value="85" />
- <enum name="KEYCODE_STOP" value="86" />
- <enum name="KEYCODE_NEXTSONG" value="87" />
- <enum name="KEYCODE_PREVIOUSSONG" value="88" />
- <enum name="KEYCODE_REWIND" value="89" />
- <enum name="KEYCODE_FORWARD" value="90" />
+ <enum name="KEYCODE_MEDIA_PLAY_PAUSE" value="85" />
+ <enum name="KEYCODE_MEDIA_STOP" value="86" />
+ <enum name="KEYCODE_MEDIA_NEXT" value="87" />
+ <enum name="KEYCODE_MEDIA_PREVIOUS" value="88" />
+ <enum name="KEYCODE_MEDIA_REWIND" value="89" />
+ <enum name="KEYCODE_MEDIA_FAST_FORWARD" value="90" />
<enum name="KEYCODE_MUTE" value="91" />
</attr>
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 2ff0962..093ddd3 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -1062,15 +1062,24 @@
<declare-styleable name="AndroidManifestData" parent="AndroidManifestIntentFilter">
<!-- Specify a MIME type that is handled, as per
{@link android.content.IntentFilter#addDataType
- IntentFilter.addDataType()}. -->
+ IntentFilter.addDataType()}.
+ <p><em>Note: MIME type matching in the Android framework is
+ case-sensitive, unlike formal RFC MIME types. As a result,
+ MIME types here should always use lower case letters.</em></p> -->
<attr name="mimeType" format="string" />
<!-- Specify a URI scheme that is handled, as per
{@link android.content.IntentFilter#addDataScheme
- IntentFilter.addDataScheme()}. -->
+ IntentFilter.addDataScheme()}.
+ <p><em>Note: scheme matching in the Android framework is
+ case-sensitive, unlike the formal RFC. As a result,
+ schemes here should always use lower case letters.</em></p> -->
<attr name="scheme" format="string" />
<!-- Specify a URI authority host that is handled, as per
{@link android.content.IntentFilter#addDataAuthority
- IntentFilter.addDataAuthority()}. -->
+ IntentFilter.addDataAuthority()}.
+ <p><em>Note: host name matching in the Android framework is
+ case-sensitive, unlike the formal RFC. As a result,
+ host names here should always use lower case letters.</em></p> -->
<attr name="host" format="string" />
<!-- Specify a URI authority port that is handled, as per
{@link android.content.IntentFilter#addDataAuthority
@@ -1140,10 +1149,17 @@
{@link android.content.Intent#setAction Intent.setAction()}. -->
<attr name="action" format="string" />
<!-- The data URI to assign to the Intent, as per
- {@link android.content.Intent#setData Intent.setData()}. -->
+ {@link android.content.Intent#setData Intent.setData()}.
+ <p><em>Note: scheme and host name matching in the Android framework is
+ case-sensitive, unlike the formal RFC. As a result,
+ Uris here should always be normalized to use lower case letters
+ for these elements (as well as other proper Uri normalization).</em></p> -->
<attr name="data" format="string" />
<!-- The MIME type name to assign to the Intent, as per
- {@link android.content.Intent#setType Intent.setType()}. -->
+ {@link android.content.Intent#setType Intent.setType()}.
+ <p><em>Note: MIME type matching in the Android framework is
+ case-sensitive, unlike formal RFC MIME types. As a result,
+ MIME types here should always use lower case letters.</em></p> -->
<attr name="mimeType" />
<!-- The package part of the ComponentName to assign to the Intent, as per
{@link android.content.Intent#setComponent Intent.setComponent()}. -->
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index f45d2e4..3282482 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2321,5 +2321,8 @@
<!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed. The first line will be in bigger type than the second. -->
<string name="create_contact_using">Create contact\nusing <xliff:g id="number" example="555">%s</xliff:g></string>
-
+
+ <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale pairs. This is used at startup to set a default locale by checking the system property ro.carrier for the carrier-id and searching through this array -->
+ <string-array translatable="false" name="carrier_locales">
+ </string-array>
</resources>
generated by cgit v1.1 at 2025-02-04 17:33:09 +0000