Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 7a0194a..8bc0f3f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Outo"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flits gevuur"</string>
     <string name="flash_off" msgid="1445443413822680010">"Geen flits"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Oorspronklike"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Kits"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 50e757c..db5390a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"ራስ ሰር"</string>
     <string name="flash_on" msgid="7891556231891837284">"ብልጭ ብሏል"</string>
     <string name="flash_off" msgid="1445443413822680010">"ምንም ብልጭታ"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"የመጀመሪያው"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"ወይን"</string>
     <string name="ffx_instant" msgid="726968618715691987">"ፈጣን"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b5d432f..1d27197 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -143,9 +143,11 @@
     <string name="auto" msgid="4296941368722892821">"تلقائية"</string>
     <string name="flash_on" msgid="7891556231891837284">"تم تشغيل الفلاش"</string>
     <string name="flash_off" msgid="1445443413822680010">"بلا فلاش"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"أصلية"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
-    <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"فوري"</string>
     <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"أزرق"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"أبيض/أسود"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7c77d84..44f772f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Аўта"</string>
     <string name="flash_on" msgid="7891556231891837284">"Са ўспышкай"</string>
     <string name="flash_off" msgid="1445443413822680010">"Без успышкі"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Арыгiнал"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 719ed84..dad6414 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Авт."</string>
     <string name="flash_on" msgid="7891556231891837284">"Със светкавица"</string>
     <string name="flash_off" msgid="1445443413822680010">"Без светкавица"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Оригинал"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Ретро"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Моментно фото"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 786946e..86670f6 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automàtic"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flaix disparat"</string>
     <string name="flash_off" msgid="1445443413822680010">"Sense flaix"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instantani"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 216f46e..91f709a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Autom."</string>
     <string name="flash_on" msgid="7891556231891837284">"S bleskem"</string>
     <string name="flash_off" msgid="1445443413822680010">"Bez blesku"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Původní"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Klasika"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instantní"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a0b9cc4..2685e00 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Auto"</string>
     <string name="flash_on" msgid="7891556231891837284">"Blitz affyret"</string>
     <string name="flash_off" msgid="1445443413822680010">"Ingen blitz"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ea7f710..76019f3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -143,9 +143,11 @@
     <string name="auto" msgid="4296941368722892821">"Automatisch"</string>
     <string name="flash_on" msgid="7891556231891837284">"Blitz ausgelöst"</string>
     <string name="flash_off" msgid="1445443413822680010">"Ohne Blitz"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
