diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:18:06 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:18:06 -0800 |
commit | 443dea98d8812842b0e420319230c0586f94547e (patch) | |
tree | 684e045546a921a13015fd6f07f8d0814d4a88c5 | |
parent | 91d41a003359d92d1c8105fc7991eb1160d856a9 (diff) | |
parent | 2f3c23e48b07ef534948df6999088b8c3d6a11aa (diff) | |
download | android_frameworks_opt_datetimepicker-stable/cm-13.0-ZNH5Y.tar.gz android_frameworks_opt_datetimepicker-stable/cm-13.0-ZNH5Y.tar.bz2 android_frameworks_opt_datetimepicker-stable/cm-13.0-ZNH5Y.zip |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/opt/datetimepicker into cm-13.0HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0
Android 6.0.1 release 22
-rw-r--r-- | res/values-az-rAZ/strings.xml | 31 | ||||
-rw-r--r-- | res/values-fa/strings.xml | 2 | ||||
-rw-r--r-- | res/values-kk-rKZ/strings.xml | 2 |
3 files changed, 2 insertions, 33 deletions
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml deleted file mode 100644 index f979d93..0000000 --- a/res/values-az-rAZ/strings.xml +++ /dev/null @@ -1,31 +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="done_label" msgid="7007948707597430919">"Bitdi"</string> - <string name="hour_picker_description" msgid="7586639618712934060">"Dairəvi saat slayderi"</string> - <string name="minute_picker_description" msgid="6024811202872705251">"Dairəvi dəqiqə slayderi"</string> - <string name="select_hours" msgid="7651068754188418859">"Saat seçin"</string> - <string name="select_minutes" msgid="8327182090226828481">"Dəqiqə seçin"</string> - <string name="day_picker_description" msgid="3968620852217927702">"Ayın gün bölgüsü"</string> - <string name="year_picker_description" msgid="6963340404644587098">"İl siyahısı"</string> - <string name="select_day" msgid="3973338219107019769">"Ay və gün seçin"</string> - <string name="select_year" msgid="2603330600102539372">"İl seçin"</string> - <string name="item_is_selected" msgid="2674929164900463786">"<xliff:g id="ITEM">%1$s</xliff:g> seçildi"</string> - <string name="deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> silindi"</string> -</resources> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 896895e..cf29490 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="done_label" msgid="7007948707597430919">"تمام"</string> + <string name="done_label" msgid="7007948707597430919">"انجام شد"</string> <string name="hour_picker_description" msgid="7586639618712934060">"لغزنده دایرهای ساعت"</string> <string name="minute_picker_description" msgid="6024811202872705251">"لغزنده دایرهای دقیقه"</string> <string name="select_hours" msgid="7651068754188418859">"انتخاب ساعت"</string> diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index f933fb9..3904a34 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="done_label" msgid="7007948707597430919">"Дайын"</string> + <string name="done_label" msgid="7007948707597430919">"Орындалды"</string> <string name="hour_picker_description" msgid="7586639618712934060">"Сағаттардың дөңгелек жүгірткісі"</string> <string name="minute_picker_description" msgid="6024811202872705251">"Минуттардың дөңгелек жүгірткісі"</string> <string name="select_hours" msgid="7651068754188418859">"Сағат таңдау"</string> |