summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-08-12 19:13:50 +0800
committerWu-cheng Li <wuchengli@google.com>2011-08-12 19:18:32 +0800
commit7058a9318dd5d6d5a1e79a84080cdc02975f68c1 (patch)
tree974aa0cb6f5c24da4a4b17547c71e4908b02f69a
parentd2db70880e6159413932f747eb82df3e925852c1 (diff)
downloadLegacyCamera-7058a9318dd5d6d5a1e79a84080cdc02975f68c1.zip
LegacyCamera-7058a9318dd5d6d5a1e79a84080cdc02975f68c1.tar.gz
LegacyCamera-7058a9318dd5d6d5a1e79a84080cdc02975f68c1.tar.bz2
Remove zoom ratio text label.
Change-Id: Ia4d54034b0b2c039e874b1fa580b036962f4cd33
-rw-r--r--res/layout-w1024dp/preview_frame.xml5
-rw-r--r--res/layout-w1024dp/preview_frame_video.xml6
-rw-r--r--res/values-af/strings.xml2
-rw-r--r--res/values-am/strings.xml2
-rw-r--r--res/values-ar/strings.xml2
-rw-r--r--res/values-bg/strings.xml2
-rw-r--r--res/values-ca/strings.xml2
-rw-r--r--res/values-cs/strings.xml2
-rw-r--r--res/values-da/strings.xml2
-rw-r--r--res/values-de/strings.xml2
-rw-r--r--res/values-el/strings.xml2
-rw-r--r--res/values-en-rGB/strings.xml2
-rw-r--r--res/values-es-rUS/strings.xml2
-rw-r--r--res/values-es/strings.xml2
-rw-r--r--res/values-fa/strings.xml2
-rw-r--r--res/values-fi/strings.xml2
-rw-r--r--res/values-fr/strings.xml2
-rw-r--r--res/values-hr/strings.xml2
-rw-r--r--res/values-hu/strings.xml2
-rw-r--r--res/values-in/strings.xml2
-rw-r--r--res/values-it/strings.xml2
-rw-r--r--res/values-iw/strings.xml2
-rw-r--r--res/values-ja/strings.xml2
-rw-r--r--res/values-ko/strings.xml2
-rw-r--r--res/values-lt/strings.xml2
-rw-r--r--res/values-lv/strings.xml2
-rw-r--r--res/values-ms/strings.xml2
-rw-r--r--res/values-nb/strings.xml2
-rw-r--r--res/values-nl/strings.xml2
-rw-r--r--res/values-pl/strings.xml2
-rw-r--r--res/values-pt-rPT/strings.xml2
-rw-r--r--res/values-pt/strings.xml2
-rw-r--r--res/values-rm/strings.xml3
-rw-r--r--res/values-ro/strings.xml2
-rw-r--r--res/values-ru/strings.xml2
-rw-r--r--res/values-sk/strings.xml2
-rw-r--r--res/values-sl/strings.xml2
-rw-r--r--res/values-sr/strings.xml2
-rw-r--r--res/values-sv/strings.xml2
-rw-r--r--res/values-sw/strings.xml2
-rw-r--r--res/values-th/strings.xml2
-rw-r--r--res/values-tl/strings.xml2
-rw-r--r--res/values-tr/strings.xml2
-rw-r--r--res/values-uk/strings.xml2
-rw-r--r--res/values-vi/strings.xml2
-rw-r--r--res/values-zh-rCN/strings.xml2
-rw-r--r--res/values-zh-rTW/strings.xml2
-rw-r--r--res/values-zu/strings.xml2
-rw-r--r--res/values/strings.xml6
-rw-r--r--src/com/android/camera/Camera.java6
-rw-r--r--src/com/android/camera/Util.java8
-rw-r--r--src/com/android/camera/VideoCamera.java5
-rw-r--r--src/com/android/camera/ui/ZoomPicker.java30
53 files changed, 7 insertions, 152 deletions
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index 41c419f..19309c2 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -29,11 +29,6 @@
android:layout_width="180dp"
android:layout_height="180dp"
android:layout_centerInParent="true"/>
- <TextView android:id="@+id/zoom_ratio"
- style="@style/OnViewfinderLabel"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/review_control"
- android:visibility="gone"/>
<ImageView style="@style/OnScreenGpsIndicator"
android:id="@+id/onscreen_gps_indicator_no_signal"
android:src="@drawable/ic_viewfinder_gps_no_signal"
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index 0323d40..c860642 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -41,12 +41,6 @@
android:drawablePadding="5dp"
android:visibility="gone"/>
</LinearLayout>
- <TextView android:id="@+id/zoom_ratio"
- style="@style/OnViewfinderLabel"
- android:layout_alignParentRight="true"
- android:layout_below="@id/labels"
- android:layout_alignWithParentIfMissing="true"
- android:visibility="gone"/>
<include layout="@layout/review_control"/>
<LinearLayout
android:layout_width="wrap_content"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4b63934..bbaa504 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -95,8 +95,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Jou USB-berging se stoorspasie raak min. Verander die gehalte-instelling of vee \'n paar prente of ander lêers uit."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Jou SD-kaart raak vol. Verander die gehalte-instelling of vee \'n paar prente of ander lêers uit."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Groottebeperking bereik."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoem"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoem <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9115a8f..404739d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -95,8 +95,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"የUSB ማከማቻዎቦታ እየሞላበት ነው።የጥራት ቅንብር ይለውጡ ወይም አንዳንድ ምስሎችን ወይም ሌላ ፋይሎች ይሰርዙ።"</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"የSD ካርድዎ ቦታ እያለቀበት ነው። የጥራት ቅንብሩን ይልወጡ ወይም አንዳንድ ምስሎችንወይም ሌሎች ፋይሎችን ይሰርዙ።"</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"መጠኑ ላይ ደርሷል፡፡"</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"ኣጕላ"</string>
- <string name="zoom_text" msgid="3450360177919418123">"ኣጕላ፡ <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0cf95cc..f1db5c1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"مساحة وحدة تخزين USB منخفضة. غيّر إعداد الجودة أو احذف بعض الصور أو الملفات الأخرى."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"مساحة بطاقة SD منخفضة. غيّر إعداد الجودة أو احذف بعض الصور أو الملفات الأخرى."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"تم بلوغ الحد الأقصى للحجم."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"تكبير/تصغير"</string>
- <string name="zoom_text" msgid="3450360177919418123">"تكبير/تصغير <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 71ef846..a6c8797 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Мястото на USB хранилището ви привършва. Променете настройките за качество или изтрийте някои изображения или други файлове."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Мястото на SD картата ви привършва. Променете настройките за качество или изтрийте някои изображения или други файлове."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Достигнат е макс. размер."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Промяна на мащаба"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Промяна на мащаба <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fc16be9..06363d3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"L\'emmagatzematge USB s\'està quedant sense espai. Canvia la configuració de qualitat o bé suprimeix unes quantes imatges o altres fitxers."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"La targeta SD s\'està quedant sense espai. Canvia la configuració de qualitat o suprimeix unes quantes imatges o altres fitxers."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"S\'ha arribat al límit de mida"</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3551a93..77c3285 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"V úložišti USB je málo místa. Změňte nastavení kvality nebo smažte některé fotografie či jiné soubory."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na kartě SD je málo místa. Změňte nastavení kvality nebo smažte některé obrázky či jiné soubory."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Bylo dosaženo limitu velikosti."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Přiblížení"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Přiblížení: <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1694773..ccb2277 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Der er snart ikke mere plads i USB-lager. Rediger indstillingerne for kvalitet, eller slet nogle billeder eller andre filer."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Der er snart ikke mere plads på dit SD-kort. Rediger indstillingerne for kvalitet, eller slet nogle billeder eller andre filer."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Størrelsesgrænse er nået."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 02ba899..7a23a1e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Ihr USB-Speicher bietet nicht mehr genug Speicherplatz. Ändern Sie die Qualitätseinstellung oder löschen Sie Bilder oder andere Dateien."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Auf Ihrer SD-Karte ist nicht mehr genügend Speicherplatz vorhanden. Ändern Sie die Qualitätseinstellung oder löschen Sie Bilder oder andere Dateien."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Maximale Größe erreicht"</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoomen mit Faktor <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c071474..408c072 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Ο διαθέσιμος χώρος USB είναι ελάχιστος. Αλλάξτε τη ρύθμιση της ποιότητας ή διαγράψτε κάποιες εικόνες ή άλλα αρχεία."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Ο διαθέσιμος χώρος στην κάρτα SD είναι ελάχιστος. Αλλάξτε τη ρύθμιση ποιότητας ή διαγράψτε κάποιες εικόνες ή άλλα αρχεία."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Συμπληρώθηκε το όριο μεγέθους."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Εστίαση"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Ζουμ <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a8bca68..5671f37 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Your USB storage is running out of space. Change the quality setting or delete some images or other files."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Your SD card is running out of space. Change the quality setting or delete some images or other files."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Size limit reached."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bf613c6..2d31091 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"El almacenamiento USB se está quedando sin espacio. Cambia la configuración de calidad o elimina algunas imágenes u otros archivos."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Tu tarjeta SD se está quedando sin espacio. Cambia la configuración de calidad o elimina algunas imágenes u otros archivos."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Se alcanzó el límite del tamaño."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Ampliar"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 03365e0..2a5347b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"No queda espacio en el almacenamiento USB. Cambia la configuración de calidad o elimina algunas imágenes u otros archivos."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"No queda espacio en la tarjeta SD. Cambia la configuración de calidad o elimina algunas imágenes u otros archivos."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Se ha alcanzado el límite de tamaño."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8a465eb..fda1309 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"حافظه USB پر است. تنظیمات کیفیت را تغییر دهید یا برخی تصاویر یا سایر فایل ها را حذف کنید."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"کارت SD شما پر شده است. تنظیمات کیفیت را تغییر دهید یا برخی تصاویر یا فایل های دیگر را حذف کنید."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"بیش از حداکثر مجاز."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"بزرگنمایی"</string>
- <string name="zoom_text" msgid="3450360177919418123">"بزرگنمایی <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 175248d..b567445 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB-tallennustilasi on vähissä. Vaihda laatuasetusta tai poista kuvia tai muita tiedostoja."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD-korttisi tila on vähissä. Vaihda laatuasetusta tai poista kuvia tai muita tiedostoja."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Videon koko on suurin mahdollinen."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoomaus"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoomaus <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8d35cc8..45b0dad 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"La mémoire de stockage USB est pleine. Définissez la qualité sur une valeur plus basse ou supprimez des images ou d\'autres types de fichiers."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Votre carte SD est pleine. Modifiez le paramètre de qualité ou supprimez des images ou des fichiers."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Taille maximale atteinte."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 48c75c7..5cea410 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Na vašoj USB memoriji ponestaje prostora. Primijenite postavku kvalitete ili izbrišite neke slike ili druge datoteke."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na vašoj kartici SD ponestaje prostora. Primijenite postavku kvalitete ili izbrišite neke slike ili druge datoteke."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Dostignuto je ograničenje veličine."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zumiranje"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Povećaj/smanji <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f0d187c..2d08319 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Az USB-táron kezd elfogyni a hely. Módosítsa a minőségi beállításokat, vagy töröljön néhány képet vagy egyéb fájlt."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Az SD-kártyán kezd elfogyni a hely. Módosítsa a minőségi beállításokat, vagy töröljön néhány képet vagy egyéb fájlt."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"A videó elérte a méretkorlátot."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Nagyítás/kicsinyítés"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom: <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 16e6a63..609fb40 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Penyimpanan USB Anda kehabisan ruang kosong. Ubah setelan kualitas atau hapus beberapa gambar atau berkas lain."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Kartu SD Anda kehabisan ruang kosong. Ubah setelan kualitas atau hapus beberapa gambar atau berkas lain."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Batas ukuran tercapai."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ecb767f..e892b10 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -91,8 +91,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Lo spazio dell\'archivio USB si sta esaurendo. Cambia l\'impostazione di qualità o elimina alcune immagini o altri file."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Lo spazio della scheda SD si sta esaurendo. Cambia l\'impostazione di qualità o elimina alcune immagini o altri file."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Limite di dimensione raggiunto."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<string name="switch_to_camera_label" msgid="9148663083850199582">"Passa a fotocamera"</string>
<string name="switch_to_video_label" msgid="1167994386902254398">"Passa a video"</string>
<string name="switch_to_panorama_label" msgid="858801335653517864">"Passa a panorama"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2797900..d5992bb 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"אוזל המקום באמצעי האחסון מסוג USB. שנה את הגדרת האיכות או מחק חלק מהתמונות או קבצים אחרים."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"אוזל המקום בכרטיס ה-SD. שנה את הגדרת האיכות או מחק חלק מהתמונות או קבצים אחרים."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"הגעת למגבלת הגודל."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"מרחק מתצוגה"</string>
- <string name="zoom_text" msgid="3450360177919418123">"זום <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index abfbf06..5eb8c26 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USBストレージの空き領域が少なくなっています。画質設定を変更するか、画像など一部のファイルを削除してください。"</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SDカードの空き領域が少なくなっています。画質設定を変更するか、画像などのファイルを一部削除してください。"</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"サイズ制限に達しました。"</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"ズーム"</string>
- <string name="zoom_text" msgid="3450360177919418123">"ズーム<xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e809d72..07c5d01 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB 저장장치의 공간이 부족합니다. 화질 설정을 변경하거나 일부 이미지 또는 기타 파일을 삭제하세요."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD 카드의 공간이 부족합니다. 화질 설정을 변경하거나 일부 이미지 또는 기타 파일을 삭제하세요."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"크기 한도에 도달했습니다."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"확대/축소"</string>
- <string name="zoom_text" msgid="3450360177919418123">"<xliff:g id="ZOOM_TEXT">%s</xliff:g> 확대/축소"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f5cb26f..bc9e4d4 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB atmintinėje trūksta vietos. Pakeiskite kokybės nustatymą arba ištrinkite kelis vaizdus ar kitus failus."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD kortelėje trūksta vietos. Pakeiskite kokybės nustatymą arba ištrinkite kelis vaizdus ar kitus failus."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Pasiekta dydžio riba."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Keisti mastelį"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Keisti mastelį <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6ede14b..53bb76c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB atmiņa drīz būs pilna. Mainiet kvalitātes iestatījumu vai dzēsiet dažus attēlus vai citus failus."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD karte drīz būs pilna. Mainiet kvalitātes iestatījumu vai dzēsiet dažus attēlus vai citus failus."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Lieluma ierobežojums ir sasniegts."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Tālummaiņa"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Tālummaiņa: <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 835d854..053a1e1 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Storan USB anda kehabisan ruang. Tukar tetapan mutu atau padamkan beberapa imej atau fail lain."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Kad SD anda kehabisan ruang. Tukar tetapan mutu atau padamkan beberapa imej atau fail lain."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Had saiz dicapai."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zum"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zum <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a71f187..d9d8c13 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB-lagringsplass er snart oppbrukt. Endre kvalitetsinnstillingene, eller slett bilder eller andre filer."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Lagringsplassen på SD-kortet er snart oppbrukt. Endre kvalitetsinnstillingene, eller slett bilder eller andre filer."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Videoen ble for stor."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9742116..40269b1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Uw USB-opslag is bijna vol. Wijzig de kwaliteitsinstelling of verwijder enkele afbeeldingen of andere bestanden."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Uw SD-kaart is bijna vol. Wijzig de kwaliteitsinstelling of verwijder enkele afbeeldingen of andere bestanden."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Maximale grootte bereikt"</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoomen"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c2ec5b8..01645a5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Na nośniku USB kończy się miejsce. Zmień ustawienie jakości bądź usuń niektóre zdjęcia lub inne pliki."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na karcie SD kończy się miejsce. Zmień ustawienie jakości bądź usuń niektóre zdjęcia lub inne pliki."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Osiągnięto limit rozmiaru."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Powiększenie"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Powiększenie <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f872cdf..6282dab 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Está a ficar sem espaço no armazenamento USB. Altere as definições de qualidade ou elimine algumas imagens ou outros ficheiros."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Está a ficar sem espaço no cartão SD. Altere as definições de qualidade ou elimine algumas imagens ou outros ficheiros."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Limite de tamanho atingido."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b2513c2..8d410c4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Seu armazenamento USB está sem espaço. Altere a configuração de qualidade ou exclua algumas imagens ou outros arquivos."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Seu cartão SD está sem espaço. Altere a configuração de qualidade ou exclua algumas imagens ou outros arquivos."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Limite de tamanho atingido."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index b213cd4..6487e37 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -98,9 +98,6 @@
<!-- outdated translation 2848517537672543641 --> <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Vossa carta SD è plaina. Modifitgai il parameter da qualitad u stizzai elements dal catalog."</string>
<!-- outdated translation 2848517537672543641 --> <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Vossa carta SD è plaina. Modifitgai il parameter da qualitad u stizzai elements dal catalog."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Cuntanschì la grondezza maximala."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <!-- no translation found for zoom_text (3450360177919418123) -->
- <skip />
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0083c22..5b06fae 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Spaţiul de stocare USB este aproape ocupat. Editaţi setarea de calitate sau ştergeţi câteva imagini ori alte fişiere."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Cardul SD rămâne fără spaţiu de stocare. Editaţi setarea de calitate sau ştergeţi câteva imagini sau alte fişiere."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Dimensiune limită depăşită."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zoom <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3efd68a..d6024ff 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Место на USB-накопителе заканчивается. Измените настройки качества или удалите ненужные изображения и другие файлы."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Место на вашей SD-карте заканчивается. Измените настройки качества или удалите ненужные изображения и другие файлы."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Достигнут предельный размер видео."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Масштаб"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Масштаб: <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a06730c..369f0a2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"V ukladacom priestore USB je málo miesta. Zmeňte nastavenie kvality alebo odstráňte niektoré obrázky či iné súbory."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na karte SD je málo miesta. Zmeňte nastavenie kvality alebo odstráňte niektoré obrázky či iné súbory."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Bolo dosiahnuté obmedzenie veľkosti."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Lupa"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Priblíženie: <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5b7a471..9e1dea6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Na vašem pomnilniku USB zmanjkuje prostora. Spremenite nastavitev kakovosti ali izbrišite nekaj slik ali drugih datotek."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na kartici SD zmanjkuje prostora. Spremenite nastavitev kakovosti ali izbrišite nekaj slik ali drugih datotek."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Dosežena je omejitev velikosti."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Povečava"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Povečava: <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9ddcd14..1aff57e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"На вашој USB меморији понестаје места. Промените подешавања квалитета или избришите неке слике или друге датотеке."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"На вашој SD картици понестаје места. Промените поставке квалитета или избришите неке слике или друге датотеке."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Достигнуто је ограничење величине."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Зумирање"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Зум <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c7282cf..9e7d621 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Din USB-lagringsenhet börjar bli full. Ändra kvalitetsinställningen eller ta bort några bilder eller andra filer."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Den delade lagringsenheten börjar bli full. Ändra inställningen för kvalitet eller ta bort några bilder eller andra filer."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Storleksgränsen nådd."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Zooma <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 71b45c4..79a0868 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -95,8 +95,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Hifadhi yako ya USB inaishiwa na nafasi. Badilisha mipangilio ya ubora au futa baadhi ya picha au faili."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Nafasi ya kadi yako ya SD inaelekea kuisha. Badlisha mpangilio wa ubora au futa baadhi ya picha au faili zingine."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Upeo wa ukubwa umefikiwa."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Kuza"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Kuza <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index e02fffa..92320da 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"ที่เก็บข้อมูล USB ของคุณไม่มีพื้นที่เหลือ ให้เปลี่ยนการตั้งค่าคุณภาพหรือลบบางภาพหรือไฟล์อื่นๆ"</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"การ์ด SD ของคุณไม่มีพื้นที่เหลือ ให้เปลี่ยนการตั้งค่าคุณภาพหรือลบบางภาพหรือไฟล์อื่นๆ"</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"ขนาดถึงขีดจำกัดแล้ว"</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"ซูม"</string>
- <string name="zoom_text" msgid="3450360177919418123">"ย่อ/ขยาย <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 31eecdb..b2d900c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Nauubusan na ng puwang ang iyong imbakan na USB. Baguhin ang setting ng kalidad o tanggalin ang ilan sa mga larawan o ibang mga file."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Nauubusan na ng puwang ang SD card. Baguhin ang setting ng kalidad o tanggalin ang ilan sa mga larawan o ibang mga file."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Naabot ang limitasyon ng laki."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Mag-zoom"</string>
- <string name="zoom_text" msgid="3450360177919418123">"I-zoom ang <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ce11e18..9ac0864 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB depolama biriminizde boş alan azaldı. Kalite ayarını değiştirin veya bazı resimleri ya da diğer dosyaları silin."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD kartınızda boş alan azaldı. Kalite ayarını değiştirin veya bazı resimleri ya da diğer dosyaları silin."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Boyut sınırına ulaşıldı."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Zum:"</string>
- <string name="zoom_text" msgid="3450360177919418123">"<xliff:g id="ZOOM_TEXT">%s</xliff:g> zum"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0f65c11..098f67b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"На носії USB недостатньо місця. Змініть налаштування якості чи видаліть зображення або інші файли."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"На карті SD недостатньо місця. Змініть налаштування якості чи видаліть зображення або інші файли."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Досягн. макс. розмір."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Масштаб."</string>
- <string name="zoom_text" msgid="3450360177919418123">"Масштаб <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a39fb47..25d9d10 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Bộ nhớ USB của bạn sắp hết dung lượng. Thay đổi cài đặt chất lượng hoặc xóa một số ảnh hoặc tệp khác."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Thẻ SD của bạn sắp hết dung lượng. Thay đổi cài đặt chất lượng hoặc xóa một số ảnh hoặc tệp khác."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Đã đạt tới giới hạn kích thước."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Thu phóng"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Thu phóng <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f1dd005..fffa2c1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB 存储设备空间不足,请更改照片品质设置,或删除某些照片或者其他文件。"</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD 卡空间不足,请更改照片品质设置,或删除某些照片或者其他文件。"</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"已达到大小上限。"</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"缩放"</string>
- <string name="zoom_text" msgid="3450360177919418123">"缩放 <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 48db01d..1574d55 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -92,8 +92,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"您的 USB 儲存裝置的空間即將用盡,請變更圖片的品質設定,或是刪除部分圖片或其他檔案。"</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"您 SD 卡的空間即將不足,請變更圖片的品質設定,或是刪除部分圖片或其他檔案。"</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"已達大小上限。"</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"縮放"</string>
- <string name="zoom_text" msgid="3450360177919418123">"變焦 <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 76584aa..20e54c1 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -95,8 +95,6 @@
<string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Isitoreji se-USB yakho siphelelwa yisikhala. Shintsha ilungiselelo lekhwalithi noma susa ezinye izithombe noma amanye amafayela."</string>
<string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Ikhadi lakho le-SD liphelelwa isikhathi. Shintsha ilungiselelo lekhwalithi noma susa eminye imifanekiso noma amanye amafayela."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Umkhwawulo wosayizi ufinyelelwe."</string>
- <string name="zoom_control_title" msgid="6532562653386981815">"Sondeza"</string>
- <string name="zoom_text" msgid="3450360177919418123">"Sondeza <xliff:g id="ZOOM_TEXT">%s</xliff:g>"</string>
<!-- no translation found for switch_to_camera_label (9148663083850199582) -->
<skip />
<!-- no translation found for switch_to_video_label (1167994386902254398) -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 489492b..800a99b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -241,12 +241,6 @@
<!-- The messsage shown when video record reaches size limit. -->
<string name="video_reach_size_limit">Size limit reached.</string>
- <!-- The title show on the zoom controller -->
- <string name="zoom_control_title">Zoom</string>
-
- <!-- The text to show the current zoom factor. [CHAR LIMIT=NONE] -->
- <string name="zoom_text">Zoom <xliff:g id="zoom_text" example="1.1x">%s</xliff:g></string>
-
<!-- The text of menu item to switch the mode to Camera. [CHAR LIMIT=NONE] -->
<string name="switch_to_camera_label">Switch to camera</string>
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 2e4de8c..86ab4e9 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -70,7 +70,6 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.RelativeLayout;
-import android.widget.TextView;
import android.widget.Toast;
import java.io.File;
@@ -456,7 +455,7 @@ public class Camera extends ActivityBase implements View.OnClickListener,
mZoomMax = mParameters.getMaxZoom();
mSmoothZoomSupported = mParameters.isSmoothZoomSupported();
if (mZoomPicker != null) {
- mZoomPicker.setZoomRatios(Util.convertZoomRatios(mParameters.getZoomRatios()));
+ mZoomPicker.setZoomMax(mZoomMax);
mZoomPicker.setZoomIndex(mParameters.getZoom());
mZoomPicker.setSmoothZoomSupported(mSmoothZoomSupported);
mZoomPicker.setOnZoomChangeListener(
@@ -603,9 +602,8 @@ public class Camera extends ActivityBase implements View.OnClickListener,
private void initializeZoomPicker() {
View zoomIncrement = findViewById(R.id.zoom_increment);
View zoomDecrement = findViewById(R.id.zoom_decrement);
- TextView zoomRatio = (TextView) findViewById(R.id.zoom_ratio);
if (zoomIncrement != null && zoomDecrement != null && mParameters.isZoomSupported()) {
- mZoomPicker = new ZoomPicker(this, zoomIncrement, zoomDecrement, zoomRatio);
+ mZoomPicker = new ZoomPicker(this, zoomIncrement, zoomDecrement);
}
}
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 61b6aa6..948b3eb 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -380,14 +380,6 @@ public class Util {
}
}
- public static float[] convertZoomRatios(List<Integer> zoomRatios) {
- float result[] = new float[zoomRatios.size()];
- for (int i = 0, n = result.length; i < n; ++i) {
- result[i] = (float) zoomRatios.get(i) / 100f;
- }
- return result;
- }
-
/**
* Returns whether the device is voice-capable (meaning, it can do MMS).
*/
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 7ee148f..7271335 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -459,9 +459,8 @@ public class VideoCamera extends ActivityBase
private void initializeZoomPicker() {
View zoomIncrement = findViewById(R.id.zoom_increment);
View zoomDecrement = findViewById(R.id.zoom_decrement);
- TextView zoomRatio = (TextView) findViewById(R.id.zoom_ratio);
if (zoomIncrement != null && zoomDecrement != null && mParameters.isZoomSupported()) {
- mZoomPicker = new ZoomPicker(this, zoomIncrement, zoomDecrement, zoomRatio);
+ mZoomPicker = new ZoomPicker(this, zoomIncrement, zoomDecrement);
}
}
@@ -1894,7 +1893,7 @@ public class VideoCamera extends ActivityBase
mZoomMax = mParameters.getMaxZoom();
mSmoothZoomSupported = mParameters.isSmoothZoomSupported();
if (mZoomPicker != null) {
- mZoomPicker.setZoomRatios(Util.convertZoomRatios(mParameters.getZoomRatios()));
+ mZoomPicker.setZoomMax(mZoomMax);
mZoomPicker.setZoomIndex(mParameters.getZoom());
mZoomPicker.setSmoothZoomSupported(mSmoothZoomSupported);
mZoomPicker.setOnZoomChangeListener(
diff --git a/src/com/android/camera/ui/ZoomPicker.java b/src/com/android/camera/ui/ZoomPicker.java
index e8305b3..3979bca 100644
--- a/src/com/android/camera/ui/ZoomPicker.java
+++ b/src/com/android/camera/ui/ZoomPicker.java
@@ -16,15 +16,11 @@
package com.android.camera.ui;
-import com.android.camera.R;
-
import android.content.Context;
import android.os.Handler;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnTouchListener;
-import android.widget.Button;
-import android.widget.TextView;
import java.util.Formatter;
@@ -33,16 +29,13 @@ import java.util.Formatter;
*/
public class ZoomPicker {
private final String TAG = "ZoomPicker";
- private TextView mZoomTextView;
private int mZoomMax, mZoomIndex;
- private float[] mZoomRatios;
private boolean mSmoothZoomSupported;
private OnZoomChangedListener mListener;
private boolean mIncrement, mDecrement;
private final StringBuilder mBuilder = new StringBuilder();
private final Formatter mFormatter = new Formatter(mBuilder);
private final Object[] mFormatterArgs = new Object[1];
- private String mZoomText;
private View mIncrementButton;
private View mDecrementButton;
@@ -74,8 +67,7 @@ public class ZoomPicker {
}
};
- public ZoomPicker(Context context, View increment, View decrement, TextView zoomText) {
- mZoomText = context.getString(R.string.zoom_text);
+ public ZoomPicker(Context context, View increment, View decrement) {
mHandler = new Handler();
OnTouchListener incrementTouchListener = new OnTouchListener() {
@@ -126,7 +118,6 @@ public class ZoomPicker {
mDecrementButton = decrement;
mDecrementButton.setOnTouchListener(decrementTouchListener);
mDecrementButton.setVisibility(View.VISIBLE);
- mZoomTextView = zoomText;
}
public void setOnZoomChangeListener(OnZoomChangedListener listener) {
@@ -138,10 +129,8 @@ public class ZoomPicker {
void onZoomStateChanged(int state); // only for smooth zoom
}
- public void setZoomRatios(float[] zoomRatios) {
- mZoomMax = zoomRatios.length - 1;
- mZoomRatios = zoomRatios;
- updateView();
+ public void setZoomMax(int zoomMax) {
+ mZoomMax = zoomMax;
}
public void setZoomIndex(int index) {
@@ -149,7 +138,6 @@ public class ZoomPicker {
throw new IllegalArgumentException("Invalid zoom value:" + index);
}
mZoomIndex = index;
- updateView();
}
public void setSmoothZoomSupported(boolean smoothZoomSupported) {
@@ -162,21 +150,9 @@ public class ZoomPicker {
if (mListener != null) {
mListener.onZoomValueChanged(mZoomIndex);
}
- updateView();
return true;
}
- private void updateView() {
- if (mZoomTextView == null) return;
-
- if (mZoomIndex == 0) {
- mZoomTextView.setVisibility(View.INVISIBLE);
- } else {
- mZoomTextView.setText(String.format(mZoomText, formatZoomRatio(mZoomRatios[mZoomIndex])));
- mZoomTextView.setVisibility(View.VISIBLE);
- }
- }
-
private String formatZoomRatio(float value) {
mFormatterArgs[0] = value;
mBuilder.delete(0, mBuilder.length());