-    <string name="ffx_instant" msgid="726968618715691987">"Sofort"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
     <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Blau"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Schwarz-Weiß"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ac8e23b..4a93f90 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Αυτόματο"</string>
     <string name="flash_on" msgid="7891556231891837284">"Το φλας άναψε"</string>
     <string name="flash_off" msgid="1445443413822680010">"Όχι φλας"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Αρχική"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Εποχής"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Άμεσα"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ce71db4..39647ec 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Auto"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flash fired"</string>
     <string name="flash_off" msgid="1445443413822680010">"No flash"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 649665a..161d710 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automático"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flash activado"</string>
     <string name="flash_off" msgid="1445443413822680010">"Sin flash"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instantánea"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8d82c28..b6022d1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automático"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flash activado"</string>
     <string name="flash_off" msgid="1445443413822680010">"Sin flash"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instantánea"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b60fbf9..bc22d15 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Autom."</string>
     <string name="flash_on" msgid="7891556231891837284">"Välk sees"</string>
     <string name="flash_off" msgid="1445443413822680010">"Välguta"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Originaal"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 64fa212..6fcd12f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"خودکار"</string>
     <string name="flash_on" msgid="7891556231891837284">"فلاش زده شد"</string>
     <string name="flash_off" msgid="1445443413822680010">"بدون فلاش"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"اصلی"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"آنتیک"</string>
     <string name="ffx_instant" msgid="726968618715691987">"فوری"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d661704..d28c342 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Autom."</string>
     <string name="flash_on" msgid="7891556231891837284">"Salama käyt."</string>
     <string name="flash_off" msgid="1445443413822680010">"Ei salamaa"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Alkuperäinen"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vanha"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Pika"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 606517d..d06a952 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automatique"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flash déclenché"</string>
     <string name="flash_off" msgid="1445443413822680010">"Flash désactivé"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instantané"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fe5d479..3de8624 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"स्वत:"</string>
     <string name="flash_on" msgid="7891556231891837284">"फ़्लैश चलाया गया"</string>
     <string name="flash_off" msgid="1445443413822680010">"कोई फ़्लैश नहीं"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"मूल"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"विंटेज"</string>
     <string name="ffx_instant" msgid="726968618715691987">"झटपट"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5329ef5..9ea27f6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automatski"</string>
     <string name="flash_on" msgid="7891556231891837284">"Bljes. okinuta"</string>
     <string name="flash_off" msgid="1445443413822680010">"Bez bljesk."</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Izvornik"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e640f59..10a6355 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automata"</string>
     <string name="flash_on" msgid="7891556231891837284">"Vakuvillanás"</string>
     <string name="flash_off" msgid="1445443413822680010">"Vaku nélkül"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Eredeti"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Szépia"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Azonnali"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2a0ab87..919f457 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Otomatis"</string>
     <string name="flash_on" msgid="7891556231891837284">"Lampu kilat aktif"</string>
     <string name="flash_off" msgid="1445443413822680010">"Tanpa lampu kilat"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Asli"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Lawas"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instan"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index da3b5e0..6aa71d7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Autom."</string>
     <string name="flash_on" msgid="7891556231891837284">"Flash scattato"</string>
     <string name="flash_off" msgid="1445443413822680010">"Senza flash"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Originale"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b894362..42d9165 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"אוטומטי"</string>
     <string name="flash_on" msgid="7891556231891837284">"צילום עם פלאש"</string>
     <string name="flash_off" msgid="1445443413822680010">"ללא פלאש"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"מקור"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"וינטאג\'"</string>
     <string name="ffx_instant" msgid="726968618715691987">"מיידי"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 00858a7..ee82f38 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"オート"</string>
     <string name="flash_on" msgid="7891556231891837284">"フラッシュON"</string>
     <string name="flash_off" msgid="1445443413822680010">"フラッシュOFF"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"オリジナル"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"ヴィンテージ"</string>
     <string name="ffx_instant" msgid="726968618715691987">"インスタント"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1dd897e..e0d53dc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"자동"</string>
     <string name="flash_on" msgid="7891556231891837284">"플래시 터짐"</string>
     <string name="flash_off" msgid="1445443413822680010">"플래시 없음"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"원본"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"빈티지"</string>
     <string name="ffx_instant" msgid="726968618715691987">"인스턴트"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 95d46fa..1796f79 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automobiliai"</string>
     <string name="flash_on" msgid="7891556231891837284">"Blykstė suveikė"</string>
     <string name="flash_off" msgid="1445443413822680010">"Be blykstės"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Originalas"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Senovinis"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Momentinis"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c5d4657..b648285 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automātiski"</string>
     <string name="flash_on" msgid="7891556231891837284">"Zibspuldze ir aktivizēta"</string>
     <string name="flash_off" msgid="1445443413822680010">"Bez zibspuldzes"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Sākotnējais"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Senlaicīgs"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Ātrais foto"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 20f190f..4a357a3 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Auto"</string>
     <string name="flash_on" msgid="7891556231891837284">"Denyar dilepas"</string>
     <string name="flash_off" msgid="1445443413822680010">"Tiada denyar"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Asli"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintaj"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Semerta"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e65e030..1950ee0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Auto"</string>
     <string name="flash_on" msgid="7891556231891837284">"Blits brukes"</string>
     <string name="flash_off" msgid="1445443413822680010">"Uten blits"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Polaroid"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 44208d8..52f0c28 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Autom."</string>
     <string name="flash_on" msgid="7891556231891837284">"Geflitst"</string>
     <string name="flash_off" msgid="1445443413822680010">"Geen flits"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Origineel"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f4c3a53..6dcf81c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automat."</string>
     <string name="flash_on" msgid="7891556231891837284">"Z lampą"</string>
     <string name="flash_off" msgid="1445443413822680010">"Bez lampy"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Oryginalny"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Zdjęcie błyskawiczne"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9dae960..d979ba7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Automático"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flash dispar."</string>
     <string name="flash_off" msgid="1445443413822680010">"Sem flash"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instantâneo"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9e63bc1..89d91d9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Auto"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flash ativo"</string>
     <string name="flash_off" msgid="1445443413822680010">"Sem flash"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index dc9fb42..68c21c1 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -219,6 +219,8 @@
     <skip />
     <!-- no translation found for flash_off (1445443413822680010) -->
     <skip />
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <!-- no translation found for ffx_original (372686331501281474) -->
     <skip />
     <!-- no translation found for ffx_vintage (8348759951363844780) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 105bf5d..38bb260 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Auto"</string>
     <string name="flash_on" msgid="7891556231891837284">"Bliţ activat"</string>
     <string name="flash_off" msgid="1445443413822680010">"Fără bliţ"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 61a2b03..5ef7099 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Авто"</string>
     <string name="flash_on" msgid="7891556231891837284">"Со вспышкой"</string>
     <string name="flash_off" msgid="1445443413822680010">"Без вспышки"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Оригинал"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Винтаж"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Полароид"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 026e883..2cdf58e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Auto"</string>
     <string name="flash_on" msgid="7891556231891837284">"S bleskom"</string>
     <string name="flash_off" msgid="1445443413822680010">"Bez blesku"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Pôvodné"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Staré"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Okamžite"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ab0251d..85f44b2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Samod."</string>
     <string name="flash_on" msgid="7891556231891837284">"Blis. sprožena"</string>
     <string name="flash_off" msgid="1445443413822680010">"Brez bliskav."</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Izvirnik"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Starinsko"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Takoj"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 512d975..8f56be5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Аутом."</string>
     <string name="flash_on" msgid="7891556231891837284">"Блиц је актив."</string>
     <string name="flash_off" msgid="1445443413822680010">"Без блица"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Оригинална"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c1cb20e..e161421 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Auto"</string>
     <string name="flash_on" msgid="7891556231891837284">"Blixt utlöst"</string>
     <string name="flash_off" msgid="1445443413822680010">"Ingen blixt"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 53241c0..d64784c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -146,6 +146,8 @@
     <string name="auto" msgid="4296941368722892821">"Kiotomatiki"</string>
     <string name="flash_on" msgid="7891556231891837284">"Mmweko umeanzishwa"</string>
     <string name="flash_off" msgid="1445443413822680010">"Hakuna flash"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Asili"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Ukale"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Papo hapo"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 5f95a68..0e45792 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"อัตโนมัติ"</string>
     <string name="flash_on" msgid="7891556231891837284">"แฟลชทำงาน"</string>
     <string name="flash_off" msgid="1445443413822680010">"ไม่เปิดแฟลช"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"ต้นฉบับ"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"วินเทจ"</string>
     <string name="ffx_instant" msgid="726968618715691987">"ทันใจ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0e8a44b..4036e18 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Auto"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flash fired"</string>
     <string name="flash_off" msgid="1445443413822680010">"Walang flash"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Orihinal"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3fe41b7..eb35c9b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Otomatik"</string>
     <string name="flash_on" msgid="7891556231891837284">"Flaş patladı"</string>
     <string name="flash_off" msgid="1445443413822680010">"Flaş yok"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Orijinal"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Klasik"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Anlık"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4a80258..5c005b3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Автомат."</string>
     <string name="flash_on" msgid="7891556231891837284">"Викор. спалах"</string>
     <string name="flash_off" msgid="1445443413822680010">"Без спалаху"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Оригінал"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Ретро"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Миттєво"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9fc72b1..a92f9d5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"Tự động"</string>
     <string name="flash_on" msgid="7891556231891837284">"Sử dụng flash"</string>
     <string name="flash_off" msgid="1445443413822680010">"Không có flash"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Gốc"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Cổ điển"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9453cd3..c804094 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"自动"</string>
     <string name="flash_on" msgid="7891556231891837284">"使用了闪光灯"</string>
     <string name="flash_off" msgid="1445443413822680010">"未使用闪光灯"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"原照片"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"复古"</string>
     <string name="ffx_instant" msgid="726968618715691987">"瞬时"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1d88e81..8f45076 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -143,6 +143,8 @@
     <string name="auto" msgid="4296941368722892821">"自動"</string>
     <string name="flash_on" msgid="7891556231891837284">"使用閃光燈"</string>
     <string name="flash_off" msgid="1445443413822680010">"未使用閃光燈"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"原始"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"復古"</string>
     <string name="ffx_instant" msgid="726968618715691987">"即時"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 79dda45..06292c7 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -145,6 +145,8 @@
     <string name="auto" msgid="4296941368722892821">"Okuzenzakalelayo"</string>
     <string name="flash_on" msgid="7891556231891837284">"Ifuleshi iqhafaziwe"</string>
     <string name="flash_off" msgid="1445443413822680010">"Ayikho ifuleshi"</string>
+    <!-- no translation found for unknown (3506693015896912952) -->
+    <skip />
     <string name="ffx_original" msgid="372686331501281474">"Oluqobo"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"I-Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Ngokuzenzakalela"</string>
diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java
index e2268fa..6b76999 100644
--- a/src/com/android/gallery3d/ui/GLRootView.java
+++ b/src/com/android/gallery3d/ui/GLRootView.java
@@ -394,7 +394,11 @@
 
         mRenderRequested = false;
 
-        if ((mFlags & FLAG_NEED_LAYOUT) != 0) layoutContentPane();
+        if ((mOrientationSource != null
+                && mDisplayRotation != mOrientationSource.getDisplayRotation())
+                || (mFlags & FLAG_NEED_LAYOUT) != 0) {
+            layoutContentPane();
+        }
 
         mCanvas.save(GLCanvas.SAVE_FLAG_ALL);
         rotateCanvas(-mCompensation);