From 0d86a8dccf6557587eb3abae1bb3573e2c40c12c Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 16 May 2016 11:57:45 -0700 Subject: [PATCH 01/13] On some "non-standard" devices, load label can cause a security exception due to modified platform code Bug: 28243147 Change-Id: Iab899d0cb233e19ebf994f8a3eacba26f840148f --- .../compat/LauncherActivityInfoCompatV16.java | 8 +++++++- .../model/WidgetsAndShortcutNameComparator.java | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java index fee0376bd3..15c5e69dde 100644 --- a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java +++ b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java @@ -26,6 +26,7 @@ import android.content.pm.PackageInfo; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.util.Log; public class LauncherActivityInfoCompatV16 extends LauncherActivityInfoCompat { @@ -51,7 +52,12 @@ public class LauncherActivityInfoCompatV16 extends LauncherActivityInfoCompat { } public CharSequence getLabel() { - return mResolveInfo.loadLabel(mPm); + try { + return mResolveInfo.loadLabel(mPm); + } catch (SecurityException e) { + Log.e("LAInfoCompat", "Failed to extract app display name from resolve info", e); + return ""; + } } public Drawable getIcon(int density) { diff --git a/src/com/android/launcher3/model/WidgetsAndShortcutNameComparator.java b/src/com/android/launcher3/model/WidgetsAndShortcutNameComparator.java index b99056023a..2e4167e124 100644 --- a/src/com/android/launcher3/model/WidgetsAndShortcutNameComparator.java +++ b/src/com/android/launcher3/model/WidgetsAndShortcutNameComparator.java @@ -4,6 +4,8 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.util.Log; + import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Utilities; import com.android.launcher3.compat.AppWidgetManagerCompat; @@ -91,7 +93,13 @@ public class WidgetsAndShortcutNameComparator implements Comparator { return Utilities.trim(mManager.loadLabel(widgetInfo)); } else { ResolveInfo shortcutInfo = (ResolveInfo) o; - return Utilities.trim(shortcutInfo.loadLabel(mPackageManager)); + try { + return Utilities.trim(shortcutInfo.loadLabel(mPackageManager)); + } catch (Exception e) { + Log.e("ShortcutNameComparator", + "Failed to extract app display name from resolve info", e); + return ""; + } } } }; From 03dc99c0ba12605e4c68c6243ea576227689a689 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Tue, 17 May 2016 00:21:31 -0700 Subject: [PATCH 02/13] Import translations. DO NOT MERGE Change-Id: Ie23f2e6ed183ef562db099f159b11402c3a959b6 Auto-generated-cl: translation import --- res/values-ca/strings.xml | 2 +- res/values-el/strings.xml | 2 +- res/values-fr-rCA/strings.xml | 2 +- res/values-gu-rIN/strings.xml | 16 ++++++++-------- res/values-it/strings.xml | 2 +- res/values-kk-rKZ/strings.xml | 2 +- res/values-lo-rLA/strings.xml | 2 +- res/values-ml-rIN/strings.xml | 6 +++--- res/values-mn-rMN/strings.xml | 2 +- res/values-pa-rIN/strings.xml | 2 +- res/values-sw/strings.xml | 2 +- res/values-tl/strings.xml | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 0777e64266..9f66f3ffd2 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -54,7 +54,7 @@ "Pàgina %1$d de %2$d" "Pantalla d\'inici %1$d de %2$d" "Pàgina de la pantalla d\'inici nova" - "Us donem la benvinguda" + "Et donem la benvinguda" "Copiar les icones d\'aplicació" "Importar icones i carpetes de pantalles d\'inici anteriors?" "COPIA LES ICONES." diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 5a1ffc7213..5b47e1b833 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -61,7 +61,7 @@ "ΝΕΑ ΕΝΑΡΞΗ" "Ταπετσαρίες, γραφικά στοιχεία και ρυθμίσεις" "Αγγίξτε παρατεταμένα το παρασκήνιο για προσαρμογή" - "ΕΓΙΝΕ" + "ΤΟ ΚΑΤΑΛΑΒΑ" "Άνοιγμα φακέλου, %1$d επί %2$d" "Αγγίξτε για να κλείσετε τον φάκελο" "Αγγίξτε για να αποθηκεύσετε το νέο όνομα" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 77b11f11f3..3718486374 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -60,7 +60,7 @@ "COPIER LES ICÔNES" "DISPOSITION PAR DÉFAUT" "Fonds d\'écran, widgets et paramètres" - "Maintenez le doigt sur le fond d\'écran pour personnaliser" + "Maintenez un doigt sur le fond d\'écran pour le personnaliser" "J\'ai compris" "Dossier ouvert, %1$d par %2$d" "Toucher pour fermer le dossier" diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 51ebdce2e7..3ce8676f79 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -22,9 +22,9 @@ "Launcher3" "કાર્યાલય" - "એપ્લિકેશન ઇન્સ્ટોલ થઈ નથી." - "એપ્લિકેશન ઉપલબ્ધ નથી" - "સુરક્ષિત મોડમાં ડાઉનલોડ કરેલ એપ્લિકેશન અક્ષમ કરી" + "ઍપ્લિકેશન ઇન્સ્ટોલ થઈ નથી." + "ઍપ્લિકેશન ઉપલબ્ધ નથી" + "સુરક્ષિત મોડમાં ડાઉનલોડ કરેલ ઍપ્લિકેશન અક્ષમ કરી" "સુરક્ષિત મોડમાં વિજેટ્સ અક્ષમ કર્યા" "વિજેટ ચૂંટવા માટે ટચ કરો અને પકડી રાખો." "વિજેટ ચૂંટવા અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરવા માટે બે વાર ટેપ કરો અને પકડી રાખો." @@ -39,7 +39,7 @@ "હોમ" "દૂર કરો" "અનઇન્સ્ટોલ કરો" - "એપ્લિકેશન માહિતી" + "ઍપ્લિકેશન માહિતી" "શોર્ટકટ્સ ઇન્સ્ટોલ કરો" "એપ્લિકેશનને વપરાશકર્તા હસ્તક્ષેપ વગર શોર્ટકટ્સ ઉમેરવાની મંજૂરી આપે છે." "હોમ સેટિંગ્સ અને શોર્ટકટ્સ વાંચો" @@ -49,13 +49,13 @@ "%1$s ને ફોન કૉલ્સ કરવાની મંજૂરી નથી" "વિજેટ લોડ કરવામાં સમસ્યા" "સેટઅપ" - "આ એક સિસ્ટમ એપ્લિકેશન છે અને અનઇન્સ્ટોલ કરી શકાતી નથી." + "આ એક સિસ્ટમ ઍપ્લિકેશન છે અને અનઇન્સ્ટોલ કરી શકાતી નથી." "અનામી ફોલ્ડર" "%2$d માંથી %1$d પૃષ્ઠ" "%2$d માંથી %1$d હોમ સ્ક્રીન" "નવું હોમ સ્ક્રીન પૃષ્ઠ" "સ્વાગત છે" - "તમારા એપ્લિકેશન આયકન્સને કૉપિ કરો" + "તમારા ઍપ્લિકેશન આયકન્સને કૉપિ કરો" "તમારી જૂની હોમ સ્ક્રીન્સથી આયકન્સ અને ફોલ્ડર્સને આયાત કરીએ?" "આયકન્સને કૉપિ કરો" "નવેસરથી પ્રારંભ કરો" @@ -76,8 +76,8 @@ "અજાણ્યો" "દૂર કરો" "શોધો" - "આ એપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી" - "આ આયકન માટેની એપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી. તમે તેને દૂર કરી શકો છો અથવા એપ્લિકેશન માટે શોધ કરી અને તેને મેન્યુઅલી ઇન્સ્ટોલ કરી શકો છો." + "આ ઍપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી" + "આ આયકન માટેની ઍપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી. તમે તેને દૂર કરી શકો છો અથવા ઍપ્લિકેશન માટે શોધ કરી અને તેને મેન્યુઅલી ઇન્સ્ટોલ કરી શકો છો." "%1$s ડાઉનલોડ કરી રહ્યાં છે, %2$s પૂર્ણ" "%1$s, ઇન્સ્ટૉલ થવાની રાહ જોઈ રહ્યું છે" "હોમ સ્ક્રીન પર ઉમેરો" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index f41fcc795e..0e898875b3 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -60,7 +60,7 @@ "COPIA ICONE" "RICOMINCIA" "Sfondi, widget e impostazioni" - "Tocca lo sfondo e tieni premuto per personalizzare" + "Tieni premuto un dito sullo sfondo per personalizzare" "OK" "Cartella aperta, %1$d per %2$d" "Tocca per chiudere la cartella" diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index 4b41ac941a..5b3196697e 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -60,7 +60,7 @@ "ТАҢБАЛАРДЫ КӨШІРУ" "ЖАҢАДАН БАСТАУ" "Тұсқағаздар, виджеттер және параметрлер" - "Теңшеу үшін фонды түртіп, ұстап тұрыңыз" + "Реттеу үшін фонды саусағыңызбен басып тұрыңыз" "ТҮСІНДІМ" "Қалта ашылды, %1$d және %2$d" "Қалтаны жабу үшін түртіңіз" diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index e93a7e648a..820f268a72 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -59,7 +59,7 @@ "ນຳເຂົ້າໄອຄອນ ແລະ ໂຟນເດີຈາກໂຮມສະກຣີນອັນເກົ່າຂອງທ່ານບໍ່?" "ສຳເນົາໄອຄອນ" "ເລີ່ມຕົ້ນໃໝ່" - "​ຮູບ​ພື້ນຫຼັງ, ວິດເຈັດ, & ​ການ​ຕັ້ງ​ຄ່າ" + "ຮູບພາບພື້ນຫຼັງ, ວິດເຈັດ ແລະ ການຕັ້ງຄ່າ" "ແຕະທີ່​ພາບ​ພື້ນ​ຫລັງ​ຄ້າງ​ໄວ້​ເພື່ອ​ປັບ​ແຕ່ງ" "ເຂົ້າໃຈແລ້ວ" "ເປີດໂຟນເດີແລ້ວ, %1$d ຄູນ %2$d" diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 09a5fc71fb..cc6c7d7b1a 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -59,7 +59,7 @@ "നിങ്ങളുടെ പഴയ ഹോം സ്ക്രീനുകളിൽ നിന്ന് ഐക്കണുകളും ഫോൾഡറുകളും ഇമ്പോർട്ടുചെയ്യണോ?" "ഐക്കണുകൾ പകർത്തുക" "പുതുതായി ആരംഭിക്കുക" - "വാൾപേപ്പറുകൾ, വിജറ്റുകൾ, ക്രമീകരണങ്ങൾ എന്നിവ" + "വാൾപേപ്പറുകൾ, വിജറ്റുകൾ, ക്രമീകരണങ്ങൾ" "ഇഷ്‌ടാനുസൃതമാക്കുന്നതിന് പശ്‌ചാത്തലം സ്‌പർശിച്ചുപിടിക്കുക" "മനസ്സിലായി" "ഫോൾഡർ തുറന്നു, %1$d / %2$d" @@ -69,8 +69,8 @@ "ഫോൾഡറിന്റെ പേര് %1$s എന്നായി മാറ്റി" "ഫോൾഡർ: %1$s" "വിജറ്റുകൾ" - "വാൾപേപ്പറുകൾ" - "ക്രമീകരണങ്ങൾ" + "വാൾപേപ്പർ" + "ക്രമീകരണം" "അഡ്മിൻ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു" "തിരിക്കൽ അനുവദിക്കുക" "അജ്ഞാതം" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index c4bef0b328..0622600e56 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -31,7 +31,7 @@ "%1$d × %2$d" "Апп хайх..." "Аппликейшныг ачаалж байна..." - "\"%1$s\"-тай нийцэх апп олдсонгүй" + "\"%1$s\"-д нийцэх апп олдсонгүй" "%1$s руу очих" "Энэ Нүүр дэлгэц зайгүй." "\"Дуртай\" трей дээр өөр зай байхгүй байна" diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml index 1b3243b4bc..ac976d4e26 100644 --- a/res/values-pa-rIN/strings.xml +++ b/res/values-pa-rIN/strings.xml @@ -35,7 +35,7 @@ "%1$s ਤੇ ਜਾਓ" "ਇਸ ਹੋਮ ਸਕ੍ਰੀਨ ਲਈ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ ਹੈ।" "ਮਨਪਸੰਦ ਟ੍ਰੇ ਵਿੱਚ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ।" - "ਐਪਸ" + "ਐਪਾਂ" "ਹੋਮ" "ਹਟਾਓ" "ਅਣਇੰਸਟੌਲ ਕਰੋ" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 12954f4d44..831d6ef569 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -61,7 +61,7 @@ "Je, ungependa kuingiza ikoni na folda kutoka kwenye skrini zako za Mwanzo za zamani?" "NAKILI IKONI" "ANZA UPYA" - "Mandhari, wijeti, na mipangilio" + "Mandhari, wijeti na mipangilio" "Gusa na ushikilie mandhari ili uweke mapendeleo" "NIMEELEWA" "Folda imefunguliwa, %1$d kwa %2$d" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 91e04fb4ea..c22935590e 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -54,7 +54,7 @@ "Pahina %1$d ng %2$d" "Home screen %1$d ng %2$d" "Bagong page ng home screen" - "Maligayang Pagdating" + "Welcome" "Kopyahin ang mga icon ng app" "I-import ang icon at folder mula sa luma mong Home screen?" "KOPYAHIN ANG MGA ICON" From 42ca2fe3a8fe25ab00a1ada6765fa99a4fed9a12 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 18 May 2016 17:16:26 -0700 Subject: [PATCH 03/13] Adding android.icu.text.AlphabeticIndex implementation for AlphabeticIndexCompat as libcore.icu.AlphabeticIndex is no longer available in N Bug: 28795251 Change-Id: I3b168dfb451c0eac9b64c6559a51d2b1b8c578b9 --- .../compat/AlphabeticIndexCompat.java | 272 +++++++++++------- 1 file changed, 163 insertions(+), 109 deletions(-) diff --git a/src/com/android/launcher3/compat/AlphabeticIndexCompat.java b/src/com/android/launcher3/compat/AlphabeticIndexCompat.java index ec1fb669fb..13ed1a23be 100644 --- a/src/com/android/launcher3/compat/AlphabeticIndexCompat.java +++ b/src/com/android/launcher3/compat/AlphabeticIndexCompat.java @@ -1,113 +1,49 @@ package com.android.launcher3.compat; import android.content.Context; +import android.content.res.Configuration; +import android.util.Log; + import com.android.launcher3.Utilities; -import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.Locale; -/** - * Fallback class to support Alphabetic indexing if not supported by the framework. - * TODO(winsonc): disable for non-english locales - */ -class BaseAlphabeticIndex { - - private static final String BUCKETS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-"; - private static final int UNKNOWN_BUCKET_INDEX = BUCKETS.length() - 1; - - public BaseAlphabeticIndex() {} - - /** - * Sets the max number of the label buckets in this index. - */ - public void setMaxLabelCount(int count) { - // Not currently supported - } - - /** - * Returns the index of the bucket in which the given string should appear. - */ - protected int getBucketIndex(String s) { - if (s.isEmpty()) { - return UNKNOWN_BUCKET_INDEX; - } - int index = BUCKETS.indexOf(s.substring(0, 1).toUpperCase()); - if (index != -1) { - return index; - } - return UNKNOWN_BUCKET_INDEX; - } - - /** - * Returns the label for the bucket at the given index (as returned by getBucketIndex). - */ - protected String getBucketLabel(int index) { - return BUCKETS.substring(index, index + 1); - } -} - -/** - * Reflected libcore.icu.AlphabeticIndex implementation, falls back to the base alphabetic index. - */ -public class AlphabeticIndexCompat extends BaseAlphabeticIndex { +public class AlphabeticIndexCompat { + private static final String TAG = "AlphabeticIndexCompat"; private static final String MID_DOT = "\u2219"; - - private Object mAlphabeticIndex; - private Method mAddLabelsMethod; - private Method mSetMaxLabelCountMethod; - private Method mGetBucketIndexMethod; - private Method mGetBucketLabelMethod; - private boolean mHasValidAlphabeticIndex; - private String mDefaultMiscLabel; + private final BaseIndex mBaseIndex; + private final String mDefaultMiscLabel; public AlphabeticIndexCompat(Context context) { - super(); - try { - Locale curLocale = context.getResources().getConfiguration().locale; - Class clazz = Class.forName("libcore.icu.AlphabeticIndex"); - Constructor ctor = clazz.getConstructor(Locale.class); - mAddLabelsMethod = clazz.getDeclaredMethod("addLabels", Locale.class); - mSetMaxLabelCountMethod = clazz.getDeclaredMethod("setMaxLabelCount", int.class); - mGetBucketIndexMethod = clazz.getDeclaredMethod("getBucketIndex", String.class); - mGetBucketLabelMethod = clazz.getDeclaredMethod("getBucketLabel", int.class); - mAlphabeticIndex = ctor.newInstance(curLocale); - try { - // Ensure we always have some base English locale buckets - if (!curLocale.getLanguage().equals(Locale.ENGLISH.getLanguage())) { - mAddLabelsMethod.invoke(mAlphabeticIndex, Locale.ENGLISH); - } - } catch (Exception e) { - e.printStackTrace(); - } - if (curLocale.getLanguage().equals(Locale.JAPANESE.getLanguage())) { - // Japanese character 他 ("misc") - mDefaultMiscLabel = "\u4ed6"; - // TODO(winsonc, omakoto): We need to handle Japanese sections better, especially the kanji - } else { - // Dot - mDefaultMiscLabel = MID_DOT; - } - mHasValidAlphabeticIndex = true; - } catch (Exception e) { - mHasValidAlphabeticIndex = false; - } - } + BaseIndex index = null; - /** - * Sets the max number of the label buckets in this index. - * (ICU 51 default is 99) - */ - public void setMaxLabelCount(int count) { - if (mHasValidAlphabeticIndex) { - try { - mSetMaxLabelCountMethod.invoke(mAlphabeticIndex, count); - } catch (Exception e) { - e.printStackTrace(); + try { + if (Utilities.isNycOrAbove()) { + index = new AlphabeticIndexVN(context); } + } catch (Exception e) { + Log.d(TAG, "Unable to load the system index", e); + } + if (index == null) { + try { + index = new AlphabeticIndexV16(context); + } catch (Exception e) { + Log.d(TAG, "Unable to load the system index", e); + } + } + + mBaseIndex = index == null ? new BaseIndex() : index; + + if (context.getResources().getConfiguration().locale + .getLanguage().equals(Locale.JAPANESE.getLanguage())) { + // Japanese character 他 ("misc") + mDefaultMiscLabel = "\u4ed6"; + // TODO(winsonc, omakoto): We need to handle Japanese sections better, especially the kanji } else { - super.setMaxLabelCount(count); + // Dot + mDefaultMiscLabel = MID_DOT; } } @@ -116,7 +52,7 @@ public class AlphabeticIndexCompat extends BaseAlphabeticIndex { */ public String computeSectionName(CharSequence cs) { String s = Utilities.trim(cs); - String sectionName = getBucketLabel(getBucketIndex(s)); + String sectionName = mBaseIndex.getBucketLabel(mBaseIndex.getBucketIndex(s)); if (Utilities.trim(sectionName).isEmpty() && s.length() > 0) { int c = s.codePointAt(0); boolean startsWithDigit = Character.isDigit(c); @@ -139,32 +75,150 @@ public class AlphabeticIndexCompat extends BaseAlphabeticIndex { } /** - * Returns the index of the bucket in which {@param s} should appear. - * Function is synchronized because underlying routine walks an iterator - * whose state is maintained inside the index object. + * Base class to support Alphabetic indexing if not supported by the framework. + * TODO(winsonc): disable for non-english locales */ - protected int getBucketIndex(String s) { - if (mHasValidAlphabeticIndex) { + private static class BaseIndex { + + private static final String BUCKETS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-"; + private static final int UNKNOWN_BUCKET_INDEX = BUCKETS.length() - 1; + + /** + * Returns the index of the bucket in which the given string should appear. + */ + protected int getBucketIndex(String s) { + if (s.isEmpty()) { + return UNKNOWN_BUCKET_INDEX; + } + int index = BUCKETS.indexOf(s.substring(0, 1).toUpperCase()); + if (index != -1) { + return index; + } + return UNKNOWN_BUCKET_INDEX; + } + + /** + * Returns the label for the bucket at the given index (as returned by getBucketIndex). + */ + protected String getBucketLabel(int index) { + return BUCKETS.substring(index, index + 1); + } + } + + /** + * Reflected libcore.icu.AlphabeticIndex implementation, falls back to the base + * alphabetic index. + */ + private static class AlphabeticIndexV16 extends BaseIndex { + + private Object mAlphabeticIndex; + private Method mGetBucketIndexMethod; + private Method mGetBucketLabelMethod; + + public AlphabeticIndexV16(Context context) throws Exception { + Locale curLocale = context.getResources().getConfiguration().locale; + Class clazz = Class.forName("libcore.icu.AlphabeticIndex"); + mGetBucketIndexMethod = clazz.getDeclaredMethod("getBucketIndex", String.class); + mGetBucketLabelMethod = clazz.getDeclaredMethod("getBucketLabel", int.class); + mAlphabeticIndex = clazz.getConstructor(Locale.class).newInstance(curLocale); + + if (!curLocale.getLanguage().equals(Locale.ENGLISH.getLanguage())) { + clazz.getDeclaredMethod("addLabels", Locale.class) + .invoke(mAlphabeticIndex, Locale.ENGLISH); + } + } + + /** + * Returns the index of the bucket in which {@param s} should appear. + * Function is synchronized because underlying routine walks an iterator + * whose state is maintained inside the index object. + */ + protected int getBucketIndex(String s) { try { return (Integer) mGetBucketIndexMethod.invoke(mAlphabeticIndex, s); } catch (Exception e) { e.printStackTrace(); } + return super.getBucketIndex(s); } - return super.getBucketIndex(s); - } - /** - * Returns the label for the bucket at the given index (as returned by getBucketIndex). - */ - protected String getBucketLabel(int index) { - if (mHasValidAlphabeticIndex) { + /** + * Returns the label for the bucket at the given index (as returned by getBucketIndex). + */ + protected String getBucketLabel(int index) { try { return (String) mGetBucketLabelMethod.invoke(mAlphabeticIndex, index); } catch (Exception e) { e.printStackTrace(); } + return super.getBucketLabel(index); + } + } + + /** + * Reflected android.icu.text.AlphabeticIndex implementation, falls back to the base + * alphabetic index. + */ + private static class AlphabeticIndexVN extends BaseIndex { + + private Object mAlphabeticIndex; + private Method mGetBucketIndexMethod; + + private Method mGetBucketMethod; + private Method mGetLabelMethod; + + public AlphabeticIndexVN(Context context) throws Exception { + // TODO: Replace this with locale list once available. + Object locales = Configuration.class.getDeclaredMethod("getLocales").invoke( + context.getResources().getConfiguration()); + int localeCount = (Integer) locales.getClass().getDeclaredMethod("size").invoke(locales); + Method localeGetter = locales.getClass().getDeclaredMethod("get", int.class); + Locale primaryLocale = localeCount == 0 ? Locale.ENGLISH : + (Locale) localeGetter.invoke(locales, 0); + + Class clazz = Class.forName("android.icu.text.AlphabeticIndex"); + mAlphabeticIndex = clazz.getConstructor(Locale.class).newInstance(primaryLocale); + + Method addLocales = clazz.getDeclaredMethod("addLabels", Locale[].class); + for (int i = 1; i < localeCount; i++) { + Locale l = (Locale) localeGetter.invoke(locales, i); + addLocales.invoke(mAlphabeticIndex, new Object[]{ new Locale[] {l}}); + } + addLocales.invoke(mAlphabeticIndex, new Object[]{ new Locale[] {Locale.ENGLISH}}); + + mAlphabeticIndex = mAlphabeticIndex.getClass() + .getDeclaredMethod("buildImmutableIndex") + .invoke(mAlphabeticIndex); + + mGetBucketIndexMethod = mAlphabeticIndex.getClass().getDeclaredMethod( + "getBucketIndex", CharSequence.class); + mGetBucketMethod = mAlphabeticIndex.getClass().getDeclaredMethod("getBucket", int.class); + mGetLabelMethod = mGetBucketMethod.getReturnType().getDeclaredMethod("getLabel"); + } + + /** + * Returns the index of the bucket in which {@param s} should appear. + */ + protected int getBucketIndex(String s) { + try { + return (Integer) mGetBucketIndexMethod.invoke(mAlphabeticIndex, s); + } catch (Exception e) { + e.printStackTrace(); + } + return super.getBucketIndex(s); + } + + /** + * Returns the label for the bucket at the given index + */ + protected String getBucketLabel(int index) { + try { + return (String) mGetLabelMethod.invoke( + mGetBucketMethod.invoke(mAlphabeticIndex, index)); + } catch (Exception e) { + e.printStackTrace(); + } + return super.getBucketLabel(index); } - return super.getBucketLabel(index); } } From ad3ca7d1bf5e2ba8671ddc99d07326b2a1816f85 Mon Sep 17 00:00:00 2001 From: Kenny Guy Date: Wed, 25 May 2016 19:22:14 +0100 Subject: [PATCH 04/13] Update wallpaper API to match NYC change. Update check for whether setting wallpaper is allowed for renamed API. Bug: 28954131 Change-Id: I09ee46167d59d267ba95d136366f78f5735ea9a5 --- src/com/android/launcher3/Utilities.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 9fdcd33f97..78ba22eb66 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -827,7 +827,7 @@ public final class Utilities { if (isNycOrAbove()) { try { WallpaperManager wm = context.getSystemService(WallpaperManager.class); - return (Boolean) wm.getClass().getDeclaredMethod("isWallpaperSettingAllowed") + return (Boolean) wm.getClass().getDeclaredMethod("isSetWallpaperAllowed") .invoke(wm); } catch (Exception e) { } } From d2a6ed36a2c240aa4f99bb54761db8c037fea0f9 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 31 May 2016 10:44:03 -0700 Subject: [PATCH 05/13] Disabling stricty mode checks when launching an activity. The default strict mode policy in NYC cause death penalty when when sharing file URI in intent. This causes launcher to crash for users who have shortcuts of images and documents on their homescreen. Bug: 28853579 Change-Id: If84cd5ff732713aaff5d3164edf428c8b4233ea2 (cherry picked from commit 85fc55a976a1f1605ad22deff74f5ceb080913e6) --- src/com/android/launcher3/Launcher.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 91b747729a..ad3ee0ee11 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -855,7 +855,7 @@ public class Launcher extends Activity sPendingAddItem = null; if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - startActivity(v, intent, null); + startActivitySafely(v, intent, null); } else { // TODO: Show a snack bar with link to settings Toast.makeText(this, getString(R.string.msg_no_phone_permission, @@ -2967,8 +2967,18 @@ public class Launcher extends Activity } if (user == null || user.equals(UserHandleCompat.myUserHandle())) { - // Could be launching some bookkeeping activity - startActivity(intent, optsBundle); + StrictMode.VmPolicy oldPolicy = StrictMode.getVmPolicy(); + try { + // Temporarily disable deathPenalty on all default checks. For eg, shortcuts + // containing file Uris would cause a crash as penaltyDeathOnFileUriExposure + // is enabled by default on NYC. + StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectAll() + .penaltyLog().build()); + // Could be launching some bookkeeping activity + startActivity(intent, optsBundle); + } finally { + StrictMode.setVmPolicy(oldPolicy); + } } else { // TODO Component can be null when shortcuts are supported for secondary user launcherApps.startActivityForProfile(intent.getComponent(), user, From 65ffa15c90f82ff3e19bd2f40308637e131832b5 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 1 Jun 2016 14:28:32 -0700 Subject: [PATCH 06/13] Adding null check when widget provider changed is received as it can come after the activity is destroyed. Bug: 28791862 Change-Id: I521931b772a611e15f0757db72b441ebb937e262 --- src/com/android/launcher3/Launcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ad3ee0ee11..23a57396f0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4444,7 +4444,7 @@ public class Launcher extends Activity @Override public void notifyWidgetProvidersChanged() { - if (mWorkspace.getState().shouldUpdateWidget) { + if (mWorkspace != null && mWorkspace.getState().shouldUpdateWidget) { mModel.refreshAndBindWidgetsAndShortcuts(this, mWidgetsView.isEmpty()); } } From 86e3dc4fc5934c156c948f7ed9685ce2c62af61a Mon Sep 17 00:00:00 2001 From: Winson Date: Mon, 6 Jun 2016 11:35:46 -0700 Subject: [PATCH 07/13] Adding null check for uninitialized CollectionItemInfo. Bug: 28893815 Change-Id: Ib75b71fbb4d37bb818251527defcef891c7e7510 --- .../launcher3/allapps/AllAppsGridAdapter.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 0460c91066..42a395d201 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -123,14 +123,16 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter Date: Tue, 7 Jun 2016 13:03:19 -0700 Subject: [PATCH 08/13] Import translations. DO NOT MERGE Change-Id: Ifcd878b149cbe2b1b2a021024039f30aef1a36a7 Auto-generated-cl: translation import --- WallpaperPicker/res/values-af/strings.xml | 9 +++-- WallpaperPicker/res/values-am/strings.xml | 9 +++-- WallpaperPicker/res/values-ar/strings.xml | 13 ++++--- WallpaperPicker/res/values-az-rAZ/strings.xml | 10 +++--- WallpaperPicker/res/values-bg/strings.xml | 9 +++-- WallpaperPicker/res/values-bn-rBD/strings.xml | 9 +++-- WallpaperPicker/res/values-ca/strings.xml | 9 +++-- WallpaperPicker/res/values-cs/strings.xml | 11 +++--- WallpaperPicker/res/values-da/strings.xml | 9 +++-- WallpaperPicker/res/values-de/strings.xml | 9 +++-- WallpaperPicker/res/values-el/strings.xml | 9 +++-- WallpaperPicker/res/values-en-rAU/strings.xml | 9 +++-- WallpaperPicker/res/values-en-rGB/strings.xml | 9 +++-- WallpaperPicker/res/values-en-rIN/strings.xml | 9 +++-- WallpaperPicker/res/values-es-rUS/strings.xml | 9 +++-- WallpaperPicker/res/values-es/strings.xml | 11 +++--- WallpaperPicker/res/values-et-rEE/strings.xml | 9 +++-- WallpaperPicker/res/values-eu-rES/strings.xml | 9 +++-- WallpaperPicker/res/values-fa/strings.xml | 9 +++-- WallpaperPicker/res/values-fi/strings.xml | 9 +++-- WallpaperPicker/res/values-fr-rCA/strings.xml | 9 +++-- WallpaperPicker/res/values-fr/strings.xml | 9 +++-- WallpaperPicker/res/values-gl-rES/strings.xml | 9 +++-- WallpaperPicker/res/values-gu-rIN/strings.xml | 10 +++--- WallpaperPicker/res/values-hi/strings.xml | 9 +++-- WallpaperPicker/res/values-hr/strings.xml | 10 +++--- WallpaperPicker/res/values-hu/strings.xml | 9 +++-- WallpaperPicker/res/values-hy-rAM/strings.xml | 9 +++-- WallpaperPicker/res/values-in/strings.xml | 9 +++-- WallpaperPicker/res/values-is-rIS/strings.xml | 9 +++-- WallpaperPicker/res/values-it/strings.xml | 9 +++-- WallpaperPicker/res/values-iw/strings.xml | 11 +++--- WallpaperPicker/res/values-ja/strings.xml | 9 +++-- WallpaperPicker/res/values-ka-rGE/strings.xml | 9 +++-- WallpaperPicker/res/values-kk-rKZ/strings.xml | 11 +++--- WallpaperPicker/res/values-km-rKH/strings.xml | 11 +++--- WallpaperPicker/res/values-kn-rIN/strings.xml | 9 +++-- WallpaperPicker/res/values-ko/strings.xml | 9 +++-- WallpaperPicker/res/values-ky-rKG/strings.xml | 9 +++-- WallpaperPicker/res/values-lo-rLA/strings.xml | 9 +++-- WallpaperPicker/res/values-lt/strings.xml | 11 +++--- WallpaperPicker/res/values-lv/strings.xml | 10 +++--- WallpaperPicker/res/values-mk-rMK/strings.xml | 13 ++++--- WallpaperPicker/res/values-ml-rIN/strings.xml | 11 +++--- WallpaperPicker/res/values-mn-rMN/strings.xml | 9 +++-- WallpaperPicker/res/values-mr-rIN/strings.xml | 9 +++-- WallpaperPicker/res/values-ms-rMY/strings.xml | 9 +++-- WallpaperPicker/res/values-my-rMM/strings.xml | 9 +++-- WallpaperPicker/res/values-nb/strings.xml | 9 +++-- WallpaperPicker/res/values-ne-rNP/strings.xml | 9 +++-- WallpaperPicker/res/values-nl/strings.xml | 11 +++--- WallpaperPicker/res/values-pa-rIN/strings.xml | 12 +++---- WallpaperPicker/res/values-pl/strings.xml | 11 +++--- WallpaperPicker/res/values-pt-rPT/strings.xml | 11 +++--- WallpaperPicker/res/values-pt/strings.xml | 9 +++-- WallpaperPicker/res/values-ro/strings.xml | 10 +++--- WallpaperPicker/res/values-ru/strings.xml | 11 +++--- WallpaperPicker/res/values-si-rLK/strings.xml | 9 +++-- WallpaperPicker/res/values-sk/strings.xml | 11 +++--- WallpaperPicker/res/values-sl/strings.xml | 11 +++--- WallpaperPicker/res/values-sq-rAL/strings.xml | 10 +++--- WallpaperPicker/res/values-sr/strings.xml | 12 +++---- WallpaperPicker/res/values-sv/strings.xml | 9 +++-- WallpaperPicker/res/values-sw/strings.xml | 9 +++-- WallpaperPicker/res/values-ta-rIN/strings.xml | 9 +++-- WallpaperPicker/res/values-te-rIN/strings.xml | 9 +++-- WallpaperPicker/res/values-th/strings.xml | 9 +++-- WallpaperPicker/res/values-tl/strings.xml | 11 +++--- WallpaperPicker/res/values-tr/strings.xml | 9 +++-- WallpaperPicker/res/values-uk/strings.xml | 11 +++--- WallpaperPicker/res/values-ur-rPK/strings.xml | 9 +++-- WallpaperPicker/res/values-uz-rUZ/strings.xml | 9 +++-- WallpaperPicker/res/values-vi/strings.xml | 9 +++-- WallpaperPicker/res/values-zh-rCN/strings.xml | 9 +++-- WallpaperPicker/res/values-zh-rHK/strings.xml | 9 +++-- WallpaperPicker/res/values-zh-rTW/strings.xml | 9 +++-- WallpaperPicker/res/values-zu/strings.xml | 9 +++-- res/values-az-rAZ/strings.xml | 4 +-- res/values-bn-rBD/strings.xml | 6 ++-- res/values-ca/strings.xml | 2 +- res/values-el/strings.xml | 2 +- res/values-en-rAU/strings.xml | 2 +- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/strings.xml | 2 +- res/values-es/strings.xml | 6 ++-- res/values-eu-rES/strings.xml | 4 +-- res/values-fa/strings.xml | 2 +- res/values-fi/strings.xml | 2 +- res/values-fr-rCA/strings.xml | 2 +- res/values-gl-rES/strings.xml | 8 ++--- res/values-gu-rIN/strings.xml | 22 ++++++------ res/values-hu/strings.xml | 4 +-- res/values-it/strings.xml | 2 +- res/values-iw/strings.xml | 4 +-- res/values-ka-rGE/strings.xml | 4 +-- res/values-kk-rKZ/strings.xml | 6 ++-- res/values-km-rKH/strings.xml | 2 +- res/values-ky-rKG/strings.xml | 6 ++-- res/values-lo-rLA/strings.xml | 6 ++-- res/values-mk-rMK/strings.xml | 12 +++---- res/values-ml-rIN/strings.xml | 8 ++--- res/values-mn-rMN/strings.xml | 4 +-- res/values-my-rMM/strings.xml | 20 +++++------ res/values-ne-rNP/strings.xml | 10 +++--- res/values-nl/strings.xml | 4 +-- res/values-pa-rIN/strings.xml | 34 +++++++++---------- res/values-pt/strings.xml | 2 +- res/values-ru/strings.xml | 2 +- res/values-sk/strings.xml | 8 ++--- res/values-sw/strings.xml | 4 +-- res/values-tl/strings.xml | 2 +- res/values-uz-rUZ/strings.xml | 16 ++++----- res/values-zh-rCN/strings.xml | 2 +- 113 files changed, 461 insertions(+), 510 deletions(-) diff --git a/WallpaperPicker/res/values-af/strings.xml b/WallpaperPicker/res/values-af/strings.xml index bc87fe1213..8d96188634 100644 --- a/WallpaperPicker/res/values-af/strings.xml +++ b/WallpaperPicker/res/values-af/strings.xml @@ -23,11 +23,10 @@ "Kon nie prent laai nie" "Kon nie prent as muurpapier laai nie" "Kon nie prent as muurpapier stel nie" - - "%1$d gekies" - "%1$d gekies" - "%1$d gekies" - + + %1$d gekies + %1$d gekies + "Muurpapier %1$d van %2$d" "Het %1$s gekies" "Vee uit" diff --git a/WallpaperPicker/res/values-am/strings.xml b/WallpaperPicker/res/values-am/strings.xml index 23bf538e3c..f73622c14e 100644 --- a/WallpaperPicker/res/values-am/strings.xml +++ b/WallpaperPicker/res/values-am/strings.xml @@ -23,11 +23,10 @@ "ምስሉን መጫን አልተቻለም" "ምስሉን እንደ ግድግዳ ወረቀት መጫን አልተቻለም" "ምስሉን እንደ ግድግዳ ወረቀት ማዘጋጀት አልተቻለም" - - "%1$d ተመርጧል" - "%1$d ተመርጧል" - "%1$d ተመርጧል" - + + %1$d ተመርጧል + %1$d ተመርጠዋል + "ልጣፍ %1$d የ%2$d" "%1$s ተመርጧል" "ሰርዝ" diff --git a/WallpaperPicker/res/values-ar/strings.xml b/WallpaperPicker/res/values-ar/strings.xml index db6834c9ad..457e534e83 100644 --- a/WallpaperPicker/res/values-ar/strings.xml +++ b/WallpaperPicker/res/values-ar/strings.xml @@ -23,11 +23,14 @@ "تعذر تحميل الصورة" "تعذر تحميل الصورة كخلفية" "تعذر تعيين الصورة كخلفية" - - "‏تم تحديد %1$d" - "‏تم تحديد %1$d" - "‏تم تحديد %1$d" - + + ‏تم تحديد %1$d + ‏تم تحديد %1$d + ‏تم تحديد %1$d + ‏تم تحديد %1$d + ‏تم تحديد %1$d + ‏تم تحديد %1$d + "‏الخلفية %1$d من %2$d" "تم تحديد %1$s" "حذف" diff --git a/WallpaperPicker/res/values-az-rAZ/strings.xml b/WallpaperPicker/res/values-az-rAZ/strings.xml index 883673dd6c..9c084e8627 100644 --- a/WallpaperPicker/res/values-az-rAZ/strings.xml +++ b/WallpaperPicker/res/values-az-rAZ/strings.xml @@ -22,11 +22,11 @@ "Divar kağı seçin" "Şəkli yükləmək alınmadı" "Şəkli divar kağızı olaraq yükləmək alınmadı" - - "%1$d seçilib" - "%1$d seçilib" - "%1$d seçilib" - + "Şəkli divar kağızı olaraq quraşdırmaq alınmadı" + + %1$d seçilib + %1$d seçilib + "Divar kağızı %1$d of %2$d" "%1$s seçilib" "Sil" diff --git a/WallpaperPicker/res/values-bg/strings.xml b/WallpaperPicker/res/values-bg/strings.xml index bf2a83b1ee..2af3123ba2 100644 --- a/WallpaperPicker/res/values-bg/strings.xml +++ b/WallpaperPicker/res/values-bg/strings.xml @@ -23,11 +23,10 @@ "Изображението не можа да бъде заредено" "Изображението не можа да бъде заредено като тапет" "Изображението не можа да бъде зададено като тапет" - - "Избрахте %1$d" - "Избрахте %1$d" - "Избрахте %1$d" - + + Избрахте %1$d + Избрахте %1$d + "Тапет %1$d от %2$d" "Избрахте %1$s" "Изтриване" diff --git a/WallpaperPicker/res/values-bn-rBD/strings.xml b/WallpaperPicker/res/values-bn-rBD/strings.xml index 1c4d3d493c..ab35daf9a5 100644 --- a/WallpaperPicker/res/values-bn-rBD/strings.xml +++ b/WallpaperPicker/res/values-bn-rBD/strings.xml @@ -23,11 +23,10 @@ "চিত্র লোড করা যায়নি" "ওয়ালপেপার হিসাবে চিত্র লোড করা যায়নি" "ওয়ালপেপার হিসাবে চিত্র সেট করা যায়নি" - - "%1$dটি নির্বাচন করা হয়েছে" - "%1$dটি নির্বাচন করা হয়েছে" - "%1$dটি নির্বাচন করা হয়েছে" - + + %1$dটি নির্বাচন করা হয়েছে + %1$dটি নির্বাচন করা হয়েছে + "%2$dটির মধ্যে %1$dটি ওয়ালপেপার" "%1$s নির্বাচন করা হয়েছে" "মুছুন" diff --git a/WallpaperPicker/res/values-ca/strings.xml b/WallpaperPicker/res/values-ca/strings.xml index 9533ae918c..652dced08b 100644 --- a/WallpaperPicker/res/values-ca/strings.xml +++ b/WallpaperPicker/res/values-ca/strings.xml @@ -23,11 +23,10 @@ "No s\'ha pogut carregar la imatge." "No s\'ha pogut carregar la imatge com a fons de pantalla." "No s\'ha pogut definir la imatge com a fons de pantalla" - - "Seleccionats: %1$d" - "Seleccionats: %1$d" - "Seleccionats: %1$d" - + + Seleccionats: %1$d + Seleccionats: %1$d + "Fons de pantalla %1$d de %2$d" "S\'ha seleccionat %1$s." "Suprimeix" diff --git a/WallpaperPicker/res/values-cs/strings.xml b/WallpaperPicker/res/values-cs/strings.xml index aab8cc8b34..58509e7fdd 100644 --- a/WallpaperPicker/res/values-cs/strings.xml +++ b/WallpaperPicker/res/values-cs/strings.xml @@ -23,11 +23,12 @@ "Obrázek nelze načíst." "Obrázek nelze načíst jako tapetu." "Obrázek nelze nastavit jako tapetu" - - "Vybráno: %1$d" - "Vybráno: %1$d" - "Vybráno: %1$d" - + + Vybráno: %1$d + Vybráno: %1$d + Vybráno: %1$d + Vybráno: %1$d + "Tapeta %1$d z %2$d" "Vybrána položka %1$s" "Smazat" diff --git a/WallpaperPicker/res/values-da/strings.xml b/WallpaperPicker/res/values-da/strings.xml index 10ef5b3da0..867cbc9571 100644 --- a/WallpaperPicker/res/values-da/strings.xml +++ b/WallpaperPicker/res/values-da/strings.xml @@ -23,11 +23,10 @@ "Billedet kunne ikke indlæses" "Billedet kunne ikke indlæses som baggrund" "Billedet kunne ikke indlæses som baggrund" - - "%1$d er valgt" - "%1$d er valgt" - "%1$d er valgt" - + + %1$d er valgt + %1$d er valgt + "Baggrund %1$d af %2$d" "%1$s blev valgt" "Slet" diff --git a/WallpaperPicker/res/values-de/strings.xml b/WallpaperPicker/res/values-de/strings.xml index be35b736bd..53c100236e 100644 --- a/WallpaperPicker/res/values-de/strings.xml +++ b/WallpaperPicker/res/values-de/strings.xml @@ -23,11 +23,10 @@ "Bild konnte nicht geladen werden." "Bild konnte nicht als Hintergrund geladen werden." "Bild konnte nicht als Hintergrund festgelegt werden." - - "%1$d ausgewählt" - "%1$d ausgewählt" - "%1$d ausgewählt" - + + %1$d ausgewählt + %1$d ausgewählt + "Hintergrund %1$d von %2$d" "%1$s ausgewählt" "Löschen" diff --git a/WallpaperPicker/res/values-el/strings.xml b/WallpaperPicker/res/values-el/strings.xml index 1d799a86d5..fc3f2a6ab5 100644 --- a/WallpaperPicker/res/values-el/strings.xml +++ b/WallpaperPicker/res/values-el/strings.xml @@ -23,11 +23,10 @@ "Δεν ήταν δυνατή η φόρτωση της εικόνας" "Δεν ήταν δυνατή η φόρτωση της εικόνας ως ταπετσαρία" "Δεν ήταν δυνατός ο ορισμός της εικόνας ως ταπετσαρία" - - "%1$d επιλεγμένα" - "%1$d επιλεγμένα" - "%1$d επιλεγμένα" - + + %1$d επιλεγμένες + %1$d επιλεγμένη + "Ταπετσαρία %1$d από %2$d" "Επιλέχθηκε το %1$s" "Διαγραφή" diff --git a/WallpaperPicker/res/values-en-rAU/strings.xml b/WallpaperPicker/res/values-en-rAU/strings.xml index a384ff6083..006746e213 100644 --- a/WallpaperPicker/res/values-en-rAU/strings.xml +++ b/WallpaperPicker/res/values-en-rAU/strings.xml @@ -23,11 +23,10 @@ "Couldn\'t load image" "Couldn\'t load image as wallpaper" "Couldn\'t set image as wallpaper" - - "%1$d selected" - "%1$d selected" - "%1$d selected" - + + %1$d selected + %1$d selected + "Wallpaper %1$d of %2$d" "Selected %1$s" "Delete" diff --git a/WallpaperPicker/res/values-en-rGB/strings.xml b/WallpaperPicker/res/values-en-rGB/strings.xml index a384ff6083..006746e213 100644 --- a/WallpaperPicker/res/values-en-rGB/strings.xml +++ b/WallpaperPicker/res/values-en-rGB/strings.xml @@ -23,11 +23,10 @@ "Couldn\'t load image" "Couldn\'t load image as wallpaper" "Couldn\'t set image as wallpaper" - - "%1$d selected" - "%1$d selected" - "%1$d selected" - + + %1$d selected + %1$d selected + "Wallpaper %1$d of %2$d" "Selected %1$s" "Delete" diff --git a/WallpaperPicker/res/values-en-rIN/strings.xml b/WallpaperPicker/res/values-en-rIN/strings.xml index a384ff6083..006746e213 100644 --- a/WallpaperPicker/res/values-en-rIN/strings.xml +++ b/WallpaperPicker/res/values-en-rIN/strings.xml @@ -23,11 +23,10 @@ "Couldn\'t load image" "Couldn\'t load image as wallpaper" "Couldn\'t set image as wallpaper" - - "%1$d selected" - "%1$d selected" - "%1$d selected" - + + %1$d selected + %1$d selected + "Wallpaper %1$d of %2$d" "Selected %1$s" "Delete" diff --git a/WallpaperPicker/res/values-es-rUS/strings.xml b/WallpaperPicker/res/values-es-rUS/strings.xml index 924ea56155..7362b7bd78 100644 --- a/WallpaperPicker/res/values-es-rUS/strings.xml +++ b/WallpaperPicker/res/values-es-rUS/strings.xml @@ -23,11 +23,10 @@ "No se pudo cargar la imagen." "No se pudo cargar la imagen como fondo de pantalla." "No se pudo establecer la imagen como fondo de pantalla" - - "%1$d seleccionado" - "%1$d seleccionado" - "%1$d seleccionados" - + + %1$d seleccionados + %1$d seleccionado + "Fondo de pantalla %1$d de %2$d" "%1$s seleccionado" "Eliminar" diff --git a/WallpaperPicker/res/values-es/strings.xml b/WallpaperPicker/res/values-es/strings.xml index 8ecd3f4c36..3c88ec6f69 100644 --- a/WallpaperPicker/res/values-es/strings.xml +++ b/WallpaperPicker/res/values-es/strings.xml @@ -23,14 +23,13 @@ "No se ha podido cargar la imagen" "No se ha podido cargar la imagen como fondo de pantalla" "No se ha podido establecer la imagen como fondo de pantalla" - - "Seleccionados: %1$d" - "Seleccionados: %1$d" - "Seleccionados: %1$d" - + + %1$d seleccionados + %1$d seleccionado + "Fondo de pantalla %1$d de %2$d" "%1$s seleccionado" - "Eliminar" + "Quitar" "Mis fotos" "Fondos de pantalla" "Recortar fondo de pantalla" diff --git a/WallpaperPicker/res/values-et-rEE/strings.xml b/WallpaperPicker/res/values-et-rEE/strings.xml index 59ca7704c4..541b1d4a20 100644 --- a/WallpaperPicker/res/values-et-rEE/strings.xml +++ b/WallpaperPicker/res/values-et-rEE/strings.xml @@ -23,11 +23,10 @@ "Kujutist ei õnnestunud laadida" "Kujutist ei õnnestunud taustapildina laadida" "Kujutist ei õnnestunud taustapildiks määrata" - - "Valitud on %1$d" - "Valitud on %1$d" - "Valitud on %1$d" - + + Valitud on %1$d + Valitud on %1$d + "%1$d/%2$d taustapildist" "Valitud on %1$s" "Kustuta" diff --git a/WallpaperPicker/res/values-eu-rES/strings.xml b/WallpaperPicker/res/values-eu-rES/strings.xml index fb77b1acd5..5e627f02fc 100644 --- a/WallpaperPicker/res/values-eu-rES/strings.xml +++ b/WallpaperPicker/res/values-eu-rES/strings.xml @@ -23,11 +23,10 @@ "Ezin izan da irudia kargatu" "Ezin izan da irudia horma-paper gisa kargatu" "Ezin izan da ezarri irudia horma-paper gisa" - - "%1$d hautatuta" - "%1$d hautatuta" - "%1$d hautatuta" - + + %1$d hautatu dira + %1$d hautatu da + "%1$d/%2$d horma-papera" "%1$s hautatu da" "Ezabatu" diff --git a/WallpaperPicker/res/values-fa/strings.xml b/WallpaperPicker/res/values-fa/strings.xml index da4b7a10d4..8c57117ac0 100644 --- a/WallpaperPicker/res/values-fa/strings.xml +++ b/WallpaperPicker/res/values-fa/strings.xml @@ -23,11 +23,10 @@ "تصویر بارگیری نشد" "تصویر به‌عنوان کاغذدیواری بارگیری نشد" "تصویر به‌عنوان کاغذدیواری تنظیم نشد" - - "‏%1$d انتخاب شد" - "‏%1$d انتخاب شد" - "‏%1$d انتخاب شد" - + + ‏%1$d انتخاب شد + ‏%1$d انتخاب شد + "‏کاغذدیواری %1$d از %2$d" "%1$s انتخاب شد" "حذف" diff --git a/WallpaperPicker/res/values-fi/strings.xml b/WallpaperPicker/res/values-fi/strings.xml index 3c8f1f538c..d1d7c277d2 100644 --- a/WallpaperPicker/res/values-fi/strings.xml +++ b/WallpaperPicker/res/values-fi/strings.xml @@ -23,11 +23,10 @@ "Kuvan lataus epäonnistui" "Kuvaa ei voitu ladata taustakuvaksi" "Kuvan asettaminen taustakuvaksi epäonnistui." - - "%1$d valittu" - "%1$d valittu" - "%1$d valittu" - + + %1$d valittu + %1$d valittu + "Taustakuva %1$d/%2$d" "Valittu: %1$s" "Poista" diff --git a/WallpaperPicker/res/values-fr-rCA/strings.xml b/WallpaperPicker/res/values-fr-rCA/strings.xml index ba1d430002..0eea5eab4e 100644 --- a/WallpaperPicker/res/values-fr-rCA/strings.xml +++ b/WallpaperPicker/res/values-fr-rCA/strings.xml @@ -23,11 +23,10 @@ "Impossible de charger l\'image" "Impossible de charger l\'image comme fond d\'écran" "Impossible d\'utiliser l\'image comme fond d\'écran" - - "%1$d sélectionné" - "%1$d sélectionné" - "%1$d sélectionné(s)" - + + %1$d fond d\'écran sélectionné + %1$d fonds d\'écran sélectionnés + "Fond d\'écran %1$d de %2$d" "Sélection : %1$s" "Supprimer" diff --git a/WallpaperPicker/res/values-fr/strings.xml b/WallpaperPicker/res/values-fr/strings.xml index 9f3b525311..3775fccfcf 100644 --- a/WallpaperPicker/res/values-fr/strings.xml +++ b/WallpaperPicker/res/values-fr/strings.xml @@ -23,11 +23,10 @@ "Impossible de charger l\'image." "Impossible de charger l\'image comme fond d\'écran." "Impossible de définir l\'image comme fond d\'écran." - - "%1$d élément sélectionné" - "%1$d élément sélectionné" - "%1$d éléments sélectionnés" - + + %1$d fond d\'écran sélectionné + %1$d fonds d\'écran sélectionnés + "Fond d\'écran %1$d sur %2$d" "%1$s sélectionné" "Supprimer" diff --git a/WallpaperPicker/res/values-gl-rES/strings.xml b/WallpaperPicker/res/values-gl-rES/strings.xml index 5805489a7d..3360a61408 100644 --- a/WallpaperPicker/res/values-gl-rES/strings.xml +++ b/WallpaperPicker/res/values-gl-rES/strings.xml @@ -23,11 +23,10 @@ "Non se puido cargar a imaxe" "Non se puido cargar a imaxe como fondo de pantalla" "Non se puido definir a imaxe como fondo de pantalla" - - "Seleccionaches %1$d" - "Seleccionaches %1$d" - "Seleccionaches %1$d" - + + Seleccionáronse %1$d elementos + Seleccionouse %1$d elemento + "Fondo de pantalla %1$d de %2$d" "Seleccionaches %1$s" "Eliminar" diff --git a/WallpaperPicker/res/values-gu-rIN/strings.xml b/WallpaperPicker/res/values-gu-rIN/strings.xml index e201d523f3..9783c60dcd 100644 --- a/WallpaperPicker/res/values-gu-rIN/strings.xml +++ b/WallpaperPicker/res/values-gu-rIN/strings.xml @@ -22,11 +22,11 @@ "વૉલપેપર સેટ કરો" "છબી લોડ કરી શકાઈ નથી" "વૉલપેપર તરીકે છબી લોડ કરી શકાઈ નથી" - - "%1$d પસંદ કર્યો" - "%1$d પસંદ કર્યો" - "%1$d પસંદ કર્યો" - + "વૉલપેપર તરીકે છબી સેટ કરી શક્યાં નથી" + + %1$d પસંદ કર્યાં + %1$d પસંદ કર્યાં + "%2$d માંથી %1$d વૉલપેપર" "%1$s પસંદ કર્યો" "કાઢી નાખો" diff --git a/WallpaperPicker/res/values-hi/strings.xml b/WallpaperPicker/res/values-hi/strings.xml index 6f610b5bb5..a3a0b1079d 100644 --- a/WallpaperPicker/res/values-hi/strings.xml +++ b/WallpaperPicker/res/values-hi/strings.xml @@ -23,11 +23,10 @@ "चित्र लोड नहीं किया जा सका" "चित्र को वॉलपेपर के रूप में लोड नहीं किया जा सका" "चित्र को वॉलपेपर के रूप में सेट नहीं किया जा सका" - - "%1$d चयनित" - "%1$d चयनित" - "%1$d चयनित" - + + %1$d चुना गया + %1$d चुने गए + "वॉलपेपर %2$d में से %1$d" "चयनित %1$s" "हटाएं" diff --git a/WallpaperPicker/res/values-hr/strings.xml b/WallpaperPicker/res/values-hr/strings.xml index aaf5e1bcd0..4cc800f33b 100644 --- a/WallpaperPicker/res/values-hr/strings.xml +++ b/WallpaperPicker/res/values-hr/strings.xml @@ -23,11 +23,11 @@ "Nije moguće učitati sliku" "Nije moguće učitati sliku kao pozadinu" "Postavljanje slike kao pozadine nije uspjelo" - - "Odabrano je %1$d stavki" - "Odabrana je %1$d stavka" - "Odabrano stavki: %1$d" - + + Odabrana je %1$d stavka + Odabrane su %1$d stavke + Odabrano je %1$d stavki + "%1$d. pozadinska slika od %2$d" "Odabrana je %1$s" "Izbriši" diff --git a/WallpaperPicker/res/values-hu/strings.xml b/WallpaperPicker/res/values-hu/strings.xml index 06c0952a40..6a0c91dd7d 100644 --- a/WallpaperPicker/res/values-hu/strings.xml +++ b/WallpaperPicker/res/values-hu/strings.xml @@ -23,11 +23,10 @@ "A kép betöltése nem sikerült" "A kép betöltése háttérképként nem sikerült" "A kép beállítása háttérképként nem sikerült" - - "%1$d kiválasztva" - "%1$d kiválasztva" - "%1$d kiválasztva" - + + %1$d kiválasztva + %1$d kiválasztva + "%1$d/%2$d. háttérkép" "%1$s kiválasztva" "Törlés" diff --git a/WallpaperPicker/res/values-hy-rAM/strings.xml b/WallpaperPicker/res/values-hy-rAM/strings.xml index f68d49f903..f04ad520ad 100644 --- a/WallpaperPicker/res/values-hy-rAM/strings.xml +++ b/WallpaperPicker/res/values-hy-rAM/strings.xml @@ -23,11 +23,10 @@ "Չհաջողվեց բեռնել նկարը" "Չհաջողվեց նկարը սահմանել որպես պաստառ" "Չհաջողվեց նկարը դնել որպես պաստառ" - - "%1$d ընտրված" - "%1$d ընտրված" - "%1$d ընտրված" - + + %1$d ընտրված + %1$d ընտրված + "%1$d պաստառ՝ %2$d-ից" "Ընտրված է %1$s" "Ջնջել" diff --git a/WallpaperPicker/res/values-in/strings.xml b/WallpaperPicker/res/values-in/strings.xml index 634eb1f765..96f90c0a3d 100644 --- a/WallpaperPicker/res/values-in/strings.xml +++ b/WallpaperPicker/res/values-in/strings.xml @@ -23,11 +23,10 @@ "Tidak dapat memuat gambar" "Tidak dapat memuat gambar sebagai wallpaper" "Tidak dapat menyetel gambar sebagai wallpaper" - - "%1$d dipilih" - "%1$d dipilih" - "%1$d dipilih" - + + %1$d dipilih + %1$d dipilih + "Wallpaper %1$d dari %2$d" "%1$s terpilih" "Hapus" diff --git a/WallpaperPicker/res/values-is-rIS/strings.xml b/WallpaperPicker/res/values-is-rIS/strings.xml index eac44ec2ad..a6432736f6 100644 --- a/WallpaperPicker/res/values-is-rIS/strings.xml +++ b/WallpaperPicker/res/values-is-rIS/strings.xml @@ -23,11 +23,10 @@ "Ekki var hægt að hlaða mynd" "Ekki var hægt að hlaða mynd sem veggfóður" "Ekki var hægt að nota mynd sem veggfóður" - - "%1$d valin" - "%1$d valið" - "%1$d valin" - + + %1$d valið + %1$d valin + "Veggfóður %1$d af %2$d" "%1$s valið" "Eyða" diff --git a/WallpaperPicker/res/values-it/strings.xml b/WallpaperPicker/res/values-it/strings.xml index fdb0ce8de7..7ddf655d13 100644 --- a/WallpaperPicker/res/values-it/strings.xml +++ b/WallpaperPicker/res/values-it/strings.xml @@ -23,11 +23,10 @@ "Impossibile caricare l\'immagine" "Impossibile caricare l\'immagine come sfondo" "Impossibile impostare l\'immagine come sfondo" - - "%1$d selezionati" - "%1$d selezionato" - "%1$d selezionati" - + + %1$d selezionati + %1$d selezionato + "Sfondo %1$d di %2$d" "Elemento selezionato: %1$s" "Elimina" diff --git a/WallpaperPicker/res/values-iw/strings.xml b/WallpaperPicker/res/values-iw/strings.xml index c6a583d0e8..97d3ad14ad 100644 --- a/WallpaperPicker/res/values-iw/strings.xml +++ b/WallpaperPicker/res/values-iw/strings.xml @@ -23,11 +23,12 @@ "לא ניתן היה לטעון את התמונה" "לא ניתן היה לטעון את התמונה כטפט" "לא ניתן היה להגדיר את התמונה כטפט" - - "‏%1$d נבחרו" - "‏%1$d נבחרו" - "‏%1$d נבחרו" - + + ‏נבחרו %1$d פריטים + ‏נבחרו %1$d פריטים + ‏נבחרו %1$d פריטים + נבחר פריט אחד + "‏טפט %1$d מתוך %2$d" "בחרת %1$s" "מחק" diff --git a/WallpaperPicker/res/values-ja/strings.xml b/WallpaperPicker/res/values-ja/strings.xml index f18da5d429..bdda7b9e40 100644 --- a/WallpaperPicker/res/values-ja/strings.xml +++ b/WallpaperPicker/res/values-ja/strings.xml @@ -23,11 +23,10 @@ "画像を読み込めませんでした" "画像を壁紙として読み込めませんでした" "画像を壁紙として設定できませんでした" - - "%1$d個選択済み" - "%1$d個選択済み" - "%1$d個選択済み" - + + %1$d 個を選択済み + %1$d 個を選択済み + "壁紙: %1$d/%2$d" "選択: %1$s" "削除" diff --git a/WallpaperPicker/res/values-ka-rGE/strings.xml b/WallpaperPicker/res/values-ka-rGE/strings.xml index 1f652823f7..5546330caf 100644 --- a/WallpaperPicker/res/values-ka-rGE/strings.xml +++ b/WallpaperPicker/res/values-ka-rGE/strings.xml @@ -23,11 +23,10 @@ "სურათი ვერ ჩაიტვირთა." "სურათი ფონად ვერ ჩაიტვირთა." "სურათი ფონად ვერ დაყენდა" - - "არჩეულია %1$d" - "არჩეულია %1$d" - "არჩეულია %1$d" - + + არჩეულია %1$d + არჩეულია %1$d + "ფონი %1$d %2$d-დან" "არჩეული %1$s" "წაშლა" diff --git a/WallpaperPicker/res/values-kk-rKZ/strings.xml b/WallpaperPicker/res/values-kk-rKZ/strings.xml index 6f4ee7ca2e..31332c5dba 100644 --- a/WallpaperPicker/res/values-kk-rKZ/strings.xml +++ b/WallpaperPicker/res/values-kk-rKZ/strings.xml @@ -23,15 +23,14 @@ "Суретті жүктей алмады" "Суретті артқы фон ретінде жүктей алмады" "Кескінді тұсқағаз ретінде орнату мүмкін болмады" - - "%1$d таңдалған" - "%1$d таңдалған" - "%1$d таңдалған" - + + %1$d таңдалған + %1$d таңдалған + "%1$d артқы фон, барлығы %2$d" "%1$s таңдалған" "Жою" "Менің фотосуреттерім" - "Артқы фондар" + "Тұсқағаздар" "Артқы фонды кесу" diff --git a/WallpaperPicker/res/values-km-rKH/strings.xml b/WallpaperPicker/res/values-km-rKH/strings.xml index 801260d3fa..3e72ac8821 100644 --- a/WallpaperPicker/res/values-km-rKH/strings.xml +++ b/WallpaperPicker/res/values-km-rKH/strings.xml @@ -23,15 +23,14 @@ "មិន​អាច​ផ្ទុក​រូបភាព" "មិន​អាច​ផ្ទុក​រូបភាព​ជា​ផ្ទាំង​រូបភាព" "មិនអាចកំណត់រូបភាពជាផ្ទាំងរូបភាពទេ" - - "បាន​ជ្រើស %1$d" - "បាន​ជ្រើស %1$d" - "បាន​ជ្រើស %1$d" - + + បានជ្រើស %1$d + បានជ្រើស %1$d + "ផ្ទាំង​រូបភាព %1$d នៃ %2$d" "បាន​ជ្រើស %1$s" "លុប" - "រូបថតរបស់ខ្ញុំ" + "រូបថតខ្ញុំ" "ផ្ទាំង​រូបភាព" "ច្រឹប​ផ្ទាំង​រូបភាព" diff --git a/WallpaperPicker/res/values-kn-rIN/strings.xml b/WallpaperPicker/res/values-kn-rIN/strings.xml index 7d4d7e70e4..4946cb495e 100644 --- a/WallpaperPicker/res/values-kn-rIN/strings.xml +++ b/WallpaperPicker/res/values-kn-rIN/strings.xml @@ -23,11 +23,10 @@ "ಚಿತ್ರವನ್ನು ಲೋಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ" "ಚಿತ್ರವನ್ನು ವಾಲ್‌ಪೇಪರ್‌ ರೂಪದಲ್ಲಿ ಲೋಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ" "ಚಿತ್ರವನ್ನು ವಾಲ್‌ಪೇಪರ್‌ ರೂಪದಲ್ಲಿ ಹೊಂದಿಸಲಾಗಲಿಲ್ಲ" - - "%1$d ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ" - "%1$d ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ" - "%1$d ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ" - + + %1$d ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ + %1$d ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ + "%2$d ರಲ್ಲಿ %1$d ವಾಲ್‌ಪೇಪರ್‌" "%1$s ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ" "ಅಳಿಸು" diff --git a/WallpaperPicker/res/values-ko/strings.xml b/WallpaperPicker/res/values-ko/strings.xml index f4072946da..81d6a386d7 100644 --- a/WallpaperPicker/res/values-ko/strings.xml +++ b/WallpaperPicker/res/values-ko/strings.xml @@ -23,11 +23,10 @@ "이미지를 로드할 수 없습니다." "이미지를 배경화면으로 로드할 수 없습니다." "이미지를 배경화면으로 설정할 수 없습니다." - - "%1$d개 선택됨" - "%1$d개 선택됨" - "%1$d개 선택됨" - + + %1$d개 선택됨 + %1$d개 선택됨 + "배경화면 %1$d/%2$d" "%1$s 선택함" "삭제" diff --git a/WallpaperPicker/res/values-ky-rKG/strings.xml b/WallpaperPicker/res/values-ky-rKG/strings.xml index f53f52b29f..4a65a05cb5 100644 --- a/WallpaperPicker/res/values-ky-rKG/strings.xml +++ b/WallpaperPicker/res/values-ky-rKG/strings.xml @@ -23,11 +23,10 @@ "Сүрөт жүктөө мүмкүн болбоду" "Сүрөттү тушкагаз катары жүктөө кыйрады" "Сүрөт тушкагаз катары коюлбай койду" - - "%1$d тандалды" - "%1$d тандалды" - "%1$d тандалды" - + + %1$d тандалды + %1$d тандалды + "%2$d ичинен %1$d тушкагаз" "%1$s тандалды" "Жок кылуу" diff --git a/WallpaperPicker/res/values-lo-rLA/strings.xml b/WallpaperPicker/res/values-lo-rLA/strings.xml index 1da6d29c4a..1dc2d11b2c 100644 --- a/WallpaperPicker/res/values-lo-rLA/strings.xml +++ b/WallpaperPicker/res/values-lo-rLA/strings.xml @@ -23,11 +23,10 @@ "ບໍ່ສາມາດໂຫຼດຮູບໄດ້" "ບໍ່ສາມາດໂຫຼດຮູບເປັນພາບພື້ນຫຼັງໄດ້" "ບໍ່ສາມາດໂຫຼດຮູບເປັນພາບພື້ນຫຼັງໄດ້" - - "ເລືອກ %1$d" - "ເລືອກ %1$d" - "ເລືອກ %1$d" - + + ເລືອກ %1$d ແລ້ວ + ເລືອກ %1$d ແລ້ວ + "ພາບພື້ນຫຼັງ %1$d ໃນ %2$d" "ເລືອກ %1$s" "ລຶບ" diff --git a/WallpaperPicker/res/values-lt/strings.xml b/WallpaperPicker/res/values-lt/strings.xml index 98c9a365c4..4ecd092e4d 100644 --- a/WallpaperPicker/res/values-lt/strings.xml +++ b/WallpaperPicker/res/values-lt/strings.xml @@ -23,11 +23,12 @@ "Nepavyko įkelti vaizdo" "Nepavyko įkelti vaizdo kaip ekrano fono" "Nepavyko nustatyti vaizdo kaip ekrano fono" - - "Pasirinkta: %1$d" - "Pasirinkta: %1$d" - "Pasirinkta: %1$d" - + + Pasirinktas %1$d elementas + Pasirinkti %1$d elementai + Pasirinkta %1$d elemento + Pasirinkta %1$d elementų + "%1$d ekrano fonas iš %2$d" "Pasirinkta: %1$s" "Ištrinti" diff --git a/WallpaperPicker/res/values-lv/strings.xml b/WallpaperPicker/res/values-lv/strings.xml index ff7876c72e..e2717057b8 100644 --- a/WallpaperPicker/res/values-lv/strings.xml +++ b/WallpaperPicker/res/values-lv/strings.xml @@ -23,11 +23,11 @@ "Nevarēja ielādēt attēlu." "Nevarēja ielādēt attēlu kā fona tapeti." "Nevarēja iestatīt attēlu kā fona tapeti." - - "Atlasīts: %1$d" - "Atlasīta: %1$d" - "Atlasītas: %1$d" - + + Atlasītas: %1$d + Atlasītas: %1$d + Atlasītas: %1$d + "%1$d. fona tapete no %2$d" "Atlasīta: %1$s" "Dzēst" diff --git a/WallpaperPicker/res/values-mk-rMK/strings.xml b/WallpaperPicker/res/values-mk-rMK/strings.xml index 13b38cd1d5..1855ee371b 100644 --- a/WallpaperPicker/res/values-mk-rMK/strings.xml +++ b/WallpaperPicker/res/values-mk-rMK/strings.xml @@ -19,19 +19,18 @@ - "Подеси тапет" + "Постави тапет" "Сликата не можеше да се вчита" "Сликата не можеше да се вчита како тапет" "Сликата не може да се постави како тапет" - - "Избрано %1$d" - "Избрано %1$d" - "Избрано %1$d" - + + Избран е %1$d + Избрани се %1$d + "Тапет %1$d од %2$d" "Избран %1$s" "Избриши" "Моите фотографии" - "Тапети" + "Позадини" "Исечи тапет" diff --git a/WallpaperPicker/res/values-ml-rIN/strings.xml b/WallpaperPicker/res/values-ml-rIN/strings.xml index 5831b36b91..2ecfae8d8e 100644 --- a/WallpaperPicker/res/values-ml-rIN/strings.xml +++ b/WallpaperPicker/res/values-ml-rIN/strings.xml @@ -23,15 +23,14 @@ "ചിത്രം ലോഡുചെയ്യാനായില്ല" "വാൾപേപ്പറായി ചിത്രം ലോഡുചെയ്യാനായില്ല" "വാൾപേപ്പറായി ചിത്രം ലോഡുചെയ്യാനായില്ല" - - "%1$d തിരഞ്ഞെടുത്തു" - "%1$d തിരഞ്ഞെടുത്തു" - "%1$d തിരഞ്ഞെടുത്തു" - + + %1$d തിരഞ്ഞെടുത്തു + %1$d തിരഞ്ഞെടുത്തു + "%1$d / %2$d വാൾപേപ്പർ" "%1$s തിരഞ്ഞെടുത്തു" "ഇല്ലാതാക്കുക" "എന്റെ ഫോട്ടോകൾ" - "വാൾപേപ്പറുകൾ" + "വാൾപേപ്പർ" "വാൾപേപ്പറിന്റെ വലുപ്പം മാറ്റൽ" diff --git a/WallpaperPicker/res/values-mn-rMN/strings.xml b/WallpaperPicker/res/values-mn-rMN/strings.xml index 9995547d55..539bc0d8b2 100644 --- a/WallpaperPicker/res/values-mn-rMN/strings.xml +++ b/WallpaperPicker/res/values-mn-rMN/strings.xml @@ -23,11 +23,10 @@ "Зургийг ачаалж чадсангүй" "Зургийг ханын зураг болгож ачаалж чадсангүй" "Зургийг ханын зураг болгож чадсангүй" - - "%1$d сонгогдсон" - "%1$d сонгогдсон" - "%1$d сонгогдсон" - + + %1$d-г сонгосон + %1$d-г сонгосон + "%2$d ханын цаасны %1$d нь" "%1$s сонгогдсон" "Устгах" diff --git a/WallpaperPicker/res/values-mr-rIN/strings.xml b/WallpaperPicker/res/values-mr-rIN/strings.xml index d740fd29e6..97fe621f72 100644 --- a/WallpaperPicker/res/values-mr-rIN/strings.xml +++ b/WallpaperPicker/res/values-mr-rIN/strings.xml @@ -23,11 +23,10 @@ "प्रतिमा लोड करू शकलो नाही" "वॉलपेपर म्हणून प्रतिमा लोड करू शकलो नाही" "प्रतिमा वॉलपेपर म्हणून सेट करू शकलो नाही" - - "%1$d निवडले" - "%1$d निवडले" - "%1$d निवडले" - + + %1$d निवडला + %1$d निवडले + "%2$d पैकी %1$d वॉलपेपर" "%1$s निवडले" "हटवा" diff --git a/WallpaperPicker/res/values-ms-rMY/strings.xml b/WallpaperPicker/res/values-ms-rMY/strings.xml index 759e48cecc..4a082614d4 100644 --- a/WallpaperPicker/res/values-ms-rMY/strings.xml +++ b/WallpaperPicker/res/values-ms-rMY/strings.xml @@ -23,11 +23,10 @@ "Tidak dapat memuatkan imej" "Tidak dapat memuatkan imej sebagai kertas dinding" "Tidak dapat menetapkan imej sebagai kertas dinding" - - "%1$d dipilih" - "%1$d dipilih" - "%1$d dipilih" - + + %1$d dipilih + %1$d dipilih + "Kertas dinding %1$d daripada %2$d" "Memilih %1$s" "Padam" diff --git a/WallpaperPicker/res/values-my-rMM/strings.xml b/WallpaperPicker/res/values-my-rMM/strings.xml index 5197b98ea3..19527d804b 100644 --- a/WallpaperPicker/res/values-my-rMM/strings.xml +++ b/WallpaperPicker/res/values-my-rMM/strings.xml @@ -23,11 +23,10 @@ "ပုံရိပ် တင် မရပါ" "ပုံရိပ်အား နောက်ခံအဖြစ် တင် မရပါ" "ပုံရိပ်အား နောက်ခံအဖြစ် တင်၍မရပါ" - - "%1$d ရွေးချယ်ပြီး" - "%1$d ရွေးချယ်ပြီး" - "%1$d ရွေးချယ်ပြီး" - + + %1$d ကို ရွေးချယ်ထားပါသည် + %1$d ကို ရွေးချယ်ထားပါသည် + "နောက်ခံ %1$d မှ %2$d" "ရွေးချယ်ထားသော %1$s" "ဖျက်ပါ" diff --git a/WallpaperPicker/res/values-nb/strings.xml b/WallpaperPicker/res/values-nb/strings.xml index 8125b53bf0..668ed81feb 100644 --- a/WallpaperPicker/res/values-nb/strings.xml +++ b/WallpaperPicker/res/values-nb/strings.xml @@ -23,11 +23,10 @@ "Kunne ikke laste inn bildet" "Kunne ikke laste inn bildet som bakgrunn" "Kunne ikke angi bildet som bakgrunn" - - "%1$d valgt" - "%1$d valgt" - "%1$d valgt" - + + %1$d er valgt + %1$d er valgt + "Bakgrunn %1$d av %2$d" "Valgt %1$s" "Slett" diff --git a/WallpaperPicker/res/values-ne-rNP/strings.xml b/WallpaperPicker/res/values-ne-rNP/strings.xml index b77a1c5d7b..63e6c06660 100644 --- a/WallpaperPicker/res/values-ne-rNP/strings.xml +++ b/WallpaperPicker/res/values-ne-rNP/strings.xml @@ -23,11 +23,10 @@ "तस्बिर लोड गर्न सकिएन" "तस्बिरलाई वालपेपरका रूपमा लोड गर्न सकिएन" "छविलाई वालपेपरको रूपमा सेट गर्न सकिएन" - - "%1$d चयन भयो" - "%1$d चयन भयो" - "%1$d चयन भयो" - + + %1$d चयन गरियो + %1$d चयन गरियो + "%2$d को %1$d वालपेपर" "चयन गरिएको %1$s" "मेट्नुहोस्" diff --git a/WallpaperPicker/res/values-nl/strings.xml b/WallpaperPicker/res/values-nl/strings.xml index dc78305aa3..a245fbf0b0 100644 --- a/WallpaperPicker/res/values-nl/strings.xml +++ b/WallpaperPicker/res/values-nl/strings.xml @@ -23,15 +23,14 @@ "Kan afbeelding niet laden" "Kan afbeelding niet laden als achtergrond" "Kan afbeelding niet instellen als achtergrond" - - "%1$d geselecteerd" - "%1$d geselecteerd" - "%1$d geselecteerd" - + + %1$d geselecteerd + %1$d geselecteerd + "Achtergrond %1$d van %2$d" "%1$s is geselecteerd" "Verwijderen" "Mijn foto\'s" - "Achtergronden" + "Achtergrond" "Achtergrond bijsnijden" diff --git a/WallpaperPicker/res/values-pa-rIN/strings.xml b/WallpaperPicker/res/values-pa-rIN/strings.xml index e4225e02d4..36a60592ce 100644 --- a/WallpaperPicker/res/values-pa-rIN/strings.xml +++ b/WallpaperPicker/res/values-pa-rIN/strings.xml @@ -19,14 +19,14 @@ - "ਵਾਲਪੇਪਰ ਸੈਟ ਕਰੋ" + "ਵਾਲਪੇਪਰ ਸੈੱਟ ਕਰੋ" "ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ" "ਵਾਲਪੇਪਰ ਦੇ ਤੌਰ ਤੇ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ" - - "%1$d ਚੁਣਿਆ ਗਿਆ" - "%1$d ਚੁਣਿਆ ਗਿਆ" - "%1$d ਚੁਣਿਆ ਗਿਆ" - + "ਵਾਲਪੇਪਰ ਦੇ ਤੌਰ ਤੇ ਚਿੱਤਰ ਸੈਟ ਨਹੀਂ ਕਰ ਸਕਿਆ" + + %1$d ਚੁਣਿਆ ਗਿਆ + %1$d ਚੁਣੇ ਗਏ + "ਵਾਲਪੇਪਰ %2$d ਦਾ %1$d" "%1$s ਚੁਣਿਆ ਗਿਆ" "ਮਿਟਾਓ" diff --git a/WallpaperPicker/res/values-pl/strings.xml b/WallpaperPicker/res/values-pl/strings.xml index 9693de46c7..e5754f68eb 100644 --- a/WallpaperPicker/res/values-pl/strings.xml +++ b/WallpaperPicker/res/values-pl/strings.xml @@ -23,11 +23,12 @@ "Nie udało się załadować obrazu" "Nie udało się załadować obrazu jako tapety" "Nie udało się ustawić obrazu jako tapety" - - "Wybranych %1$d" - "Wybrana %1$d" - "Wybrane: %1$d" - + + Wybrano %1$d elementy + Wybrano %1$d elementów + Wybrano %1$d elementu + Wybrano %1$d element + "Tapeta %1$d z %2$d" "Wybrano %1$s" "Usuń" diff --git a/WallpaperPicker/res/values-pt-rPT/strings.xml b/WallpaperPicker/res/values-pt-rPT/strings.xml index 3c4fa9b731..aa1463f1f7 100644 --- a/WallpaperPicker/res/values-pt-rPT/strings.xml +++ b/WallpaperPicker/res/values-pt-rPT/strings.xml @@ -19,15 +19,14 @@ - "Definir imagem fundo" + "Definir imagem de fundo" "Não foi possível carregar a imagem" "Não foi possível carregar a imagem como imagem de fundo" "Não foi possível definir a imagem como imagem de fundo" - - "%1$d selecionadas" - "%1$d selecionada" - "%1$d selecionadas" - + + %1$d selecionadas + %1$d selecionada + "Imagem de fundo %1$d de %2$d" "%1$s selecionada" "Eliminar" diff --git a/WallpaperPicker/res/values-pt/strings.xml b/WallpaperPicker/res/values-pt/strings.xml index 2520eed3a7..29e03844be 100644 --- a/WallpaperPicker/res/values-pt/strings.xml +++ b/WallpaperPicker/res/values-pt/strings.xml @@ -23,11 +23,10 @@ "Não foi possível carregar a imagem" "Não foi possível carregar a imagem como plano de fundo" "Não foi possível definir a imagem como plano de fundo" - - "%1$d selecionados" - "%1$d selecionado" - "%1$d selecionados" - + + %1$d selecionados + %1$d selecionados + "Plano de fundo %1$d de %2$d" "%1$s selecionado" "Excluir" diff --git a/WallpaperPicker/res/values-ro/strings.xml b/WallpaperPicker/res/values-ro/strings.xml index f5df3eee22..f79188795e 100644 --- a/WallpaperPicker/res/values-ro/strings.xml +++ b/WallpaperPicker/res/values-ro/strings.xml @@ -23,11 +23,11 @@ "Nu s-a putut încărca imaginea" "Nu s-a putut încărca imaginea ca fundal" "Nu s-a putut seta ca imagine de fundal" - - "%1$d selectate" - "%1$d selectată" - "%1$d selectate" - + + %1$d selectate + %1$d selectate + %1$d selectată + "Imaginea de fundal %1$d din %2$d" "S-a selectat %1$s" "Ștergeți" diff --git a/WallpaperPicker/res/values-ru/strings.xml b/WallpaperPicker/res/values-ru/strings.xml index f8c350a1f8..9ea1e88400 100644 --- a/WallpaperPicker/res/values-ru/strings.xml +++ b/WallpaperPicker/res/values-ru/strings.xml @@ -23,11 +23,12 @@ "Не удалось загрузить изображение" "Не удалось загрузить изображение" "Не удалось сменить обои" - - "Выбрано: %1$d" - "Выбрано: %1$d" - "Выбрано: %1$d" - + + Выбрано: %1$d + Выбрано: %1$d + Выбрано: %1$d + Выбрано: %1$d + "Обои %1$d из %2$d" "Выбран элемент \"%1$s\"" "Удалить" diff --git a/WallpaperPicker/res/values-si-rLK/strings.xml b/WallpaperPicker/res/values-si-rLK/strings.xml index 3945bdf89d..5cdbcb9358 100644 --- a/WallpaperPicker/res/values-si-rLK/strings.xml +++ b/WallpaperPicker/res/values-si-rLK/strings.xml @@ -23,11 +23,10 @@ "පින්තූරය පූරණය කිරීමට නොහැකි විය" "පින්තූරය වෝල්පේපරයක් ලෙස පූරණය කිරීමට නොහැකි විය" "පින්තූරය බිතුපතක් ලෙස සැකසීමට නොහැකි විය" - - "%1$d තෝරා ගන්නා ලදි" - "%1$d තෝරා ගන්නා ලදි" - "%1$d තෝරා ගන්නා ලදි" - + + %1$dක් තෝරා ගන්නා ලදී + %1$dක් තෝරා ගන්නා ලදී + diff --git a/WallpaperPicker/res/values-sk/strings.xml b/WallpaperPicker/res/values-sk/strings.xml index fb2c819b27..458448d024 100644 --- a/WallpaperPicker/res/values-sk/strings.xml +++ b/WallpaperPicker/res/values-sk/strings.xml @@ -23,11 +23,12 @@ "Obrázok nie je možné načítať" "Obrázok nie je možné načítať ako tapetu" "Obrázok nie je možné nastaviť ako tapetu" - - "Počet vybratých položiek: %1$d" - "Počet vybratých položiek: %1$d" - "Počet vybratých položiek: %1$d" - + + Počet vybratých položiek: %1$d + Počet vybratých položiek: %1$d + Počet vybratých položiek: %1$d + Počet vybratých položiek: %1$d + "Tapeta %1$d z %2$d" "Vybratá položka %1$s" "Odstrániť" diff --git a/WallpaperPicker/res/values-sl/strings.xml b/WallpaperPicker/res/values-sl/strings.xml index a7ff0891d9..dbeb53ad54 100644 --- a/WallpaperPicker/res/values-sl/strings.xml +++ b/WallpaperPicker/res/values-sl/strings.xml @@ -23,11 +23,12 @@ "Slike ni bilo mogoče naložiti" "Slike ni bilo mogoče naložiti kot ozadje" "Slike ni bilo mogoče nastaviti kot ozadje" - - "Št. izbranih: %1$d" - "Št. izbranih: %1$d" - "Št. izbranih: %1$d" - + + %1$d izbrano + %1$d izbrani + %1$d izbrana + %1$d izbranih + "%1$d. ozadje od %2$d" "Izbrano: %1$s" "Izbriši" diff --git a/WallpaperPicker/res/values-sq-rAL/strings.xml b/WallpaperPicker/res/values-sq-rAL/strings.xml index 8a9983b4bd..96ad16bac7 100644 --- a/WallpaperPicker/res/values-sq-rAL/strings.xml +++ b/WallpaperPicker/res/values-sq-rAL/strings.xml @@ -22,11 +22,11 @@ "Cakto imazhin e sfondit" "Nuk mund të ngarkonte imazhin" "Nuk mundi të ngarkonte imazhin si imazh sfondi" - - "Të përzgjedhur: %1$d" - "Të përzgjedhur: %1$d" - "Të përzgjedhur: %1$d" - + "Nuk mundi të vendoste imazhin si imazh sfondi." + + %1$d të zgjedhur + %1$d i zgjedhur + "Imazhi i sfondit: %1$d nga gjithsej %2$d" "%1$s u përzgjodh" "Fshi" diff --git a/WallpaperPicker/res/values-sr/strings.xml b/WallpaperPicker/res/values-sr/strings.xml index 6154526cda..edab2dc90b 100644 --- a/WallpaperPicker/res/values-sr/strings.xml +++ b/WallpaperPicker/res/values-sr/strings.xml @@ -23,15 +23,15 @@ "Није могуће учитати слику" "Није могуће учитати слику као позадину" "Учитавање слике као позадине није успело" - - "Изабрано је %1$d" - "Изабрана је %1$d" - "Изабраних: %1$d" - + + Изабрана је %1$d ставка + Изабране су %1$d ставке + Изабрано је %1$d ставки + "Позадина %1$d од %2$d" "Изабрана је %1$s" "Избриши" - "Моје фотографије" + "Моје слике" "Позадине" "Опсеци позадину" diff --git a/WallpaperPicker/res/values-sv/strings.xml b/WallpaperPicker/res/values-sv/strings.xml index 38062b9eed..7f6faa340d 100644 --- a/WallpaperPicker/res/values-sv/strings.xml +++ b/WallpaperPicker/res/values-sv/strings.xml @@ -23,11 +23,10 @@ "Det gick inte att läsa in bilden" "Det gick inte att läsa in bilden som bakgrund" "Det gick inte att ange bilden som bakgrund" - - "%1$d har valts" - "%1$d har valts" - "%1$d har valts" - + + %1$d har valts + %1$d har valts + "Bakgrund %1$d av %2$d" "%1$s har valts" "Ta bort" diff --git a/WallpaperPicker/res/values-sw/strings.xml b/WallpaperPicker/res/values-sw/strings.xml index 729a79a74f..ab4fe5c128 100644 --- a/WallpaperPicker/res/values-sw/strings.xml +++ b/WallpaperPicker/res/values-sw/strings.xml @@ -23,11 +23,10 @@ "Haikuweza kupakia picha" "Haikuweza kupakia picha iwe mandhari" "Haikuweza kuweka picha kuwa mandhari" - - "%1$d zimechaguliwa" - "%1$d zimechaguliwa" - "%1$d zimechaguliwa" - + + %1$d zimechaguliwa + %1$d imechaguliwa + "Mandhari %1$d ya %2$d" "%1$s iliyochaguliwa" "Futa" diff --git a/WallpaperPicker/res/values-ta-rIN/strings.xml b/WallpaperPicker/res/values-ta-rIN/strings.xml index 69a9d386be..f856c94d62 100644 --- a/WallpaperPicker/res/values-ta-rIN/strings.xml +++ b/WallpaperPicker/res/values-ta-rIN/strings.xml @@ -23,11 +23,10 @@ "படத்தை ஏற்ற முடியவில்லை" "படத்தை வால்பேப்பராக ஏற்ற முடியவில்லை" "படத்தை வால்பேப்பராக அமைக்க முடியவில்லை" - - "%1$d தேர்ந்தெடுக்கப்பட்டன" - "%1$d தேர்ந்தெடுக்கப்பட்டது" - "%1$d தேர்ந்தெடுக்கப்பட்டன" - + + %1$d தேர்ந்தெடுக்கப்பட்டன + %1$d தேர்ந்தெடுக்கப்பட்டது + "வால்பேப்பர் %1$d / %2$d" "%1$s தேர்ந்தெடுக்கப்பட்டது" "நீக்கு" diff --git a/WallpaperPicker/res/values-te-rIN/strings.xml b/WallpaperPicker/res/values-te-rIN/strings.xml index 6fb5fa29b1..7ca48aad8d 100644 --- a/WallpaperPicker/res/values-te-rIN/strings.xml +++ b/WallpaperPicker/res/values-te-rIN/strings.xml @@ -23,11 +23,10 @@ "చిత్రాన్ని లోడ్ చేయడం సాధ్యపడలేదు" "చిత్రాన్ని వాల్‌పేపర్‌గా లోడ్ చేయడం సాధ్యపడలేదు" "చిత్రాన్ని వాల్‌పేపర్‌గా సెట్ చేయడం సాధ్యపడలేదు" - - "%1$d ఎంచుకోబడింది" - "%1$d ఎంచుకోబడింది" - "%1$d ఎంచుకోబడింది" - + + %1$d ఎంచుకోబడ్డాయి + %1$d ఎంచుకోబడింది + "%2$dలో %1$dవ వాల్‌పేపర్" "%1$s ఎంచుకోబడింది" "తొలగించు" diff --git a/WallpaperPicker/res/values-th/strings.xml b/WallpaperPicker/res/values-th/strings.xml index c689436060..2616d0113f 100644 --- a/WallpaperPicker/res/values-th/strings.xml +++ b/WallpaperPicker/res/values-th/strings.xml @@ -23,11 +23,10 @@ "ไม่สามารถโหลดรูปภาพ" "ไม่สามารถโหลดรูปภาพเป็นวอลเปเปอร์" "ไม่สามารถตั้งรูปภาพเป็นวอลเปเปอร์" - - "เลือกไว้ %1$d" - "เลือกไว้ %1$d" - "เลือกไว้ %1$d" - + + เลือกไว้ %1$d รายการ + เลือกไว้ %1$d รายการ + "วอลเปเปอร์ %1$d จาก %2$d" "เลือก %1$s แล้ว" "ลบ" diff --git a/WallpaperPicker/res/values-tl/strings.xml b/WallpaperPicker/res/values-tl/strings.xml index c760d7f6e3..64f678daf3 100644 --- a/WallpaperPicker/res/values-tl/strings.xml +++ b/WallpaperPicker/res/values-tl/strings.xml @@ -23,14 +23,13 @@ "Hindi ma-load ang larawan" "Hindi ma-load ang larawan bilang wallpaper" "Hindi maitakda ang larawan bilang wallpaper" - - "%1$d ang napili" - "%1$d ang napili" - "%1$d ang napili" - + + %1$d ang napili + %1$d ang napili + "Wallpaper %1$d ng %2$d" "Napili ang %1$s" - "Tanggalin" + "I-delete" "Aking mga larawan" "Mga Wallpaper" "I-crop ang wallpaper" diff --git a/WallpaperPicker/res/values-tr/strings.xml b/WallpaperPicker/res/values-tr/strings.xml index e9dc1d2b29..2488a07c59 100644 --- a/WallpaperPicker/res/values-tr/strings.xml +++ b/WallpaperPicker/res/values-tr/strings.xml @@ -23,11 +23,10 @@ "Resim yüklenemedi" "Resim duvar kağıdı olarak yüklenemedi" "Resim, duvar kağıdı olarak ayarlanamadı" - - "%1$d tane seçildi" - "%1$d tane seçildi" - "%1$d tane seçildi" - + + %1$d tane seçildi + %1$d tane seçildi + "%2$d duvar kağıdı arasından duvar kağıdı %1$d" "%1$s seçildi" "Sil" diff --git a/WallpaperPicker/res/values-uk/strings.xml b/WallpaperPicker/res/values-uk/strings.xml index c6669c0c86..84f180f5a5 100644 --- a/WallpaperPicker/res/values-uk/strings.xml +++ b/WallpaperPicker/res/values-uk/strings.xml @@ -23,11 +23,12 @@ "Не вдалося завантажити зображення" "Не вдалося завантажити зображення як фоновий малюнок" "Не вдалося зробити зображення фоновим малюнком" - - "Вибрано %1$d" - "Вибрано %1$d" - "Вибрано %1$d" - + + Вибрано %1$d + Вибрано %1$d + Вибрано %1$d + Вибрано %1$d + "Фоновий малюнок %1$d з %2$d" "Вибрано %1$s" "Видалити" diff --git a/WallpaperPicker/res/values-ur-rPK/strings.xml b/WallpaperPicker/res/values-ur-rPK/strings.xml index e240e1a50a..703fabcfb9 100644 --- a/WallpaperPicker/res/values-ur-rPK/strings.xml +++ b/WallpaperPicker/res/values-ur-rPK/strings.xml @@ -23,11 +23,10 @@ "تصویر کو لوڈ نہیں کیا جا سکا" "تصویر کو وال پیپر کے بطور لوڈ نہیں کیا جا سکا" "تصویر کو بطور وال پیپر سیٹ نہیں کیا جا سکا" - - "‏%1$d کو منتخب کیا گیا" - "‏%1$d کو منتخب کیا گیا" - "‏%1$d کو منتخب کیا گیا" - + + ‏%1$d کا انتخاب ہو گیا + ‏%1$d کا انتخاب ہو گیا + "‏وال پیپر ‎%1$d از ‎%2$d" "%1$s کو منتخب کیا گیا" "حذف کریں" diff --git a/WallpaperPicker/res/values-uz-rUZ/strings.xml b/WallpaperPicker/res/values-uz-rUZ/strings.xml index 5a79981e9d..7ffb1c4ca0 100644 --- a/WallpaperPicker/res/values-uz-rUZ/strings.xml +++ b/WallpaperPicker/res/values-uz-rUZ/strings.xml @@ -23,11 +23,10 @@ "Rasm yuklanmadi" "Fon rasmi sifatida rasm yuklanmadi" "Rasmni fon rasmi sifatida o‘rnatib bo‘lmadi" - - "%1$d ta tanlandi" - "%1$d ta tanlandi" - "%1$d ta tanlandi" - + + %1$d ta tanlandi + %1$d ta tanlandi + "Fon rasmi %2$ddan %1$d" "%1$s tanlandi" "O‘chirish" diff --git a/WallpaperPicker/res/values-vi/strings.xml b/WallpaperPicker/res/values-vi/strings.xml index a7c636de3a..01c18f4326 100644 --- a/WallpaperPicker/res/values-vi/strings.xml +++ b/WallpaperPicker/res/values-vi/strings.xml @@ -23,11 +23,10 @@ "Không thể tải hình ảnh" "Không thể tải hình ảnh làm hình nền" "Không thể đặt hình ảnh làm hình nền" - - "Đã chọn %1$d" - "Đã chọn %1$d" - "Đã chọn %1$d" - + + Đã chọn %1$d mục + Đã chọn %1$d mục + "Hình nền %1$d / %2$d" "%1$s được chọn" "Xóa" diff --git a/WallpaperPicker/res/values-zh-rCN/strings.xml b/WallpaperPicker/res/values-zh-rCN/strings.xml index 4656ec687a..3369cff134 100644 --- a/WallpaperPicker/res/values-zh-rCN/strings.xml +++ b/WallpaperPicker/res/values-zh-rCN/strings.xml @@ -23,11 +23,10 @@ "无法加载图片" "无法加载要设为壁纸的图片" "无法将图片设为壁纸" - - "已选择%1$d项" - "已选择%1$d项" - "已选择%1$d项" - + + 已选择 %1$d 项 + 已选择 %1$d 项 + "第%1$d张壁纸，共%2$d张" "已选择%1$s" "删除" diff --git a/WallpaperPicker/res/values-zh-rHK/strings.xml b/WallpaperPicker/res/values-zh-rHK/strings.xml index eb9c327347..bc09d582c4 100644 --- a/WallpaperPicker/res/values-zh-rHK/strings.xml +++ b/WallpaperPicker/res/values-zh-rHK/strings.xml @@ -23,11 +23,10 @@ "無法載入圖片" "無法載入圖片設為桌布" "無法將圖片設為桌布" - - "已選取 %1$d 張" - "已選取 %1$d 張" - "已選取 %1$d 張" - + + 已選取 %1$d 張 + 已選取 %1$d 張 + "第 %1$d 張桌布，共 %2$d 張" "已選取%1$s" "刪除" diff --git a/WallpaperPicker/res/values-zh-rTW/strings.xml b/WallpaperPicker/res/values-zh-rTW/strings.xml index fda123c790..90f9facade 100644 --- a/WallpaperPicker/res/values-zh-rTW/strings.xml +++ b/WallpaperPicker/res/values-zh-rTW/strings.xml @@ -23,11 +23,10 @@ "無法載入圖片" "無法載入您要設為桌布的圖片" "無法將圖片設為桌布" - - "已選取 %1$d 個" - "已選取 %1$d 個" - "已選取 %1$d 個" - + + 已選取 %1$d 個 + 已選取 %1$d 個 + "第 %1$d 張桌布，共 %2$d 張" "已選取%1$s" "刪除" diff --git a/WallpaperPicker/res/values-zu/strings.xml b/WallpaperPicker/res/values-zu/strings.xml index 1a5b95e930..ba43741bf6 100644 --- a/WallpaperPicker/res/values-zu/strings.xml +++ b/WallpaperPicker/res/values-zu/strings.xml @@ -23,11 +23,10 @@ "Ayikwazanga ukulayisha isithombe" "Ayikwazanga ukulayisha isithombe njengesithombe sangemuva" "Ayikwazanga ukusetha isithombe njengesithombe sangemuva" - - "%1$d khethiwe" - "%1$d khethiwe" - "%1$d khethiwe" - + + %1$d okukhethiwe + %1$d okukhethiwe + "Isithombe sangemuva esingu-%1$d kwezingu-%2$d" "I-%1$s ekhethiwe" "Susa" diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 52561152f2..76cfaa341c 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -37,8 +37,8 @@ "Favoritlər-də yer yoxdur" "Tətbiqlər" "Əsas səhifə" - "Kənarlaşdır" - "Sistemdən sil" + "Silin" + "Sistemdən silin" "Tətbiq məlumatı" "qısayolları quraşdır" "Tətbiqə istifadəçi müdaxiləsi olmadan qısayolları əlavə etməyə icazə verir." diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 5a81ed482d..d142c82cf5 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -55,12 +55,12 @@ "%2$dটির %1$d নম্বর হোম স্ক্রীন" "নতুন হোম স্ক্রীনের পৃষ্ঠা" "স্বাগতম" - "আপনার অ্যাপ্লিকেশান আইকনগুলি অনুলিপি করুন" + "আপনার অ্যাপ্লিকেশান আইকনগুলি কপি করুন" "আপনার পুরানো হোম স্ক্রীন থেকে আইকন এবং ফোল্ডারগুলি আমদানি করবেন?" - "আইকনগুলি অনুলিপি করুন" + "আইকনগুলি কপি করুন" "নতুন করে শুরু করুন" "ওয়ালপেপার, উইজেট এবং সেটিংস" - "কাস্টমাইজ করার জন্য পটভূমি স্পর্শ করে ধরে থাকুন" + "নিজের পছন্দমত সাজানোর জন্য পটভূমি স্পর্শ করে ধরে থাকুন" "বুঝেছি" "ফোল্ডার খোলা হয়েছে, %1$d বাই %2$d" "ফোল্ডার বন্ধ করতে স্পর্শ করুন" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 05932a95e1..f67394577e 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -54,7 +54,7 @@ "Pàgina %1$d de %2$d" "Pantalla d\'inici %1$d de %2$d" "Pàgina de la pantalla d\'inici nova" - "Us donem la benvinguda" + "Et donem la benvinguda" "Copiar les icones d\'aplicació" "Importar icones i carpetes de pantalles d\'inici anteriors?" "COPIA LES ICONES." diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 12a315771e..bdc62c8a48 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -61,7 +61,7 @@ "ΝΕΑ ΕΝΑΡΞΗ" "Ταπετσαρίες, γραφικά στοιχεία και ρυθμίσεις" "Αγγίξτε παρατεταμένα το παρασκήνιο για προσαρμογή" - "ΕΓΙΝΕ" + "ΤΟ ΚΑΤΑΛΑΒΑ" "Άνοιγμα φακέλου, %1$d επί %2$d" "Αγγίξτε για να κλείσετε τον φάκελο" "Αγγίξτε για να αποθηκεύσετε το νέο όνομα" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index f8873a5742..b86987cded 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -59,7 +59,7 @@ "Import icons and folders from your old Home screens?" "COPY ICONS" "START AFRESH" - "Wallpapers, widgets, & settings" + "Wallpapers, widgets & settings" "Touch & hold background to customise" "GOT IT" "Folder opened, %1$d by %2$d" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index f8873a5742..b86987cded 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -59,7 +59,7 @@ "Import icons and folders from your old Home screens?" "COPY ICONS" "START AFRESH" - "Wallpapers, widgets, & settings" + "Wallpapers, widgets & settings" "Touch & hold background to customise" "GOT IT" "Folder opened, %1$d by %2$d" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index f8873a5742..b86987cded 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -59,7 +59,7 @@ "Import icons and folders from your old Home screens?" "COPY ICONS" "START AFRESH" - "Wallpapers, widgets, & settings" + "Wallpapers, widgets & settings" "Touch & hold background to customise" "GOT IT" "Folder opened, %1$d by %2$d" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c9c68545ff..ab469dd55a 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -37,7 +37,7 @@ "La bandeja de favoritos está completa" "Aplicaciones" "Inicio" - "Eliminar" + "Quitar" "Desinstalar" "Información de la aplicación" "instalar accesos directos" @@ -73,10 +73,10 @@ "Ajustes" "Permitir rotación" "Desconocido" - "Eliminar" + "Quitar" "Buscar" "Esta aplicación no está instalada" - "La aplicación de este icono no está instalada. Puedes eliminar el icono o buscar la aplicación e instalarla manualmente." + "La aplicación de este icono no está instalada. Puedes quitar el icono o buscar la aplicación e instalarla manualmente." "Descargando %1$s (%2$s completado)" "Esperando para instalar %1$s" "Añadir a la pantalla de inicio" diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index c85466c43d..4b44c216e0 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -26,7 +26,7 @@ "Ez dago erabilgarri aplikazioa" "Deskargatutako aplikazioa modu seguruan desgaitu da" "Widgetak desgaitu egin dira modu seguruan" - "Eduki ukituta widgeta aukeratzeko." + "Eduki sakatuta widgeta aukeratzeko." "Sakatu birritan eta eduki sakatuta widgeta aukeratzeko edo ekintza pertsonalizatuak erabiltzeko." "%1$d × %2$d" "Bilatu aplikazioetan…" @@ -60,7 +60,7 @@ "KOPIATU IKONOAK" "HASI HUTSETIK" "Horma-paperak, widgetak eta ezarpenak" - "Pertsonalizatzeko, eduki ukituta atzeko planoa" + "Pertsonalizatzeko, eduki sakatuta atzeko planoa" "ADOS" "Karpeta ireki da: %1$d x %2$d" "Karpeta ixteko, uki ezazu" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 85a379bfe3..125e79e3a4 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -37,7 +37,7 @@ "فضای بیشتری در سینی موارد دلخواه وجود ندارد" "برنامه‌ها" "صفحه اصلی" - "حذف" + "برداشتن" "حذف نصب" "اطلاعات برنامه" "نصب میان‌برها" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index c27310b66a..03df2923a3 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -60,7 +60,7 @@ "KOPIOI KUVAKKEET" "ALOITA ALUSTA" "Taustakuvat, widgetit ja asetukset" - "Muokkaa taustaa koskettamalla ja painamalla pitkään" + "Muokkaa taustaa koskettamalla ja painamalla pitkään." "SELVÄ" "Kansio avattu, koko %1$d x %2$d" "Sulje kansio koskettamalla" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index bb0f1a01c1..5a338aefde 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -60,7 +60,7 @@ "COPIER LES ICÔNES" "DISPOSITION PAR DÉFAUT" "Fonds d\'écran, widgets et paramètres" - "Maintenez le doigt sur le fond d\'écran pour personnaliser" + "Maintenez le doigt sur le fond d\'écran pour le personnaliser" "J\'ai compris" "Dossier ouvert, %1$d par %2$d" "Toucher pour fermer le dossier" diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index ad25e84984..a35b03e029 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -29,7 +29,7 @@ "Mantén premido un widget para seleccionalo." "Toca dúas veces e mantén premido para seleccionar un widget ou utiliza accións personalizadas." "%1$d × %2$d" - "Aplicacións de busca..." + "Buscar aplicacións..." "Cargando aplicacións..." "Non se atoparon aplicacións que coincidan con \"%1$s\"" "Ir a %1$s" @@ -37,7 +37,7 @@ "Non hai máis espazo na bandexa de favoritos" "Aplicacións" "Inicio" - "Eliminar" + "Quitar" "Desinstalar" "Información da aplicación" "instalar atallos" @@ -59,8 +59,8 @@ "Queres importar as iconas e os cartafoles doutras pantallas de inicio?" "COPIAR ICONAS" "COMEZAR DE CERO" - "Fondos pantalla, widgets e configuración" - "Mantén tocado o segundo plano para personalizar" + "Fondos de pantalla, widgets e configuración" + "Mantén premido o fondo para personalizalo" "DE ACORDO" "Abriuse o cartafol, %1$d por %2$d" "Toca para pechar o cartafol" diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 1cd6768306..c42348f86e 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -22,24 +22,24 @@ "Launcher3" "કાર્યાલય" - "એપ્લિકેશન ઇન્સ્ટોલ થઈ નથી." - "એપ્લિકેશન ઉપલબ્ધ નથી" - "સુરક્ષિત મોડમાં ડાઉનલોડ કરેલ એપ્લિકેશન અક્ષમ કરી" + "ઍપ્લિકેશન ઇન્સ્ટોલ થઈ નથી." + "ઍપ્લિકેશન ઉપલબ્ધ નથી" + "સુરક્ષિત મોડમાં ડાઉનલોડ કરેલ ઍપ્લિકેશન અક્ષમ કરી" "સુરક્ષિત મોડમાં વિજેટ્સ અક્ષમ કર્યા" "વિજેટ ચૂંટવા માટે ટચ કરો અને પકડી રાખો." "વિજેટ ચૂંટવા અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરવા માટે બે વાર ટેપ કરો અને પકડી રાખો." "%1$d × %2$d" "ઍપ્લિકેશનોમાં શોધો…" - "એપ્લિકેશનો લોડ કરી રહ્યું છે…" - "\"%1$s\" થી મેળ ખાતી કોઈ એપ્લિકેશનો મળી નથી" + "ઍપ્લિકેશનો લોડ કરી રહ્યું છે…" + "\"%1$s\" થી મેળ ખાતી કોઈ ઍપ્લિકેશનો મળી નથી" "%1$s પર જાઓ" "આ હોમ સ્ક્રીન પર વધુ જગ્યા નથી." "મનપસંદ ટ્રે પર વધુ જગ્યા નથી" - "એપ્લિકેશનો" + "ઍપ્લિકેશનો" "હોમ" "દૂર કરો" "અનઇન્સ્ટોલ કરો" - "એપ્લિકેશન માહિતી" + "ઍપ્લિકેશન માહિતી" "શોર્ટકટ્સ ઇન્સ્ટોલ કરો" "એપ્લિકેશનને વપરાશકર્તા હસ્તક્ષેપ વગર શોર્ટકટ્સ ઉમેરવાની મંજૂરી આપે છે." "હોમ સેટિંગ્સ અને શોર્ટકટ્સ વાંચો" @@ -49,13 +49,13 @@ "%1$s ને ફોન કૉલ્સ કરવાની મંજૂરી નથી" "વિજેટ લોડ કરવામાં સમસ્યા" "સેટઅપ" - "આ એક સિસ્ટમ એપ્લિકેશન છે અને અનઇન્સ્ટોલ કરી શકાતી નથી." + "આ એક સિસ્ટમ ઍપ્લિકેશન છે અને અનઇન્સ્ટોલ કરી શકાતી નથી." "અનામી ફોલ્ડર" "%2$d માંથી %1$d પૃષ્ઠ" "%2$d માંથી %1$d હોમ સ્ક્રીન" "નવું હોમ સ્ક્રીન પૃષ્ઠ" "સ્વાગત છે" - "તમારા એપ્લિકેશન આયકન્સને કૉપિ કરો" + "તમારા ઍપ્લિકેશન આયકન્સને કૉપિ કરો" "તમારી જૂની હોમ સ્ક્રીન્સથી આયકન્સ અને ફોલ્ડર્સને આયાત કરીએ?" "આયકન્સને કૉપિ કરો" "નવેસરથી પ્રારંભ કરો" @@ -75,8 +75,8 @@ "અજાણ્યો" "દૂર કરો" "શોધો" - "આ એપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી" - "આ આયકન માટેની એપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી. તમે તેને દૂર કરી શકો છો અથવા એપ્લિકેશન માટે શોધ કરી અને તેને મેન્યુઅલી ઇન્સ્ટોલ કરી શકો છો." + "આ ઍપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી" + "આ આયકન માટેની ઍપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી. તમે તેને દૂર કરી શકો છો અથવા ઍપ્લિકેશન માટે શોધ કરી અને તેને મેન્યુઅલી ઇન્સ્ટોલ કરી શકો છો." "%1$s ડાઉનલોડ કરી રહ્યાં છે, %2$s પૂર્ણ" "%1$s, ઇન્સ્ટૉલ થવાની રાહ જોઈ રહ્યું છે" "હોમ સ્ક્રીન પર ઉમેરો" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index b9a5b6135b..a1d7e6de3a 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -37,8 +37,8 @@ "Nincs több hely a Kedvencek tálcán" "Alkalmazások" "Főoldal" - "Eltávolítás" - "Törlés" + "Törlés" + "Eltávolítás" "Alkalmazásinformáció" "parancsikonok telepítése" "Lehetővé teszi egy alkalmazás számára, hogy felhasználói beavatkozás nélkül adjon hozzá parancsikonokat." diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index a01bc9db84..46040f54fd 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -60,7 +60,7 @@ "COPIA ICONE" "RICOMINCIA" "Sfondi, widget e impostazioni" - "Tocca lo sfondo e tieni premuto per personalizzare" + "Tieni premuto un dito sullo sfondo per personalizzare" "OK" "Cartella aperta, %1$d per %2$d" "Tocca per chiudere la cartella" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 137800e708..bb1ee5aa7d 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -37,7 +37,7 @@ "אין עוד מקום במגש המועדפים" "אפליקציות" "דף הבית" - "הסר" + "מחק" "הסר התקנה" "פרטי אפליקציה" "התקן קיצורי דרך" @@ -60,7 +60,7 @@ "העתק סמלים" "התחל דף חדש" "טפטים, ווידג\'טים והגדרות" - "גע והחזק ברקע לביצוע התאמה אישית" + "גע והחזק ברקע כדי לבצע התאמה אישית" "הבנתי" "תיקיה פתוחה, %1$d על %2$d" "גע כדי לסגור את התיקיה" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 288f0ba86b..3ddae4d623 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -37,7 +37,7 @@ "რჩეულების თაროზე ადგილი არ არის" "აპები" "მთავარი" - "წაშლა" + "მოშორება" "დეინსტალაცია" "აპის შესახებ" "მალსახმობების დაყენება" @@ -59,7 +59,7 @@ "გსურთ, ძველი მთავარი ეკრანიდან ხატულების და საქაღ. იმპორტი?" "ხატულების კოპირება" "სტანდარტული განლაგება" - "ფონები, ვიჯეტები, & პარამეტრები" + "ფონები, ვიჯეტები & პარამეტრები" "მოსარგებად შეეხეთ & დააყოვნეთ ფონზე" "გასაგებია" "საქაღალდე გახსნილია, %1$d x %2$d" diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index b633790d23..eead791aa3 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -38,7 +38,7 @@ "Қолданбалар" "Негізгі" "Алып тастау" - "Алмау" + "Жою" "Қолданба ақпары" "төте пернелерді орнату" "Қолданбаға пайдаланушының қатысуынсыз төте пернелерді қосу мүмкіндігін береді." @@ -60,7 +60,7 @@ "ТАҢБАЛАРДЫ КӨШІРУ" "ЖАҢАДАН БАСТАУ" "Тұсқағаздар, виджеттер және параметрлер" - "Теңшеу үшін фонды түртіп, ұстап тұрыңыз" + "Реттеу үшін фонды саусағыңызбен басып тұрыңыз" "ТҮСІНДІМ" "Қалта ашылды, %1$d және %2$d" "Қалтаны жабу үшін түртіңіз" @@ -69,7 +69,7 @@ "Қалта атауы %1$s болып өзгертілді" "Қалта: %1$s" "Виджеттер" - "Артқы фондар" + "Тұсқағаздар" "Параметрлер" "Айналуға рұқсат ету" "Белгісіз" diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 3cf2599736..d6a1b0a974 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -60,7 +60,7 @@ "រូប​តំណាង​ច្បាប់​ចម្លង" "ចាប់ផ្ដើម​ធ្វើ​ឲ្យ​ស្រស់" "ផ្ទាំងរូបភាព,ធាតុក្រាហ្វិក & ការកំណត់" - "ប៉ះ & សង្កត់​ផ្ទៃ​ខាង​ក្រោយ​ដើម្បី​ប្ដូរ​តាម​​តម្រូវ​ការ" + "ប៉ះ & សង្កត់​ផ្ទៃ​ខាង​ក្រោយ​ឲ្យជាប់ ដើម្បី​ប្ដូរ​តាមបំណង" "យល់​ហើយ" "បាន​បើក​ថត %1$d ដោយ %2$d" "ប៉ះ ដើម្បី​បិទ​ថត" diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml index 0d7cb486b1..9b0ecfb7a3 100644 --- a/res/values-ky-rKG/strings.xml +++ b/res/values-ky-rKG/strings.xml @@ -38,7 +38,7 @@ "Колдонмолор" "Үйгө" "Алып салуу" - "Чечип салуу" + "Орнотуудан чыгаруу" "Колдонмо тууралуу" "тез чакырмаларды орнотуу" "Колдонмого колдонуучуга кайрылбастан тез чакырма кошууга уруксат берет." @@ -59,8 +59,8 @@ "Эски үй экрандарыңыздан сүрөтчөлөр жана фолдерлер импорттолсунбу?" "СҮРӨТЧӨЛӨРДҮ КӨЧҮРҮҮ" "ТАЗАСЫН БАШТОО" - "Тушкагаздар, виджеттер & жөндөөлөр" - "Өзгөчөлөштүрүү үчүн фонго тийип & коё бербей туруңуз" + "Тушкагаздар, виджеттер жана жөндөөлөр" + "Өзгөчөлөштүрүү үчүн фонго тийип коё бербей басып туруңуз" "ТҮШҮНДҮМ" "Фолдер ачылды, туурасы %1$d, бийиктиги %2$d" "Фолдерди жабыш үчүн тийиңиз" diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index 8ed9c263e9..496aa2da83 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -37,8 +37,8 @@ "ບໍ່ມີບ່ອນຫວ່າງໃນຖາດສຳລັບເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ" "ແອັບຯ" "ໜ້າຫຼັກ" - "ລຶບ" - "ຖອນ​ການ​ຕິດ​ຕັ້ງ" + "ລຶບອອກ" + "ຖອນການຕິດຕັ້ງ" "ຂໍ້ມູນແອັບຯ" "ຕິດຕັ້ງທາງລັດ" "ອະນຸຍາດໃຫ້ແອັບຯ ເພີ່ມທາງລັດໂດຍບໍ່ຕ້ອງຮັບການຢືນຢັນຈາກຜູ່ໃຊ້." @@ -59,7 +59,7 @@ "ນຳເຂົ້າໄອຄອນ ແລະ ໂຟນເດີຈາກໂຮມສະກຣີນອັນເກົ່າຂອງທ່ານບໍ່?" "ສຳເນົາໄອຄອນ" "ເລີ່ມຕົ້ນໃໝ່" - "​ຮູບ​ພື້ນຫຼັງ, ວິດເຈັດ, & ​ການ​ຕັ້ງ​ຄ່າ" + "ຮູບພາບພື້ນຫຼັງ, ວິດເຈັດ ແລະ ການຕັ້ງຄ່າ" "ແຕະທີ່​ພາບ​ພື້ນ​ຫລັງ​ຄ້າງ​ໄວ້​ເພື່ອ​ປັບ​ແຕ່ງ" "ເຂົ້າໃຈແລ້ວ" "ເປີດໂຟນເດີແລ້ວ, %1$d ຄູນ %2$d" diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index 73a9d95394..37bd1cf42a 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -42,9 +42,9 @@ "Информации за апликацијата" "инсталирај кратенки" "Овозможува апликацијата да додава кратенки без интервенција на корисникот." - "прочитај подесувања и кратенки на почетна страница" + "чита поставки и кратенки на почетна страница" "Овозможува апликацијата да ги менува подесувањата и кратенките на почетната страница." - "напиши подесувања и кратенки на почетна страница" + "пишува поставки и кратенки на почетна страница" "Овозможува апликацијата да ги менува подесувањата и кратенките на почетната страница." "%1$s нема дозвола за телефонски повици" "Проблем при вчитувањето на виџетот" @@ -54,12 +54,12 @@ "Страница %1$d од %2$d" "Екран на почетна страница %1$d од %2$d" "Нова страница на почетен екран" - "Добредојдовте" + "Добре дојдовте" "Копирај икони за апликација" "Зачувај икони и папки од твоите стари почетни страни?" "КОПИРАЈ ИКОНИ" "СТАРТУВАЈ ОД ПОЧЕТОК" - "Тапети, додатоци и поставки" + "Позадини, додатоци и поставки" "Допрете и задржете на заднината за да приспособите" "СФАТИВ" "Отворена е папка, %1$d на %2$d" @@ -68,8 +68,8 @@ "Папката е затворена" "Папката е преименувана во %1$s" "Папка: %1$s" - "Виџети" - "Тапети" + "Додатоци" + "Позадини" "Поставки" "Дозволи ротација" "Непознато" diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 1169be2c4f..e0e18013db 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -38,7 +38,7 @@ "അപ്ലിക്കേഷനുകൾ" "ഹോം" "നീക്കംചെയ്യുക" - "അണ്‍ഇസ്റ്റാളുചെയ്യുക" + "അണ്‍ഇൻസ്റ്റാൾ" "ആപ്പ് വിവരം" "കുറുക്കുവഴികൾ ഇൻസ്റ്റാളുചെയ്യുക" "ഉപയോക്തൃ ഇടപെടൽ ഇല്ലാതെ കുറുക്കുവഴികൾ ചേർക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു." @@ -59,7 +59,7 @@ "നിങ്ങളുടെ പഴയ ഹോം സ്ക്രീനുകളിൽ നിന്ന് ഐക്കണുകളും ഫോൾഡറുകളും ഇമ്പോർട്ടുചെയ്യണോ?" "ഐക്കണുകൾ പകർത്തുക" "പുതുതായി ആരംഭിക്കുക" - "വാൾപേപ്പറുകൾ, വിജറ്റുകൾ, ക്രമീകരണങ്ങൾ എന്നിവ" + "വാൾപേപ്പറുകൾ, വിജറ്റുകൾ, ക്രമീകരണങ്ങൾ" "ഇഷ്‌ടാനുസൃതമാക്കുന്നതിന് പശ്‌ചാത്തലം സ്‌പർശിച്ചുപിടിക്കുക" "മനസ്സിലായി" "ഫോൾഡർ തുറന്നു, %1$d / %2$d" @@ -69,8 +69,8 @@ "ഫോൾഡറിന്റെ പേര് %1$s എന്നായി മാറ്റി" "ഫോൾഡർ: %1$s" "വിജറ്റുകൾ" - "വാൾപേപ്പറുകൾ" - "ക്രമീകരണങ്ങൾ" + "വാൾപേപ്പർ" + "ക്രമീകരണം" "തിരിക്കൽ അനുവദിക്കുക" "അജ്ഞാതം" "നീക്കംചെയ്യുക" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index 46f46fada5..2c2671468b 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -31,13 +31,13 @@ "%1$d × %2$d" "Апп хайх..." "Аппликейшныг ачаалж байна..." - "\"%1$s\"-тай нийцэх апп олдсонгүй" + "\"%1$s\"-д нийцэх апп олдсонгүй" "%1$s руу очих" "Энэ Нүүр дэлгэц зайгүй." "\"Дуртай\" трей дээр өөр зай байхгүй байна" "Апп" "Нүүр" - "Устгах" + "Хасах" "Устгах" "Апп мэдээлэл" "товчлол суулгах" diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index 0264c98df8..c995a69b29 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -24,7 +24,7 @@ "အလုပ်" "အပ်ပလီကေးရှင်း မထည့်သွင်းထားပါ" "App လက်လှမ်း မမှီပါ" - "ဒေါင်းလုဒ် appကို လုံခြုံရေး မုဒ်ထဲမှာ ပိတ်ထား" + "ဒေါင်းလုဒ် အက်ပ်ကို လုံခြုံရေး မုဒ်ထဲမှာ ပိတ်ထား" "လုံခြုံရေး မုဒ်ထဲမှာ ဝီဂျက်များကို ပိတ်ထား" "ဝဒ်ဂျက်တစ်ခုကို ကောက်ယူရန် ဖိနှိပ်ထားပါ" "ဝစ်ဂျက်တစ်ခုကိုရယူရန် သို့မဟုတ် စိတ်ကြိုက်လုပ်ဆောင်မှုများကို အသုံးပြုရန် နှစ်ချက်တို့ပြီး ကိုင်ထားပါ။" @@ -35,10 +35,10 @@ "%1$sကို သွားပါ" "ဤပင်မမျက်နှာစာတွင် နေရာလွတ် မကျန်တော့ပါ" "အနှစ်သက်ဆုံးများ ထားရာတွင် နေရာလွတ် မကျန်တော့ပါ" - "အပ်ပလီကေးရှင်းများ" + "အက်ပ်များ" "ပင်မစာမျက်နှာ" - "ဖယ်ရှာခြင်း" - "ဖယ်ရှားခြင်း" + "ဖယ်ရှားပါ" + "ပြန်ထုတ်ပါ" "အပ်ပလီကေးရှင်း အချက်အလက်များ" "အတိုကောက်မှတ်သားမှုများအား ထည့်သွင်းခြင်း" "အသုံးပြုသူ လုပ်ဆောင်မှုမရှိပဲ အပ်ပလီကေးရှင်းကို အတိုကောက်မှတ်သားမှုများ ပြုလုပ်ခွင့် ပေးခြင်း" @@ -59,24 +59,24 @@ "ပင်မစာမျက်နှာအဟောင်းမှ ပုံညွှန်းများ နှင့် အကန့်များကို ယူလာပါမလား" "COPY ICONS" "START FRESH" - "နောက်ခံများ၊ ဝီဂျက်များ& ဆက်တင်များ" + "နောက်ခံများ၊ ဝိဂျက်များ& ဆက်တင်များ" "နောက်ခံကို စိတ်တိုင်းကျ ပြုလုပ်ရန် ထိလျက် & ကိုင်ထားပါ" - "ရပြီ" + "ရပါပြီ" "ဖွင့်ထားသောအကန့်, %1$d နှင့် %2$d" "အကန့်ကို ပိတ်ရန် ဖိကိုင်ပါ" "အမည်ပြောင်းခြင်း အတည်ပြုရန် ဖိကိုင်ပါ" "ပိတ်ထားသောအကန့်" "ပြောင်းလဲလိုက်သော အကန့်အမည် %1$s" "အကန့်အမည်: %1$s" - "ဝဒ်ဂျက်များ" + "ဝိဂျက်များ" "နောက်ခံများ" - "အပြင်အဆင်များ" - "လှည့်ရန် ခွင့်ပြုမည်" + "ဆက်တင်များ" + "လှည့်နိုင်သည်" "မသိရ" "ဖယ်ရှားရန်" "ရှာဖွေရန်" "App မတပ်ဆင်ရသေးပါ" - "ဤအိုင်ကွန်အတွက် app အားမထည့်သွင်းထားပါ။ You can remove it, or search for the app and install it manually." + "ဤအိုင်ကွန်အတွက် အက်ပ် အားမထည့်သွင်းထားပါ။ You can remove it, or search for the အက်ပ် and install it manually." "%1$s ဒေါင်းလုဒ်လုပ်နေသည်၊ %2$s ပြီးပါပြီ" "%1$s ကိုထည့်သွင်းရန်စောင့်နေသည်" "ပင်မမျက်နှာစာသို့ ထည့်ပါ" diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index 2abf0050cc..007934ca47 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -38,7 +38,7 @@ "अनुप्रयोगहरू" "गृह" "हटाउनुहोस्" - "स्थापना हटाउनुहोस्" + "स्थापित अनुप्रयोग हटाउनुहोस्" "अनुप्रयोग जानकारी" "सर्टकट स्थापना गर्नेहोस्" "प्रयोगकर्ताको हस्तक्षेप बिना एउटा अनुप्रयोगलाई सर्टकटमा थप्नको लागि अनुमति दिनुहोस्।" @@ -54,14 +54,14 @@ "पृष्ठ %2$d को %1$d" "गृह स्क्रिन %1$d को %2$d" "नयाँ गृह स्क्रिन पृष्ठ" - "स्वागतम" + "स्वागतम्" "तपाईँको अनुप्रयोग आईकनको प्रतिलिप गर्नुहोस्" "आफ्नो पुरानो गृह स्क्रीनबाट अाईकन र फोल्डरहरू आयात गर्नुहोस्?" "ICONS प्रतिलिप गर्नुहोस्" "START FRESH" - "वालपेपरहरू, विजेट; सेटिङहरू" - "छुनुहोस् ; अनुकूलन पृष्ठभूमि होल्ड गर्नुहोस्" - "बुझियो" + "वालपेपर, विजेट तथा सेटिङहरू" + "अनुकूलन गर्न पृष्ठभूमिलाई छुनुहोस् र होल्ड गर्नुहोस्" + "बुँझें" "फोल्डर खुल्यो %1$d बाट %2$d" "फोल्डर बन्द गर्नको लागि टच गर्नुहोस्" "पुन: नामाकरण बचत गर्न टच गर्नुहोस्।" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index a55aebf8d3..3f98106a38 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -40,7 +40,7 @@ "Verwijderen" "Deïnstalleren" "App-info" - "Snelkoppelingen instellen" + "Snelle links instellen" "Een app toestaan snelkoppelingen toe te voegen zonder tussenkomst van de gebruiker." "instellingen en snelkoppelingen op de startpagina lezen" "De app toestaan de instellingen en snelkoppelingen op de startpagina te lezen." @@ -69,7 +69,7 @@ "De naam van de map is gewijzigd in %1$s" "Map: %1$s" "Widgets" - "Achtergronden" + "Achtergrond" "Instellingen" "Draaien toestaan" "Onbekend" diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml index 6f5acff584..1a10a739a3 100644 --- a/res/values-pa-rIN/strings.xml +++ b/res/values-pa-rIN/strings.xml @@ -25,30 +25,30 @@ "ਐਪ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਹੋਇਆ ਹੈ।" "ਐਪ ਉਪਲਬਧ ਨਹੀਂ ਹੈ" "ਡਾਊਨਲੋਡ ਕੀਤਾ ਐਪ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ" - "ਵਿਜੇਟਸ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ" + "ਵਿਜਿਟ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ" "ਇੱਕ ਵਿਜੇਟ ਚੁਣਨ ਲਈ ਛੋਹਵੋT & ਹੋਲਡ ਕਰੋ।" "ਡਬਲ-ਟੈਪ & ਇੱਕ ਵਿਜੇਟ ਚੁਣਨ ਲਈ ਹੋਲਡ ਕਰੋ ਅਤੇ ਕਸਟਮ ਕਿਰਿਆਵਾਂ ਵਰਤੋ।" "%1$d × %2$d" "ਐਪਾਂ ਖੋਜੋ…" - "ਐਪਸ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ..." - "\"%1$s\" ਨਾਲ ਮਿਲਦੀ ਕੋਈ ਵੀ ਐਪਸ ਨਹੀਂ ਲੱਭੀਆਂ" + "ਐਪਾਂ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + "\"%1$s\" ਨਾਲ ਮਿਲਦੀਆਂ ਕੋਈ ਵੀ ਐਪਾਂ ਨਹੀਂ ਮਿਲੀਆਂ" "%1$s ਤੇ ਜਾਓ" "ਇਸ ਹੋਮ ਸਕ੍ਰੀਨ ਲਈ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ ਹੈ।" "ਮਨਪਸੰਦ ਟ੍ਰੇ ਵਿੱਚ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ।" - "ਐਪਸ" + "ਐਪਾਂ" "ਹੋਮ" "ਹਟਾਓ" "ਅਣਇੰਸਟੌਲ ਕਰੋ" "ਐਪ ਜਾਣਕਾਰੀ" - "ਸ਼ੌਰਟਕਟ ਇੰਸਟੌਲ ਕਰੋ" - "ਇੱਕ ਐਪ ਨੂੰ ਉਪਭੋਗਤਾ ਦੇ ਦਖ਼ਲ ਤੋਂ ਬਿਨਾਂ ਸ਼ੌਰਟਕਟ ਜੋੜਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" - "ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ੌਰਟਕਟ ਪੜ੍ਹੋ" - "ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ੌਰਟਕਟ ਪੜ੍ਹਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" - "ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ੌਰਟਕਟ ਲਿਖੋ" - "ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ੌਰਟਕਟ ਬਦਲਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" + "ਸ਼ਾਰਟਕੱਟ ਇੰਸਟੌਲ ਕਰੋ" + "ਇੱਕ ਐਪ ਨੂੰ ਉਪਭੋਗਤਾ ਦੇ ਦਖ਼ਲ ਤੋਂ ਬਿਨਾਂ ਸ਼ਾਰਟਕੱਟ ਜੋੜਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" + "ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਪੜ੍ਹੋ" + "ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਪੜ੍ਹਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" + "ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਲਿਖੋ" + "ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਬਦਲਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" "%1$s ਨੂੰ ਫੋਨ ਕਾਲਾਂ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ" "ਵਿਜੇਟ ਲੋਡ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ" - "ਸੈਟਅਪ" + "ਸਥਾਪਤ ਕਰੋ" "ਇਹ ਇੱਕ ਸਿਸਟਮ ਐਪ ਹੈ ਅਤੇ ਇਸਨੂੰ ਅਣਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।" "ਬਿਨਾਂ ਨਾਮ ਦਿੱਤਾ ਫੋਲਡਰ" "ਸਫ਼ਾ %2$d ਦਾ %1$d" @@ -59,16 +59,16 @@ "ਕੀ ਆਪਣੀਆਂ ਪੁਰਾਣੀਆਂ ਹੋਮ ਸਕ੍ਰੀਨਾਂ ਤੋਂ ਆਈਕਨਾਂ ਅਤੇ ਫੋਲਡਰ ਆਯਾਤ ਕਰਨੇ ਹਨ?" "ਆਈਕਨਾਂ ਨੂੰ ਕਾਪੀ ਕਰੋ" "ਤਾਜ਼ਾ ਸ਼ੁਰੂ ਕਰੋ" - "ਵਾਲਪੇਪਰ, ਵਿਜੇਟ, & ਸੈਟਿੰਗਾਂ" - "ਅਨੁਕੂਲ ਕਰਨ ਲਈ ਪਿਛੋਕੜ ਛੋਹਵੋ & ਹੋਲਡ ਕਰੋ" - "ਸਮਝ ਗਿਆ" + "ਵਾਲਪੇਪਰ, ਵਿਜਿਟ, ਅਤੇ ਸੈਟਿੰਗਾਂ" + "ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਕਰਨ ਲਈ ਪਿੱਠਭੂਮੀ ਨੂੰ ਛੂਹੋ ਅਤੇ ਛੂਹੀ ਰੱਖੋ" + "ਸਮਝ ਲਿਆ" "ਫੋਲਡਰ ਖੋਲ੍ਹਿਆ, %1$d ਬਾਇ %2$d" - "ਫੋਲਡਰ ਬੰਦ ਕਰਨ ਲਈ ਛੋਹਵੋ" - "ਮੁੜ ਨਾਮ ਦਿਓ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਛੋਹਵੋ" + "ਫੋਲਡਰ ਬੰਦ ਕਰਨ ਲਈ ਸਪੱਰਸ਼ ਕਰੋ" + "ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਸਪੱਰਸ਼ ਕਰੋ" "ਫੋਲਡਰ ਬੰਦ ਕੀਤਾ" "ਫੋਲਡਰ ਨੂੰ %1$s ਮੁੜ ਨਾਮ ਦਿੱਤਾ ਗਿਆ" "ਫੋਲਡਰ: %1$s" - "ਵਿਜੇਟਸ" + "ਵਿਜਿਟ" "ਵਾਲਪੇਪਰ" "ਸੈਟਿੰਗਾਂ" "ਰੋਟੇਸ਼ਨ ਦੀ ਆਗਿਆ ਦਿਓ" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index d9fbdef587..9ba9d6da4b 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -60,7 +60,7 @@ "COPIAR ÍCONES" "COMEÇAR DO ZERO" "Plano de fundo, widgets e configurações" - "Toque e mantenha pressionado o segundo plano para personalizar" + "Toque no segundo plano e mantenha pressionado para personalizar" "ENTENDI" "Pasta aberta, %1$d por %2$d" "Toque para fechar a pasta" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index b4ddae7e74..8f2dc42274 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -60,7 +60,7 @@ "КОПИРОВАТЬ ЗНАЧКИ" "ИСПОЛЬЗОВАТЬ СТАНДАРТНЫЙ МАКЕТ" "Обои, виджеты и настройки" - "Чтобы выполнить настройку, коснитесь фона и удерживайте его" + "Чтобы выполнить настройку, коснитесь фона и удерживайте его." "ОК" "Папка открыта, %1$d x %2$d" "Нажмите, чтобы закрыть папку" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 66772c7775..cc3a2b4a71 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -29,10 +29,10 @@ "Miniaplikáciu pridáte stlačením a podržaním." "Miniaplikáciu pridáte dvojitým klepnutím a pridržaním alebo pomocou vlastných akcií." "%1$d × %2$d" - "Vyhľadávanie v aplikáciách…" + "Hľadať aplikácie…" "Načítavajú sa aplikácie..." "Nenašli sa žiadne aplikácie zodpovedajúce dopytu %1$s" - "Prejsť na dopyt %1$s" + "Prejsť na %1$s" "Na tejto ploche už nie je miesto" "Na paneli Obľúbené položky už nie je miesto" "Aplikácie" @@ -59,8 +59,8 @@ "Chcete importovať ikony a priečinky zo starých plôch?" "SKOPÍROVAŤ IKONY" "ZAČAŤ ODZNOVA" - "Pozadia, miniaplikácie a nastavenia" - "Ak si chcete pozadie prispôsobiť, klepnite naň a podržte ho" + "Tapety, miniaplikácie a nastavenia" + "Pozadie môžete prispôsobiť jeho pridržaním" "DOBRE" "Otvorený priečinok, %1$d x %2$d" "Dotykom zavriete priečinok" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 2abe8244cb..9e2b246c47 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -61,8 +61,8 @@ "Je, ungependa kuingiza ikoni na folda kutoka kwenye skrini zako za Mwanzo za zamani?" "NAKILI IKONI" "ANZA UPYA" - "Mandhari, wijeti, na mipangilio" - "Gusa na ushikilie mandhari ili uweke mapendeleo" + "Mandhari, wijeti na mipangilio" + "Gusa na ushikilie mandhari ili ubadilishe upendavyo" "NIMEELEWA" "Folda imefunguliwa, %1$d kwa %2$d" "Gusa ili ufunge folda" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 7da7b13783..6b08c0e149 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -54,7 +54,7 @@ "Pahina %1$d ng %2$d" "Home screen %1$d ng %2$d" "Bagong page ng home screen" - "Maligayang Pagdating" + "Welcome" "Kopyahin ang mga icon ng app" "I-import ang icon at folder mula sa luma mong Home screen?" "KOPYAHIN ANG MGA ICON" diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index 23f82d8f59..ce799009d9 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -29,16 +29,16 @@ "Vidjetni tanlash uchun bosib turing." "Ikki marta bosib va bosib turgan holatda vidjetni tanlang yoki maxsus amaldan foydalaning." "%1$d × %2$d" - "Ilovalarni qidirish…" + "Ilovalar ichidan qidirish…" "Ilovalar yuklanmoqda…" - "“%1$s” bilan mos hech qanday ilova topilmadi" - "O‘tish: %1$s" + "“%1$s” so‘rovi bo‘yicha hech narsa topilmadi" + "%1$s" "Uy ekranida bitta ham xona yo‘q." "Ajratilganlarda birorta ham xona yo‘q" "Ilovalar" - "Uy" + "Bosh sahifa" "Olib tashlash" - "O‘chirish" + "O‘chirib tashlash" "Ilova haqida" "yorliqlar yaratish" "Ilovalarga foydalanuvchidan so‘ramasdan yorliqlar qo‘shishga ruxsat beradi." @@ -59,8 +59,8 @@ "Eski \"Uy\" ekranlaringizdan jildlar va nishonchalar import qilinsinmi?" "NISHONCHALARNI NUSXALASH" "YANGIDAN BOSHLASH" - "Orqa fon rasmlari, vidjet va sozlamalar" - "Orqa fonni moslashtirish uchun uni bosing va ushlab turing" + "Fon rasmlari, vidjet va sozlamalar" + "Moslashtirish uchun orqa fon ustiga biroz bosib turing" "OK" "Jild ochildi, %1$d ga %2$d" "Jildni yopish uchun bosing" @@ -71,7 +71,7 @@ "Vidjetlar" "Fon rasmlari" "Sozlamalar" - "Aylanishga ruxsat berish" + "Avtomatik burilish" "Noma’lum" "O‘chirish" "Qidirish" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 93a7fa7ad3..72b6ec7f82 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -37,7 +37,7 @@ "收藏栏已满" "应用" "主屏幕" - "删除" + "移除" "卸载" "应用信息" "安装快捷方式" From 7bf18facfcc8a93d0adffb7da483dbdb9c7b862c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 7 Jun 2016 13:37:04 -0700 Subject: [PATCH 09/13] Import translations. DO NOT MERGE Change-Id: I0722328b8acf18a1711632c6f650c1328441e4a2 Auto-generated-cl: translation import --- WallpaperPicker/res/values-af/strings.xml | 9 ++---- WallpaperPicker/res/values-am/strings.xml | 9 ++---- WallpaperPicker/res/values-az-rAZ/strings.xml | 9 ++---- .../res/values-b+sr+Latn/strings.xml | 11 +++---- WallpaperPicker/res/values-be-rBY/strings.xml | 9 ++---- WallpaperPicker/res/values-bn-rBD/strings.xml | 9 ++---- WallpaperPicker/res/values-bs-rBA/strings.xml | 9 ++---- WallpaperPicker/res/values-ca/strings.xml | 9 ++---- WallpaperPicker/res/values-cs/strings.xml | 9 ++---- WallpaperPicker/res/values-da/strings.xml | 9 ++---- WallpaperPicker/res/values-de/strings.xml | 9 ++---- WallpaperPicker/res/values-el/strings.xml | 9 ++---- WallpaperPicker/res/values-es-rUS/strings.xml | 9 ++---- WallpaperPicker/res/values-es/strings.xml | 11 +++---- WallpaperPicker/res/values-et-rEE/strings.xml | 9 ++---- WallpaperPicker/res/values-eu-rES/strings.xml | 9 ++---- WallpaperPicker/res/values-fa/strings.xml | 9 ++---- WallpaperPicker/res/values-fi/strings.xml | 9 ++---- WallpaperPicker/res/values-fr-rCA/strings.xml | 9 ++---- WallpaperPicker/res/values-fr/strings.xml | 9 ++---- WallpaperPicker/res/values-gl-rES/strings.xml | 9 ++---- WallpaperPicker/res/values-gu-rIN/strings.xml | 9 ++---- WallpaperPicker/res/values-hi/strings.xml | 9 ++---- WallpaperPicker/res/values-hr/strings.xml | 9 ++---- WallpaperPicker/res/values-hu/strings.xml | 9 ++---- WallpaperPicker/res/values-hy-rAM/strings.xml | 9 ++---- WallpaperPicker/res/values-in/strings.xml | 9 ++---- WallpaperPicker/res/values-is-rIS/strings.xml | 9 ++---- WallpaperPicker/res/values-it/strings.xml | 9 ++---- WallpaperPicker/res/values-iw/strings.xml | 9 ++---- WallpaperPicker/res/values-ja/strings.xml | 9 ++---- WallpaperPicker/res/values-ka-rGE/strings.xml | 9 ++---- WallpaperPicker/res/values-kk-rKZ/strings.xml | 11 +++---- WallpaperPicker/res/values-km-rKH/strings.xml | 11 +++---- WallpaperPicker/res/values-kn-rIN/strings.xml | 9 ++---- WallpaperPicker/res/values-ky-rKG/strings.xml | 9 ++---- WallpaperPicker/res/values-lt/strings.xml | 9 ++---- WallpaperPicker/res/values-lv/strings.xml | 9 ++---- WallpaperPicker/res/values-mk-rMK/strings.xml | 13 +++----- WallpaperPicker/res/values-ml-rIN/strings.xml | 11 +++---- WallpaperPicker/res/values-mn-rMN/strings.xml | 9 ++---- WallpaperPicker/res/values-mr-rIN/strings.xml | 9 ++---- WallpaperPicker/res/values-ms-rMY/strings.xml | 9 ++---- WallpaperPicker/res/values-my-rMM/strings.xml | 9 ++---- WallpaperPicker/res/values-nb/strings.xml | 9 ++---- WallpaperPicker/res/values-nl/strings.xml | 11 +++---- WallpaperPicker/res/values-pa-rIN/strings.xml | 11 +++---- WallpaperPicker/res/values-pl/strings.xml | 9 ++---- WallpaperPicker/res/values-pt-rPT/strings.xml | 11 +++---- WallpaperPicker/res/values-pt/strings.xml | 9 ++---- WallpaperPicker/res/values-ro/strings.xml | 9 ++---- WallpaperPicker/res/values-ru/strings.xml | 9 ++---- WallpaperPicker/res/values-sk/strings.xml | 9 ++---- WallpaperPicker/res/values-sq-rAL/strings.xml | 9 ++---- WallpaperPicker/res/values-sr/strings.xml | 11 +++---- WallpaperPicker/res/values-sv/strings.xml | 9 ++---- WallpaperPicker/res/values-sw/strings.xml | 9 ++---- WallpaperPicker/res/values-ta-rIN/strings.xml | 9 ++---- WallpaperPicker/res/values-te-rIN/strings.xml | 9 ++---- WallpaperPicker/res/values-th/strings.xml | 9 ++---- WallpaperPicker/res/values-tl/strings.xml | 11 +++---- WallpaperPicker/res/values-tr/strings.xml | 9 ++---- WallpaperPicker/res/values-uk/strings.xml | 9 ++---- WallpaperPicker/res/values-ur-rPK/strings.xml | 9 ++---- WallpaperPicker/res/values-uz-rUZ/strings.xml | 9 ++---- WallpaperPicker/res/values-vi/strings.xml | 9 ++---- WallpaperPicker/res/values-zh-rCN/strings.xml | 9 ++---- WallpaperPicker/res/values-zh-rTW/strings.xml | 9 ++---- WallpaperPicker/res/values-zu/strings.xml | 9 ++---- res/values-az-rAZ/strings.xml | 4 +-- res/values-be-rBY/strings.xml | 6 ++-- res/values-bn-rBD/strings.xml | 2 +- res/values-bs-rBA/strings.xml | 6 ++-- res/values-en-rAU/strings.xml | 2 +- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/strings.xml | 2 +- res/values-es/strings.xml | 6 ++-- res/values-eu-rES/strings.xml | 4 +-- res/values-fa/strings.xml | 2 +- res/values-fi/strings.xml | 2 +- res/values-fr-rCA/strings.xml | 2 +- res/values-gl-rES/strings.xml | 8 ++--- res/values-gu-rIN/strings.xml | 6 ++-- res/values-hu/strings.xml | 4 +-- res/values-iw/strings.xml | 4 +-- res/values-ka-rGE/strings.xml | 4 +-- res/values-kk-rKZ/strings.xml | 4 +-- res/values-km-rKH/strings.xml | 2 +- res/values-ky-rKG/strings.xml | 6 ++-- res/values-lo-rLA/strings.xml | 4 +-- res/values-mk-rMK/strings.xml | 12 +++---- res/values-ml-rIN/strings.xml | 2 +- res/values-mn-rMN/strings.xml | 2 +- res/values-my-rMM/strings.xml | 20 ++++++------ res/values-ne-rNP/strings.xml | 10 +++--- res/values-nl/strings.xml | 2 +- res/values-pa-rIN/strings.xml | 32 +++++++++---------- res/values-ru/strings.xml | 2 +- res/values-sk/strings.xml | 8 ++--- res/values-sw/strings.xml | 2 +- res/values-uz-rUZ/strings.xml | 14 ++++---- res/values-zh-rCN/strings.xml | 2 +- 102 files changed, 314 insertions(+), 521 deletions(-) diff --git a/WallpaperPicker/res/values-af/strings.xml b/WallpaperPicker/res/values-af/strings.xml index c926f48781..0525681111 100644 --- a/WallpaperPicker/res/values-af/strings.xml +++ b/WallpaperPicker/res/values-af/strings.xml @@ -33,10 +33,7 @@ "My foto\'s" "Muurpapiere" "Snoei muurpapier" - - - - - - + "Tuisskerm" + "Sluitskerm" + "Tuisskerm en sluitskerm" diff --git a/WallpaperPicker/res/values-am/strings.xml b/WallpaperPicker/res/values-am/strings.xml index 1b067d4f65..dd15a86e96 100644 --- a/WallpaperPicker/res/values-am/strings.xml +++ b/WallpaperPicker/res/values-am/strings.xml @@ -33,10 +33,7 @@ "የእኔ ፎቶዎች" "የግድግዳ ወረቀቶች" "ልጣፍ ይከርክሙ" - - - - - - + "መነሻ ገጽ" + "ማያ ገጽ ቆልፍ" + "መነሻ ገጽ እና ማያ ገጽ ቁልፍ" diff --git a/WallpaperPicker/res/values-az-rAZ/strings.xml b/WallpaperPicker/res/values-az-rAZ/strings.xml index cb894c960a..f32d1e16b1 100644 --- a/WallpaperPicker/res/values-az-rAZ/strings.xml +++ b/WallpaperPicker/res/values-az-rAZ/strings.xml @@ -33,10 +33,7 @@ "Fotolarım" "Divar kağızları" "Divar kağızını kəsin" - - - - - - + "Əsas ekran" + "Ekran kilidi" + "Əsas ekran və kilid ekranı" diff --git a/WallpaperPicker/res/values-b+sr+Latn/strings.xml b/WallpaperPicker/res/values-b+sr+Latn/strings.xml index 2ac08034e6..8ce22e7c4a 100644 --- a/WallpaperPicker/res/values-b+sr+Latn/strings.xml +++ b/WallpaperPicker/res/values-b+sr+Latn/strings.xml @@ -31,13 +31,10 @@ "Pozadina %1$d od %2$d" "Izabrana je %1$s" "Izbriši" - "Moje fotografije" + "Moje slike" "Pozadine" "Opseci pozadinu" - - - - - - + "Početni ekran" + "Zaključani ekran" + "Početni ekran i zaključani ekran" diff --git a/WallpaperPicker/res/values-be-rBY/strings.xml b/WallpaperPicker/res/values-be-rBY/strings.xml index c78814a4a2..638cca5cbe 100644 --- a/WallpaperPicker/res/values-be-rBY/strings.xml +++ b/WallpaperPicker/res/values-be-rBY/strings.xml @@ -35,10 +35,7 @@ "Мае фатаграфii" "Шпалеры" "Абрэзаць шпалеры" - - - - - - + "Галоўны экран" + "Экран блакіроўкі" + "Галоўны экран і экран блакіроўкі" diff --git a/WallpaperPicker/res/values-bn-rBD/strings.xml b/WallpaperPicker/res/values-bn-rBD/strings.xml index 79a370ec32..e4a30c4c0e 100644 --- a/WallpaperPicker/res/values-bn-rBD/strings.xml +++ b/WallpaperPicker/res/values-bn-rBD/strings.xml @@ -33,10 +33,7 @@ "আমার ফটো" "ওয়ালপেপারগুলি" "ওয়ালপেপার কাটছাঁট করুন" - - - - - - + "হোম স্ক্রীন" + "লক স্ক্রীন" + "হোম স্ক্রীন ও লক স্ক্রীন" diff --git a/WallpaperPicker/res/values-bs-rBA/strings.xml b/WallpaperPicker/res/values-bs-rBA/strings.xml index 304bc57789..2613018a9d 100644 --- a/WallpaperPicker/res/values-bs-rBA/strings.xml +++ b/WallpaperPicker/res/values-bs-rBA/strings.xml @@ -34,10 +34,7 @@ "Moje fotografije" "Pozadine" "Izreži pozadinsku sliku" - - - - - - + "Početni ekran" + "Zaključavanje ekrana" + "Početni ekran i zaključavanje ekrana" diff --git a/WallpaperPicker/res/values-ca/strings.xml b/WallpaperPicker/res/values-ca/strings.xml index 3110e3486a..410319d0b2 100644 --- a/WallpaperPicker/res/values-ca/strings.xml +++ b/WallpaperPicker/res/values-ca/strings.xml @@ -33,10 +33,7 @@ "Les meves fotos" "Fons de pantalla" "Retallar fons de pantalla" - - - - - - + "Pantalla d\'inici" + "Pantalla de bloqueig" + "Pantalla d\'inici i pantalla de bloqueig" diff --git a/WallpaperPicker/res/values-cs/strings.xml b/WallpaperPicker/res/values-cs/strings.xml index 8ec211ae8f..18ef5665e3 100644 --- a/WallpaperPicker/res/values-cs/strings.xml +++ b/WallpaperPicker/res/values-cs/strings.xml @@ -35,10 +35,7 @@ "Moje fotografie" "Tapety" "Oříznutí tapety" - - - - - - + "Plocha" + "Obrazovka uzamčení" + "Plocha a obrazovka uzamčení" diff --git a/WallpaperPicker/res/values-da/strings.xml b/WallpaperPicker/res/values-da/strings.xml index 58409b8e2e..475620cfb3 100644 --- a/WallpaperPicker/res/values-da/strings.xml +++ b/WallpaperPicker/res/values-da/strings.xml @@ -33,10 +33,7 @@ "Mine billeder" "Baggrunde" "Beskær baggrunden" - - - - - - + "Startskærm" + "Låseskærm" + "Startskærm og låseskærm" diff --git a/WallpaperPicker/res/values-de/strings.xml b/WallpaperPicker/res/values-de/strings.xml index 175e6a7f85..411ef45662 100644 --- a/WallpaperPicker/res/values-de/strings.xml +++ b/WallpaperPicker/res/values-de/strings.xml @@ -33,10 +33,7 @@ "Meine Fotos" "Hintergründe" "Hintergrund zuschneiden" - - - - - - + "Startbildschirm" + "Sperrbildschirm" + "Start- und Sperrbildschirm" diff --git a/WallpaperPicker/res/values-el/strings.xml b/WallpaperPicker/res/values-el/strings.xml index 4b2963ebcf..b024ea38d3 100644 --- a/WallpaperPicker/res/values-el/strings.xml +++ b/WallpaperPicker/res/values-el/strings.xml @@ -33,10 +33,7 @@ "Οι φωτογραφίες μου" "Ταπετσαρίες" "Περικοπή ταπετσαρίας" - - - - - - + "Αρχική οθόνη" + "Κλείδωμα οθόνης" + "Αρχική οθόνη και κλείδωμα οθόνης" diff --git a/WallpaperPicker/res/values-es-rUS/strings.xml b/WallpaperPicker/res/values-es-rUS/strings.xml index cb625138ba..5caf439f15 100644 --- a/WallpaperPicker/res/values-es-rUS/strings.xml +++ b/WallpaperPicker/res/values-es-rUS/strings.xml @@ -33,10 +33,7 @@ "Mis fotos" "Fondos de pantalla" "Recortar fondo de pantalla" - - - - - - + "Pantalla principal" + "Pantalla bloqueada" + "Pantalla principal y pantalla bloqueada" diff --git a/WallpaperPicker/res/values-es/strings.xml b/WallpaperPicker/res/values-es/strings.xml index 121b392ccf..a909391461 100644 --- a/WallpaperPicker/res/values-es/strings.xml +++ b/WallpaperPicker/res/values-es/strings.xml @@ -29,14 +29,11 @@ "Fondo de pantalla %1$d de %2$d" "%1$s seleccionado" - "Eliminar" + "Quitar" "Mis fotos" "Fondos de pantalla" "Recortar fondo de pantalla" - - - - - - + "Pantalla de inicio" + "Pantalla de bloqueo" + "Pantalla de inicio y de bloqueo" diff --git a/WallpaperPicker/res/values-et-rEE/strings.xml b/WallpaperPicker/res/values-et-rEE/strings.xml index 53be95734c..c387d4cae6 100644 --- a/WallpaperPicker/res/values-et-rEE/strings.xml +++ b/WallpaperPicker/res/values-et-rEE/strings.xml @@ -33,10 +33,7 @@ "Minu fotod" "Taustapildid" "Taustapildi kärpimine" - - - - - - + "Avaekraan" + "Lukustuskuva" + "Avaekraan ja lukustuskuva" diff --git a/WallpaperPicker/res/values-eu-rES/strings.xml b/WallpaperPicker/res/values-eu-rES/strings.xml index 8eb490cf69..dd461b63b1 100644 --- a/WallpaperPicker/res/values-eu-rES/strings.xml +++ b/WallpaperPicker/res/values-eu-rES/strings.xml @@ -33,10 +33,7 @@ "Nire argazkiak" "Horma-paperak" "Ebaki horma-papera" - - - - - - + "Hasierako pantaila" + "Pantaila blokeatua" + "Hasierako pantaila eta pantaila blokeatua" diff --git a/WallpaperPicker/res/values-fa/strings.xml b/WallpaperPicker/res/values-fa/strings.xml index 9764e9a9d3..7e0cf270d7 100644 --- a/WallpaperPicker/res/values-fa/strings.xml +++ b/WallpaperPicker/res/values-fa/strings.xml @@ -33,10 +33,7 @@ "عکس‌های من" "کاغذدیواری‌ها" "برش کاغذدیواری" - - - - - - + "صفحه اصلی" + "قفل صفحه" + "صفحه اصلی و قفل صفحه" diff --git a/WallpaperPicker/res/values-fi/strings.xml b/WallpaperPicker/res/values-fi/strings.xml index 7d5a30a18d..19c0eecf32 100644 --- a/WallpaperPicker/res/values-fi/strings.xml +++ b/WallpaperPicker/res/values-fi/strings.xml @@ -33,10 +33,7 @@ "Omat valokuvat" "Taustakuvat" "Rajaa taustakuva" - - - - - - + "Aloitusnäyttö" + "Lukitusnäyttö" + "Aloitusnäyttö ja lukitusnäyttö" diff --git a/WallpaperPicker/res/values-fr-rCA/strings.xml b/WallpaperPicker/res/values-fr-rCA/strings.xml index 78ed16521a..3efa953481 100644 --- a/WallpaperPicker/res/values-fr-rCA/strings.xml +++ b/WallpaperPicker/res/values-fr-rCA/strings.xml @@ -33,10 +33,7 @@ "Mes photos" "Fonds d\'écran" "Rogner le fond d\'écran" - - - - - - + "Écran d\'accueil" + "Écran de verrouillage" + "Écran d\'accueil et écran de verrouillage" diff --git a/WallpaperPicker/res/values-fr/strings.xml b/WallpaperPicker/res/values-fr/strings.xml index 8a3ba67a0f..428abbcea0 100644 --- a/WallpaperPicker/res/values-fr/strings.xml +++ b/WallpaperPicker/res/values-fr/strings.xml @@ -33,10 +33,7 @@ "Mes photos" "Fonds d\'écran" "Recadrer le fond d\'écran" - - - - - - + "Écran d\'accueil" + "Écran de verrouillage" + "Écran d\'accueil et écran de verrouillage" diff --git a/WallpaperPicker/res/values-gl-rES/strings.xml b/WallpaperPicker/res/values-gl-rES/strings.xml index 4ac52c6151..314f5253aa 100644 --- a/WallpaperPicker/res/values-gl-rES/strings.xml +++ b/WallpaperPicker/res/values-gl-rES/strings.xml @@ -33,10 +33,7 @@ "As miñas fotos" "Fondos de pantalla" "Recortar fondo de pantalla" - - - - - - + "Pantalla de inicio" + "Pantalla de bloqueo" + "Pantalla de inicio e pantalla de bloqueo" diff --git a/WallpaperPicker/res/values-gu-rIN/strings.xml b/WallpaperPicker/res/values-gu-rIN/strings.xml index 48fc6e8a90..f805120543 100644 --- a/WallpaperPicker/res/values-gu-rIN/strings.xml +++ b/WallpaperPicker/res/values-gu-rIN/strings.xml @@ -33,10 +33,7 @@ "મારા ફોટા" "વૉલપેપર્સ" "વૉલપેપર કાપો" - - - - - - + "હોમ સ્ક્રીન" + "લૉક સ્ક્રીન" + "હોમ સ્ક્રીન અને લૉક સ્ક્રીન" diff --git a/WallpaperPicker/res/values-hi/strings.xml b/WallpaperPicker/res/values-hi/strings.xml index 5b2cd624ea..4a7b5dc539 100644 --- a/WallpaperPicker/res/values-hi/strings.xml +++ b/WallpaperPicker/res/values-hi/strings.xml @@ -33,10 +33,7 @@ "मेरी फ़ोटो" "वॉलपेपर" "वॉलपेपर काटें" - - - - - - + "होम स्क्रीन" + "लॉक स्‍क्रीन" + "होम स्क्रीन और लॉक स्क्रीन" diff --git a/WallpaperPicker/res/values-hr/strings.xml b/WallpaperPicker/res/values-hr/strings.xml index fa98cfabfe..fdad036bd2 100644 --- a/WallpaperPicker/res/values-hr/strings.xml +++ b/WallpaperPicker/res/values-hr/strings.xml @@ -34,10 +34,7 @@ "Moje fotografije" "Pozadine" "Obrezivanje pozadinske slike" - - - - - - + "Početni zaslon" + "Zaključan zaslon" + "Početni zaslon i zaključan zaslon" diff --git a/WallpaperPicker/res/values-hu/strings.xml b/WallpaperPicker/res/values-hu/strings.xml index bb59ee33e8..0982b2c125 100644 --- a/WallpaperPicker/res/values-hu/strings.xml +++ b/WallpaperPicker/res/values-hu/strings.xml @@ -33,10 +33,7 @@ "Saját fotók" "Háttérképek" "Háttérkép körbevágása" - - - - - - + "Kezdőképernyő" + "Lezárási képernyő" + "Kezdőképernyő és lezárási képernyő" diff --git a/WallpaperPicker/res/values-hy-rAM/strings.xml b/WallpaperPicker/res/values-hy-rAM/strings.xml index 8d011c3010..2cd7cf5ad8 100644 --- a/WallpaperPicker/res/values-hy-rAM/strings.xml +++ b/WallpaperPicker/res/values-hy-rAM/strings.xml @@ -33,10 +33,7 @@ "Իմ լուսանկարները" "Պաստառներ" "Եզրատել պաստառը" - - - - - - + "Հիմնական էկրան" + "Կողպել էկրանը" + "Հիմնական էկրան և կողպէկրան" diff --git a/WallpaperPicker/res/values-in/strings.xml b/WallpaperPicker/res/values-in/strings.xml index 990a235d82..6e588efcb7 100644 --- a/WallpaperPicker/res/values-in/strings.xml +++ b/WallpaperPicker/res/values-in/strings.xml @@ -33,10 +33,7 @@ "Foto saya" "Wallpaper" "Pangkas wallpaper" - - - - - - + "Layar utama" + "Layar kunci" + "Layar utama dan layar kunci" diff --git a/WallpaperPicker/res/values-is-rIS/strings.xml b/WallpaperPicker/res/values-is-rIS/strings.xml index 9c1db9fbd3..225bdecebc 100644 --- a/WallpaperPicker/res/values-is-rIS/strings.xml +++ b/WallpaperPicker/res/values-is-rIS/strings.xml @@ -33,10 +33,7 @@ "Myndirnar mínar" "Veggfóður" "Skera veggfóður" - - - - - - + "Heimaskjár" + "Lásskjár" + "Heimaskjár og lásskjár" diff --git a/WallpaperPicker/res/values-it/strings.xml b/WallpaperPicker/res/values-it/strings.xml index 91430dd9d5..2cbd8c4649 100644 --- a/WallpaperPicker/res/values-it/strings.xml +++ b/WallpaperPicker/res/values-it/strings.xml @@ -33,10 +33,7 @@ "Le mie foto" "Sfondi" "Ritaglia sfondo" - - - - - - + "Schermata Home" + "Schermata di blocco" + "Schermata Home e schermata di blocco" diff --git a/WallpaperPicker/res/values-iw/strings.xml b/WallpaperPicker/res/values-iw/strings.xml index 72ad4c24c8..bf1cd83679 100644 --- a/WallpaperPicker/res/values-iw/strings.xml +++ b/WallpaperPicker/res/values-iw/strings.xml @@ -35,10 +35,7 @@ "התמונות שלי" "טפטים" "חתוך את הטפט" - - - - - - + "מסך דף הבית" + "מסך הנעילה" + "מסך דף הבית ומסך הנעילה" diff --git a/WallpaperPicker/res/values-ja/strings.xml b/WallpaperPicker/res/values-ja/strings.xml index 39e82706b7..9855d02473 100644 --- a/WallpaperPicker/res/values-ja/strings.xml +++ b/WallpaperPicker/res/values-ja/strings.xml @@ -33,10 +33,7 @@ "マイフォト" "壁紙" "壁紙のトリミング" - - - - - - + "ホーム画面" + "ロック画面" + "ホーム画面とロック画面" diff --git a/WallpaperPicker/res/values-ka-rGE/strings.xml b/WallpaperPicker/res/values-ka-rGE/strings.xml index 1cc78cd60b..daeffd4a55 100644 --- a/WallpaperPicker/res/values-ka-rGE/strings.xml +++ b/WallpaperPicker/res/values-ka-rGE/strings.xml @@ -33,10 +33,7 @@ "ჩემი ფოტოები" "ფონები" "ფონის ჩამოჭრა" - - - - - - + "მთავარი ეკრანი" + "ჩაკეტილი ეკრანი" + "მთავარი ეკრანი და ჩაკეტილი ეკრანი" diff --git a/WallpaperPicker/res/values-kk-rKZ/strings.xml b/WallpaperPicker/res/values-kk-rKZ/strings.xml index c78a8d8eb6..68ab14588c 100644 --- a/WallpaperPicker/res/values-kk-rKZ/strings.xml +++ b/WallpaperPicker/res/values-kk-rKZ/strings.xml @@ -31,12 +31,9 @@ "%1$s таңдалған" "Жою" "Менің фотосуреттерім" - "Артқы фондар" + "Тұсқағаздар" "Артқы фонды кесу" - - - - - - + "Негізгі экран" + "Құлыпталған экран" + "Негізгі экран және құлыпталған экран" diff --git a/WallpaperPicker/res/values-km-rKH/strings.xml b/WallpaperPicker/res/values-km-rKH/strings.xml index 402f28e67c..29aef7a05d 100644 --- a/WallpaperPicker/res/values-km-rKH/strings.xml +++ b/WallpaperPicker/res/values-km-rKH/strings.xml @@ -30,13 +30,10 @@ "ផ្ទាំង​រូបភាព %1$d នៃ %2$d" "បាន​ជ្រើស %1$s" "លុប" - "រូបថតរបស់ខ្ញុំ" + "រូបថតខ្ញុំ" "ផ្ទាំង​រូបភាព" "ច្រឹប​ផ្ទាំង​រូបភាព" - - - - - - + "អេក្រង់ដើម" + "អេក្រង់ជាប់សោ" + "អេក្រង់ដើម និងអេក្រង់ជាប់សោ" diff --git a/WallpaperPicker/res/values-kn-rIN/strings.xml b/WallpaperPicker/res/values-kn-rIN/strings.xml index 1b467f40a8..d6e0c7fe0a 100644 --- a/WallpaperPicker/res/values-kn-rIN/strings.xml +++ b/WallpaperPicker/res/values-kn-rIN/strings.xml @@ -33,10 +33,7 @@ "ನನ್ನ ಫೋಟೋಗಳು" "ವಾಲ್‌ಪೇಪರ್‌ಗಳು" "ವಾಲ್‌ಪೇಪರ್‌ ಕತ್ತರಿಸಿ" - - - - - - + "ಮುಖಪುಟದ ಪರದೆ" + "ಲಾಕ್‌ ಪರದೆ" + "ಮುಖಪುಟದ ಪರದೆ ಮತ್ತು ಲಾಕ್ ಪರದೆ" diff --git a/WallpaperPicker/res/values-ky-rKG/strings.xml b/WallpaperPicker/res/values-ky-rKG/strings.xml index acf8b5ddc4..bc2ee69ef4 100644 --- a/WallpaperPicker/res/values-ky-rKG/strings.xml +++ b/WallpaperPicker/res/values-ky-rKG/strings.xml @@ -33,10 +33,7 @@ "Менин сүрөттөрүм" "Тушкагаздар" "Тушкагазды тегиздөө" - - - - - - + "Башкы экран" + "Кулпуланган экран" + "Башкы экран жана кулпуланган экран" diff --git a/WallpaperPicker/res/values-lt/strings.xml b/WallpaperPicker/res/values-lt/strings.xml index f9127d828a..00bea1cfcf 100644 --- a/WallpaperPicker/res/values-lt/strings.xml +++ b/WallpaperPicker/res/values-lt/strings.xml @@ -35,10 +35,7 @@ "Mano nuotraukos" "Ekrano fonai" "Apkirpti ekrano foną" - - - - - - + "Pagrindinis ekranas" + "Užrakinimo ekranas" + "Pagrindinis ekranas ir užrakinimo ekranas" diff --git a/WallpaperPicker/res/values-lv/strings.xml b/WallpaperPicker/res/values-lv/strings.xml index d8601dce95..c04a7fa4e3 100644 --- a/WallpaperPicker/res/values-lv/strings.xml +++ b/WallpaperPicker/res/values-lv/strings.xml @@ -34,10 +34,7 @@ "Mani fotoattēli" "Fona tapetes" "Apgriezt fona tapeti" - - - - - - + "Sākuma ekrāns" + "Bloķēšanas ekrāns" + "Sākuma ekrāns un bloķēšanas ekrāns" diff --git a/WallpaperPicker/res/values-mk-rMK/strings.xml b/WallpaperPicker/res/values-mk-rMK/strings.xml index c881595181..c8ed4e6ef6 100644 --- a/WallpaperPicker/res/values-mk-rMK/strings.xml +++ b/WallpaperPicker/res/values-mk-rMK/strings.xml @@ -19,7 +19,7 @@ - "Подеси тапет" + "Постави тапет" "Сликата не можеше да се вчита" "Сликата не можеше да се вчита како тапет" "Сликата не може да се постави како тапет" @@ -31,12 +31,9 @@ "Избран %1$s" "Избриши" "Моите фотографии" - "Тапети" + "Позадини" "Исечи тапет" - - - - - - + "Почетен екран" + "Заклучен екран" + "Почетен и заклучен екран" diff --git a/WallpaperPicker/res/values-ml-rIN/strings.xml b/WallpaperPicker/res/values-ml-rIN/strings.xml index 35eb6c0325..c8e33beed1 100644 --- a/WallpaperPicker/res/values-ml-rIN/strings.xml +++ b/WallpaperPicker/res/values-ml-rIN/strings.xml @@ -31,12 +31,9 @@ "%1$s തിരഞ്ഞെടുത്തു" "ഇല്ലാതാക്കുക" "എന്റെ ഫോട്ടോകൾ" - "വാൾപേപ്പറുകൾ" + "വാൾപേപ്പർ" "വാൾപേപ്പറിന്റെ വലുപ്പം മാറ്റൽ" - - - - - - + "ഹോം സ്‌ക്രീൻ" + "ലോക്ക് സ്‌ക്രീൻ" + "ഹോം സ്ക്രീനും ലോക്ക് സ്ക്രീനും" diff --git a/WallpaperPicker/res/values-mn-rMN/strings.xml b/WallpaperPicker/res/values-mn-rMN/strings.xml index ca55055d48..b9251d8995 100644 --- a/WallpaperPicker/res/values-mn-rMN/strings.xml +++ b/WallpaperPicker/res/values-mn-rMN/strings.xml @@ -33,10 +33,7 @@ "Миний зураг" "Ханын зураг" "Ханын зургийг тайрах" - - - - - - + "Үндсэн нүүр" + "Түгжих дэлгэц" + "Үндсэн нүүр болон түгжих дэлгэц" diff --git a/WallpaperPicker/res/values-mr-rIN/strings.xml b/WallpaperPicker/res/values-mr-rIN/strings.xml index 3d76d20b48..349b3c45ec 100644 --- a/WallpaperPicker/res/values-mr-rIN/strings.xml +++ b/WallpaperPicker/res/values-mr-rIN/strings.xml @@ -33,10 +33,7 @@ "माझे फोटो" "वॉलपेपर" "वॉलपेपर कापा" - - - - - - + "मुख्यपृष्ठ" + "लॉक स्‍क्रीन" + "मुख्यपृष्ठ आणि लॉक स्क्रीन" diff --git a/WallpaperPicker/res/values-ms-rMY/strings.xml b/WallpaperPicker/res/values-ms-rMY/strings.xml index a60ba06d3e..9931975236 100644 --- a/WallpaperPicker/res/values-ms-rMY/strings.xml +++ b/WallpaperPicker/res/values-ms-rMY/strings.xml @@ -33,10 +33,7 @@ "Foto saya" "Kertas dinding" "Pangkas kertas dinding" - - - - - - + "Skrin utama" + "Kunci skrin" + "Skrin utama dan kunci skrin" diff --git a/WallpaperPicker/res/values-my-rMM/strings.xml b/WallpaperPicker/res/values-my-rMM/strings.xml index 32d92fae77..8abf2d6a56 100644 --- a/WallpaperPicker/res/values-my-rMM/strings.xml +++ b/WallpaperPicker/res/values-my-rMM/strings.xml @@ -33,10 +33,7 @@ "ကျွန်ုပ်၏ ဓာတ်ပုံများ" "နောက်ခံများ" "နောက်ခံအား ဖြတ်ခြင်း" - - - - - - + "ပင်မစာမျက်နှာ" + "လော့ခ်စာမျက်နှာ" + "ပင်မစာမျက်နှာနှင့် လော့ခ်စာမျက်နှာ" diff --git a/WallpaperPicker/res/values-nb/strings.xml b/WallpaperPicker/res/values-nb/strings.xml index d9ce2466f5..23dbf87d15 100644 --- a/WallpaperPicker/res/values-nb/strings.xml +++ b/WallpaperPicker/res/values-nb/strings.xml @@ -33,10 +33,7 @@ "Mine bilder" "Bakgrunner" "Beskjær bakgrunnen" - - - - - - + "Startskjerm" + "Låseskjerm" + "Startskjerm og låseskjerm" diff --git a/WallpaperPicker/res/values-nl/strings.xml b/WallpaperPicker/res/values-nl/strings.xml index 7246b22d3a..0ebf8e0af1 100644 --- a/WallpaperPicker/res/values-nl/strings.xml +++ b/WallpaperPicker/res/values-nl/strings.xml @@ -31,12 +31,9 @@ "%1$s is geselecteerd" "Verwijderen" "Mijn foto\'s" - "Achtergronden" + "Achtergrond" "Achtergrond bijsnijden" - - - - - - + "Startscherm" + "Vergrendelingsscherm" + "Startscherm en vergrendelingsscherm" diff --git a/WallpaperPicker/res/values-pa-rIN/strings.xml b/WallpaperPicker/res/values-pa-rIN/strings.xml index 3532fcb3e9..99265eb30a 100644 --- a/WallpaperPicker/res/values-pa-rIN/strings.xml +++ b/WallpaperPicker/res/values-pa-rIN/strings.xml @@ -19,7 +19,7 @@ - "ਵਾਲਪੇਪਰ ਸੈਟ ਕਰੋ" + "ਵਾਲਪੇਪਰ ਸੈੱਟ ਕਰੋ" "ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ" "ਵਾਲਪੇਪਰ ਦੇ ਤੌਰ ਤੇ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ" "ਵਾਲਪੇਪਰ ਦੇ ਤੌਰ ਤੇ ਚਿੱਤਰ ਸੈਟ ਨਹੀਂ ਕਰ ਸਕਿਆ" @@ -33,10 +33,7 @@ "ਮੇਰੀਆਂ ਫੋਟੋਆਂ" "ਵਾਲਪੇਪਰ" "ਵਾਲਪੇਪਰ ਕੱਟੋ" - - - - - - + "ਮੁੱਖ ਸਕ੍ਰੀਨ" + "ਲੌਕ ਸਕ੍ਰੀਨ" + "ਮੁੱਖ ਸਕ੍ਰੀਨ ਅਤੇ ਲੌਕ ਸਕ੍ਰੀਨ" diff --git a/WallpaperPicker/res/values-pl/strings.xml b/WallpaperPicker/res/values-pl/strings.xml index 98153636ac..cf2f160fd5 100644 --- a/WallpaperPicker/res/values-pl/strings.xml +++ b/WallpaperPicker/res/values-pl/strings.xml @@ -35,10 +35,7 @@ "Moje zdjęcia" "Tapety" "Przytnij tapetę" - - - - - - + "Ekran główny" + "Ekran blokady" + "Ekran główny i ekran blokady" diff --git a/WallpaperPicker/res/values-pt-rPT/strings.xml b/WallpaperPicker/res/values-pt-rPT/strings.xml index f64815e4e0..4e672422a1 100644 --- a/WallpaperPicker/res/values-pt-rPT/strings.xml +++ b/WallpaperPicker/res/values-pt-rPT/strings.xml @@ -19,7 +19,7 @@ - "Definir imagem fundo" + "Definir imagem de fundo" "Não foi possível carregar a imagem" "Não foi possível carregar a imagem como imagem de fundo" "Não foi possível definir a imagem como imagem de fundo" @@ -33,10 +33,7 @@ "As minhas fotos" "Imagens de fundo" "Recortar imagem de fundo" - - - - - - + "Ecrã principal" + "Ecrã de bloqueio" + "Ecrã principal e ecrã de bloqueio" diff --git a/WallpaperPicker/res/values-pt/strings.xml b/WallpaperPicker/res/values-pt/strings.xml index be573ae62c..ec327d1f6a 100644 --- a/WallpaperPicker/res/values-pt/strings.xml +++ b/WallpaperPicker/res/values-pt/strings.xml @@ -33,10 +33,7 @@ "Minhas fotos" "Planos de fundo" "Cortar plano de fundo" - - - - - - + "Tela inicial" + "Tela de bloqueio" + "Tela inicial e tela de bloqueio" diff --git a/WallpaperPicker/res/values-ro/strings.xml b/WallpaperPicker/res/values-ro/strings.xml index 7594bf75d6..14c9e538a8 100644 --- a/WallpaperPicker/res/values-ro/strings.xml +++ b/WallpaperPicker/res/values-ro/strings.xml @@ -34,10 +34,7 @@ "Fotografiile mele" "Imagini de fundal" "Decupați imaginea de fundal" - - - - - - + "Ecranul de pornire" + "Ecranul de blocare" + "Ecranul de pornire și ecranul de blocare" diff --git a/WallpaperPicker/res/values-ru/strings.xml b/WallpaperPicker/res/values-ru/strings.xml index e8e9972ee1..eee4e755a7 100644 --- a/WallpaperPicker/res/values-ru/strings.xml +++ b/WallpaperPicker/res/values-ru/strings.xml @@ -35,10 +35,7 @@ "Мои фото" "Обои" "Кадрировать обои" - - - - - - + "Главный экран" + "Экран блокировки" + "Главный экран и экран блокировки" diff --git a/WallpaperPicker/res/values-sk/strings.xml b/WallpaperPicker/res/values-sk/strings.xml index 69aa6f9219..2614a7c696 100644 --- a/WallpaperPicker/res/values-sk/strings.xml +++ b/WallpaperPicker/res/values-sk/strings.xml @@ -35,10 +35,7 @@ "Moje fotky" "Tapety" "Orezanie tapety" - - - - - - + "Plocha" + "Uzamknutá obrazovka" + "Plocha a uzamknutá obrazovka" diff --git a/WallpaperPicker/res/values-sq-rAL/strings.xml b/WallpaperPicker/res/values-sq-rAL/strings.xml index c3cac5b1ab..5758caea73 100644 --- a/WallpaperPicker/res/values-sq-rAL/strings.xml +++ b/WallpaperPicker/res/values-sq-rAL/strings.xml @@ -33,10 +33,7 @@ "Fotografitë e mia" "Imazhet e sfondit" "Prit imazhin e sfondit" - - - - - - + "Ekrani bazë" + "Ekrani i kyçjes" + "Ekrani bazë dhe ekrani i kyçjes" diff --git a/WallpaperPicker/res/values-sr/strings.xml b/WallpaperPicker/res/values-sr/strings.xml index 28dfd920e4..33330f85c3 100644 --- a/WallpaperPicker/res/values-sr/strings.xml +++ b/WallpaperPicker/res/values-sr/strings.xml @@ -31,13 +31,10 @@ "Позадина %1$d од %2$d" "Изабрана је %1$s" "Избриши" - "Моје фотографије" + "Моје слике" "Позадине" "Опсеци позадину" - - - - - - + "Почетни екран" + "Закључани екран" + "Почетни екран и закључани екран" diff --git a/WallpaperPicker/res/values-sv/strings.xml b/WallpaperPicker/res/values-sv/strings.xml index 32c0a5a56a..a6e1b1702d 100644 --- a/WallpaperPicker/res/values-sv/strings.xml +++ b/WallpaperPicker/res/values-sv/strings.xml @@ -33,10 +33,7 @@ "Mina foton" "Bakgrunder" "Beskär bakgrund" - - - - - - + "Startskärm" + "Låsskärm" + "Startskärm och låsskärm" diff --git a/WallpaperPicker/res/values-sw/strings.xml b/WallpaperPicker/res/values-sw/strings.xml index 32943215f4..78e4dbe6ef 100644 --- a/WallpaperPicker/res/values-sw/strings.xml +++ b/WallpaperPicker/res/values-sw/strings.xml @@ -33,10 +33,7 @@ "Picha zangu" "Mandhari" "Punguza mandhari" - - - - - - + "Skrini ya kwanza" + "Skrini iliyofungwa" + "Skrini ya kwanza na skrini iliyofungwa" diff --git a/WallpaperPicker/res/values-ta-rIN/strings.xml b/WallpaperPicker/res/values-ta-rIN/strings.xml index 5528072bbf..668e155c4f 100644 --- a/WallpaperPicker/res/values-ta-rIN/strings.xml +++ b/WallpaperPicker/res/values-ta-rIN/strings.xml @@ -33,10 +33,7 @@ "எனது படங்கள்" "வால்பேப்பர்கள்" "வால்பேப்பரைச் செதுக்கு" - - - - - - + "முகப்புத் திரை" + "பூட்டுத் திரை" + "முகப்புத் திரை மற்றும் பூட்டுத் திரை" diff --git a/WallpaperPicker/res/values-te-rIN/strings.xml b/WallpaperPicker/res/values-te-rIN/strings.xml index 0c9e9ebdb4..795a86cf0f 100644 --- a/WallpaperPicker/res/values-te-rIN/strings.xml +++ b/WallpaperPicker/res/values-te-rIN/strings.xml @@ -33,10 +33,7 @@ "నా ఫోటోలు" "వాల్‌పేపర్‌లు" "వాల్‌పేపర్‌ను కత్తిరించండి" - - - - - - + "హోమ్ స్క్రీన్" + "లాక్ స్క్రీన్" + "హోమ్ స్క్రీన్ మరియు లాక్ స్క్రీన్" diff --git a/WallpaperPicker/res/values-th/strings.xml b/WallpaperPicker/res/values-th/strings.xml index 48aee2a804..a27adcfb60 100644 --- a/WallpaperPicker/res/values-th/strings.xml +++ b/WallpaperPicker/res/values-th/strings.xml @@ -33,10 +33,7 @@ "รูปภาพของฉัน" "วอลเปเปอร์" "ครอบตัดวอลเปเปอร์" - - - - - - + "หน้าจอหลัก" + "หน้าจอล็อก" + "หน้าจอหลักและหน้าจอล็อก" diff --git a/WallpaperPicker/res/values-tl/strings.xml b/WallpaperPicker/res/values-tl/strings.xml index 14bf572363..132141a72d 100644 --- a/WallpaperPicker/res/values-tl/strings.xml +++ b/WallpaperPicker/res/values-tl/strings.xml @@ -29,14 +29,11 @@ "Wallpaper %1$d ng %2$d" "Napili ang %1$s" - "Tanggalin" + "I-delete" "Aking mga larawan" "Mga Wallpaper" "I-crop ang wallpaper" - - - - - - + "Home screen" + "Lock screen" + "Home screen at lock screen" diff --git a/WallpaperPicker/res/values-tr/strings.xml b/WallpaperPicker/res/values-tr/strings.xml index 82c6ef84b6..dc7aaeb6ba 100644 --- a/WallpaperPicker/res/values-tr/strings.xml +++ b/WallpaperPicker/res/values-tr/strings.xml @@ -33,10 +33,7 @@ "Fotoğraflarım" "Duvar kağıtları" "Duvar kağıdını kırp" - - - - - - + "Ana ekran" + "Kilit ekranı" + "Ana ekran ve kilit ekranı" diff --git a/WallpaperPicker/res/values-uk/strings.xml b/WallpaperPicker/res/values-uk/strings.xml index b59409a3a9..7470876c0a 100644 --- a/WallpaperPicker/res/values-uk/strings.xml +++ b/WallpaperPicker/res/values-uk/strings.xml @@ -35,10 +35,7 @@ "Мої фото" "Фонові малюнки" "Обрізати фоновий малюнок" - - - - - - + "Головний екран" + "Заблокований екран" + "Головний екран і заблокований екран" diff --git a/WallpaperPicker/res/values-ur-rPK/strings.xml b/WallpaperPicker/res/values-ur-rPK/strings.xml index 616b36f734..755d67ecaf 100644 --- a/WallpaperPicker/res/values-ur-rPK/strings.xml +++ b/WallpaperPicker/res/values-ur-rPK/strings.xml @@ -33,10 +33,7 @@ "میری تصاویر" "وال پیپرز" "وال پیپر کو تراشیں" - - - - - - + "ہوم اسکرین" + "مقفل اسکرین" + "ہوم اسکرین اور مقفل اسکرین" diff --git a/WallpaperPicker/res/values-uz-rUZ/strings.xml b/WallpaperPicker/res/values-uz-rUZ/strings.xml index 45c9e98ca6..452c09399e 100644 --- a/WallpaperPicker/res/values-uz-rUZ/strings.xml +++ b/WallpaperPicker/res/values-uz-rUZ/strings.xml @@ -33,10 +33,7 @@ "Mening rasmlarim" "Fon rasmlari" "Fon rasmini kesish" - - - - - - + "Bosh ekran" + "Qulf ekrani" + "Bosh va qulf ekrani" diff --git a/WallpaperPicker/res/values-vi/strings.xml b/WallpaperPicker/res/values-vi/strings.xml index 5aafc060c1..1cd2c68e9a 100644 --- a/WallpaperPicker/res/values-vi/strings.xml +++ b/WallpaperPicker/res/values-vi/strings.xml @@ -33,10 +33,7 @@ "Ảnh của tôi" "Hình nền" "Cắt hình nền" - - - - - - + "Màn hình chính" + "Màn hình khóa" + "Màn hình chính và màn hình khóa" diff --git a/WallpaperPicker/res/values-zh-rCN/strings.xml b/WallpaperPicker/res/values-zh-rCN/strings.xml index 9b9b509cb9..e216680e3a 100644 --- a/WallpaperPicker/res/values-zh-rCN/strings.xml +++ b/WallpaperPicker/res/values-zh-rCN/strings.xml @@ -33,10 +33,7 @@ "我的照片" "壁纸" "剪裁壁纸" - - - - - - + "主屏幕" + "锁定屏幕" + "主屏幕和锁定屏幕" diff --git a/WallpaperPicker/res/values-zh-rTW/strings.xml b/WallpaperPicker/res/values-zh-rTW/strings.xml index b22c6917d5..310c73cdf8 100644 --- a/WallpaperPicker/res/values-zh-rTW/strings.xml +++ b/WallpaperPicker/res/values-zh-rTW/strings.xml @@ -33,10 +33,7 @@ "我的相片" "桌布" "裁剪桌布" - - - - - - + "主畫面" + "螢幕鎖定" + "主畫面和螢幕鎖定" diff --git a/WallpaperPicker/res/values-zu/strings.xml b/WallpaperPicker/res/values-zu/strings.xml index 0069293646..21da3a9d9b 100644 --- a/WallpaperPicker/res/values-zu/strings.xml +++ b/WallpaperPicker/res/values-zu/strings.xml @@ -33,10 +33,7 @@ "Izithombe zami" "Izithombe zangemuva" "Nqampuna isithombe sangemuva" - - - - - - + "Isikrini sasekhaya" + "Khiya isikrini" + "Isikrini sasekhaya nokukhiya isikrini" diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 476f2ab132..63bc1a8c6d 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -37,8 +37,8 @@ "Favoritlər-də yer yoxdur" "Tətbiqlər" "Əsas səhifə" - "Kənarlaşdır" - "Sistemdən sil" + "Silin" + "Sistemdən silin" "Tətbiq məlumatı" "qısayolları quraşdır" "Tətbiqə istifadəçi müdaxiləsi olmadan qısayolları əlavə etməyə icazə verir." diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml index 47fbf8c067..5f698bc2d9 100644 --- a/res/values-be-rBY/strings.xml +++ b/res/values-be-rBY/strings.xml @@ -37,8 +37,8 @@ "У латку \"Абранае\" больш няма месца" "Праграмы" "Галоўная" - "Выдаліць" - "Выдаліць" + "Прыбраць" + "Дэінсталяваць" "Звесткі пра праграму" "усталёўваць ярлыкі" "Дазваляе праграмам дадаваць ярлыкі без умяшання карыстальніка." @@ -60,7 +60,7 @@ "СКАПІРАВАЦЬ ЗНАЧКІ" "ПАЧАЦЬ НАНАВА" "Шпалеры, віджэты і налады" - "Дакраніцеся да любога месца ў фоне экрана і ўтрым. яго, каб дапасаваць" + "Каб дапасаваць іх, дакраніцеся і ўтрымлівайце ў любым месцы фону" "ЗРАЗУМЕЛА" "Папка адкрыта, %1$d на %2$d" "Дакраніцеся, каб закрыць папку" diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 8a7f517222..8d7ae92d6d 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -60,7 +60,7 @@ "আইকনগুলি কপি করুন" "নতুন করে শুরু করুন" "ওয়ালপেপার, উইজেট এবং সেটিংস" - "কাস্টমাইজ করার জন্য পটভূমি স্পর্শ করে ধরে থাকুন" + "নিজের পছন্দমত সাজানোর জন্য পটভূমি স্পর্শ করে ধরে থাকুন" "বুঝেছি" "ফোল্ডার খোলা হয়েছে, %1$d বাই %2$d" "ফোল্ডার বন্ধ করতে স্পর্শ করুন" diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml index f25548a44e..bbffe98aa8 100644 --- a/res/values-bs-rBA/strings.xml +++ b/res/values-bs-rBA/strings.xml @@ -38,7 +38,7 @@ "Aplikacije" "Tipka za početak" "Ukloni" - "Ukloni" + "Deinstaliraj" "Informacije o aplikaciji" "instaliraj prečice" "Dopušta aplikaciji dodavanje prečica bez posredovanja korisnika." @@ -59,8 +59,8 @@ "Uvoz ikone i foldera sa starih početnih ekrana?" "KOPIRAJ IKONE" "POČNITE ISPOČETKA" - "Pozadine, vidžeti, & amp; podešavanja" - "Dodirnite & i držite pozadinu za prilagođavanje" + "Pozadine, vidžeti i podešavanja" + "Dodirnite i držite pozadinu za prilagođavanje" "JASNO MI JE" "Fascikla je otvorena, (š) %1$d (v) %2$d" "Dodirnite da biste zatvorili fasciklu" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index dff24f8d3c..d496905c06 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -59,7 +59,7 @@ "Import icons and folders from your old Home screens?" "COPY ICONS" "START AFRESH" - "Wallpapers, widgets, & settings" + "Wallpapers, widgets & settings" "Touch & hold background to customise" "GOT IT" "Folder opened, %1$d by %2$d" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index dff24f8d3c..d496905c06 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -59,7 +59,7 @@ "Import icons and folders from your old Home screens?" "COPY ICONS" "START AFRESH" - "Wallpapers, widgets, & settings" + "Wallpapers, widgets & settings" "Touch & hold background to customise" "GOT IT" "Folder opened, %1$d by %2$d" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index dff24f8d3c..d496905c06 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -59,7 +59,7 @@ "Import icons and folders from your old Home screens?" "COPY ICONS" "START AFRESH" - "Wallpapers, widgets, & settings" + "Wallpapers, widgets & settings" "Touch & hold background to customise" "GOT IT" "Folder opened, %1$d by %2$d" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 5256dda1f1..fdc02a4b0d 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -37,7 +37,7 @@ "La bandeja de favoritos está completa" "Aplicaciones" "Inicio" - "Eliminar" + "Quitar" "Desinstalar" "Información de la aplicación" "instalar accesos directos" @@ -74,10 +74,10 @@ "Inhabilitada por el administrador" "Permitir rotación" "Desconocido" - "Eliminar" + "Quitar" "Buscar" "Esta aplicación no está instalada" - "La aplicación de este icono no está instalada. Puedes eliminar el icono o buscar la aplicación e instalarla manualmente." + "La aplicación de este icono no está instalada. Puedes quitar el icono o buscar la aplicación e instalarla manualmente." "Descargando %1$s (%2$s completado)" "Esperando para instalar %1$s" "Añadir a la pantalla de inicio" diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index 8201dd8f98..d934968f54 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -26,7 +26,7 @@ "Ez dago erabilgarri aplikazioa" "Deskargatutako aplikazioa modu seguruan desgaitu da" "Widgetak desgaitu egin dira modu seguruan" - "Eduki ukituta widgeta aukeratzeko." + "Eduki sakatuta widgeta aukeratzeko." "Sakatu birritan eta eduki sakatuta widgeta aukeratzeko edo ekintza pertsonalizatuak erabiltzeko." "%1$d × %2$d" "Bilatu aplikazioetan…" @@ -60,7 +60,7 @@ "KOPIATU IKONOAK" "HASI HUTSETIK" "Horma-paperak, widgetak eta ezarpenak" - "Pertsonalizatzeko, eduki ukituta atzeko planoa" + "Pertsonalizatzeko, eduki sakatuta atzeko planoa" "ADOS" "Karpeta ireki da: %1$d x %2$d" "Karpeta ixteko, uki ezazu" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 73413dc3ee..3a2f6fbc59 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -37,7 +37,7 @@ "فضای بیشتری در سینی موارد دلخواه وجود ندارد" "برنامه‌ها" "صفحه اصلی" - "حذف" + "برداشتن" "حذف نصب" "اطلاعات برنامه" "نصب میان‌برها" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 52a47c791c..f086c662c1 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -60,7 +60,7 @@ "KOPIOI KUVAKKEET" "ALOITA ALUSTA" "Taustakuvat, widgetit ja asetukset" - "Muokkaa taustaa koskettamalla ja painamalla pitkään" + "Muokkaa taustaa koskettamalla ja painamalla pitkään." "SELVÄ" "Kansio avattu, koko %1$d x %2$d" "Sulje kansio koskettamalla" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 3718486374..b8244d71cd 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -60,7 +60,7 @@ "COPIER LES ICÔNES" "DISPOSITION PAR DÉFAUT" "Fonds d\'écran, widgets et paramètres" - "Maintenez un doigt sur le fond d\'écran pour le personnaliser" + "Maintenez le doigt sur le fond d\'écran pour le personnaliser" "J\'ai compris" "Dossier ouvert, %1$d par %2$d" "Toucher pour fermer le dossier" diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index 91e1ac3481..ad17816fd7 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -29,7 +29,7 @@ "Mantén premido un widget para seleccionalo." "Toca dúas veces e mantén premido para seleccionar un widget ou utiliza accións personalizadas." "%1$d × %2$d" - "Aplicacións de busca..." + "Buscar aplicacións..." "Cargando aplicacións..." "Non se atoparon aplicacións que coincidan con \"%1$s\"" "Ir a %1$s" @@ -37,7 +37,7 @@ "Non hai máis espazo na bandexa de favoritos" "Aplicacións" "Inicio" - "Eliminar" + "Quitar" "Desinstalar" "Información da aplicación" "instalar atallos" @@ -59,8 +59,8 @@ "Queres importar as iconas e os cartafoles doutras pantallas de inicio?" "COPIAR ICONAS" "COMEZAR DE CERO" - "Fondos pantalla, widgets e configuración" - "Mantén tocado o segundo plano para personalizar" + "Fondos de pantalla, widgets e configuración" + "Mantén premido o fondo para personalizalo" "DE ACORDO" "Abriuse o cartafol, %1$d por %2$d" "Toca para pechar o cartafol" diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 3ce8676f79..792481cd44 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -30,12 +30,12 @@ "વિજેટ ચૂંટવા અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરવા માટે બે વાર ટેપ કરો અને પકડી રાખો." "%1$d × %2$d" "ઍપ્લિકેશનોમાં શોધો…" - "એપ્લિકેશનો લોડ કરી રહ્યું છે…" - "\"%1$s\" થી મેળ ખાતી કોઈ એપ્લિકેશનો મળી નથી" + "ઍપ્લિકેશનો લોડ કરી રહ્યું છે…" + "\"%1$s\" થી મેળ ખાતી કોઈ ઍપ્લિકેશનો મળી નથી" "%1$s પર જાઓ" "આ હોમ સ્ક્રીન પર વધુ જગ્યા નથી." "મનપસંદ ટ્રે પર વધુ જગ્યા નથી" - "એપ્લિકેશનો" + "ઍપ્લિકેશનો" "હોમ" "દૂર કરો" "અનઇન્સ્ટોલ કરો" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 400a426283..cb518b567d 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -37,8 +37,8 @@ "Nincs több hely a Kedvencek tálcán" "Alkalmazások" "Főoldal" - "Eltávolítás" - "Törlés" + "Törlés" + "Eltávolítás" "Alkalmazásinformáció" "parancsikonok telepítése" "Lehetővé teszi egy alkalmazás számára, hogy felhasználói beavatkozás nélkül adjon hozzá parancsikonokat." diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 8d0dc2d1c0..396ba6604e 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -37,7 +37,7 @@ "אין עוד מקום במגש המועדפים" "אפליקציות" "דף הבית" - "הסר" + "מחק" "הסר התקנה" "פרטי אפליקציה" "התקן קיצורי דרך" @@ -60,7 +60,7 @@ "העתק סמלים" "התחל דף חדש" "טפטים, ווידג\'טים והגדרות" - "גע והחזק ברקע לביצוע התאמה אישית" + "גע והחזק ברקע כדי לבצע התאמה אישית" "הבנתי" "תיקיה פתוחה, %1$d על %2$d" "גע כדי לסגור את התיקיה" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index ea7ee7442a..09f274f47a 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -37,7 +37,7 @@ "რჩეულების თაროზე ადგილი არ არის" "აპები" "მთავარი" - "წაშლა" + "მოშორება" "დეინსტალაცია" "აპის შესახებ" "მალსახმობების დაყენება" @@ -59,7 +59,7 @@ "გსურთ, ძველი მთავარი ეკრანიდან ხატულების და საქაღ. იმპორტი?" "ხატულების კოპირება" "სტანდარტული განლაგება" - "ფონები, ვიჯეტები, & პარამეტრები" + "ფონები, ვიჯეტები & პარამეტრები" "მოსარგებად შეეხეთ & დააყოვნეთ ფონზე" "გასაგებია" "საქაღალდე გახსნილია, %1$d x %2$d" diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index 5b3196697e..96b1af1630 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -38,7 +38,7 @@ "Қолданбалар" "Негізгі" "Алып тастау" - "Алмау" + "Жою" "Қолданба ақпары" "төте пернелерді орнату" "Қолданбаға пайдаланушының қатысуынсыз төте пернелерді қосу мүмкіндігін береді." @@ -69,7 +69,7 @@ "Қалта атауы %1$s болып өзгертілді" "Қалта: %1$s" "Виджеттер" - "Артқы фондар" + "Тұсқағаздар" "Параметрлер" "Әкімші өшірді" "Айналуға рұқсат ету" diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index f49135b6c7..dbc90a5d14 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -60,7 +60,7 @@ "រូប​តំណាង​ច្បាប់​ចម្លង" "ចាប់ផ្ដើម​ធ្វើ​ឲ្យ​ស្រស់" "ផ្ទាំងរូបភាព,ធាតុក្រាហ្វិក & ការកំណត់" - "ប៉ះ & សង្កត់​ផ្ទៃ​ខាង​ក្រោយ​ដើម្បី​ប្ដូរ​តាម​​តម្រូវ​ការ" + "ប៉ះ & សង្កត់​ផ្ទៃ​ខាង​ក្រោយ​ឲ្យជាប់ ដើម្បី​ប្ដូរ​តាមបំណង" "យល់​ហើយ" "បាន​បើក​ថត %1$d ដោយ %2$d" "ប៉ះ ដើម្បី​បិទ​ថត" diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml index 5d4c8a35b1..6705a40d0a 100644 --- a/res/values-ky-rKG/strings.xml +++ b/res/values-ky-rKG/strings.xml @@ -38,7 +38,7 @@ "Колдонмолор" "Үйгө" "Алып салуу" - "Чечип салуу" + "Орнотуудан чыгаруу" "Колдонмо тууралуу" "тез чакырмаларды орнотуу" "Колдонмого колдонуучуга кайрылбастан тез чакырма кошууга уруксат берет." @@ -59,8 +59,8 @@ "Эски үй экрандарыңыздан сүрөтчөлөр жана фолдерлер импорттолсунбу?" "СҮРӨТЧӨЛӨРДҮ КӨЧҮРҮҮ" "ТАЗАСЫН БАШТОО" - "Тушкагаздар, виджеттер & жөндөөлөр" - "Өзгөчөлөштүрүү үчүн фонго тийип & коё бербей туруңуз" + "Тушкагаздар, виджеттер жана жөндөөлөр" + "Өзгөчөлөштүрүү үчүн фонго тийип коё бербей басып туруңуз" "ТҮШҮНДҮМ" "Фолдер ачылды, туурасы %1$d, бийиктиги %2$d" "Фолдерди жабыш үчүн тийиңиз" diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index 820f268a72..6b33c5a6ec 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -37,8 +37,8 @@ "ບໍ່ມີບ່ອນຫວ່າງໃນຖາດສຳລັບເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ" "ແອັບຯ" "ໜ້າຫຼັກ" - "ລຶບ" - "ຖອນ​ການ​ຕິດ​ຕັ້ງ" + "ລຶບອອກ" + "ຖອນການຕິດຕັ້ງ" "ຂໍ້ມູນແອັບຯ" "ຕິດຕັ້ງທາງລັດ" "ອະນຸຍາດໃຫ້ແອັບຯ ເພີ່ມທາງລັດໂດຍບໍ່ຕ້ອງຮັບການຢືນຢັນຈາກຜູ່ໃຊ້." diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index a1bf843282..bbcf41547f 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -42,9 +42,9 @@ "Информации за апликацијата" "инсталирај кратенки" "Овозможува апликацијата да додава кратенки без интервенција на корисникот." - "прочитај подесувања и кратенки на почетна страница" + "чита поставки и кратенки на почетна страница" "Овозможува апликацијата да ги менува подесувањата и кратенките на почетната страница." - "напиши подесувања и кратенки на почетна страница" + "пишува поставки и кратенки на почетна страница" "Овозможува апликацијата да ги менува подесувањата и кратенките на почетната страница." "%1$s нема дозвола за телефонски повици" "Проблем при вчитувањето на виџетот" @@ -54,12 +54,12 @@ "Страница %1$d од %2$d" "Екран на почетна страница %1$d од %2$d" "Нова страница на почетен екран" - "Добредојдовте" + "Добре дојдовте" "Копирај икони за апликација" "Зачувај икони и папки од твоите стари почетни страни?" "КОПИРАЈ ИКОНИ" "СТАРТУВАЈ ОД ПОЧЕТОК" - "Тапети, додатоци и поставки" + "Позадини, додатоци и поставки" "Допрете и задржете на заднината за да приспособите" "СФАТИВ" "Отворена е папка, %1$d на %2$d" @@ -68,8 +68,8 @@ "Папката е затворена" "Папката е преименувана во %1$s" "Папка: %1$s" - "Виџети" - "Тапети" + "Додатоци" + "Позадини" "Поставки" "Оневозможено од администраторот" "Дозволи ротација" diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index cc6c7d7b1a..f629920813 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -38,7 +38,7 @@ "അപ്ലിക്കേഷനുകൾ" "ഹോം" "നീക്കംചെയ്യുക" - "അണ്‍ഇസ്റ്റാളുചെയ്യുക" + "അണ്‍ഇൻസ്റ്റാൾ" "ആപ്പ് വിവരം" "കുറുക്കുവഴികൾ ഇൻസ്റ്റാളുചെയ്യുക" "ഉപയോക്തൃ ഇടപെടൽ ഇല്ലാതെ കുറുക്കുവഴികൾ ചേർക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു." diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index 0622600e56..6e04b1c9ad 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -37,7 +37,7 @@ "\"Дуртай\" трей дээр өөр зай байхгүй байна" "Апп" "Нүүр" - "Устгах" + "Хасах" "Устгах" "Апп мэдээлэл" "товчлол суулгах" diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index fade6b8f0a..75f7bf64ea 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -24,7 +24,7 @@ "အလုပ်" "အပ်ပလီကေးရှင်း မထည့်သွင်းထားပါ" "App လက်လှမ်း မမှီပါ" - "ဒေါင်းလုဒ် appကို လုံခြုံရေး မုဒ်ထဲမှာ ပိတ်ထား" + "ဒေါင်းလုဒ် အက်ပ်ကို လုံခြုံရေး မုဒ်ထဲမှာ ပိတ်ထား" "လုံခြုံရေး မုဒ်ထဲမှာ ဝီဂျက်များကို ပိတ်ထား" "ဝဒ်ဂျက်တစ်ခုကို ကောက်ယူရန် ဖိနှိပ်ထားပါ" "ဝစ်ဂျက်တစ်ခုကိုရယူရန် သို့မဟုတ် စိတ်ကြိုက်လုပ်ဆောင်မှုများကို အသုံးပြုရန် နှစ်ချက်တို့ပြီး ကိုင်ထားပါ။" @@ -35,10 +35,10 @@ "%1$sကို သွားပါ" "ဤပင်မမျက်နှာစာတွင် နေရာလွတ် မကျန်တော့ပါ" "အနှစ်သက်ဆုံးများ ထားရာတွင် နေရာလွတ် မကျန်တော့ပါ" - "အပ်ပလီကေးရှင်းများ" + "အက်ပ်များ" "ပင်မစာမျက်နှာ" - "ဖယ်ရှာခြင်း" - "ဖယ်ရှားခြင်း" + "ဖယ်ရှားပါ" + "ပြန်ထုတ်ပါ" "အပ်ပလီကေးရှင်း အချက်အလက်များ" "အတိုကောက်မှတ်သားမှုများအား ထည့်သွင်းခြင်း" "အသုံးပြုသူ လုပ်ဆောင်မှုမရှိပဲ အပ်ပလီကေးရှင်းကို အတိုကောက်မှတ်သားမှုများ ပြုလုပ်ခွင့် ပေးခြင်း" @@ -59,25 +59,25 @@ "ပင်မစာမျက်နှာအဟောင်းမှ ပုံညွှန်းများ နှင့် အကန့်များကို ယူလာပါမလား" "COPY ICONS" "START FRESH" - "နောက်ခံများ၊ ဝီဂျက်များ& ဆက်တင်များ" + "နောက်ခံများ၊ ဝိဂျက်များ& ဆက်တင်များ" "နောက်ခံကို စိတ်တိုင်းကျ ပြုလုပ်ရန် ထိလျက် & ကိုင်ထားပါ" - "ရပြီ" + "ရပါပြီ" "ဖွင့်ထားသောအကန့်, %1$d နှင့် %2$d" "အကန့်ကို ပိတ်ရန် ဖိကိုင်ပါ" "အမည်ပြောင်းခြင်း အတည်ပြုရန် ဖိကိုင်ပါ" "ပိတ်ထားသောအကန့်" "ပြောင်းလဲလိုက်သော အကန့်အမည် %1$s" "အကန့်အမည်: %1$s" - "ဝဒ်ဂျက်များ" + "ဝိဂျက်များ" "နောက်ခံများ" - "အပြင်အဆင်များ" + "ဆက်တင်များ" "သင့်စီမံခန့်ခွဲသူက ပိတ်လိုက်ပါသည်" - "လှည့်ရန် ခွင့်ပြုမည်" + "လှည့်နိုင်သည်" "မသိရ" "ဖယ်ရှားရန်" "ရှာဖွေရန်" "App မတပ်ဆင်ရသေးပါ" - "ဤအိုင်ကွန်အတွက် app အားမထည့်သွင်းထားပါ။ You can remove it, or search for the app and install it manually." + "ဤအိုင်ကွန်အတွက် အက်ပ် အားမထည့်သွင်းထားပါ။ You can remove it, or search for the အက်ပ် and install it manually." "%1$s ဒေါင်းလုဒ်လုပ်နေသည်၊ %2$s ပြီးပါပြီ" "%1$s ကိုထည့်သွင်းရန်စောင့်နေသည်" "ပင်မမျက်နှာစာသို့ ထည့်ပါ" diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index f4f46d804e..ad2da28633 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -38,7 +38,7 @@ "अनुप्रयोगहरू" "गृह" "हटाउनुहोस्" - "स्थापना हटाउनुहोस्" + "स्थापित अनुप्रयोग हटाउनुहोस्" "अनुप्रयोग जानकारी" "सर्टकट स्थापना गर्नेहोस्" "प्रयोगकर्ताको हस्तक्षेप बिना एउटा अनुप्रयोगलाई सर्टकटमा थप्नको लागि अनुमति दिनुहोस्।" @@ -54,14 +54,14 @@ "पृष्ठ %2$d को %1$d" "गृह स्क्रिन %1$d को %2$d" "नयाँ गृह स्क्रिन पृष्ठ" - "स्वागतम" + "स्वागतम्" "तपाईँको अनुप्रयोग आईकनको प्रतिलिप गर्नुहोस्" "आफ्नो पुरानो गृह स्क्रीनबाट अाईकन र फोल्डरहरू आयात गर्नुहोस्?" "ICONS प्रतिलिप गर्नुहोस्" "START FRESH" - "वालपेपरहरू, विजेट; सेटिङहरू" - "छुनुहोस् ; अनुकूलन पृष्ठभूमि होल्ड गर्नुहोस्" - "बुझियो" + "वालपेपर, विजेट तथा सेटिङहरू" + "अनुकूलन गर्न पृष्ठभूमिलाई छुनुहोस् र होल्ड गर्नुहोस्" + "बुँझें" "फोल्डर खुल्यो %1$d बाट %2$d" "फोल्डर बन्द गर्नको लागि टच गर्नुहोस्" "पुन: नामाकरण बचत गर्न टच गर्नुहोस्।" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 58ab411234..1c59e5aeba 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -69,7 +69,7 @@ "De naam van de map is gewijzigd in %1$s" "Map: %1$s" "Widgets" - "Achtergronden" + "Achtergrond" "Instellingen" "Uitgeschakeld door je beheerder" "Draaien toestaan" diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml index ac976d4e26..f72afce055 100644 --- a/res/values-pa-rIN/strings.xml +++ b/res/values-pa-rIN/strings.xml @@ -25,13 +25,13 @@ "ਐਪ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਹੋਇਆ ਹੈ।" "ਐਪ ਉਪਲਬਧ ਨਹੀਂ ਹੈ" "ਡਾਊਨਲੋਡ ਕੀਤਾ ਐਪ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ" - "ਵਿਜੇਟਸ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ" + "ਵਿਜਿਟ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ" "ਇੱਕ ਵਿਜੇਟ ਚੁਣਨ ਲਈ ਛੋਹਵੋT & ਹੋਲਡ ਕਰੋ।" "ਡਬਲ-ਟੈਪ & ਇੱਕ ਵਿਜੇਟ ਚੁਣਨ ਲਈ ਹੋਲਡ ਕਰੋ ਅਤੇ ਕਸਟਮ ਕਿਰਿਆਵਾਂ ਵਰਤੋ।" "%1$d × %2$d" "ਐਪਾਂ ਖੋਜੋ…" - "ਐਪਸ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ..." - "\"%1$s\" ਨਾਲ ਮਿਲਦੀ ਕੋਈ ਵੀ ਐਪਸ ਨਹੀਂ ਲੱਭੀਆਂ" + "ਐਪਾਂ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + "\"%1$s\" ਨਾਲ ਮਿਲਦੀਆਂ ਕੋਈ ਵੀ ਐਪਾਂ ਨਹੀਂ ਮਿਲੀਆਂ" "%1$s ਤੇ ਜਾਓ" "ਇਸ ਹੋਮ ਸਕ੍ਰੀਨ ਲਈ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ ਹੈ।" "ਮਨਪਸੰਦ ਟ੍ਰੇ ਵਿੱਚ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ।" @@ -40,15 +40,15 @@ "ਹਟਾਓ" "ਅਣਇੰਸਟੌਲ ਕਰੋ" "ਐਪ ਜਾਣਕਾਰੀ" - "ਸ਼ੌਰਟਕਟ ਇੰਸਟੌਲ ਕਰੋ" - "ਇੱਕ ਐਪ ਨੂੰ ਉਪਭੋਗਤਾ ਦੇ ਦਖ਼ਲ ਤੋਂ ਬਿਨਾਂ ਸ਼ੌਰਟਕਟ ਜੋੜਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" - "ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ੌਰਟਕਟ ਪੜ੍ਹੋ" - "ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ੌਰਟਕਟ ਪੜ੍ਹਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" - "ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ੌਰਟਕਟ ਲਿਖੋ" - "ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ੌਰਟਕਟ ਬਦਲਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" + "ਸ਼ਾਰਟਕੱਟ ਇੰਸਟੌਲ ਕਰੋ" + "ਇੱਕ ਐਪ ਨੂੰ ਉਪਭੋਗਤਾ ਦੇ ਦਖ਼ਲ ਤੋਂ ਬਿਨਾਂ ਸ਼ਾਰਟਕੱਟ ਜੋੜਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" + "ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਪੜ੍ਹੋ" + "ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਪੜ੍ਹਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" + "ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਲਿਖੋ" + "ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਬਦਲਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।" "%1$s ਨੂੰ ਫੋਨ ਕਾਲਾਂ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ" "ਵਿਜੇਟ ਲੋਡ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ" - "ਸੈਟਅਪ" + "ਸਥਾਪਤ ਕਰੋ" "ਇਹ ਇੱਕ ਸਿਸਟਮ ਐਪ ਹੈ ਅਤੇ ਇਸਨੂੰ ਅਣਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।" "ਬਿਨਾਂ ਨਾਮ ਦਿੱਤਾ ਫੋਲਡਰ" "ਸਫ਼ਾ %2$d ਦਾ %1$d" @@ -59,16 +59,16 @@ "ਕੀ ਆਪਣੀਆਂ ਪੁਰਾਣੀਆਂ ਹੋਮ ਸਕ੍ਰੀਨਾਂ ਤੋਂ ਆਈਕਨਾਂ ਅਤੇ ਫੋਲਡਰ ਆਯਾਤ ਕਰਨੇ ਹਨ?" "ਆਈਕਨਾਂ ਨੂੰ ਕਾਪੀ ਕਰੋ" "ਤਾਜ਼ਾ ਸ਼ੁਰੂ ਕਰੋ" - "ਵਾਲਪੇਪਰ, ਵਿਜੇਟ, & ਸੈਟਿੰਗਾਂ" - "ਅਨੁਕੂਲ ਕਰਨ ਲਈ ਪਿਛੋਕੜ ਛੋਹਵੋ & ਹੋਲਡ ਕਰੋ" - "ਸਮਝ ਗਿਆ" + "ਵਾਲਪੇਪਰ, ਵਿਜਿਟ, ਅਤੇ ਸੈਟਿੰਗਾਂ" + "ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਕਰਨ ਲਈ ਪਿੱਠਭੂਮੀ ਨੂੰ ਛੂਹੋ ਅਤੇ ਛੂਹੀ ਰੱਖੋ" + "ਸਮਝ ਲਿਆ" "ਫੋਲਡਰ ਖੋਲ੍ਹਿਆ, %1$d ਬਾਇ %2$d" - "ਫੋਲਡਰ ਬੰਦ ਕਰਨ ਲਈ ਛੋਹਵੋ" - "ਮੁੜ ਨਾਮ ਦਿਓ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਛੋਹਵੋ" + "ਫੋਲਡਰ ਬੰਦ ਕਰਨ ਲਈ ਸਪੱਰਸ਼ ਕਰੋ" + "ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਸਪੱਰਸ਼ ਕਰੋ" "ਫੋਲਡਰ ਬੰਦ ਕੀਤਾ" "ਫੋਲਡਰ ਨੂੰ %1$s ਮੁੜ ਨਾਮ ਦਿੱਤਾ ਗਿਆ" "ਫੋਲਡਰ: %1$s" - "ਵਿਜੇਟਸ" + "ਵਿਜਿਟ" "ਵਾਲਪੇਪਰ" "ਸੈਟਿੰਗਾਂ" "ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਈ ਗਈ" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 4a2cb61d85..ec1704d787 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -60,7 +60,7 @@ "КОПИРОВАТЬ ЗНАЧКИ" "ИСПОЛЬЗОВАТЬ СТАНДАРТНЫЙ МАКЕТ" "Обои, виджеты и настройки" - "Чтобы выполнить настройку, коснитесь фона и удерживайте его" + "Чтобы выполнить настройку, коснитесь фона и удерживайте его." "ОК" "Папка открыта, %1$d x %2$d" "Нажмите, чтобы закрыть папку" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 5fb421ab3e..cd2a8828aa 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -29,10 +29,10 @@ "Miniaplikáciu pridáte stlačením a podržaním." "Miniaplikáciu pridáte dvojitým klepnutím a pridržaním alebo pomocou vlastných akcií." "%1$d × %2$d" - "Vyhľadávanie v aplikáciách…" + "Hľadať aplikácie…" "Načítavajú sa aplikácie..." "Nenašli sa žiadne aplikácie zodpovedajúce dopytu %1$s" - "Prejsť na dopyt %1$s" + "Prejsť na %1$s" "Na tejto ploche už nie je miesto" "Na paneli Obľúbené položky už nie je miesto" "Aplikácie" @@ -59,8 +59,8 @@ "Chcete importovať ikony a priečinky zo starých plôch?" "SKOPÍROVAŤ IKONY" "ZAČAŤ ODZNOVA" - "Pozadia, miniaplikácie a nastavenia" - "Ak si chcete pozadie prispôsobiť, klepnite naň a podržte ho" + "Tapety, miniaplikácie a nastavenia" + "Pozadie môžete prispôsobiť jeho pridržaním" "DOBRE" "Otvorený priečinok, %1$d x %2$d" "Dotykom zavriete priečinok" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 831d6ef569..b8831a1491 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -62,7 +62,7 @@ "NAKILI IKONI" "ANZA UPYA" "Mandhari, wijeti na mipangilio" - "Gusa na ushikilie mandhari ili uweke mapendeleo" + "Gusa na ushikilie mandhari ili ubadilishe upendavyo" "NIMEELEWA" "Folda imefunguliwa, %1$d kwa %2$d" "Gusa ili ufunge folda" diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index fd71c417c1..693a9ddbd4 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -29,14 +29,14 @@ "Vidjetni tanlash uchun bosib turing." "Ikki marta bosib va bosib turgan holatda vidjetni tanlang yoki maxsus amaldan foydalaning." "%1$d × %2$d" - "Ilovalarni qidirish…" + "Ilovalar ichidan qidirish…" "Ilovalar yuklanmoqda…" - "“%1$s” bilan mos hech qanday ilova topilmadi" - "O‘tish: %1$s" + "“%1$s” so‘rovi bo‘yicha hech narsa topilmadi" + "%1$s" "Uy ekranida bitta ham xona yo‘q." "Ajratilganlarda birorta ham xona yo‘q" "Ilovalar" - "Uy" + "Bosh sahifa" "Olib tashlash" "O‘chirib tashlash" "Ilova haqida" @@ -59,8 +59,8 @@ "Eski \"Uy\" ekranlaringizdan jildlar va nishonchalar import qilinsinmi?" "NISHONCHALARNI NUSXALASH" "YANGIDAN BOSHLASH" - "Orqa fon rasmlari, vidjet va sozlamalar" - "Orqa fonni moslashtirish uchun uni bosing va ushlab turing" + "Fon rasmlari, vidjet va sozlamalar" + "Moslashtirish uchun orqa fon ustiga biroz bosib turing" "OK" "Jild ochildi, %1$d ga %2$d" "Jildni yopish uchun bosing" @@ -72,7 +72,7 @@ "Fon rasmlari" "Sozlamalar" "Administrator tomonidan o‘chirilgan" - "Aylanishga ruxsat berish" + "Avtomatik burilish" "Noma’lum" "O‘chirish" "Qidirish" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e333ecbd27..74984bbdf0 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -37,7 +37,7 @@ "收藏栏已满" "应用" "主屏幕" - "删除" + "移除" "卸载" "应用信息" "安装快捷方式" From 677ce21fbfb8b40b22542347b9be1812f4360e7c Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Tue, 7 Jun 2016 14:30:10 -0700 Subject: [PATCH 10/13] Ensure that custom actions are available to all apps items -> When BubbleTextViews were being recycled, the RecyclerView was clearing the AccessibilityDelegate. Ensure that this is reset by the adapter when a BubbleTextView is reused. issue 25948877 Change-Id: I95dd21bfdcd602a67925d1b8f06e6ca92d1d7203 (cherry picked from commit 6e92f05314ae240dccd11347ea86529066b528b3) --- .../accessibility/LauncherAccessibilityDelegate.java | 4 +++- src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index 2306b776ed..646b463ef2 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -118,7 +118,9 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme info.addAction(mActions.get(RESIZE)); } } - } if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) { + } + + if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) { info.addAction(mActions.get(ADD_TO_WORKSPACE)); } } diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 42a395d201..2c9c5470bb 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -564,12 +564,16 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter Date: Tue, 7 Jun 2016 22:30:30 +0000 Subject: [PATCH 11/13] Revert "Ensure that custom actions are available to all apps items" This reverts commit 677ce21fbfb8b40b22542347b9be1812f4360e7c. Change-Id: I7fc13142de9946e0b482160fa4c067461e471f52 --- .../accessibility/LauncherAccessibilityDelegate.java | 4 +--- src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index 646b463ef2..2306b776ed 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -118,9 +118,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme info.addAction(mActions.get(RESIZE)); } } - } - - if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) { + } if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) { info.addAction(mActions.get(ADD_TO_WORKSPACE)); } } diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 2c9c5470bb..42a395d201 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -564,16 +564,12 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter Date: Tue, 7 Jun 2016 14:30:10 -0700 Subject: [PATCH 12/13] Ensure that custom actions are available to all apps items -> When BubbleTextViews were being recycled, the RecyclerView was clearing the AccessibilityDelegate. Ensure that this is reset by the adapter when a BubbleTextView is reused. issue 25948877 (cherry picked from commit 6e92f05314ae240dccd11347ea86529066b528b3) Change-Id: I5f0773333186e5ffe4600f49330b4390cd3fbaeb --- .../accessibility/LauncherAccessibilityDelegate.java | 4 +++- src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index 2306b776ed..646b463ef2 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -118,7 +118,9 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme info.addAction(mActions.get(RESIZE)); } } - } if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) { + } + + if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) { info.addAction(mActions.get(ADD_TO_WORKSPACE)); } } diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 42a395d201..255e417412 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -44,6 +44,7 @@ import android.widget.TextView; import com.android.launcher3.AppInfo; import com.android.launcher3.BubbleTextView; import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherAppState; import com.android.launcher3.R; import com.android.launcher3.Utilities; @@ -564,12 +565,16 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter Date: Sun, 15 May 2016 16:39:26 -0700 Subject: [PATCH 13/13] Replaced Utilities.isNycOrAbove() with version code check. - Instead of using reflection to check if N is present, we now use Build.VERSION.SDK_INT >= Build.VERSION_CODES.N. - Other places that used reflection to use N APIs have also been cleaned up. Bug: 22942492 Change-Id: Ia7b981cae375e800bcc8f0c54aec48e0c8c076da --- .../gallery3d/common/BitmapCropTask.java | 6 +-- .../android/launcher3/NycWallpaperUtils.java | 33 +++++-------- .../launcher3/WallpaperPickerActivity.java | 8 ++-- build.gradle | 2 +- src/com/android/launcher3/Utilities.java | 46 ++++++------------- .../launcher3/compat/UserManagerCompat.java | 2 +- .../launcher3/compat/UserManagerCompatVN.java | 12 ++--- .../model/GridSizeMigrationTask.java | 2 +- .../launcher3/util/PackageManagerHelper.java | 2 +- 9 files changed, 40 insertions(+), 73 deletions(-) diff --git a/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java b/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java index 153fa90587..b5238126ca 100644 --- a/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java +++ b/WallpaperPicker/src/com/android/gallery3d/common/BitmapCropTask.java @@ -181,7 +181,7 @@ public class BitmapCropTask extends AsyncTask { failure = true; } return !failure; - } else if (mSetWallpaper && Utilities.isNycOrAbove() + } else if (mSetWallpaper && Utilities.ATLEAST_N && mRotation == 0 && mOutWidth > 0 && mOutHeight > 0) { Rect hint = new Rect(); mCropBounds.roundOut(hint); @@ -404,7 +404,7 @@ public class BitmapCropTask extends AsyncTask { @Override protected Boolean doInBackground(Integer... params) { - return cropBitmap(params.length == 0 ? NycWallpaperUtils.FLAG_SET_SYSTEM : params[0]); + return cropBitmap(params.length == 0 ? WallpaperManager.FLAG_SYSTEM : params[0]); } @Override @@ -418,7 +418,7 @@ public class BitmapCropTask extends AsyncTask { } private void setWallpaper(InputStream in, Rect crop, int whichWallpaper) throws IOException { - if (!Utilities.isNycOrAbove()) { + if (!Utilities.ATLEAST_N) { WallpaperManager.getInstance(mContext.getApplicationContext()).setStream(in); } else { NycWallpaperUtils.setStream(mContext, in, crop, true, whichWallpaper); diff --git a/WallpaperPicker/src/com/android/launcher3/NycWallpaperUtils.java b/WallpaperPicker/src/com/android/launcher3/NycWallpaperUtils.java index abac830a2a..d9d4293a69 100644 --- a/WallpaperPicker/src/com/android/launcher3/NycWallpaperUtils.java +++ b/WallpaperPicker/src/com/android/launcher3/NycWallpaperUtils.java @@ -9,15 +9,11 @@ import android.os.AsyncTask; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; /** * Utility class used to help set lockscreen wallpapers on N+. */ public class NycWallpaperUtils { - public static final int FLAG_SET_SYSTEM = 1 << 0; // TODO: use WallpaperManager.FLAG_SET_SYSTEM - public static final int FLAG_SET_LOCK = 1 << 1; // TODO: use WallpaperManager.FLAG_SET_LOCK /** * Calls cropTask.execute(), once the user has selected which wallpaper to set. On pre-N @@ -26,7 +22,7 @@ public class NycWallpaperUtils { public static void executeCropTaskAfterPrompt( Context context, final AsyncTask cropTask, DialogInterface.OnCancelListener onCancelListener) { - if (Utilities.isNycOrAbove()) { + if (Utilities.ATLEAST_N) { new AlertDialog.Builder(context) .setTitle(R.string.wallpaper_instructions) .setItems(R.array.which_wallpaper_options, new DialogInterface.OnClickListener() { @@ -34,11 +30,12 @@ public class NycWallpaperUtils { public void onClick(DialogInterface dialog, int selectedItemIndex) { int whichWallpaper; if (selectedItemIndex == 0) { - whichWallpaper = FLAG_SET_SYSTEM; + whichWallpaper = WallpaperManager.FLAG_SYSTEM; } else if (selectedItemIndex == 1) { - whichWallpaper = FLAG_SET_LOCK; + whichWallpaper = WallpaperManager.FLAG_LOCK; } else { - whichWallpaper = FLAG_SET_SYSTEM | FLAG_SET_LOCK; + whichWallpaper = WallpaperManager.FLAG_SYSTEM + | WallpaperManager.FLAG_LOCK; } cropTask.execute(whichWallpaper); } @@ -46,20 +43,16 @@ public class NycWallpaperUtils { .setOnCancelListener(onCancelListener) .show(); } else { - cropTask.execute(FLAG_SET_SYSTEM); + cropTask.execute(WallpaperManager.FLAG_SYSTEM); } } public static void setStream(Context context, final InputStream data, Rect visibleCropHint, boolean allowBackup, int whichWallpaper) throws IOException { WallpaperManager wallpaperManager = WallpaperManager.getInstance(context); - try { - // TODO: use mWallpaperManager.setStream(data, visibleCropHint, allowBackup, which) - // without needing reflection. - Method setStream = WallpaperManager.class.getMethod("setStream", InputStream.class, - Rect.class, boolean.class, int.class); - setStream.invoke(wallpaperManager, data, visibleCropHint, allowBackup, whichWallpaper); - } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { + if (Utilities.ATLEAST_N) { + wallpaperManager.setStream(data, visibleCropHint, allowBackup, whichWallpaper); + } else { // Fall back to previous implementation (set system) wallpaperManager.setStream(data); } @@ -67,11 +60,9 @@ public class NycWallpaperUtils { public static void clear(Context context, int whichWallpaper) throws IOException { WallpaperManager wallpaperManager = WallpaperManager.getInstance(context); - try { - // TODO: use mWallpaperManager.clear(whichWallpaper) without needing reflection. - Method clear = WallpaperManager.class.getMethod("clear", int.class); - clear.invoke(wallpaperManager, whichWallpaper); - } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + if (Utilities.ATLEAST_N) { + wallpaperManager.clear(whichWallpaper); + } else { // Fall back to previous implementation (clear system) wallpaperManager.clear(); } diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java index 40f0544a2d..3ecb53eaa2 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java @@ -353,7 +353,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { } @Override public void onSave(final WallpaperPickerActivity a) { - if (!Utilities.isNycOrAbove()) { + if (!Utilities.ATLEAST_N) { try { WallpaperManager.getInstance(a.getContext()).clear(); a.setResult(Activity.RESULT_OK); @@ -393,7 +393,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { int whichWallpaper = params[0]; boolean succeeded = true; try { - if (whichWallpaper == NycWallpaperUtils.FLAG_SET_LOCK) { + if (whichWallpaper == WallpaperManager.FLAG_LOCK) { Bitmap defaultWallpaper = ((BitmapDrawable) WallpaperManager .getInstance(a.getApplicationContext()).getBuiltInDrawable()) .getBitmap(); @@ -403,7 +403,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { byte[] outByteArray = tmpOut.toByteArray(); NycWallpaperUtils.setStream(a.getApplicationContext(), new ByteArrayInputStream(outByteArray), null, true, - NycWallpaperUtils.FLAG_SET_LOCK); + WallpaperManager.FLAG_LOCK); } } else { NycWallpaperUtils.clear(a, whichWallpaper); @@ -944,7 +944,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { (int) rotatedBounds[0], (int) rotatedBounds[1], width, height, leftAligned); cropTask.setCropBounds(cropRect); - if (cropTask.cropBitmap(NycWallpaperUtils.FLAG_SET_SYSTEM)) { + if (cropTask.cropBitmap(WallpaperManager.FLAG_SYSTEM)) { return cropTask.getCroppedBitmap(); } else { return null; diff --git a/build.gradle b/build.gradle index b9a990f87e..00bed8bca4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.1.0' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.0' } } diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 78ba22eb66..ba342b1694 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -46,7 +46,6 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.PaintDrawable; import android.os.Build; -import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.PowerManager; import android.os.Process; @@ -101,8 +100,11 @@ public final class Utilities { private static final int[] sLoc0 = new int[2]; private static final int[] sLoc1 = new int[2]; - // TODO: use Build.VERSION_CODES when available - public static final boolean ATLEAST_MARSHMALLOW = Build.VERSION.SDK_INT >= 23; + // TODO: use the full N name (e.g. ATLEAST_N*****) when available + public static final boolean ATLEAST_N = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N; + + public static final boolean ATLEAST_MARSHMALLOW = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; public static final boolean ATLEAST_LOLLIPOP_MR1 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1; @@ -119,18 +121,6 @@ public final class Utilities { public static final boolean ATLEAST_JB_MR2 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2; - public static boolean isNycOrAbove() { - // TODO: Replace using reflection with looking at the API version once - // Build.VERSION.SDK_INT gets bumped to 24. b/22942492. - try { - View.class.getDeclaredField("DRAG_FLAG_OPAQUE"); - // View.DRAG_FLAG_OPAQUE doesn't exist in M-release, so it's an indication of N+. - return true; - } catch (NoSuchFieldException e) { - return false; - } - } - // These values are same as that in {@link AsyncTask}. private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors(); private static final int CORE_POOL_SIZE = CPU_COUNT + 1; @@ -151,20 +141,14 @@ public final class Utilities { public static boolean isAllowRotationPrefEnabled(Context context) { boolean allowRotationPref = false; - if (isNycOrAbove()) { + if (ATLEAST_N) { // If the device was scaled, used the original dimensions to determine if rotation // is allowed of not. - try { - // TODO: Use the actual field when the API is finalized. - int originalDensity = - DisplayMetrics.class.getField("DENSITY_DEVICE_STABLE").getInt(null); - Resources res = context.getResources(); - int originalSmallestWidth = res.getConfiguration().smallestScreenWidthDp - * res.getDisplayMetrics().densityDpi / originalDensity; - allowRotationPref = originalSmallestWidth >= 600; - } catch (Exception e) { - // Ignore - } + int originalDensity = DisplayMetrics.DENSITY_DEVICE_STABLE; + Resources res = context.getResources(); + int originalSmallestWidth = res.getConfiguration().smallestScreenWidthDp + * res.getDisplayMetrics().densityDpi / originalDensity; + allowRotationPref = originalSmallestWidth >= 600; } return getPrefs(context).getBoolean(ALLOW_ROTATION_PREFERENCE_KEY, allowRotationPref); } @@ -824,12 +808,8 @@ public final class Utilities { } public static boolean isWallapaperAllowed(Context context) { - if (isNycOrAbove()) { - try { - WallpaperManager wm = context.getSystemService(WallpaperManager.class); - return (Boolean) wm.getClass().getDeclaredMethod("isSetWallpaperAllowed") - .invoke(wm); - } catch (Exception e) { } + if (ATLEAST_N) { + return context.getSystemService(WallpaperManager.class).isSetWallpaperAllowed(); } return true; } diff --git a/src/com/android/launcher3/compat/UserManagerCompat.java b/src/com/android/launcher3/compat/UserManagerCompat.java index 978f9229da..186ab2a2bc 100644 --- a/src/com/android/launcher3/compat/UserManagerCompat.java +++ b/src/com/android/launcher3/compat/UserManagerCompat.java @@ -32,7 +32,7 @@ public abstract class UserManagerCompat { public static UserManagerCompat getInstance(Context context) { synchronized (sInstanceLock) { if (sInstance == null) { - if (Utilities.isNycOrAbove()) { + if (Utilities.ATLEAST_N) { sInstance = new UserManagerCompatVN(context.getApplicationContext()); } else if (Utilities.ATLEAST_LOLLIPOP) { sInstance = new UserManagerCompatVL(context.getApplicationContext()); diff --git a/src/com/android/launcher3/compat/UserManagerCompatVN.java b/src/com/android/launcher3/compat/UserManagerCompatVN.java index ae41e68a36..ed828a5f9a 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVN.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVN.java @@ -16,7 +16,9 @@ package com.android.launcher3.compat; +import android.annotation.TargetApi; import android.content.Context; +import android.os.Build; import android.os.UserHandle; import android.os.UserManager; import android.util.Log; @@ -24,7 +26,7 @@ import android.util.Log; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -//TODO: Once gogole3 SDK is updated to N, add @TargetApi(Build.VERSION_CODES.N) +@TargetApi(Build.VERSION_CODES.N) public class UserManagerCompatVN extends UserManagerCompatVL { private static final String TAG = "UserManagerCompatVN"; @@ -37,13 +39,7 @@ public class UserManagerCompatVN extends UserManagerCompatVL { public boolean isQuietModeEnabled(UserHandleCompat user) { if (user != null) { try { - //TODO: Replace with proper API call once google3 SDK is updated. - Method isQuietModeEnabledMethod = UserManager.class.getMethod("isQuietModeEnabled", - UserHandle.class); - return (boolean) isQuietModeEnabledMethod.invoke(mUserManager, user.getUser()); - } catch (NoSuchMethodError | NoSuchMethodException | IllegalAccessException - | InvocationTargetException e) { - Log.e(TAG, "Running on N without isQuietModeEnabled", e); + return mUserManager.isQuietModeEnabled(user.getUser()); } catch (IllegalArgumentException e) { // TODO remove this when API is fixed to not throw this // when called on user that isn't a managed profile. diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java index 8117122055..f7da596f81 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTask.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java @@ -39,7 +39,7 @@ import java.util.Locale; */ public class GridSizeMigrationTask { - public static boolean ENABLED = Utilities.isNycOrAbove(); + public static boolean ENABLED = Utilities.ATLEAST_N; private static final String TAG = "GridSizeMigrationTask"; private static final boolean DEBUG = true; diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java index 08e8e869d5..5e60ed6ee8 100644 --- a/src/com/android/launcher3/util/PackageManagerHelper.java +++ b/src/com/android/launcher3/util/PackageManagerHelper.java @@ -62,7 +62,7 @@ public class PackageManagerHelper { // The value of FLAG_SUSPENDED was reused by a hidden constant // ApplicationInfo.FLAG_PRIVILEGED prior to N, so only check for suspended flag on N // or later. - if (Utilities.isNycOrAbove()) { + if (Utilities.ATLEAST_N) { return (info.flags & FLAG_SUSPENDED) != 0; } else { return false;