diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-11 03:47:09 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-11 16:58:39 -0800 |
commit | 0e1dbed9194839a90755670d8fdf9046a75b85f7 (patch) | |
tree | 010372762ddc617295da2862f7d61813da9e3586 /packages/ExternalStorageProvider | |
parent | 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8 (diff) | |
parent | e342181a4a8d8177b3b87ffe141777565fe98f15 (diff) | |
download | frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.zip frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.tar.gz frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.tar.bz2 |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/base into cm-13.0
Android 6.0.1 release 22
Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
Diffstat (limited to 'packages/ExternalStorageProvider')
6 files changed, 6 insertions, 29 deletions
diff --git a/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml b/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml index cd5ba2f..a6a79ca8 100644 --- a/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml +++ b/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml @@ -18,5 +18,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="7123375275748530234">"Xarici Yaddaş"</string> <string name="root_internal_storage" msgid="827844243068584127">"Daxili yaddaş"</string> - <string name="root_documents" msgid="4051252304075469250">"Sənədlər"</string> </resources> diff --git a/packages/ExternalStorageProvider/res/values-da/strings.xml b/packages/ExternalStorageProvider/res/values-da/strings.xml index dc565ae..a9ecb69 100644 --- a/packages/ExternalStorageProvider/res/values-da/strings.xml +++ b/packages/ExternalStorageProvider/res/values-da/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_label" msgid="7123375275748530234">"Ekstern lagerplads"</string> - <string name="root_internal_storage" msgid="827844243068584127">"Intern lagerplads"</string> + <string name="app_label" msgid="7123375275748530234">"Ekstern lagring"</string> + <string name="root_internal_storage" msgid="827844243068584127">"Intern lagring"</string> <string name="root_documents" msgid="4051252304075469250">"Dokumenter"</string> </resources> diff --git a/packages/ExternalStorageProvider/res/values-fa/strings.xml b/packages/ExternalStorageProvider/res/values-fa/strings.xml index 9ae8a47..8471fc7 100644 --- a/packages/ExternalStorageProvider/res/values-fa/strings.xml +++ b/packages/ExternalStorageProvider/res/values-fa/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_label" msgid="7123375275748530234">"حافظه خارجی"</string> + <string name="app_label" msgid="7123375275748530234">"فضای ذخیره خارجی"</string> <string name="root_internal_storage" msgid="827844243068584127">"حافظهٔ داخلی"</string> <string name="root_documents" msgid="4051252304075469250">"اسناد"</string> </resources> diff --git a/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml index 08e6dae..204b336 100644 --- a/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml +++ b/packages/ExternalStorageProvider/res/values-ml-rIN/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_label" msgid="7123375275748530234">"ബാഹ്യ സ്റ്റോറേജ്"</string> - <string name="root_internal_storage" msgid="827844243068584127">"ആന്തരിക സ്റ്റോറേജ്"</string> + <string name="app_label" msgid="7123375275748530234">"ബാഹ്യ സംഭരണം"</string> + <string name="root_internal_storage" msgid="827844243068584127">"ആന്തരിക സംഭരണം"</string> <string name="root_documents" msgid="4051252304075469250">"പ്രമാണങ്ങൾ"</string> </resources> diff --git a/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml b/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml deleted file mode 100644 index 77c89b8..0000000 --- a/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project - - 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 xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="7123375275748530234">"Armazenamento externo"</string> - <string name="root_internal_storage" msgid="827844243068584127">"Armazenamento interno"</string> - <string name="root_documents" msgid="4051252304075469250">"Documentos"</string> -</resources> diff --git a/packages/ExternalStorageProvider/res/values-ru/strings.xml b/packages/ExternalStorageProvider/res/values-ru/strings.xml index 740272f..b6c1095 100644 --- a/packages/ExternalStorageProvider/res/values-ru/strings.xml +++ b/packages/ExternalStorageProvider/res/values-ru/strings.xml @@ -17,6 +17,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="7123375275748530234">"Внешний накопитель"</string> - <string name="root_internal_storage" msgid="827844243068584127">"Внутренний накопитель"</string> + <string name="root_internal_storage" msgid="827844243068584127">"Внутренняя память"</string> <string name="root_documents" msgid="4051252304075469250">"Документы"</string> </resources> |