From 7ae0cf0b9a2d0f41889599806d8a977a43c8362a Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 10 Nov 2014 03:44:59 +0200 Subject: Automatic translation import Change-Id: Ie12d13900b286655881295c7aade95e72eefaeb8 --- res/values-af/cm_strings.xml | 9 ++++++ res/values-af/qcomstrings.xml | 8 ++--- res/values-ar/qcomstrings.xml | 4 --- res/values-az/qcomstrings.xml | 61 +++++++++++++++++++++++++++++++++++++++ res/values-ca/qcomstrings.xml | 4 --- res/values-cs/qcomstrings.xml | 4 --- res/values-da/qcomstrings.xml | 4 --- res/values-de/qcomstrings.xml | 5 +--- res/values-el/qcomstrings.xml | 4 --- res/values-es-rXA/qcomstrings.xml | 4 --- res/values-es/qcomstrings.xml | 4 --- res/values-et/qcomstrings.xml | 4 --- res/values-eu/qcomstrings.xml | 4 --- res/values-fi/cm_strings.xml | 7 +++++ res/values-fi/qcomstrings.xml | 4 --- res/values-fr/cm_strings.xml | 2 +- res/values-fr/qcomstrings.xml | 16 +++++----- res/values-hu/qcomstrings.xml | 4 --- res/values-in/qcomstrings.xml | 4 --- res/values-it/qcomstrings.xml | 4 --- res/values-iw/qcomstrings.xml | 4 --- res/values-ja/qcomstrings.xml | 4 --- res/values-ko/qcomstrings.xml | 4 --- res/values-ku/qcomstrings.xml | 4 --- res/values-lb/strings.xml | 4 +-- res/values-lt/cm_strings.xml | 8 +++++ res/values-lt/qcomstrings.xml | 8 ++--- res/values-lv/cm_strings.xml | 8 +++++ res/values-lv/qcomstrings.xml | 8 ++--- res/values-nb/qcomstrings.xml | 4 --- res/values-nl/cm_strings.xml | 4 +++ res/values-nl/qcomstrings.xml | 8 ++--- res/values-pl/qcomstrings.xml | 4 --- res/values-pt-rBR/qcomstrings.xml | 4 --- res/values-pt-rPT/qcomstrings.xml | 4 --- res/values-ro/qcomstrings.xml | 4 --- res/values-ru/qcomstrings.xml | 8 ++--- res/values-si/qcomstrings.xml | 4 --- res/values-sk/qcomstrings.xml | 4 --- res/values-sr/qcomstrings.xml | 4 --- res/values-sv/qcomstrings.xml | 4 --- res/values-th/qcomstrings.xml | 4 --- res/values-tr/qcomstrings.xml | 4 --- res/values-uk/cm_strings.xml | 7 +++++ res/values-uk/qcomstrings.xml | 4 --- res/values-zh-rCN/qcomstrings.xml | 4 --- res/values-zh-rHK/cm_strings.xml | 4 +-- res/values-zh-rHK/qcomstrings.xml | 6 +--- res/values-zh-rTW/cm_strings.xml | 16 ++++++++++ res/values-zh-rTW/qcomstrings.xml | 3 -- 50 files changed, 155 insertions(+), 165 deletions(-) create mode 100644 res/values-az/qcomstrings.xml diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml index 6f50939f6..779f1fb9d 100644 --- a/res/values-af/cm_strings.xml +++ b/res/values-af/cm_strings.xml @@ -18,22 +18,30 @@ 20.7 M pieksels 18 M pieksels + 15.9 M Pieksels (16:9) 12.8 M pieksels 12.7 M pieksels 12 M pieksels + 11.9 M pieksels 11.5 M pieksels 10.4 M pieksels 10 M pieksels + 9.7 M pieksels (16:9) 9 M pieksels + 8.2 M pieksels (16:9) 7.7 M pieksels 6.4 M pieksels + 6 M pieksels (16:9) 4.5 M pieksels 4M pieksels + 537 M pieksels (16:9) 2.5 M pieksels + 2.1 M pieksels (16:9) 1.9 M pieksels WXGA XGA SVGA + nHD (16:9) WVGA WQVGA Verminder vervaag beweging @@ -125,5 +133,6 @@ VERFRAAI MOOI TONEEL Krag knoppie + Helder skerm Vergroot diff --git a/res/values-af/qcomstrings.xml b/res/values-af/qcomstrings.xml index 49c43aff5..f5e7a5b53 100644 --- a/res/values-af/qcomstrings.xml +++ b/res/values-af/qcomstrings.xml @@ -30,22 +30,22 @@ Kol Meting Video enkodeerder Oudio enkodeerder - Video tydsduur - 30 sekondes(MMS) - 10 minute - 30 minute Velkleur verbetering Instelbare Zone Outo Fokus Outo Kol Meting Geweegdegemiddelde Foto raam Gemiddeld + HDR is aangeskakel, net Outo toneel modus word ondersteun + HDR word nie in die toneel modus ondersteun nie behalwe in Outo Video (HDR) Gesig Opsporing Rooi oë Vermindering + HFR word nie ondersteun wanneer video stabilisering, tydsverloop of video HDR aan is nie HFR word nie ondersteun vir geselekteerde resolusie Slegs H264 video kodering word ondersteun wanneer HFR AAN is Onondersteunde video resolusie vir hierdie tipe enkodeerder + Video stabilisering word nie ondersteun vir geselekteerde resolusie Auto beligting afbakening Stadige aksie (HFR) Af diff --git a/res/values-ar/qcomstrings.xml b/res/values-ar/qcomstrings.xml index e66eff671..952cb14c9 100644 --- a/res/values-ar/qcomstrings.xml +++ b/res/values-ar/qcomstrings.xml @@ -30,10 +30,6 @@ بقعة القياس ترميز الفيديو ترميز الصوت - مدة الفيديو - 30 ثانية (MMS) - 10 دقائق - 30دقيقه تعزيز لون البشرة Autofocus منطقة تلقائي diff --git a/res/values-az/qcomstrings.xml b/res/values-az/qcomstrings.xml new file mode 100644 index 000000000..46032c7f5 --- /dev/null +++ b/res/values-az/qcomstrings.xml @@ -0,0 +1,61 @@ + + + + + Güc rejimi + Aşağı güc + Normal güc + Çərçivə ortalaması + Video kodlayıcı + Avto + Video HDR + Üz tanıma + Yavaş Hərəkət (HFR) + Bağlı + 60 K/S + 90 K/S + 120 K/S + ISO + Avto + Auto (HJR) + ISO50 + ISO100ö + ISO125 + ISO200 + ISO250 + ISO320 + ISO400 + ISO500 + ISO640 + ISO800 + ISO1000 + ISO1200 + ISO1250 + ISO1600 + ISO2000 + Şəkil formatı + Şəkil keyfiyyəti + 55% + 65% (normal) + 95% + 100% + diff --git a/res/values-ca/qcomstrings.xml b/res/values-ca/qcomstrings.xml index 10cc65257..9eaf8599a 100644 --- a/res/values-ca/qcomstrings.xml +++ b/res/values-ca/qcomstrings.xml @@ -30,10 +30,6 @@ Mesura puntual Codificador de vídeo Codificador de so - Duració del vídeo - 30 segons (MMS) - 10 minuts - 30 minuts Millora la tonalitat de la pell Zona d\'Auto Focus Auto diff --git a/res/values-cs/qcomstrings.xml b/res/values-cs/qcomstrings.xml index c84207cdf..12becd2f3 100644 --- a/res/values-cs/qcomstrings.xml +++ b/res/values-cs/qcomstrings.xml @@ -30,10 +30,6 @@ Bodový Video kodek Zvukový kodek - Délka videa - 30 sekund (MMS) - 10 minut - 30 minut Vylepšení tónů pleti Zóna automatického ostření Automaticky diff --git a/res/values-da/qcomstrings.xml b/res/values-da/qcomstrings.xml index 766d9f333..28e03736b 100644 --- a/res/values-da/qcomstrings.xml +++ b/res/values-da/qcomstrings.xml @@ -30,10 +30,6 @@ Spotmåling Video-codec Lyd-codec - Varighed for video - 30 sekunder (MMS) - 10 minutter - 30 minutter Hudfarveforbedring Autofokus-zone Auto diff --git a/res/values-de/qcomstrings.xml b/res/values-de/qcomstrings.xml index c5433553c..98e28e949 100644 --- a/res/values-de/qcomstrings.xml +++ b/res/values-de/qcomstrings.xml @@ -30,16 +30,13 @@ Spot Video-Encoder Audio-Encoder - Videodauer - 30 Sekunden (MMS) - 10 Minuten - 30 Minuten Hauttöne verbessern Autofokus Automatisch Spot Mittenbetont Integral + HDR ist aktiviert. Nur der automatische Szenenmodus wird unterstützt HDR wird nur im automatischen Szenenmodus unterstützt Video (HDR) Gesichtserkennung diff --git a/res/values-el/qcomstrings.xml b/res/values-el/qcomstrings.xml index 7158b9fd4..945a8a2ad 100644 --- a/res/values-el/qcomstrings.xml +++ b/res/values-el/qcomstrings.xml @@ -30,10 +30,6 @@ Σημειακή μέτρηση Κωδικοποιητής βίντεο Κωδικοποιητής ήχου - Διάρκεια βίντεο - 30 δευτερόλεπτα (MMS) - 10 λεπτά - 30 λεπτά Βελτίωση τόνου δέρματος Ζώνη αυτόματης εστίασης Αυτόματη diff --git a/res/values-es-rXA/qcomstrings.xml b/res/values-es-rXA/qcomstrings.xml index bb2e84ccb..9e06eaa00 100644 --- a/res/values-es-rXA/qcomstrings.xml +++ b/res/values-es-rXA/qcomstrings.xml @@ -30,10 +30,6 @@ Midición puntual Códec de videu Códec d\'audiu - Duración del videu - 30 segundos (MMS) - 10 minutos - 30 minutos Meyora del tonu la piel Zona d\'enfoque automáticu Auto diff --git a/res/values-es/qcomstrings.xml b/res/values-es/qcomstrings.xml index 4d1393323..a8b72944a 100644 --- a/res/values-es/qcomstrings.xml +++ b/res/values-es/qcomstrings.xml @@ -30,10 +30,6 @@ Puntual Codec de vídeo Códec de audio - Duración de vídeo - 30 segundos (MMS) - 10 minutos - 30 minutos Mejora tono de piel Modo de enfoque automático Automático diff --git a/res/values-et/qcomstrings.xml b/res/values-et/qcomstrings.xml index 19ed3a09f..52f6e3f9d 100644 --- a/res/values-et/qcomstrings.xml +++ b/res/values-et/qcomstrings.xml @@ -30,10 +30,6 @@ Punktmõõtmine Video koodek Heli koodek - Video kestus - 30 sekundit (MMS) - 10 minutit - 30 minutit Nahatooni parandus Autofookus tsoon Auto diff --git a/res/values-eu/qcomstrings.xml b/res/values-eu/qcomstrings.xml index 560c5f6c8..4e5c2aed3 100644 --- a/res/values-eu/qcomstrings.xml +++ b/res/values-eu/qcomstrings.xml @@ -30,10 +30,6 @@ Puntuala Bideo kodek-a Audio kodek-a - Bideoaren iraupena - 30 segundu (MMS) - 10 minutu - 30 minutu Azal tonuaren hobekuntza Enfoke automatiko modua Automatikoa diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml index 8cc2683dc..ddc575e46 100644 --- a/res/values-fi/cm_strings.xml +++ b/res/values-fi/cm_strings.xml @@ -18,6 +18,7 @@ 20,7 megapikseliä 18 megapikseliä + 15.9 megapikseliä (16:9) 12,8 megapikseliä 12,7 megapikseliä 18 megapikseliä @@ -25,16 +26,22 @@ 11,5 megapikseliä 10,4 megapikseliä 10 megapikseliä + 9.7 megapikseliä (16:9) 9 megapikseliä + 8.2 megapikseliä (16:9) 7,7 megapikseliä 6,4 megapikseliä + 6 megapikseliä (16:9) 4,5 megapikseliä 4 megapikseliä + 3,7 megapikseliä (16:9) 2,5 megapikseliä + 2.1 megapikseliä (16:9) 1,9 megapikseliä WXGA XGA SVGA + nHD (16:9) WVGA WQVGA Liikkeen sumennuksen vähentäminen diff --git a/res/values-fi/qcomstrings.xml b/res/values-fi/qcomstrings.xml index 575f7ccda..0aa7e9334 100644 --- a/res/values-fi/qcomstrings.xml +++ b/res/values-fi/qcomstrings.xml @@ -30,10 +30,6 @@ Pisteeseen kohdistettu Videon pakkaus Audion pakkaus - Videon kesto - 30 sekuntia (MMS) - 10 minuuttia - 30 minuuttia Ihonvärin muutos Automaattitarkennusalue Automaattinen diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml index a160fd41c..81068dd1b 100644 --- a/res/values-fr/cm_strings.xml +++ b/res/values-fr/cm_strings.xml @@ -89,7 +89,7 @@ Continu Étendu Détection de visage - Priorité aux visages + Priorité au visage Fixé Portrait Hyperfocal diff --git a/res/values-fr/qcomstrings.xml b/res/values-fr/qcomstrings.xml index a486661b4..b89d9f5e4 100644 --- a/res/values-fr/qcomstrings.xml +++ b/res/values-fr/qcomstrings.xml @@ -25,27 +25,27 @@ Faible puissance Puissance normale Exposition automatique - Moyenne de la trame + Trame moyenne Pondérée centrale Mesure spot Codec vidéo Codec audio - Durée de vidéo - 30 secondes (MMS) - 10 minutes - 30 minutes Amélioration de la teinte de peau Zone de mise au point automatique Auto Mesure de spot Pondérée centrale Trame moyenne + Le HDR est activé, seul le mode scène automatique est pris en charge + Le HDR n\'est pas pris en charge dans un mode de scène différent qu\'automatique Vidéo HDR Détection de visage Réduction des yeux rouges + Le HFR n\'est pas pris en charge lorsque le HDR, la stabilisation ou l\'accélération vidéo est activé HFR n\'est pas supporté pour la résolution choisie Seul l\'encodage vidéo H.264 est pris en charge lorsque HFR est activé Résolution vidéo non pris en charge pour ce type de codec + La stabilisation vidéo n\'est pas prise en charge pour la résolution sélectionnée Exposition automatique Vidéo au ralenti (HFR) Désactivé @@ -85,7 +85,7 @@ Mono Sépia Négatif - Solarisation + Solariser Postériser Eau Relief @@ -94,11 +94,11 @@ Pastel Mosaïque Teinte rouge - Teinte bleu + Teinte bleue Teinte verte Touche AF/AEC Stabilisation vidéo - Reconnaissance des visages + Reconnaissance de visage Netteté Niveau 0 Niveau 1 diff --git a/res/values-hu/qcomstrings.xml b/res/values-hu/qcomstrings.xml index 26321c937..91b64d129 100644 --- a/res/values-hu/qcomstrings.xml +++ b/res/values-hu/qcomstrings.xml @@ -30,10 +30,6 @@ Spot mérés Videó tömörítő Audió tömörítő - Videó hossza - 30 másodperc (MMS) - 10 perc - 30 perc Bőrszín fokozás Választható fókusz módok Automatikus diff --git a/res/values-in/qcomstrings.xml b/res/values-in/qcomstrings.xml index 466cc8ac8..48eddf312 100644 --- a/res/values-in/qcomstrings.xml +++ b/res/values-in/qcomstrings.xml @@ -30,10 +30,6 @@ Pengukuran titik Video codec Audio codec - Durasi video - 30 detik (MMS) - 10 menit - 30 menit Peningkatan warna kulit Zona fokus-otomatis Otomatis diff --git a/res/values-it/qcomstrings.xml b/res/values-it/qcomstrings.xml index f3f2bbff9..08d1cced7 100644 --- a/res/values-it/qcomstrings.xml +++ b/res/values-it/qcomstrings.xml @@ -30,10 +30,6 @@ Punto singolo Codec video Codec audio - Durata video - 30 secondi (MMS) - 10 minuti - 30 minuti Esaltazione toni della pelle Regione autofocus Automatico diff --git a/res/values-iw/qcomstrings.xml b/res/values-iw/qcomstrings.xml index 412d93e57..d411afbb4 100644 --- a/res/values-iw/qcomstrings.xml +++ b/res/values-iw/qcomstrings.xml @@ -30,10 +30,6 @@ אזור מדידה קידוד וידאו קידוד שמע - משך וידאו - 30 שניות (MMS) - 10 דקות - 30 דקות שיפור גוון אשור פוקוס אוטומטי אוטומטי diff --git a/res/values-ja/qcomstrings.xml b/res/values-ja/qcomstrings.xml index 3b451c97e..5da44ad49 100644 --- a/res/values-ja/qcomstrings.xml +++ b/res/values-ja/qcomstrings.xml @@ -30,10 +30,6 @@ スポット測光 ビデオコーデック オーディオコーデック - 動画の長さ - 30秒（MMS） - 10分 - 30 分 肌の色合いの強調 オートフォーカスゾーン オート diff --git a/res/values-ko/qcomstrings.xml b/res/values-ko/qcomstrings.xml index 1ba29b295..c0bc806f3 100644 --- a/res/values-ko/qcomstrings.xml +++ b/res/values-ko/qcomstrings.xml @@ -30,10 +30,6 @@ 스팟 측광 비디오 코덱 오디오 코덱 - 비디오 길이 - 30초 (MMS) - 10분 - 30분 피부 색 개선 자동 초점 영역 자동 diff --git a/res/values-ku/qcomstrings.xml b/res/values-ku/qcomstrings.xml index 027f4cb24..9a57f3c54 100644 --- a/res/values-ku/qcomstrings.xml +++ b/res/values-ku/qcomstrings.xml @@ -30,10 +30,6 @@ مه‌ترکردنی نیشانه‌ لێده‌ری ڤیدیۆ لێده‌ری ده‌نگ - ماوه‌ی ڤیدیۆ - 30 چرکه‌ (ئێم ئێم ئیس) - 10 خوله‌ک - 30 خوله‌ک زیادکردنی جوانکاری ده‌موچاو خۆکارانه‌ سه‌رنجدان خۆکارانه‌ diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml index 89a09e6b0..04e6f3834 100644 --- a/res/values-lb/strings.xml +++ b/res/values-lb/strings.xml @@ -44,7 +44,7 @@ %1$d ausgewielt %1$d ausgewielt - Op der Kaart weisen + Op der Kaart uweisen Lénks rotéieren Riets rotéieren Änneren @@ -91,7 +91,7 @@ Keen Zougrëff op USB-Späicher méiglech. Zäitrafferopnam Gëtt opgeholl - Kamera wielen + Kamera auswielen Hannen Vir Plaz späicheren diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml index 535d5ac88..74c431543 100644 --- a/res/values-lt/cm_strings.xml +++ b/res/values-lt/cm_strings.xml @@ -18,6 +18,7 @@ 20,7 MP 18 MP + 15,9 MP (16:9) 12,8 MP 12,7 MP 12 MP @@ -25,16 +26,22 @@ 11,5 MP 10,4 MP 10 MP + 9,7 MP (16:9) 9 MP + 8,2 MP (16:9) 7,7 MP 6,4 MP + 6 MP (16:9) 4,5 MP 4 MP + 3,7 MP (16:9) 2,5 MP + 2,1 MP (16:9) 1,9 MP WXGA XGA SVGA + nHD (16:9) WVGA WQVGA Judesių liejimosi mažinimas @@ -126,5 +133,6 @@ PAGRAŽINTI SUMANI SCENA Fotografavimo mygtukas + Ryškus ekranas Padidinti diff --git a/res/values-lt/qcomstrings.xml b/res/values-lt/qcomstrings.xml index ed912b485..919878df9 100644 --- a/res/values-lt/qcomstrings.xml +++ b/res/values-lt/qcomstrings.xml @@ -30,22 +30,22 @@ Taškinis matavimas Vaizdo iškodavimas Garso iškodavimas - Vaizdo trukmė - 30 sek. (MMS) - 10 min. - 30 min. Odos spalvos tono didinimas Autom. fokusavimo zona Automatiškai Taškinis matavimas Centruotas Vidutinis rėmas + HDR įjungtas, palaikomas tik automatinės scenos rėžimas + Išskyrus autom. HDR nėra palaikoma scenos režimu Vaizdas (HDR) Veido aptikimas Raudonų akių mažinimas + HFR nėra palaikoma kai įjungtas vaizdo stabilizavimas, fotofilmas arba HDR Daug kadrų per sekundę (HFR) nepalaiko pasirinktos rezoliucijos Kai daug kadrų per sekundę (HFR) yra įjungta, palaikomas tik H264 vaizdo iškodavimas Nepalaikoma vaizdo rezoliucija šiam iškodavimo tipui + Vaizdo stabilizavimas nepalaikomas pasirinktoje raiškoje Automatinio išlaikymo korekcija Sulėtinimas (HFR) Išjungta diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml index 64644460a..2f3314e80 100644 --- a/res/values-lv/cm_strings.xml +++ b/res/values-lv/cm_strings.xml @@ -18,6 +18,7 @@ 20.7M punkti 18M punkti + 15.9M punkti (16:9) 12.8M punkti 12.7M punkti 12M punkti @@ -25,16 +26,22 @@ 11.5M punkti 10.4M punkti 10M punkti + 9.7M punkti (16:9) 9M punkti + 8.2M punkti (16:9) 7.7M punkti 6.4M punkti + 6M punkti (16:9) 4.5M punkti 4M punkti + 3.7M punkti (16:9) 2.5M punkti + 2.1M punkti (16:9) 1.9M punkti WXGA XGA SVGA + nHD (16:9) WVGA WQVGA Kustības miglojuma samazināšana @@ -126,5 +133,6 @@ SKAISTUMS GUDRĀ AINA Jaudas slēdzis + Spilgts ekrāns Palielināt diff --git a/res/values-lv/qcomstrings.xml b/res/values-lv/qcomstrings.xml index e5cf4e019..994bb3918 100644 --- a/res/values-lv/qcomstrings.xml +++ b/res/values-lv/qcomstrings.xml @@ -30,22 +30,22 @@ Punkta mērīšana Video kodeks Audio kodeks - Video ilgums - 30 sekundes (MMS) - 10 minūtes - 30 minūtes Ādas toņu uzlabošana Autofokusa zona Auto Punkta mērīšana Centra svērtā Kadra vidējais + Ja HDR ir ieslēgts, tiek atbalstīts tikai Auto ainas režīms + Ja nav izmantots Automātiskais ainas režīms, HDR netiek atbalstīts Video HDR Seju noteikšana Sarkano acu vājināšana + HFR nav atbalstīta, ja ir ieslēgti video stabilizācija, laika sprīžu video vai HDR Izvēlētajai izšķirtspējai HFR nav atbalstīts h. 264 video kodējums ir atbalstīts, tikai ja ir ieslēgts HFR Neatbalstīta video izšķirtspēja šim kodeka veidam + Izvēlētai izšķirtspējai video stabilizāciju nav atbalstīta Automātiskā ekspozīcijas ierobežošana Lēna kustība (HFR) Izslēgts diff --git a/res/values-nb/qcomstrings.xml b/res/values-nb/qcomstrings.xml index 440cdfd74..954018e1b 100644 --- a/res/values-nb/qcomstrings.xml +++ b/res/values-nb/qcomstrings.xml @@ -30,10 +30,6 @@ Punktmåling Videokodek Lydkodek - Video varighet - 30 sekunder (MMS) - 10 minutter - 30 minutter Hud farge forsterkning Autofokus sone Automatisk diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml index 4a03e39e7..63ebdafde 100644 --- a/res/values-nl/cm_strings.xml +++ b/res/values-nl/cm_strings.xml @@ -34,11 +34,14 @@ 6 megapixel (16:9) 4,5 megapixel 4 megapixel + 3,7 megapixel (16:9) 2,5 megapixel + 2,1 megapixel (16:9) 1,9 megapixel WXGA XGA SVGA + nHD (16:9) WVGA WQVGA Beweging verscherpen @@ -130,5 +133,6 @@ VERFRAAIEN AUTO-SCÈNE Aan/uit-knop + Helder scherm Superzoom diff --git a/res/values-nl/qcomstrings.xml b/res/values-nl/qcomstrings.xml index 25c90d676..20e977fb6 100644 --- a/res/values-nl/qcomstrings.xml +++ b/res/values-nl/qcomstrings.xml @@ -30,22 +30,22 @@ Spotmeting Videocodec Audiocodec - Lengte video - 30 seconden (mms) - 10 minuten - 30 minuten Huidskleurverbetering Selecteerbare autofocus-zone Automatisch Spotmeting Centrum gewogen Beeldgemiddelde + HDR is ingeschakeld, alleen Automatische scènedetectie wordt ondersteund + HDR wordt alleen ondersteund in Automatische scènedetectie Video (HDR) Gezichtsherkenning Rode ogen verminderen + HFR wordt niet ondersteund wanneer Digitale beeldstabilisatie, Time-lapse-opname of Video (HDR) is ingeschakeld Hoge beeldsnelheid (HFR) wordt niet ondersteund bij deze resolutie Alleen H.264-videocodec ondersteund bij HFR Videoresolutie niet ondersteund bij deze codec + Digitale beeldstabilisatie wordt niet ondersteund in deze resolutie Reeksopname met automatische belichting Slowmotion (HFR) Uit diff --git a/res/values-pl/qcomstrings.xml b/res/values-pl/qcomstrings.xml index ea5bea3fc..ed51cf984 100644 --- a/res/values-pl/qcomstrings.xml +++ b/res/values-pl/qcomstrings.xml @@ -30,10 +30,6 @@ Pomiar punktowy Kodek wideo Kodek audio - Czas trwania video - 30 sekund (MMS) - 10 minut - 30 minut Poprawa koloru skóry Strefa automatycznego wyostrzenia Automatyczne diff --git a/res/values-pt-rBR/qcomstrings.xml b/res/values-pt-rBR/qcomstrings.xml index f277f1588..9050c012c 100644 --- a/res/values-pt-rBR/qcomstrings.xml +++ b/res/values-pt-rBR/qcomstrings.xml @@ -30,10 +30,6 @@ Medição de lugar Codec de vídeo Codec de áudio - Duração do vídeo - 30 segundos (MMS) - 10 minutos - 30 minutos Melhoria do tom da pele Zone de auto-foco Automático diff --git a/res/values-pt-rPT/qcomstrings.xml b/res/values-pt-rPT/qcomstrings.xml index 38cd8bf53..1cf0069dc 100644 --- a/res/values-pt-rPT/qcomstrings.xml +++ b/res/values-pt-rPT/qcomstrings.xml @@ -30,10 +30,6 @@ Medição pontual Codec de vídeo Codec de áudio - Duração do video - 30 segundos (MMS) - 10 minutos - 30 minutos Melhoria do tom de pele Zona de focagem automática Auto diff --git a/res/values-ro/qcomstrings.xml b/res/values-ro/qcomstrings.xml index d6a171df1..d1d4b2d13 100644 --- a/res/values-ro/qcomstrings.xml +++ b/res/values-ro/qcomstrings.xml @@ -29,10 +29,6 @@ Spot metering Codec video Codec audio - Durată video - 30 de secunde (MMS) - 10 minute - 30 de minute Intensificare ton piele Zona de autofocus Auto diff --git a/res/values-ru/qcomstrings.xml b/res/values-ru/qcomstrings.xml index 58fed21de..4be0d15e8 100644 --- a/res/values-ru/qcomstrings.xml +++ b/res/values-ru/qcomstrings.xml @@ -30,22 +30,22 @@ Точечный Видеокодек Аудиокодек - Длительность видео - 30 секунд (для MMS) - 10 минут - 30 минут Улучшение цвета кожи Многозонный автофокус Авто Точечный замер По центру кадра Усреднённый + Включён HDR, поддерживается только режим Авто + Функция HDR не поддерживается в режимах, отличных от Авто HDR-видеосъёмка Определение лиц Ум. эфф. красных глаз + Ускоренная съёмка не поддерживается при включённой видеостабилизации, в режиме замедленной съёмки или при включённом HDR Ускоренная съёмка не поддерживается для текущего разрешения Ускоренная съёмка возможна только с видеокодеком H264 Видеокодек не поддерживает выбранное разрешение + Видеостабилизация для выбранного разрешения не поддерживается Автобрекетинг Ускоренная съёмка (замедл. движ.) Выкл. diff --git a/res/values-si/qcomstrings.xml b/res/values-si/qcomstrings.xml index 1b1365a02..eb03d4de0 100644 --- a/res/values-si/qcomstrings.xml +++ b/res/values-si/qcomstrings.xml @@ -30,10 +30,6 @@ තැන මානනය වීඩියෝ කොඩෙක් ශ්‍රව්‍ය කොඩෙක් - වීඩියෝ පැවතුම් කාලය - තත්පර 30 (MMS) - මිනිත්තු 10 - මිනිත්තු 30 හමේ වර්ණය වැඩි කිරීම ස්වයං නාභිගත පෙදෙස ස්වයං diff --git a/res/values-sk/qcomstrings.xml b/res/values-sk/qcomstrings.xml index 5d92f936c..64536d060 100644 --- a/res/values-sk/qcomstrings.xml +++ b/res/values-sk/qcomstrings.xml @@ -30,10 +30,6 @@ Bodové meranie Kodek videa Kodek zvuku - Dĺžka videa - 30 sekúnd (MMS) - 10 minút - 30 minút Vylepšenia tónu pleti Zóna automatického zaostrovania Automaticky diff --git a/res/values-sr/qcomstrings.xml b/res/values-sr/qcomstrings.xml index 6f8be47a1..b23db2abb 100644 --- a/res/values-sr/qcomstrings.xml +++ b/res/values-sr/qcomstrings.xml @@ -30,10 +30,6 @@ Мерење места Видео кодек Аудио кодек - Трајање видеа - 30 секунди (MMS) - 10 минута - 30 минута Унапређење тона коже Зона аутофокуса Аутоматски diff --git a/res/values-sv/qcomstrings.xml b/res/values-sv/qcomstrings.xml index adffd6ee3..b65c82d71 100644 --- a/res/values-sv/qcomstrings.xml +++ b/res/values-sv/qcomstrings.xml @@ -29,10 +29,6 @@ Punktmätning Videokodek Ljudkodek - Videolängd - 30 sekunder (MMS) - 10 minuter - 30 minuter Hudfärgsförstärkning Autofokuszon Auto diff --git a/res/values-th/qcomstrings.xml b/res/values-th/qcomstrings.xml index adaf4b866..606f40213 100644 --- a/res/values-th/qcomstrings.xml +++ b/res/values-th/qcomstrings.xml @@ -30,10 +30,6 @@ จุดวัดแสง ตัวแปลงสัญญาณวิดีโอ ตัวแปลงสัญญาณเสียง - ระยะเวลาวิดีโอ - 30 วินาที (MMS) - 10 นาที - 30 นาที ปรับโทนสีผิว บริเวณโฟกัสอัตโนมัติ อัตโนมัติ diff --git a/res/values-tr/qcomstrings.xml b/res/values-tr/qcomstrings.xml index 4d7e661b7..e4d9f3790 100644 --- a/res/values-tr/qcomstrings.xml +++ b/res/values-tr/qcomstrings.xml @@ -30,10 +30,6 @@ Nokta Ölçümü Video kodlayıcı Ses kodlayıcı - Video süresi - 30 saniye (MMS) - 10 dakika - 30 dakika Cilt rengi geliştirmesi Otomatik odaklama alanı Oto diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml index 30399b86f..3f3f75621 100644 --- a/res/values-uk/cm_strings.xml +++ b/res/values-uk/cm_strings.xml @@ -18,6 +18,7 @@ 20,7 Мпікс. 18 Мпікс. + 15,9 Мпікс. 12,8 Мпікс. 12,7 Мпікс. 12 Мпікс @@ -25,16 +26,22 @@ 11,5 Мпікс. 10,4 Мпікс. 10 Мпікс. + 9.7 Мпікс (16:9) 9 Мпікс. + 8.2 Мпікс. (16:9) 7,7 Мпікс. 6,4 Мпікс. + 6M Мпікс. (16:9) 4,5 Мпікс. 4 Мпікс. + 3.7M Мпікс. (16:9) 2,5 Мпікс. + 2.1M Мпікс. (16:9) 1,9 Мпікс. WXGA XGA SVGA + nHD (16:9) WVGA WQVGA Зменшення розмиття руху diff --git a/res/values-uk/qcomstrings.xml b/res/values-uk/qcomstrings.xml index 4180f4d1b..be6a10631 100644 --- a/res/values-uk/qcomstrings.xml +++ b/res/values-uk/qcomstrings.xml @@ -30,10 +30,6 @@ Точковий Відео кодек Аудіо кодек - Тривалість відео - 30 секунд (MMS) - 10 хвилин - 30 хвилин Кращий тон шкіри Зона афтофокусу Авто diff --git a/res/values-zh-rCN/qcomstrings.xml b/res/values-zh-rCN/qcomstrings.xml index e4a9e3b56..3572a7917 100644 --- a/res/values-zh-rCN/qcomstrings.xml +++ b/res/values-zh-rCN/qcomstrings.xml @@ -30,10 +30,6 @@ 点测光 视频编码 音频编码 - 视频长度 - 30 秒 (彩信) - 10 分钟 - 30 分钟 皮肤色调增强 自动对焦区域 自动 diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml index c3f42b414..4ad4c9332 100644 --- a/res/values-zh-rHK/cm_strings.xml +++ b/res/values-zh-rHK/cm_strings.xml @@ -69,7 +69,7 @@ 高感光度 室内 風景 - 混合光線 + 混合光綫 意境 夜晚肖像 夜間室內 @@ -82,7 +82,7 @@ 射燈 平穩相片 漆黑深夜 - 掃描線跡 + 掃描綫跡 文字 劇院 白板 diff --git a/res/values-zh-rHK/qcomstrings.xml b/res/values-zh-rHK/qcomstrings.xml index b5ee7fcaa..b17da7c48 100644 --- a/res/values-zh-rHK/qcomstrings.xml +++ b/res/values-zh-rHK/qcomstrings.xml @@ -29,10 +29,6 @@ 測光點 視像編解碼器 音訊解碼器 - 影片長度 - 30 秒 (多媒體短訊) - 10 分鐘 - 30 分鐘 膚色色調強化 自動對焦區域 自動 @@ -59,7 +55,7 @@ ISO400 ISO800 ISO1600 - 防條紋線 + 防條紋綫 關閉 50 Hz 60 Hz diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml index ac4104100..b026570af 100644 --- a/res/values-zh-rTW/cm_strings.xml +++ b/res/values-zh-rTW/cm_strings.xml @@ -18,20 +18,30 @@ 2070 萬像素 1800 萬像素 + 1590 萬像素 (16:9) 1280 萬像素 1270 萬像素 + 1200 萬像素 + 1190 萬像素 1150 萬像素 1040 萬像素 1000 萬像素 + 970 萬像素 (16:9) 900 萬像素 + 820 萬像素 (16:9) 770 萬像素 640 萬像素 + 600 萬像素 (16:9) 450 萬像素 + 400 萬像素 + 370 萬像素 (16:9) 250 萬像素 + 210 萬像素 (16:9) 190 萬像素 WXGA XGA SVGA + nHD (16:9) WVGA WQVGA 增強實景 @@ -52,8 +62,11 @@ 文件 秋色 煙花 + 花卉 室內 風景 + 舊底片 + 寵物 雪景 運動 黑夜 @@ -63,6 +76,8 @@ 臉部偵測 臉部優先 超焦距 + 手動 + 卡通化 連拍模式 關閉 5 連拍 @@ -90,6 +105,7 @@ 32 秒 64 秒 儲存空間 + 智慧場景 電源快門 放大 diff --git a/res/values-zh-rTW/qcomstrings.xml b/res/values-zh-rTW/qcomstrings.xml index bf7ad0563..1a17402f2 100644 --- a/res/values-zh-rTW/qcomstrings.xml +++ b/res/values-zh-rTW/qcomstrings.xml @@ -21,9 +21,6 @@ limitations under the License. --> - 30 秒 (多媒體簡訊) - 10 分鐘 - 30 分鐘 自動對焦區域 自動 關閉 -- cgit v1.2.3 From e95ccbc2275afdff17ed106cbc0266de58aab24e Mon Sep 17 00:00:00 2001 From: "Christopher R. Palmer" Date: Tue, 11 Nov 2014 05:59:16 -0500 Subject: Camera2: Allow devices to opt-out of threaded camera startup On at least the current Exynos based devices, the vendor's HAL appears to be unable to handle the threaded startup. Since we cannot easily fix their HAL, allow these devices to opt out of the faster camera startup. Change-Id: I8d1935eb69bb8ba1396b59d92993062637654258 --- res/values/config.xml | 4 ++++ src/com/android/camera/PhotoModule.java | 41 +++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/res/values/config.xml b/res/values/config.xml index 9bb3b8b73..fde705275 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -43,4 +43,8 @@ false false + + + true diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 5a1013b63..ababaf291 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -237,6 +237,28 @@ public class PhotoModule } private OpenCameraThread mOpenCameraThread = null; + private boolean mEnableThreadedCameraStartup = true; + + private void startOpenCameraThread() { + mOpenCameraThread = new OpenCameraThread(); + if (mEnableThreadedCameraStartup) { + mOpenCameraThread.start(); + } else { + mOpenCameraThread.run(); + } + } + + private void stopOpenCameraThread() { + if (mOpenCameraThread != null && mEnableThreadedCameraStartup) { + try { + mOpenCameraThread.join(); + } catch (InterruptedException ex) { + // ignore + } + } + mOpenCameraThread = null; + } + /** * An unpublished intent flag requesting to return as soon as capturing * is completed. @@ -520,9 +542,11 @@ public class PhotoModule // Max brightness mActivity.initMaxBrightness(mPreferences); + mEnableThreadedCameraStartup = mActivity.getResources().getBoolean( + R.bool.enableThreadedCameraStartup); + if (mOpenCameraThread == null && !mActivity.mIsModuleSwitchInProgress) { - mOpenCameraThread = new OpenCameraThread(); - mOpenCameraThread.start(); + startOpenCameraThread(); } initializeControlByIntent(); mQuickCapture = mActivity.getIntent().getBooleanExtra(EXTRA_QUICK_CAPTURE, false); @@ -1886,8 +1910,7 @@ public class PhotoModule if (mOpenCameraFail || mCameraDisabled) return; if (mOpenCameraThread == null) { - mOpenCameraThread = new OpenCameraThread(); - mOpenCameraThread.start(); + startOpenCameraThread(); } mJpegPictureCallbackTime = 0; @@ -1950,14 +1973,8 @@ public class PhotoModule Log.v(TAG, "On pause."); mUI.showPreviewCover(); - try { - if (mOpenCameraThread != null) { - mOpenCameraThread.join(); - } - } catch (InterruptedException ex) { - // ignore - } - mOpenCameraThread = null; + stopOpenCameraThread(); + // Reset the focus first. Camera CTS does not guarantee that // cancelAutoFocus is allowed after preview stops. if (mCameraDevice != null && mCameraState != PREVIEW_STOPPED) { -- cgit v1.2.3