am 2d5cc3c1: am fae7bf85: Merge "Replace various BitmapPools with a smarter unified...

* commit '2d5cc3c1ff8533d4452446e899f4923eb957a46d':
  Replace various BitmapPools with a smarter unified pool

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6702e86..3c27260 100644 (file)
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -195,7 +195,7 @@
     <string name="no_external_storage_title" msgid="2408933644249734569">"Žádné úložiště"</string>
     <string name="no_external_storage" msgid="95726173164068417">"Žádné externí úložiště není k dispozici"</string>
     <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Zobrazení filmového pásu"</string>
-    <string name="switch_photo_grid" msgid="3681299459107925725">"Mřížkové zobrazení"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Zobrazení v mřížce"</string>
     <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Celá obrazovka"</string>
     <string name="trimming" msgid="9122385768369143997">"Zkracování"</string>
     <string name="muting" msgid="5094925919589915324">"Probíhá ztlumení"</string>

diff --git a/res/values-da/filtershow_strings.xml b/res/values-da/filtershow_strings.xml
index bc5ed33..872d5ff 100644 (file)
--- a/res/values-da/filtershow_strings.xml
+++ b/res/values-da/filtershow_strings.xml
@@ -80,7 +80,7 @@
     <string name="draw_size" msgid="4360005386104151209">"Størrelse"</string>
     <string name="draw_color" msgid="2119030386987211193">"Farve"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linjer"</string>
-    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Tusch"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Markør"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Stænk"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Ryd"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Vælg tilpasset farve"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index de3dbaa..6e2620a 100644 (file)
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -196,7 +196,7 @@
     <string name="no_external_storage" msgid="95726173164068417">"Intet tilgængeligt eksternt lager"</string>
     <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Filmstrip-visning"</string>
     <string name="switch_photo_grid" msgid="3681299459107925725">"Gittervisning"</string>
-    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Se i fuld skærm"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Visning i fuld skærm"</string>
     <string name="trimming" msgid="9122385768369143997">"Beskæring"</string>
     <string name="muting" msgid="5094925919589915324">"Slår lyden fra"</string>
     <string name="please_wait" msgid="7296066089146487366">"Vent"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a99402c..1b79d50 100644 (file)
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -170,7 +170,7 @@
     <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> au chini"</string>
     <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> au juu"</string>
     <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> kwa <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
-    <string name="Import" msgid="3985447518557474672">"Ingiza"</string>
+    <string name="Import" msgid="3985447518557474672">"Leta"</string>
     <string name="import_complete" msgid="3875040287486199999">"Kuingiza Kumekamilika"</string>
     <string name="import_fail" msgid="8497942380703298808">"Haijafaulu kuleta"</string>
     <string name="camera_connected" msgid="916021826223448591">"Kamera imeunganishwa."</string>
@@ -199,7 +199,7 @@
     <string name="no_external_storage" msgid="95726173164068417">"Hakuna hifadhi ya nje inayopatikana"</string>
     <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Mwonekano wa utepe wa filamu"</string>
     <string name="switch_photo_grid" msgid="3681299459107925725">"Mwonekano wa gridi"</string>
-    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Mwonekano wa skrini nzima"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Muonekano wa skrini nzima"</string>
     <string name="trimming" msgid="9122385768369143997">"Inapunguza"</string>
     <string name="muting" msgid="5094925919589915324">"Inanyamazisha"</string>
     <string name="please_wait" msgid="7296066089146487366">"Tafadhali subiri"</string>