diff options
author | Marie Janssen <jamuraa@google.com> | 2017-01-10 17:55:28 -0800 |
---|---|---|
committer | Marie Janssen <jamuraa@google.com> | 2017-01-10 17:55:28 -0800 |
commit | 2bd1db8c4e1c44e9474eecd45a127a9aeac18150 (patch) | |
tree | fb26aac7ec43f47e9790fb69ab321ccb0cb14068 /res/values-ro | |
parent | 4eacbdb6ea1e86c7741e6e80a054e8331eca5560 (diff) | |
parent | ed3da4c780e8bf8adb230fd2e54a3f115a729993 (diff) | |
download | android_packages_apps_Bluetooth-2bd1db8c4e1c44e9474eecd45a127a9aeac18150.tar.gz android_packages_apps_Bluetooth-2bd1db8c4e1c44e9474eecd45a127a9aeac18150.tar.bz2 android_packages_apps_Bluetooth-2bd1db8c4e1c44e9474eecd45a127a9aeac18150.zip |
resolve merge conflicts of ed3da4c78 to nyc-mr1-dev-plus-aosp
Change-Id: I4244c7ae08a182332985bffdac31ec30a5813e5c
Diffstat (limited to 'res/values-ro')
-rw-r--r-- | res/values-ro/strings_map.xml | 15 | ||||
-rw-r--r-- | res/values-ro/test_strings.xml | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/res/values-ro/strings_map.xml b/res/values-ro/strings_map.xml deleted file mode 100644 index bfed36c50..000000000 --- a/res/values-ro/strings_map.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="map_session_key_dialog_title" msgid="4357431314165953502">"Introduceţi cheia de sesiune pentru %1$s"</string> - <string name="map_session_key_dialog_header" msgid="1858363785687455516">"Cheie de sesiune Bluetooth solicitată"</string> - <string name="map_acceptance_timeout_message" msgid="2247454902690565876">"A expirat timpul pentru acceptarea conexiunii cu %1$s"</string> - <string name="map_authentication_timeout_message" msgid="2151423397615327066">"A expirat timpul de introducere a cheii de sesiune cu %1$s"</string> - <string name="map_auth_notif_ticker" msgid="8840174807927327119">"Cerere de autentificare pentru protocolul OBEX"</string> - <string name="map_auth_notif_title" msgid="301767019364765129">"Cheia sesiunii"</string> - <string name="map_auth_notif_message" msgid="1510095655064214863">"Introduceţi cheia de sesiune pentru %1$s"</string> - <string name="map_defaultname" msgid="3805234816465216759">"Set de maşină"</string> - <string name="map_unknownName" msgid="4985352365863687360">"Nume necunoscut"</string> - <string name="map_localPhoneName" msgid="6264496105941797768">"Numele meu"</string> - <string name="map_defaultnumber" msgid="3838264444043503815">"000000"</string> -</resources> diff --git a/res/values-ro/test_strings.xml b/res/values-ro/test_strings.xml index 773db8dfe..08e9de399 100644 --- a/res/values-ro/test_strings.xml +++ b/res/values-ro/test_strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="hello" msgid="1740533743008967039">"Bună ziua tuturor! Test de activitate!"</string> <string name="app_name" msgid="1203877025577761792">"Distribuire prin Bluetooth"</string> <string name="insert_record" msgid="1450997173838378132">"Inserați o înregistrare"</string> <string name="update_record" msgid="2480425402384910635">"Confirmați înregistrarea"</string> |