Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
index b6d7e61..5467d42 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
@@ -510,7 +510,9 @@
* @see #EVENT_VALUE_OF_REGISTERED_TAG
*/
protected void registerForTagValue(ExifTag tag) {
- mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, true));
+ if (tag.getOffset() >= mTiffStream.getReadByteCount()) {
+ mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, true));
+ }
}
private void registerIfd(int ifdType, long offset) {
@@ -563,7 +565,12 @@
tag.setOffset((int) offset);
}
} else {
+ boolean defCount = tag.hasDefinedCount();
+ // Set defined count to 0 so we can add \0 to non-terminated strings
+ tag.setHasDefinedCount(false);
+ // Read value
readFullTagValue(tag);
+ tag.setHasDefinedCount(defCount);
mTiffStream.skip(4 - dataSize);
// Set the offset to the position of value.
tag.setOffset(mTiffStream.getReadByteCount() - 4);
@@ -644,13 +651,22 @@
if (mCorrespondingEvent.size() > 0) {
if (mCorrespondingEvent.firstEntry().getKey() < mTiffStream.getReadByteCount()
+ size) {
- if (mCorrespondingEvent.firstEntry().getValue() instanceof ImageEvent) {
- // Invalid thumbnail offset: tag metadata overlaps with
- // strip.
+ Object event = mCorrespondingEvent.firstEntry().getValue();
+ if (event instanceof ImageEvent) {
+ // Tag value overlaps thumbnail, ignore thumbnail.
+ Log.w(TAG, "Thumbnail overlaps value for tag: \n" + tag.toString());
Entry<Integer, Object> entry = mCorrespondingEvent.pollFirstEntry();
- // Ignore thumbnail.
Log.w(TAG, "Invalid thumbnail offset: " + entry.getKey());
} else {
+ // Tag value overlaps another tag, shorten count
+ if (event instanceof IfdEvent) {
+ Log.w(TAG, "Ifd " + ((IfdEvent) event).ifd
+ + " overlaps value for tag: \n" + tag.toString());
+ } else if (event instanceof ExifTagEvent) {
+ Log.w(TAG, "Tag value for tag: \n"
+ + ((ExifTagEvent) event).tag.toString()
+ + " overlaps value for tag: \n" + tag.toString());
+ }
size = mCorrespondingEvent.firstEntry().getKey()
- mTiffStream.getReadByteCount();
Log.w(TAG, "Invalid size of tag: \n" + tag.toString()
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
index 24e7f53..b8b3872 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
@@ -330,8 +330,13 @@
}
byte[] buf = value.getBytes(US_ASCII);
- byte[] finalBuf = (buf[buf.length - 1] == 0 || mDataType == TYPE_UNDEFINED) ? buf : Arrays
+ byte[] finalBuf = buf;
+ if (buf.length > 0) {
+ finalBuf = (buf[buf.length - 1] == 0 || mDataType == TYPE_UNDEFINED) ? buf : Arrays
.copyOf(buf, buf.length + 1);
+ } else if (mDataType == TYPE_ASCII && mComponentCountActual == 1) {
+ finalBuf = new byte[] { 0 };
+ }
int count = finalBuf.length;
if (checkBadComponentCount(count)) {
return false;
@@ -870,6 +875,10 @@
mHasDefinedDefaultComponentCount = d;
}
+ protected boolean hasDefinedCount() {
+ return mHasDefinedDefaultComponentCount;
+ }
+
private boolean checkBadComponentCount(int count) {
if (mHasDefinedDefaultComponentCount && (mComponentCountActual != count)) {
return true;
diff --git a/res/values-af/filtershow_strings.xml b/res/values-af/filtershow_strings.xml
index 1ecb0bf..4493aa5 100644
--- a/res/values-af/filtershow_strings.xml
+++ b/res/values-af/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"Stel muurpapier"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"Kon foto nie aflaai nie. Netwerk nie beskikbaar nie."</string>
<string name="original" msgid="3524493791230430897">"Oorspronklike"</string>
<string name="borders" msgid="2067345080568684614">"Grense"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"Ontdoen"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"Herdoen"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"Wys toegepaste effekte"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"Versteek toegepaste effekte"</string>
<string name="menu_settings" msgid="6428291655769260831">"Instellings"</string>
<string name="unsaved" msgid="8704442449002374375">"Daar is ongestoorde veranderinge aan hierdie prent."</string>
<string name="save_before_exit" msgid="2680660633675916712">"Wil jy stoor voor jy uitgaan?"</string>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e4ba1de..0962a2c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Terug"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Voorkant"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Stoor ligging"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"LIGGING"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"Aftel-tydhouer"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 sekonde"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nag"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sonsondergang"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Partytjie"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"GEEN"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"HANDELING"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NAG"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"SONSONDERGANG"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"PARTYTJIE"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"AFTEL-TYDHOUER"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TYDHOUER AF"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKONDE"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKONDES"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKONDES"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKONDES"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Kan nie in toneelmodus gekies word nie."</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Beligting"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"BELIGTING"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"VOORSTE KAMERA"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"AGTERSTE KAMERA"</string>
<string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
diff --git a/res/values-am/filtershow_strings.xml b/res/values-am/filtershow_strings.xml
index 72c70f7..04fb893 100644
--- a/res/values-am/filtershow_strings.xml
+++ b/res/values-am/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"ልጥፍ በማዘጋጀት ላይ"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"ፎቶን ማውረድ አልተቻለም። አውታረ መረብ አይገኝም።"</string>
<string name="original" msgid="3524493791230430897">"የመጀመሪያው"</string>
<string name="borders" msgid="2067345080568684614">"ድንበሮች"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"ቀልብስ"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"ድገም"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"የተተገበሩ ተጽዕኖዎችን አሳይ"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"የተተገበሩ ተጽዕኖዎችን ደብቅ"</string>
<string name="menu_settings" msgid="6428291655769260831">"ቅንብሮች"</string>
<string name="unsaved" msgid="8704442449002374375">"በዚህ ምስል ላይ"</string>
<string name="save_before_exit" msgid="2680660633675916712">"ከመውጣትዎ በፊት ማስቀመጥ ይፈልጋሉ?"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 4398386..7682220 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"ተመለስ"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"የፊት"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"ሥፍራ"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"አካባቢ"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"ሰዓት ቆጣሪ"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 ሰከንድ"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"ማታ"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"ፀሀይ ስትጠልቅ"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"ፓርቲ"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"ምንም"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"እርምጃ"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"ማታ"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ፀሀይ ስትጠልቅ"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"ድግስ"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ሰዓት ቆጣሪ"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ሰዓት ቆጣሪ ጠፍቷል"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 ሰከንድ"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 ሰከንዶች"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 ሰከንዶች"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 ሰከንዶች"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">" በትዕይንት ሁኔታ መመረጥ የሚችል አይደለም።"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"የተጋለጠ"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"ተጋላጭነት"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"ኤች ዲ አር"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"የፊት ካሜራ"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"የኋላ ካሜራ"</string>
<string name="dialog_ok" msgid="6263301364153382152">"እሺ"</string>
diff --git a/res/values-ar/filtershow_strings.xml b/res/values-ar/filtershow_strings.xml
index e1adf32..926136e 100644
--- a/res/values-ar/filtershow_strings.xml
+++ b/res/values-ar/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"جارٍ تعيين الخلفية"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"تعذر تنزيل الصورة. الشبكة غير متاحة."</string>
<string name="original" msgid="3524493791230430897">"أصلية"</string>
<string name="borders" msgid="2067345080568684614">"حدود"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"تراجع"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"إعادة"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"إظهار التأثيرات المطبقة"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"إخفاء التأثيرات المطبقة"</string>
<string name="menu_settings" msgid="6428291655769260831">"إعدادات"</string>
<string name="unsaved" msgid="8704442449002374375">"هناك تغييرات في هذه الصورة لم يتم حفظها."</string>
<string name="save_before_exit" msgid="2680660633675916712">"هل تريد الحفظ قبل الخروج؟"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 583c060..e0f0ad4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"رجوع"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"الأمام"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"تخزين الموقع"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"الموقع"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"مؤقت العد التنازلي"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"ثانية واحدة"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"ليلي"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"الغروب"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"مجموعة"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"لا شيء"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"حركة"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"ليلاً"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"الغروب"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"حفلة"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"موقّت العد التنازلي"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"إيقاف الموقّت"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"ثانية واحدة"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 ثوانٍ"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 ثوانٍ"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 ثانية"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"لا يمكن تحديده في وضع المشهد."</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"التعرض"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"التعرض للضوء"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"نطاق عالي الديناميكية"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"الكاميرا الأمامية"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"الكاميرا الخلفية"</string>
<string name="dialog_ok" msgid="6263301364153382152">"موافق"</string>
diff --git a/res/values-be/filtershow_strings.xml b/res/values-be/filtershow_strings.xml
index ca156f7..049ba6e 100644
--- a/res/values-be/filtershow_strings.xml
+++ b/res/values-be/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"Усталёўка шпалер..."</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"Не атрымалася спампаваць фота. Сетка недаступная."</string>
<string name="original" msgid="3524493791230430897">"Арыгiнал"</string>
<string name="borders" msgid="2067345080568684614">"Межы"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"Вярнуць"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"Паўтарыць"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"Паказваць прымененыя эфекты"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"Хаваць прымененыя эфекты"</string>
<string name="menu_settings" msgid="6428291655769260831">"Налады"</string>
<string name="unsaved" msgid="8704442449002374375">"Існуюць незахаваныя змяненні ў гэтай выяве."</string>
<string name="save_before_exit" msgid="2680660633675916712">"Жадаеце захавацца перад выхадам?"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d2dbc8c..b304450 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Назад"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Перад"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Месцазнаходжанне крамы"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"МЕСЦАЗНАХОДЖАННЕ"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"Таймер зваротнага адлiку"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 секунда"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ноч"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Заход"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Вечарына"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"НЯМА"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ДЗЕЯННЕ"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"НОЧ"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ЗАХОД"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"ВЕЧАРЫНА"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ТАЙМЕР ЗВАРОТНАГА АДЛІКУ"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ТАЙМЕР АДКЛЮЧАНЫ"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 СЕКУНДА"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 СЕКУНДЫ"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 СЕКУНД"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 СЕКУНД"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Немагчыма выбраць у рэжыме здымкi."</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Экспазіцыя"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"ЭКСПАЗIЦЫЯ"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"ПЯРЭДНЯЯ КАМЕРА"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"ЗАДНЯЯ КАМЕРА"</string>
<string name="dialog_ok" msgid="6263301364153382152">"ОК"</string>
diff --git a/res/values-ca/filtershow_strings.xml b/res/values-ca/filtershow_strings.xml
index a45fb41..7da09b9 100644
--- a/res/values-ca/filtershow_strings.xml
+++ b/res/values-ca/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"S\'està establint el fons de pantalla"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"No s\'ha pogut baixar la foto. La xarxa no està disponible."</string>
<string name="original" msgid="3524493791230430897">"Original"</string>
<string name="borders" msgid="2067345080568684614">"Vores"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"Desfés"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"Refés"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"Mostra els efectes aplicats"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"Amaga els efectes aplicats"</string>
<string name="menu_settings" msgid="6428291655769260831">"Configuració"</string>
<string name="unsaved" msgid="8704442449002374375">"Hi ha canvis sense desar en aquesta imatge."</string>
<string name="save_before_exit" msgid="2680660633675916712">"Vols desar abans de sortir?"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index facd004..7b23c80 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Enrere"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Frontal"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Emmagatzema la ubicació"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"UBICACIÓ"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"Temporitzador de compte enrere"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 segon"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nocturn"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Posta del sol"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Festa"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"CAP"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ACCIÓ"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NIT"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"POSTA DE SOL"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FESTA"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"TEMPORITZADOR DE COMPTE ENRERE"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TEMPORITZADOR DESACTIVAT"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEGON"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEGONS"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEGONS"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEGONS"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"No es pot seleccionar en mode d\'escena."</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposició"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"EXPOSICIÓ"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"CÀMERA FRONTAL"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"CÀMERA POSTERIOR"</string>
<string name="dialog_ok" msgid="6263301364153382152">"D\'acord"</string>
diff --git a/res/values-el/filtershow_strings.xml b/res/values-el/filtershow_strings.xml
index 8afcaaa..bfbd589 100644
--- a/res/values-el/filtershow_strings.xml
+++ b/res/values-el/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"Ορισμός ταπετσαρίας…"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"Δεν ήταν δυνατή η λήψη φωτογραφιών. Το δίκτυο δεν είναι διαθέσιμο."</string>
<string name="original" msgid="3524493791230430897">"Αρχική"</string>
<string name="borders" msgid="2067345080568684614">"Σύνορα"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"Αναίρεση"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"Επανάληψη"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"Εμφάνιση εφαρμοσμένων εφέ"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"Απόκρυψη εφαρμοσμένων εφέ"</string>
<string name="menu_settings" msgid="6428291655769260831">"Ρυθμίσεις"</string>
<string name="unsaved" msgid="8704442449002374375">"Υπάρχουν μη αποθηκευμένες αλλαγές σε αυτήν την εικόνα."</string>
<string name="save_before_exit" msgid="2680660633675916712">"Θέλετε να γίνει αποθήκευση πριν από την έξοδο;"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0cff7ed..a4afe6b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Πίσω"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Μπροστά"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Αποθήκευση τοποθεσίας"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"ΤΟΠΟΘΕΣΙΑ"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"Χρονόμετρο αντίστροφης μέτρησης"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 δευτερόλεπτο"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Νύχτα"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ηλιοβασίλεμα"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Πάρτι"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"ΚΑΜΙΑ"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ΔΡΑΣΗ"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"ΝΥΧΤΑ"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ΗΛΙΟΒΑΣΙΛΕΜΑ"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"ΠΑΡΤΙ"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ΧΡΟΝΟΜΕΤΡΟ ΑΝΤΙΣΤΡΟΦΗΣ ΜΕΤΡΗΣΗΣ"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ΑΝΕΝΕΡΓΟ ΧΡΟΝΟΜΕΤΡΟ"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 ΔΕΥΤΕΡΟΛΕΠΤΟ"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 ΔΕΥΤΕΡΟΛΕΠΤΑ"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 ΔΕΥΤΕΡΟΛΕΠΤΑ"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 ΔΕΥΤΕΡΟΛΕΠΤΑ"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Δεν υπάρχει δυνατότητα επιλογής στη λειτουργία σκηνής."</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Έκθεση"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"ΕΚΘΕΣΗ"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"Υψηλό δυναμικό εύρος (HDR)"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"ΜΠΡΟΣΤΙΝΗ ΚΑΜΕΡΑ"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"ΠΙΣΩ ΚΑΜΕΡΑ"</string>
<string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
diff --git a/res/values-iw/filtershow_strings.xml b/res/values-iw/filtershow_strings.xml
index 870a1de..b584872 100644
--- a/res/values-iw/filtershow_strings.xml
+++ b/res/values-iw/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"מגדיר טפט"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"לא ניתן היה להוריד את התמונה. הרשת לא זמינה."</string>
<string name="original" msgid="3524493791230430897">"מקור"</string>
<string name="borders" msgid="2067345080568684614">"גבולות"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"בטל"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"בצע מחדש"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"הצג אפקטים שהוחלו"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"הסתר אפקטים שהוחלו"</string>
<string name="menu_settings" msgid="6428291655769260831">"הגדרות"</string>
<string name="unsaved" msgid="8704442449002374375">"יש בתמונה הזו שינויים שלא נשמרו."</string>
<string name="save_before_exit" msgid="2680660633675916712">"האם אתה רוצה לשמור לפני היציאה?"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 584a428..1d1a9af 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"הקודם"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"חזיתית"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"מיקום אחסון"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"מיקום"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"טיימר לספירה לאחור"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"שנייה אחת"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"לילה"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"שקיעה"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"מסיבה"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"ללא"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"פעולה"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"לילה"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"שקיעה"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"מסיבה"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"טיימר לספירה לאחור"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"טיימר כבוי"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"שנייה אחת"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 שניות"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 שניות"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 שניות"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"לא ניתן לבחירה במצב נוף."</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"חשיפה"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"חשיפה"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"מצלמה חזיתית"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"מצלמה אחורית"</string>
<string name="dialog_ok" msgid="6263301364153382152">"אישור"</string>
diff --git a/res/values-ko/filtershow_strings.xml b/res/values-ko/filtershow_strings.xml
index 36b9e7e..933aa68 100644
--- a/res/values-ko/filtershow_strings.xml
+++ b/res/values-ko/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"배경화면 설정 중"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"네트워크를 사용할 수 없기 때문에 사진을 다운로드할 수 없습니다."</string>
<string name="original" msgid="3524493791230430897">"원본"</string>
<string name="borders" msgid="2067345080568684614">"테두리"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"실행취소"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"다시실행"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"적용된 효과 표시"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"적용된 효과 숨기기"</string>
<string name="menu_settings" msgid="6428291655769260831">"설정"</string>
<string name="unsaved" msgid="8704442449002374375">"이 이미지에 저장하지 않은 변경사항이 있습니다."</string>
<string name="save_before_exit" msgid="2680660633675916712">"저장하고 나서 종료하시겠습니까?"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cc314d9..874fd23 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"후방"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"전방"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"위치 저장"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"위치"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"카운트다운 타이머"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1초"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"야간"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"일몰"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"파티"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"없음"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"작업"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"밤"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"일몰"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"파티"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"카운트다운 타이머"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"타이머 중지"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1초"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3초"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10초"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15초"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"장면 모드에서 선택할 수 없습니다."</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"노출"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"노출"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"전방 카메라"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"후방 카메라"</string>
<string name="dialog_ok" msgid="6263301364153382152">"확인"</string>
diff --git a/res/values-ms/filtershow_strings.xml b/res/values-ms/filtershow_strings.xml
index 559b667..cac3e7d 100644
--- a/res/values-ms/filtershow_strings.xml
+++ b/res/values-ms/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"Menetapkan kertas dinding"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"Tidak dapat memuat turun foto. Rangkaian tidak tersedia."</string>
<string name="original" msgid="3524493791230430897">"Asli"</string>
<string name="borders" msgid="2067345080568684614">"Sempadan"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"Buat asal"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"Buat semula"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"Tunjukkan Kesan Digunakan"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"Sembunyikan Kesan Digunakan"</string>
<string name="menu_settings" msgid="6428291655769260831">"Tetapan"</string>
<string name="unsaved" msgid="8704442449002374375">"Terdapat perubahan kepada imej ini yang tidak disimpan."</string>
<string name="save_before_exit" msgid="2680660633675916712">"Adakah anda ingin simpan sebelum keluar?"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 212c70b..3f5d185 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Belakang"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Depan"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Lokasi stor"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"LOKASI"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"Pemasa hitung detik"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 saat"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Malam"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Matahari Terbenam"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Parti"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"TIADA"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"TINDAKAN"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"MALAM"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"MATAHARI TERBENAM"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"PARTI"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"PEMASA HITUNG DETIK"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"PEMASA DIMATIKAN"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SAAT"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SAAT"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SAAT"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SAAT"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Tidak boleh dipilih dalam mod pemandangan."</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Dedahan"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"DEDAHAN"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"KAMERA DEPAN"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"KAMERA BELAKANG"</string>
<string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
diff --git a/res/values-rm/filtershow_strings.xml b/res/values-rm/filtershow_strings.xml
new file mode 100644
index 0000000..590ad0c
--- /dev/null
+++ b/res/values-rm/filtershow_strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- no translation found for title_activity_filter_show (2036539130684382763) -->
+ <skip />
+ <!-- no translation found for cannot_load_image (5023634941212959976) -->
+ <skip />
+ <!-- no translation found for original_picture_text (3076213290079909698) -->
+ <skip />
+ <!-- no translation found for setting_wallpaper (4679087092300036632) -->
+ <skip />
+ <!-- no translation found for download_failure (5923323939788582895) -->
+ <skip />
+ <!-- no translation found for original (3524493791230430897) -->
+ <skip />
+ <!-- no translation found for borders (2067345080568684614) -->
+ <!-- no translation found for borders (4461692156695893616) -->
+ <skip />
+ <!-- no translation found for filtershow_undo (6781743189243585101) -->
+ <skip />
+ <!-- no translation found for filtershow_redo (4219489910543059747) -->
+ <skip />
+ <!-- no translation found for show_imagestate_panel (281932769701043015) -->
+ <skip />
+ <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
+ <skip />
+ <!-- no translation found for menu_settings (6428291655769260831) -->
+ <skip />
+ <!-- no translation found for unsaved (8704442449002374375) -->
+ <skip />
+ <!-- no translation found for save_before_exit (2680660633675916712) -->
+ <skip />
+ <!-- no translation found for save_and_exit (3628425023766687419) -->
+ <skip />
+ <!-- no translation found for exit (242642957038770113) -->
+ <skip />
+ <!-- no translation found for history (455767361472692409) -->
+ <skip />
+ <!-- no translation found for reset (9013181350779592937) -->
+ <skip />
+ <!-- no translation found for history_original (150973253194312841) -->
+ <skip />
+ <!-- no translation found for imageState (8632586742752891968) -->
+ <skip />
+ <!-- no translation found for compare_original (8140838959007796977) -->
+ <skip />
+ <!-- no translation found for apply_effect (1218288221200568947) -->
+ <skip />
+ <!-- no translation found for reset_effect (7712605581024929564) -->
+ <skip />
+ <!-- no translation found for aspect (4025244950820813059) -->
+ <skip />
+ <!-- no translation found for aspect1to1_effect (1159104543795779123) -->
+ <skip />
+ <!-- no translation found for aspect4to3_effect (7968067847241223578) -->
+ <skip />
+ <!-- no translation found for aspect3to4_effect (7078163990979248864) -->
+ <skip />
+ <!-- no translation found for aspect4to6_effect (1410129351686165654) -->
+ <skip />
+ <!-- no translation found for aspect5to7_effect (5122395569059384741) -->
+ <skip />
+ <!-- no translation found for aspect7to5_effect (5780001758108328143) -->
+ <skip />
+ <!-- no translation found for aspect9to16_effect (7740468012919660728) -->
+ <skip />
+ <!-- no translation found for aspectNone_effect (6263330561046574134) -->
+ <skip />
+ <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+ <skip />
+ <!-- no translation found for Fixed (8017376448916924565) -->
+ <skip />
+ <!-- no translation found for tinyplanet (2783694326474415761) -->
+ <skip />
+ <string name="exposure" msgid="6526397045949374905">"Exposiziun"</string>
+ <!-- no translation found for sharpness (6463103068318055412) -->
+ <skip />
+ <!-- no translation found for contrast (2310908487756769019) -->
+ <skip />
+ <!-- no translation found for vibrance (3326744578577835915) -->
+ <skip />
+ <!-- no translation found for saturation (7026791551032438585) -->
+ <skip />
+ <!-- no translation found for bwfilter (8927492494576933793) -->
+ <skip />
+ <!-- no translation found for wbalance (6346581563387083613) -->
+ <skip />
+ <!-- no translation found for hue (6231252147971086030) -->
+ <skip />
+ <!-- no translation found for shadow_recovery (3928572915300287152) -->
+ <skip />
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
+ <!-- no translation found for curvesRGB (915010781090477550) -->
+ <skip />
+ <!-- no translation found for vignette (934721068851885390) -->
+ <skip />
+ <!-- no translation found for redeye (4508883127049472069) -->
+ <skip />
+ <!-- no translation found for imageDraw (6918552177844486656) -->
+ <skip />
+ <!-- no translation found for straighten (26025591664983528) -->
+ <!-- no translation found for straighten (5217801513491493491) -->
+ <skip />
+ <string name="crop" msgid="5781263790107850771">"Retagliar"</string>
+ <string name="rotate" msgid="2796802553793795371">"Rotar"</string>
+ <!-- no translation found for mirror (5482518108154883096) -->
+ <skip />
+ <!-- no translation found for negative (6998313764388022201) -->
+ <skip />
+ <!-- no translation found for none (6633966646410296520) -->
+ <!-- no translation found for none (3601545724573307541) -->
+ <skip />
+ <!-- no translation found for edge (7036064886242147551) -->
+ <skip />
+ <!-- no translation found for kmeans (1630263230946107457) -->
+ <skip />
+ <!-- no translation found for downsample (3552938534146980104) -->
+ <skip />
+ <!-- no translation found for curves_channel_rgb (7909209509638333690) -->
+ <skip />
+ <!-- no translation found for curves_channel_red (4199710104162111357) -->
+ <skip />
+ <!-- no translation found for curves_channel_green (3733003466905031016) -->
+ <skip />
+ <!-- no translation found for curves_channel_blue (9129211507395079371) -->
+ <skip />
+ <!-- no translation found for draw_style (2036125061987325389) -->
+ <skip />
+ <!-- no translation found for draw_size (4360005386104151209) -->
+ <skip />
+ <!-- no translation found for draw_color (2119030386987211193) -->
+ <skip />
+ <!-- no translation found for draw_style_line (9216476853904429628) -->
+ <skip />
+ <!-- no translation found for draw_style_brush_spatter (7612691122932981554) -->
+ <skip />
+ <!-- no translation found for draw_style_brush_marker (8468302322165644292) -->
+ <skip />
+ <!-- no translation found for draw_clear (6728155515454921052) -->
+ <skip />
+ <!-- no translation found for color_pick_select (734312818059057394) -->
+ <skip />
+ <!-- no translation found for color_pick_title (6195567431995308876) -->
+ <skip />
+ <!-- no translation found for draw_size_title (3121649039610273977) -->
+ <skip />
+ <!-- no translation found for draw_size_accept (6781529716526190028) -->
+ <skip />
+ <!-- no translation found for state_panel_original (9069584409934164419) -->
+ <skip />
+ <!-- no translation found for state_panel_result (318640531123298676) -->
+ <skip />
+</resources>
diff --git a/res/values-th/filtershow_strings.xml b/res/values-th/filtershow_strings.xml
index cabb5cc..311e89e 100644
--- a/res/values-th/filtershow_strings.xml
+++ b/res/values-th/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"กำลังตั้งค่าวอลเปเปอร์"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"ไม่สามารถดาวน์โหลดภาพ เครือข่ายไม่พร้อมใช้งาน"</string>
<string name="original" msgid="3524493791230430897">"ต้นฉบับ"</string>
<string name="borders" msgid="2067345080568684614">"ขอบ"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"เลิกทำ"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"ทำซ้ำ"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"แสดงเอฟเฟ็กต์ที่ใช้"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"ซ่อนเอฟเฟ็กต์ที่ใช้"</string>
<string name="menu_settings" msgid="6428291655769260831">"การตั้งค่า"</string>
<string name="unsaved" msgid="8704442449002374375">"มีการเปลี่ยนแปลงที่ไม่ได้บันทึกไปยังภาพนี้"</string>
<string name="save_before_exit" msgid="2680660633675916712">"คุณต้องการบันทึกก่อนที่จะออกหรือไม่"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index dc9dce7..d3cabce 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"ย้อนกลับ"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"ด้านหน้า"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"ตำแหน่งจัดเก็บ"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"ตำแหน่ง"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"ตัวจับเวลาถอยหลัง"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 วินาที"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"กลางคืน"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"ดวงอาทิตย์ตก"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"งานเลี้ยง"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"ไม่มี"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"การทำงาน"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"กลางคืน"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ดวงอาทิตย์ตก"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"ปาร์ตี้"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ตัวจับเวลาถอยหลัง"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ตัวจับเวลาปิด"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 วินาที"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 วินาที"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 วินาที"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 วินาที"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"ไม่สามารถเลือกได้ในโหมดสำเร็จรูป"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"การรับแสง"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"การรับแสง"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"กล้องด้านหน้า"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"กล้องด้านหลัง"</string>
<string name="dialog_ok" msgid="6263301364153382152">"ตกลง"</string>
diff --git a/res/values-tl/filtershow_strings.xml b/res/values-tl/filtershow_strings.xml
index 949a84f..e0d5b10 100644
--- a/res/values-tl/filtershow_strings.xml
+++ b/res/values-tl/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"Itinatakda ang wallpaper"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"Hindi ma-download ang larawan. Hindi available ang network."</string>
<string name="original" msgid="3524493791230430897">"Orihinal"</string>
<string name="borders" msgid="2067345080568684614">"Mga Border"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"I-undo"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"I-redo"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"Ipakita Mga Inilapat na Effect"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"Itago Mga Inilapat na Effect"</string>
<string name="menu_settings" msgid="6428291655769260831">"Mga Setting"</string>
<string name="unsaved" msgid="8704442449002374375">"May mga hindi naka-save na pagbabago sa larawang ito."</string>
<string name="save_before_exit" msgid="2680660633675916712">"Gusto mo bang mag-save bago lumabas?"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3e618d4..0b655ce 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -235,8 +235,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Bumalik"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Harap"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Iimbak ang lokasyon"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"LOKASYON"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"Timer ng countdown"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 segundo"</item>
@@ -296,31 +295,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Gabi"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Paglubog ng araw"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Partido"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"WALA"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ACTION"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NIGHT"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"SUNSET"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"PARTY"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"COUNTDOWN TIMER"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"NAKA-OFF ANG TIMER"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEGUNDO"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEGUNDO"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEGUNDO"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEGUNDO"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Hindi mapipili sa mode ng scene."</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Pagkakalantad"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"EXPOSURE"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"CAMERA SA HARAP"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"CAMERA SA LIKOD"</string>
<string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
diff --git a/res/values-zu/filtershow_strings.xml b/res/values-zu/filtershow_strings.xml
index 0f7e86b..93e04d2 100644
--- a/res/values-zu/filtershow_strings.xml
+++ b/res/values-zu/filtershow_strings.xml
@@ -21,16 +21,13 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"Isetha isithombe sangemuva"</string>
- <!-- no translation found for download_failure (5923323939788582895) -->
- <skip />
+ <string name="download_failure" msgid="5923323939788582895">"Ayikwazanga ukulanda isithombe. Inethiwekhi ayitholakali."</string>
<string name="original" msgid="3524493791230430897">"Oluqobo"</string>
<string name="borders" msgid="2067345080568684614">"Imingcele"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"Hlehlisa"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"Yenza kabusha"</string>
- <!-- no translation found for show_imagestate_panel (281932769701043015) -->
- <skip />
- <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
- <skip />
+ <string name="show_imagestate_panel" msgid="281932769701043015">"Bonisa imiphumela esetshenzisiwe"</string>
+ <string name="hide_imagestate_panel" msgid="7207643485811695257">"Fihla imiphumela esetshenzisiwe"</string>
<string name="menu_settings" msgid="6428291655769260831">"Izilungiselelo"</string>
<string name="unsaved" msgid="8704442449002374375">"Kukhona ushintsho olungalondolozwanga kulesi sithombe."</string>
<string name="save_before_exit" msgid="2680660633675916712">"Ufuna ukulondoloza ngaphambi kokuphuma?"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index aed35d5..b453cf6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -237,8 +237,7 @@
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Emuva"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Phambili"</string>
<string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Gcina indawo"</string>
- <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
- <skip />
+ <string name="pref_camera_location_label" msgid="2254270920298609161">"INDAWO"</string>
<string name="pref_camera_timer_title" msgid="3105232208281893389">"Isikali sesikhathi esibala ngokwehla"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 isekhondi"</item>
@@ -298,31 +297,23 @@
<string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ebusuku"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ukushona kwelanga"</string>
<string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Phathi"</string>
- <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
- <skip />
+ <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"LUTHO"</string>
<string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ISENZO"</string>
<string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"EBUSUKU"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"UKUSHONA KWELANGA"</string>
<string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"IPHATHI"</string>
- <!-- no translation found for pref_camera_countdown_label (7592784692450586126) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_off (4987856883590176585) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_one (1101814103087928898) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_three (1047399297342955649) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_ten (6274681535347260279) -->
- <skip />
- <!-- no translation found for pref_camera_countdown_label_fifteen (4544824246687597089) -->
- <skip />
+ <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ISIKHALI SESHIKHATHI ESIBALA NGOKWEHLA"</string>
+ <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ISIKALI SESIKHATHI SIVALIWE"</string>
+ <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 ISEKHONDI"</string>
+ <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 AMASEKHONDI"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 AMASEKHONDI"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 AMASEKHONDI"</string>
<string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Akukhetheki esimweni sokubuka"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Isibonelelo"</string>
<string name="pref_exposure_label" msgid="552624394642497940">"UKUBONISWA"</string>
<!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
<skip />
- <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
- <skip />
+ <string name="pref_camera_hdr_label" msgid="7217211253357027510">"I-HDR"</string>
<string name="pref_camera_id_label_back" msgid="8745553500400332333">"IKHAMERA EPHAMBILI"</string>
<string name="pref_camera_id_label_front" msgid="8699439330056996709">"IKHAMERA ENGEMUVA"</string>
<string name="dialog_ok" msgid="6263301364153382152">"KULUNGILE"</string>
diff --git a/src/com/android/camera/ui/RotatableLayout.java b/src/com/android/camera/ui/RotatableLayout.java
index bf80605..2dea58d 100644
--- a/src/com/android/camera/ui/RotatableLayout.java
+++ b/src/com/android/camera/ui/RotatableLayout.java
@@ -62,6 +62,7 @@
@Override
public void onAttachedToWindow() {
+ mPrevRotation = Util.getDisplayRotation((Activity) getContext());
// check if there is any rotation before the view is attached to window
int currentOrientation = getResources().getConfiguration().orientation;
if (mInitialOrientation == currentOrientation) {
@@ -74,7 +75,6 @@
&& currentOrientation == Configuration.ORIENTATION_LANDSCAPE) {
rotateLayout(false);
}
- mPrevRotation = Util.getDisplayRotation((Activity) getContext());
}
@Override
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index eb5c258..56680b0 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -117,6 +117,7 @@
private WeakReference<ProgressDialog> mSavingProgressDialog;
private LoadBitmapTask mLoadBitmapTask;
+ private boolean mLoading = true;
private CategoryAdapter mCategoryLooksAdapter = null;
private CategoryAdapter mCategoryBordersAdapter = null;
@@ -132,6 +133,7 @@
if (onlyUsePortrait) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
+ MasterImage.setMaster(mMasterImage);
clearGalleryBitmapPool();
@@ -320,6 +322,7 @@
}
private void startLoadBitmap(Uri uri) {
+ mLoading = true;
final View loading = findViewById(R.id.loading);
final View imageShow = findViewById(R.id.imageShow);
imageShow.setVisibility(View.INVISIBLE);
@@ -457,7 +460,7 @@
@Override
protected void onPostExecute(Boolean result) {
-
+ MasterImage.setMaster(mMasterImage);
if (isCancelled()) {
return;
}
@@ -495,6 +498,7 @@
if (mAction == TINY_PLANET_ACTION) {
showRepresentation(mCategoryFiltersAdapter.getTinyPlanet());
}
+ mLoading = false;
super.onPostExecute(result);
}
@@ -634,6 +638,7 @@
@Override
public void onPause() {
super.onPause();
+ rsPause();
if (mShareActionProvider != null) {
mShareActionProvider.setOnShareTargetSelectedListener(null);
}
@@ -642,11 +647,48 @@
@Override
public void onResume() {
super.onResume();
+ rsResume();
if (mShareActionProvider != null) {
mShareActionProvider.setOnShareTargetSelectedListener(this);
}
}
+ private void rsResume() {
+ ImageFilter.setActivityForMemoryToasts(this);
+ MasterImage.setMaster(mMasterImage);
+ if (CachingPipeline.getRenderScriptContext() == null) {
+ CachingPipeline.createRenderscriptContext(this);
+ }
+ FiltersManager.setResources(getResources());
+ if (!mLoading) {
+ Bitmap largeBitmap = mImageLoader.getOriginalBitmapLarge();
+ FilteringPipeline pipeline = FilteringPipeline.getPipeline();
+ pipeline.setOriginal(largeBitmap);
+ float previewScale = (float) largeBitmap.getWidth() /
+ (float) mImageLoader.getOriginalBounds().width();
+ pipeline.setPreviewScaleFactor(previewScale);
+ Bitmap highresBitmap = mImageLoader.getOriginalBitmapHighres();
+ if (highresBitmap != null) {
+ float highResPreviewScale = (float) highresBitmap.getWidth() /
+ (float) mImageLoader.getOriginalBounds().width();
+ pipeline.setHighResPreviewScaleFactor(highResPreviewScale);
+ }
+ pipeline.turnOnPipeline(true);
+ MasterImage.getImage().setOriginalGeometry(largeBitmap);
+ }
+ }
+
+ private void rsPause() {
+ FilteringPipeline.getPipeline().turnOnPipeline(false);
+ FilteringPipeline.reset();
+ ImageFilter.resetStatics();
+ FiltersManager.getPreviewManager().freeRSFilterScripts();
+ FiltersManager.getManager().freeRSFilterScripts();
+ FiltersManager.getHighresManager().freeRSFilterScripts();
+ FiltersManager.reset();
+ CachingPipeline.destroyRenderScriptContext();
+ }
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
diff --git a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
index e3c7700..8760c4a 100644
--- a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
+++ b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
@@ -91,7 +91,9 @@
}
public static synchronized void destroyRenderScriptContext() {
- sRS.destroy();
+ if (sRS != null) {
+ sRS.destroy();
+ }
sRS = null;
sResources = null;
}
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
index 3c0c017..4c071dc 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
@@ -39,7 +39,7 @@
@Override
public String calculateUserMessage(Context context, String effectName, Object parameterValue) {
String apply = context.getString(R.string.apply_effect);
- apply += " " + effectName + " " + parameterValue;
+ apply += " " + effectName;
return apply;
}
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 658d8bc..5e5d70b 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -91,6 +91,11 @@
private MasterImage() {
}
+ // TODO: remove singleton
+ public static void setMaster(MasterImage master) {
+ sMasterImage = master;
+ }
+
public static MasterImage getImage() {
if (sMasterImage == null) {
sMasterImage = new MasterImage();