From 7dc6e97c508125b94fffc15c4a8f0b6c989f396c Mon Sep 17 00:00:00 2001 From: Andy Huibers Date: Tue, 19 Nov 2013 15:10:04 -0800 Subject: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Bug: 11773268 Change-Id: Iea7702a0141a390e1e9b50c738f6269c03dabcc3 --- src/com/android/camera/PhotoModule.java | 44 +++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index daf8cfcd1..9b1853a8a 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -110,9 +110,9 @@ public class PhotoModule private static final int UPDATE_PARAM_PREFERENCE = 4; private static final int UPDATE_PARAM_ALL = -1; - // This is the timeout to keep the camera in onPause for the first time - // after screen on if the activity is started from secure lock screen. - private static final int KEEP_CAMERA_TIMEOUT = 1000; // ms + // This is the delay before we execute onResume tasks when coming + // from the lock screen, to allow time for onPause to execute. + private static final int ON_RESUME_TASKS_DELAY_MSEC = 20; private static final String DEBUG_IMAGE_PREFIX = "DEBUG_"; @@ -1172,6 +1172,7 @@ public class PhotoModule private boolean prepareCamera() { // We need to check whether the activity is paused before long // operations to ensure that onPause() can be done ASAP. + Log.v(TAG, "Open camera device."); mCameraDevice = CameraUtil.openCamera( mActivity, mCameraId, mHandler, mActivity.getCameraOpenErrorCallback()); @@ -1194,7 +1195,28 @@ public class PhotoModule @Override public void onResumeAfterSuper() { - Log.v(TAG, "On resume."); + // Add delay on resume from lock screen only, in order to to speed up + // the onResume --> onPause --> onResume cycle from lock screen. + // Don't do always because letting go of thread can cause delay. + String action = mActivity.getIntent().getAction(); + if (MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA.equals(action) + || MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.equals(action)) { + Log.v(TAG, "On resume, from lock screen."); + // Note: onPauseAfterSuper() will delete this runnable, so we will + // at most have 1 copy queued up. + mHandler.postDelayed(new Runnable() { + public void run() { + onResumeTasks(); + } + }, ON_RESUME_TASKS_DELAY_MSEC); + } else { + Log.v(TAG, "On resume."); + onResumeTasks(); + } + } + + private void onResumeTasks() { + Log.v(TAG, "Executing onResumeTasks."); if (mOpenCameraFail || mCameraDisabled) return; mJpegPictureCallbackTime = 0; @@ -1247,15 +1269,7 @@ public class PhotoModule public void onPauseAfterSuper() { Log.v(TAG, "On pause."); mUI.showPreviewCover(); - // When camera is started from secure lock screen for the first time - // after screen on, the activity gets onCreate->onResume->onPause->onResume. - // To reduce the latency, keep the camera for a short time so it does - // not need to be opened again. - if (mCameraDevice != null && mActivity.isSecureCamera() - && CameraActivity.isFirstStartAfterScreenOn()) { - CameraActivity.resetFirstStartAfterScreenOn(); - CameraHolder.instance().keep(KEEP_CAMERA_TIMEOUT); - } + // Reset the focus first. Camera CTS does not guarantee that // cancelAutoFocus is allowed after preview stops. if (mCameraDevice != null && mCameraState != PREVIEW_STOPPED) { @@ -1277,9 +1291,6 @@ public class PhotoModule // Remove the messages and runnables in the queue. mHandler.removeCallbacksAndMessages(null); - // Postpones actually releasing for KEEP_CAMERA_TIMEOUT, - // so if onResume is directly called after this, the camera - // simply needs to reconnect (takes about 2-5ms). closeCamera(); resetScreenOn(); @@ -1442,6 +1453,7 @@ public class PhotoModule } private void closeCamera() { + Log.v(TAG, "Close camera device."); if (mCameraDevice != null) { mCameraDevice.setZoomChangeListener(null); mCameraDevice.setFaceDetectionCallback(null, null); -- cgit v1.2.3 From ae13f34c5debd5442a616bc97558815a069a84b8 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Wed, 20 Nov 2013 11:53:49 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I2db02a5ec058c2eed8d08a490aeed180095bd58d Auto-generated-cl: translation import --- res/values-iw/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 3d6d04d08..a75cd03d7 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -75,7 +75,7 @@ "רוחק מוקד" "איזון לבן" "זמן חשיפה" - "‏ISO‏" + "‏ISO" "מ\"מ" "ידני" "אוטומטי" -- cgit v1.2.3 From 18eb2e4e7f35a5dfbeea6e3c64b612769bb31293 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 21 Nov 2013 16:41:27 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I5bf42de7313c856550b6cc68e0ca5fa30a64c6a1 Auto-generated-cl: translation import --- res/values-af/strings.xml | 10 +++++---- res/values-am/strings.xml | 10 +++++---- res/values-ar/strings.xml | 42 +++++++++++++++++++------------------ res/values-bg/strings.xml | 10 +++++---- res/values-ca/strings.xml | 10 +++++---- res/values-cs/strings.xml | 14 +++++++------ res/values-da/strings.xml | 10 +++++---- res/values-de/strings.xml | 10 +++++---- res/values-el/strings.xml | 10 +++++---- res/values-en-rGB/strings.xml | 10 +++++---- res/values-en-rIN/strings.xml | 10 +++++---- res/values-es-rUS/strings.xml | 10 +++++---- res/values-es/strings.xml | 10 +++++---- res/values-et-rEE/strings.xml | 10 +++++---- res/values-fa/strings.xml | 46 +++++++++++++++++++++-------------------- res/values-fi/strings.xml | 10 +++++---- res/values-fr-rCA/strings.xml | 10 +++++---- res/values-fr/strings.xml | 10 +++++---- res/values-hi/strings.xml | 10 +++++---- res/values-hr/strings.xml | 10 +++++---- res/values-hu/strings.xml | 10 +++++---- res/values-hy-rAM/strings.xml | 10 +++++---- res/values-in/strings.xml | 10 +++++---- res/values-it/strings.xml | 10 +++++---- res/values-iw/strings.xml | 48 ++++++++++++++++++++++--------------------- res/values-ja/strings.xml | 10 +++++---- res/values-ka-rGE/strings.xml | 10 +++++---- res/values-km-rKH/strings.xml | 10 +++++---- res/values-ko/strings.xml | 10 +++++---- res/values-lo-rLA/strings.xml | 10 +++++---- res/values-lt/strings.xml | 10 +++++---- res/values-lv/strings.xml | 12 ++++++----- res/values-mn-rMN/strings.xml | 10 +++++---- res/values-ms-rMY/strings.xml | 10 +++++---- res/values-nb/strings.xml | 10 +++++---- res/values-nl/strings.xml | 10 +++++---- res/values-pl/strings.xml | 10 +++++---- res/values-pt-rPT/strings.xml | 10 +++++---- res/values-pt/strings.xml | 10 +++++---- res/values-ro/strings.xml | 10 +++++---- res/values-ru/strings.xml | 10 +++++---- res/values-sk/strings.xml | 10 +++++---- res/values-sl/strings.xml | 10 +++++---- res/values-sr/strings.xml | 10 +++++---- res/values-sv/strings.xml | 10 +++++---- res/values-sw/strings.xml | 10 +++++---- res/values-th/strings.xml | 10 +++++---- res/values-tl/strings.xml | 10 +++++---- res/values-tr/strings.xml | 10 +++++---- res/values-uk/strings.xml | 12 ++++++----- res/values-vi/strings.xml | 10 +++++---- res/values-zh-rCN/strings.xml | 10 +++++---- res/values-zh-rHK/strings.xml | 10 +++++---- res/values-zh-rTW/strings.xml | 10 +++++---- res/values-zu/strings.xml | 10 +++++---- 55 files changed, 387 insertions(+), 277 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 0c4b1261b..381c6f88a 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -93,6 +93,7 @@ "Berei tans SD-kaart voor…" "Kon nie toegang tot SD-kaart kry nie." "Tydsverloop-opname" + "Vang tans vas" "Kies kamera" "Terug" "Voorkant" @@ -122,6 +123,7 @@ "3 M pieksels" "2 M pieksels" "2 M pieksels (16:9)" + "1,5 M pieksels" "1,3 M pieksels" "1 M pieksels" "VGA" @@ -157,10 +159,10 @@ "Outo" "HDR+" "HDR" - "Skakel HDR+ aan" - "Skakel HDR+ af" - "Skakel HDR aan" - "Skakel HDR af" + "HDR+ AAN" + "HDR+ AF" + "HDR AAN" + "HDR AF" "Handeling" "Nag" "Sonsondergang" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 1cbc2d96c..bd1655dc2 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -93,6 +93,7 @@ "የSD ካርድ በማዘጋጀት ላይ…" "SD ካርድን መድረስ አልተቻለም።" "በቀረጻ የአላፊ ጊዜ" + "በመቅረጽ ላይ" "ካሜራ ይምረጡ" "የኋላ" "የፊት" @@ -122,6 +123,7 @@ "3ሚ ፒክሰሎች" "2ሚ ፒክሰሎች" "2ሚ ፒክሰሎች (16:9)" + "1.5 ሚ ፒክሰሎች" "1.3ሚ ፒክሰሎች" "1ሚ ፒክሰሎች" "VGA" @@ -157,10 +159,10 @@ "ራስ-ሰር" "ኤች ዲ አር+" "ኤች ዲ አር" - "ኤች ዲ አር+ አብራ" - "ኤች ዲ አር+ አጥፋ" - "ኤች ዲ አር አብራ" - "ኤች ዲ አር አጥፋ" + "ኤች ዲ አር+ በርቷል" + "ኤች ዲ አር+ ጠፍቷል" + "ኤች ዲ አር በርቷል" + "ኤች ዲ አር ጠፍቷል" "እርምጃ" "ሌሊት" "ፀሀይ ስትጠልቅ" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index db3e3d9db..364d79686 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -34,19 +34,19 @@ "التفاصيل" "إغلاق" - "تم تحديد %1$d" - "تم تحديد %1$d" - "تم تحديد %1$d" + "‏تم تحديد %1$d" + "‏تم تحديد %1$d" + "‏تم تحديد %1$d" - "تم تحديد %1$d" - "تم تحديد %1$d" - "تم تحديد %1$d" + "‏تم تحديد %1$d" + "‏تم تحديد %1$d" + "‏تم تحديد %1$d" - "تم تحديد %1$d" - "تم تحديد %1$d" - "تم تحديد %1$d" + "‏تم تحديد %1$d" + "‏تم تحديد %1$d" + "‏تم تحديد %1$d" "عرض على الخريطة" "تدوير لليسار" @@ -66,7 +66,7 @@ "الارتفاع" "الاتجاه" "المدة" - "نوع MIME" + "‏نوع MIME" "حجم الملف" "منشئ العنصر" "النموذج" @@ -89,10 +89,11 @@ "يتعذر الاتصال بالكاميرا." "تم تعطيل الكاميرا بسبب سياسات الأمان." "الرجاء الانتظار…" - "أدرج بطاقة SD قبل استخدام الكاميرا." - "جارٍ تحضير بطاقة SD…" - "تعذر الدخول إلى بطاقة SD." + "‏أدرج بطاقة SD قبل استخدام الكاميرا." + "‏جارٍ تحضير بطاقة SD…" + "‏تعذر الدخول إلى بطاقة SD." "التسجيل في وضع انقضاء الوقت" + "جارٍ الالتقاط" "اختيار كاميرا" "الخلفية" "الأمامية" @@ -101,7 +102,7 @@ "موقّت العد التنازلي" "ثانية واحدة" - "%d من الثواني" + "‏%d من الثواني" @@ -122,6 +123,7 @@ "3 ميغا بكسل" "2 ميغا بكسل" "2 ميغا بكسل (16‏:9)" + "1.5 ميغا بكسل" "1.3 ميغا بكسل" "1 ميغا بكسل" "VGA" @@ -157,10 +159,10 @@ "تلقائيًا" "نطاق عالي الديناميكية+" "نطاق عالي الديناميكية" - "تشغيل النطاق عالي الديناميكية الأفضل" - "إيقاف النطاق عالي الديناميكية الأفضل" - "تشغيل النطاق عالي الديناميكية" - "إيقاف النطاق عالي الديناميكية" + "تشغيل النطاق عالي الديناميكية+" + "إيقاف النطاق عالي الديناميكية+" + "تشغيل النطاق عالي الديناميكية" + "إيقاف النطاق عالي الديناميكية" "حركة" "ليلاً" "الغروب" @@ -186,7 +188,7 @@ "الكاميرا الأمامية" "الكاميرا الخلفية" "موافق" - "أوشكت المساحة الخالية في بطاقة SD على النفاد. غيّر إعداد الجودة أو احذف بعض الصور أو الملفات الأخرى." + "‏أوشكت المساحة الخالية في بطاقة SD على النفاد. غيّر إعداد الجودة أو احذف بعض الصور أو الملفات الأخرى." "تم بلوغ الحد الأقصى للحجم." "سريع جدًا" "جارٍ تحضير الصورة البانورامية" @@ -217,7 +219,7 @@ "الغالق" "زر القائمة" "محدّد الكاميرا أو الفيديو أو البانوراما" - "مربع اختيار %1$s" + "‏مربع اختيار %1$s" "تبديل إلى وضع الصور" "تبديل إلى وضع الفيديو" "تبديل إلى بانوراما" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index ad99c7cf1..c195059db 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -93,6 +93,7 @@ "SD картата се подготвя…" "Няма достъп до SD картата." "Запис на цайтрафера" + "Заснема се" "Избиране на камера" "Задна" "Предна" @@ -122,6 +123,7 @@ "3 мегапиксела" "2 мегапиксела" "2 мегапиксела (16:9)" + "1,5 мегапиксела" "1,3 мегапиксела" "1 мегапиксел" "VGA" @@ -157,10 +159,10 @@ "Автоматично" "HDR+" "HDR" - "Включване на HDR+" - "Изключване на HDR+" - "Включване на HDR" - "Изключване на HDR" + "ВКЛЮЧВАНЕ НА HDR+" + "ИЗКЛЮЧВАНЕ НА HDR+" + "ВКЛЮЧВАНЕ НА HDR" + "ИЗКЛЮЧВАНЕ НА HDR" "Действие" "През нощта" "Залез" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 1cccc3c1a..60bed2524 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -93,6 +93,7 @@ "S\'està preparant la targeta SD…" "No s\'ha pogut accedir a la targeta SD." "Enregistrament a intervals" + "S\'està capturant." "Tria de la càmera" "Enrere" "Frontal" @@ -122,6 +123,7 @@ "3 Mp" "2 Mp" "2 Mp (16:9)" + "1,5 Mp" "1,3 Mp" "1 Mp" "VGA" @@ -157,10 +159,10 @@ "Auto" "HDR+" "HDR" - "Activa l\'HDR+" - "Desactiva l\'HDR+" - "Activa l\'HDR" - "Desactiva l\'HDR" + "HDR+ ACTIVAT" + "HDR+ DESACTIVAT" + "HDR ACTIVAT" + "HDR DESACTIVAT" "Acció" "Nit" "Posta de sol" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index e6d94363f..15ab0aa5e 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -93,6 +93,7 @@ "Příprava karty SD…" "Nelze získat přístup ke kartě SD." "Časosběrný záznam" + "Pořizování snímku" "Zvolit fotoaparát" "Zpět" "Přední" @@ -122,6 +123,7 @@ "3 Mpx" "2 Mpx" "2 Mpx (16:9)" + "1,5 Mpx" "1,3 Mpx" "1 Mpx" "VGA" @@ -157,10 +159,10 @@ "Automaticky" "HDR+" "HDR" - "Zapnout HDR+" - "Vypnout HDR+" - "Zapnout HDR" - "Vypnout HDR" + "HDR+ ZAPNUTO" + "HDR+ VYPNUTO" + "HDR ZAPNUTO" + "HDR VYPNUTO" "Akce" "Noc" "Západ slunce" @@ -226,8 +228,8 @@ "Zrušit" "Hotovo" "Pořídit další" - "Zap." - "Vyp." + "ZAP." + "VYP" "Vypnuto" "0,5 sekundy" "1 sekunda" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 3edce31ed..f35e546be 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -93,6 +93,7 @@ "Forbereder SD-kort.." "Det var ikke muligt at få adgang til SD-kortet." "Optagelse af tidsforløb" + "Fotograferer" "Vælg kamera" "Tilbage" "Front" @@ -122,6 +123,7 @@ "3 megapixel" "2 megapixels" "2 megapixels (16:9)" + "1,5 megapixels" "1,3 megapixels" "1 megapixel" "VGA" @@ -157,10 +159,10 @@ "Automatisk" "HDR+" "HDR" - "Slå HDR+ til" - "Slå HDR+ fra" - "Slå HDR til" - "Slå HDR fra" + "HDR+ TIL" + "HDR+ FRA" + "HDR TIL" + "HDR FRA" "Action" "Nat" "Solnedgang" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 19c2381d6..fc721a0ec 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -93,6 +93,7 @@ "SD-Karte wird vorbereitet…" "Kein Zugriff auf SD-Karte möglich" "Zeitrafferaufnahme" + "Wird aufgenommen" "Kamera wählen" "Zurück" "Vorderseite" @@ -122,6 +123,7 @@ "3 MP" "2 MP" "2 MP (16:9)" + "1,5 Megapixel" "1,3 MP" "1 MP" "VGA" @@ -157,10 +159,10 @@ "Automatisch" "HDR+" "HDR" - "HDR+ aktivieren" - "HDR+ deaktivieren" - "HDR aktivieren" - "HDR deaktivieren" + "HDR+ an" + "HDR+ aus" + "HDR an" + "HDR aus" "Bewegung" "Nachtaufnahme" "Sonnenuntergang" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index b98518284..25f78a3bb 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -93,6 +93,7 @@ "Προετοιμασία κάρτας SD…" "Δεν ήταν δυνατή η πρόσβαση στην κάρτα SD." "Εγγραφή παρέλευσης χρόνου" + "Λήψη" "Επιλογή φωτ. μηχανής" "Πίσω" "Μπροστινή" @@ -122,6 +123,7 @@ "3M εικονοστοιχεία" "2M εικονοστοιχεία" "2M εικονοστ. (16:9)" + "1.5M pixel" "1.3M εικονοστοιχεία" "1M εικονοστοιχεία" "VGA" @@ -157,10 +159,10 @@ "Αυτόματα" "HDR+" "HDR" - "Ενεργοποίηση του HDR+" - "Απενεργοποίηση του HDR+" - "Ενεργοποίηση του HDR" - "Απενεργοποίηση του HDR" + "ΕΝΕΡΓΟΠΟΙΗΣΗ HDR+" + "ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ HDR+" + "ΕΝΕΡΓΟΠΟΙΗΣΗ HDR" + "ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ HDR" "Ενέργεια" "Βράδυ" "Ηλιοβασίλεμα" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index c8d07eb21..cfd3f38fd 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -93,6 +93,7 @@ "Preparing SD card…" "Couldn\'t access SD card." "Time lapse recording" + "Capturing" "Choose camera" "Back" "Front" @@ -122,6 +123,7 @@ "3 M pixels" "2 M pixels" "2 M pixels (16:9)" + "1.5 M pixels" "1.3 M pixels" "1 M pixels" "VGA" @@ -157,10 +159,10 @@ "Auto" "HDR+" "HDR" - "Turn HDR+ On" - "Turn HDR+ Off" - "Turn HDR On" - "Turn HDR Off" + "HDR+ ON" + "HDR+ OFF" + "HDR ON" + "HDR OFF" "Action" "Night" "Sunset" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index c8d07eb21..cfd3f38fd 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -93,6 +93,7 @@ "Preparing SD card…" "Couldn\'t access SD card." "Time lapse recording" + "Capturing" "Choose camera" "Back" "Front" @@ -122,6 +123,7 @@ "3 M pixels" "2 M pixels" "2 M pixels (16:9)" + "1.5 M pixels" "1.3 M pixels" "1 M pixels" "VGA" @@ -157,10 +159,10 @@ "Auto" "HDR+" "HDR" - "Turn HDR+ On" - "Turn HDR+ Off" - "Turn HDR On" - "Turn HDR Off" + "HDR+ ON" + "HDR+ OFF" + "HDR ON" + "HDR OFF" "Action" "Night" "Sunset" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 85a7d5f61..31a4e2eed 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -93,6 +93,7 @@ "Preparando tarjeta SD…" "No se pudo acceder a la tarjeta SD." "Grabación en intervalos" + "Capturando" "Elegir cámara" "Trasera" "Frontal" @@ -122,6 +123,7 @@ "3 megapíxeles" "2 megapíxeles" "2 megapíxeles (16:9)" + "1,5 MP" "1,3 megapíxeles" "1 megapíxel" "VGA" @@ -157,10 +159,10 @@ "Automático" "HDR+" "HDR" - "Activar HDR+" - "Desactivar HDR+" - "Activar HDR" - "Desactivar HDR" + "HDR+ ACTIVADO" + "HDR+ DESACTIVADO" + "HDR ACTIVADO" + "HDR DESACTIVADO" "Acción" "Noche" "Atardecer" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 0c3333ebc..9e2b659dc 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -93,6 +93,7 @@ "Preparando tarjeta SD..." "No se ha podido acceder a la tarjeta SD." "Grabación a intervalos de tiempo" + "Capturando" "Seleccionar cámara" "Atrás" "Frontal" @@ -122,6 +123,7 @@ "3 MP" "2 MP" "2 MP (16:9)" + "1,5 MP" "1,3 MP" "1 MP" "VGA" @@ -157,10 +159,10 @@ "Automático" "HDR+" "ARD" - "Activar HDR+" - "Desactivar HDR+" - "Activar HDR" - "Desactivar HDR" + "HDR+ ACTIVADO" + "HDR+ DESACTIVADO" + "HDR ACTIVADO" + "HDR DESACTIVADO" "Acción" "Noche" "Atardecer" diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 7b841ae6f..88611e4c1 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -93,6 +93,7 @@ "SD-kaardi ettevalmistamine ..." "SD-kaardile ei saanud juurdepääsu." "Aeglustusrežiimis salvestamine" + "Pildistamine" "Kaamera valimine" "Tagasi" "Esikaamera" @@ -122,6 +123,7 @@ "3 megapikslit" "2 megapikslit" "2 MP (16 : 9)" + "1,5 megapikslit" "1,3 megapikslit" "1 megapiksel" "VGA" @@ -157,10 +159,10 @@ "Automaatne" "HDR+" "HDR" - "HDR+ sisselülitamine" - "HDR+ väljalülitamine" - "HDR-i sisselülitamine" - "HDR-i väljalülitamine" + "HDR+ ON SEES" + "HDR+ ON VÄLJAS" + "HDR ON SEES" + "HDR ON VÄLJAS" "Toiming" "Õhtu" "Päikeseloojang" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 00cd0f8ca..e457bf752 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -34,19 +34,19 @@ "جزئیات" "بستن" - "%1$d انتخاب شد" - "%1$d انتخاب شد" - "%1$d انتخاب شد" + "‏%1$d انتخاب شد" + "‏%1$d انتخاب شد" + "‏%1$d انتخاب شد" - "%1$d انتخاب شد" - "%1$d انتخاب شد" - "%1$d انتخاب شد" + "‏%1$d انتخاب شد" + "‏%1$d انتخاب شد" + "‏%1$d انتخاب شد" - "%1$d انتخاب شد" - "%1$d انتخاب شد" - "%1$d انتخاب شد" + "‏%1$d انتخاب شد" + "‏%1$d انتخاب شد" + "‏%1$d انتخاب شد" "نمایش در نقشه" "چرخش به چپ" @@ -66,7 +66,7 @@ "ارتفاع" "جهت" "مدت" - "نوع MIME" + "‏نوع MIME" "حجم فایل" "سازنده" "مدل" @@ -84,15 +84,16 @@ "نامشخص" "این مورد در دستگاه ذخیره شده و به صورت آفلاین در دسترس است." "لطفاً منتظر بمانید" - "در حال تولید تصویر Photo Sphere" + "‏در حال تولید تصویر Photo Sphere" "خطای دوربین" "اتصال به دوربین امکان‌پذیر نیست." "به دلیل خط‌مشی‌های امنیتی، دوربین غیرفعال شده است." "لطفاً منتظر بمانید…" - "قبل از استفاده از دوربین، یک کارت SD در آن قرار دهید." - "در حال آماده‌سازی کارت SD..." - "دسترسی به کارت SD ممکن نیست." + "‏قبل از استفاده از دوربین، یک کارت SD در آن قرار دهید." + "‏در حال آماده‌سازی کارت SD..." + "‏دسترسی به کارت SD ممکن نیست." "ضبط با قابلیت گذر زمان" + "درحال ضبط" "انتخاب دوربین" "برگشت" "جلو" @@ -101,7 +102,7 @@ "تایمر شمارش معکوس" "۱ ثانیه" - "%d ثانیه" + "‏%d ثانیه" @@ -122,6 +123,7 @@ "۳ مگاپیکسل" "۲ مگاپیکسل" "‫۲ مگاپیکسل (۱۶:۹)‏" + "‫۱٫۵ مگاپیکسل" "۱٫۳ مگاپیکسل" "۱ مگاپیکسل" "VGA" @@ -157,10 +159,10 @@ "خودکار" "HDR+‎" "HDR" - "روشن کردن HDR+‎" - "خاموش کردن HDR+‎" - "روشن کردن HDR" - "خاموش کردن HDR" + "‏HDR+‎ روشن" + "‏HDR+‎ خاموش" + "‏‫HDR روشن" + "‏‫HDR خاموش" "عملکرد" "شب" "غروب آفتاب" @@ -186,7 +188,7 @@ "دوربین جلو" "دوربین پشت" "تأیید" - "کارت SD شما پر شده است. تنظیمات کیفیت را تغییر دهید یا برخی تصاویر یا فایل‌های دیگر را حذف کنید." + "‏کارت SD شما پر شده است. تنظیمات کیفیت را تغییر دهید یا برخی تصاویر یا فایل‌های دیگر را حذف کنید." "حجم ویدیو به حداکثر مجاز رسید." "بسیار سریع" "در حال آماده‌سازی پانوراما" @@ -217,11 +219,11 @@ "شاتر" "دکمه منو" "انتخابگر دوربین، ویدیو یا پانوراما" - "کادر تأیید %1$s" + "‏کادر تأیید %1$s" "تغییر به حالت عکس" "تغییر به حالت ویدیو" "تغییر به حالت پانوراما" - "تغییر به Photo Sphere" + "‏تغییر به Photo Sphere" "تغییر به کیفیت بالا" "لغو بازبینی" "بازبینی انجام شد" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 5dc4183cb..2e40945cb 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -93,6 +93,7 @@ "Valmistellaan SD-korttia…" "SD-korttia ei voi käyttää." "Intervallikuvauksen tallennus" + "Kuvataan" "Valitse kamera" "Edellinen" "Etupuoli" @@ -122,6 +123,7 @@ "3 megapikseliä" "2 megapikseliä" "2 megap. (16:9)" + "1,5 megapikseliä" "1,3 megapikseliä" "1 megapikseli" "VGA" @@ -157,10 +159,10 @@ "Auto" "HDR+" "HDR" - "Ota HDR+ käyttöön" - "Poista HDR+ käytöstä" - "Ota HDR käyttöön" - "Poista HDR käytöstä" + "HDR+ KÄYTÖSSÄ" + "HDR+ EI KÄYTÖSSÄ" + "HDR KÄYTÖSSÄ" + "HDR EI KÄYTÖSSÄ" "Toiminto" "Yö" "Auringonlasku" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 9ff83bbf7..315ee656e 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -93,6 +93,7 @@ "Préparation de la carte SD en cours…" "Impossible d\'accéder à la carte SD." "Enregistr. mode Intervalle temps" + "Photo en cours…" "Sélectionner appareil" "Précédent" "Frontal" @@ -122,6 +123,7 @@ "3 mégapixels" "2 mégapixels" "2 mégapixels (16:9)" + "1,5 mégapixel" "1,3 mégapixel" "1 mégapixel" "VGA" @@ -157,10 +159,10 @@ "Automatique" "HDR+" "HDR" - "Activer le mode HDR+" - "Désactiver le mode HDR+" - "Activer le mode HDR" - "Désactiver le mode HDR" + "HDR+ ACTIVÉ" + "HDR+ DÉSACTIVÉ" + "HDR ACTIVÉ" + "HDR DÉSACTIVÉ" "Action" "Nuit" "C. de soleil" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 4cd432c07..fc2c76935 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -93,6 +93,7 @@ "Préparation de la carte SD en cours…" "Impossible d\'accéder à la carte SD." "Enregistrement mode Intervalle temps" + "Prise de vue en cours…" "Sélectionner caméra" "Arrière" "Frontale" @@ -122,6 +123,7 @@ "3 mégapixels" "2 mégapixels" "2 mégapixels (16:9)" + "1,5 mégapixel" "1,3 mégapixel" "1 mégapixel" "VGA" @@ -157,10 +159,10 @@ "Automatique" "HDR+" "HDR" - "Activer le mode HDR+" - "Désactiver le mode HDR+" - "Activer le mode HDR" - "Désactiver le mode HDR" + "HDR+ ACTIVÉ" + "HDR+ DÉSACTIVÉ" + "HDR ACTIVÉ" + "HDR DÉSACTIVÉ" "Action" "Nuit" "Coucher de soleil" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 830adca12..1acbdfbff 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -93,6 +93,7 @@ "SD कार्ड तैयार हो रहा है…" "SD कार्ड एक्सेस नहीं कर सका." "समय अंतराल रिकॉर्डिंग" + "कैप्चर हो रहा है" "कैमरा चुनें" "पीछे का कैमरा" "सामने का कैमरा" @@ -122,6 +123,7 @@ "3M पिक्सेल" "2M पिक्सेल" "2M पिक्सेल (16:9)" + "1.5M पिक्सेल" "1.3M पिक्सेल" "1M पिक्सेल" "VGA" @@ -157,10 +159,10 @@ "स्वतः" "HDR+" "HDR" - "HDR+ चालू करें" - "HDR+ बंद करें" - "HDR चालू करें" - "HDR बंद करें" + "HDR+ चालू" + "HDR+ बंद" + "HDR चालू" + "HDR बंद" "कार्यवाही" "रात" "सूर्यास्त" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 22b5759e5..cb4d20367 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -93,6 +93,7 @@ "Priprema SD kartice…" "Nije moguć pristup SD kartici." "Snimanje s vremenskim odmakom" + "Snimanje" "Odaberite fotoaparat" "Stražnji" "Prednji" @@ -122,6 +123,7 @@ "3 megapiksela" "2 megapiksela" "2 mpiks. (16:9)" + "1,5 megapiksela" "1,3 megapiksela" "1 megapiksel" "VGA" @@ -157,10 +159,10 @@ "Automatski" "VDR+" "VDR" - "Uključi VDR+" - "Isključi VDR+" - "Uključi VDR" - "Isključi VDR" + "HDR UKLJUČEN" + "HDR+ ISKLJUČEN" + "VDR UKLJUČEN" + "VDR ISKLJUČEN" "Radnja" "Noć" "Zalazak sunca" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 0384019b0..bc27b2e52 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -93,6 +93,7 @@ "SD-kártya előkészítése..." "Nem lehet hozzáférni az SD-kártyához." "Gyorsított felvétel" + "Rögzítés" "Kameraválasztás" "Hátsó" "Elülső" @@ -122,6 +123,7 @@ "3 megapixel" "2 megapixel" "2 megapixel (16:9)" + "1,5 megapixel" "1,3 megapixel" "1 megapixel" "VGA" @@ -157,10 +159,10 @@ "Automatikus" "HDR+" "HDR" - "HDR+ bekapcsolása" - "HDR+ kikapcsolása" - "HDR bekapcsolása" - "HDR kikapcsolása" + "HDR+ BEKAPCSOLVA" + "HDR+ KIKAPCSOLVA" + "HDR BEKAPCSOLVA" + "HDR KIKAPCSOLVA" "Mozgásban" "Éjszaka" "Napnyugta" diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 0e4f67bbc..3603d6a58 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -93,6 +93,7 @@ "Պատրաստվում է SD քարտը..." "SD քարտը հասանելի չէ:" "Ժամանակի սպառումով տեսագրություն" + "Լուսանկարում" "Ընտրել տեսախցիկը" "Հետևի" "Առջևի" @@ -122,6 +123,7 @@ "3Մ պիքսել" "2Մ պիքսել" "2Մ պիքսել (16:9)" + "1.5Մ պիքսել" "1.3Մ պիքսել" "1Մ պիքսել" "VGA" @@ -157,10 +159,10 @@ "Ավտոմատ" "HDR+" "HDR" - "Միացնել HDR+ը" - "Անջատել HDR+ը" - "Միացնել HDR-ը" - "Անջատել HDR-ը" + "HDR+ Միացնել" + "HDR+ Անջատել" + "HDR Միացնել" + "HDR Անջատել" "Գործողություն" "Գիշերային" "Մայրամուտ" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index b42624941..115f90175 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -93,6 +93,7 @@ "Menyiapkan kartu SD…" "Tidak dapat mengakses kartu SD." "Perekaman selang waktu" + "Menjepret" "Pilih kamera" "Kembali" "Depan" @@ -122,6 +123,7 @@ "3 M piksel" "2 M piksel" "2 M px (16:9)" + "1,5M piksel" "1,3 M piksel" "1 M piksel" "VGA" @@ -157,10 +159,10 @@ "Otomatis" "HDR+" "HDR" - "Aktifkan HDR+" - "Nonaktifkan HDR+" - "Aktifkan HDR" - "Nonaktifkan HDR" + "HDR+ AKTIF" + "HDR+ NONAKTIF" + "HDR AKTIF" + "HDR NONAKTIF" "Tindakan" "Malam" "Terbenam" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b5dcf6323..b9ba5e636 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -93,6 +93,7 @@ "Preparazione scheda SD..." "Accesso a scheda SD non riuscito." "Registrazione al rallentatore" + "Acquisizione..." "Scegli fotocamera" "Posteriore" "Anteriore" @@ -122,6 +123,7 @@ "3 Mpixel" "2 Mpixel" "2 Mpixel (16:9)" + "1,5 megapixel" "1,3 Mpixel" "1 Mpixel" "VGA" @@ -157,10 +159,10 @@ "Automatica" "HDR+" "HDR" - "Attiva HDR+" - "Disattiva HDR+" - "Attiva HDR" - "Disattiva HDR" + "HDR+ ATTIVO" + "HDR+ DISATTIVATO" + "HDR ATTIVO" + "HDR DISATTIVATO" "Azione" "Notte" "Tramonto" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 27601f17d..a75cd03d7 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -34,19 +34,19 @@ "פרטים" "סגור" - "%1$d נבחרו" - "%1$d נבחרו" - "%1$d נבחרו" + "‏%1$d נבחרו" + "‏%1$d נבחרו" + "‏%1$d נבחרו" - "%1$d נבחרו" - "%1$d נבחרו" - "%1$d נבחרו" + "‏%1$d נבחרו" + "‏%1$d נבחרו" + "‏%1$d נבחרו" - "%1$d נבחרו" - "%1$d נבחרו" - "%1$d נבחרו" + "‏%1$d נבחרו" + "‏%1$d נבחרו" + "‏%1$d נבחרו" "הצג במפה" "סובב שמאלה" @@ -66,7 +66,7 @@ "גובה" "כיוון" "משך זמן" - "סוג MIME" + "‏סוג MIME" "גודל קובץ" "יוצר" "דגם" @@ -75,7 +75,7 @@ "רוחק מוקד" "איזון לבן" "זמן חשיפה" - "ISO‏" + "‏ISO" "מ\"מ" "ידני" "אוטומטי" @@ -84,15 +84,16 @@ "לא ידוע" "הפריט מאוחסן באופן מקומי וזמין במצב לא מקוון." "המתן" - "מעבד את צילום ה-Photo Sphere" + "‏מעבד את צילום ה-Photo Sphere" "שגיאת מצלמה" "לא ניתן להתחבר למצלמה." "המצלמה הושבתה בשל מדיניות אבטחה." "המתן…" - "הכנס כרטיס SD לפני השימוש במצלמה." - "מכין כרטיס SD…" - "לא ניתן היה לגשת לכרטיס ה-SD." + "‏הכנס כרטיס SD לפני השימוש במצלמה." + "‏מכין כרטיס SD…" + "‏לא ניתן היה לגשת לכרטיס ה-SD." "הקלטה של צילום בהילוך מהיר" + "מצלם" "בחר מצלמה" "הקודם" "חזיתית" @@ -101,7 +102,7 @@ "טיימר לספירה לאחור" "שנייה אחת" - "%d שניות" + "‏%d שניות" @@ -122,6 +123,7 @@ "3 מגה פיקסל" "2 מגה פיקסל" "2 מגה פיקסל (16:9)" + "1.5 מגה פיקסל" "1.3 מגה פיקסל" "מגה פיקסל אחד" "VGA" @@ -157,10 +159,10 @@ "אוטומטי" "HDR+‎" "HDR" - "הפעל HDR+‎" - "כבה HDR+‎" - "הפעל HDR" - "כבה HDR" + "‏HDR+‎ פועל" + "‏HDR+‎ כבוי" + "‏HDR פועל" + "‏HDR כבוי" "פעולה" "לילה" "שקיעה" @@ -186,7 +188,7 @@ "מצלמה חזיתית" "מצלמה אחורית" "אישור" - "השטח בכרטיס ה-SD אוזל. שנה את הגדרת האיכות או מחק חלק מהתמונות או קבצים אחרים." + "‏השטח בכרטיס ה-SD אוזל. שנה את הגדרת האיכות או מחק חלק מהתמונות או קבצים אחרים." "הגעת למגבלת הגודל." "מהר מדי" "מכין פנורמה" @@ -217,11 +219,11 @@ "לחצן הצילום" "לחצן תפריט" "בורר מצב מצלמה, וידאו או פנורמה" - "תיבת סימון %1$s" + "‏תיבת סימון %1$s" "עבור לצילום תמונות" "עבור לצילום וידאו" "עבור לצילום פנורמה" - "עבור לצילום Photo Sphere" + "‏עבור לצילום Photo Sphere" "עבור לאיכות גבוהה" "ביטול בדיקה" "בדיקה בוצעה" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 761a48bc6..503ac3457 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -93,6 +93,7 @@ "SDカードを準備しています…" "SDカードにアクセスできませんでした。" "低速度撮影" + "キャプチャしています" "カメラを選択" "戻る" "前面" @@ -122,6 +123,7 @@ "3メガピクセル" "2メガピクセル" "2Mピクセル（16:9）" + "1.5Mピクセル" "1.3メガピクセル" "1メガピクセル" "VGA" @@ -157,10 +159,10 @@ "オート" "HDR+" "HDR" - "HDR+をONにする" - "HDR+をOFFにする" - "HDRをONにする" - "HDRをOFFにする" + "HDR+ ON" + "HDR+ OFF" + "HDR ON" + "HDR OFF" "スポーツ" "夜景" "夕焼け" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 8722085cf..2cf9557a5 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -93,6 +93,7 @@ "SD ბარათის მომზადება…" "SD ბარათზე წვდომა ვერ განხორციელდა." "ინტერვალური გადაღება" + "მიმდინარეობს შეყვანა" "კამერის არჩევა" "უკან" "წინ" @@ -122,6 +123,7 @@ "3 მეგაპიქსელი" "2 მეგაპიქსელი" "2 მეგაპიქსელი (16:9)" + "1,5 მეგაპიქსელი" "1.3 მეგაპიქსელი" "1 მეგაპიქსელი" "VGA" @@ -157,10 +159,10 @@ "ავტომატური" "HDR+" "HDR" - "HDR+\'ის ჩართვა" - "HDR+\'ის გამორთვა" - "HDR-ის ჩართვა" - "HDR-ის გამორთვა" + "HDR+ ჩართ." + "HDR+ გამორთ." + "HDR ჩართ." + "HDR გამორთ." "მოქმედება" "ღამე" "მზის ჩასვლა" diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index e76c2c96e..4ac792243 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -93,6 +93,7 @@ "កំពុង​រៀបចំ​កាត​អេសឌី..." "មិន​អាច​ចូល​ដំណើរការ​កាត​អេសឌី។" "កំណត់ត្រា​​ពេល​វេលា​កន្លង​ទៅ" + "កំពុង​ចាប់​យក" "ជ្រើស​ម៉ាស៊ីន​ថត" "ខាង​ក្រោយ" "ខាង​មុខ" @@ -122,6 +123,7 @@ "៣ មេហ្គា​ភីកសែល" "២ មេហ្គា​ភីកសែល" "២ មេហ្គាភីក​សែល (16:9)" + "១.៥ មេហ្គាភីក​សែល" "១.៣ មេហ្គា​ភីកសែល" "១ មេហ្គា​ភីកសែល" "VGA" @@ -157,10 +159,10 @@ "ស្វ័យប្រវត្តិ" "HDR+" "HDR" - "បើក HDR+" - "បិទ HDR++" - "បើក HDR" - "បិទ HDR" + "បើក HDR+" + "បិទ HDR+" + "បើក HDR" + "បិទ HDR" "សកម្មភាព" "រាត្រី" "ថ្ងៃ​លិច" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index c63af8f96..29e6583b7 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -93,6 +93,7 @@ "SD 카드 준비 중..." "SD 카드에 액세스할 수 없습니다." "시간 경과 모드" + "캡처 중" "카메라 선택" "이전" "전면" @@ -122,6 +123,7 @@ "300만 화소" "200만 화소" "200만 화소(16:9)" + "150만 화소" "130만 화소" "100만 화소" "VGA" @@ -157,10 +159,10 @@ "자동" "HDR+" "HDR" - "HDR+ 켜기" - "HDR+ 끄기" - "HDR 켜기" - "HDR 끄기" + "HDR+ 사용" + "HDR+ 사용 안함" + "HDR 사용" + "HDR 사용 안함" "액션" "밤" "일몰" diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index 62250754f..f70018ada 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -93,6 +93,7 @@ "ກຳລັງກະກຽມ SD card ..." "ບໍ່ສາມາດເຂົ້າເຖິງ SD card ໄດ້." "ການບັນທຶກພາບທາມແລບ" + "ກຳລັງບັນທຶກ" "ເລືອກກ້ອງ" "ກັບຄືນ" "ໜ້າ" @@ -122,6 +123,7 @@ "3 ລ້ານພິກເຊວ" "2 ລ້ານພິກເຊວ" "2 ລ້ານພິກເຊວ (16:9​)" + "1.5 ລ້ານພິກເຊວ" "1.3 ລ້ານພິກເຊວ" "1 ລ້ານພິກເຊວ" "VGA" @@ -157,10 +159,10 @@ "ອັດຕະໂນມັດ" "HDR+" "HDR" - "ເປີດໂໝດ HDR+" - "ປິດໂໝດ HDR+" - "ເປີດໂໝດ HDR" - "ປິດໂໝດ HDR" + "HDR+ ເປີດ" + "HDR+ ປິດ" + "HDR ເປີດ" + "HDR ປິດ" "ແອັກຊັນ" "ຕອນຄ່ຳ" "ຕາເວັນຕົກ" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 1f45d26fe..39ee62da6 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -93,6 +93,7 @@ "Ruošiama SD kortelė…" "Nepavyko pasiekti SD kortelės." "Įrašoma laiko intervalu" + "Fiksuojama" "Pasirin. fotoaparatą" "Atgal" "Į priekį" @@ -122,6 +123,7 @@ "3 megapikseliai" "2 megapikseliai" "2 megapiks. (16:9)" + "1,5 megapiks." "1,3 megapikselio" "1 megapikselis" "VGA" @@ -157,10 +159,10 @@ "Automatinis" "HDR+" "HDR" - "Įjungti HDR+" - "Išjungti HDR+" - "Įjungti HDR" - "Išjungti HDR" + "HDR+ funkcija įjungta" + "HDR+ funkcija išjungta" + "HDR funkcija įjungta" + "HDR funkcija išjungta" "Veiksmas" "Naktis" "Saulėlydis" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index ebe480185..7f3ec11b9 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -93,6 +93,7 @@ "SD kartes sagatavošana..." "Nevarēja piekļūt SD kartei." "Intervāla fotografēšanas režīms" + "Uzņem attēlu…" "Kameras izvēle" "Aizmugurējā" "Priekšējā" @@ -122,6 +123,7 @@ "3 megapikseļi" "2 megapikseļi" "2 megapiks. (16:9)" + "1,5 megapikseļi" "1,3 megapikseļi" "1 megapikselis" "VGA" @@ -155,12 +157,12 @@ "MĀKOŅAINS" "Ainavas režīms" "Automātiski" - "Augsts din.diap." + "HDR+" "Augsts din.diap." - "Ieslēgt HDR+" - "Izslēgt HDR+" - "Ieslēgt HDR" - "Izslēgt HDR" + "IESLĒGTS HDR+ REŽĪMS" + "IZSLĒGTS HDR+ REŽĪMS" + "IESLĒGTS AUGSTS DINAMISKAIS DIAPAZONS" + "IZSLĒGTS AUGSTS DINAMISKAIS DIAPAZONS" "Kustība" "Nakts" "Saulriets" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index bf0df9d89..eb6d3704b 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -93,6 +93,7 @@ "SD карт бэлдэж байна…" "SD картад хандаж чадсангүй." "Цагийн урсгал бичигдэж байна" + "Авч байна" "Камер сонгох" "Буцах" "Өмнөх" @@ -122,6 +123,7 @@ "3M пиксел" "2M пиксел" "2M пиксел (16:9)" + "1.5M пиксел" "1.3M пиксел" "1M пиксел" "VGA" @@ -157,10 +159,10 @@ "Автомат" "HDR+" "HDR" - "HDR+ асаах" - "HDR+ унтраах" - "HDR-г асаах" - "HDR-г унтраах" + "HDR+ ИДЭВХЖСЭН" + "HDR+ ИДЭВХГҮЙ" + "HDR ИДЭВХЖСЭН" + "HDR ИДЭВХГҮЙ" "Үйлдэл" "Шөнө" "Нар жаргах" diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index ce353041f..ff24fe4ad 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -93,6 +93,7 @@ "Menyediakan kad SD..." "Tidak dapat mengakses kad SD." "Rakaman selang masa" + "Menangkap" "Pilih kamera" "Kembali" "Depan" @@ -122,6 +123,7 @@ "3M piksel" "2M piksel" "2M piksel (16:9)" + "1.5M piksel" "1.3M piksel" "1M piksel" "VGA" @@ -157,10 +159,10 @@ "Auto" "HDR+" "HDR" - "Hidupkan HDR+" - "Matikan HDR+" - "Hidupkan HDR" - "Matikan HDR" + "HDR+ DIHIDUPKAN" + "HDR+ DIMATIKAN" + "HDR DIHIDUPKAN" + "HDR DIMATIKAN" "Tindakan" "Malam" "Senja" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index eb8c0d0b4..6ee3286cd 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -93,6 +93,7 @@ "Forbereder SD-kort …" "Får ikke tilgang til SD-kort." "Tidsintervallopptak" + "Tar bilde …" "Velg kamera" "Tilbake" "Frontkamera" @@ -122,6 +123,7 @@ "3 megapiksler" "2 megapiksler" "2 megapiksler (16:9)" + "1,5 M piksler" "1,3 megapiksler" "1 megapiksel" "VGA" @@ -157,10 +159,10 @@ "Auto" "HDR+" "HDR" - "Slå på HDR+" - "Slå av HDR+" - "Slå på HDR" - "Slå av HDR" + "HDR+ PÅ" + "HDR+ AV" + "HDR PÅ" + "HDR AV" "Action" "Natt" "Solnedgang" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 1c886db60..66cf12c6c 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -93,6 +93,7 @@ "SD-kaart voorbereiden…" "Geen toegang tot SD-kaart." "Time-lapse-opname" + "Vastleggen" "Camera selecteren" "Achterzijde" "Voorzijde" @@ -122,6 +123,7 @@ "3 megapixel" "2 megapixel" "2 megapixel (16:9)" + "1,5 megapixel" "1,3 megapixel" "1 megapixel" "VGA" @@ -157,10 +159,10 @@ "Automatisch" "HDR+" "HDR" - "HDR+ inschakelen" - "HDR+ uitschakelen" - "HDR inschakelen" - "HDR uitschakelen" + "HDR+ AAN" + "HDR+ UIT" + "HDR AAN" + "HDR UIT" "Actie" "Nacht" "Zonsondergang" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index dfa2353ed..0f918e626 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -93,6 +93,7 @@ "Przygotowuję kartę SD…" "Nie udało się otworzyć karty SD." "Nagrywanie poklatkowe" + "Robię zdjęcie" "Wybierz aparat" "Tylny" "Przedni" @@ -122,6 +123,7 @@ "3 Mpix" "2 Mpix" "2 Mpix (16:9)" + "1,5 mln pikseli" "1,3 Mpix" "1 Mpix" "VGA" @@ -157,10 +159,10 @@ "Automatycznie" "HDR+" "HDR" - "Włącz HDR+" - "Wyłącz HDR+" - "Włącz HDR" - "Wyłącz HDR" + "HDR+ WŁĄCZONY" + "HDR+ WYŁĄCZONY" + "HDR WŁĄCZONY" + "HDR WYŁĄCZONY" "Akcja" "Noc" "Zachód słońca" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 73ead39bc..dcd48b041 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -93,6 +93,7 @@ "A preparar cartão SD..." "Não foi possível aceder ao cartão SD." "Gravação com intervalo de tempo" + "A capturar" "Escolher câmara" "Anterior" "Frontal" @@ -122,6 +123,7 @@ "3 MP" "2 MP" "2 MP (16:9)" + "1,5 megapíxeis" "1,3 MP" "1 MP" "VGA" @@ -157,10 +159,10 @@ "Automático" "HDR+" "HDR" - "Ativar HDR+" - "Desativar HDR+" - "Ativar HDR" - "Desativar HDR" + "HDR+ ATIVADO" + "HDR+ DESATIVADO" + "HDR ATIVADO" + "HDR DESATIVADO" "Ação" "Noite" "Pôr do sol" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index b97294258..e3e9517b3 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -93,6 +93,7 @@ "Preparando cartão SD…" "Não foi possível acessar o cartão SD." "Gravação de passagem de tempo" + "Capturando" "Escolher câmera" "Voltar" "Frontal" @@ -122,6 +123,7 @@ "3 MP" "2 MP" "2 MP (16:9)" + "1.5 MP" "1.3 MP" "1 MP" "VGA" @@ -157,10 +159,10 @@ "Automático" "HDR+" "HDR" - "Ativar HDR+" - "Desativar HDR+" - "Ativar HDR" - "Desativar HDR" + "HDR+ ATIVADO" + "HDR+ DESATIVADO" + "HDR ATIVADO" + "HDR DESATIVADO" "Ação" "Noite" "Pôr do sol" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index c11fef48c..001108aa6 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -93,6 +93,7 @@ "Se pregătește cardul SD..." "Nu s-a putut accesa cardul SD." "Înregistrare cu filmare lentă" + "Se capturează" "Alegeți camera foto" "Înapoi" "Față" @@ -122,6 +123,7 @@ "3 MP" "2 MP" "2 MP (16:9)" + "1,5 MP" "1,3 MP" "1 MP" "VGA" @@ -157,10 +159,10 @@ "Automat" "HDR+" "HDR" - "Activați HDR+" - "Dezactivați HDR+" - "Activați HDR" - "Dezactivați HDR" + "HDR+ ACTIVAT" + "HDR+ DEZACTIVAT" + "HDR ACTIVAT" + "HDR DEZACTIVAT" "Acțiune" "Noapte" "Apus de soare" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index fa18753b3..62d1769cb 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -93,6 +93,7 @@ "Подготовка SD-карты…" "Нет доступа к SD-карте" "Режим замедленной съемки" + "Подождите…" "Выбор камеры" "Основная" "Фронтальная" @@ -122,6 +123,7 @@ "3 Мпикс." "2 Мпикс." "2 Мпикс. (16:9)" + "1,5 Мпикс." "1,3 Мпикс." "1 Мпикс." "640 х 480 пикс." @@ -157,10 +159,10 @@ "Авто" "HDR+" "HDR" - "Включить HDR+" - "Отключить HDR+" - "Включить HDR" - "Отключить HDR" + "ВКЛЮЧИТЬ HDR+" + "ОТКЛЮЧИТЬ HDR+" + "ВКЛЮЧИТЬ HDR" + "ОТКЛЮЧИТЬ HDR" "В движении" "Ночная съемка" "Закат" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index b81cf02ca..9be1e91c6 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -93,6 +93,7 @@ "Príprava karty SD..." "Nepodarilo sa získať prístup ku karte SD." "Časozberný záznam" + "Prebieha snímanie" "Vybrať fotoaparát" "Späť" "Predný" @@ -122,6 +123,7 @@ "3 Mpx" "2 Mpx" "2 Mpx (16:9)" + "1,5 Mpx" "1,3 Mpx" "1 Mpx" "VGA" @@ -157,10 +159,10 @@ "Automaticky" "HDR+" "HDR" - "Zapnúť HDR+" - "Vypnúť HDR+" - "Zapnúť HDR" - "Vypnúť HDR" + "HDR+ ZAPNUTÉ" + "HDR+ VYPNUTÉ" + "HDR ZAPNUTÉ" + "HDR VYPNUTÉ" "Akcia" "Noc" "Západ slnka" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 488138457..3af43a200 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -93,6 +93,7 @@ "Priprava kartice SD …" "Dostop do kartice SD ni bil mogoč." "Snemanje s časovnim zamikom" + "Snemanje" "Izberite fotoaparat" "Zadaj" "Spredaj" @@ -122,6 +123,7 @@ "3 M slikovnih pik" "2 M slikovnih pik" "2 M pik (16 : 9)" + "1,5 mio. sl. pik" "1,3 M slikovnih pik" "1 M slikovnih pik" "VGA" @@ -157,10 +159,10 @@ "Samodejno" "HDR+" "HDR" - "Vklop načina HDR+" - "Izklop načina HDR+" - "Vklop načina HDR" - "Izklop načina HDR" + "HDR+ VKLOPLJEN" + "HDR+ IZKLOPLJEN" + "HDR VKLOPLJEN" + "HDR IZKLOPLJEN" "Gibanje" "Ponoči" "Sončni zahod" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 5553bbd18..d3f869ba9 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -93,6 +93,7 @@ "Припремање SD картице…" "Није могуће приступити SD картици." "Снимањe у дужем интервалу" + "Снимање" "Изаберите камеру" "Задња" "Предња" @@ -122,6 +123,7 @@ "3 мегапиксела" "2 мегапиксела" "2 мегапиксела (16:9)" + "1,5 мегапиксела" "1,3 мегапиксела" "1 мегапиксел" "VGA" @@ -157,10 +159,10 @@ "Аутоматски" "HDR+" "HDR" - "Укључи HDR+" - "Искључи HDR+" - "Укључи HDR" - "Искључи HDR" + "УКЉУЧИ HDR+" + "ИСКЉУЧИ HDR+" + "УКЉУЧИ HDR" + "ИСКЉУЧИ HDR" "Радња" "Ноћ" "Залазак сунца" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index b4cf2d74c..eed747053 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -93,6 +93,7 @@ "Förbereder SD-kort …" "Det gick inte att öppna SD-kortet." "Intervallinspelning" + "Tar ett foto …" "Välj kamera" "Bakre" "Främre" @@ -122,6 +123,7 @@ "3 megapixlar" "2 megapixlar" "2 megapixlar (16:9)" + "1,5 megapixel" "1,3 megapixlar" "1 megapixel" "VGA" @@ -157,10 +159,10 @@ "Auto" "HDR+" "HDR" - "Aktivera HDR+" - "Inaktivera HDR+" - "Aktivera HDR" - "Inaktivera HDR" + "HDR+ PÅ" + "HDR+ AV" + "HDR PÅ" + "HDR AV" "Rörligt objekt" "Natt" "Solnedgång" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 5d715ba47..750b4689d 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -93,6 +93,7 @@ "Inatayarisha kadi ya SD..." "Haikuweza kufikia kadi ya SD." "Kurekodi wa muda ukipita" + "Inapiga picha" "Chagua kamera" "Nyuma" "Mbele" @@ -122,6 +123,7 @@ "Megapikseli 3" "Megapikseli 2" "Megapikseli 2 (16:9)" + "Pikseli Milioni 1.5" "Megapikseli 1.3" "Megapikseli 1" "VGA" @@ -157,10 +159,10 @@ "Kiotomatiki" "HDR+" "HDR" - "Washa HDR+" - "Zima HDR+" - "Washa HDR" - "Zima HDR" + "HDR+ IMEWASHWA" + "HDR+ IMEZIMWA" + "HDR IMEWASHWA" + "HDR IMEZIMWA" "Kitendo" "Usiku" "Machweo" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 49cc1b274..5b69f9f8a 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -93,6 +93,7 @@ "กำลังเตรียมการ์ด SD…" "ไม่สามารถเข้าถึงการ์ด SD" "การบันทึกเป็นช่วงเวลา" + "กำลังจับภาพ" "เลือกกล้องถ่ายรูป" "กลับ" "ด้านหน้า" @@ -122,6 +123,7 @@ "3 ล้านพิกเซล" "2 ล้านพิกเซล" "2 ล้านพิกเซล (16:9)" + "1.5 ล้านพิกเซล" "1.3 ล้านพิกเซล" "1 ล้านพิกเซล" "VGA" @@ -157,10 +159,10 @@ "ออโต้" "HDR+" "HDR" - "เปิด HDR+" - "ปิด HDR+" - "เปิด HDR" - "ปิด HDR" + "เปิด HDR+" + "ปิด HDR+" + "เปิด HDR" + "ปิด HDR" "การทำงาน" "กลางคืน" "ดวงอาทิตย์ตก" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 6789ac0a5..3737711e7 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -93,6 +93,7 @@ "Ihinahanda ang SD card..." "Hindi ma-access ang SD card." "Pag-record ng time lapse" + "Kinukunan" "Pumili ng camera" "Bumalik" "Harap" @@ -122,6 +123,7 @@ "3M pixel" "2M pixel" "2M pixel (16:9)" + "1.5M pixel" "1.3M pixel" "1M pixel" "VGA" @@ -157,10 +159,10 @@ "Auto" "HDR+" "HDR" - "I-on ang HDR+" - "I-off ang HDR+" - "I-on ang HDR" - "I-off ang HDR" + "NAKA-ON ANG HDR+" + "NAKA-OFF ANG HDR+" + "NAKA-ON ANG HDR" + "NAKA-OFF ANG HDR" "Aksyon" "Gabi" "Takipsilim" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 1597fd5db..9face74ee 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -93,6 +93,7 @@ "SD kart hazırlanıyor..." "SD karta erişilemedi." "Zaman atlamalı kayıt" + "Fotoğraf çekiliyor" "Kamera seçin" "Arka" "Ön" @@ -122,6 +123,7 @@ "3 megapiksel" "2 megapiksel" "2 megapiksel (16:9)" + "1,5 M piksel" "1,3 megapiksel" "1 megapiksel" "VGA" @@ -157,10 +159,10 @@ "Otomatik" "HDR+" "HDR" - "HDR+\'yı Aç" - "HDR+\'yı Kapat" - "HDR\'yi Aç" - "HDR\'yi Kapat" + "HDR+ AÇIK" + "HDR+ KAPALI" + "HDR AÇIK" + "HDR KAPALI" "Hareket" "Gece" "Gün batımı" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index c4a6bdfe8..8719e4b61 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -93,6 +93,7 @@ "Підготовка карти SD…" "Не вдалось отримати доступ до карти SD." "Запис уповільненої зйомки" + "Зйомка" "Вибрати камеру" "Задня камера" "Передня камера" @@ -122,6 +123,7 @@ "3 Мпікс." "2 Мпікс." "2 Мпікс. (16:9)" + "1,5 Мпікс." "1,3 Mпікс." "1 Мпікс." "VGA" @@ -157,10 +159,10 @@ "Авто" "HDR+" "HDR" - "Увімкнути режим HDR+" - "Вимкнути режим HDR+" - "Увімкнути режим HDR" - "Вимкнути режим HDR" + "HDR+ УВІМКНЕНО" + "HDR+ ВИМКНЕНО" + "HDR УВІМКНЕНО" + "HDR ВИМКНЕНО" "Під час руху" "Ніч" "Захід сонця" @@ -216,7 +218,7 @@ "ФОН" "Витримка" "Кнопка меню" - "Перемикач мід режимами фото, відео чи панорами" + "Перемикач між режимами фото, відео чи панорами" "Прапорець %1$s" "Перейти в режим фото" "Перейти в режим відео" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index b5b72da87..0c9d40ba3 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -93,6 +93,7 @@ "Đang chuẩn bị thẻ SD…" "Không thể truy cập thẻ SD." "Đang quay ở chế độ khoảng thời gian" + "Đang chụp" "Chọn máy ảnh" "Quay lại" "Trước" @@ -122,6 +123,7 @@ "3M pixel" "2M pixel" "2M pixel (16:9)" + "1,5 M pixel" "1,3M pixel" "1M pixel" "VGA" @@ -157,10 +159,10 @@ "Tự động" "HDR+" "HDR" - "Bật HDR+" - "Tắt HDR+" - "Bật HDR" - "Tắt HDR" + "BẬT HDR+" + "TẮT HDR+" + "BẬT HDR" + "TẮT HDR" "Tác vụ" "Đêm" "Hoàng hôn" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 136e579e5..3748af72e 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -93,6 +93,7 @@ "正在准备 SD 卡…" "无法使用 SD 卡。" "延时录影" + "正在拍摄" "选择摄像头" "后置" "前置" @@ -122,6 +123,7 @@ "300万像素" "200万像素" "200万像素 (16:9)" + "150万像素" "130万像素" "100万像素" "VGA" @@ -157,10 +159,10 @@ "自动" "HDR+" "HDR" - "开启 HDR+" - "关闭 HDR+" - "开启 HDR" - "关闭 HDR" + "开启 HDR+" + "关闭 HDR+" + "开启 HDR" + "关闭 HDR" "运动" "夜间" "日落" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 9e58a1beb..07523fe78 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -93,6 +93,7 @@ "正在準備 SD 卡…" "無法存取 SD 卡。" "延時攝影錄製" + "拍攝中" "選擇相機" "後置鏡頭" "前置鏡頭" @@ -122,6 +123,7 @@ "3 百萬像素" "2 百萬像素" "2 百萬像素 (16:9)" + "150 萬像素" "130 萬像素" "1 百萬像素" "VGA" @@ -157,10 +159,10 @@ "自動" "HDR+ (高動態範圍)" "高動態範圍" - "開啟 HDR+ (高動態範圍)" - "關閉 HDR+ (高動態範圍)" - "開啟 HDR (高動態範圍)" - "關閉 HDR (高動態範圍)" + "開啟 HDR+" + "關閉 HDR+" + "開啟 HDR" + "關閉 HDR" "動作" "夜景" "日落" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 77d1ca7e7..9697eec7b 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -93,6 +93,7 @@ "正在準備 SD 卡…" "無法存取 SD 卡。" "延時攝影錄製" + "拍攝中" "選擇相機" "後置" "前置" @@ -122,6 +123,7 @@ "300 萬像素" "200 萬像素" "200 萬像素 (16:9)" + "150 萬像素" "130 萬像素" "100 萬像素" "VGA" @@ -157,10 +159,10 @@ "自動" "高動態範圍+" "高動態範圍" - "開啟 HDR+" - "關閉 HDR+" - "開啟 HDR" - "關閉 HDR" + "開啟 HDR+" + "關閉 HDR+" + "開啟 HDR" + "關閉 HDR" "動作" "夜景" "黃昏" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 999bc0b91..73554c790 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -93,6 +93,7 @@ "Ilungiselela ikhadi le-SD..." "Yehlukekile ukufinyelela kwikhadi le-SD." "Ukurekhoda ukuphela kwesikhathi" + "Iyathwebula" "Khetha ikhamela" "Emuva" "Phambili" @@ -122,6 +123,7 @@ "3M amaphikiseli" "2M amaphikiseli" "2M amaphikiseli (16:9)" + "1.5M amaphikiseli" "1.3M amaphikiseli" "1M amaphikiseli" "I-VGA" @@ -157,10 +159,10 @@ "Okuzenzakalelayo" "I-HDR+" "I-HDR" - "Vula i-HDR+" - "Vala i-HDR+" - "Vula i-HDR" - "Vala i-HDR" + "I-HDR+ IVULIWE" + "I-HDR+ IVALIWE" + "I-HDR IVULIWE" + "I-HDR IVALIWE" "Isenzo" "Ebusuku" "Ukushona kwelanga" -- cgit v1.2.3 From adf70222d8c493a6880c54b8f939c541a61949bf Mon Sep 17 00:00:00 2001 From: Geoff Mendal Date: Mon, 25 Nov 2013 11:53:21 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I50cb348cf6e31dcb28145087c649c5106bd563d5 Auto-generated-cl: translation import --- res/values-ar/strings.xml | 2 +- res/values-fa/strings.xml | 2 +- res/values-it/strings.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 364d79686..a90afc912 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -75,7 +75,7 @@ "البعد البؤري" "توازن الأبيض" "مدة المشاهدة" - "ISO" + "أيزو" "ملليمتر" "يدويًا" "تلقائيًا" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index e457bf752..387ba68b9 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -75,7 +75,7 @@ "فاصله کانونی" "توازن سفیدی" "زمان نوردهی" - "ISO" + "ایزو" "میلی‌متر" "دستی" "خودکار" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b9ba5e636..19efe914d 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -112,7 +112,7 @@ "Qualità video" "Alta" "Bassa" - "Rallentatore" + "Time-lapse" "Impostazioni della fotocamera" "Impostazioni videocamera" "Dimensioni immagine" @@ -275,7 +275,7 @@ "ore" "Fine" "Imposta l\'intervallo di tempo" - "La funzione Rallentatore non è attiva. Attivala per impostare l\'intervallo di tempo." + "La funzione Time lapse non è attiva. Attivala per impostare l\'intervallo di tempo." "Imposta la durata in secondi" "Conto alla rovescia per scattare una foto" "Memorizzare i luoghi delle foto?" -- cgit v1.2.3 From 7191c9558e22e81bdbaf34411bebe92d32eacfbb Mon Sep 17 00:00:00 2001 From: Geoff Mendal Date: Mon, 25 Nov 2013 11:54:26 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I258a9c2191463a2d46a6524e6523c7639ee183b4 Auto-generated-cl: translation import --- res/values-ar/strings.xml | 2 +- res/values-fa/strings.xml | 2 +- res/values-it/strings.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 364d79686..a90afc912 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -75,7 +75,7 @@ "البعد البؤري" "توازن الأبيض" "مدة المشاهدة" - "ISO" + "أيزو" "ملليمتر" "يدويًا" "تلقائيًا" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index e457bf752..387ba68b9 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -75,7 +75,7 @@ "فاصله کانونی" "توازن سفیدی" "زمان نوردهی" - "ISO" + "ایزو" "میلی‌متر" "دستی" "خودکار" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b9ba5e636..19efe914d 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -112,7 +112,7 @@ "Qualità video" "Alta" "Bassa" - "Rallentatore" + "Time-lapse" "Impostazioni della fotocamera" "Impostazioni videocamera" "Dimensioni immagine" @@ -275,7 +275,7 @@ "ore" "Fine" "Imposta l\'intervallo di tempo" - "La funzione Rallentatore non è attiva. Attivala per impostare l\'intervallo di tempo." + "La funzione Time lapse non è attiva. Attivala per impostare l\'intervallo di tempo." "Imposta la durata in secondi" "Conto alla rovescia per scattare una foto" "Memorizzare i luoghi delle foto?" -- cgit v1.2.3 From 88f9b3e75c313d181c49ac644930627c40b2138d Mon Sep 17 00:00:00 2001 From: Seth Raphael Date: Wed, 27 Nov 2013 14:29:24 -0800 Subject: Reduce logging of flattened Preferences Bug: 11901390 Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905 --- src/com/android/camera/PhotoModule.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 9b1853a8a..9bde1c1b3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -918,8 +918,7 @@ public class PhotoModule setCameraState(SNAPSHOT_IN_PROGRESS); UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, UsageStatistics.ACTION_CAPTURE_DONE, "Photo", 0, - UsageStatistics.hashFileName(mNamedImages.mQueue.lastElement().title + ".jpg"), - mParameters.flatten()); + UsageStatistics.hashFileName(mNamedImages.mQueue.lastElement().title + ".jpg")); return true; } -- cgit v1.2.3 From 7993f4521011869a794da69e4d0057fe3b0886c3 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Fri, 12 Jul 2013 11:36:47 -0700 Subject: Always set focus mode first before applying scene mode cherrypick from Bryce branch Bug: 9577903 Bug: 11777611 Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880 --- src/com/android/camera/PhotoModule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 9bde1c1b3..2afaf5bf5 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1613,6 +1613,10 @@ public class PhotoModule setFocusAreasIfSupported(); setMeteringAreasIfSupported(); + // initialize focus mode + mFocusManager.overrideFocusMode(null); + mParameters.setFocusMode(mFocusManager.getFocusMode()); + // Set picture size. String pictureSize = mPreferences.getString( CameraSettings.KEY_PICTURE_SIZE, null); -- cgit v1.2.3 From 398f151a6292a617cd635cc05fa9e0abaece5c19 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Wed, 12 Jun 2013 11:57:45 -0700 Subject: Add another HTC picture resolution patching into Carlsbad branch from Bryce Bug: 9370319 Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc Conflicts: res/values/strings.xml --- res/values/arrays.xml | 4 +++- res/values/strings.xml | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 050f5a6d7..79dbcd94f 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -159,7 +159,8 @@ @string/pref_camera_picturesize_entry_5mp @string/pref_camera_picturesize_entry_5mp @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_4mp + @string/pref_camera_picturesize_entry_4mp_wide + @string/pref_camera_picturesize_entry_3mp @string/pref_camera_picturesize_entry_3mp @string/pref_camera_picturesize_entry_2mp @string/pref_camera_picturesize_entry_2mp_wide @@ -185,6 +186,7 @@ 2560x1920 2688x1520 2048x1536 + 2048x1520 1600x1200 1920x1088 1920x1080 diff --git a/res/values/strings.xml b/res/values/strings.xml index 9879864a9..7df7f5e94 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -265,7 +265,7 @@ 5M pixels - 4M pixels + 4M pixels (16:9) 3M pixels @@ -281,7 +281,6 @@ VGA - QVGA -- cgit v1.2.3 From 0f7d5488d33988c1ee3636fe3a7d6472bed84f00 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Thu, 11 Jul 2013 13:48:15 -0700 Subject: Revert fixed focus area in CAF mode Bug: 9306098 This doesn't set the faces as focus/exp areas yet, but resets the focus area to null in CAF mode to let the HAL decide focus/exp area. Cherrypick of Bryce CL into Carlsbad. Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0 Conflicts: src/com/android/camera/FocusOverlayManager.java --- src/com/android/camera/FocusOverlayManager.java | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java index f382a2ad6..797316258 100644 --- a/src/com/android/camera/FocusOverlayManager.java +++ b/src/com/android/camera/FocusOverlayManager.java @@ -89,7 +89,6 @@ public class FocusOverlayManager { private Handler mHandler; Listener mListener; private boolean mPreviousMoving; - private boolean mFocusDefault; private FocusUI mUI; private final Rect mPreviewRect = new Rect(0, 0, 0, 0); @@ -141,7 +140,6 @@ public class FocusOverlayManager { setParameters(parameters); mListener = listener; setMirror(mirror); - mFocusDefault = true; mUI = ui; } @@ -291,7 +289,7 @@ public class FocusOverlayManager { updateFocusUI(); // If this is triggered by touch focus, cancel focus after a // while. - if (!mFocusDefault) { + if (mFocusArea != null) { mHandler.sendEmptyMessageDelayed(RESET_TOUCH_FOCUS, RESET_TOUCH_FOCUS_DELAY); } if (shutterButtonPressed) { @@ -362,12 +360,12 @@ public class FocusOverlayManager { UsageStatistics.ACTION_TOUCH_FOCUS, x + "," + y); // Let users be able to cancel previous touch focus. - if ((!mFocusDefault) && (mState == STATE_FOCUSING || + if ((mFocusArea != null) && (mState == STATE_FOCUSING || mState == STATE_SUCCESS || mState == STATE_FAIL)) { cancelAutoFocus(); } if (mPreviewRect.width() == 0 || mPreviewRect.height() == 0) return; - mFocusDefault = false; + // Initialize variables. // Initialize mFocusArea. if (mFocusAreaSupported) { initializeFocusAreas(x, y); @@ -447,7 +445,7 @@ public class FocusOverlayManager { if (mParameters == null) return Parameters.FOCUS_MODE_AUTO; List supportedFocusModes = mParameters.getSupportedFocusModes(); - if (mFocusAreaSupported && !mFocusDefault) { + if (mFocusAreaSupported && mFocusArea != null) { // Always use autofocus in tap-to-focus. mFocusMode = Parameters.FOCUS_MODE_AUTO; } else { @@ -492,7 +490,7 @@ public class FocusOverlayManager { // Show only focus indicator or face indicator. if (mState == STATE_IDLE) { - if (mFocusDefault) { + if (mFocusArea == null) { mUI.clearFocus(); } else { // Users touch on the preview and the indicator represents the @@ -520,14 +518,8 @@ public class FocusOverlayManager { // Put focus indicator to the center. clear reset position mUI.clearFocus(); // Initialize mFocusArea. - if (mFocusAreaSupported) { - initializeFocusAreas(mPreviewRect.centerX(), mPreviewRect.centerY()); - } - // Reset metering area when no specific region is selected. - if (mMeteringAreaSupported) { - resetMeteringAreas(); - } - mFocusDefault = true; + mFocusArea = null; + mMeteringArea = null; } private void calculateTapArea(int x, int y, float areaMultiple, Rect rect) { -- cgit v1.2.3 From 13350e5e46db241b4f6d1ad3f371ac7292c12e65 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Mon, 24 Jun 2013 13:22:52 -0700 Subject: Fix WB indicator override Patching into Carlsbad from Bryce. Bug: 9372794 Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78 --- src/com/android/camera/PhotoUI.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 8308e1561..5018c16d6 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -526,12 +526,15 @@ public class PhotoUI implements PieListener, mOnScreenIndicators.updateExposureOnScreenIndicator(params, CameraSettings.readExposure(prefs)); mOnScreenIndicators.updateFlashOnScreenIndicator(params.getFlashMode()); - int wbIndex = 2; + int wbIndex = -1; + String wb = params.getWhiteBalance(); ListPreference pref = group.findPreference(CameraSettings.KEY_WHITE_BALANCE); if (pref != null) { - wbIndex = pref.getCurrentIndex(); + wbIndex = pref.findIndexOfValue(wb); } - mOnScreenIndicators.updateWBIndicator(wbIndex); + // make sure the correct value was found + // otherwise use auto index + mOnScreenIndicators.updateWBIndicator(wbIndex < 0 ? 2 : wbIndex); boolean location = RecordLocationPreference.get( prefs, mActivity.getContentResolver()); mOnScreenIndicators.updateLocationIndicator(location); -- cgit v1.2.3 From d75b9aee9a205d6c4d96aa8913131430a0d9a399 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Thu, 30 May 2013 07:45:41 -0700 Subject: Fix samsung video recording Patching Bryce CL into Carlsbad Bug: 9056573 Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9 Conflicts: src/com/android/camera/VideoModule.java --- src/com/android/camera/VideoModule.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 0ee62bb9d..92a2a9493 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -965,7 +965,6 @@ public class VideoModule implements CameraModule, } mMediaRecorder = new MediaRecorder(); - setupMediaRecorderPreviewDisplay(); // Unlock the camera object before passing it to media recorder. mCameraDevice.unlock(); mMediaRecorder.setCamera(mCameraDevice.getCamera()); @@ -974,6 +973,7 @@ public class VideoModule implements CameraModule, } mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); mMediaRecorder.setProfile(mProfile); + mMediaRecorder.setVideoSize(mProfile.videoFrameWidth, mProfile.videoFrameHeight); mMediaRecorder.setMaxDuration(mMaxVideoDurationInMs); if (mCaptureTimeLapse) { double fps = 1000 / (double) mTimeBetweenTimeLapseFrameCaptureMs; @@ -1022,6 +1022,7 @@ public class VideoModule implements CameraModule, } } mMediaRecorder.setOrientationHint(rotation); + setupMediaRecorderPreviewDisplay(); try { mMediaRecorder.prepare(); @@ -1463,6 +1464,7 @@ public class VideoModule implements CameraModule, @SuppressWarnings("deprecation") private void setCameraParameters() { mParameters.setPreviewSize(mDesiredPreviewWidth, mDesiredPreviewHeight); + mParameters.set("video-size", mProfile.videoFrameWidth+"x"+mProfile.videoFrameHeight); int[] fpsRange = CameraUtil.getMaxPreviewFpsRange(mParameters); if (fpsRange.length > 0) { mParameters.setPreviewFpsRange( @@ -1527,7 +1529,15 @@ public class VideoModule implements CameraModule, CameraProfile.QUALITY_HIGH); mParameters.setJpegQuality(jpegQuality); + boolean flag = false; + if (mPreviewing) { + stopPreview(); + flag = true; + } mCameraDevice.setParameters(mParameters); + if (flag) { + startPreview(); + } // Keep preview size up to date. mParameters = mCameraDevice.getParameters(); -- cgit v1.2.3 From be55432c9d98640fbc968a4b8dc77d7994c16fe4 Mon Sep 17 00:00:00 2001 From: Geoff Mendal Date: Wed, 4 Dec 2013 13:44:30 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I10fe11b8f611ca054e7d0689c8d12135b0722dd4 Auto-generated-cl: translation import --- res/values-af/strings.xml | 3 ++- res/values-am/strings.xml | 3 ++- res/values-ar/strings.xml | 3 ++- res/values-bg/strings.xml | 3 ++- res/values-ca/strings.xml | 3 ++- res/values-cs/strings.xml | 3 ++- res/values-da/strings.xml | 7 ++++--- res/values-de/strings.xml | 3 ++- res/values-el/strings.xml | 3 ++- res/values-en-rGB/strings.xml | 3 ++- res/values-en-rIN/strings.xml | 3 ++- res/values-es-rUS/strings.xml | 3 ++- res/values-es/strings.xml | 3 ++- res/values-et-rEE/strings.xml | 3 ++- res/values-fa/strings.xml | 3 ++- res/values-fi/strings.xml | 2 +- res/values-fr-rCA/strings.xml | 3 ++- res/values-fr/strings.xml | 3 ++- res/values-hi/strings.xml | 3 ++- res/values-hr/strings.xml | 3 ++- res/values-hu/strings.xml | 3 ++- res/values-hy-rAM/strings.xml | 3 ++- res/values-in/strings.xml | 3 ++- res/values-it/strings.xml | 3 ++- res/values-iw/strings.xml | 3 ++- res/values-ja/strings.xml | 3 ++- res/values-ka-rGE/strings.xml | 3 ++- res/values-km-rKH/strings.xml | 3 ++- res/values-ko/strings.xml | 3 ++- res/values-lo-rLA/strings.xml | 2 +- res/values-lt/strings.xml | 3 ++- res/values-lv/strings.xml | 3 ++- res/values-mn-rMN/strings.xml | 3 ++- res/values-ms-rMY/strings.xml | 2 +- res/values-nb/strings.xml | 3 ++- res/values-nl/strings.xml | 3 ++- res/values-pl/strings.xml | 3 ++- res/values-pt-rPT/strings.xml | 3 ++- res/values-pt/strings.xml | 2 +- res/values-ro/strings.xml | 2 +- res/values-ru/strings.xml | 3 ++- res/values-sk/strings.xml | 3 ++- res/values-sl/strings.xml | 3 ++- res/values-sr/strings.xml | 3 ++- res/values-sv/strings.xml | 3 ++- res/values-sw/strings.xml | 3 ++- res/values-th/strings.xml | 3 ++- res/values-tl/strings.xml | 3 ++- res/values-tr/strings.xml | 3 ++- res/values-uk/strings.xml | 3 ++- res/values-vi/strings.xml | 3 ++- res/values-zh-rCN/strings.xml | 3 ++- res/values-zh-rHK/strings.xml | 3 ++- res/values-zh-rTW/strings.xml | 3 ++- res/values-zu/strings.xml | 3 ++- 55 files changed, 107 insertions(+), 57 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 381c6f88a..57e48ff8c 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -119,7 +119,8 @@ "13 M pieksels" "8 M pieksels" "5 M pieksels" - "4 M pieksels" + + "3 M pieksels" "2 M pieksels" "2 M pieksels (16:9)" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index bd1655dc2..fa6f7c934 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -119,7 +119,8 @@ "13ሚ ፒክሰሎች" "8ሚ ፒክሰሎች" "5ሚ ፒክሰሎች" - "4ሚ ፒክሰሎች" + + "3ሚ ፒክሰሎች" "2ሚ ፒክሰሎች" "2ሚ ፒክሰሎች (16:9)" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index a90afc912..4fc16ff2a 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -119,7 +119,8 @@ "13 ميغا بكسل" "8 ميغا بكسل" "5 ميغا بكسل" - "4 ميغا بكسل" + + "3 ميغا بكسل" "2 ميغا بكسل" "2 ميغا بكسل (16‏:9)" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index c195059db..c844fc2a0 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -119,7 +119,8 @@ "13 мегапиксела" "8 мегапиксела" "5 мегапиксела" - "4 мегапиксела" + + "3 мегапиксела" "2 мегапиксела" "2 мегапиксела (16:9)" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 60bed2524..86d6560d2 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -119,7 +119,8 @@ "13 Mp" "8 Mp" "5 Mp" - "4 Mp" + + "3 Mp" "2 Mp" "2 Mp (16:9)" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 15ab0aa5e..2d89867c6 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -119,7 +119,8 @@ "13 Mpx" "8 Mpx" "5 Mpx" - "4 Mpx" + + "3 Mpx" "2 Mpx" "2 Mpx (16:9)" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index f35e546be..302b1baa1 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -97,7 +97,7 @@ "Vælg kamera" "Tilbage" "Front" - "Lagringsplacering" + "Lagerplacering" "PLACERING" "Nedtællingsur" @@ -119,7 +119,8 @@ "13 megapixels" "8 megapixels" "5 megapixels" - "4 megapixels" + + "3 megapixel" "2 megapixels" "2 megapixels (16:9)" @@ -188,7 +189,7 @@ "FRONTKAMERA" "BAGSIDEKAMERA" "OK" - "Der er snart ikke mere plads på dit SD-kort. Rediger indstillingerne for kvalitet, eller slet nogle billeder eller andre filer." + "Der er snart ikke mere plads på dit SD-kort. Skift kvalitetsindstillingen, eller slet nogle billeder eller andre filer." "Størrelsesgrænsen er nået." "For hurtig" "Panoramabillede forberedes" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index fc721a0ec..f8f9b1c96 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -119,7 +119,8 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + + "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 25f78a3bb..eba6c73aa 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -119,7 +119,8 @@ "13M εικονοστοιχεία" "8M εικονοστοιχεία" "5M εικονοστοιχεία" - "4M εικονοστοιχεία" + + "3M εικονοστοιχεία" "2M εικονοστοιχεία" "2M εικονοστ. (16:9)" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index cfd3f38fd..a7416e905 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -119,7 +119,8 @@ "13 M pixels" "8 M pixels" "5 M pixels" - "4 M pixels" + + "3 M pixels" "2 M pixels" "2 M pixels (16:9)" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index cfd3f38fd..a7416e905 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -119,7 +119,8 @@ "13 M pixels" "8 M pixels" "5 M pixels" - "4 M pixels" + + "3 M pixels" "2 M pixels" "2 M pixels (16:9)" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 31a4e2eed..56052a01f 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -119,7 +119,8 @@ "13 megapíxeles" "8 megapíxeles" "5 megapíxeles" - "4 megapíxeles" + + "3 megapíxeles" "2 megapíxeles" "2 megapíxeles (16:9)" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 9e2b659dc..3fa83bd94 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -119,7 +119,8 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + + "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 88611e4c1..94b265eb7 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -119,7 +119,8 @@ "13 megapikslit" "8 megapikslit" "5 megapikslit" - "4 megapikslit" + + "3 megapikslit" "2 megapikslit" "2 MP (16 : 9)" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 387ba68b9..0707c0fff 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -119,7 +119,8 @@ "۱۳ مگاپیکسل" "۸ مگاپیکسل" "۵ مگاپیکسل" - "‫۴ مگاپیکسل" + + "۳ مگاپیکسل" "۲ مگاپیکسل" "‫۲ مگاپیکسل (۱۶:۹)‏" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 2e40945cb..ae27fa155 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -119,7 +119,7 @@ "13 megapikseliä" "8 megapikseliä" "5 megapikseliä" - "4 megapikseliä" + "4 megapiks. (16:9)" "3 megapikseliä" "2 megapikseliä" "2 megap. (16:9)" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 315ee656e..f86fc2bd9 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -119,7 +119,8 @@ "13 mégapixels" "8 mégapixels" "5 mégapixels" - "4 mégapixels" + + "3 mégapixels" "2 mégapixels" "2 mégapixels (16:9)" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index fc2c76935..8f9d660f0 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -119,7 +119,8 @@ "13 mégapixels" "8 mégapixels" "5 mégapixels" - "4 mégapixels" + + "3 mégapixels" "2 mégapixels" "2 mégapixels (16:9)" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 1acbdfbff..ad136ab1a 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -119,7 +119,8 @@ "13M पिक्सेल" "8M पिक्सेल" "5M पिक्सेल" - "4M पिक्सेल" + + "3M पिक्सेल" "2M पिक्सेल" "2M पिक्सेल (16:9)" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index cb4d20367..8c959e623 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -119,7 +119,8 @@ "13 megapiksela" "8 megapiksela" "5 megapiksela" - "4 megapiksela" + + "3 megapiksela" "2 megapiksela" "2 mpiks. (16:9)" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index bc27b2e52..1654e47b9 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -119,7 +119,8 @@ "13 megapixel" "8 megapixel" "5 megapixel" - "4 megapixel" + + "3 megapixel" "2 megapixel" "2 megapixel (16:9)" diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 3603d6a58..307e7d78a 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -119,7 +119,8 @@ "13Մ պիքսել" "8Մ պիքսել" "5Մ պիքսել" - "4Մ պիքսել" + + "3Մ պիքսել" "2Մ պիքսել" "2Մ պիքսել (16:9)" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 115f90175..71a229570 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -119,7 +119,8 @@ "13 M piksel" "8 M piksel" "5 M piksel" - "4 M piksel" + + "3 M piksel" "2 M piksel" "2 M px (16:9)" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 19efe914d..6f9f46160 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -119,7 +119,8 @@ "13 Mpixel" "8 Mpixel" "5 Mpixel" - "4 Mpixel" + + "3 Mpixel" "2 Mpixel" "2 Mpixel (16:9)" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index a75cd03d7..8a0eb6080 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -119,7 +119,8 @@ "13 מגה פיקסל" "8 מגה פיקסל" "5 מגה פיקסל" - "4 מגה פיקסל" + + "3 מגה פיקסל" "2 מגה פיקסל" "2 מגה פיקסל (16:9)" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 503ac3457..c2f7ed266 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -119,7 +119,8 @@ "13メガピクセル" "8メガピクセル" "5メガピクセル" - "4メガピクセル" + + "3メガピクセル" "2メガピクセル" "2Mピクセル（16:9）" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 2cf9557a5..ed7444213 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -119,7 +119,8 @@ "13 მეგაპიქსელი" "8 მეგაპიქსელი" "5 მეგაპიქსელი" - "4 მეგაპიქსელი" + + "3 მეგაპიქსელი" "2 მეგაპიქსელი" "2 მეგაპიქსელი (16:9)" diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 4ac792243..c1bb6f9e6 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -119,7 +119,8 @@ "១៣ មេហ្គាភីកសែល" "៨ មេហ្គា​ភីកសែល" "៥ មេហ្គា​ភីកសែល" - "៤ មេហ្គា​​ភីក​សែល" + + "៣ មេហ្គា​ភីកសែល" "២ មេហ្គា​ភីកសែល" "២ មេហ្គាភីក​សែល (16:9)" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 29e6583b7..254f179f1 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -119,7 +119,8 @@ "1300만 화소" "800만 화소" "500만 화소" - "400만 화소" + + "300만 화소" "200만 화소" "200만 화소(16:9)" diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index f70018ada..d245aeec6 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -119,7 +119,7 @@ "13 ລ້ານພິກເຊວ" "8 ລ້ານພິກເຊວ" "5 ລ້ານພິກເຊວ" - "4 ລ້ານພິກເຊວ" + "4 ລ້ານພິກເຊວ (16:9)" "3 ລ້ານພິກເຊວ" "2 ລ້ານພິກເຊວ" "2 ລ້ານພິກເຊວ (16:9​)" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 39ee62da6..47a040d2e 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -119,7 +119,8 @@ "13 megapikselių" "8 megapikseliai" "5 megapikseliai" - "4 megapikseliai" + + "3 megapikseliai" "2 megapikseliai" "2 megapiks. (16:9)" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 7f3ec11b9..e4ddb0c23 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -119,7 +119,8 @@ "13 megapikseļi" "8 megapikseļi" "5 megapikseļi" - "4 megapikseļi" + + "3 megapikseļi" "2 megapikseļi" "2 megapiks. (16:9)" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index eb6d3704b..7e38bc86c 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -119,7 +119,8 @@ "13M пиксел" "8M пиксел" "5M пиксел" - "4M пиксел" + + "3M пиксел" "2M пиксел" "2M пиксел (16:9)" diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index ff24fe4ad..23c7086ab 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -119,7 +119,7 @@ "13M piksel" "8M piksel" "5M piksel" - "4M piksel" + "4M piksel (16:9)" "3M piksel" "2M piksel" "2M piksel (16:9)" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 6ee3286cd..612a16113 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -119,7 +119,8 @@ "13 megapiksler" "8 megapiksler" "5 megapiksler" - "4 megapiksler" + + "3 megapiksler" "2 megapiksler" "2 megapiksler (16:9)" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 66cf12c6c..701e40f44 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -119,7 +119,8 @@ "13 megapixel" "8 megapixel" "5 megapixel" - "4 megapixel" + + "3 megapixel" "2 megapixel" "2 megapixel (16:9)" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 0f918e626..0b7751a82 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -119,7 +119,8 @@ "13 Mpix" "8 Mpix" "5 Mpix" - "4 Mpix" + + "3 Mpix" "2 Mpix" "2 Mpix (16:9)" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index dcd48b041..3d6428767 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -119,7 +119,8 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + + "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index e3e9517b3..ee1950baf 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -119,7 +119,7 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + "4 MP (16:9)" "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 001108aa6..17e4b6bc1 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -119,7 +119,7 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + "4 MP (16:9)" "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 62d1769cb..0cafd13d9 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -119,7 +119,8 @@ "13 Мпикс." "8 Мпикс." "5 Мпикс." - "4 Мпикс." + + "3 Мпикс." "2 Мпикс." "2 Мпикс. (16:9)" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 9be1e91c6..d0de42733 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -119,7 +119,8 @@ "13 Mpx" "8 Mpx" "5 Mpx" - "4 Mpx" + + "3 Mpx" "2 Mpx" "2 Mpx (16:9)" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 3af43a200..ef2edfb26 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -119,7 +119,8 @@ "13 M slikovnih pik" "8 M slikovnih pik" "5 M slikovnih pik" - "4 M slikovnih pik" + + "3 M slikovnih pik" "2 M slikovnih pik" "2 M pik (16 : 9)" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index d3f869ba9..af2764239 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -119,7 +119,8 @@ "13 мегапиксела" "8 мегапиксела" "5 мегапиксела" - "4 мегапиксела" + + "3 мегапиксела" "2 мегапиксела" "2 мегапиксела (16:9)" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index eed747053..1c025f818 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -119,7 +119,8 @@ "13 megapixlar" "8 megapixlar" "5 megapixlar" - "4 megapixlar" + + "3 megapixlar" "2 megapixlar" "2 megapixlar (16:9)" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 750b4689d..98ba43216 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -119,7 +119,8 @@ "Megapikseli 13" "Megapikseli 8" "Megapikseli 5" - "Megapikseli 4" + + "Megapikseli 3" "Megapikseli 2" "Megapikseli 2 (16:9)" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 5b69f9f8a..b49539fef 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -119,7 +119,8 @@ "13 ล้านพิกเซล" "8 ล้านพิกเซล" "5 ล้านพิกเซล" - "4 ล้านพิกเซล" + + "3 ล้านพิกเซล" "2 ล้านพิกเซล" "2 ล้านพิกเซล (16:9)" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 3737711e7..6bb5d6480 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -119,7 +119,8 @@ "13M pixel" "8M pixel" "5M pixel" - "4M pixel" + + "3M pixel" "2M pixel" "2M pixel (16:9)" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 9face74ee..d5c5e1b71 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -119,7 +119,8 @@ "13 megapiksel" "8 megapiksel" "5 megapiksel" - "4 megapiksel" + + "3 megapiksel" "2 megapiksel" "2 megapiksel (16:9)" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 8719e4b61..7cf32e35d 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -119,7 +119,8 @@ "13 Мпікс." "8 Мпікс." "5 Мпікс." - "4 Мпікс." + + "3 Мпікс." "2 Мпікс." "2 Мпікс. (16:9)" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 0c9d40ba3..3cfa86644 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -119,7 +119,8 @@ "13M pixel" "8M pixel" "5M pixel" - "4M pixel" + + "3M pixel" "2M pixel" "2M pixel (16:9)" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3748af72e..e910ab09e 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -119,7 +119,8 @@ "1300万像素" "800万像素" "500万像素" - "400万像素" + + "300万像素" "200万像素" "200万像素 (16:9)" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 07523fe78..6608b0d74 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -119,7 +119,8 @@ "1,300 萬像素" "8 百萬像素" "5 百萬像素" - "4 百萬像素" + + "3 百萬像素" "2 百萬像素" "2 百萬像素 (16:9)" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 9697eec7b..4934c0f05 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -119,7 +119,8 @@ "1300 萬像素" "800 萬像素" "500 萬像素" - "400 萬像素" + + "300 萬像素" "200 萬像素" "200 萬像素 (16:9)" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 73554c790..e06d62e56 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -119,7 +119,8 @@ "13M amaphikiseli" "8M amaphikiseli" "5M amaphikiseli" - "4M amaphikiseli" + + "3M amaphikiseli" "2M amaphikiseli" "2M amaphikiseli (16:9)" -- cgit v1.2.3 From ecaad7a2992d27ae3aeeec359824c4bb1fef5799 Mon Sep 17 00:00:00 2001 From: Geoff Mendal Date: Wed, 4 Dec 2013 13:45:51 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I108868d50a1376c9d638fae24f7a004733eedecb Auto-generated-cl: translation import --- res/values-af/strings.xml | 3 ++- res/values-am/strings.xml | 3 ++- res/values-ar/strings.xml | 3 ++- res/values-bg/strings.xml | 3 ++- res/values-ca/strings.xml | 3 ++- res/values-cs/strings.xml | 3 ++- res/values-da/strings.xml | 7 ++++--- res/values-de/strings.xml | 3 ++- res/values-el/strings.xml | 3 ++- res/values-en-rGB/strings.xml | 3 ++- res/values-en-rIN/strings.xml | 3 ++- res/values-es-rUS/strings.xml | 3 ++- res/values-es/strings.xml | 3 ++- res/values-et-rEE/strings.xml | 3 ++- res/values-fa/strings.xml | 3 ++- res/values-fi/strings.xml | 2 +- res/values-fr-rCA/strings.xml | 3 ++- res/values-fr/strings.xml | 3 ++- res/values-hi/strings.xml | 3 ++- res/values-hr/strings.xml | 3 ++- res/values-hu/strings.xml | 3 ++- res/values-hy-rAM/strings.xml | 3 ++- res/values-in/strings.xml | 3 ++- res/values-it/strings.xml | 3 ++- res/values-iw/strings.xml | 3 ++- res/values-ja/strings.xml | 3 ++- res/values-ka-rGE/strings.xml | 3 ++- res/values-km-rKH/strings.xml | 3 ++- res/values-ko/strings.xml | 3 ++- res/values-lo-rLA/strings.xml | 2 +- res/values-lt/strings.xml | 3 ++- res/values-lv/strings.xml | 3 ++- res/values-mn-rMN/strings.xml | 3 ++- res/values-ms-rMY/strings.xml | 2 +- res/values-nb/strings.xml | 3 ++- res/values-nl/strings.xml | 3 ++- res/values-pl/strings.xml | 3 ++- res/values-pt-rPT/strings.xml | 3 ++- res/values-pt/strings.xml | 2 +- res/values-ro/strings.xml | 2 +- res/values-ru/strings.xml | 3 ++- res/values-sk/strings.xml | 3 ++- res/values-sl/strings.xml | 3 ++- res/values-sr/strings.xml | 3 ++- res/values-sv/strings.xml | 3 ++- res/values-sw/strings.xml | 3 ++- res/values-th/strings.xml | 3 ++- res/values-tl/strings.xml | 3 ++- res/values-tr/strings.xml | 3 ++- res/values-uk/strings.xml | 3 ++- res/values-vi/strings.xml | 3 ++- res/values-zh-rCN/strings.xml | 3 ++- res/values-zh-rHK/strings.xml | 3 ++- res/values-zh-rTW/strings.xml | 3 ++- res/values-zu/strings.xml | 3 ++- 55 files changed, 107 insertions(+), 57 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 381c6f88a..57e48ff8c 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -119,7 +119,8 @@ "13 M pieksels" "8 M pieksels" "5 M pieksels" - "4 M pieksels" + + "3 M pieksels" "2 M pieksels" "2 M pieksels (16:9)" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index bd1655dc2..fa6f7c934 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -119,7 +119,8 @@ "13ሚ ፒክሰሎች" "8ሚ ፒክሰሎች" "5ሚ ፒክሰሎች" - "4ሚ ፒክሰሎች" + + "3ሚ ፒክሰሎች" "2ሚ ፒክሰሎች" "2ሚ ፒክሰሎች (16:9)" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index a90afc912..4fc16ff2a 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -119,7 +119,8 @@ "13 ميغا بكسل" "8 ميغا بكسل" "5 ميغا بكسل" - "4 ميغا بكسل" + + "3 ميغا بكسل" "2 ميغا بكسل" "2 ميغا بكسل (16‏:9)" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index c195059db..c844fc2a0 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -119,7 +119,8 @@ "13 мегапиксела" "8 мегапиксела" "5 мегапиксела" - "4 мегапиксела" + + "3 мегапиксела" "2 мегапиксела" "2 мегапиксела (16:9)" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 60bed2524..86d6560d2 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -119,7 +119,8 @@ "13 Mp" "8 Mp" "5 Mp" - "4 Mp" + + "3 Mp" "2 Mp" "2 Mp (16:9)" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 15ab0aa5e..2d89867c6 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -119,7 +119,8 @@ "13 Mpx" "8 Mpx" "5 Mpx" - "4 Mpx" + + "3 Mpx" "2 Mpx" "2 Mpx (16:9)" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index f35e546be..302b1baa1 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -97,7 +97,7 @@ "Vælg kamera" "Tilbage" "Front" - "Lagringsplacering" + "Lagerplacering" "PLACERING" "Nedtællingsur" @@ -119,7 +119,8 @@ "13 megapixels" "8 megapixels" "5 megapixels" - "4 megapixels" + + "3 megapixel" "2 megapixels" "2 megapixels (16:9)" @@ -188,7 +189,7 @@ "FRONTKAMERA" "BAGSIDEKAMERA" "OK" - "Der er snart ikke mere plads på dit SD-kort. Rediger indstillingerne for kvalitet, eller slet nogle billeder eller andre filer." + "Der er snart ikke mere plads på dit SD-kort. Skift kvalitetsindstillingen, eller slet nogle billeder eller andre filer." "Størrelsesgrænsen er nået." "For hurtig" "Panoramabillede forberedes" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index fc721a0ec..f8f9b1c96 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -119,7 +119,8 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + + "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 25f78a3bb..eba6c73aa 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -119,7 +119,8 @@ "13M εικονοστοιχεία" "8M εικονοστοιχεία" "5M εικονοστοιχεία" - "4M εικονοστοιχεία" + + "3M εικονοστοιχεία" "2M εικονοστοιχεία" "2M εικονοστ. (16:9)" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index cfd3f38fd..a7416e905 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -119,7 +119,8 @@ "13 M pixels" "8 M pixels" "5 M pixels" - "4 M pixels" + + "3 M pixels" "2 M pixels" "2 M pixels (16:9)" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index cfd3f38fd..a7416e905 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -119,7 +119,8 @@ "13 M pixels" "8 M pixels" "5 M pixels" - "4 M pixels" + + "3 M pixels" "2 M pixels" "2 M pixels (16:9)" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 31a4e2eed..56052a01f 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -119,7 +119,8 @@ "13 megapíxeles" "8 megapíxeles" "5 megapíxeles" - "4 megapíxeles" + + "3 megapíxeles" "2 megapíxeles" "2 megapíxeles (16:9)" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 9e2b659dc..3fa83bd94 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -119,7 +119,8 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + + "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 88611e4c1..94b265eb7 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -119,7 +119,8 @@ "13 megapikslit" "8 megapikslit" "5 megapikslit" - "4 megapikslit" + + "3 megapikslit" "2 megapikslit" "2 MP (16 : 9)" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 387ba68b9..0707c0fff 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -119,7 +119,8 @@ "۱۳ مگاپیکسل" "۸ مگاپیکسل" "۵ مگاپیکسل" - "‫۴ مگاپیکسل" + + "۳ مگاپیکسل" "۲ مگاپیکسل" "‫۲ مگاپیکسل (۱۶:۹)‏" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 2e40945cb..ae27fa155 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -119,7 +119,7 @@ "13 megapikseliä" "8 megapikseliä" "5 megapikseliä" - "4 megapikseliä" + "4 megapiks. (16:9)" "3 megapikseliä" "2 megapikseliä" "2 megap. (16:9)" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 315ee656e..f86fc2bd9 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -119,7 +119,8 @@ "13 mégapixels" "8 mégapixels" "5 mégapixels" - "4 mégapixels" + + "3 mégapixels" "2 mégapixels" "2 mégapixels (16:9)" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index fc2c76935..8f9d660f0 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -119,7 +119,8 @@ "13 mégapixels" "8 mégapixels" "5 mégapixels" - "4 mégapixels" + + "3 mégapixels" "2 mégapixels" "2 mégapixels (16:9)" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 1acbdfbff..ad136ab1a 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -119,7 +119,8 @@ "13M पिक्सेल" "8M पिक्सेल" "5M पिक्सेल" - "4M पिक्सेल" + + "3M पिक्सेल" "2M पिक्सेल" "2M पिक्सेल (16:9)" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index cb4d20367..8c959e623 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -119,7 +119,8 @@ "13 megapiksela" "8 megapiksela" "5 megapiksela" - "4 megapiksela" + + "3 megapiksela" "2 megapiksela" "2 mpiks. (16:9)" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index bc27b2e52..1654e47b9 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -119,7 +119,8 @@ "13 megapixel" "8 megapixel" "5 megapixel" - "4 megapixel" + + "3 megapixel" "2 megapixel" "2 megapixel (16:9)" diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 3603d6a58..307e7d78a 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -119,7 +119,8 @@ "13Մ պիքսել" "8Մ պիքսել" "5Մ պիքսել" - "4Մ պիքսել" + + "3Մ պիքսել" "2Մ պիքսել" "2Մ պիքսել (16:9)" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 115f90175..71a229570 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -119,7 +119,8 @@ "13 M piksel" "8 M piksel" "5 M piksel" - "4 M piksel" + + "3 M piksel" "2 M piksel" "2 M px (16:9)" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 19efe914d..6f9f46160 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -119,7 +119,8 @@ "13 Mpixel" "8 Mpixel" "5 Mpixel" - "4 Mpixel" + + "3 Mpixel" "2 Mpixel" "2 Mpixel (16:9)" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index a75cd03d7..8a0eb6080 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -119,7 +119,8 @@ "13 מגה פיקסל" "8 מגה פיקסל" "5 מגה פיקסל" - "4 מגה פיקסל" + + "3 מגה פיקסל" "2 מגה פיקסל" "2 מגה פיקסל (16:9)" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 503ac3457..c2f7ed266 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -119,7 +119,8 @@ "13メガピクセル" "8メガピクセル" "5メガピクセル" - "4メガピクセル" + + "3メガピクセル" "2メガピクセル" "2Mピクセル（16:9）" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 2cf9557a5..ed7444213 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -119,7 +119,8 @@ "13 მეგაპიქსელი" "8 მეგაპიქსელი" "5 მეგაპიქსელი" - "4 მეგაპიქსელი" + + "3 მეგაპიქსელი" "2 მეგაპიქსელი" "2 მეგაპიქსელი (16:9)" diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 4ac792243..c1bb6f9e6 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -119,7 +119,8 @@ "១៣ មេហ្គាភីកសែល" "៨ មេហ្គា​ភីកសែល" "៥ មេហ្គា​ភីកសែល" - "៤ មេហ្គា​​ភីក​សែល" + + "៣ មេហ្គា​ភីកសែល" "២ មេហ្គា​ភីកសែល" "២ មេហ្គាភីក​សែល (16:9)" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 29e6583b7..254f179f1 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -119,7 +119,8 @@ "1300만 화소" "800만 화소" "500만 화소" - "400만 화소" + + "300만 화소" "200만 화소" "200만 화소(16:9)" diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index f70018ada..d245aeec6 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -119,7 +119,7 @@ "13 ລ້ານພິກເຊວ" "8 ລ້ານພິກເຊວ" "5 ລ້ານພິກເຊວ" - "4 ລ້ານພິກເຊວ" + "4 ລ້ານພິກເຊວ (16:9)" "3 ລ້ານພິກເຊວ" "2 ລ້ານພິກເຊວ" "2 ລ້ານພິກເຊວ (16:9​)" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 39ee62da6..47a040d2e 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -119,7 +119,8 @@ "13 megapikselių" "8 megapikseliai" "5 megapikseliai" - "4 megapikseliai" + + "3 megapikseliai" "2 megapikseliai" "2 megapiks. (16:9)" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 7f3ec11b9..e4ddb0c23 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -119,7 +119,8 @@ "13 megapikseļi" "8 megapikseļi" "5 megapikseļi" - "4 megapikseļi" + + "3 megapikseļi" "2 megapikseļi" "2 megapiks. (16:9)" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index eb6d3704b..7e38bc86c 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -119,7 +119,8 @@ "13M пиксел" "8M пиксел" "5M пиксел" - "4M пиксел" + + "3M пиксел" "2M пиксел" "2M пиксел (16:9)" diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index ff24fe4ad..23c7086ab 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -119,7 +119,7 @@ "13M piksel" "8M piksel" "5M piksel" - "4M piksel" + "4M piksel (16:9)" "3M piksel" "2M piksel" "2M piksel (16:9)" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 6ee3286cd..612a16113 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -119,7 +119,8 @@ "13 megapiksler" "8 megapiksler" "5 megapiksler" - "4 megapiksler" + + "3 megapiksler" "2 megapiksler" "2 megapiksler (16:9)" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 66cf12c6c..701e40f44 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -119,7 +119,8 @@ "13 megapixel" "8 megapixel" "5 megapixel" - "4 megapixel" + + "3 megapixel" "2 megapixel" "2 megapixel (16:9)" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 0f918e626..0b7751a82 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -119,7 +119,8 @@ "13 Mpix" "8 Mpix" "5 Mpix" - "4 Mpix" + + "3 Mpix" "2 Mpix" "2 Mpix (16:9)" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index dcd48b041..3d6428767 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -119,7 +119,8 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + + "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index e3e9517b3..ee1950baf 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -119,7 +119,7 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + "4 MP (16:9)" "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 001108aa6..17e4b6bc1 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -119,7 +119,7 @@ "13 MP" "8 MP" "5 MP" - "4 MP" + "4 MP (16:9)" "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 62d1769cb..0cafd13d9 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -119,7 +119,8 @@ "13 Мпикс." "8 Мпикс." "5 Мпикс." - "4 Мпикс." + + "3 Мпикс." "2 Мпикс." "2 Мпикс. (16:9)" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 9be1e91c6..d0de42733 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -119,7 +119,8 @@ "13 Mpx" "8 Mpx" "5 Mpx" - "4 Mpx" + + "3 Mpx" "2 Mpx" "2 Mpx (16:9)" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 3af43a200..ef2edfb26 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -119,7 +119,8 @@ "13 M slikovnih pik" "8 M slikovnih pik" "5 M slikovnih pik" - "4 M slikovnih pik" + + "3 M slikovnih pik" "2 M slikovnih pik" "2 M pik (16 : 9)" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index d3f869ba9..af2764239 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -119,7 +119,8 @@ "13 мегапиксела" "8 мегапиксела" "5 мегапиксела" - "4 мегапиксела" + + "3 мегапиксела" "2 мегапиксела" "2 мегапиксела (16:9)" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index eed747053..1c025f818 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -119,7 +119,8 @@ "13 megapixlar" "8 megapixlar" "5 megapixlar" - "4 megapixlar" + + "3 megapixlar" "2 megapixlar" "2 megapixlar (16:9)" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 750b4689d..98ba43216 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -119,7 +119,8 @@ "Megapikseli 13" "Megapikseli 8" "Megapikseli 5" - "Megapikseli 4" + + "Megapikseli 3" "Megapikseli 2" "Megapikseli 2 (16:9)" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 5b69f9f8a..b49539fef 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -119,7 +119,8 @@ "13 ล้านพิกเซล" "8 ล้านพิกเซล" "5 ล้านพิกเซล" - "4 ล้านพิกเซล" + + "3 ล้านพิกเซล" "2 ล้านพิกเซล" "2 ล้านพิกเซล (16:9)" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 3737711e7..6bb5d6480 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -119,7 +119,8 @@ "13M pixel" "8M pixel" "5M pixel" - "4M pixel" + + "3M pixel" "2M pixel" "2M pixel (16:9)" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 9face74ee..d5c5e1b71 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -119,7 +119,8 @@ "13 megapiksel" "8 megapiksel" "5 megapiksel" - "4 megapiksel" + + "3 megapiksel" "2 megapiksel" "2 megapiksel (16:9)" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 8719e4b61..7cf32e35d 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -119,7 +119,8 @@ "13 Мпікс." "8 Мпікс." "5 Мпікс." - "4 Мпікс." + + "3 Мпікс." "2 Мпікс." "2 Мпікс. (16:9)" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 0c9d40ba3..3cfa86644 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -119,7 +119,8 @@ "13M pixel" "8M pixel" "5M pixel" - "4M pixel" + + "3M pixel" "2M pixel" "2M pixel (16:9)" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3748af72e..e910ab09e 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -119,7 +119,8 @@ "1300万像素" "800万像素" "500万像素" - "400万像素" + + "300万像素" "200万像素" "200万像素 (16:9)" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 07523fe78..6608b0d74 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -119,7 +119,8 @@ "1,300 萬像素" "8 百萬像素" "5 百萬像素" - "4 百萬像素" + + "3 百萬像素" "2 百萬像素" "2 百萬像素 (16:9)" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 9697eec7b..4934c0f05 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -119,7 +119,8 @@ "1300 萬像素" "800 萬像素" "500 萬像素" - "400 萬像素" + + "300 萬像素" "200 萬像素" "200 萬像素 (16:9)" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 73554c790..e06d62e56 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -119,7 +119,8 @@ "13M amaphikiseli" "8M amaphikiseli" "5M amaphikiseli" - "4M amaphikiseli" + + "3M amaphikiseli" "2M amaphikiseli" "2M amaphikiseli (16:9)" -- cgit v1.2.3 From f9b2d0c7775b43996a9b9f51c6fc5ab266042c72 Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Wed, 4 Dec 2013 15:10:01 -0800 Subject: Remove TRIM support Remove the ability to trim a video with the quick menu action. Bug: 11884080 Change-Id: If00cb31ad6b913012c542a809dba1a8e5d9e5b74 --- src/com/android/camera/CameraActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index e7ccbb1e5..8f2b04b4f 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -657,8 +657,7 @@ public class CameraActivity extends Activity | SUPPORT_SHARE | SUPPORT_SHOW_ON_MAP; break; case LocalData.LOCAL_VIDEO: - supported |= SUPPORT_DELETE | SUPPORT_INFO | SUPPORT_TRIM - | SUPPORT_SHARE; + supported |= SUPPORT_DELETE | SUPPORT_INFO | SUPPORT_SHARE; break; case LocalData.LOCAL_PHOTO_SPHERE: supported |= SUPPORT_DELETE | SUPPORT_ROTATE | SUPPORT_INFO -- cgit v1.2.3 From 9f7b40e134242e2829a2bffcf71e8149130a159a Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Mon, 9 Dec 2013 12:06:04 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I2b510d8650a4854a3066596e28cee9d4d196dd09 Auto-generated-cl: translation import --- res/values-af/strings.xml | 3 +-- res/values-am/strings.xml | 3 +-- res/values-ar/strings.xml | 3 +-- res/values-bg/strings.xml | 3 +-- res/values-ca/strings.xml | 3 +-- res/values-cs/strings.xml | 3 +-- res/values-da/strings.xml | 3 +-- res/values-de/strings.xml | 3 +-- res/values-el/strings.xml | 3 +-- res/values-en-rGB/strings.xml | 3 +-- res/values-en-rIN/strings.xml | 3 +-- res/values-es-rUS/strings.xml | 3 +-- res/values-es/strings.xml | 3 +-- res/values-et-rEE/strings.xml | 3 +-- res/values-fa/strings.xml | 3 +-- res/values-fr-rCA/strings.xml | 3 +-- res/values-fr/strings.xml | 3 +-- res/values-hi/strings.xml | 3 +-- res/values-hr/strings.xml | 3 +-- res/values-hu/strings.xml | 3 +-- res/values-hy-rAM/strings.xml | 3 +-- res/values-in/strings.xml | 3 +-- res/values-it/strings.xml | 3 +-- res/values-iw/strings.xml | 3 +-- res/values-ja/strings.xml | 3 +-- res/values-ka-rGE/strings.xml | 3 +-- res/values-km-rKH/strings.xml | 3 +-- res/values-ko/strings.xml | 3 +-- res/values-lt/strings.xml | 3 +-- res/values-lv/strings.xml | 3 +-- res/values-mn-rMN/strings.xml | 3 +-- res/values-nb/strings.xml | 3 +-- res/values-nl/strings.xml | 3 +-- res/values-pl/strings.xml | 3 +-- res/values-pt-rPT/strings.xml | 3 +-- res/values-ru/strings.xml | 3 +-- res/values-sk/strings.xml | 3 +-- res/values-sl/strings.xml | 3 +-- res/values-sr/strings.xml | 3 +-- res/values-sv/strings.xml | 3 +-- res/values-sw/strings.xml | 3 +-- res/values-th/strings.xml | 3 +-- res/values-tl/strings.xml | 3 +-- res/values-tr/strings.xml | 3 +-- res/values-uk/strings.xml | 3 +-- res/values-vi/strings.xml | 3 +-- res/values-zh-rCN/strings.xml | 3 +-- res/values-zh-rHK/strings.xml | 3 +-- res/values-zh-rTW/strings.xml | 3 +-- res/values-zu/strings.xml | 3 +-- 50 files changed, 50 insertions(+), 100 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 57e48ff8c..aa87ce7de 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -119,8 +119,7 @@ "13 M pieksels" "8 M pieksels" "5 M pieksels" - - + "4 M pieksels (16:9)" "3 M pieksels" "2 M pieksels" "2 M pieksels (16:9)" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index fa6f7c934..8a72c8660 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -119,8 +119,7 @@ "13ሚ ፒክሰሎች" "8ሚ ፒክሰሎች" "5ሚ ፒክሰሎች" - - + "4ሚ ፒክሰል (16:9)" "3ሚ ፒክሰሎች" "2ሚ ፒክሰሎች" "2ሚ ፒክሰሎች (16:9)" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 4fc16ff2a..00fd9f873 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -119,8 +119,7 @@ "13 ميغا بكسل" "8 ميغا بكسل" "5 ميغا بكسل" - - + "4 ميغا بكسل (16:9)" "3 ميغا بكسل" "2 ميغا بكسل" "2 ميغا بكسل (16‏:9)" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index c844fc2a0..664289e29 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -119,8 +119,7 @@ "13 мегапиксела" "8 мегапиксела" "5 мегапиксела" - - + "4 мегапиксела (16:9)" "3 мегапиксела" "2 мегапиксела" "2 мегапиксела (16:9)" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 86d6560d2..a13430700 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -119,8 +119,7 @@ "13 Mp" "8 Mp" "5 Mp" - - + "4 Mp (16:9)" "3 Mp" "2 Mp" "2 Mp (16:9)" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 2d89867c6..c3a85a451 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -119,8 +119,7 @@ "13 Mpx" "8 Mpx" "5 Mpx" - - + "4 Mpx (16:9)" "3 Mpx" "2 Mpx" "2 Mpx (16:9)" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 302b1baa1..aa0c23734 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -119,8 +119,7 @@ "13 megapixels" "8 megapixels" "5 megapixels" - - + "4 M pixels (16:9)" "3 megapixel" "2 megapixels" "2 megapixels (16:9)" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index f8f9b1c96..43fdafd9c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -119,8 +119,7 @@ "13 MP" "8 MP" "5 MP" - - + "4 MP (16:9)" "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index eba6c73aa..1b67f0cb1 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -119,8 +119,7 @@ "13M εικονοστοιχεία" "8M εικονοστοιχεία" "5M εικονοστοιχεία" - - + "4 εκ.εικονοστ.(16:9)" "3M εικονοστοιχεία" "2M εικονοστοιχεία" "2M εικονοστ. (16:9)" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index a7416e905..16d7e6557 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -119,8 +119,7 @@ "13 M pixels" "8 M pixels" "5 M pixels" - - + "4 M pixels (16:9)" "3 M pixels" "2 M pixels" "2 M pixels (16:9)" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index a7416e905..16d7e6557 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -119,8 +119,7 @@ "13 M pixels" "8 M pixels" "5 M pixels" - - + "4 M pixels (16:9)" "3 M pixels" "2 M pixels" "2 M pixels (16:9)" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 56052a01f..a62005368 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -119,8 +119,7 @@ "13 megapíxeles" "8 megapíxeles" "5 megapíxeles" - - + "4 MP (16:9)" "3 megapíxeles" "2 megapíxeles" "2 megapíxeles (16:9)" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 3fa83bd94..fb9f4561b 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -119,8 +119,7 @@ "13 MP" "8 MP" "5 MP" - - + "4 MP (16:9)" "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 94b265eb7..32205fb09 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -119,8 +119,7 @@ "13 megapikslit" "8 megapikslit" "5 megapikslit" - - + "4M pikslit (16 : 9)" "3 megapikslit" "2 megapikslit" "2 MP (16 : 9)" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 0707c0fff..fa15c5552 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -119,8 +119,7 @@ "۱۳ مگاپیکسل" "۸ مگاپیکسل" "۵ مگاپیکسل" - - + "‫۴ مگاپیکسل (۱۶:۹)‏" "۳ مگاپیکسل" "۲ مگاپیکسل" "‫۲ مگاپیکسل (۱۶:۹)‏" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index f86fc2bd9..c84df282a 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -119,8 +119,7 @@ "13 mégapixels" "8 mégapixels" "5 mégapixels" - - + "4 mégapixels (16:9)" "3 mégapixels" "2 mégapixels" "2 mégapixels (16:9)" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 8f9d660f0..5da31e9c3 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -119,8 +119,7 @@ "13 mégapixels" "8 mégapixels" "5 mégapixels" - - + "4 mégapixels (16:9)" "3 mégapixels" "2 mégapixels" "2 mégapixels (16:9)" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index ad136ab1a..f6faab7ac 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -119,8 +119,7 @@ "13M पिक्सेल" "8M पिक्सेल" "5M पिक्सेल" - - + "4M पिक्सेल (16:9)" "3M पिक्सेल" "2M पिक्सेल" "2M पिक्सेल (16:9)" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 8c959e623..b17323e31 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -119,8 +119,7 @@ "13 megapiksela" "8 megapiksela" "5 megapiksela" - - + "4 megapiksela (16:9)" "3 megapiksela" "2 megapiksela" "2 mpiks. (16:9)" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 1654e47b9..1c4c5924e 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -119,8 +119,7 @@ "13 megapixel" "8 megapixel" "5 megapixel" - - + "4 megapixel (16:9)" "3 megapixel" "2 megapixel" "2 megapixel (16:9)" diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 307e7d78a..87e37e080 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -119,8 +119,7 @@ "13Մ պիքսել" "8Մ պիքսել" "5Մ պիքսել" - - + "4Մ պիքսել (16:9)" "3Մ պիքսել" "2Մ պիքսել" "2Մ պիքսել (16:9)" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 71a229570..2dce49575 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -119,8 +119,7 @@ "13 M piksel" "8 M piksel" "5 M piksel" - - + "4M piksel (16:9)" "3 M piksel" "2 M piksel" "2 M px (16:9)" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 6f9f46160..4faaef2d8 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -119,8 +119,7 @@ "13 Mpixel" "8 Mpixel" "5 Mpixel" - - + "4 Mpixel (16:9)" "3 Mpixel" "2 Mpixel" "2 Mpixel (16:9)" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 8a0eb6080..cec03fa3b 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -119,8 +119,7 @@ "13 מגה פיקסל" "8 מגה פיקסל" "5 מגה פיקסל" - - + "4 מגה פיקסל (16:9)" "3 מגה פיקסל" "2 מגה פיקסל" "2 מגה פיקסל (16:9)" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index c2f7ed266..999437dfc 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -119,8 +119,7 @@ "13メガピクセル" "8メガピクセル" "5メガピクセル" - - + "4Mピクセル（16:9）" "3メガピクセル" "2メガピクセル" "2Mピクセル（16:9）" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index ed7444213..b0c6d2db7 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -119,8 +119,7 @@ "13 მეგაპიქსელი" "8 მეგაპიქსელი" "5 მეგაპიქსელი" - - + "4 მეგაპიქსელი (16:9)" "3 მეგაპიქსელი" "2 მეგაპიქსელი" "2 მეგაპიქსელი (16:9)" diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index c1bb6f9e6..b096cfce5 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -119,8 +119,7 @@ "១៣ មេហ្គាភីកសែល" "៨ មេហ្គា​ភីកសែល" "៥ មេហ្គា​ភីកសែល" - - + "៤ មេហ្គា​ភីកសែល (16:9)" "៣ មេហ្គា​ភីកសែល" "២ មេហ្គា​ភីកសែល" "២ មេហ្គាភីក​សែល (16:9)" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 254f179f1..b93b3b2b5 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -119,8 +119,7 @@ "1300만 화소" "800만 화소" "500만 화소" - - + "4백만 화소(16:9)" "300만 화소" "200만 화소" "200만 화소(16:9)" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 47a040d2e..319d795a0 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -119,8 +119,7 @@ "13 megapikselių" "8 megapikseliai" "5 megapikseliai" - - + "4 megapiks. (16:9)" "3 megapikseliai" "2 megapikseliai" "2 megapiks. (16:9)" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index e4ddb0c23..ac369d589 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -119,8 +119,7 @@ "13 megapikseļi" "8 megapikseļi" "5 megapikseļi" - - + "4 megapikseļi (16:9)" "3 megapikseļi" "2 megapikseļi" "2 megapiks. (16:9)" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index 7e38bc86c..f2242ed49 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -119,8 +119,7 @@ "13M пиксел" "8M пиксел" "5M пиксел" - - + "4M пиксел (16:9)" "3M пиксел" "2M пиксел" "2M пиксел (16:9)" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 612a16113..d4c7e7985 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -119,8 +119,7 @@ "13 megapiksler" "8 megapiksler" "5 megapiksler" - - + "4M piksler (16:9)" "3 megapiksler" "2 megapiksler" "2 megapiksler (16:9)" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 701e40f44..c6ed15dab 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -119,8 +119,7 @@ "13 megapixel" "8 megapixel" "5 megapixel" - - + "4 megapixel (16:9)" "3 megapixel" "2 megapixel" "2 megapixel (16:9)" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 0b7751a82..664de52a2 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -119,8 +119,7 @@ "13 Mpix" "8 Mpix" "5 Mpix" - - + "4 megapiksele (16:9)" "3 Mpix" "2 Mpix" "2 Mpix (16:9)" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 3d6428767..1a36e37c6 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -119,8 +119,7 @@ "13 MP" "8 MP" "5 MP" - - + "4 megapíxeis (16:9)" "3 MP" "2 MP" "2 MP (16:9)" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 0cafd13d9..e1bb69a31 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -119,8 +119,7 @@ "13 Мпикс." "8 Мпикс." "5 Мпикс." - - + "4 Мпикс. (16:9)" "3 Мпикс." "2 Мпикс." "2 Мпикс. (16:9)" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index d0de42733..94b885641 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -119,8 +119,7 @@ "13 Mpx" "8 Mpx" "5 Mpx" - - + "4 megapixely (16:9)" "3 Mpx" "2 Mpx" "2 Mpx (16:9)" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index ef2edfb26..1ef85de00 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -119,8 +119,7 @@ "13 M slikovnih pik" "8 M slikovnih pik" "5 M slikovnih pik" - - + "4 mio. pik (16 : 9)" "3 M slikovnih pik" "2 M slikovnih pik" "2 M pik (16 : 9)" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index af2764239..3455fdd6d 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -119,8 +119,7 @@ "13 мегапиксела" "8 мегапиксела" "5 мегапиксела" - - + "4 мегапиксела (16:9)" "3 мегапиксела" "2 мегапиксела" "2 мегапиксела (16:9)" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 1c025f818..32d27332b 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -119,8 +119,7 @@ "13 megapixlar" "8 megapixlar" "5 megapixlar" - - + "4 megapixlar (16:9)" "3 megapixlar" "2 megapixlar" "2 megapixlar (16:9)" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 98ba43216..eb1fdb8af 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -119,8 +119,7 @@ "Megapikseli 13" "Megapikseli 8" "Megapikseli 5" - - + "Pikseli milioni 4 (16:09)" "Megapikseli 3" "Megapikseli 2" "Megapikseli 2 (16:9)" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index b49539fef..f3038bc81 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -119,8 +119,7 @@ "13 ล้านพิกเซล" "8 ล้านพิกเซล" "5 ล้านพิกเซล" - - + "4M พิกเซล (16:9)" "3 ล้านพิกเซล" "2 ล้านพิกเซล" "2 ล้านพิกเซล (16:9)" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 6bb5d6480..c194de550 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -119,8 +119,7 @@ "13M pixel" "8M pixel" "5M pixel" - - + "4M pixels (16:9)" "3M pixel" "2M pixel" "2M pixel (16:9)" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index d5c5e1b71..ef799f2a0 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -119,8 +119,7 @@ "13 megapiksel" "8 megapiksel" "5 megapiksel" - - + "4 M piksel (16:9)" "3 megapiksel" "2 megapiksel" "2 megapiksel (16:9)" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 7cf32e35d..5abb10958 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -119,8 +119,7 @@ "13 Мпікс." "8 Мпікс." "5 Мпікс." - - + "4 Мпікс. (16:9)" "3 Мпікс." "2 Мпікс." "2 Мпікс. (16:9)" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 3cfa86644..d5805195f 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -119,8 +119,7 @@ "13M pixel" "8M pixel" "5M pixel" - - + "4M pixel (16:9)" "3M pixel" "2M pixel" "2M pixel (16:9)" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e910ab09e..22e6b3296 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -119,8 +119,7 @@ "1300万像素" "800万像素" "500万像素" - - + "400万像素 (16:9)" "300万像素" "200万像素" "200万像素 (16:9)" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 6608b0d74..048ff5d3d 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -119,8 +119,7 @@ "1,300 萬像素" "8 百萬像素" "5 百萬像素" - - + "400 萬像素 (16:9)" "3 百萬像素" "2 百萬像素" "2 百萬像素 (16:9)" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 4934c0f05..38d58e2f5 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -119,8 +119,7 @@ "1300 萬像素" "800 萬像素" "500 萬像素" - - + "400 萬像素 (16:9)" "300 萬像素" "200 萬像素" "200 萬像素 (16:9)" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index e06d62e56..1b6f9cba1 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -119,8 +119,7 @@ "13M amaphikiseli" "8M amaphikiseli" "5M amaphikiseli" - - + "4M amaphikiseli (16:9)" "3M amaphikiseli" "2M amaphikiseli" "2M amaphikiseli (16:9)" -- cgit v1.2.3 From dae90cf82db8125b5e741f42aacc78c7e1417aac Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Mon, 16 Dec 2013 13:03:54 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I8229ddd9cd55f6561be600469f38063e70480c0f Auto-generated-cl: translation import --- res/values-es/strings.xml | 4 ++-- res/values-mn-rMN/strings.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index fb9f4561b..465c98124 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -228,8 +228,8 @@ "Revisar cancelación" "Revisión terminada" "Revisar repetición" - "ACTIVADO" - "DESACTIVADO" + "SÍ" + "NO" "No" "0,5 segundos" "1 segundo" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index f2242ed49..ec900363c 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -289,7 +289,7 @@ "Томруулах" "Эргүүлэх" "Хадгалах" - "Зургийг ачаалах боломжгүй!" + "Зургийг ачааллах боломжгүй!" "Зургийн хальсаар харах" "Ханын зургийг тохируулж байна" -- cgit v1.2.3 From 9d8187cbdb82e36eae9a42eefda138b6d0925b1f Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 20 Feb 2014 08:42:24 -0800 Subject: Import translations. DO NOT MERGE Change-Id: I5f7c2232952457358858fc8d33d06c8c1de19efc Auto-generated-cl: translation import --- res/values-km-rKH/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index b096cfce5..6de87e6c1 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -178,8 +178,8 @@ "១០ វិនាទី" "១៥ វិនាទី" "មិន​អាច​ជ្រើស​បាន​ក្នុង​របៀប​រូបភាព។" - "បង្ហាញ" - "បង្ហាញ" + "ពន្លឺ" + "ពន្លឺ" -- cgit v1.2.3