diff options
author | Baligh Uddin <baligh@google.com> | 2014-02-25 17:23:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-25 17:23:25 +0000 |
commit | 7f6855864c3a7bfb76d07438cf975158e722a356 (patch) | |
tree | 48092c1ab47afdfef334c4638475d3df54a41e58 | |
parent | d9abcfa2be56d71e8c2d32c73e940e1abbe90a7d (diff) | |
parent | 9beac5ce876f4f641af9120d04e1c648c2f69f5f (diff) | |
download | android_packages_apps_Email-7f6855864c3a7bfb76d07438cf975158e722a356.tar.gz android_packages_apps_Email-7f6855864c3a7bfb76d07438cf975158e722a356.tar.bz2 android_packages_apps_Email-7f6855864c3a7bfb76d07438cf975158e722a356.zip |
Merge "Import translations. DO NOT MERGE" into ub-mail-master
-rw-r--r-- | res/values-am/strings.xml | 4 | ||||
-rw-r--r-- | res/values-fi/strings.xml | 6 | ||||
-rw-r--r-- | res/values-hy-rAM/strings.xml | 6 | ||||
-rw-r--r-- | res/values-ka-rGE/strings.xml | 6 | ||||
-rw-r--r-- | res/values-ms-rMY/strings.xml | 6 | ||||
-rw-r--r-- | res/values-pt/strings.xml | 6 | ||||
-rw-r--r-- | res/values-ro/strings.xml | 6 |
7 files changed, 14 insertions, 26 deletions
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index aedd6c0bc..89a647954 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -81,7 +81,7 @@ <string name="account_setup_basics_title" msgid="3578333196594678422">"መለያ አዘጋጅ"</string> <string name="sign_in_title" msgid="8509755024484685915">"በመለያ ይግቡ"</string> <string name="account_setup_basics_headline" msgid="6726590205905464015">"የኢሜይል መለያ"</string> - <string name="accounts_welcome" msgid="8337750045270269649">"መለያህን በጥቂት ደረጃዎች ብቻ ማዋቀር ትችላለህ።"</string> + <string name="accounts_welcome" msgid="8337750045270269649">"መለያዎን በጥቂት ደረጃዎች ብቻ ማዋቀር ይችላሉ።"</string> <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ኢሜይል አድራሻ"</string> <string name="or_label" msgid="2207403489755254427">"ወይም"</string> <string name="sign_in_with_google" msgid="9051489501495503976">"በGoogle ይግቡ"</string> @@ -203,7 +203,7 @@ <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"የማያ ቆልፍ ይለፍ ቃል ጊዜው እያለፈነው"</string> <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"በቅርቡ የማሳያህ ቆልፍ ፒን ወይም የይለፍ ቃል መለወጥ ያስፈልግሃል፤ አለበለዚያ የ<xliff:g id="ACCOUNT">%s</xliff:g> ውሂብ ይሰረዛል። አሁን እንዲለወጥ ትፈልጋለህ?"</string> <string name="password_expired_dialog_title" msgid="2186547998125938084">"የማያ ቆልፍ ይለፍ ቃል ጊዜው አልፏል"</string> - <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"የ<xliff:g id="ACCOUNT">%s</xliff:g> ውሂብ ከመሳሪያህ ላይ እየተሰረዘ ነው። የማያ መቆለፊያ PIN ወይም ይለፍ ቃል በመለወጥ እነበረበት መመለስ ትችላለህ። አሁን መለወጥ ትፈልጋለህ?"</string> + <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"የ<xliff:g id="ACCOUNT">%s</xliff:g> ውሂብ ከመሳሪያዎ ላይ እየተሰረዘ ነው። የማያ መቆለፊያ PIN ወይም ይለፍ ቃል በመለወጥ እነበረበት መመለስ ይችላሉ። አሁን መለወጥ ይፈልጋሉ?"</string> <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"ያልተቀመጠ ለውጦችን ይወገዱ?"</string> <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"በመለያ መግባት አልተቻለም፡፡"</string> <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"የ<xliff:g id="ACCOUNT">%s</xliff:g> የተጠቃሚው ስም ወይም ይለፍ ቃል የተሳሳተ ነው። አሁን ልታዘምናቸው ትፈልጋለህ?"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 42d417246..7f621c92d 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -85,11 +85,9 @@ <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Sähköpostiosoite"</string> <string name="or_label" msgid="2207403489755254427">"TAI"</string> <string name="sign_in_with_google" msgid="9051489501495503976">"Kirjaudu Google-tiliin"</string> - <!-- no translation found for password_label (5228754278985667134) --> - <skip /> + <string name="password_label" msgid="5228754278985667134">"Salasana"</string> <string name="signed_in_with_service_label" msgid="4909910797357155961">"Kirjautunut palveluun %s"</string> - <!-- no translation found for authentication_label (5210804218348191833) --> - <skip /> + <string name="authentication_label" msgid="5210804218348191833">"Todennus"</string> <string name="add_authentication_label" msgid="865206092644419804">"Lisää todennus"</string> <string name="clear_authentication_label" msgid="8113966442068335059">"Poista todennus"</string> <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuaalinen määritys"</string> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 58b6308be..9a20a8b64 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -85,13 +85,11 @@ <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Էլփոստի հասցե"</string> <string name="or_label" msgid="2207403489755254427">"ԿԱՄ"</string> <string name="sign_in_with_google" msgid="9051489501495503976">"Մուտք գործել Google-ով"</string> - <!-- no translation found for password_label (5228754278985667134) --> - <skip /> + <string name="password_label" msgid="5228754278985667134">"Գաղտնաբառ"</string> <!-- String.format failed for translation --> <!-- no translation found for signed_in_with_service_label (4909910797357155961) --> <skip /> - <!-- no translation found for authentication_label (5210804218348191833) --> - <skip /> + <string name="authentication_label" msgid="5210804218348191833">"Նույնականացում"</string> <string name="add_authentication_label" msgid="865206092644419804">"Ավելացնել նույնականացում"</string> <string name="clear_authentication_label" msgid="8113966442068335059">"Մաքրել նույնականացումը"</string> <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ձեռքով կարգավորում"</string> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 616297b1b..a474bcc33 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -85,11 +85,9 @@ <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ელფოსტის მისამართი"</string> <string name="or_label" msgid="2207403489755254427">"OR"</string> <string name="sign_in_with_google" msgid="9051489501495503976">"Google-ით შესვლა"</string> - <!-- no translation found for password_label (5228754278985667134) --> - <skip /> + <string name="password_label" msgid="5228754278985667134">"პაროლი"</string> <string name="signed_in_with_service_label" msgid="4909910797357155961">"შესულია %s-ით"</string> - <!-- no translation found for authentication_label (5210804218348191833) --> - <skip /> + <string name="authentication_label" msgid="5210804218348191833">"ავტორიზაცია"</string> <string name="add_authentication_label" msgid="865206092644419804">"ავტორიზაციის დამატება"</string> <string name="clear_authentication_label" msgid="8113966442068335059">"ავტორიზაციის გასუფთავება"</string> <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"ხელით დაყენება"</string> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 61e9fcf7c..71996a080 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -85,11 +85,9 @@ <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Alamat e-mel"</string> <string name="or_label" msgid="2207403489755254427">"ATAU"</string> <string name="sign_in_with_google" msgid="9051489501495503976">"Log masuk dengan Google"</string> - <!-- no translation found for password_label (5228754278985667134) --> - <skip /> + <string name="password_label" msgid="5228754278985667134">"Kata laluan"</string> <string name="signed_in_with_service_label" msgid="4909910797357155961">"Dilog masuk dengan %s"</string> - <!-- no translation found for authentication_label (5210804218348191833) --> - <skip /> + <string name="authentication_label" msgid="5210804218348191833">"Pengesahan"</string> <string name="add_authentication_label" msgid="865206092644419804">"Tambah pengesahan"</string> <string name="clear_authentication_label" msgid="8113966442068335059">"Padamkan pengesahan"</string> <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Persediaan manual"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index af617859d..5328d2306 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -85,11 +85,9 @@ <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Endereço de e-mail"</string> <string name="or_label" msgid="2207403489755254427">"OU"</string> <string name="sign_in_with_google" msgid="9051489501495503976">"Fazer login com o Google"</string> - <!-- no translation found for password_label (5228754278985667134) --> - <skip /> + <string name="password_label" msgid="5228754278985667134">"Senha"</string> <string name="signed_in_with_service_label" msgid="4909910797357155961">"Conectado com o %s"</string> - <!-- no translation found for authentication_label (5210804218348191833) --> - <skip /> + <string name="authentication_label" msgid="5210804218348191833">"Autenticação"</string> <string name="add_authentication_label" msgid="865206092644419804">"Adicionar autenticação"</string> <string name="clear_authentication_label" msgid="8113966442068335059">"Limpar autenticação"</string> <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 82a6b79cf..1e3c25161 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -85,11 +85,9 @@ <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresă de e-mail"</string> <string name="or_label" msgid="2207403489755254427">"SAU"</string> <string name="sign_in_with_google" msgid="9051489501495503976">"Conectați-vă cu Google"</string> - <!-- no translation found for password_label (5228754278985667134) --> - <skip /> + <string name="password_label" msgid="5228754278985667134">"Parolă"</string> <string name="signed_in_with_service_label" msgid="4909910797357155961">"Conectat(ă) cu %s"</string> - <!-- no translation found for authentication_label (5210804218348191833) --> - <skip /> + <string name="authentication_label" msgid="5210804218348191833">"Autentificare"</string> <string name="add_authentication_label" msgid="865206092644419804">"Adăugați autentificare"</string> <string name="clear_authentication_label" msgid="8113966442068335059">"Ștergeți autentificarea"</string> <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configurare manuală"</string> |