diff options
author | Steve Kondik <steve@cyngn.com> | 2015-03-15 00:34:12 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-03-15 00:34:12 -0700 |
commit | 7179f3b01e4f2fb825863bc0d92006fefeba6375 (patch) | |
tree | 1ea3d007ca798e0d4b86c18ed03d41c717b2ed77 | |
parent | 7d11386c888094c3871e6afe68f5d2d915ef43e8 (diff) | |
parent | 33c0a544f35937a5175e45dea1c71d37595c4d3f (diff) | |
download | android_packages_apps_CertInstaller-7179f3b01e4f2fb825863bc0d92006fefeba6375.tar.gz android_packages_apps_CertInstaller-7179f3b01e4f2fb825863bc0d92006fefeba6375.tar.bz2 android_packages_apps_CertInstaller-7179f3b01e4f2fb825863bc0d92006fefeba6375.zip |
Merge tag 'android-5.1.0_r1' of https://android.googlesource.com/platform/packages/apps/CertInstaller into cm-12.1staging/cm-12.1stable/cm-12.1-YOG3C
Android 5.1.0 release 1
-rw-r--r-- | res/values-hi/strings.xml | 10 | ||||
-rw-r--r-- | res/values-pt/strings.xml | 4 | ||||
-rw-r--r-- | res/values-sl/strings.xml | 4 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 4 | ||||
-rw-r--r-- | res/values-zh-rHK/strings.xml | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 7b3fd31..a2b4b15 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -35,7 +35,7 @@ <string name="name_empty_error" msgid="3808800768660110354">"नाम लिखें."</string> <string name="name_char_error" msgid="3176618568784938968">"वह नाम लिखें जिसमें केवल अक्षर और संख्याएं हों."</string> <string name="storage_error" msgid="8306802455802770779">"प्रमाणपत्र सहेजा नहीं जा सका. पुन: प्रयास करने के लिए ठीक स्पर्श करें."</string> - <string name="unable_to_save_cert" msgid="9178604087335389686">"प्रमाणपत्र सहेजा नहीं जा सका. प्रमाणिकता मेमोरी सक्षम नहीं है या ठीक से प्रारंभ नहीं हुआ है."</string> + <string name="unable_to_save_cert" msgid="9178604087335389686">"प्रमाणपत्र सहेजा नहीं जा सका. क्रेडेंशियल संग्रहण सक्षम नहीं है या ठीक से प्रारंभ नहीं हुआ है."</string> <string name="cert_not_saved" msgid="4037698479662830270">"प्रमाणपत्र इंस्टॉल नहीं हुआ."</string> <string name="no_cert_to_saved" msgid="5708884372817309068">"इंस्टॉल करने के लिए कोई प्रमाणपत्र नहीं है."</string> <string name="invalid_cert" msgid="7704228670980743590">"प्रमाणपत्र अमान्य है."</string> @@ -43,12 +43,12 @@ <string name="cert_too_large_error" msgid="8715414972725646285">"प्रमाणपत्र का आकार बहुत बड़ा होने के कारण इंस्टॉल नहीं कर सका."</string> <string name="cert_missing_error" msgid="7040527352278728220">"प्रमाणपत्र फ़ाइल नहीं मिल सकने के कारण इंस्टॉल नहीं कर सका."</string> <string name="cert_read_error" msgid="7353463360652419796">"प्रमाणपत्र फ़ाइल नहीं पढ़ी जा सकने के कारण इंस्टॉल नहीं कर सका."</string> - <string name="no_cert_file_found" product="nosdcard" msgid="3555332946357131929">"USB मेमोरी में कोई प्रमाणपत्र फ़ाइल नहीं मिली."</string> + <string name="no_cert_file_found" product="nosdcard" msgid="3555332946357131929">"USB संग्रहण में कोई प्रमाणपत्र फ़ाइल नहीं मिली."</string> <string name="no_cert_file_found" product="default" msgid="1942077544887243999">"SD कार्ड में कोई प्रमाणपत्र फ़ाइल नहीं मिली."</string> - <string name="sdcard_not_present" product="nosdcard" msgid="9197143240492611196">"USB मेमोरी उपलब्ध नहीं है."</string> + <string name="sdcard_not_present" product="nosdcard" msgid="9197143240492611196">"USB संग्रहण उपलब्ध नहीं है."</string> <string name="sdcard_not_present" product="default" msgid="3866952732541932947">"SD कार्ड मौजूद नहीं है."</string> - <string name="only_primary_user_allowed" msgid="4005084935023047716">"केवल इस डिवाइस का स्वामी ही प्रमाणपत्रों को इंस्टॉल कर सकता है."</string> - <string name="credential_usage_label" msgid="1513892208033156805">"प्रमाणिकता उपयोग:"</string> + <string name="only_primary_user_allowed" msgid="4005084935023047716">"केवल इस उपकरण का स्वामी ही प्रमाणपत्रों को इंस्टॉल कर सकता है."</string> + <string name="credential_usage_label" msgid="1513892208033156805">"क्रेडेंशियल उपयोग:"</string> <string-array name="credential_usage"> <item msgid="375085478373011304">"VPN और ऐप्स"</item> <item msgid="692322974985472861">"वाई-फ़ाई"</item> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index abc379c..222aeff 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -35,7 +35,7 @@ <string name="name_empty_error" msgid="3808800768660110354">"Digite um nome."</string> <string name="name_char_error" msgid="3176618568784938968">"Digite um nome que contenha apenas letras e números."</string> <string name="storage_error" msgid="8306802455802770779">"Não foi possível salvar o certificado. Toque em OK para tentar novamente."</string> - <string name="unable_to_save_cert" msgid="9178604087335389686">"Não foi possível salvar o certificado. Armazenamento de credenciais desativado ou não inicializado corretamente."</string> + <string name="unable_to_save_cert" msgid="9178604087335389686">"Não foi possível salvar o certificado. O armazenamento de credenciais não está ativado ou não foi inicializado corretamente."</string> <string name="cert_not_saved" msgid="4037698479662830270">"O certificado não está instalado."</string> <string name="no_cert_to_saved" msgid="5708884372817309068">"Não há certificado para instalar."</string> <string name="invalid_cert" msgid="7704228670980743590">"O certificado é inválido."</string> @@ -50,7 +50,7 @@ <string name="only_primary_user_allowed" msgid="4005084935023047716">"Somente o dono do dispositivo pode instalar certificados."</string> <string name="credential_usage_label" msgid="1513892208033156805">"Uso da credencial:"</string> <string-array name="credential_usage"> - <item msgid="375085478373011304">"VPN e apps"</item> + <item msgid="375085478373011304">"VPN e aplicativos"</item> <item msgid="692322974985472861">"Wi-Fi"</item> </string-array> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 7626b0d..4f25e25 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="9095072584761066851">"Namestitvena aplikacija za potrdilo"</string> + <string name="app_name" msgid="9095072584761066851">"Namestitveni program za potrdilo"</string> <string name="pick_file_title" msgid="4481949485108233297">"Izberite potrdilo"</string> <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Izvozi potrdilo"</string> <string name="extracting_pkcs12" msgid="1881267738821799771">"Ekstrahiranje ..."</string> @@ -39,7 +39,7 @@ <string name="cert_not_saved" msgid="4037698479662830270">"Potrdilo ni nameščeno."</string> <string name="no_cert_to_saved" msgid="5708884372817309068">"Ni potrdila za namestitev."</string> <string name="invalid_cert" msgid="7704228670980743590">"Potrdilo ni veljavno."</string> - <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> je nameščen."</string> + <string name="cert_is_added" msgid="6996557598167000500">"Program <xliff:g id="CREDENTIAL">%s</xliff:g> je nameščen."</string> <string name="cert_too_large_error" msgid="8715414972725646285">"Namestitev ni uspela, ker je potrdilo preveliko."</string> <string name="cert_missing_error" msgid="7040527352278728220">"Namestitev ni uspela, ker ni bilo mogoče najti datoteke s potrdilom."</string> <string name="cert_read_error" msgid="7353463360652419796">"Namestitev ni uspela, ker ni bilo mogoče prebrati datoteke s potrdilom."</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index ccbd165..95e0a04 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -28,8 +28,8 @@ <string name="p12_description" msgid="4128352087331630024">"PKCS12 密钥库中的证书。"</string> <string name="one_userkey" msgid="3500697912370644881">"一个用户密钥"</string> <string name="one_usercrt" msgid="7690798336332403106">"一个用户证书"</string> - <string name="one_cacrt" msgid="2667950425420663146">"1个CA证书"</string> - <string name="n_cacrts" msgid="2141498640685639208">"%d个CA证书"</string> + <string name="one_cacrt" msgid="2667950425420663146">"一个 CA 证书"</string> + <string name="n_cacrts" msgid="2141498640685639208">"%d 个 CA 证书"</string> <string name="password_error" msgid="2042471639556516356">"键入正确的密码。"</string> <string name="password_empty_error" msgid="591713406761723025">"键入密码。"</string> <string name="name_empty_error" msgid="3808800768660110354">"键入名称。"</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index a5da46a..4dfb280 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -26,7 +26,7 @@ <string name="credential_password" msgid="3520176519550993326">"輸入密碼以擷取憑證。"</string> <string name="credential_info" msgid="2436768402308470397">"套件包含:"</string> <string name="p12_description" msgid="4128352087331630024">"PKCS12 金鑰庫中的憑證。"</string> - <string name="one_userkey" msgid="3500697912370644881">"一個使用者金鑰"</string> + <string name="one_userkey" msgid="3500697912370644881">"一個用戶金鑰"</string> <string name="one_usercrt" msgid="7690798336332403106">"一個使用者憑證"</string> <string name="one_cacrt" msgid="2667950425420663146">"1 個 CA 憑證"</string> <string name="n_cacrts" msgid="2141498640685639208">"%d 個 CA 憑證"</string> |