summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values-cs/strings.xml1
-rw-r--r--res/values-da/strings.xml1
-rw-r--r--res/values-de/strings.xml1
-rw-r--r--res/values-el/strings.xml1
-rw-r--r--res/values-es-rUS/strings.xml1
-rw-r--r--res/values-es/strings.xml1
-rw-r--r--res/values-fr/strings.xml1
-rw-r--r--res/values-it/strings.xml1
-rw-r--r--res/values-ja/strings.xml1
-rw-r--r--res/values-ko/strings.xml1
-rw-r--r--res/values-nb/strings.xml1
-rw-r--r--res/values-nl/strings.xml1
-rw-r--r--res/values-pl/strings.xml1
-rw-r--r--res/values-pt-rPT/strings.xml1
-rw-r--r--res/values-pt/strings.xml1
-rw-r--r--res/values-ru/strings.xml1
-rw-r--r--res/values-sv/strings.xml1
-rw-r--r--res/values-tr/strings.xml1
-rw-r--r--res/values-zh-rCN/strings.xml1
-rw-r--r--res/values-zh-rTW/strings.xml1
-rw-r--r--res/values/arrays.xml2
-rw-r--r--res/values/strings.xml3
22 files changed, 4 insertions, 21 deletions
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9f45360..64b9b79 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixely"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixely"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Kvalita fotografií"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Velmi jemná"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Jemná"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4526303..7795694 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 M pixels"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 M pixels"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M pixels"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Billedkvalitet"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Superfin"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fin"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2800d95..38b46fe 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 Millionen Pixel"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 Millionen Pixel"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 Million Pixel"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Bildqualität"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Extrafein"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fein"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 48252ea..9a21ec3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M εικονοστοιχεία"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M εικονοστοιχεία"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M εικονοστοιχεία"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Ποιότητα εικόνας"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Πολύ υψηλή"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Λεπτή"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b038998..da6fb49 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M píxeles"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M píxeles"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M píxeles"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Calidad de la imagen"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Súper fino"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fino"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f186c2b..2fd7d3b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"Píxeles de 3 M"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"Píxeles de 2 M"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"Píxeles de 1 M"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Calidad de imagen"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Muy buena"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Buena"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2f9adf8..d17dc5c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 M pixels"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 M pixels"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M pixels"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualité d\'image"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Très haute qualité"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Haute qualité"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4ab58ea..e9fca65 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 Megapixel"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 Megapixel"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 Megapixel"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualità immagine"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super fine"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fine"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 478a98b..04451e7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3メガピクセル"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2メガピクセル"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1メガピクセル"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"写真の画質"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"スーパーファイン"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"ファイン"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 34a7c42..2a93a7f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M 픽셀"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M 픽셀"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M 픽셀"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"사진 품질"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"최고급"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"고급"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8dae11a..a82bc16 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M (2048x1536)"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M (1600x1200)"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M (1024x768)"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Bildekvalitet"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Ekstra fin"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fin"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4772080..37356fe 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixels"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixels"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixels"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Fotokwaliteit"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Zeer fijn"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fijn"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ebc7e71..b3c8539 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapiksele"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapiksele"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapiksel"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Jakość zdjęcia"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Bardzo wysoka"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Wysoka"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f746339..184052a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixels"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixels"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixels"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualidade de imagem"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super fina"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Optimizar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ddf0c99..f7a56ec 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M Pixels"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M Pixels"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Pixels"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualidade da imagem"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Muito boa"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Boa"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c49228f..fa322a0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 мегапикселя"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 мегапикселя"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 мегапиксель"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Качество фотографий"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Отличное"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Хорошее"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 53f052e..5edf342 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixlar"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixlar"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Bildkvalitet"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Superfin"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fin"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 28e6143..69c0af7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M Piksel"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M Piksel"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Piksel"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Resim kalitesi"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Çok iyi"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"İyi"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8e9d10f..9d1b9eb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 百万像素"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 百万像素"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 百万像素"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"照片质量"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"极精细"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"精细"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d47f5ae..0d3dbd8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -60,7 +60,6 @@
<string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 百萬像素"</string>
<string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 百萬像素"</string>
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 百萬像素"</string>
- <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"相片品質"</string>
<string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"超精細"</string>
<string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"精細"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6ee7263..0e89d1b 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -103,6 +103,7 @@
<item>@string/pref_camera_picturesize_entry_2048x1536</item>
<item>@string/pref_camera_picturesize_entry_1600x1200</item>
<item>@string/pref_camera_picturesize_entry_1024x768</item>
+ <item>@string/pref_camera_picturesize_entry_640x480</item>
<item>@string/pref_camera_picturesize_entry_320x240</item>
</string-array>
@@ -115,6 +116,7 @@
<item>2048x1536</item>
<item>1600x1200</item>
<item>1024x768</item>
+ <item>640x480</item>
<item>320x240</item>
</string-array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf39dde..aa2e420 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -192,7 +192,8 @@
<string name="pref_camera_picturesize_entry_2048x1536">3M Pixels</string>
<string name="pref_camera_picturesize_entry_1600x1200">2M Pixels</string>
<string name="pref_camera_picturesize_entry_1024x768">1M Pixels</string>
- <string name="pref_camera_picturesize_entry_320x240">QVGA</string>
+ <string name="pref_camera_picturesize_entry_640x480" translatable="false">VGA</string>
+ <string name="pref_camera_picturesize_entry_320x240" translatable="false">QVGA</string>
<!-- Default picture quality setting. See
pref_camera_jpegquality_entryvalues for possible values -->