am c0247a59: updated camera launcher icon in Gallery2 package as well

* commit 'c0247a599ffa70eebda4f1c8c1ce5b132da648bd':
  updated camera launcher icon in Gallery2 package as well
diff --git a/res/values-af/filtershow_strings.xml b/res/values-af/filtershow_strings.xml
index 65aa0d2..3328128 100644
--- a/res/values-af/filtershow_strings.xml
+++ b/res/values-af/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Fotoredigeerder"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Kan die beeld nie laai nie!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Kan nie die oorspronklike wysig nie"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Stel muurpapier"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Kon nie foto aflaai nie. Netwerk nie beskikbaar nie."</string>
     <string name="original" msgid="3524493791230430897">"Oorspronklike"</string>
     <string name="borders" msgid="2067345080568684614">"Grense"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Gepasmaakte"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Ontdoen"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Herdoen"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Wys geskiedenis"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Versteek geskiedenis"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Wys prenttoestand"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Versteek prenttoestand"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Wys toegepaste effekte"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Versteek toegepaste effekte"</string>
+    <string name="export_image" msgid="3202835713172222134">"Voer uit"</string>
+    <string name="print_image" msgid="1942989216591621413">"Druk"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Voer platgemaakte prent uit"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Die uitgevoerde prent sal \'n afskrif wees, sonder die geskiedenis."</string>
+    <string name="quality" msgid="179292110309050529">"Gehalte"</string>
+    <string name="size" msgid="4639404642236356037">"Grootte"</string>
+    <string name="x" msgid="6810256999024563662">"x"</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>
     <string name="save_and_exit" msgid="3628425023766687419">"Stoor en gaan uit"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Verwerk tans volresolusieprent…"</string>
     <string name="exit" msgid="242642957038770113">"Gaan uit"</string>
     <string name="history" msgid="455767361472692409">"Geskiedenis"</string>
     <string name="reset" msgid="9013181350779592937">"Stel terug"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Ligstrepe"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Kurwes"</string>
     <string name="vignette" msgid="934721068851885390">"Vinjet"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjet"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Beligting"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Kleurdiepte"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontras"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Vermindering"</string>
     <string name="redeye" msgid="4508883127049472069">"Rooi oog"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Skets"</string>
     <string name="straighten" msgid="26025591664983528">"Maak reguit"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatief"</string>
     <string name="none" msgid="6633966646410296520">"Geen"</string>
     <string name="edge" msgid="7036064886242147551">"Kante"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Plakkateer"</string>
     <string name="downsample" msgid="3552938534146980104">"Verklein prent"</string>
+    <string name="grad" msgid="546774853424848655">"Gegradeerde"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Helderheid"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontras"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Kleurdiepte"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Hoof"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rooi"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Geel"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Groen"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Groen-blou"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blou"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Styl"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nuut"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rooi"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Groen"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Blou"</string>
     <string name="draw_style" msgid="2036125061987325389">"Styl"</string>
     <string name="draw_size" msgid="4360005386104151209">"Grootte"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Skakering"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Kleurdiepte"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Helderheid"</string>
     <string name="draw_color" msgid="2119030386987211193">"Kleur"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Lyne"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Merker"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spatsels"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Vee uit"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Dikte"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Hoekgrootte"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Kleur"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Maak skoon"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Kies gepasmaakte kleur"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Kies kleur"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Kies grootte"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Oorspronklike"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultaat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Stoor tans prent"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Verwerk tans…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Stoor huidige voorafstelling"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Bestuur gebruikervoorafstellings"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nuwe voorafstelling"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Voorafgestelde naam"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Inligting"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Prentnaam"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Prentgrootte"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-data"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Voorafgestelde"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Weergawe"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Oorspronklike"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Huidige"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Lensopening"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Fokuslengte"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Onderwerp-afstand"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Datum geneem"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F-stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Beligtingstyd"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Kopiereg"</string>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index bf72c67..44186ba 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Draai na regs"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Kon nie die item vind nie."</string>
     <string name="edit" msgid="1502273844748580847">"Redigeer"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Eenvoudige redigeer"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Verwerk kasversoeke"</string>
     <string name="caching_label" msgid="4521059045896269095">"Kas tans..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Snoei"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Kan nie aan die kamera koppel nie."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera is gedeaktiveer weens sekuriteitsbeleide."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="wait" msgid="8600187532323801552">"Wag asseblief…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Heg USB-berging voordat kamera gebruik word."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Sit \'n SD-kaart in voor jy die kamera gebruik."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera-instellings"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamera-instellings"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Prentgrootte"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M pixels"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixels"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pixels"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 M pieksels"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 M pieksels (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M pixels"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M pixels"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Outo"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Oneindig"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"OUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"ONEINDIG"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flits-modus"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"FLITS-MODUS"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Outo"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Aan"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Af"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"OUTO-FLITS"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLITS AAN"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLITS AF"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Witbalans"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"WITBALANS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Outo"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Gloeiend"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Daglig"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluoresserend"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Bewolk"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"OUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"GLOEIEND"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DAGLIG"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESSEREND"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"BEWOLK"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Toneel-modus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Outo"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Jou USB-berging se stoorspasie raak min. Verander die gehalte-instelling of vee \'n paar prente of ander lêers uit."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Jou SD-kaart raak vol. Verander die gehalte-instelling of vee \'n paar prente of ander lêers uit."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"In die ruimte"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sonsondergang"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Jou video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Sit jou toestel neer."\n"Stap vir \'n oomblik buite sig."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Sit jou toestel neer.\nStap vir \'n oomblik buite sig."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Raak om foto tydens opname te neem."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Video-opname het begin."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Video-opname het gestop."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Skakel oor na video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Skakel oor na panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Skakel oor na nuwe panorama"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Wissel om te herfokus"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Kanselleer hersiening"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Voltooi hersiening"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Hersien neem weer"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Speel video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Laat video wag"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Herlaai video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Video-speler se tydbalk"</string>
     <string name="capital_on" msgid="5491353494964003567">"AAN"</string>
     <string name="capital_off" msgid="7231052688467970897">"AF"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Af"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Stel tydsduur in sekondes"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Tel af om \'n foto te neem"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Moet foto-liggings onthou word?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Merk jou foto\'s en video\'s met die liggings waar hulle geneem is."\n\n"Ander programme kan toegang kry tot hierdie inligting saam met jou gestoorde prente."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Merk jou foto\'s en video\'s met die liggings waar hulle geneem is.\n\nAnder programme kan toegang kry tot hierdie inligting saam met jou gestoorde prente."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nee dankie"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ja"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Soek"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Foto\'s"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albums"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"NOG OPSIES"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"INSTELLINGS"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d foto\'s"</item>
diff --git a/res/values-am/filtershow_strings.xml b/res/values-am/filtershow_strings.xml
index f644d1f..196e99c 100644
--- a/res/values-am/filtershow_strings.xml
+++ b/res/values-am/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"ፎቶ አርታዒ"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"ምስሉን መጫን አልተቻለም!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"የመጀመሪያውን ማርትዕ አይቻልም"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"ልጥፍ በማዘጋጀት ላይ"</string>
+    <string name="download_failure" msgid="5923323939788582895">"ፎቶን ማውረድ አልተቻለም። አውታረ መረብ አይገኝም።"</string>
     <string name="original" msgid="3524493791230430897">"የመጀመሪያው"</string>
     <string name="borders" msgid="2067345080568684614">"ድንበሮች"</string>
+    <string name="custom_border" msgid="8679893731790931871">"ብጁ"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"ቀልብስ"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"ድገም"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"ታሪክ አሳይ"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"ታሪክ ደብቅ"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"የምስል ሁኔታን አሳይ"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"የምስል ሁኔታን ደብቅ"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"የተተገበሩ ተጽዕኖዎችን አሳይ"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"የተተገበሩ ተጽዕኖዎችን ደብቅ"</string>
+    <string name="export_image" msgid="3202835713172222134">"ወደ ውጪ ላክ"</string>
+    <string name="print_image" msgid="1942989216591621413">"አትም"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"ጠፍጣፋ የተደረገ ምስል ይላኩ"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"ወደ ውጪ የተላከው ምስል ቅጂ ይሆናል፣ ከታሪኩ ውጪ።"</string>
+    <string name="quality" msgid="179292110309050529">"ጥራት"</string>
+    <string name="size" msgid="4639404642236356037">"መጠን"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"ቅንብሮች"</string>
     <string name="unsaved" msgid="8704442449002374375">"በዚህ ምስል ላይ"</string>
     <string name="save_before_exit" msgid="2680660633675916712">"ከመውጣትዎ በፊት ማስቀመጥ ይፈልጋሉ?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"አስቀምጥና ውጣ"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"ባለሙሉ ጥራት ምስልን በመስራት ላይ..."</string>
     <string name="exit" msgid="242642957038770113">"ውጣ"</string>
     <string name="history" msgid="455767361472692409">"ታሪክ"</string>
     <string name="reset" msgid="9013181350779592937">"ዳግም አስጀምር"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"ድምቀቶች"</string>
     <string name="curvesRGB" msgid="915010781090477550">"ጥምዞች"</string>
     <string name="vignette" msgid="934721068851885390">"ቪኜት"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"ቪኜት"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"ተጋላጭነት"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"የቀለም ሙሌት"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"ንፅፅር"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"ቅነሳ"</string>
     <string name="redeye" msgid="4508883127049472069">"ቀይ አይን"</string>
     <string name="imageDraw" msgid="6918552177844486656">"መሳል"</string>
     <string name="straighten" msgid="26025591664983528">"ቀጥ አርግ"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"ኔጌቲቭ"</string>
     <string name="none" msgid="6633966646410296520">"ምንም"</string>
     <string name="edge" msgid="7036064886242147551">"ጠርዞች"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"ግራጫማ አድርግ"</string>
     <string name="downsample" msgid="3552938534146980104">"ናሙና ማውረድ"</string>
+    <string name="grad" msgid="546774853424848655">"የተሻሻለ"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"ብሩህነት"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"ንፅፅር"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"የቀለም ሙሌት"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"ዋና"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"ቀይ"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"ቢጫ"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"አረንጓዴ"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"አረንጓዴ-ሰማያዊ"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"ሰማያዊ"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"ሮዝ"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"ቅጥ"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"አዲስ"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"ቀ አ ሰ"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"ቀይ"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"አረንጓዴ"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"ሰማያዊ"</string>
     <string name="draw_style" msgid="2036125061987325389">"ቅጥ"</string>
     <string name="draw_size" msgid="4360005386104151209">"መጠን"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"የቀለም ድባብ"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"የቀለም ሙሌት"</string>
+    <string name="draw_value" msgid="6571604055161538273">"ብሩህነት"</string>
     <string name="draw_color" msgid="2119030386987211193">"ቀለም"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"መስመሮች"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"አመልካች"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"ነጠብጣብ"</string>
     <string name="draw_clear" msgid="6728155515454921052">"አጽዳ"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"ውፍረት"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"የማዕዘን መጠን"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"ቀለም"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"አጽዳ"</string>
     <string name="color_pick_select" msgid="734312818059057394">"ብጁ ቀለም ይምረጡ"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"ቀለም ይምረጡ"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"መጠን ይምረጡ"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"እሺ"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"የመጀመሪያው"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"ውጤት"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"ምስል በማስቀመጥ ላይ"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"በማስኬድ ላይ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"የአሁኑን ቅድመ-ቅምጥ ያስቀምጡ"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"የተጠቃሚ ቅድመ-ቅምጦችን ያስተዳድሩ"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"አዲስ ቅድመ-ቅምጥ"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"ቅድመ-ቅምጥ ስም"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"መረጃ"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"የምስል ስም"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"የምስል መጠን"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ሂስቶግራም"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF ውሂብ"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"ቅድመ-ቅምጥ"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"ስሪት"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"ኦሪጅናል"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"የአሁን"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"ሞዴል"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"የካሜራ ሌንስ ማስገቢያ"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"የትክተት ርዝመት"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"አይ ኤስ ኦ"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"የሚነሳው ነገር ርቀት"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"የተነሳበት ቀን"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"የካሜራ ትኩረት ማቆሚያ ቁጥር"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"የብርሃነ መጠን ጊዜ"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"የቅጂ መብት"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 68f44c3..b372dd6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -55,7 +55,7 @@
     <item quantity="other" msgid="5874316486520635333">"የተመረጡት ንጥሎች ይሰረዙ?"</item>
   </plurals>
     <string name="confirm" msgid="8646870096527848520">"አረጋግጥ"</string>
-    <string name="cancel" msgid="3637516880917356226">"ይቅር"</string>
+    <string name="cancel" msgid="3637516880917356226">"ሰርዝ"</string>
     <string name="share" msgid="3619042788254195341">"አጋራ"</string>
     <string name="share_panorama" msgid="2569029972820978718">"ፓኖራማ አጋራ"</string>
     <string name="share_as_photo" msgid="8959225188897026149">"እንደ ፎቶ አጋራ"</string>
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"ወደ ቀኝ አሽከርክር"</string>
     <string name="no_such_item" msgid="5315144556325243400">"ሊገኙ አልተቻለም::"</string>
     <string name="edit" msgid="1502273844748580847">"አርትዕ"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"ቀላል አርትዖት"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"መሸጎጫ ጥየቃዎች ሂደት"</string>
     <string name="caching_label" msgid="4521059045896269095">"በመሸጎጥ ላይ..."</string>
     <string name="crop_action" msgid="3427470284074377001">"ከርክም"</string>
@@ -115,7 +116,7 @@
     <string name="no_albums_alert" msgid="4111744447491690896">"ምንም አልበሞች አልተገኙም::"</string>
     <string name="empty_album" msgid="4542880442593595494">"O ምስሎች/ ቪዲዮዎች ማግኘት ይቻላል::"</string>
     <string name="picasa_posts" msgid="1497721615718760613">"ልጥፎች"</string>
-    <string name="make_available_offline" msgid="5157950985488297112">"ከመስመር ውጪ እንዲገኝአድርግ"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"ከመስመር ውጪ እንዲገኝ አድርግ"</string>
     <string name="sync_picasa_albums" msgid="8522572542111169872">"አድስ"</string>
     <string name="done" msgid="217672440064436595">"ተከናውኗል"</string>
     <string name="sequence_in_set" msgid="7235465319919457488">"%1$d  ከ%2$d  አይነቶች:"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"ከካሜራ ጋር ማገናኘት አልተቻለም።"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"በደህንነት ፖሊሲዎች ምክንያት ካሜራ ቦዝኗል።"</string>
     <string name="camera_label" msgid="6346560772074764302">"ካሜራ"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"ካምኮርድ"</string>
     <string name="wait" msgid="8600187532323801552">"እባክዎ ይጠብቁ…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"እባክህ ካሜራ ከመጠቀምህ በፊት USB ሰካ።"</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"እባክህ ካሜራውን ከመጠቀምህ በፊት የSD ካርድ አስገባ።"</string>
@@ -227,16 +227,17 @@
     <string name="preparing_sd" product="default" msgid="2914969119574812666">"የ SD  ካርድ በማዘጋጀት ላይ..."</string>
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB ማከማችን መድረስ አልተቻለም፡፡"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD ካርድን መድረስ አልተቻለም፡፡"</string>
-    <string name="review_cancel" msgid="8188009385853399254">"ይቅር"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"ሰርዝ"</string>
     <string name="review_ok" msgid="1156261588693116433">"ተከናውኗል"</string>
     <string name="time_lapse_title" msgid="4360632427760662691">"በመቅዳት የሚፈጀውን ጊዜ"</string>
     <string name="pref_camera_id_title" msgid="4040791582294635851">"ካሜራ ምረጥ"</string>
     <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>
+    <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>
+    <item quantity="one" msgid="1654523400981245448">"1 ሴኮንድ"</item>
     <item quantity="other" msgid="6455381617076792481">"%d ሰከንዶች"</item>
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"የካሜራ ቅንብሮች"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"የካምኮርድ ቅንብሮች"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"የምስል መጠን"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13ሚ ፒክሰሎች"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 ሜጋፒክሰል"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 ሜጋ ፒክሴል"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4ሚ ፒክሰሎች"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 ሜጋ ፒክሴል"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 ሜጋ ፒክሴል"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2ሚ ፒክሰሎች (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 ሜጋ ፒክሴል"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 ሜጋ ፒክሴል"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ራስ"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"ወሰን የሌለው"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"ማክሮ"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ራስ-ሰር"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"የትየሌለ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"ማክሮ"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"የብልጭታ ሁነታ"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"የብልጭታ ሁነታ"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"ራስ"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"በ"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"ውጪ"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"ራስ-ብልጭታ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"ብልጭታ በርቷል"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ብልጭታ ጠፍቷል"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"ዝግጁ ምስል"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"የነጭ ምጥጥን"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"ራስ"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"ያለፈበት"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"የቀን ብርሃን"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ፍሎረሰንት"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"ደመናማ"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ራስ-ሰር"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"የሙቀት ብርሃን"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"የቀን ብርሃን"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ፍሎረሰንት"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ደመናማ"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"የእይታ ሁነታ"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"ራስ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"የUSB  ማከማቻዎቦታ እየሞላበት ነው።የጥራት ቅንብር ይለውጡ ወይም አንዳንድ ምስሎችን ወይም ሌላ ፋይሎች ይሰርዙ።"</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"የSD ካርድዎ ቦታ እያለቀበት ነው። የጥራት ቅንብሩን ይልወጡ ወይም አንዳንድ ምስሎችንወይም ሌሎች ፋይሎችን ይሰርዙ።"</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"ቦታ ውስጥ"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"ፀሀይ ስትጠልቅ"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"ቪዲዮህ"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"መሳሪያህን ወደታች አኑር።"\n"  ለትንሽ ቆይታ ከዕይታ ውጪ ሁን።"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"መሳሪያህን ወደታች አኑር።\n  ለትንሽ ቆይታ ከዕይታ ውጪ ሁን።"</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"እየቀዳህ ፎቶ ለማንሳት ንካ።"</string>
     <string name="video_recording_started" msgid="4132915454417193503">"የቪዲዮ ቀረጻ ተጀምሯል።"</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"የቪዲዮ ቀረጻ ቆሟል።"</string>
@@ -331,14 +363,19 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"ወደ ቪዲዮ ቀይር"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"ወደ ፓኖራማ ቀይር"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"ወደ አዲስ ፓኖራማ ይቀይሩ"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"ወደ ዳግም አተኩር ይቀይሩ"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"ግምገማ፣ ሰርዝ"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"ግምገማ፣ ተጠናቅቋል"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"ዳግም የተነሳውን ይገምግሙ"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"ቪዲዮ አጫውት"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"ቪዲዮ ለአፍታ አቁም"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"ቪዲዮ ዳግም ጫን"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"የቪዲዮ አጫዋች ሰዓት አሞሌ"</string>
     <string name="capital_on" msgid="5491353494964003567">"በርቷል"</string>
     <string name="capital_off" msgid="7231052688467970897">"ጠፍቷል"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"ጠፍቷል"</string>
     <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 ሰከንዶች"</string>
-    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 ሰከንድ"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 ሴኮንድ"</string>
     <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 ሰከንዶች"</string>
     <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 ሰከንዶች"</string>
     <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 ሰከንዶች"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"ቆይታን በሰከንዶች ያዘጋጁ"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"ፎቶ ለመውሰድ ጊዜ በመቁጠር ላይ"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"የፎቶ አካባቢዎች ይታወሱ?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"ፎቶዎችዎን እና ቪዲዮዎችዎን በተነሱበት አካባቢዎች መለያ ይስጧቸው።"\n\n"ሌሎች መተግበሪያዎች ይህንን መረጃ ከተቀመጡ ምስሎችዎ ጋር ሊደርሱበት ይችላሉ።"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"ፎቶዎችዎን እና ቪዲዮዎችዎን በተነሱበት አካባቢዎች መለያ ይስጧቸው።\n\nሌሎች መተግበሪያዎች ይህንን መረጃ ከተቀመጡ ምስሎችዎ ጋር ሊደርሱበት ይችላሉ።"</string>
     <string name="remember_location_no" msgid="7541394381714894896">"አይ፣ አመሰግናለሁ"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"አዎ"</string>
     <string name="menu_camera" msgid="3476709832879398998">"ካሜራ"</string>
     <string name="menu_search" msgid="7580008232297437190">"ፍለጋ"</string>
     <string name="tab_photos" msgid="9110813680630313419">"ፎቶዎች"</string>
     <string name="tab_albums" msgid="8079449907770685691">"አልበሞች"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ተጨማሪ አማራጮች"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ቅንብሮች"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d ፎቶ"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d ፎቶዎች"</item>
diff --git a/res/values-ar/filtershow_strings.xml b/res/values-ar/filtershow_strings.xml
index 7ccf388..ccd8b8f 100644
--- a/res/values-ar/filtershow_strings.xml
+++ b/res/values-ar/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"محرر الصور"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"لا يمكن تحميل الصورة!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"لا يمكن تعديل النسخة الأصلية"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"جارٍ تعيين الخلفية"</string>
+    <string name="download_failure" msgid="5923323939788582895">"تعذر تنزيل الصورة. الشبكة غير متاحة."</string>
     <string name="original" msgid="3524493791230430897">"أصلية"</string>
     <string name="borders" msgid="2067345080568684614">"حدود"</string>
+    <string name="custom_border" msgid="8679893731790931871">"تخصيص"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"تراجع"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"إعادة"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"عرض السجل"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"إخفاء السجل"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"عرض حالة الصورة"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"إخفاء حالة الصورة"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"إظهار التأثيرات المطبقة"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"إخفاء التأثيرات المطبقة"</string>
+    <string name="export_image" msgid="3202835713172222134">"تصدير"</string>
+    <string name="print_image" msgid="1942989216591621413">"طباعة"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"تصدير صورة مسطحة"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"ستكون الصورة التي تم تصديرها عبارة عن نسخة بدون سجلّ."</string>
+    <string name="quality" msgid="179292110309050529">"الجودة"</string>
+    <string name="size" msgid="4639404642236356037">"الحجم"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"إعدادات"</string>
     <string name="unsaved" msgid="8704442449002374375">"هناك تغييرات في هذه الصورة لم يتم حفظها."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"هل تريد الحفظ قبل الخروج؟"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"حفظ وخروج"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"جارٍ معالجة الصورة كاملة الدقة..."</string>
     <string name="exit" msgid="242642957038770113">"خروج"</string>
     <string name="history" msgid="455767361472692409">"السجل"</string>
     <string name="reset" msgid="9013181350779592937">"إعادة تعيين"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"تسليط الضوء"</string>
     <string name="curvesRGB" msgid="915010781090477550">"المنحنيات"</string>
     <string name="vignette" msgid="934721068851885390">"نقوش صورة نصفية"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"نقوش صورة نصفية"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"التعرض للضوء"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"تشبع اللون"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"التباين"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"انخفاض"</string>
     <string name="redeye" msgid="4508883127049472069">"العين الحمراء"</string>
     <string name="imageDraw" msgid="6918552177844486656">"رسم"</string>
     <string name="straighten" msgid="26025591664983528">"تسوية"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"سالب"</string>
     <string name="none" msgid="6633966646410296520">"لا شيء"</string>
     <string name="edge" msgid="7036064886242147551">"الحواف"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"تتالٍ"</string>
     <string name="downsample" msgid="3552938534146980104">"تصغير حجم"</string>
+    <string name="grad" msgid="546774853424848655">"مدرّجة"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"السطوع"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"التباين"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"تشبع اللون"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"رئيسي"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"أحمر"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"أصفر"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"أخضر"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"سماوي"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"أزرق"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"أرجواني"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"النمط"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"جديدة"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"حمراء"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"خضراء"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"زرقاء"</string>
     <string name="draw_style" msgid="2036125061987325389">"النمط"</string>
     <string name="draw_size" msgid="4360005386104151209">"الحجم"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"تدرج اللون"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"تشبع اللون"</string>
+    <string name="draw_value" msgid="6571604055161538273">"السطوع"</string>
     <string name="draw_color" msgid="2119030386987211193">"اللون"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"الأسطر"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"محدد"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"رشاش"</string>
     <string name="draw_clear" msgid="6728155515454921052">"محو"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"السماكة"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"حجم الركن"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"اللون"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"محو"</string>
     <string name="color_pick_select" msgid="734312818059057394">"اختيار لون مخصص"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"تحديد اللون"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"تحديد الحجم"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"موافق"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"أصلي"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"النتيجة"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"حفظ الصورة"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"جارٍ المعالجة..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"حفظ الإعداد المسبق الحالي"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"إدارة إعدادات المستخدم المسبقة"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"إعداد مسبق جديد"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"إعداد الاسم مسبقًا"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"معلومات"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"اسم الصورة"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"حجم الصورة"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"التردد الرسومي"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"بيانات EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"إعداد مسبق"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"الإصدار"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"الأصلي"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"الحالي"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"الطراز"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"فتحة العدسة"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"البعد البؤري"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"مسافة الهدف"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"تاريخ الالتقاط"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"إيقاف التركيز"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"مدة التعرض للضوء"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"حقوق الطبع والنشر"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d4f6d6b..9b99b3b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"تدوير لليمين"</string>
     <string name="no_such_item" msgid="5315144556325243400">"تعذر العثور على العنصر."</string>
     <string name="edit" msgid="1502273844748580847">"تعديل"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"تعديل بسيط"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"معالجة طلبات التخزين المؤقت"</string>
     <string name="caching_label" msgid="4521059045896269095">"تخزين مؤقت..."</string>
     <string name="crop_action" msgid="3427470284074377001">"اقتصاص"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"يتعذر الاتصال بالكاميرا."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"تم تعطيل الكاميرا بسبب سياسات الأمان."</string>
     <string name="camera_label" msgid="6346560772074764302">"الكاميرا"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"كاميرا فيديو"</string>
     <string name="wait" msgid="8600187532323801552">"يرجى الانتظار…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"حمِّل وحدة تخزين USB قبل استخدام الكاميرا."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"أدرج بطاقة SD قبل استخدام الكاميرا."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"إعدادات الكاميرا"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"إعدادات كاميرا الفيديو"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"حجم الصورة"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 ميغابكسل"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 ميغا بكسل"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 ميغا بكسل"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 ميغا بكسل (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"تلقائي"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"بلا نهاية"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"ماكرو"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"تلقائي"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"بلا نهاية"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"ماكرو"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"وضع الفلاش"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"وضع الفلاش"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"تلقائي"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"تشغيل"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"إيقاف"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"الفلاش التلقائي"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"تشغيل الفلاش"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"إيقاف الفلاش"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"موازنة اللون الأبيض"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"توازن الأبيض"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"تلقائي"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"براق"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"نهاري"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"فلورسنت"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"غائم"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"تلقائي"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"براق"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"نهاري"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"فلورسنت"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"غائم"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"وضع المشهد"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"تلقائي"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"النطاق الديناميكي العالي"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"مساحة وحدة تخزين USB منخفضة. غيّر إعداد الجودة أو احذف بعض الصور أو الملفات الأخرى."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"مساحة بطاقة SD منخفضة. غيّر إعداد الجودة أو احذف بعض الصور أو الملفات الأخرى."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"في الفضاء"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"الغروب"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"مقطع فيديو"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"ضع جهازك أسفل"\n"اخرج من العرض للحظة."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"ضع جهازك أسفل\nاخرج من العرض للحظة."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"المس لالتقاط صورة أثناء التسجيل."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"بدأ تسجيل الفيديو."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"تم إيقاف تسجيل الفيديو."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"تبديل إلى الفيديو"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"تبديل إلى بانوراما"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"تبديل إلى بانوراما جديدة"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"تبديل إلى إعادة التركيز"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"مراجعة الإلغاء"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"تمت المراجعة"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"مراجعة: إعادة الالتقاط"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"تشغيل الفيديو"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"إيقاف الفيديو مؤقتًا"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"إعادة تحميل الفيديو"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"شريط الوقت لمشغّل الفيديو"</string>
     <string name="capital_on" msgid="5491353494964003567">"تشغيل"</string>
     <string name="capital_off" msgid="7231052688467970897">"إيقاف"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"تم الإيقاف"</string>
@@ -385,14 +422,16 @@
     <string name="set_timer_help" msgid="5007708849404589472">"مؤقت العد التنازلي متوقف. يُمكنك تشغيله لإجراء العد التنازلي قبل التقاط صورة."</string>
     <string name="set_duration" msgid="5578035312407161304">"تعيين المدة بالثواني"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"العد التنازلي لالتقاط صورة"</string>
-    <string name="remember_location_title" msgid="9060472929006917810">"هل تتذكر مواقع الصور؟"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"ضع علامة على الصور ومقاطع الفيديو التابعة لك تشير إلى المواقع التي تم التقاطها منها."\n\n"يمكن لتطبيقات أخرى الدخول إلى هذه المعلومات إلى جانب صورك المحفوظة."</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"هل تريد حفظ مواقع الصور؟"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"ضع علامة على الصور ومقاطع الفيديو التابعة لك تشير إلى المواقع التي تم التقاطها منها.\n\nيمكن لتطبيقات أخرى الدخول إلى هذه المعلومات إلى جانب صورك المحفوظة."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"لا، شكرًا"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"نعم"</string>
     <string name="menu_camera" msgid="3476709832879398998">"الكاميرا"</string>
     <string name="menu_search" msgid="7580008232297437190">"البحث"</string>
     <string name="tab_photos" msgid="9110813680630313419">"الصور"</string>
     <string name="tab_albums" msgid="8079449907770685691">"الألبومات"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"خيارات إضافية"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"إعدادات"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d صورة"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d من الصور"</item>
diff --git a/res/values-az-rAZ/filtershow_strings.xml b/res/values-az-rAZ/filtershow_strings.xml
new file mode 100644
index 0000000..3f8f22d
--- /dev/null
+++ b/res/values-az-rAZ/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Foto Redaktor"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Şəkil yüklənə bilmir!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Originalı redaktə etmək olmur"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Divar kağızı ayarlanır"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Şəkil endirilə bilmədi. Şəbəkə əlçatmazdır."</string>
+    <string name="original" msgid="3524493791230430897">"Original"</string>
+    <string name="saved" msgid="6678827180814174711">"Yadda saxlanılmış"</string>
+    <string name="borders" msgid="2067345080568684614">"Sərhədlər"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Ləğv edin"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Yenidən edin"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Tətbiq Olunmuş Effektləri Göstər"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Tətbiq Olunmuş Effektləri Gizlət"</string>
+    <string name="export_image" msgid="3202835713172222134">"Eksport edin"</string>
+    <string name="print_image" msgid="1942989216591621413">"Çap"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Yastı Şəkli Eksport et"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Tarixçəsiz eksport olunmuş şəkil surət olacaq."</string>
+    <string name="quality" msgid="179292110309050529">"Keyfiyyət"</string>
+    <string name="size" msgid="4639404642236356037">"Ölçü"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Ayarlar"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Bu şəkildə yadda saxlanmamış dəyişikliklər var."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Çıxmadan öncə yadda saxlamaq istəyirsiniz mi?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Yadda Saxlayın və Çıxın"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Tam ölçülü şəkli prosesdən keçirir..."</string>
+    <string name="exit" msgid="242642957038770113">"Çıxış"</string>
+    <string name="history" msgid="455767361472692409">"Tarixçə"</string>
+    <string name="reset" msgid="9013181350779592937">"Sıfırla"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Tətbiq Olunmuş Effektlər"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Müqayisə edin"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Tətbiq et"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Sıfırla"</string>
+    <string name="aspect" msgid="4025244950820813059">"Aspekt"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Heç biri"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Sabit"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Balaca Planet"</string>
+    <string name="exposure" msgid="6526397045949374905">"Ekspozisiya"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Kəskinlik"</string>
+    <string name="contrast" msgid="2310908487756769019">"Ziddiyyət"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Vibrasiya"</string>
+    <string name="saturation" msgid="7026791551032438585">"Dolğunluq"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"BW Filtr"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Avtorəng"</string>
+    <string name="hue" msgid="6231252147971086030">"Çalar"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Kölgələr"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Vurğular"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Əyrilər"</string>
+    <string name="vignette" msgid="934721068851885390">"Vignette"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinyet"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Ekspozisiya"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Dolğunluq"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Düşmə"</string>
+    <string name="redeye" msgid="4508883127049472069">"Qırmızı Göz"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Rəsm çək"</string>
+    <string name="straighten" msgid="26025591664983528">"Düzləndirmə"</string>
+    <string name="crop" msgid="5781263790107850771">"Kəsin"</string>
+    <string name="rotate" msgid="2796802553793795371">"Fırlat"</string>
+    <string name="mirror" msgid="5482518108154883096">"Güzgü"</string>
+    <string name="negative" msgid="6998313764388022201">"Neqativ"</string>
+    <string name="none" msgid="6633966646410296520">"Heç biri"</string>
+    <string name="edge" msgid="7036064886242147551">"Kənarlar"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterizə"</string>
+    <string name="downsample" msgid="3552938534146980104">"Desimasiya"</string>
+    <string name="grad" msgid="546774853424848655">"Dərəcəli"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Parlaqlıq"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Dolğunluq"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Əsas"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Qırmızı"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Sarı"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Yaşıl"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Mavi"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Göy"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Çəhrayı qırmızı"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Üslub"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"yeni"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Qırmızı"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Yaşıl"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Mavi"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Üslub"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Ölçü"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Çalar"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Dolğunluq"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Parlaqlıq"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Rəng"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Xətlər"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Sıçratma"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Sil"</string>
+    <string name="color_border_size" msgid="8745307483517793073">"qalınlıq"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Künc Ölçüsü"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Rəng"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Təmizlə"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"İxtiyari rəng seçin"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Rəng ​​Seçin"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Ölçü Seçin"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Orijinal"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Nəticə"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Şəkil Yadda Saxlanılır"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Proses keçirilir..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Cari öncədən quraşdırmanı yadda saxla"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"İstifadəçi öncədən quraşdırmalarını idarə edin"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Yeni Öncədən Quraşdırma"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Ilkin Quraşdırılan Ad"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Məlumat"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Şəkil Adı"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Şəkil Ölçüsü"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF Datası"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Öncədən quraşdırma"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versiya"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Orijinal"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Cari"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Dəlik"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Fokal Uzunluq"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Mövzu Məsafəsi"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Çəkilmə tarixi"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Ekspozisiya Müddəti"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Müəllif hüququ"</string>
+</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..234a0b4
--- /dev/null
+++ b/res/values-az-rAZ/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Qalereya"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Şəkil çərçivəsi"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Video pleyer"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Video yüklənir…"</string>
+    <string name="loading_image" msgid="1200894415793838191">"Şəkil yüklənir ..."</string>
+    <string name="loading_account" msgid="928195413034552034">"Hesab yüklənir…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Videoya davam edin"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"%s oyun davam edilsin?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Oxutmağa davam et"</string>
+    <string name="loading" msgid="7038208555304563571">"Yüklənir…"</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Yükləmə mümkün olmadı"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Şəkli yükləmək mümkün olmadı"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"Miniatür yoxdur"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Əvvəldən başlayın"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"Ok"</string>
+    <string name="ok" msgid="5296833083983263293">"OK"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Başlamaq üçün üzə toxunun."</string>
+    <string name="saving_image" msgid="7270334453636349407">"Şəkil yadda saxlanılır ..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Şəkil <xliff:g id="ALBUM_NAME">%1$s</xliff:g> albomuna qeyd olunur…"</string>
+    <string name="save_error" msgid="6857408774183654970">"Kəsilmiş şəkil yadda saxlana bilmədi."</string>
+    <string name="crop_label" msgid="521114301871349328">"Şəkli kəsin"</string>
+    <string name="trim_label" msgid="274203231381209979">"Videonu nizamla"</string>
+    <string name="select_image" msgid="7841406150484742140">"Foto seçin"</string>
+    <string name="select_video" msgid="4859510992798615076">"Video seçin"</string>
+    <string name="select_item" msgid="2816923896202086390">"Element seçin"</string>
+    <string name="select_album" msgid="1557063764849434077">"Albom seçin"</string>
+    <string name="select_group" msgid="6744208543323307114">"Qrup seçin"</string>
+    <string name="set_image" msgid="2331476809308010401">"Şəkli bu kimi istifadə edin:"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Divar kağızı ayarlayın"</string>
+    <string name="wallpaper" msgid="140165383777262070">"Divar kağızı ayarları..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Divar kağızı"</string>
+    <string name="delete" msgid="2839695998251824487">"Silin"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Seçilmiş element silinsin?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Seçilmiş elementlər silinsin?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Təsdiqlə"</string>
+    <string name="cancel" msgid="3637516880917356226">"Ləğv et"</string>
+    <string name="share" msgid="3619042788254195341">"Paylaşın"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Panoramanı paylaşın"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Foto kimi paylaşın"</string>
+    <string name="deleted" msgid="6795433049119073871">"Silindi"</string>
+    <string name="undo" msgid="2930873956446586313">"Geri qaytarmaq"</string>
+    <string name="select_all" msgid="3403283025220282175">"Hamısını seçin"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Hamısından seçimi qaldırın"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Slaydşou"</string>
+    <string name="details" msgid="8415120088556445230">"Detallar"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d of %2$d element:"</string>
+    <string name="close" msgid="5585646033158453043">"Bağla"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Kameraya keçirin"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d seçildi"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d seçildi"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d seçilib"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d seçilib"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d seçildi"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d seçilib"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d seçildi"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d seçilib"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d seçildi"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Xəritədə göstər"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Sola fırlat"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Sağa fırladın"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Element tapıla bilmədi."</string>
+    <string name="edit" msgid="1502273844748580847">"Düzəliş et"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Asan redaktə"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Keş sorğularının emalı"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Keş olunur ..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"Kəs"</string>
+    <string name="trim_action" msgid="703098114452883524">"Nizamlama"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Susdurun"</string>
+    <string name="set_as" msgid="3636764710790507868">"Belə et"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Video susdurula bilmir."</string>
+    <string name="video_err" msgid="7003051631792271009">"Video oxumur"</string>
+    <string name="group_by_location" msgid="316641628989023253">"Yerə görə"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"Vaxt üzrə"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"Teq üzrə"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"Adamlar üzrə"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"Albom üzrə"</string>
+    <string name="group_by_size" msgid="153766174950394155">"Ölçü üzrə"</string>
+    <string name="untagged" msgid="7281481064509590402">"Teqsiz"</string>
+    <string name="no_location" msgid="4043624857489331676">"Məkan yoxdur"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Şəbəkə problemlərinə görə bəzi məkanlar təyin edilə bilmədi"</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Bu albomda fotoları endirmək alınmadı. Az sonra təkrar sınayın."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Yalnız şəkillər"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Yalnız video"</string>
+    <string name="show_all" msgid="6963292714584735149">"Şəkillər &amp; videolar"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Fotoqalereya"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"Foto yoxdur"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Kəsilmiş şəkil <xliff:g id="FOLDER_NAME">%s</xliff:g> qovluğunda yadda saxlanıldı."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"Albom mövcud deyil."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O şəkil/video əlçatımlıdır."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Yazılar"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Oflayn zamanı əlçatımlı edin"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Təzələyin"</string>
+    <string name="done" msgid="217672440064436595">"Tamam"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%2$d elementdən %1$d:"</string>
+    <string name="title" msgid="7622928349908052569">"Başlıq"</string>
+    <string name="description" msgid="3016729318096557520">"Təsvir"</string>
+    <string name="time" msgid="1367953006052876956">"Vaxt"</string>
+    <string name="location" msgid="3432705876921618314">"Məkan"</string>
+    <string name="path" msgid="4725740395885105824">"Cığır"</string>
+    <string name="width" msgid="9215847239714321097">"Enlilik"</string>
+    <string name="height" msgid="3648885449443787772">"Hündürlük"</string>
+    <string name="orientation" msgid="4958327983165245513">"Orientasiya"</string>
+    <string name="duration" msgid="8160058911218541616">"Müddət:"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MİM növü"</string>
+    <string name="file_size" msgid="8486169301588318915">"Fayl ölçüsü"</string>
+    <string name="maker" msgid="7921835498034236197">"Yaradıcı"</string>
+    <string name="model" msgid="8240207064064337366">"Model"</string>
+    <string name="flash" msgid="2816779031261147723">"İşıq"</string>
+    <string name="aperture" msgid="5920657630303915195">"Dəlik"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Fokus uzunluğu"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Ağ balans"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Ekspozisiya vaxtı"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"Təlimat"</string>
+    <string name="auto" msgid="4296941368722892821">"Avto"</string>
+    <string name="flash_on" msgid="7891556231891837284">"İşartı oldu"</string>
+    <string name="flash_off" msgid="1445443413822680010">"İşartı yoxdur"</string>
+    <string name="unknown" msgid="3506693015896912952">"Naməlum"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Original"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Üzüm rəngi"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Ani"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Ağartmaq"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Mavi"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"Ağ / Qara"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Punş"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X Proses"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Lito"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Albomu oflayn olanda əlçatımlı etmək"</item>
+    <item quantity="other" msgid="4948604338155959389">"Albomları oflayn zamanı əlçatımlı edilir."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Bu element yerli və oflayn istifadə edilə biləcək şəkildə saxlanılır."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"Bütün albomlar"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Yerli albomlar"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP cihazları"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa albomları"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> boş yer var"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> və ya aşağı"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> və ya daha çox"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> ölçüdən <xliff:g id="MAX_SIZE">%2$s</xliff:g> ölçüyə qədər"</string>
+    <string name="Import" msgid="3985447518557474672">"İmport"</string>
+    <string name="import_complete" msgid="3875040287486199999">"İmportun tamamlanması"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Uğursuz İmport"</string>
+    <string name="camera_connected" msgid="916021826223448591">"Kamera qoşuludur."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Kamera qoşulu deyil."</string>
+    <string name="click_import" msgid="6407959065464291972">"İmport üçün buraya toxunun"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Albom seçin"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Bütün şəkilləri qarışdırın"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Şəkil seçin"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Şəkilləri seçin"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Slaydşou"</string>
+    <string name="albums" msgid="7320787705180057947">"Albomlar"</string>
+    <string name="times" msgid="2023033894889499219">"Vaxt"</string>
+    <string name="locations" msgid="6649297994083130305">"Yerlər"</string>
+    <string name="people" msgid="4114003823747292747">"Camaat"</string>
+    <string name="tags" msgid="5539648765482935955">"Teqlər"</string>
+    <string name="group_by" msgid="4308299657902209357">"Qruplaşdırın"</string>
+    <string name="settings" msgid="1534847740615665736">"Ayarlar"</string>
+    <string name="add_account" msgid="4271217504968243974">"Hesab əlavə edin"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Kamera"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Endir"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Redaktə edilmış Onlayn fotolar"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"impot olunmuş"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Ekran görüntüsü"</string>
+    <string name="help" msgid="7368960711153618354">"Kömək"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"Saxlamağa yer yoxdur"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"Xarici yaddaş yoxdur"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Filmstrip mənzərəsi"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Tor mənzərəsi"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Tam ekran görünüşü"</string>
+    <string name="trimming" msgid="9122385768369143997">"Nizamlanır"</string>
+    <string name="muting" msgid="5094925919589915324">"Səs kəsmə"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Lütfən, gözləyin"</string>
+    <string name="save_into" msgid="9155488424829609229">"Video <xliff:g id="ALBUM_NAME">%1$s</xliff:g> albomuna qeyd olunur…"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Kəsilə bilmir: Video çox qısadır"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Panorama göstərilməsi"</string>
+    <string name="save" msgid="613976532235060516">"Yadda saxla"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Məzmun skan edilir..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d maddə skan olunub"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d maddə skan olunub"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d element skan edildi"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Çeşidlənir ..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Skan edildi"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"İmport edilir..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"Bu cihaza import edilmək üçün əlçatımlı məzmun yoxdur."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"Heç bir MTP cihaz birləşdirilməyib"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Kamera xətası"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Kamera qoşula bilmir."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Təhlükəsizlik siyasətinə görə kamera deaktiv edilib."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
+    <string name="wait" msgid="8600187532323801552">"Lütfən, gözləyin ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Kamera işlətmədən öncə USB yaddaşı quraşdırın."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Kamera istifadə etməzdən əvvəl SD kartı daxil edin."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB yaddaş hazırlanır ..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD kart hazırlanır ..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB yaddaşına giriş mümkün olmadı."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD karta giriş mümkün olmadı."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"LƏĞV ET"</string>
+    <string name="review_ok" msgid="1156261588693116433">"TAMAM"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Vaxt aralığı qeyd olunur"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Kamera seçin"</string>
+    <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Geri"</string>
+    <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Ön"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Saxlama yeri"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"YER"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Geri sayma taymeri"</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one" msgid="1654523400981245448">"1 saniyə"</item>
+    <item quantity="other" msgid="6455381617076792481">"%d saniyə"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Geri sayma zamanı siqnal"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Deaktiv"</string>
+    <string name="setting_on" msgid="8602246224465348901">"Aktiv"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Video keyfiyyəti"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Yüksək"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Aşağı"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Vaxt aralığı"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera ayarları"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamera ayarları"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Şəkil ölçüsü"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13N piksel"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8m piksel"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M piksel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M piksel"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M piksel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M piksel"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokus rejimi"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Avto"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Sonsuzluq"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"Avto"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"Sonsuzluq"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Fləş rejimi"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"İŞARTI REJİMİ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Avto"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Açıq"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Deaktiv"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AVTOİŞARTI"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"İŞARTI AKTİV"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"İşıq qapalıdır"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Ağlıq balansı"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"AĞ BALANS"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Avtomatik"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Közərmə lampası"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Gün işığı"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Flüoressent"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Buludlu"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AVTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"PARLAQ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"GÜNDÜZ İŞIĞI"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLÜORESSENT"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"BULUDLU"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Səhnə rejimi"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Avto"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Fəaliyyət"</string>
+    <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Gecə"</string>
+    <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Qürub"</string>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Parti"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"HEÇ BİRİ"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"HƏRƏKƏT"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"GECƏ"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"QÜRUB"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"Parti"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"GERİSAYAN SAAT"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"Taymer deaktiv"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SANİYƏ"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SANİYƏ"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SANİYƏ"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SANİYƏ"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Səhnə rejimində seçmək olmur."</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozisiya"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"Ekspozisiya"</string>
+    <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
+    <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"Ön kamera"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"ARXA KAMERA"</string>
+    <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB yaddaşınız dolmaq üzrədir. Keyfiyyət ayarlarını dəyişin və ya şəkilləri, yaxud digər faylları silin."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD kartınızın yaddaşı dolmaq üzrədir. Keyfiyyət ayarlarını dəyişin və ya şəkilləri, yaxud digər faylları silin."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Ölçü limiti doldu."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Çox sürətli"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama hazırlanır"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panoramanı yadda saxlamaq mümkün olmadı."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panorama Çəkilir"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Öncəki panorama gözlənilir"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Yadda saxlanılır..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Panorama göstərilməsi"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Fokusa toxunun."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Effektlər"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Heç biri"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Sıx"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Böyük gözlər"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Böyük ağız"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Kiçik ağız"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Böyük burun"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Kiçik gözlər"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Kosmosda"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Günəşin qürubu"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Sizin video"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Cihazınızı bir yerə qoyun.\nBir müddətlik görünüşdən kənarlaşın."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Yazılış zamanı şəkil çəkmək üçün toxunun."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"Video çəklişi başlamışdır."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"Video çəkilişi dayanıb"</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videokadr çəkilişi xüsusi effektlər açıq olanda deaktiv olur."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Effektləri silin"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"Axmaq sifətlər"</string>
+    <string name="effect_background" msgid="6579360207378171022">"Fon"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Sürgü düyməsi"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Menyu düyməsi"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Ən son foto"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Ön və arxa kamera keçidi"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kamera, video və ya panorama seçicisi"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Daha çox ayar kontrolu"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Ayar kontrolunu qapadın"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoom kontrolu"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s azaldın"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s artırın"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s qeyd qutusu"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Fotoya keçin"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Videoya keçid"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Panoramaya keçin"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Yeni panoramaya keçin"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Refokusa Dəyişin"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Ləğvi gözdən keçir"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Gözdən keçirildi"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Yenidən çəkməni incələyin"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Videonu oxut"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Videonu durdurun"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Videonu təzələyin"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Video player vaxt paneli"</string>
+    <string name="capital_on" msgid="5491353494964003567">"Aç"</string>
+    <string name="capital_off" msgid="7231052688467970897">"Qapatma"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"boş vaxt"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 saat"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"saniyə"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"dəqiqə"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"saatlar"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Tamam"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Vaxt intervalı seçin"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Vaxt aralığı özəlliyi deaktiv edilib. Vaxt intervalını ayarlamaq üçün onu aktivləşdirin."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Geri sayma taymeri deaktiv edilib. Şəkil çəkmədən öncə geri saymaq üçün onu aktivləşdirin."</string>
+    <string name="set_duration" msgid="5578035312407161304">"Müddəti saniyələrlə ayarlayın"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Foto çəkmək üçün geri sayılır"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Foto məkanları yadda qalsın?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Fotolarınızı və videolarınızı çəkildikləri yerlərə teq edin.\n\nDigər tətbiqlər yadda saxladığınız şəkillərlə birlikdə bu məlumatları əldə edə bilər."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"Xeyr, təşəkkür edirəm"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Bəli"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Axtarış"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Fotolar"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Albomlar"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"Daha çox seçim"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"AYARLAR"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d fotolar"</item>
+  </plurals>
+</resources>
diff --git a/res/values-az/filtershow_strings.xml b/res/values-az/filtershow_strings.xml
new file mode 100644
index 0000000..8df6bc1
--- /dev/null
+++ b/res/values-az/filtershow_strings.xml
@@ -0,0 +1,150 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Foto Redaktor"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Şəkil yüklənə bilmir!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Originalı redaktə etmək olmur"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Divar kağızı ayarlanır"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Şəkil endirilə bilmədi. Şəbəkə əlçatmazdır."</string>
+    <string name="original" msgid="3524493791230430897">"Original"</string>
+    <string name="saved" msgid="6678827180814174711">"Yadda saxlanılmış"</string>
+    <string name="borders" msgid="2067345080568684614">"Sərhədlər"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Ləğv edin"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Yenidən edin"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Tətbiq Olunmuş Effektləri Göstər"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Tətbiq Olunmuş Effektləri Gizlət"</string>
+    <string name="export_image" msgid="3202835713172222134">"Eksport edin"</string>
+    <string name="print_image" msgid="1942989216591621413">"Çap"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Yastı Şəkli Eksport et"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Tarixçəsiz eksport olunmuş şəkil surət olacaq."</string>
+    <string name="quality" msgid="179292110309050529">"Keyfiyyət"</string>
+    <string name="size" msgid="4639404642236356037">"Ölçü"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Ayarlar"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Bu şəkildə yadda saxlanmamış dəyişikliklər var."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Çıxmadan öncə yadda saxlamaq istəyirsiniz mi?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Yadda Saxlayın və Çıxın"</string>
+    <string name="exit" msgid="242642957038770113">"Çıxış"</string>
+    <string name="history" msgid="455767361472692409">"Tarixçə"</string>
+    <string name="reset" msgid="9013181350779592937">"Sıfırla"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Tətbiq Olunmuş Effektlər"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Müqayisə edin"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Tətbiq et"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Sıfırla"</string>
+    <string name="aspect" msgid="4025244950820813059">"Aspekt"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Heç biri"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Sabit"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Balaca Planet"</string>
+    <string name="exposure" msgid="6526397045949374905">"Ekspozisiya"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Kəskinlik"</string>
+    <string name="contrast" msgid="2310908487756769019">"Ziddiyyət"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Vibrasiya"</string>
+    <string name="saturation" msgid="7026791551032438585">"Dolğunluq"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"BW Filtr"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Avtorəng"</string>
+    <string name="hue" msgid="6231252147971086030">"Çalar"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Kölgələr"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Vurğular"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Əyrilər"</string>
+    <string name="vignette" msgid="934721068851885390">"Vignette"</string>
+    <string name="redeye" msgid="4508883127049472069">"Qırmızı Göz"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Rəsm çək"</string>
+    <string name="straighten" msgid="26025591664983528">"Düzləndirmə"</string>
+    <string name="crop" msgid="5781263790107850771">"Kəsin"</string>
+    <string name="rotate" msgid="2796802553793795371">"Fırlat"</string>
+    <string name="mirror" msgid="5482518108154883096">"Güzgü"</string>
+    <string name="negative" msgid="6998313764388022201">"Neqativ"</string>
+    <string name="none" msgid="6633966646410296520">"Heç biri"</string>
+    <string name="edge" msgid="7036064886242147551">"Kənarlar"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterizə"</string>
+    <string name="downsample" msgid="3552938534146980104">"Desimasiya"</string>
+    <string name="grad" msgid="546774853424848655">"Dərəcəli"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Parlaqlıq"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Dolğunluq"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Əsas"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Qırmızı"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Sarı"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Yaşıl"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Mavi"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Göy"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Çəhrayı qırmızı"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Üslub"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"yeni"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Qırmızı"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Yaşıl"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Mavi"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Üslub"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Ölçü"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Çalar"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Dolğunluq"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Parlaqlıq"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Rəng"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Xətlər"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Sıçratma"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Sil"</string>
+    <string name="color_border_size" msgid="8745307483517793073">"qalınlıq"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Künc Ölçüsü"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Rəng"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Təmizlə"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"İxtiyari rəng seçin"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Rəng ​​Seçin"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Ölçü Seçin"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Orijinal"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Nəticə"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Şəkil Yadda Saxlanılır"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Proses keçirilir..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Cari öncədən quraşdırmanı yadda saxla"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"İstifadəçi öncədən quraşdırmalarını idarə edin"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Yeni Öncədən Quraşdırma"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Ilkin Quraşdırılan Ad"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Məlumat"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Şəkil Adı"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Şəkil Ölçüsü"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF Datası"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Öncədən quraşdırma"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versiya"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Orijinal"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Cari"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Dəlik"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Fokal Uzunluq"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Mövzu Məsafəsi"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Çəkilmə tarixi"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Ekspozisiya Müddəti"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Müəllif hüququ"</string>
+</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
new file mode 100644
index 0000000..234a0b4
--- /dev/null
+++ b/res/values-az/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Qalereya"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Şəkil çərçivəsi"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Video pleyer"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Video yüklənir…"</string>
+    <string name="loading_image" msgid="1200894415793838191">"Şəkil yüklənir ..."</string>
+    <string name="loading_account" msgid="928195413034552034">"Hesab yüklənir…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Videoya davam edin"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"%s oyun davam edilsin?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Oxutmağa davam et"</string>
+    <string name="loading" msgid="7038208555304563571">"Yüklənir…"</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Yükləmə mümkün olmadı"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Şəkli yükləmək mümkün olmadı"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"Miniatür yoxdur"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Əvvəldən başlayın"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"Ok"</string>
+    <string name="ok" msgid="5296833083983263293">"OK"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Başlamaq üçün üzə toxunun."</string>
+    <string name="saving_image" msgid="7270334453636349407">"Şəkil yadda saxlanılır ..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Şəkil <xliff:g id="ALBUM_NAME">%1$s</xliff:g> albomuna qeyd olunur…"</string>
+    <string name="save_error" msgid="6857408774183654970">"Kəsilmiş şəkil yadda saxlana bilmədi."</string>
+    <string name="crop_label" msgid="521114301871349328">"Şəkli kəsin"</string>
+    <string name="trim_label" msgid="274203231381209979">"Videonu nizamla"</string>
+    <string name="select_image" msgid="7841406150484742140">"Foto seçin"</string>
+    <string name="select_video" msgid="4859510992798615076">"Video seçin"</string>
+    <string name="select_item" msgid="2816923896202086390">"Element seçin"</string>
+    <string name="select_album" msgid="1557063764849434077">"Albom seçin"</string>
+    <string name="select_group" msgid="6744208543323307114">"Qrup seçin"</string>
+    <string name="set_image" msgid="2331476809308010401">"Şəkli bu kimi istifadə edin:"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Divar kağızı ayarlayın"</string>
+    <string name="wallpaper" msgid="140165383777262070">"Divar kağızı ayarları..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Divar kağızı"</string>
+    <string name="delete" msgid="2839695998251824487">"Silin"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Seçilmiş element silinsin?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Seçilmiş elementlər silinsin?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Təsdiqlə"</string>
+    <string name="cancel" msgid="3637516880917356226">"Ləğv et"</string>
+    <string name="share" msgid="3619042788254195341">"Paylaşın"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Panoramanı paylaşın"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Foto kimi paylaşın"</string>
+    <string name="deleted" msgid="6795433049119073871">"Silindi"</string>
+    <string name="undo" msgid="2930873956446586313">"Geri qaytarmaq"</string>
+    <string name="select_all" msgid="3403283025220282175">"Hamısını seçin"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Hamısından seçimi qaldırın"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Slaydşou"</string>
+    <string name="details" msgid="8415120088556445230">"Detallar"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d of %2$d element:"</string>
+    <string name="close" msgid="5585646033158453043">"Bağla"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Kameraya keçirin"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d seçildi"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d seçildi"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d seçilib"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d seçilib"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d seçildi"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d seçilib"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d seçildi"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d seçilib"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d seçildi"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Xəritədə göstər"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Sola fırlat"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Sağa fırladın"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Element tapıla bilmədi."</string>
+    <string name="edit" msgid="1502273844748580847">"Düzəliş et"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Asan redaktə"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Keş sorğularının emalı"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Keş olunur ..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"Kəs"</string>
+    <string name="trim_action" msgid="703098114452883524">"Nizamlama"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Susdurun"</string>
+    <string name="set_as" msgid="3636764710790507868">"Belə et"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Video susdurula bilmir."</string>
+    <string name="video_err" msgid="7003051631792271009">"Video oxumur"</string>
+    <string name="group_by_location" msgid="316641628989023253">"Yerə görə"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"Vaxt üzrə"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"Teq üzrə"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"Adamlar üzrə"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"Albom üzrə"</string>
+    <string name="group_by_size" msgid="153766174950394155">"Ölçü üzrə"</string>
+    <string name="untagged" msgid="7281481064509590402">"Teqsiz"</string>
+    <string name="no_location" msgid="4043624857489331676">"Məkan yoxdur"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Şəbəkə problemlərinə görə bəzi məkanlar təyin edilə bilmədi"</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Bu albomda fotoları endirmək alınmadı. Az sonra təkrar sınayın."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Yalnız şəkillər"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Yalnız video"</string>
+    <string name="show_all" msgid="6963292714584735149">"Şəkillər &amp; videolar"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Fotoqalereya"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"Foto yoxdur"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Kəsilmiş şəkil <xliff:g id="FOLDER_NAME">%s</xliff:g> qovluğunda yadda saxlanıldı."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"Albom mövcud deyil."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O şəkil/video əlçatımlıdır."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Yazılar"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Oflayn zamanı əlçatımlı edin"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Təzələyin"</string>
+    <string name="done" msgid="217672440064436595">"Tamam"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%2$d elementdən %1$d:"</string>
+    <string name="title" msgid="7622928349908052569">"Başlıq"</string>
+    <string name="description" msgid="3016729318096557520">"Təsvir"</string>
+    <string name="time" msgid="1367953006052876956">"Vaxt"</string>
+    <string name="location" msgid="3432705876921618314">"Məkan"</string>
+    <string name="path" msgid="4725740395885105824">"Cığır"</string>
+    <string name="width" msgid="9215847239714321097">"Enlilik"</string>
+    <string name="height" msgid="3648885449443787772">"Hündürlük"</string>
+    <string name="orientation" msgid="4958327983165245513">"Orientasiya"</string>
+    <string name="duration" msgid="8160058911218541616">"Müddət:"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MİM növü"</string>
+    <string name="file_size" msgid="8486169301588318915">"Fayl ölçüsü"</string>
+    <string name="maker" msgid="7921835498034236197">"Yaradıcı"</string>
+    <string name="model" msgid="8240207064064337366">"Model"</string>
+    <string name="flash" msgid="2816779031261147723">"İşıq"</string>
+    <string name="aperture" msgid="5920657630303915195">"Dəlik"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Fokus uzunluğu"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Ağ balans"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Ekspozisiya vaxtı"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"Təlimat"</string>
+    <string name="auto" msgid="4296941368722892821">"Avto"</string>
+    <string name="flash_on" msgid="7891556231891837284">"İşartı oldu"</string>
+    <string name="flash_off" msgid="1445443413822680010">"İşartı yoxdur"</string>
+    <string name="unknown" msgid="3506693015896912952">"Naməlum"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Original"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Üzüm rəngi"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Ani"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Ağartmaq"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Mavi"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"Ağ / Qara"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Punş"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X Proses"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Lito"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Albomu oflayn olanda əlçatımlı etmək"</item>
+    <item quantity="other" msgid="4948604338155959389">"Albomları oflayn zamanı əlçatımlı edilir."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Bu element yerli və oflayn istifadə edilə biləcək şəkildə saxlanılır."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"Bütün albomlar"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Yerli albomlar"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP cihazları"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa albomları"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> boş yer var"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> və ya aşağı"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> və ya daha çox"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> ölçüdən <xliff:g id="MAX_SIZE">%2$s</xliff:g> ölçüyə qədər"</string>
+    <string name="Import" msgid="3985447518557474672">"İmport"</string>
+    <string name="import_complete" msgid="3875040287486199999">"İmportun tamamlanması"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Uğursuz İmport"</string>
+    <string name="camera_connected" msgid="916021826223448591">"Kamera qoşuludur."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Kamera qoşulu deyil."</string>
+    <string name="click_import" msgid="6407959065464291972">"İmport üçün buraya toxunun"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Albom seçin"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Bütün şəkilləri qarışdırın"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Şəkil seçin"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Şəkilləri seçin"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Slaydşou"</string>
+    <string name="albums" msgid="7320787705180057947">"Albomlar"</string>
+    <string name="times" msgid="2023033894889499219">"Vaxt"</string>
+    <string name="locations" msgid="6649297994083130305">"Yerlər"</string>
+    <string name="people" msgid="4114003823747292747">"Camaat"</string>
+    <string name="tags" msgid="5539648765482935955">"Teqlər"</string>
+    <string name="group_by" msgid="4308299657902209357">"Qruplaşdırın"</string>
+    <string name="settings" msgid="1534847740615665736">"Ayarlar"</string>
+    <string name="add_account" msgid="4271217504968243974">"Hesab əlavə edin"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Kamera"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Endir"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Redaktə edilmış Onlayn fotolar"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"impot olunmuş"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Ekran görüntüsü"</string>
+    <string name="help" msgid="7368960711153618354">"Kömək"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"Saxlamağa yer yoxdur"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"Xarici yaddaş yoxdur"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Filmstrip mənzərəsi"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Tor mənzərəsi"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Tam ekran görünüşü"</string>
+    <string name="trimming" msgid="9122385768369143997">"Nizamlanır"</string>
+    <string name="muting" msgid="5094925919589915324">"Səs kəsmə"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Lütfən, gözləyin"</string>
+    <string name="save_into" msgid="9155488424829609229">"Video <xliff:g id="ALBUM_NAME">%1$s</xliff:g> albomuna qeyd olunur…"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Kəsilə bilmir: Video çox qısadır"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Panorama göstərilməsi"</string>
+    <string name="save" msgid="613976532235060516">"Yadda saxla"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Məzmun skan edilir..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d maddə skan olunub"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d maddə skan olunub"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d element skan edildi"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Çeşidlənir ..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Skan edildi"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"İmport edilir..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"Bu cihaza import edilmək üçün əlçatımlı məzmun yoxdur."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"Heç bir MTP cihaz birləşdirilməyib"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Kamera xətası"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Kamera qoşula bilmir."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Təhlükəsizlik siyasətinə görə kamera deaktiv edilib."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
+    <string name="wait" msgid="8600187532323801552">"Lütfən, gözləyin ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Kamera işlətmədən öncə USB yaddaşı quraşdırın."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Kamera istifadə etməzdən əvvəl SD kartı daxil edin."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB yaddaş hazırlanır ..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD kart hazırlanır ..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB yaddaşına giriş mümkün olmadı."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD karta giriş mümkün olmadı."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"LƏĞV ET"</string>
+    <string name="review_ok" msgid="1156261588693116433">"TAMAM"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Vaxt aralığı qeyd olunur"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Kamera seçin"</string>
+    <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Geri"</string>
+    <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Ön"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Saxlama yeri"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"YER"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Geri sayma taymeri"</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one" msgid="1654523400981245448">"1 saniyə"</item>
+    <item quantity="other" msgid="6455381617076792481">"%d saniyə"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Geri sayma zamanı siqnal"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Deaktiv"</string>
+    <string name="setting_on" msgid="8602246224465348901">"Aktiv"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Video keyfiyyəti"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Yüksək"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Aşağı"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Vaxt aralığı"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera ayarları"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamera ayarları"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Şəkil ölçüsü"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13N piksel"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8m piksel"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M piksel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M piksel"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M piksel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M piksel"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokus rejimi"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Avto"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Sonsuzluq"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"Avto"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"Sonsuzluq"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Fləş rejimi"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"İŞARTI REJİMİ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Avto"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Açıq"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Deaktiv"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AVTOİŞARTI"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"İŞARTI AKTİV"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"İşıq qapalıdır"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Ağlıq balansı"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"AĞ BALANS"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Avtomatik"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Közərmə lampası"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Gün işığı"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Flüoressent"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Buludlu"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AVTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"PARLAQ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"GÜNDÜZ İŞIĞI"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLÜORESSENT"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"BULUDLU"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Səhnə rejimi"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Avto"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Fəaliyyət"</string>
+    <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Gecə"</string>
+    <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Qürub"</string>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Parti"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"HEÇ BİRİ"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"HƏRƏKƏT"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"GECƏ"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"QÜRUB"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"Parti"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"GERİSAYAN SAAT"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"Taymer deaktiv"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SANİYƏ"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SANİYƏ"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SANİYƏ"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SANİYƏ"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Səhnə rejimində seçmək olmur."</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozisiya"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"Ekspozisiya"</string>
+    <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
+    <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"Ön kamera"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"ARXA KAMERA"</string>
+    <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB yaddaşınız dolmaq üzrədir. Keyfiyyət ayarlarını dəyişin və ya şəkilləri, yaxud digər faylları silin."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD kartınızın yaddaşı dolmaq üzrədir. Keyfiyyət ayarlarını dəyişin və ya şəkilləri, yaxud digər faylları silin."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Ölçü limiti doldu."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Çox sürətli"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama hazırlanır"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panoramanı yadda saxlamaq mümkün olmadı."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panorama Çəkilir"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Öncəki panorama gözlənilir"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Yadda saxlanılır..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Panorama göstərilməsi"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Fokusa toxunun."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Effektlər"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Heç biri"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Sıx"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Böyük gözlər"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Böyük ağız"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Kiçik ağız"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Böyük burun"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Kiçik gözlər"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Kosmosda"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Günəşin qürubu"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Sizin video"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Cihazınızı bir yerə qoyun.\nBir müddətlik görünüşdən kənarlaşın."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Yazılış zamanı şəkil çəkmək üçün toxunun."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"Video çəklişi başlamışdır."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"Video çəkilişi dayanıb"</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videokadr çəkilişi xüsusi effektlər açıq olanda deaktiv olur."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Effektləri silin"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"Axmaq sifətlər"</string>
+    <string name="effect_background" msgid="6579360207378171022">"Fon"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Sürgü düyməsi"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Menyu düyməsi"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Ən son foto"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Ön və arxa kamera keçidi"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kamera, video və ya panorama seçicisi"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Daha çox ayar kontrolu"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Ayar kontrolunu qapadın"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoom kontrolu"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s azaldın"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s artırın"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s qeyd qutusu"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Fotoya keçin"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Videoya keçid"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Panoramaya keçin"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Yeni panoramaya keçin"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Refokusa Dəyişin"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Ləğvi gözdən keçir"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Gözdən keçirildi"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Yenidən çəkməni incələyin"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Videonu oxut"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Videonu durdurun"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Videonu təzələyin"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Video player vaxt paneli"</string>
+    <string name="capital_on" msgid="5491353494964003567">"Aç"</string>
+    <string name="capital_off" msgid="7231052688467970897">"Qapatma"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"boş vaxt"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 saniyə"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 dəqiqə"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 saat"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"saniyə"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"dəqiqə"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"saatlar"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Tamam"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Vaxt intervalı seçin"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Vaxt aralığı özəlliyi deaktiv edilib. Vaxt intervalını ayarlamaq üçün onu aktivləşdirin."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Geri sayma taymeri deaktiv edilib. Şəkil çəkmədən öncə geri saymaq üçün onu aktivləşdirin."</string>
+    <string name="set_duration" msgid="5578035312407161304">"Müddəti saniyələrlə ayarlayın"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Foto çəkmək üçün geri sayılır"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Foto məkanları yadda qalsın?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Fotolarınızı və videolarınızı çəkildikləri yerlərə teq edin.\n\nDigər tətbiqlər yadda saxladığınız şəkillərlə birlikdə bu məlumatları əldə edə bilər."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"Xeyr, təşəkkür edirəm"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Bəli"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Axtarış"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Fotolar"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Albomlar"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"Daha çox seçim"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"AYARLAR"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d fotolar"</item>
+  </plurals>
+</resources>
diff --git a/res/values-be/filtershow_strings.xml b/res/values-be/filtershow_strings.xml
index 66f4506..adaa3c2 100644
--- a/res/values-be/filtershow_strings.xml
+++ b/res/values-be/filtershow_strings.xml
@@ -18,21 +18,40 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Фотарэдактар"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Не атрымлiваецца загрузіць малюнак"</string>
+    <!-- no translation found for cannot_edit_original (5890293845882609388) -->
+    <skip />
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Усталёўка шпалер..."</string>
+    <string name="download_failure" msgid="5923323939788582895">"Не атрымалася спампаваць фота. Сетка недаступная."</string>
     <string name="original" msgid="3524493791230430897">"Арыгiнал"</string>
     <string name="borders" msgid="2067345080568684614">"Межы"</string>
+    <!-- no translation found for custom_border (8679893731790931871) -->
+    <skip />
     <string name="filtershow_undo" msgid="6781743189243585101">"Вярнуць"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Паўтарыць"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Паказаць гісторыю"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Схаваць гісторыю"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Паказаць статус малюнка"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Схаваць статус малюнка"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Паказваць прымененыя эфекты"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Хаваць прымененыя эфекты"</string>
+    <!-- no translation found for export_image (3202835713172222134) -->
+    <skip />
+    <!-- no translation found for print_image (1942989216591621413) -->
+    <skip />
+    <!-- no translation found for export_flattened (9046192331465915411) -->
+    <skip />
+    <!-- no translation found for select_output_settings (1268532018080310748) -->
+    <skip />
+    <!-- no translation found for quality (179292110309050529) -->
+    <skip />
+    <!-- no translation found for size (4639404642236356037) -->
+    <skip />
+    <!-- no translation found for x (6810256999024563662) -->
+    <skip />
     <string name="menu_settings" msgid="6428291655769260831">"Налады"</string>
     <string name="unsaved" msgid="8704442449002374375">"Існуюць незахаваныя змяненні ў гэтай выяве."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Жадаеце захавацца перад выхадам?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Захаваць і выйсці"</string>
+    <!-- no translation found for save_and_processing (6371565035837463194) -->
+    <skip />
     <string name="exit" msgid="242642957038770113">"Выйсці"</string>
     <string name="history" msgid="455767361472692409">"Гісторыя"</string>
     <string name="reset" msgid="9013181350779592937">"Скінуць"</string>
@@ -67,6 +86,16 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Блікі"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Пэндзаль"</string>
     <string name="vignette" msgid="934721068851885390">"Віньетка"</string>
+    <!-- no translation found for vignette_main (6046495605390665423) -->
+    <skip />
+    <!-- no translation found for vignette_exposure (6862058227309534094) -->
+    <skip />
+    <!-- no translation found for vignette_saturation (1617055207565719771) -->
+    <skip />
+    <!-- no translation found for vignette_contrast (955732121756799897) -->
+    <skip />
+    <!-- no translation found for vignette_falloff (690918055030064199) -->
+    <skip />
     <string name="redeye" msgid="4508883127049472069">"Чырвонае вока"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Намаляваць"</string>
     <string name="straighten" msgid="26025591664983528">"Выраўнаваць"</string>
@@ -76,21 +105,112 @@
     <string name="negative" msgid="6998313764388022201">"Негатыў"</string>
     <string name="none" msgid="6633966646410296520">"Няма"</string>
     <string name="edge" msgid="7036064886242147551">"Краi"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Уорхал"</string>
+    <!-- no translation found for kmeans (2080952022674981541) -->
+    <skip />
     <string name="downsample" msgid="3552938534146980104">"Паменшыць"</string>
+    <!-- no translation found for grad (546774853424848655) -->
+    <skip />
+    <!-- no translation found for editor_grad_brightness (5937316734380235741) -->
+    <skip />
+    <!-- no translation found for editor_grad_contrast (3454456673401803360) -->
+    <skip />
+    <!-- no translation found for editor_grad_saturation (3760247354109521726) -->
+    <skip />
+    <!-- no translation found for editor_chan_sat_main (4427652337797121940) -->
+    <skip />
+    <!-- no translation found for editor_chan_sat_red (1699222266490540696) -->
+    <skip />
+    <!-- no translation found for editor_chan_sat_yellow (1488997071882154179) -->
+    <skip />
+    <!-- no translation found for editor_chan_sat_green (1514055896212975167) -->
+    <skip />
+    <!-- no translation found for editor_chan_sat_cyan (1367634650172508288) -->
+    <skip />
+    <!-- no translation found for editor_chan_sat_blue (384409736863387895) -->
+    <skip />
+    <!-- no translation found for editor_chan_sat_magenta (6689215719351415546) -->
+    <skip />
+    <!-- no translation found for editor_grad_style (2168414479007745179) -->
+    <skip />
+    <!-- no translation found for editor_grad_new (4857265951369377379) -->
+    <skip />
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Чырвоны"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Зялёны"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Сiнi"</string>
     <string name="draw_style" msgid="2036125061987325389">"Стыль"</string>
     <string name="draw_size" msgid="4360005386104151209">"Памер"</string>
+    <!-- no translation found for draw_hue (4975135843189267133) -->
+    <skip />
+    <!-- no translation found for draw_saturation (5394395648014454882) -->
+    <skip />
+    <!-- no translation found for draw_value (6571604055161538273) -->
+    <skip />
     <string name="draw_color" msgid="2119030386987211193">"Колер"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Лiнii"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Маркёр"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Пырскi"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Ачысціць"</string>
+    <!-- no translation found for color_border_size (1086895807615869290) -->
+    <skip />
+    <!-- no translation found for color_border_corner_size (7637235159438869979) -->
+    <skip />
+    <!-- no translation found for color_border_color (8765458414425980711) -->
+    <skip />
+    <!-- no translation found for color_border_clear (4418261191091091722) -->
+    <skip />
     <string name="color_pick_select" msgid="734312818059057394">"Выбраць іншы колер"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Выберыце колер"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Выберыце памер"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Арыгiнал"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Вынiк"</string>
+    <!-- no translation found for filtershow_notification_label (1653168445525855247) -->
+    <skip />
+    <!-- no translation found for filtershow_notification_message (2661871765484036286) -->
+    <skip />
+    <!-- no translation found for filtershow_save_preset (3933550455577927439) -->
+    <skip />
+    <!-- no translation found for filtershow_manage_preset (3872896753708921286) -->
+    <skip />
+    <!-- no translation found for filtershow_new_preset (8923930134923416617) -->
+    <skip />
+    <!-- no translation found for filtershow_preset_name (7015939727047649866) -->
+    <skip />
+    <!-- no translation found for filtershow_show_info_panel (5773036746043711115) -->
+    <skip />
+    <!-- no translation found for filtershow_show_info_panel_name (5908258517140549439) -->
+    <skip />
+    <!-- no translation found for filtershow_show_info_panel_size (1714666849204493017) -->
+    <skip />
+    <!-- no translation found for filtershow_show_info_panel_histogram (2669188469897955809) -->
+    <skip />
+    <!-- no translation found for filtershow_show_info_panel_exif (4965486882625125154) -->
+    <skip />
+    <!-- no translation found for filtershow_add_button_looks (8630823661416925426) -->
+    <skip />
+    <!-- no translation found for filtershow_add_button_versions (7620107266685809612) -->
+    <skip />
+    <!-- no translation found for filtershow_version_original (1413894292200912828) -->
+    <skip />
+    <!-- no translation found for filtershow_version_current (6609334422797468952) -->
+    <skip />
+    <!-- no translation found for filtershow_exif_model (3543206476046267466) -->
+    <skip />
+    <!-- no translation found for filtershow_exif_aperture (5076571522763604380) -->
+    <skip />
+    <!-- no translation found for filtershow_exif_focal_length (5925151469731623706) -->
+    <skip />
+    <!-- no translation found for filtershow_exif_iso (5822494416955625317) -->
+    <skip />
+    <!-- no translation found for filtershow_exif_subject_distance (4920632253433906646) -->
+    <skip />
+    <!-- no translation found for filtershow_exif_date (8882402253732028544) -->
+    <skip />
+    <!-- no translation found for filtershow_exif_f_stop (6081797865604483139) -->
+    <skip />
+    <!-- no translation found for filtershow_exif_exposure_time (4099067062781294115) -->
+    <skip />
+    <!-- no translation found for filtershow_exif_copyright (8801875918803737581) -->
+    <skip />
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index a8670de..56ddbd0 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Павярнуць направа"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Элемент не знойдзены."</string>
     <string name="edit" msgid="1502273844748580847">"Рэдагаваць"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Простае рэдагаванне"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Запыты на кэшаванне працэсу"</string>
     <string name="caching_label" msgid="4521059045896269095">"Кэшаванне..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Абрэзаць"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Не атрымлiваецца падключыцца да камеры."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Камера адключана з-за палітыкі бяспекі."</string>
     <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Відэакамера"</string>
     <string name="wait" msgid="8600187532323801552">"Чакайце..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Перш чым выкарыстоўваць камеру, падключыце USB-назапашвальнiк."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Устаўце SD-карту перад выкарыстаннем камеры."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Налады камеры"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Налады відэакамеры"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Памер малюнка"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 млн. пікселяў"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 мегапікселяў"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 мегапiкселяў"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 мiльёны пікселяў"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 мегапiкселя"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 мегапiкселя"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 мiльёны пікселяў (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 мегапікселя"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 мегапiксель"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Аўтаматычна"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Бясконцасць"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Макра"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"АЎТАМАТЫЧНАЯ"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"БЯСКОНЦА"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"МАКРА"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Рэжым успышкі"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"РЭЖЫМ УСПЫШКI"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Аўтаматычна"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Уключана"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Адключана"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"АЎТАЎСПЫШКА"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"УСПЫШКА ЎКЛ."</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"УСПЫШ. ВЫКЛ"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Баланс белага"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"БАЛАНС БЕЛАГА"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Аўтаматычна"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Белы напал"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Дзённае святло"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Флюарэсцэнтны"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Пахмурна"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"АЎТАМАТЫЧНАЯ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"БЕЛЫ НАПАЛ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ДЗЁННАЕ СВЯТЛО"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ФЛЮАРЭСЦЭНТНЫ"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ПАХМУРНА"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Рэжым здымкаў"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Аўтаматычна"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Месца на вашым USB-назапашвальнiку заканчваецца. Змяніце параметры якасці або выдаліце некаторыя выявы цi іншыя файлы."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Месца на вашай SD-карце заканчваецца. Змяніце параметры якасці або выдаліце некаторыя выявы цi іншыя файлы."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"У космасе"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Заход"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Вашы відэа"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Наладзьце прыладу."\n"На хвіліну выйдзіце з поля зроку."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Наладзьце прыладу.\nНа хвіліну выйдзіце з поля зроку."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Націсніце, каб зрабiць здымак падчас запісу."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Відэазапіс пачаўся."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Вiдэазапiс спыніўся."</string>
@@ -331,9 +363,15 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Пераключыцца ў рэжым відэа"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Пераключыцца ў рэжым панарамы"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Пераключыцца на новую панараму"</string>
+    <!-- no translation found for accessibility_switch_to_refocus (4539294619557299903) -->
+    <skip />
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Адмена агляда"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Агляд зроблены"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Пераробка агляда"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Прайграванне відэа"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Паўза прайгравання відэа"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Абнавіць відэа"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Радок часу прайгравання відэапрайгравальніка"</string>
     <string name="capital_on" msgid="5491353494964003567">"УКЛ."</string>
     <string name="capital_off" msgid="7231052688467970897">"АДКЛ."</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Адключана"</string>
@@ -386,13 +424,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Усталяваць час у секундах"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Зваротны адлiк, каб зрабіць здымак"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Запамiнаць месца, дзе зроблена фота?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Адзначце на вашых фатаграфіях і відэа месцы, у якіх яны былі створаныя."\n\n"Іншыя праграмы могуць атрымаць доступ да гэтай інфармацыі разам з захаванымі выявамі."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Адзначце на вашых фатаграфіях і відэа месцы, у якіх яны былі створаныя.\n\nІншыя праграмы могуць атрымаць доступ да гэтай інфармацыі разам з захаванымі выявамі."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Не, дзякуй"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Так"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Камера"</string>
     <string name="menu_search" msgid="7580008232297437190">"Пошук"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Фатаграфіі"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Альбомы"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ДАДАТКОВЫЯ ПАРАМЕТРЫ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"НАЛАДЫ"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d фота"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d фота"</item>
diff --git a/res/values-bg/filtershow_strings.xml b/res/values-bg/filtershow_strings.xml
index 715692b..4cab271 100644
--- a/res/values-bg/filtershow_strings.xml
+++ b/res/values-bg/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Фоторедактор"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Изображението не може да се зареди!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Оригиналът не може да бъде редактиран"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Тапетът се задава"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Снимката не можа да се изтегли. Мрежата не е налице."</string>
     <string name="original" msgid="3524493791230430897">"Оригинал"</string>
     <string name="borders" msgid="2067345080568684614">"Контури"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Персонализирано"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Отмяна"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Възстановяване"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"История: Показване"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"История: Скриване"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Съст. на изобр.: Показване"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Съст. на изобр.: Скриване"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Приложени ефекти: Показване"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Приложени ефекти: Скриване"</string>
+    <string name="export_image" msgid="3202835713172222134">"Експортиране"</string>
+    <string name="print_image" msgid="1942989216591621413">"Печат"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Еднослойно изобр.: Експорт."</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Експортираното изображение ще бъде копие и няма да включва историята на промените."</string>
+    <string name="quality" msgid="179292110309050529">"Качество"</string>
+    <string name="size" msgid="4639404642236356037">"Размер"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Настройки"</string>
     <string name="unsaved" msgid="8704442449002374375">"В това изображение има незапазени промени."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Искате ли да запазите преди изход?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Запазване и изход"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Изображението с пълна разделителна способност се обработва..."</string>
     <string name="exit" msgid="242642957038770113">"Изход"</string>
     <string name="history" msgid="455767361472692409">"История"</string>
     <string name="reset" msgid="9013181350779592937">"Повторно задаване"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Просветляване"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Извивки"</string>
     <string name="vignette" msgid="934721068851885390">"Винетиране"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Винетиране"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Експонация"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Насищане"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Контраст"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Потъмняване"</string>
     <string name="redeye" msgid="4508883127049472069">"Червени очи"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Рисуване"</string>
     <string name="straighten" msgid="26025591664983528">"Изправяне"</string>
@@ -75,22 +89,68 @@
     <string name="mirror" msgid="5482518108154883096">"Огледало"</string>
     <string name="negative" msgid="6998313764388022201">"Негатив"</string>
     <string name="none" msgid="6633966646410296520">"Без"</string>
-    <string name="edge" msgid="7036064886242147551">"Контури"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Уорхол"</string>
-    <string name="downsample" msgid="3552938534146980104">"Децимация"</string>
+    <string name="edge" msgid="7036064886242147551">"Edges"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Плакат"</string>
+    <string name="downsample" msgid="3552938534146980104">"Downsample"</string>
+    <string name="grad" msgid="546774853424848655">"Преливане"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Ярко"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Контрастно"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Насищане"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Основно"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Червено"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Жълто"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Зелено"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Синьозелено"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Синьо"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Пурпурно"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Стил"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ново"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"червено"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"зелено"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"синьо"</string>
     <string name="draw_style" msgid="2036125061987325389">"Стил"</string>
     <string name="draw_size" msgid="4360005386104151209">"Размер"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Цветови тон"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Насищане"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Яркост"</string>
     <string name="draw_color" msgid="2119030386987211193">"Цвят"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Линии"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Маркер"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Пръски боя"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Изчистване"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Дебелина"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Ъгъл: Размер"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Цвят"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Изчистване"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Избор на персонализиран цвят"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Избиране на цвят"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Избиране на размер"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Оригинал"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Резултат"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Изображението се запазва"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Обработва се..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Текуща готова настр.: Запазв."</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Готови потр. настр.: Управл."</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Нова готова настройка"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Предварително зададено име"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Информация"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Име на изображението"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Размер на изображението"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Хистограма"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF данни"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Готова настройка"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Версия"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Оригинал"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Текуща"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Модел"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Бленда"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Дължина на фокуса"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Разстояние до обекта"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Дата на заснемане"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Относителна бленда"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Експонация"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Авторски права"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cf0a879..879a0d7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Завъртане надясно"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Елементът не можа да бъде намерен."</string>
     <string name="edit" msgid="1502273844748580847">"Редактиране"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Обикн. редактиране"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Заявките за кеширане се обработват"</string>
     <string name="caching_label" msgid="4521059045896269095">"Кешира се..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Подрязване"</string>
@@ -148,7 +149,7 @@
     <string name="ffx_vintage" msgid="8348759951363844780">"Ретро"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Моментно фото"</string>
     <string name="ffx_bleach" msgid="8946700451603478453">"Избелване"</string>
-    <string name="ffx_blue_crush" msgid="6034283412305561226">"синьо"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Синьо"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Ч/Б"</string>
     <string name="ffx_punch" msgid="1343475517872562639">"Пунш"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"Кроспроцес"</string>
@@ -204,22 +205,21 @@
     <string name="trim_too_short" msgid="751593965620665326">"Не може да се отреже: Целевият видеоклип е твърде кратък"</string>
     <string name="pano_progress_text" msgid="1586851614586678464">"Панорамата се изобразява"</string>
     <string name="save" msgid="613976532235060516">"Запазване"</string>
-    <string name="ingest_scanning" msgid="1062957108473988971">"Съдържанието се сканира..."</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Scanning content..."</string>
   <plurals name="ingest_number_of_items_scanned">
-    <item quantity="zero" msgid="2623289390474007396">"Сканирани са %1$d елемента"</item>
-    <item quantity="one" msgid="4340019444460561648">"Сканиран е %1$d елемент"</item>
-    <item quantity="other" msgid="3138021473860555499">"Сканирани са %1$d елемента"</item>
+    <item quantity="zero" msgid="2623289390474007396">"%1$d items scanned"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d item scanned"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d items scanned"</item>
   </plurals>
-    <string name="ingest_sorting" msgid="1028652103472581918">"Сортира се..."</string>
-    <string name="ingest_scanning_done" msgid="8911916277034483430">"Сканирането завърши"</string>
-    <string name="ingest_importing" msgid="7456633398378527611">"Импортира се..."</string>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Sorting..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Scanning done"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Importing..."</string>
     <string name="ingest_empty_device" msgid="2010470482779872622">"Няма съдържание, налично за импортиране на това устройство."</string>
     <string name="ingest_no_device" msgid="3054128223131382122">"Няма свързано устройство, поддържащо MTP"</string>
     <string name="camera_error_title" msgid="6484667504938477337">"Грешка в камерата"</string>
     <string name="cannot_connect_camera" msgid="955440687597185163">"Не може да се осъществи връзка с камерата."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Камерата е деактивирана заради правилата за сигурност."</string>
     <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Видеокамера"</string>
     <string name="wait" msgid="8600187532323801552">"Моля, изчакайте…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Свържете USB хранилището, преди да използвате камерата."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Поставете SD карта, преди да използвате камерата."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Настройки на камера"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Настройки на видеокамера"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер на снимка"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 мпкс"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 мпкс (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 мегапиксел"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Автоматичен"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Безкрайност"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Макро"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"АВТОМАТИЧНО"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"БЕЗКРАЙНОСТ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"МАКРО"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Светкавица"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"РЕЖИМ НА СВЕТКАВИЦАТА"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Автоматичен"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Включена"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Изкл."</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"АВТОМАТИЧНА СВЕТКАВИЦА"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"СВЕТКАВИЦАТА Е ВКЛЮЧЕНА"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"СВЕТКАВИЦАТА Е ИЗКЛЮЧЕНА"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Баланс на бялото"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"БАЛАНС НА БЯЛОТО"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Автоматичен"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Изкуствена светлина"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Дневна светлина"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Флуоресцентна светлина"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Облачно"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"АВТОМАТИЧНО"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ИЗКУСТВЕНА СВЕТЛИНА"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ДНЕВНА СВЕТЛИНА"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ФЛУОРЕСЦЕНТНА СВЕТЛИНА"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ОБЛАЧНО"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Сценичен режим"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Автоматичен"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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">"Eкспониране"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"ЕКСПОНИРАНЕ"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Мястото на USB хранилището ви привършва. Променете настройките за качество или изтрийте някои изображения или други файлове."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Мястото на SD картата ви привършва. Променете настройките за качество или изтрийте някои изображения или други файлове."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"В космоса"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Залез"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Видеоклипът ви"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Оставете устройството си."\n"Отдръпнете се от зрителното му поле за момент."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Оставете устройството си.\nОтдръпнете се от зрителното му поле за момент."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Докоснете, за да направите снимка, докато записвате."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Видеозаписът започна."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Видеозаписът спря."</string>
@@ -326,14 +358,19 @@
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Контрола за промяна на мащаба"</string>
     <string name="accessibility_decrement" msgid="1411194318538035666">"Намаляване на %1$s"</string>
     <string name="accessibility_increment" msgid="8447850530444401135">"Увеличаване на %1$s"</string>
-    <string name="accessibility_check_box" msgid="7317447218256584181">"Квадратче за отметка за %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s check box"</string>
     <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Превключване към фотоапарат"</string>
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Превключване към видео"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Превключване към панорама"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Превключване към нова панорама"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Превключване към режима за префокусиране"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Анулиране на прегледа"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Прегледът приключи"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Преглед на презаснетия елемент"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Пускане на видеоклипа"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Поставяне на видеоклипа на пауза"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Презареждане на видеоклипа"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Времева лента на видеоплейъра"</string>
     <string name="capital_on" msgid="5491353494964003567">"ВКЛЮЧЕНО"</string>
     <string name="capital_off" msgid="7231052688467970897">"ИЗКЛЮЧЕНО"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Изкл."</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Задаване на продължителността в секунди"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Обратно отброяване до правенето на снимка"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Да се запомнят ли местоположенията на снимките?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Поставете в снимките и видеоклиповете си маркери с местоположенията, на които са направени."\n\n"Другите приложения могат да осъществяват достъп до тази информация, както и до запазените ви изображения."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Поставете в снимките и видеоклиповете си маркери с местоположенията, на които са направени.\n\nДругите приложения могат да осъществяват достъп до тази информация, както и до запазените ви изображения."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Не, благодаря"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Да"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Камера"</string>
     <string name="menu_search" msgid="7580008232297437190">"Търсене"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Снимки"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Албуми"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ОЩЕ ОПЦИИ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"НАСТРОЙКИ"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d снимка"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d снимки"</item>
diff --git a/res/values-ca/filtershow_strings.xml b/res/values-ca/filtershow_strings.xml
index 495947f..dfedadc 100644
--- a/res/values-ca/filtershow_strings.xml
+++ b/res/values-ca/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor de fotos"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"No es pot carregar la imatge."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"No es pot editar l\'original."</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"S\'està establint el fons de pantalla"</string>
+    <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="custom_border" msgid="8679893731790931871">"Personalitzat"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Desfés"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Refés"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Mostra l\'historial"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Amaga l\'historial"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Mostra estat imatge"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Amaga estat d\'imatge"</string>
+    <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="export_image" msgid="3202835713172222134">"Exporta"</string>
+    <string name="print_image" msgid="1942989216591621413">"Imprimeix"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exporta la imatge aplanada"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"La imatge exportada serà una còpia i no inclourà l\'historial."</string>
+    <string name="quality" msgid="179292110309050529">"Qualitat"</string>
+    <string name="size" msgid="4639404642236356037">"Mida"</string>
+    <string name="x" msgid="6810256999024563662">"x"</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>
     <string name="save_and_exit" msgid="3628425023766687419">"Desa i surt"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"S\'està processant la imatge en resolució completa..."</string>
     <string name="exit" msgid="242642957038770113">"Surt"</string>
     <string name="history" msgid="455767361472692409">"Historial"</string>
     <string name="reset" msgid="9013181350779592937">"Restableix"</string>
@@ -67,30 +76,81 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Punts brillants"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Corbes"</string>
     <string name="vignette" msgid="934721068851885390">"Vinyeta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinyeta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposició"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturació"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Atenuació"</string>
     <string name="redeye" msgid="4508883127049472069">"Ulls vermells"</string>
-    <string name="imageDraw" msgid="6918552177844486656">"Dibuixos"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Dibuixar"</string>
     <string name="straighten" msgid="26025591664983528">"Redreça"</string>
     <string name="crop" msgid="5781263790107850771">"Retalla"</string>
     <string name="rotate" msgid="2796802553793795371">"Gira"</string>
     <string name="mirror" msgid="5482518108154883096">"Reflex"</string>
     <string name="negative" msgid="6998313764388022201">"Negatiu"</string>
     <string name="none" msgid="6633966646410296520">"Cap"</string>
-    <string name="edge" msgid="7036064886242147551">"Vores"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
-    <string name="downsample" msgid="3552938534146980104">"Reduïda"</string>
+    <string name="edge" msgid="7036064886242147551">"Bordes"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posteritza"</string>
+    <string name="downsample" msgid="3552938534146980104">"Disminuir resolució"</string>
+    <string name="grad" msgid="546774853424848655">"Graduat"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Brillantor"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturació"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Principal"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Vermell"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Groc"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Verd"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cian"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blau"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Estil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nova"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Vermell"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Verd"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Blau"</string>
     <string name="draw_style" msgid="2036125061987325389">"Estil"</string>
     <string name="draw_size" msgid="4360005386104151209">"Mida"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"To"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturació"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Brillantor"</string>
     <string name="draw_color" msgid="2119030386987211193">"Color"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Línies"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marcador"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Esquitx"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Esborra"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Gruix"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Mida extrem"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Color"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Esborra"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Tria un color personalitzat"</string>
-    <string name="color_pick_title" msgid="6195567431995308876">"Selecció del color"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Selecciona el color"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Selecció de la mida"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"D\'acord"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"S\'està desant la imatge"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"S\'està processant..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Desa config. predet. actual"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Gestiona config. pred. usuari"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Configuració predet. nova"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nom de la configuració pred."</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informació"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nom de la imatge"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Mida de la imatge"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histograma"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Dades EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Configuració predeterminada"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versió"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Actual"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Obertura"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Longitud focal"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distància de l\'individu"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Data de realització"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Número f"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Temps d\'exposició"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Drets d\'autor"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 333b3af..f3f594f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -38,14 +38,14 @@
     <string name="saving_image" msgid="7270334453636349407">"S\'està desant la imatge..."</string>
     <string name="filtershow_saving_image" msgid="6659463980581993016">"S\'està desant la imatge a <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
     <string name="save_error" msgid="6857408774183654970">"No s\'ha pogut desar la imatge retallada."</string>
-    <string name="crop_label" msgid="521114301871349328">"Escapça la imatge"</string>
+    <string name="crop_label" msgid="521114301871349328">"Retalla"</string>
     <string name="trim_label" msgid="274203231381209979">"Retalla el vídeo"</string>
     <string name="select_image" msgid="7841406150484742140">"Selecciona una foto"</string>
     <string name="select_video" msgid="4859510992798615076">"Selecciona un vídeo"</string>
     <string name="select_item" msgid="2816923896202086390">"Tria un element"</string>
     <string name="select_album" msgid="1557063764849434077">"Selecciona un àlbum"</string>
     <string name="select_group" msgid="6744208543323307114">"Selecciona un grup"</string>
-    <string name="set_image" msgid="2331476809308010401">"Defineix la imatge com a"</string>
+    <string name="set_image" msgid="2331476809308010401">"Estableix com a"</string>
     <string name="set_wallpaper" msgid="8491121226190175017">"Defineix el fons de pantalla"</string>
     <string name="wallpaper" msgid="140165383777262070">"S\'està establint el fons de pantalla..."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Fons de pantalla"</string>
@@ -88,12 +88,13 @@
     <string name="rotate_right" msgid="6776325835923384839">"Gira a la dreta"</string>
     <string name="no_such_item" msgid="5315144556325243400">"No s\'ha trobat l\'element."</string>
     <string name="edit" msgid="1502273844748580847">"Edita"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Edició simple"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"S\'estan processant les sol·licituds de memòria cau"</string>
     <string name="caching_label" msgid="4521059045896269095">"S\'està desant a la memòria cau..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Retalla"</string>
     <string name="trim_action" msgid="703098114452883524">"Retalla"</string>
     <string name="mute_action" msgid="5296241754753306251">"Silencia"</string>
-    <string name="set_as" msgid="3636764710790507868">"Defineix com a"</string>
+    <string name="set_as" msgid="3636764710790507868">"Estableix com a"</string>
     <string name="video_mute_err" msgid="6392457611270600908">"No es pot silenciar el vídeo."</string>
     <string name="video_err" msgid="7003051631792271009">"No es pot reproduir el vídeo."</string>
     <string name="group_by_location" msgid="316641628989023253">"Per ubicació"</string>
@@ -141,9 +142,9 @@
     <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
     <string name="manual" msgid="6608905477477607865">"Manual"</string>
     <string name="auto" msgid="4296941368722892821">"Automàtic"</string>
-    <string name="flash_on" msgid="7891556231891837284">"Flaix disparat"</string>
+    <string name="flash_on" msgid="7891556231891837284">"Flaix activat"</string>
     <string name="flash_off" msgid="1445443413822680010">"Sense flaix"</string>
-    <string name="unknown" msgid="3506693015896912952">"Desconeguda"</string>
+    <string name="unknown" msgid="3506693015896912952">"Desconegut"</string>
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instantània"</string>
@@ -204,22 +205,22 @@
     <string name="trim_too_short" msgid="751593965620665326">"No es pot retallar: el vídeo de destinació és massa curt"</string>
     <string name="pano_progress_text" msgid="1586851614586678464">"Panorama de representació"</string>
     <string name="save" msgid="613976532235060516">"Desa"</string>
-    <string name="ingest_scanning" msgid="1062957108473988971">"S\'està explorant el contingut..."</string>
-  <plurals name="ingest_number_of_items_scanned">
-    <item quantity="zero" msgid="2623289390474007396">"%1$d elements explorats"</item>
-    <item quantity="one" msgid="4340019444460561648">"%1$d element explorat"</item>
-    <item quantity="other" msgid="3138021473860555499">"%1$d elements explorats"</item>
-  </plurals>
-    <string name="ingest_sorting" msgid="1028652103472581918">"S\'està ordenant..."</string>
-    <string name="ingest_scanning_done" msgid="8911916277034483430">"Exploració finalitzada"</string>
-    <string name="ingest_importing" msgid="7456633398378527611">"S\'està important..."</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Anàlisi de contingut ..."</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for ingest_number_of_items_scanned:zero (2623289390474007396) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for ingest_number_of_items_scanned:one (4340019444460561648) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for ingest_number_of_items_scanned:other (3138021473860555499) -->
+    <string name="ingest_sorting" msgid="1028652103472581918">"Ordenant ..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Escaneig fet"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Importació ..."</string>
     <string name="ingest_empty_device" msgid="2010470482779872622">"No hi ha contingut disponible per importar en aquest dispositiu."</string>
     <string name="ingest_no_device" msgid="3054128223131382122">"No hi ha cap dispositiu MTP connectat"</string>
     <string name="camera_error_title" msgid="6484667504938477337">"Error de la càmera"</string>
     <string name="cannot_connect_camera" msgid="955440687597185163">"No es pot connectar a la càmera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"La càmera s\'ha desactivat a causa de les polítiques de seguretat."</string>
     <string name="camera_label" msgid="6346560772074764302">"Càmera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Càmera de vídeo"</string>
     <string name="wait" msgid="8600187532323801552">"Espereu-vos…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Instal·la l\'emmagatzematge USB abans d\'utilitzar la càmera."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Insereix una targeta SD abans d\'utilitzar la càmera."</string>
@@ -229,11 +230,12 @@
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"No s\'ha pogut accedir a la targeta SD."</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCEL·LA"</string>
     <string name="review_ok" msgid="1156261588693116433">"FET"</string>
-    <string name="time_lapse_title" msgid="4360632427760662691">"S\'està enregistrant lapse de temps"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"S\'està enregistrant a intervals de temps"</string>
     <string name="pref_camera_id_title" msgid="4040791582294635851">"Tria de la càmera"</string>
     <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>
+    <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>
@@ -247,32 +249,48 @@
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualitat de vídeo"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Alta"</string>
     <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Baixa"</string>
-    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Lapse de temps"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Interval de temps"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuració de la càmera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuració de la càmera de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Mida de la imatge"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapíxel"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 Mp"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mp"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Mp"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 Mp"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Mp"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Mp"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Mp (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 Mp"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 Mp"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
     <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mode d\'enfocament"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automàtic"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinit"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMÀTIC"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINIT"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Mode de flaix"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODE DE FLAIX"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automàtic"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"A"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Desactivat"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLAIX AUTOMÀTIC"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLAIX ACTIVAT"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLAIX DESACTIVAT"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balanç de blancs"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALANÇ DE BLANCS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automàtica"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescent"</string>
-    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Llum de dia"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Llum natural"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescent"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Ennuvolat"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMÀTIC"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENT"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"LLUM NATURAL"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENT"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ENNUVOLAT"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Mode d\'escena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automàtic"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +298,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"L\'emmagatzematge USB s\'està quedant sense espai. Canvia la configuració de qualitat o bé suprimeix unes quantes imatges o altres fitxers."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"La targeta SD s\'està quedant sense espai. Canvia la configuració de qualitat o suprimeix unes quantes imatges o altres fitxers."</string>
@@ -308,8 +341,8 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"A l\'espai"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Posta del sol"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"El teu vídeo"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Deixa el dispositiu."\n"Surt un moment de la visualització."</string>
-    <string name="video_snapshot_hint" msgid="18833576851372483">"Toca per fer una foto mentre enregistres."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Deixa el dispositiu.\nSurt un moment de la visualització."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Toca per fer una foto mentre enregistres un vídeo."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"L\'enregistrament de vídeo ha començat."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"L\'enregistrament de vídeo s\'ha aturat."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Les instantànies del vídeo es desactiven quan hi ha els efectes especials activats."</string>
@@ -326,14 +359,21 @@
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Control de zoom"</string>
     <string name="accessibility_decrement" msgid="1411194318538035666">"Redueix %1$s"</string>
     <string name="accessibility_increment" msgid="8447850530444401135">"Augmenta %1$s"</string>
-    <string name="accessibility_check_box" msgid="7317447218256584181">"Casella de selecció %1$s"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for accessibility_check_box (7317447218256584181) -->
+    <skip />
     <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Canvia a foto"</string>
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Canvia a vídeo"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Canvia a panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Canvia al panorama nou"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Canvia a reenfocament"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Cancel·la en mode de revisió"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Fet en mode de revisió"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Revisa la foto o el vídeo nou"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Reprodueix el vídeo"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Posa en pausa el vídeo"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Torna a carregar el vídeo"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Barra temporal del reproductor de vídeo"</string>
     <string name="capital_on" msgid="5491353494964003567">"ACTIVAT"</string>
     <string name="capital_off" msgid="7231052688467970897">"DESACTIVAT"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Desactivat"</string>
@@ -381,18 +421,20 @@
     <string name="time_lapse_hours" msgid="1776453661704997476">"hores"</string>
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Fet"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Definició d\'interval de temps"</string>
-    <string name="set_time_interval_help" msgid="6665849510484821483">"La funció de lapse de temps està desactivada. Activa-la per definir l\'interval de temps."</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"L\'interval de temps està desactivat. Activa aquesta funció per establir un interval de temps."</string>
     <string name="set_timer_help" msgid="5007708849404589472">"El temporitzador del compte enrere està desactivat. Activa el compte enrere abans de fer una foto."</string>
     <string name="set_duration" msgid="5578035312407161304">"Configuració de la durada en segons"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Compte enrere per fer una foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Vols que es recordin les ubicacions de les fotos?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Etiqueta les teves fotos i els teus vídeos amb les ubicacions des de les quals es fan."\n\n"Altres aplicacions podran accedir a aquesta informació juntament amb les imatges desades."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Etiqueta les teves fotos i els teus vídeos amb les ubicacions on s\'han fet.\n\nAltres aplicacions podran accedir a aquesta informació i a les imatges desades."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"No, gràcies"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Sí"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Càmera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Cerca"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotos"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Àlbums"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"MÉS OPCIONS"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"CONFIGURACIÓ"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotos"</item>
diff --git a/res/values-cs/filtershow_strings.xml b/res/values-cs/filtershow_strings.xml
index e3889d0..e5d0070 100644
--- a/res/values-cs/filtershow_strings.xml
+++ b/res/values-cs/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor fotografií"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Obrázek nelze načíst!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Originál nelze upravit"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Nastavování tapety"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Fotografii se nepodařilo stáhnout. Síť je nedostupná."</string>
     <string name="original" msgid="3524493791230430897">"Původní"</string>
     <string name="borders" msgid="2067345080568684614">"Okraje"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Vlastní"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Vrátit zpět"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Opakovat"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Zobrazit historii"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Skrýt historii"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Ukázat stav obrázku"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Skrýt stav obrázku"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Ukázat použité efekty"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Skrýt použité efekty"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportovat"</string>
+    <string name="print_image" msgid="1942989216591621413">"Tisk"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exportovat zploštělou fotku"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Exportovaný obrázek bude kopie bez historie."</string>
+    <string name="quality" msgid="179292110309050529">"Kvalita"</string>
+    <string name="size" msgid="4639404642236356037">"Rozměry"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Nastavení"</string>
     <string name="unsaved" msgid="8704442449002374375">"Obrázek obsahuje neuložené změny."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Chcete před ukončením uložit změny?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Uložit a ukončit"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Zpracovávání fotografie v plném rozlišení..."</string>
     <string name="exit" msgid="242642957038770113">"Ukončit"</string>
     <string name="history" msgid="455767361472692409">"Historie"</string>
     <string name="reset" msgid="9013181350779592937">"Obnovit"</string>
@@ -67,30 +76,81 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Světlá místa"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Křivky"</string>
     <string name="vignette" msgid="934721068851885390">"Viněta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinětace"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Expozice"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Sytost"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Pokles"</string>
     <string name="redeye" msgid="4508883127049472069">"Červené oči"</string>
-    <string name="imageDraw" msgid="6918552177844486656">"Kresby"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Kreslit"</string>
     <string name="straighten" msgid="26025591664983528">"Vyrovnat"</string>
-    <string name="crop" msgid="5781263790107850771">"Oříznutí"</string>
+    <string name="crop" msgid="5781263790107850771">"Oříznout"</string>
     <string name="rotate" msgid="2796802553793795371">"Otočit"</string>
     <string name="mirror" msgid="5482518108154883096">"Zrcadlit"</string>
     <string name="negative" msgid="6998313764388022201">"Negativ"</string>
     <string name="none" msgid="6633966646410296520">"Žádný"</string>
     <string name="edge" msgid="7036064886242147551">"Hrany"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Poster."</string>
     <string name="downsample" msgid="3552938534146980104">"Zmenšit"</string>
+    <string name="grad" msgid="546774853424848655">"Stupňování"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Jas"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Sytost"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Hlavní"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Červená"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Žlutá"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zelená"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Tyrkysová"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Modrá"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Purpurová"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Styl"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nová"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Červená"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Zelená"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Modrá"</string>
     <string name="draw_style" msgid="2036125061987325389">"Styl"</string>
     <string name="draw_size" msgid="4360005386104151209">"Velikost"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Odstín"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Sytost"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Jas"</string>
     <string name="draw_color" msgid="2119030386987211193">"Barva"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Čáry"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Zvýrazňovač"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Cákance"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Vymazat"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Tloušťka"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Velikost rohu"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Barva"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Vymazat"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Zvolit vlastní barvu"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Vyberte barvu"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Vyberte velikost"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Původní"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Výsledek"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Ukládání fotky"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Zpracování..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Uložit aktuální předvolbu"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Spravovat předvolby"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nová předvolba"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Přednastavit název"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informace"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Název fotky"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Velik. fotky"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Údaje EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Předvolba"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Verze"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Původní"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Aktuální"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Clona"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Ohnisková vzdálenost"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Vzdálenost objektu"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Datum pořízení"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Clonové číslo"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Expoziční čas"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autorská práva"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b6265cc..83e427a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -45,7 +45,7 @@
     <string name="select_item" msgid="2816923896202086390">"Vybrat položku"</string>
     <string name="select_album" msgid="1557063764849434077">"Vybrat album"</string>
     <string name="select_group" msgid="6744208543323307114">"Vybrat skupinu"</string>
-    <string name="set_image" msgid="2331476809308010401">"Nastavit fotografii jako"</string>
+    <string name="set_image" msgid="2331476809308010401">"Nastavit fotku jako"</string>
     <string name="set_wallpaper" msgid="8491121226190175017">"Nastavit tapetu"</string>
     <string name="wallpaper" msgid="140165383777262070">"Nastavování tapety..."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Tapeta"</string>
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Otočit doprava"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Položku nelze najít."</string>
     <string name="edit" msgid="1502273844748580847">"Upravit"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Jednoduchá úprava"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Zpracování požadavků na uložení do mezipaměti"</string>
     <string name="caching_label" msgid="4521059045896269095">"Ukládání do mezipaměti..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Oříznout"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Nelze se připojit k fotoaparátu."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Fotoaparát byl z důvodu zásad zabezpečení deaktivován."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparát"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="wait" msgid="8600187532323801552">"Čekejte prosím..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Před použitím fotoaparátu připojte úložiště USB."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Před použitím fotoaparátu prosím vložte SD kartu."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Zadní"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Přední"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Úložiště"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"POLOHA"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Časovač odpočítávání"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 s"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavení fotoaparátu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavení videokamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Velikost fotografií"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixelů"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpx"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 Mpx"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Mpx"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Mpx (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 Mpx"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 Mpx"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Nekonečno"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"NEKONEČNO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Režim blesku"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"REŽIM BLESKU"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automaticky"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Zapnout"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Vypnout"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMATICKÝ BLESK"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BLESK ZAPNUTÝ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"BLESK VYPNUTÝ"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Vyvážení bílé"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"VYVÁŽENÍ BÍLÉ"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automaticky"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Žárovka"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Denní světlo"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Zářivka"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Zataženo"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ŽÁROVKA"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DENNÍ SVĚTLO"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ZÁŘIVKA"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ZATAŽENO"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scénický režim"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automaticky"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Západ slunce"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Párty"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"ŽÁDNÉ"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"AKCE"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOC"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ZÁPAD SLUNCE"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"VEČÍREK"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ČASOVAČ ODPOČÍTÁVÁNÍ"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ČASOVAČ VYPNUT"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUNDA"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDY"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUND"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUND"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Tuto možnost nelze ve scénickém režimu vybrat."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Expozice"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOZICE"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"PŘEDNÍ FOTOAPARÁT"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"ZADNÍ FOTOAPARÁT"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"V úložišti USB je málo místa. Změňte nastavení kvality nebo smažte některé fotografie či jiné soubory."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na kartě SD je málo místa. Změňte nastavení kvality nebo smažte některé obrázky či jiné soubory."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Ve vesmíru"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Západ slunce"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Vaše video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Položte zařízení."\n"Vystupte na chvíli ze zorného pole."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Položte zařízení.\nVystupte na chvíli ze zorného pole."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Dotykem v průběhu nahrávání pořídíte snímek."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Záznam videa byl zahájen."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Záznam videa byl zastaven."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Přepnout na video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Přepnout do panoramatického režimu"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Přepnout do nového panoramatického režimu"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Přepnout do režimu opětovného zaostření"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Zrušit"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Hotovo"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Pořídit další"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Přehrát video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pozastavit video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Znovu načíst video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Časová lišta přehrávače videa"</string>
     <string name="capital_on" msgid="5491353494964003567">"ZAPNUTO"</string>
     <string name="capital_off" msgid="7231052688467970897">"VYPNUTO"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Vypnuto"</string>
@@ -376,9 +413,9 @@
     <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 hodin"</string>
     <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 hodin"</string>
     <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 hodin"</string>
-    <string name="time_lapse_seconds" msgid="2105521458391118041">"sekundy"</string>
-    <string name="time_lapse_minutes" msgid="7738520349259013762">"minuty"</string>
-    <string name="time_lapse_hours" msgid="1776453661704997476">"hodiny"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"s"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"min"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"hod"</string>
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Hotovo"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Nastavit časový interval"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"Funkce časosběr je vypnutá. Zapněte ji a nastavte časový interval."</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Nastavit dobu v sekundách"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Odpočítávání spouště fotoaparátu"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Pamatovat, kde byly fotky pořízeny?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Přidejte do fotek a videí označení míst, kde jste je pořídili."\n\n"Ostatní aplikace budou mít k těmto informacím přístup společně s přístupem k uloženým obrázkům."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Přidejte do fotek a videí označení míst, kde jste je pořídili.\n\nOstatní aplikace budou mít k těmto informacím přístup společně s přístupem k uloženým obrázkům."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Ne, děkuji"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ano"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Fotoaparát"</string>
     <string name="menu_search" msgid="7580008232297437190">"Hledat"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotky"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Alba"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"DALŠÍ MOŽNOSTI"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"NASTAVENÍ"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d fotka"</item>
     <item quantity="other" msgid="3813306834113858135">"Fotky: %1$d"</item>
diff --git a/res/values-da/filtershow_strings.xml b/res/values-da/filtershow_strings.xml
index c120489..62094f8 100644
--- a/res/values-da/filtershow_strings.xml
+++ b/res/values-da/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Fotoredigeringsværktøj"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Billedet kan ikke indlæses."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Originalen kan ikke redigeres"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Angiver baggrund"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Kunne ikke downloade billede. Netværk utilgængeligt."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Rammer"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Tilpasset"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Fortryd"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Annuller fortryd"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Vis historik"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Skjul historik"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Vis billedtilstand"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Skjul billedtilstand"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Vis anvendte effekter"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Skjul anvendte effekter"</string>
+    <string name="export_image" msgid="3202835713172222134">"Eksportér"</string>
+    <string name="print_image" msgid="1942989216591621413">"Udskriv"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Eksportér fladt billede"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Det eksporterede billede vil være en kopi uden historik."</string>
+    <string name="quality" msgid="179292110309050529">"Kvalitet"</string>
+    <string name="size" msgid="4639404642236356037">"Størrelse"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Indstillinger"</string>
     <string name="unsaved" msgid="8704442449002374375">"Der er ændringer på dette billede, som ikke er gemt."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Vil du gemme, før du afslutter?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Gem og afslut"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Behandler billede i fuld opløsning..."</string>
     <string name="exit" msgid="242642957038770113">"Afslut"</string>
     <string name="history" msgid="455767361472692409">"Historik"</string>
     <string name="reset" msgid="9013181350779592937">"Nulstil"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Fremhævninger"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Kurver"</string>
     <string name="vignette" msgid="934721068851885390">"Vignet"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignet"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Eksponering"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Mætning"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Udfald"</string>
     <string name="redeye" msgid="4508883127049472069">"Røde øjne"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Tegn"</string>
     <string name="straighten" msgid="26025591664983528">"Ret op"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativ"</string>
     <string name="none" msgid="6633966646410296520">"Ingen"</string>
     <string name="edge" msgid="7036064886242147551">"Kanter"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterisering"</string>
     <string name="downsample" msgid="3552938534146980104">"Reducer"</string>
+    <string name="grad" msgid="546774853424848655">"Inddelt"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Lysstyrke"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Mætning"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Hoved"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rød"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Gul"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Grøn"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blå"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ny"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rød"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Grøn"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Blå"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
     <string name="draw_size" msgid="4360005386104151209">"Størrelse"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Farvetone"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Mætning"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Lysstyrke"</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_marker" msgid="8468302322165644292">"Stænk"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Ryd"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Tykkelse"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Hjørnestr."</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Farve"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Ryd"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Vælg tilpasset farve"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Vælg farve"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Vælg størrelse"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Gemmer billedet"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Behandler..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Gem aktuel forudindstilling"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Administrer brugerforudindstil."</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Ny forudindstilling"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Forudindstillet navn"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Oplysninger"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Billednavn"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Billedstørrelse"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-data"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Forindstilling"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Version"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Aktuel"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Blænde"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Fokuslængde"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Motivafstand"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Oprettelsesdato"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Eksponeringstid"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Ophavsret"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c325b81..19cdf6a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Roter til højre"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Elementet blev ikke fundet."</string>
     <string name="edit" msgid="1502273844748580847">"Rediger"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Simpel redigering"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Håndterer anmodninger om cachelagring"</string>
     <string name="caching_label" msgid="4521059045896269095">"Cachelagrer..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Beskær"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Der kan ikke oprettes forbindelse til kameraet."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kameraet er deaktiveret på grund af sikkerhedspolitikker."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="wait" msgid="8600187532323801552">"Vent..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Isæt USB-lager, før du tager kameraet i brug."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Indsæt et SD-kort, før kameraet tages i brug."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Bagest"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Forrest"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Gem placering"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"PLACERING"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Nedtællingsur"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for pref_camera_timer_entry:other (6455381617076792481) -->
@@ -249,10 +250,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Indstillinger for kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Indstillinger for videokamera"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Billedstørrelse"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M pixels"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixel"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M pixels"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M pixels (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -261,16 +265,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatisk"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Uendelighed"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMATISK"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"UENDELIGT"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Blitztilstand"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"BLITZTILSTAND"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatisk"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Til"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Fra"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMATISK BLITZ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BLITZ TIL"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"BLITZ FRA"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Hvidbalance"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"HVIDBALANCE"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatisk"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Blødt lys"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Dagslys"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Hårdt lys"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Overskyet"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMATISK"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"BLØDT LYS"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DAGSLYS"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"HÅRDT LYS"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"OVERSKYET"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scenetilstand"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatisk"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -278,10 +295,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nat"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fest"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"INGEN"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"HANDLING"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NAT"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"SOLNEDGANG"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FEST"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"NEDTÆLLINGSUR"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"SLÅ NEDTÆLLINGSUR FRA"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUND"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDER"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUNDER"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUNDER"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Kan ikke vælges i motivtilstand."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EKSPONERING"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"FRONTKAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"BAGSIDEKAMERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Der er snart ikke mere plads i USB-lager. Rediger indstillingerne for kvalitet, eller slet nogle billeder eller andre filer."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Der er snart ikke mere plads på dit SD-kort. Rediger indstillingerne for kvalitet, eller slet nogle billeder eller andre filer."</string>
@@ -306,7 +338,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"I rummet"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgang"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Din video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Læg din enhed ned."\n"Træd ud af syne et øjeblik."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Læg din enhed ned.\nTræd ud af syne et øjeblik."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Tryk for at tage et foto, mens du optager."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Videooptagelsen er startet."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Videooptagelsen er stoppet."</string>
@@ -329,9 +361,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Skift til video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Skift til panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Skift til nyt panorama"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Skift til Fokusér"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Annullering af gennemgang"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Gennemgang fuldført"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Lav foto/video til anmeldelsen om"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Afspil video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Sæt video på pause"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Genindlæs video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Tidsbjælke til videoafspiller"</string>
     <string name="capital_on" msgid="5491353494964003567">"TIL"</string>
     <string name="capital_off" msgid="7231052688467970897">"FRA"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Fra"</string>
@@ -383,14 +420,16 @@
     <string name="set_timer_help" msgid="5007708849404589472">"Nedtællingsur er slukket. Slå den til at tælle ned, før du tager et billede."</string>
     <string name="set_duration" msgid="5578035312407161304">"Indstil varigheden i sekunder"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Tælle ned for at tage et foto"</string>
-    <string name="remember_location_title" msgid="9060472929006917810">"Skal fotosteder huskes?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Tag dine fotos og videoer med de placeringer, hvor de blev taget."\n\n"Andre apps kan få adgang til disse oplysninger sammen med dine gemte billeder."</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Husk, hvor fotoet er fra?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Mærk dine billeder og videoer med de placeringer, hvor de blev taget.\n\nAndre apps kan få adgang til disse oplysninger sammen med dine gemte billeder."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nej tak"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ja"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Søg"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotos"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albummer"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"FLERE VALGMULIGHEDER"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"INDSTILLINGER"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d billede"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d billeder"</item>
diff --git a/res/values-de/filtershow_strings.xml b/res/values-de/filtershow_strings.xml
index 037abc2..aae3291 100644
--- a/res/values-de/filtershow_strings.xml
+++ b/res/values-de/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Fotoeditor"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Bild kann nicht geladen werden."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Original kann nicht bearbeitet werden."</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Hintergrund wird festgelegt..."</string>
+    <string name="download_failure" msgid="5923323939788582895">"Foto konnte nicht heruntergeladen werden. Netzwerk ist nicht verfügbar."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Rahmen"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Benutzerdefiniert"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Rückgängig machen"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Wiederholen"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Verlauf anzeigen"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Verlauf ausblenden"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Bildstatus anzeigen"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Bildstatus ausblenden"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Angewendete Effekte anzeigen"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Angewendete Effekte ausblenden"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportieren"</string>
+    <string name="print_image" msgid="1942989216591621413">"Drucken"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Abgeflachtes Bild exportieren"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Das exportierte Bild wird als Kopie gespeichert und beinhaltet keinen Verlauf."</string>
+    <string name="quality" msgid="179292110309050529">"Qualität"</string>
+    <string name="size" msgid="4639404642236356037">"Größe"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Einstellungen"</string>
     <string name="unsaved" msgid="8704442449002374375">"Dieses Bild weist nicht gespeicherte Änderungen auf."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Möchten Sie vor dem Schließen speichern?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Speichern und schließen"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Bild mit hoher Auflösung wird verarbeitet..."</string>
     <string name="exit" msgid="242642957038770113">"Schließen"</string>
     <string name="history" msgid="455767361472692409">"Verlauf"</string>
     <string name="reset" msgid="9013181350779592937">"Zurücksetzen"</string>
@@ -63,10 +72,15 @@
     <string name="bwfilter" msgid="8927492494576933793">"SW-Filter"</string>
     <string name="wbalance" msgid="6346581563387083613">"Autom. Farbe"</string>
     <string name="hue" msgid="6231252147971086030">"Farbton"</string>
-    <string name="shadow_recovery" msgid="3928572915300287152">"Schatten"</string>
-    <string name="highlight_recovery" msgid="8262208470735204243">"Highlights"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Tiefen"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Lichter"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Kurven"</string>
     <string name="vignette" msgid="934721068851885390">"Vignettierung"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignettierung"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Belichtung"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Sättigung"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Lichtabfall"</string>
     <string name="redeye" msgid="4508883127049472069">"Rote Augen"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Zeichnen"</string>
     <string name="straighten" msgid="26025591664983528">"Ausrichten"</string>
@@ -74,23 +88,69 @@
     <string name="rotate" msgid="2796802553793795371">"Drehen"</string>
     <string name="mirror" msgid="5482518108154883096">"Spiegeln"</string>
     <string name="negative" msgid="6998313764388022201">"Negativ"</string>
-    <string name="none" msgid="6633966646410296520">"Keines"</string>
+    <string name="none" msgid="6633966646410296520">"Kein Filter"</string>
     <string name="edge" msgid="7036064886242147551">"Kanten"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Tontrennung"</string>
     <string name="downsample" msgid="3552938534146980104">"Verkleinern"</string>
+    <string name="grad" msgid="546774853424848655">"Abgestuft"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Helligkeit"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Sättigung"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Hauptoption"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rot"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Gelb"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Grün"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Blaugrün"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blau"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"Neu"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rot"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Grün"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Blau"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
     <string name="draw_size" msgid="4360005386104151209">"Größe"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Farbton"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Sättigung"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Helligkeit"</string>
     <string name="draw_color" msgid="2119030386987211193">"Farbe"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linien"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Filzstift"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spritzer"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Löschen"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Randstärke"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Eckengröße"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Farbe"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Löschen"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Benutzerdefinierte Farbe wählen"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Farbe auswählen"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Größe auswählen"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Ergebnis"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Bild wird gespeichert..."</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Wird verarbeitet..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Diese Voreinstellung speichern"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Voreinstellungen verwalten"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Neue Voreinstellung"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Name der Voreinstellung"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informationen"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Bildname"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Bildgröße"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogramm"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-Daten"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Voreinstellung"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Version"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Aktuell"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modell"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Blende"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Brennweite"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Motivdistanz"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Aufnahmedatum"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Blendenzahl"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Belichtungszeit"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Urheberrecht"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e052719..46903f1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -65,7 +65,7 @@
     <string name="deselect_all" msgid="5758897506061723684">"Auswahl für alle aufheben"</string>
     <string name="slideshow" msgid="4355906903247112975">"Diashow"</string>
     <string name="details" msgid="8415120088556445230">"Details"</string>
-    <string name="details_title" msgid="2611396603977441273">"%1$d von %2$d Elementen:"</string>
+    <string name="details_title" msgid="2611396603977441273">"Element %1$d von %2$d:"</string>
     <string name="close" msgid="5585646033158453043">"Schließen"</string>
     <string name="switch_to_camera" msgid="7280111806675169992">"Zu Kamera wechseln"</string>
   <plurals name="number_of_items_selected">
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Nach rechts drehen"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Bild wurde nicht gefunden."</string>
     <string name="edit" msgid="1502273844748580847">"Bearbeiten"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Einfache Bearbeitung"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Caching-Anfragen werden verarbeitet."</string>
     <string name="caching_label" msgid="4521059045896269095">"Caching läuft..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Zuschneiden"</string>
@@ -118,7 +119,7 @@
     <string name="make_available_offline" msgid="5157950985488297112">"Offline bereitstellen"</string>
     <string name="sync_picasa_albums" msgid="8522572542111169872">"Aktualisieren"</string>
     <string name="done" msgid="217672440064436595">"Fertig"</string>
-    <string name="sequence_in_set" msgid="7235465319919457488">"%1$d von %2$d Elementen:"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"Element %1$d von %2$d:"</string>
     <string name="title" msgid="7622928349908052569">"Titel"</string>
     <string name="description" msgid="3016729318096557520">"Beschreibung"</string>
     <string name="time" msgid="1367953006052876956">"Uhrzeit"</string>
@@ -136,7 +137,7 @@
     <string name="aperture" msgid="5920657630303915195">"Blende"</string>
     <string name="focal_length" msgid="1291383769749877010">"Brennweite"</string>
     <string name="white_balance" msgid="1582509289994216078">"Weißabgleich"</string>
-    <string name="exposure_time" msgid="3990163680281058826">"Einblendungsdauer"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Belichtungszeit"</string>
     <string name="iso" msgid="5028296664327335940">"ISO"</string>
     <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
     <string name="manual" msgid="6608905477477607865">"Manuell"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Keine Verbindung zur Kamera möglich"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Die Kamera wurde aufgrund von Sicherheitsrichtlinien deaktiviert."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
     <string name="wait" msgid="8600187532323801552">"Bitte warten..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Stellen Sie vor Verwendung der Kamera einen USB-Speicher bereit."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Legen Sie vor Verwendung der Kamera eine SD-Karte ein."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Rückseite"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Vorderseite"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Ort speichern"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"Standort"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Countdown-Timer"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 Sekunde"</item>
@@ -251,28 +252,44 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameraeinstellungen"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcordereinstellungen"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildgröße"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 Megapixel"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 Megapixel"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 MP"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 MP"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 MP (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 MP"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
     <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokussierungsmodus"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatisch"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Unendlich"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"Automatisch"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"Unendlich"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"Makro"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Blitzmodus"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"Blitzmodus"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatisch"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"An"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Aus"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"Automatischer Blitz"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"Blitz an"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"Blitz aus"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Weißabgleich"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"Weißabgleich"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatisch"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Glühlampenlicht"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Tageslicht"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Neonlicht"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Bewölkt"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"Automatisch"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"Glühlampenlicht"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"Tageslicht"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"Neonlicht"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"Bewölkt"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Szenenmodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatisch"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nachtaufnahme"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sonnenuntergang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Party"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"Kein"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"Aktion"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"Nachts"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"Sonnenuntergang"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"Party"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"Countdown-Timer"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"Timer deaktiviert"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 Sekunde"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 Sekunden"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 Sekunden"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 Sekunden"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Diese Einstellung kann im Szenenmodus nicht ausgewählt werden."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Belichtung"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"Belichtung"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR; High Dynamic Range"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"Frontkamera"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"Kamera auf der Rückseite"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Ihr USB-Speicher bietet nicht mehr genug Speicherplatz. Ändern Sie die Qualitätseinstellung oder löschen Sie Bilder oder andere Dateien."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Auf Ihrer SD-Karte ist nicht mehr genügend Speicherplatz vorhanden. Ändern Sie die Qualitätseinstellung oder löschen Sie Bilder oder andere Dateien."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Im All"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sonnenuntergang"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Mein Video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Legen Sie Ihr Gerät ab."\n"Treten Sie für einen kurzen Moment aus dem Aufnahmebereich."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Legen Sie Ihr Gerät ab.\nTreten Sie für einen kurzen Moment aus dem Aufnahmebereich."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Zum Erstellen eines Fotos während der Aufnahme tippen"</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Videoaufzeichnung wurde gestartet."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Videoaufzeichnung wurde beendet."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"In Video-Modus wechseln"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"In Panorama-Modus wechseln"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Zum neuen Panorama wechseln"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Zu Auswahl eines neuen Fokus wechseln"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Überprüfung abbrechen"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Überprüfung abgeschlossen"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Überprüfen – erneut aufnehmen"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Video ansehen"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Video anhalten"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Video erneut laden"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Zeitleiste des Videoplayers"</string>
     <string name="capital_on" msgid="5491353494964003567">"An"</string>
     <string name="capital_off" msgid="7231052688467970897">"Aus"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Aus"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Dauer in Sekunden festlegen"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Countdown für Fotoaufnahme"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Aufnahmeorte für Fotos speichern?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Taggen Sie Ihre Fotos und Videos mit den Standorten, an denen sie aufgenommen wurden."\n\n"Andere Apps können auf diese Informationen und Ihre gespeicherten Bilder zugreifen."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Taggen Sie Ihre Fotos und Videos mit den Standorten, an denen sie aufgenommen wurden.\n\nAndere Apps können auf diese Informationen und Ihre gespeicherten Bilder zugreifen."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nein"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ja"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Suchen"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotos"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Alben"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"Weitere Optionen"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"Einstellungen"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d Foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d Fotos"</item>
diff --git a/res/values-el/filtershow_strings.xml b/res/values-el/filtershow_strings.xml
index 76e3d2a..4ce117f 100644
--- a/res/values-el/filtershow_strings.xml
+++ b/res/values-el/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Επεξεργασία φωτογραφιών"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Δεν είναι δυνατή η φόρτωση της εικόνας!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Δεν είναι δυνατή η επεξεργασία της αρχικής μορφής"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Ορισμός ταπετσαρίας…"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Δεν ήταν δυνατή η λήψη φωτογραφιών. Το δίκτυο δεν είναι διαθέσιμο."</string>
     <string name="original" msgid="3524493791230430897">"Αρχική"</string>
     <string name="borders" msgid="2067345080568684614">"Σύνορα"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Προσαρμοσμένο"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Αναίρεση"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Επανάληψη"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Εμφάνιση ιστορικού"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Απόκρυψη ιστορικού"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Εμφ.κατάστ.εικόνας"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Απόκρ.κατάστ.εικόνας"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Εμφάνιση εφαρμοσμένων εφέ"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Απόκρυψη εφαρμοσμένων εφέ"</string>
+    <string name="export_image" msgid="3202835713172222134">"Εξαγωγή"</string>
+    <string name="print_image" msgid="1942989216591621413">"Εκτύπωση"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Εξαγωγή πεπλατυσμένης εικόνας"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Η εξαγόμενη εικόνα θα αποτελεί ένα αντίγραφο, χωρίς το ιστορικό."</string>
+    <string name="quality" msgid="179292110309050529">"Ποιότητα"</string>
+    <string name="size" msgid="4639404642236356037">"Μέγεθος"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Ρυθμίσεις"</string>
     <string name="unsaved" msgid="8704442449002374375">"Υπάρχουν μη αποθηκευμένες αλλαγές σε αυτήν την εικόνα."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Θέλετε να γίνει αποθήκευση πριν από την έξοδο;"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Αποθήκευση και έξοδος"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Επεξεργασία εικόνας πλήρους ανάλυσης…"</string>
     <string name="exit" msgid="242642957038770113">"Έξοδος"</string>
     <string name="history" msgid="455767361472692409">"Ιστορικό"</string>
     <string name="reset" msgid="9013181350779592937">"Επαναφορά"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Φωτεινά σημεία"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Καμπύλες"</string>
     <string name="vignette" msgid="934721068851885390">"Βινιετάρισμα"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Βινιετάρισμα"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Έκθεση"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Κορεσμός"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Αντίθεση"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Μείωση"</string>
     <string name="redeye" msgid="4508883127049472069">"Κόκκινα μάτια"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Σχεδίαση"</string>
     <string name="straighten" msgid="26025591664983528">"Ευθυγράμμιση"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Αρνητικό"</string>
     <string name="none" msgid="6633966646410296520">"Κανένα"</string>
     <string name="edge" msgid="7036064886242147551">"Άκρες"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Ποστεροποίηση"</string>
     <string name="downsample" msgid="3552938534146980104">"Σμίκρυνση"</string>
+    <string name="grad" msgid="546774853424848655">"Διαβαθμισμένη"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Φωτεινότητα"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Αντίθεση"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Κορεσμός"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Κύριος"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Κόκκινο"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Κίτρινο"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Πράσινο"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Κυανό"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Μπλε"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Πορφυρό"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Στυλ"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"νέο"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Κόκκινο"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Πράσινο"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Μπλε"</string>
     <string name="draw_style" msgid="2036125061987325389">"Στυλ"</string>
     <string name="draw_size" msgid="4360005386104151209">"Μέγεθος"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Απόχρωση"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Κορεσμός"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Φωτεινότητα"</string>
     <string name="draw_color" msgid="2119030386987211193">"Χρώμα"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Γραμμές"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Μαρκαδόρος"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Πιτσιλιές"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Διαγραφή"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Πάχος"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Μέγεθος γωνίας"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Χρώμα"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Διαγραφή"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Επιλογή προσαρμ.χρώματος"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Επιλογή χρώματος"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Επιλογή μεγέθους"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"ΟΚ"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Αρχική"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Αποτέλεσμα"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Αποθήκευση εικόνας"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Επεξεργασία…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Αποθήκευση τρέχ.προεπιλογής"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Διαχείριση προεπιλογών χρηστών"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Νέα προεπιλογή"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Προεπιλεγμένο όνομα"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Πληροφορίες"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Όνομα εικόνας"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Μέγεθος εικόνας"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Ιστόγραμμα"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Δεδομένα  EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Προεπιλογές"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Έκδοση"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Πρωτότυπη"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Τρέχουσα"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Μοντέλο"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Διάφραγμα"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Μήκος εστίασης"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Απόσταση θέματος"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Ημερομηνία λήψης"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Διακοπή F"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Χρόνος έκθεσης"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Πνευματικά δικαιώματα"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 98d425b..52f5b43 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Δεξιά περιστροφή"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Δεν ήταν δυνατή η εύρεση."</string>
     <string name="edit" msgid="1502273844748580847">"Επεξεργασία"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Απλή επεξεργασία"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Επεξεργασία αιτημάτων προσωρινής αποθήκευσης"</string>
     <string name="caching_label" msgid="4521059045896269095">"Προσωρ. αποθ..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Περικοπή"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Δεν είναι δυνατή η σύνδεση με τη φωτογραφική μηχανή."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Η φωτογραφική μηχανή έχει απενεργοποιηθεί λόγω των πολιτικών ασφαλείας."</string>
     <string name="camera_label" msgid="6346560772074764302">"Φωτογ.μηχανή"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Βιντεοκάμ."</string>
     <string name="wait" msgid="8600187532323801552">"Περιμένετε..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Προσαρτήστε τον χώρο αποθήκευσης USB προτού κάνετε χρήση της φωτογραφικής μηχανής."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Εισαγάγετε κάρτα SD πριν χρησιμοποιήσετε τη φωτογραφική μηχανή."</string>
@@ -233,7 +233,8 @@
     <string name="pref_camera_id_title" msgid="4040791582294635851">"Επιλογή φωτ. μηχανής"</string>
     <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>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Τοποθεσία αποθήκευσης"</string>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ρυθμίσεις βιντεοκάμερας"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Μέγεθος εικόνας"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M εικονοστ."</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M εικονοστ."</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M εικονοστ."</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M εικονοστ."</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M εικονοστ."</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M  εικονοστ."</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M εικον.(16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M εικονοστ."</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M εικονοστ."</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,27 +267,55 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Αυτόματο"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Άπειρο"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Απόσταση"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ΑΥΤΟΜΑΤΟ"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"ΑΠΕΙΡΟ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"ΜΑΚΡΟΦΩΤΟΓΡΑΦΙΑ"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Λειτουργία Flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"ΛΕΙΤΟΥΡΓΙΑ ΦΛΑΣ"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Αυτόματο"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Ενεργοποιημένο"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΟ"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"ΑΥΤΟΜΑΤΟ ΦΛΑΣ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"ΕΝΕΡΓΟΠΟΙΗΣΗ ΦΛΑΣ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ ΦΛΑΣ"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Ισορροπία λευκού"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"ΙΣΟΡΡΟΠΙΑ ΛΕΥΚΟΥ"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Αυτόματο"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Λαμπτήρας πυρακτώσεως"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Φως ημέρας"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Λαμπτήρας φθορισμού"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Συννεφιά"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ΑΥΤΟΜΑΤΟ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ΛΑΜΠΤΗΡΑΣ ΠΥΡΑΚΤΩΣΕΩΣ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ΦΩΣ ΗΜΕΡΑΣ"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ΛΑΜΠΤΗΡΑΣ ΦΘΟΡΙΣΜΟΥ"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ΣΥΝΝΕΦΙΑ"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Λειτουργία σκηνής"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Αυτόματο"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Ενέργεια"</string>
     <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>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Πάρτυ"</string>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Ο διαθέσιμος χώρος USB είναι ελάχιστος. Αλλάξτε τη ρύθμιση της ποιότητας ή διαγράψτε κάποιες εικόνες ή άλλα αρχεία."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Ο διαθέσιμος χώρος στην κάρτα SD είναι ελάχιστος. Αλλάξτε τη ρύθμιση ποιότητας ή διαγράψτε κάποιες εικόνες ή άλλα αρχεία."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Στο διάστημα"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Δύση ηλίου"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Το βίντεό σας"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Αφήστε τη συσκευή σας κάτω"\n"Απομακρυνθείτε για λίγο από την εμβέλειά της."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Αφήστε τη συσκευή σας κάτω\nΑπομακρυνθείτε για λίγο από την εμβέλειά της."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Αγγίξτε για λήψη φωτογραφίας κατά την εγγραφή."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Έχει ξεκινήσει η εγγραφή βίντεο."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Έχει διακοπεί η εγγραφή βίντεο."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Μετάβαση σε λειτουργία βίντεο"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Μετάβαση σε πανόραμα"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Μετάβαση σε νέο πανόραμα"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Εναλλαγή στην επανεστίαση"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Ακύρωση αναθεώρησης"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Ολοκλήρωση αναθεώρησης"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Έλεγχος νέας λήψης"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Αναπαραγωγή βίντεο"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Παύση βίντεο"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Επανάληψη φόρτωσης βίντεο"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Γραμμή χρόνου προγράμματος αναπαραγωγής βίντεο"</string>
     <string name="capital_on" msgid="5491353494964003567">"ΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
     <string name="capital_off" msgid="7231052688467970897">"ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Απενεργοποιημένη"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Ορισμός διάρκειας σε δευτερόλεπτα"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Αντίστροφη μέτρηση για λήψη φωτογραφίας"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Απομνημόνευση τοποθεσίας φωτογραφιών;"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Προσθέστε ετικέτες στις φωτογραφίες και τα βίντεό σας με την τοποθεσία στην οποία έχουν τραβηχτεί."\n\n"Οι άλλες εφαρμογές μπορούν να αποκτήσουν πρόσβαση σε αυτές τις πληροφορίες μαζί με τις αποθηκευμένες σας εικόνες."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Προσθέστε ετικέτες στις φωτογραφίες και τα βίντεό σας με την τοποθεσία στην οποία έχουν τραβηχτεί.\n\nΟι άλλες εφαρμογές μπορούν να αποκτήσουν πρόσβαση σε αυτές τις πληροφορίες μαζί με τις αποθηκευμένες σας εικόνες."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Όχι ευχαριστώ"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ναι"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Κάμερα"</string>
     <string name="menu_search" msgid="7580008232297437190">"Αναζήτηση"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Φωτογραφίες"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Λεύκωμα"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ΠΕΡΙΣΣΟΤΕΡΕΣ ΕΠΙΛΟΓΕΣ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ΡΥΘΜΙΣΕΙΣ"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d φωτογραφία"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d φωτογραφ."</item>
diff --git a/res/values-en-rGB/filtershow_strings.xml b/res/values-en-rGB/filtershow_strings.xml
index be9a85f..bd076f4 100644
--- a/res/values-en-rGB/filtershow_strings.xml
+++ b/res/values-en-rGB/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Photo Editor"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Cannot load the image!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Cannot edit original"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Setting wallpaper"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Could not download photo. Network unavailable."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Borders"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Customise"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Undo"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Redo"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Show history"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Hide history"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Show Image State"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Hide Image State"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Show Applied Effects"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Hide Applied Effects"</string>
+    <string name="export_image" msgid="3202835713172222134">"Export"</string>
+    <string name="print_image" msgid="1942989216591621413">"Print"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Export Flattened Image"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"The exported image will be a copy, without the history."</string>
+    <string name="quality" msgid="179292110309050529">"Quality"</string>
+    <string name="size" msgid="4639404642236356037">"Size"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Settings"</string>
     <string name="unsaved" msgid="8704442449002374375">"There are unsaved changes to this image."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Do you want to save before exiting?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Save and Exit"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Processing full resolution image..."</string>
     <string name="exit" msgid="242642957038770113">"Exit"</string>
     <string name="history" msgid="455767361472692409">"History"</string>
     <string name="reset" msgid="9013181350779592937">"Reset"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Highlights"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Curves"</string>
     <string name="vignette" msgid="934721068851885390">"Vignette"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignette"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposure"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturation"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Falloff"</string>
     <string name="redeye" msgid="4508883127049472069">"Red Eye"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Draw"</string>
     <string name="straighten" msgid="26025591664983528">"Straighten"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negative"</string>
     <string name="none" msgid="6633966646410296520">"None"</string>
     <string name="edge" msgid="7036064886242147551">"Edges"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterise"</string>
     <string name="downsample" msgid="3552938534146980104">"Downsample"</string>
+    <string name="grad" msgid="546774853424848655">"Graduated"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Brightness"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturation"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Main"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Red"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Yellow"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Green"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blue"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Style"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"new"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Red"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Green"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Blue"</string>
     <string name="draw_style" msgid="2036125061987325389">"Style"</string>
     <string name="draw_size" msgid="4360005386104151209">"Size"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Hue"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturation"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Brightness"</string>
     <string name="draw_color" msgid="2119030386987211193">"Colour"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Lines"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spatter"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Clear"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Thickness"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Corner Size"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Colour"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Clear"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Choose custom colour"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Select Colour"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Select Size"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Result"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Saving Image"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Processing..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Save current preset"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Manage user presets"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"New Preset"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Preset Name"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Information"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Image Name"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Image Size"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF Data"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Preset"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Version"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Current"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Aperture"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Focal Length"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Subject Distance"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Date taken"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Exposure Time"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Copyright"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 788d170..79f8742 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Rotate right"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Couldn\'t find item."</string>
     <string name="edit" msgid="1502273844748580847">"Edit"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Simple Edit"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Process Caching Requests"</string>
     <string name="caching_label" msgid="4521059045896269095">"Caching..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Crop"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Can\'t connect to the camera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Camera has been disabled because of security policies."</string>
     <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
     <string name="wait" msgid="8600187532323801552">"Please wait…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Please mount USB storage before using the camera."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Insert an SD card before using the camera."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Back"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Front"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Store location"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOCATION"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Countdown timer"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 second"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera settings"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder settings"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Picture size"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixels"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 M pixels"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 M pixels"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 M pixels (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 M pixels"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinity"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITY"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flash mode"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"FLASH MODE"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Auto"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"On"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Off"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTO"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ON"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH OFF"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"White balance"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"WHITE BALANCE"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Auto"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescent"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Daylight"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescent"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Cloudy"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENT"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DAYLIGHT"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENT"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"CLOUDY"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scene mode"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Night"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sunset"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Party"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NONE"</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>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"COUNTDOWN TIMER"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TIMER OFF"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SECOND"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SECONDS"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SECONDS"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SECONDS"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Not selectable in scene mode."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposure"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOSURE"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"FRONT CAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"BACK CAMERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Your USB storage is running out of space. Change the quality setting or delete some images or other files."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Your SD card is running out of space. Change the quality setting or delete some images or other files."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"In space"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sunset"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Your video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Set your device down."\n"Move out of view for a moment."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Set your device down.\nMove out of view for a moment."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Touch to take photo while recording."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Video recording has started."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Video recording has stopped."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Switch to video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Switch to panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Switch to new panorama"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Switch to Refocus"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Review cancel"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Review done"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Review retake"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Play video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pause video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Reload video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Video player time bar"</string>
     <string name="capital_on" msgid="5491353494964003567">"ON"</string>
     <string name="capital_off" msgid="7231052688467970897">"OFF"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Off"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Set duration in seconds"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Counting down to take a photo"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Remember photo locations?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Tag your photos and videos with the locations where they are taken."\n\n"Other apps can access this information along with your saved images."</string>
-    <string name="remember_location_no" msgid="7541394381714894896">"No thanks"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"No, thanks"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Yes"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Camera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Search"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Photos"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albums"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"More options"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"SETTINGS"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d photo"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d photos"</item>
diff --git a/res/values-en-rIN/filtershow_strings.xml b/res/values-en-rIN/filtershow_strings.xml
new file mode 100644
index 0000000..bd076f4
--- /dev/null
+++ b/res/values-en-rIN/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Photo Editor"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Cannot load the image!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Cannot edit original"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Setting wallpaper"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Could not download photo. Network unavailable."</string>
+    <string name="original" msgid="3524493791230430897">"Original"</string>
+    <string name="borders" msgid="2067345080568684614">"Borders"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Customise"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Undo"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Redo"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Show Applied Effects"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Hide Applied Effects"</string>
+    <string name="export_image" msgid="3202835713172222134">"Export"</string>
+    <string name="print_image" msgid="1942989216591621413">"Print"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Export Flattened Image"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"The exported image will be a copy, without the history."</string>
+    <string name="quality" msgid="179292110309050529">"Quality"</string>
+    <string name="size" msgid="4639404642236356037">"Size"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Settings"</string>
+    <string name="unsaved" msgid="8704442449002374375">"There are unsaved changes to this image."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Do you want to save before exiting?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Save and Exit"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Processing full resolution image..."</string>
+    <string name="exit" msgid="242642957038770113">"Exit"</string>
+    <string name="history" msgid="455767361472692409">"History"</string>
+    <string name="reset" msgid="9013181350779592937">"Reset"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Applied Effects"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Compare"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Apply"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Reset"</string>
+    <string name="aspect" msgid="4025244950820813059">"Aspect"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1, 1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"None"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Fixed"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Tiny Planet"</string>
+    <string name="exposure" msgid="6526397045949374905">"Exposure"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Sharpness"</string>
+    <string name="contrast" msgid="2310908487756769019">"Contrast"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Vibrancy"</string>
+    <string name="saturation" msgid="7026791551032438585">"Saturation"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"BW Filter"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Autocolour"</string>
+    <string name="hue" msgid="6231252147971086030">"Hue"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Shadows"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Highlights"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Curves"</string>
+    <string name="vignette" msgid="934721068851885390">"Vignette"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignette"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposure"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturation"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Falloff"</string>
+    <string name="redeye" msgid="4508883127049472069">"Red Eye"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Draw"</string>
+    <string name="straighten" msgid="26025591664983528">"Straighten"</string>
+    <string name="crop" msgid="5781263790107850771">"Crop"</string>
+    <string name="rotate" msgid="2796802553793795371">"Rotate"</string>
+    <string name="mirror" msgid="5482518108154883096">"Mirror"</string>
+    <string name="negative" msgid="6998313764388022201">"Negative"</string>
+    <string name="none" msgid="6633966646410296520">"None"</string>
+    <string name="edge" msgid="7036064886242147551">"Edges"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterise"</string>
+    <string name="downsample" msgid="3552938534146980104">"Downsample"</string>
+    <string name="grad" msgid="546774853424848655">"Graduated"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Brightness"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturation"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Main"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Red"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Yellow"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Green"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blue"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Style"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"new"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Red"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Green"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Blue"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Style"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Size"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Hue"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturation"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Brightness"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Colour"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Lines"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spatter"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Clear"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Thickness"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Corner Size"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Colour"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Clear"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Choose custom colour"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Select Colour"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Select Size"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Result"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Saving Image"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Processing..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Save current preset"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Manage user presets"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"New Preset"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Preset Name"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Information"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Image Name"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Image Size"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF Data"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Preset"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Version"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Current"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Aperture"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Focal Length"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Subject Distance"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Date taken"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Exposure Time"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Copyright"</string>
+</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..79f8742
--- /dev/null
+++ b/res/values-en-rIN/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Gallery"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Picture frame"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Video player"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Loading video…"</string>
+    <string name="loading_image" msgid="1200894415793838191">"Loading image…"</string>
+    <string name="loading_account" msgid="928195413034552034">"Loading account…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Resume video"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"Resume playing from %s ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Resume playing"</string>
+    <string name="loading" msgid="7038208555304563571">"Loading…"</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Couldn\'t load"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Couldn\'t load the image"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"No thumbnail"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Start again"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"OK"</string>
+    <string name="ok" msgid="5296833083983263293">"OK"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Touch a face to begin."</string>
+    <string name="saving_image" msgid="7270334453636349407">"Saving picture…"</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Saving picture to <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="save_error" msgid="6857408774183654970">"Couldn\'t save cropped image."</string>
+    <string name="crop_label" msgid="521114301871349328">"Crop picture"</string>
+    <string name="trim_label" msgid="274203231381209979">"Trim video"</string>
+    <string name="select_image" msgid="7841406150484742140">"Select photo"</string>
+    <string name="select_video" msgid="4859510992798615076">"Select video"</string>
+    <string name="select_item" msgid="2816923896202086390">"Select item"</string>
+    <string name="select_album" msgid="1557063764849434077">"Select album"</string>
+    <string name="select_group" msgid="6744208543323307114">"Select group"</string>
+    <string name="set_image" msgid="2331476809308010401">"Set picture as"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Set wallpaper"</string>
+    <string name="wallpaper" msgid="140165383777262070">"Setting wallpaper..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Wallpaper"</string>
+    <string name="delete" msgid="2839695998251824487">"Delete"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Delete selected item?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Delete selected items?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Confirm"</string>
+    <string name="cancel" msgid="3637516880917356226">"Cancel"</string>
+    <string name="share" msgid="3619042788254195341">"Share"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Share panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Share as photo"</string>
+    <string name="deleted" msgid="6795433049119073871">"Deleted"</string>
+    <string name="undo" msgid="2930873956446586313">"UNDO"</string>
+    <string name="select_all" msgid="3403283025220282175">"Select all"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Deselect all"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Slideshow"</string>
+    <string name="details" msgid="8415120088556445230">"Details"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d of %2$d items:"</string>
+    <string name="close" msgid="5585646033158453043">"Close"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Switch to camera"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d selected"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d selected"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d selected"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d selected"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d selected"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d selected"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d selected"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d selected"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d selected"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Show on map"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Rotate left"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Rotate right"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Couldn\'t find item."</string>
+    <string name="edit" msgid="1502273844748580847">"Edit"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Simple Edit"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Process Caching Requests"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Caching..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"Crop"</string>
+    <string name="trim_action" msgid="703098114452883524">"Trim"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Mute"</string>
+    <string name="set_as" msgid="3636764710790507868">"Set as"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Can\'t mute video."</string>
+    <string name="video_err" msgid="7003051631792271009">"Cannot play video"</string>
+    <string name="group_by_location" msgid="316641628989023253">"By location"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"By time"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"By tags"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"By people"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"By album"</string>
+    <string name="group_by_size" msgid="153766174950394155">"By size"</string>
+    <string name="untagged" msgid="7281481064509590402">"Untagged"</string>
+    <string name="no_location" msgid="4043624857489331676">"No location"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Some locations couldn\'t be identified due to network problems."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Couldn\'t download the photos in this album. Retry later."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Images only"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Videos only"</string>
+    <string name="show_all" msgid="6963292714584735149">"Images &amp; videos"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Photo Gallery"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"No photos."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Cropped image saved to <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"No albums available."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O images/videos available."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Posts"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Make available offline"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Refresh"</string>
+    <string name="done" msgid="217672440064436595">"Done"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%1$d of %2$d items:"</string>
+    <string name="title" msgid="7622928349908052569">"Title"</string>
+    <string name="description" msgid="3016729318096557520">"Description"</string>
+    <string name="time" msgid="1367953006052876956">"Time"</string>
+    <string name="location" msgid="3432705876921618314">"Location"</string>
+    <string name="path" msgid="4725740395885105824">"Path"</string>
+    <string name="width" msgid="9215847239714321097">"Width"</string>
+    <string name="height" msgid="3648885449443787772">"Height"</string>
+    <string name="orientation" msgid="4958327983165245513">"Orientation"</string>
+    <string name="duration" msgid="8160058911218541616">"Duration"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME type"</string>
+    <string name="file_size" msgid="8486169301588318915">"File size"</string>
+    <string name="maker" msgid="7921835498034236197">"Maker"</string>
+    <string name="model" msgid="8240207064064337366">"Model"</string>
+    <string name="flash" msgid="2816779031261147723">"Flash"</string>
+    <string name="aperture" msgid="5920657630303915195">"Aperture"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Focal Length"</string>
+    <string name="white_balance" msgid="1582509289994216078">"White balance"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Exposure time"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"Manual"</string>
+    <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>
+    <string name="unknown" msgid="3506693015896912952">"Unknown"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Original"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Blue"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"B/W"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X Process"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Litho"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Making album available offline."</item>
+    <item quantity="other" msgid="4948604338155959389">"Making albums available offline"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"This item is stored locally and available offline."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"All albums"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Local albums"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP devices"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa albums"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> free"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> or below"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> or above"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> to <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"Import"</string>
+    <string name="import_complete" msgid="3875040287486199999">"Import complete"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Import unsuccessful"</string>
+    <string name="camera_connected" msgid="916021826223448591">"Camera connected"</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Camera disconnected"</string>
+    <string name="click_import" msgid="6407959065464291972">"Touch here to import"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Choose an album"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Shuffle all images"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Choose an image:"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Choose images"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Slide show"</string>
+    <string name="albums" msgid="7320787705180057947">"Albums"</string>
+    <string name="times" msgid="2023033894889499219">"Times"</string>
+    <string name="locations" msgid="6649297994083130305">"Locations"</string>
+    <string name="people" msgid="4114003823747292747">"People"</string>
+    <string name="tags" msgid="5539648765482935955">"Tags"</string>
+    <string name="group_by" msgid="4308299657902209357">"Group by"</string>
+    <string name="settings" msgid="1534847740615665736">"Settings"</string>
+    <string name="add_account" msgid="4271217504968243974">"Add account"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Camera"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Download"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Edited Online Photos"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"Imported"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Screenshot"</string>
+    <string name="help" msgid="7368960711153618354">"Help"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"No Storage"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"No external storage available"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Filmstrip view"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Grid view"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Fullscreen view"</string>
+    <string name="trimming" msgid="9122385768369143997">"Trimming"</string>
+    <string name="muting" msgid="5094925919589915324">"Muting"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Please wait"</string>
+    <string name="save_into" msgid="9155488424829609229">"Saving video to <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Cannot trim: target video is too short"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Rendering panorama"</string>
+    <string name="save" msgid="613976532235060516">"Save"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Scanning content..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d items scanned"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d item scanned"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d items scanned"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Sorting..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Scanning done"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Importing..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"There is no content available for importing on this device."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"There is no MTP device connected"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Camera error"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Can\'t connect to the camera."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Camera has been disabled because of security policies."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
+    <string name="wait" msgid="8600187532323801552">"Please wait…"</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Please mount USB storage before using the camera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Insert an SD card before using the camera."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Preparing USB storage…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"Preparing SD card…"</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Couldn\'t access USB storage."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Couldn\'t access SD card."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"CANCEL"</string>
+    <string name="review_ok" msgid="1156261588693116433">"DONE"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Time lapse recording"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Choose camera"</string>
+    <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Back"</string>
+    <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Front"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Store location"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOCATION"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Countdown timer"</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one" msgid="1654523400981245448">"1 second"</item>
+    <item quantity="other" msgid="6455381617076792481">"%d seconds"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Beep during countdown"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Off"</string>
+    <string name="setting_on" msgid="8602246224465348901">"On"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Video quality"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"High"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Low"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Time lapse"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera settings"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder settings"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Picture size"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 M pixels (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Focus mode"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinity"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITY"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flash mode"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"FLASH MODE"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Auto"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"On"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Off"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTO"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ON"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH OFF"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"White balance"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"WHITE BALANCE"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Auto"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescent"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Daylight"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescent"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Cloudy"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENT"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DAYLIGHT"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENT"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"CLOUDY"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scene mode"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Auto"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Action"</string>
+    <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Night"</string>
+    <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sunset"</string>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Party"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NONE"</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>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"COUNTDOWN TIMER"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TIMER OFF"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SECOND"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SECONDS"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SECONDS"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SECONDS"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Not selectable in scene mode."</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Exposure"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOSURE"</string>
+    <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
+    <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"FRONT CAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"BACK CAMERA"</string>
+    <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Your USB storage is running out of space. Change the quality setting or delete some images or other files."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Your SD card is running out of space. Change the quality setting or delete some images or other files."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Size limit reached."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Too fast"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Preparing panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Couldn\'t save panorama."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Capturing panorama"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Waiting for previous panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Saving…"</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Rendering panorama"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Touch to focus."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Effects"</string>
+    <string name="effect_none" msgid="3601545724573307541">"None"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Squeeze"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Big eyes"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Big mouth"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Small mouth"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Big nose"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Small eyes"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"In space"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sunset"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Your video"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Set your device down.\nMove out of view for a moment."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Touch to take photo while recording."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"Video recording has started."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"Video recording has stopped."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Video snapshot is disabled when special effects are on."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Clear effects"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"SILLY FACES"</string>
+    <string name="effect_background" msgid="6579360207378171022">"BACKGROUND"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Shutter button"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Menu button"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Most recent photo"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Front and back camera switch"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Camera, video or panorama selector"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"More settings controls"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Close settings controls"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoom control"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Decrease %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Increase %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s tick box"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Switch to photo"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Switch to video"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Switch to panorama"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Switch to new panorama"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Switch to Refocus"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Review cancel"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Review done"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Review retake"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Play video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pause video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Reload video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Video player time bar"</string>
+    <string name="capital_on" msgid="5491353494964003567">"ON"</string>
+    <string name="capital_off" msgid="7231052688467970897">"OFF"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Off"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 second"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 seconds"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0–5 Minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 minute"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 hour"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 hour"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 hours"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 hours"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"seconds"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"minutes"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"hours"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Done"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Set Time Interval"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Time lapse feature is off. Turn it on to set time interval."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Countdown timer is off. Turn it on to count down before taking a picture."</string>
+    <string name="set_duration" msgid="5578035312407161304">"Set duration in seconds"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Counting down to take a photo"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Remember photo locations?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"No, thanks"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Yes"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Camera"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Search"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Photos"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Albums"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"More options"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"SETTINGS"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d photo"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d photos"</item>
+  </plurals>
+</resources>
diff --git a/res/values-es-rUS/filtershow_strings.xml b/res/values-es-rUS/filtershow_strings.xml
index d2f5080..1ad4c82 100644
--- a/res/values-es-rUS/filtershow_strings.xml
+++ b/res/values-es-rUS/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor fotográfico"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"No se puede cargar la imagen."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"No se puede editar el original."</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Estableciendo fondo de pantalla..."</string>
+    <string name="download_failure" msgid="5923323939788582895">"No se pudo descargar la foto. La red no está disponible."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Bordes"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Personalizado"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Deshacer"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Rehacer"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Mostrar historial"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Ocultar historial"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Mostrar estado imag."</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Ocultar estado imag."</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Mostrar efectos aplicados"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ocultar efectos aplicados"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportar"</string>
+    <string name="print_image" msgid="1942989216591621413">"Imprimir"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exportar imagen plana"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"La imagen exportada será una copia sin el historial."</string>
+    <string name="quality" msgid="179292110309050529">"Calidad"</string>
+    <string name="size" msgid="4639404642236356037">"Tamaño"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Configuración"</string>
     <string name="unsaved" msgid="8704442449002374375">"Hay cambios sin guardar en esta imagen."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"¿Quieres guardar los cambios antes de salir?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Guardar y salir"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Procesando imagen con resolución máxima…"</string>
     <string name="exit" msgid="242642957038770113">"Salir"</string>
     <string name="history" msgid="455767361472692409">"Historial"</string>
     <string name="reset" msgid="9013181350779592937">"Restablecer"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Zonas brillant."</string>
     <string name="curvesRGB" msgid="915010781090477550">"Curvas"</string>
     <string name="vignette" msgid="934721068851885390">"Viñeta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Viñeta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposición"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturación"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contraste"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Atenuación"</string>
     <string name="redeye" msgid="4508883127049472069">"Ojos rojos"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Dibujar"</string>
     <string name="straighten" msgid="26025591664983528">"Enderezar"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativo"</string>
     <string name="none" msgid="6633966646410296520">"Ninguno"</string>
     <string name="edge" msgid="7036064886242147551">"Bordes"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterizar"</string>
     <string name="downsample" msgid="3552938534146980104">"Reducir"</string>
+    <string name="grad" msgid="546774853424848655">"Graduado"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Brillo"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contraste"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturación"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Principal"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rojo"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Amarillo"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Verde"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cian"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Azul"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Estilo"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nueva"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RVA"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rojo"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Verde"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Azul"</string>
     <string name="draw_style" msgid="2036125061987325389">"Estilo"</string>
     <string name="draw_size" msgid="4360005386104151209">"Tamaño"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Matiz"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturación"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Brillo"</string>
     <string name="draw_color" msgid="2119030386987211193">"Color"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Líneas"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marcador"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Salpicadura"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Borrar"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Grosor"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Tamaño esquina"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Color"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Borrar"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Elegir un color personalizado"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Seleccionar color"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Seleccionar tamaño"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"Aceptar"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultado"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Guardando imagen"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Procesando…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Guardar config. predeterminada"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Admin. config. predeterminadas"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Config. predeterminada nueva"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nombre predeterminado"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Información"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nombre de la imagen"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Tamaño de la imagen"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histograma"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Datos de EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Configuración predeterminada"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versión"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Actual"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modelo"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Apertura"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Longitud focal"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distancia al objeto"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Fecha de creación"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Punto f"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Duración de la exposición"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Derechos de autor"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 322196b..e639fd4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Rotar hacia la derecha"</string>
     <string name="no_such_item" msgid="5315144556325243400">"No se pudo encontrar el elemento."</string>
     <string name="edit" msgid="1502273844748580847">"Editar"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Edición simple"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Procesando solicitudes de almacenamiento en caché"</string>
     <string name="caching_label" msgid="4521059045896269095">"Alm en caché..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Recortar"</string>
@@ -130,7 +131,7 @@
     <string name="duration" msgid="8160058911218541616">"Duración"</string>
     <string name="mimetype" msgid="8024168704337990470">"Tipo de MIME"</string>
     <string name="file_size" msgid="8486169301588318915">"Tamaño del archivo"</string>
-    <string name="maker" msgid="7921835498034236197">"Creador"</string>
+    <string name="maker" msgid="7921835498034236197">"Fabricante"</string>
     <string name="model" msgid="8240207064064337366">"Modelo"</string>
     <string name="flash" msgid="2816779031261147723">"Flash"</string>
     <string name="aperture" msgid="5920657630303915195">"Apertura"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"No se puede establecer conexión con la cámara."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"La cámara ha sido desactivada por políticas de seguridad."</string>
     <string name="camera_label" msgid="6346560772074764302">"Cámara"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Cámara de video"</string>
     <string name="wait" msgid="8600187532323801552">"Espera, por favor..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Activa el almacenamiento USB antes de usar la cámara."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Inserta una tarjeta SD antes de usar la cámara."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Parte trasera"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Parte delantera"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Almacenar ubicación"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"UBICACIÓN"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Temp. de cuenta regresiva"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 segundo"</item>
@@ -242,7 +243,7 @@
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
     <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Pitido en cuenta"</string>
-    <string name="setting_off" msgid="4480039384202951946">"Desactivada"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Desactiv."</string>
     <string name="setting_on" msgid="8602246224465348901">"Activada"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Calidad del video"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Alta"</string>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuración de cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño de imagen"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapíxeles"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 Mpx"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 MP"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Mpx (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 MP"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automático"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMÁTICO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODO DE FLASH"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automático"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Activado"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Desactivado"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTOMÁTICO"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ACTIVADO"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH DESACTIVADO"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balance blancos"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALANCE DE BLANCOS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automático"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescente"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Luz del día"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescente"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Nublado"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMÁTICO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENTE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"LUZ NATURAL"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENTE"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"NUBLADO"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modo de preselección de escenas"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automático"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nocturno"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Atardecer"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fiesta"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NINGUNO"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ACCIÓN"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOCHE"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ATARDECER"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FIESTA"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"TEMPORIZADOR DE CUENTA REGRESIVA"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TEMPORIZADOR DESACTIVADO"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEGUNDO"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEGUNDOS"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEGUNDOS"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEGUNDOS"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"No se puede seleccionar en el modo Escena."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Valor de exposición"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOSICIÓN"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"CÁMARA FRONTAL"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"CÁMARA POSTERIOR"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"Aceptar"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"El almacenamiento USB se está quedando sin espacio. Cambia la configuración de calidad o elimina algunas imágenes u otros archivos."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Tu tarjeta SD se está quedando sin espacio. Cambia la configuración de calidad o elimina algunas imágenes u otros archivos."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"En el espacio"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Atardecer"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Tu video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Desactiva el dispositivo."\n"Deja de usarlo durante unos minutos."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Desactiva el dispositivo.\nDeja de usarlo durante unos minutos."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Toca para tomar una foto mientras grabas un video."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Comenzó la grabación de video."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Se detuvo la grabación de video."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Cambiar al modo Video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Cambiar al modo Panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Cambiar a nuevo panorama"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Cambiar a reenfoque"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Cancelar"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Listo"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Revisar nueva toma"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Reproducir video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pausar video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Volver a cargar video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Barra de tiempo del reproductor de video"</string>
     <string name="capital_on" msgid="5491353494964003567">"ACTIVADO"</string>
     <string name="capital_off" msgid="7231052688467970897">"DESACTIVADO"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Apagado"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Configurar la duración en segundos"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Cuenta regresiva para tomar una foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"¿Recordar ubicaciones de las fotos?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Etiqueta tus fotos y videos con la ubicación donde fueron tomados."\n\n"Otras aplicaciones pueden acceder a esta información junto con tus imágenes guardadas."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Etiqueta tus fotos y videos con la ubicación donde fueron tomados.\n\nOtras aplicaciones pueden acceder a esta información junto con tus imágenes guardadas."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"No, gracias"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Sí"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Cámara"</string>
     <string name="menu_search" msgid="7580008232297437190">"Búsqueda"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotos"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Álbumes"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"MÁS OPCIONES"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"CONFIGURACIÓN"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotos"</item>
diff --git a/res/values-es/filtershow_strings.xml b/res/values-es/filtershow_strings.xml
index bf81a16..eba75cb 100644
--- a/res/values-es/filtershow_strings.xml
+++ b/res/values-es/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor de fotos"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Error al cargar la imagen"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"No se puede editar el original"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Estableciendo fondo de pantalla..."</string>
+    <string name="download_failure" msgid="5923323939788582895">"No se ha podido descargar la foto porque la red no está disponible."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Margen"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Personalizado"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Deshacer"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Rehacer"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Mostrar historial"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Ocultar historial"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Mostrar estado imagen"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Ocultar estado de la imagen"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Mostrar efectos aplicados"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ocultar efectos aplicados"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportar"</string>
+    <string name="print_image" msgid="1942989216591621413">"Imprimir"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exportar imagen aplastada"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"La imagen exportada será una copia y no incluirá el historial."</string>
+    <string name="quality" msgid="179292110309050529">"Calidad"</string>
+    <string name="size" msgid="4639404642236356037">"Tamaño"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Ajustes"</string>
     <string name="unsaved" msgid="8704442449002374375">"Hay cambios sin guardar en esta imagen."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"¿Quieres guardar antes de salir?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Guardar y salir"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Procesando imagen con resolución completa..."</string>
     <string name="exit" msgid="242642957038770113">"Salir"</string>
     <string name="history" msgid="455767361472692409">"Historial"</string>
     <string name="reset" msgid="9013181350779592937">"Restablecer"</string>
@@ -64,9 +73,14 @@
     <string name="wbalance" msgid="6346581563387083613">"Color automático"</string>
     <string name="hue" msgid="6231252147971086030">"Tonalidad"</string>
     <string name="shadow_recovery" msgid="3928572915300287152">"Sombras"</string>
-    <string name="highlight_recovery" msgid="8262208470735204243">"Lo más destacado"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Destacado"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Curvar"</string>
     <string name="vignette" msgid="934721068851885390">"Viñeta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Viñeta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposición"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturación"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contraste"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Atenuación"</string>
     <string name="redeye" msgid="4508883127049472069">"Ojos rojos"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Dibujo"</string>
     <string name="straighten" msgid="26025591664983528">"Enderezar"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativo"</string>
     <string name="none" msgid="6633966646410296520">"Ninguno"</string>
     <string name="edge" msgid="7036064886242147551">"Bordes"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterizar"</string>
     <string name="downsample" msgid="3552938534146980104">"Reducir calidad"</string>
+    <string name="grad" msgid="546774853424848655">"Graduada"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Brillo"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contraste"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturación"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Principal"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rojo"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Amarillo"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Verde"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cian"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Azul"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Estilo"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"Nueva"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rojo"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Verde"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Azul"</string>
     <string name="draw_style" msgid="2036125061987325389">"Estilo"</string>
     <string name="draw_size" msgid="4360005386104151209">"Tamaño"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Matiz"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturación"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Brillo"</string>
     <string name="draw_color" msgid="2119030386987211193">"Color"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Líneas"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Rotulador"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Manchas"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Borrar"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Grosor"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Tamaño esquina"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Color"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Borrar"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Elegir un color personalizado"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Seleccionar color"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Seleccionar tamaño"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"Aceptar"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultado"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Guardando imagen"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Procesando..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Guardar valor predeterminado"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Administrar predeterminados"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nuevo valor predeterminado"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nombre predeterminado"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Información"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nombre de la imagen"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Tamaño de la imagen"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histograma"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Datos de EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Predeterminado"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versión"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Actual"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modelo"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Apertura"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Longitud focal"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distancia del sujeto"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Fecha de creación"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Número f"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Tiempo de exposición"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Copyright"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6ce3e5c..f62f492 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Girar a la derecha"</string>
     <string name="no_such_item" msgid="5315144556325243400">"No se ha podido encontrar el elemento."</string>
     <string name="edit" msgid="1502273844748580847">"Editar"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Edición simple"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Procesando solicitudes de almacenamiento en caché"</string>
     <string name="caching_label" msgid="4521059045896269095">"Almacenando en caché..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Recortar"</string>
@@ -115,7 +116,7 @@
     <string name="no_albums_alert" msgid="4111744447491690896">"No hay álbumes disponibles."</string>
     <string name="empty_album" msgid="4542880442593595494">"No hay imágenes ni vídeos disponibles."</string>
     <string name="picasa_posts" msgid="1497721615718760613">"Publicaciones"</string>
-    <string name="make_available_offline" msgid="5157950985488297112">"Disponible sin conex."</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Disponible sin conexión"</string>
     <string name="sync_picasa_albums" msgid="8522572542111169872">"Actualizar"</string>
     <string name="done" msgid="217672440064436595">"Listo"</string>
     <string name="sequence_in_set" msgid="7235465319919457488">"Elemento: %1$d de %2$d"</string>
@@ -146,12 +147,12 @@
     <string name="unknown" msgid="3506693015896912952">"Desconocido"</string>
     <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>
+    <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
     <string name="ffx_bleach" msgid="8946700451603478453">"Decolorar"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Azul"</string>
-    <string name="ffx_bw_contrast" msgid="517988490066217206">"Blanco y negro"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"B/N"</string>
     <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
-    <string name="ffx_x_process" msgid="4779398678661811765">"Procesamiento X"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"Proceso X"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litho"</string>
   <plurals name="make_albums_available_offline">
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"No se puede acceder a la cámara."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Se ha inhabilitado la cámara debido a las políticas de seguridad."</string>
     <string name="camera_label" msgid="6346560772074764302">"Cámara"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videocámara"</string>
     <string name="wait" msgid="8600187532323801552">"Por favor, espera..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Para poder usar la cámara, activa el almacenamiento USB."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Para poder usar la cámara, inserta una tarjeta SD."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Trasera"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Delantera"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Añadir ubicación"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"UBICACIÓN"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Temporizador de cuenta atrás"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 segundo"</item>
@@ -242,7 +243,7 @@
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
     <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Utilizar pitido"</string>
-    <string name="setting_off" msgid="4480039384202951946">"Desactivado"</string>
+    <string name="setting_off" msgid="4480039384202951946">"No"</string>
     <string name="setting_on" msgid="8602246224465348901">"Activado"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Calidad de vídeo"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Alta"</string>
@@ -251,28 +252,44 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Ajustes de la cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño imagen"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 MP"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 MP"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 MP"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 MP (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 MP"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 MP"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapíxel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
     <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de enfoque"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMÁTICO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODO DE FLASH"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automático"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Activado"</string>
-    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Desactivado"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"No"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTOMÁTICO"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ACTIVADO"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH DESACTIVADO"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balance de blancos"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALANCE DE BLANCOS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automático"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescente"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Luz natural"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescente"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Nublado"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMÁTICO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENTE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"LUZ NATURAL"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENTE"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"NUBLADO"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modo de escena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automático"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nocturno"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Atardecer"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fiesta"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NINGUNO"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ACCIÓN"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOCHE"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ATARDECER"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FIESTA"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"TEMPORIZADOR DE CUENTA ATRÁS"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TEMPORIZADOR DESACTIVADO"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEGUNDO"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEGUNDOS"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEGUNDOS"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEGUNDOS"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"No se puede seleccionar en el modo de escena."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposición"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOSICIÓN"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"CÁMARA FRONTAL"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"CÁMARA TRASERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"Aceptar"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"No queda espacio en el almacenamiento USB. Cambia la configuración de calidad o elimina algunas imágenes u otros archivos."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"No queda espacio en la tarjeta SD. Cambia la configuración de calidad o elimina algunas imágenes u otros archivos."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"En el espacio"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Atardecer"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Tu vídeo"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Desactiva el dispositivo."\n"Deja de usarlo durante unos minutos."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Desactiva el dispositivo.\nDeja de usarlo durante unos minutos."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Toca para hacer una foto mientras grabas un vídeo."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Se ha iniciado la grabación de vídeo."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"La grabación de vídeo se ha detenido."</string>
@@ -331,12 +363,17 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Cambiar a vídeo"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Cambiar a modo panorámico"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Cambiar a nueva panorámica"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Cambiar a reenfoque"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Cancelar"</string>
-    <string name="accessibility_review_ok" msgid="7793302834271343168">"Listo"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Revisión terminada"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Revisar repetición"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Ver un vídeo"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pausar vídeo"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Volver a cargar vídeo"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Barra de tiempo del reproductor de vídeo"</string>
     <string name="capital_on" msgid="5491353494964003567">"SÍ"</string>
     <string name="capital_off" msgid="7231052688467970897">"NO"</string>
-    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Desactivado"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"No"</string>
     <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0,5 segundos"</string>
     <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 segundo"</string>
     <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1,5 segundos"</string>
@@ -380,19 +417,21 @@
     <string name="time_lapse_minutes" msgid="7738520349259013762">"minutos"</string>
     <string name="time_lapse_hours" msgid="1776453661704997476">"horas"</string>
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Listo"</string>
-    <string name="set_time_interval" msgid="2970567717633813771">"Establecer intervalo de tiempo"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Establece el intervalo de tiempo"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"El intervalo de tiempo está desactivado. Activa esta función para establecer un intervalo."</string>
     <string name="set_timer_help" msgid="5007708849404589472">"El temporizador de cuenta atrás está desactivado. Activa esta opción para ver la cuenta atrás antes de hacer una foto."</string>
-    <string name="set_duration" msgid="5578035312407161304">"Definir duración en segundos"</string>
+    <string name="set_duration" msgid="5578035312407161304">"Define la duración en segundos"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Cuenta atrás para hacer una foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"¿Recordar ubicaciones de las fotos?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Etiqueta tus fotos y vídeos con las ubicaciones donde se han realizado."\n\n"Otras aplicaciones pueden acceder a esta información, así como a las imágenes guardadas."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Etiqueta tus fotos y vídeos con las ubicaciones donde se han realizado.\n\nOtras aplicaciones pueden acceder a esta información, así como a las imágenes guardadas."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"No, gracias"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Sí"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Cámara"</string>
     <string name="menu_search" msgid="7580008232297437190">"Buscar"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotos"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Álbumes"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"MÁS OPCIONES"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"AJUSTES"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotos"</item>
diff --git a/res/values-et-rEE/filtershow_strings.xml b/res/values-et-rEE/filtershow_strings.xml
new file mode 100644
index 0000000..3e7c252
--- /dev/null
+++ b/res/values-et-rEE/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Fototöötlus"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Pilti ei saa laadida!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Originaali ei saa muuta"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Taustapildi määramine"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Fotot ei õnnestunud alla laadida, kuna võrk ei ole saadaval."</string>
+    <string name="original" msgid="3524493791230430897">"Originaal"</string>
+    <string name="borders" msgid="2067345080568684614">"Äärised"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Kohandatud"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Võta tagasi"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Tee uuesti"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Kuva rakendatud efektid"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Peida rakendatud efektid"</string>
+    <string name="export_image" msgid="3202835713172222134">"Ekspordi"</string>
+    <string name="print_image" msgid="1942989216591621413">"Prindi"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Tasandatud kujutise eksportimine"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Eksporditud kujutis on ilma ajaloota koopia."</string>
+    <string name="quality" msgid="179292110309050529">"Kvaliteet"</string>
+    <string name="size" msgid="4639404642236356037">"Suurus"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Seaded"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Kujutisel on salvestamata muudatusi."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Kas soovite enne väljumist salvestada?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Salvesta ja välju"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Täieliku eraldusvõimega kujutise töötlemine ..."</string>
+    <string name="exit" msgid="242642957038770113">"Välju"</string>
+    <string name="history" msgid="455767361472692409">"Ajalugu"</string>
+    <string name="reset" msgid="9013181350779592937">"Lähtesta"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Rakendatud efektid"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Võrdle"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Rakenda"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Lähtesta"</string>
+    <string name="aspect" msgid="4025244950820813059">"Kuvasuhe"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Mitte ühtegi"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Fikseeritud"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Pisike planeet"</string>
+    <string name="exposure" msgid="6526397045949374905">"Säriaeg"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Teravus"</string>
+    <string name="contrast" msgid="2310908487756769019">"Kontrast"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Kirkus"</string>
+    <string name="saturation" msgid="7026791551032438585">"Küllastus"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"MV filter"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Autom. värvid"</string>
+    <string name="hue" msgid="6231252147971086030">"Värvitoon"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Varjud"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Esiletõstmine"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Kõverad"</string>
+    <string name="vignette" msgid="934721068851885390">"Vinjett"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjett"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Säriaeg"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Küllastus"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Langus"</string>
+    <string name="redeye" msgid="4508883127049472069">"Punasilmsus"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Joonistus"</string>
+    <string name="straighten" msgid="26025591664983528">"Rihi otseks"</string>
+    <string name="crop" msgid="5781263790107850771">"Kärpimine"</string>
+    <string name="rotate" msgid="2796802553793795371">"Pööra"</string>
+    <string name="mirror" msgid="5482518108154883096">"Peegelpilt"</string>
+    <string name="negative" msgid="6998313764388022201">"Negatiiv"</string>
+    <string name="none" msgid="6633966646410296520">"Mitte ühtegi"</string>
+    <string name="edge" msgid="7036064886242147551">"Servad"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Plakatiks"</string>
+    <string name="downsample" msgid="3552938534146980104">"Vähend."</string>
+    <string name="grad" msgid="546774853424848655">"Astmeline"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Heledus"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Küllastus"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Peamine"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Punane"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Kollane"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Roheline"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Tsüaan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Sinine"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Fuksia"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stiil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"uus"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Punane"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Roheline"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Sinine"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Stiil"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Suurus"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Värvitoon"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Küllastus"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Heledus"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Värv"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Jooned"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Pritsi"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Tühjenda"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Paksus"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Nurga suurus"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Värv"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Kustuta"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Valige kohandatud värv"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Värvi valimine"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Suuruse valimine"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Algne"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Tulemus"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Kujutise salvestamine"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Töötlemine ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Salvesta praegune eelseadistus"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Kasutaja eelseadistuste haldamine"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Uus eelseadistus"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Eelseadistatud nimi"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Teave"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Kujutise nimi"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Kujutise suurus"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogramm"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-i andmed"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Eelseadistus"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versioon"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Algne"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Praegune"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Mudel"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Ava"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Fookuskaugus"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Objekti kaugus"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Jäädvustamiskuupäev"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Avaarv"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Säriaeg"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autoriõigus"</string>
+</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000..057fa98
--- /dev/null
+++ b/res/values-et-rEE/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Galerii"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Pildiraam"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Videopleier"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Video laadimine ..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"Kujutise laadimine ..."</string>
+    <string name="loading_account" msgid="928195413034552034">"Kontode laadimine ..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Jätka videot"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"Kas jätkata esitust alates %s?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Jätka esitust"</string>
+    <string name="loading" msgid="7038208555304563571">"Laadimine ..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Laadimine ebaõnnestus"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Kujutist ei õnnestunud laadida"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"Pisipilti pole"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Alusta uuesti"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"OK"</string>
+    <string name="ok" msgid="5296833083983263293">"OK"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Alustamiseks näo puudutamine."</string>
+    <string name="saving_image" msgid="7270334453636349407">"Pildi salvestamine ..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Pildi salvestamine albumisse <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="save_error" msgid="6857408774183654970">"Kärbitud kujutist ei saanud salvestada."</string>
+    <string name="crop_label" msgid="521114301871349328">"Kärbi pilti"</string>
+    <string name="trim_label" msgid="274203231381209979">"Kärbi videot"</string>
+    <string name="select_image" msgid="7841406150484742140">"Valige foto"</string>
+    <string name="select_video" msgid="4859510992798615076">"Vali video"</string>
+    <string name="select_item" msgid="2816923896202086390">"Valige üksus"</string>
+    <string name="select_album" msgid="1557063764849434077">"Albumi valimine"</string>
+    <string name="select_group" msgid="6744208543323307114">"Rühma valimine"</string>
+    <string name="set_image" msgid="2331476809308010401">"Seadke pilt kui"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Taustapildiks määr."</string>
+    <string name="wallpaper" msgid="140165383777262070">"Taustapildi määramine ..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Taustapilt"</string>
+    <string name="delete" msgid="2839695998251824487">"Kustuta"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Kas kustutada valitud üksus?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Kas kustutada valitud üksused?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Kinnitamine"</string>
+    <string name="cancel" msgid="3637516880917356226">"Tühista"</string>
+    <string name="share" msgid="3619042788254195341">"Jaga"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Panoraami jagamine"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Fotona jagamine"</string>
+    <string name="deleted" msgid="6795433049119073871">"Kustutatud"</string>
+    <string name="undo" msgid="2930873956446586313">"VÕTA TAGASI"</string>
+    <string name="select_all" msgid="3403283025220282175">"Vali kõik"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Tühista kõik valikud"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Slaidiseanss"</string>
+    <string name="details" msgid="8415120088556445230">"Üksikasjad"</string>
+    <string name="details_title" msgid="2611396603977441273">"Üksusi: %1$d/%2$d"</string>
+    <string name="close" msgid="5585646033158453043">"Sule"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Üleminek rakendusse Kaamera"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"Valitud %1$d"</item>
+    <item quantity="one" msgid="2478365152745637768">"Valitud %1$d"</item>
+    <item quantity="other" msgid="754722656147810487">"Valitud %1$d"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"Valitud %1$d"</item>
+    <item quantity="one" msgid="6184377003099987825">"Valitud %1$d"</item>
+    <item quantity="other" msgid="53105607141906130">"Valitud %1$d"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"Valitud %1$d"</item>
+    <item quantity="one" msgid="5030162638216034260">"Valitud %1$d"</item>
+    <item quantity="other" msgid="3512041363942842738">"Valitud %1$d"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Näita kaardil"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Pööra vasakule"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Pööra paremale"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Üksust ei leitud."</string>
+    <string name="edit" msgid="1502273844748580847">"Muuda"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Lihtne muutmine"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Vahemällu lisamise taotluste töötlemine"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Vahemällu ..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"Kärbi"</string>
+    <string name="trim_action" msgid="703098114452883524">"Kärbi"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Vaigista"</string>
+    <string name="set_as" msgid="3636764710790507868">"Seadista kui"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Video vaigistamine ei õnnestu."</string>
+    <string name="video_err" msgid="7003051631792271009">"Videot ei saa esitada."</string>
+    <string name="group_by_location" msgid="316641628989023253">"Asukoha järgi"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"Aja järgi"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"Märgendite järgi"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"Inimeste järgi"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"Albumi järgi"</string>
+    <string name="group_by_size" msgid="153766174950394155">"Suuruse järgi"</string>
+    <string name="untagged" msgid="7281481064509590402">"Märgendita"</string>
+    <string name="no_location" msgid="4043624857489331676">"Asukoht puudub"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Mõnda asukohta ei suudetud võrguprobleemide tõttu tuvastada."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Fotosid ei saa sellesse albumisse alla laadida. Proovige hiljem uuesti."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Ainult kujutised"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Ainult videod"</string>
+    <string name="show_all" msgid="6963292714584735149">"Kujutised ja videod"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Fotogalerii"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"Fotod puuduvad."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Kärbitud kujutis salvestati kausta <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"Ühtegi albumit pole saadaval."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O kujutist/videot on saadaval."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Postitused"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Muuda offlainis kasutatavaks"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Värskenda"</string>
+    <string name="done" msgid="217672440064436595">"Valmis"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%1$d/%2$d üksust"</string>
+    <string name="title" msgid="7622928349908052569">"Pealkiri"</string>
+    <string name="description" msgid="3016729318096557520">"Kirjeldus"</string>
+    <string name="time" msgid="1367953006052876956">"Kellaaeg"</string>
+    <string name="location" msgid="3432705876921618314">"Asukoht"</string>
+    <string name="path" msgid="4725740395885105824">"Tee"</string>
+    <string name="width" msgid="9215847239714321097">"Laius"</string>
+    <string name="height" msgid="3648885449443787772">"Kõrgus"</string>
+    <string name="orientation" msgid="4958327983165245513">"Paigutus"</string>
+    <string name="duration" msgid="8160058911218541616">"Kestus"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME-tüüp"</string>
+    <string name="file_size" msgid="8486169301588318915">"Faili suurus"</string>
+    <string name="maker" msgid="7921835498034236197">"Looja"</string>
+    <string name="model" msgid="8240207064064337366">"Mudel"</string>
+    <string name="flash" msgid="2816779031261147723">"Välk"</string>
+    <string name="aperture" msgid="5920657630303915195">"Ava"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Fookuskaugus"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Valge tasakaal"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Säriaeg"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"Käsitsi"</string>
+    <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>
+    <string name="unknown" msgid="3506693015896912952">"Tundmatu"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Originaal"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Pleekimine"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Sinine"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"Mustvalge"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Punš"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X-töötlus"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Litorgaafia"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Tegime albumi võrguühenduseta kättesaadavaks."</item>
+    <item quantity="other" msgid="4948604338155959389">"Tegime albumid võrguühenduseta kättesaadavaks."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"See üksus on kohalikult salvestatud ja offlainis kättesaadav."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"Kõik albumid"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Kohalikud albumid"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP-seadmed"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa albumid"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> tasuta"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> või väiksem"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> või suurem"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> kuni <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"Impordi"</string>
+    <string name="import_complete" msgid="3875040287486199999">"Importim. lõpetatud"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Importimine ebaõnnestus"</string>
+    <string name="camera_connected" msgid="916021826223448591">"Kaamera on ühendatud."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Kaamera pole ühendatud."</string>
+    <string name="click_import" msgid="6407959065464291972">"Puudutage impordiks siia"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Vali album"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Kuva kõik kujutised juhuesitusena"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Vali kujutis"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Kujutiste valimine"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Slaidiseanss"</string>
+    <string name="albums" msgid="7320787705180057947">"Albumid"</string>
+    <string name="times" msgid="2023033894889499219">"Ajad"</string>
+    <string name="locations" msgid="6649297994083130305">"Asukohad"</string>
+    <string name="people" msgid="4114003823747292747">"Inimesed"</string>
+    <string name="tags" msgid="5539648765482935955">"Märgendid"</string>
+    <string name="group_by" msgid="4308299657902209357">"Grupeerimisalus:"</string>
+    <string name="settings" msgid="1534847740615665736">"Seaded"</string>
+    <string name="add_account" msgid="4271217504968243974">"Lisa konto"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Kaamera"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Alla laaditud"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Muudetud fotod võrgus"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"Imporditud"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Ekraanipilt"</string>
+    <string name="help" msgid="7368960711153618354">"Abi"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"Mäluseade puudub"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"Ükski välismäluseade ei ole saadaval"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Filmiribakuva"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Ruudustiku kuva"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Täisekraani vaade"</string>
+    <string name="trimming" msgid="9122385768369143997">"Kärpimine"</string>
+    <string name="muting" msgid="5094925919589915324">"Vaigistamine"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Palun oodake"</string>
+    <string name="save_into" msgid="9155488424829609229">"Video salvestamine albumisse <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Ei saa kärpida: lõppvideo on liiga lühike"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Panoraami renderdamine"</string>
+    <string name="save" msgid="613976532235060516">"Salvesta"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Sisu skannimine ..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d üksust on skannitud"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d üksus on skannitud"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d üksust on skannitud"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Sortimine ..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Skannimine on lõppenud"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Importimine ..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"Seadmes pole importimiseks saadaval mingit sisu."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"Ühtegi MTP-seadet pole ühendatud"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Kaamera viga"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Ei saa kaameraga ühendada."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Kaamera on keelatud turvaeeskirjade tõttu."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Kaamera"</string>
+    <string name="wait" msgid="8600187532323801552">"Oodake ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Paigaldage USB-mäluseade enne kaamera kasutamist."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Enne kaamera kasutamist sisestage SD-kaart."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB-seadme ettevalmistamine…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD-kaardi ettevalmistamine ..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Juurdepääs USB-mäluseadmele ebaõnnestus."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Juurdepääs SD-kaardile ebaõnnestus."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"TÜHISTA"</string>
+    <string name="review_ok" msgid="1156261588693116433">"VALMIS"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Aeglase filmimise salvestamine"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Vali kaamera"</string>
+    <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Tagasi"</string>
+    <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Eestvaade"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Talletuse asukoht"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"ASUKOHT"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Iseavaja taimer"</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one" msgid="1654523400981245448">"1 sekund"</item>
+    <item quantity="other" msgid="6455381617076792481">"%d sekundit"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Iseavaja heli"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Väljas"</string>
+    <string name="setting_on" msgid="8602246224465348901">"Sees"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Video kvaliteet"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Kõrge"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Madal"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Aeglustus"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kaamera seaded"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokaamera seaded"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Pildi suurus"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapikslit"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikslit"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pikslit"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapikslit"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pikslit"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M pikslit"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Mpiks. (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3M pikslit"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M pikslit"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Teravustamisrežiim"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automaatne"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Lõpmatus"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMAATNE"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"LÕPMATUS"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Välgurežiim"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"VÄLGUREŽIIM"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automaatne"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Sees"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Väljas"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMAATVÄLK"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"VÄLK ON SEES"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"VÄLK ON VÄLJAS"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Valge tasakaal"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"VALGE TASAKAAL"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automaatne"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Hõõglamp"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Päevavalgus"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Päevavalguslamp"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Pilves"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMAATNE"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"HÕÕGLAMP"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"PÄEVAVALGUS"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"PÄEVAVALGUSLAMP"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"PILVINE"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Stseenirežiim"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automaatne"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Toiming"</string>
+    <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Öö"</string>
+    <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Päikeseloojang"</string>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Pidu"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"PUUDUB"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"TOIMING"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"ÖÖ"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"PÄIKESELOOJANG"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"PIDU"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"PÖÖRDLOENDUSTAIMER"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TAIMER VÄLJA"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUND"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDIT"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUNDIT"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUNDIT"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Seda ei saa stseenirežiimis valida."</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Säriaeg"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"SÄRIAEG"</string>
+    <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
+    <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"ESIKAAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"TAGAKAAMERA"</string>
+    <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Teie USB-mäluseadme ruum on otsa saamas. Muutke kvaliteediseadeid või kustutage kujutisi või teisi faile."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Teie SD-kaardi ruum on otsa saamas. Muutke kvaliteedi seadeid või kustutage kujutisi või teisi faile."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Suuruspiirang on saavutatud."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Liiga kiire"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panoraami ettevalmistus"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panoraami ei saanud salvestada."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Panoraam"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panoraami jäädvustamine"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Eelmise panoraami ootel"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Salvestus ..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Panoraami renderdamine"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Puudutage fokuseerimiseks."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Efektid"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Mitte ühtegi"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Pitsita"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Suured silmad"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Suur suu"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Väike suu"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Suur nina"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Väiksed silmad"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Kosmoses"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Päikeseloojang"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Teie video"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Pange seade käest ära.\nAstuge korraks vaateväljast eemale."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Puudutage salvestamise ajal foto jäädvustamiseks."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"Video salvestamine algas."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"Video salvestamine lõppes."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Kui eriefektid on sisse lülitatud, on video hetktõmmis keelatud."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Nulli efektid"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"NALJAKAD NÄOD"</string>
+    <string name="effect_background" msgid="6579360207378171022">"TAUST"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Päästiku nupp"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Menüü nupp"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Viimane foto"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Eesmise ja tagumise kaamera lüliti"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kaamera, video või panoraami valija"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Rohkem seadete juhtnuppe"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Sule seadete juhtnupud"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Suumi juhtimine"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Vähenda %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Suurenda %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s märkeruut"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Aktiveeri fotorežiim"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Aktiveeri videorežiim"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Aktiveeri panoraamrežiim"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Lülitu uuele panoraamile"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Lülitu uuesti fokusseerimisele"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Arvustuse tühistamine"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Arvustus valmis"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Uue võtte ülevaade"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Esita videot"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Peata video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Laadi video uuesti"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Videomängija ajariba"</string>
+    <string name="capital_on" msgid="5491353494964003567">"SEES"</string>
+    <string name="capital_off" msgid="7231052688467970897">"VÄLJAS"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Väljas"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0,5 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 sekund"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1,5 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2,5 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 sekundit"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0,5 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 minut"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1,5 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2,5 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 minutit"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0,5 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 tund"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1,5 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2,5 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 tundi"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 tundi"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"sekundit"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"minutit"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"tundi"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Valmis"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Ajavahemiku määramine"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Aeglustamisfunktsioon on välja lülitatud. Ajavahemiku määramiseks lülitage funktsioon sisse."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Iseavaja taimer on väljas. Lülitage see sisse, et loendada pildi tegemiseni jäänud aega."</string>
+    <string name="set_duration" msgid="5578035312407161304">"Määrake kestus sekundites"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Aega foto tegemiseni"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Kas jätta meelde fotode jäädvustamise asukohad?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Märkige oma fotodele ja videotele jäädvustamise asukoht.\n\nMuud rakendused pääsevad lisaks salvestatud piltidele juurde ka sellele teabele."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"Ei, tänan"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Jah"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Kaamera"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Otsing"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Fotod"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Albumid"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ROHKEM VALIKUID"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"SEADED"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d fotot"</item>
+  </plurals>
+</resources>
diff --git a/res/values-et/filtershow_strings.xml b/res/values-et/filtershow_strings.xml
index 2d9ea29..f84b090 100644
--- a/res/values-et/filtershow_strings.xml
+++ b/res/values-et/filtershow_strings.xml
@@ -21,14 +21,21 @@
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Taustapildi määramine"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Fotot ei õnnestunud alla laadida, kuna võrk ei ole saadaval."</string>
     <string name="original" msgid="3524493791230430897">"Originaal"</string>
+    <string name="saved" msgid="6678827180814174711">"Salvestatud"</string>
     <string name="borders" msgid="2067345080568684614">"Äärised"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Võta tagasi"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Tee uuesti"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Kuva ajalugu"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Peida ajalugu"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Kuva pildi olek"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Peida pildi olek"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Kuva rakendatud efektid"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Peida rakendatud efektid"</string>
+    <string name="export_image" msgid="3202835713172222134">"Ekspordi"</string>
+    <string name="print_image" msgid="1942989216591621413">"Prindi"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Tasandatud kujutise eksportimine"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Eksporditud kujutis on ilma ajaloota koopia."</string>
+    <string name="quality" msgid="179292110309050529">"Kvaliteet"</string>
+    <string name="size" msgid="4639404642236356037">"Suurus"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Seaded"</string>
     <string name="unsaved" msgid="8704442449002374375">"Kujutisel on salvestamata muudatusi."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Kas soovite enne väljumist salvestada?"</string>
@@ -76,14 +83,30 @@
     <string name="negative" msgid="6998313764388022201">"Negatiiv"</string>
     <string name="none" msgid="6633966646410296520">"Mitte ühtegi"</string>
     <string name="edge" msgid="7036064886242147551">"Servad"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Plakatiks"</string>
     <string name="downsample" msgid="3552938534146980104">"Vähend."</string>
+    <string name="grad" msgid="546774853424848655">"Astmeline"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Heledus"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Küllastus"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Peamine"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Punane"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Kollane"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Roheline"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Tsüaan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Sinine"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Fuksia"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stiil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"uus"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Punane"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Roheline"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Sinine"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stiil"</string>
     <string name="draw_size" msgid="4360005386104151209">"Suurus"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Värvitoon"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Küllastus"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Heledus"</string>
     <string name="draw_color" msgid="2119030386987211193">"Värv"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Jooned"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
@@ -93,4 +116,30 @@
     <string name="color_pick_title" msgid="6195567431995308876">"Värvi valimine"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Suuruse valimine"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Algne"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Tulemus"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Kujutise salvestamine"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Töötlemine ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Salvesta praegune eelseadistus"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Kasutaja eelseadistuste haldamine"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Uus eelseadistus"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Eelseadistatud nimi"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Teave"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Kujutise nimi"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Kujutise suurus"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogramm"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-i andmed"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Eelseadistus"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versioon"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Algne"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Praegune"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Mudel"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Ava"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Fookuskaugus"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Objekti kaugus"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Jäädvustamiskuupäev"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Avaarv"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Säriaeg"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autoriõigus"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 7873ccd..8b67802 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Pööra paremale"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Üksust ei leitud."</string>
     <string name="edit" msgid="1502273844748580847">"Muuda"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Lihtne muutmine"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Vahemällu lisamise taotluste töötlemine"</string>
     <string name="caching_label" msgid="4521059045896269095">"Vahemällu ..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Kärbi"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Ei saa kaameraga ühendada."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kaamera on keelatud turvaeeskirjade tõttu."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kaamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videokaamera"</string>
     <string name="wait" msgid="8600187532323801552">"Oodake ..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Paigaldage USB-mäluseade enne kaamera kasutamist."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Enne kaamera kasutamist sisestage SD-kaart."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Tagasi"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Eestvaade"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Talletuse asukoht"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"ASUKOHT"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Iseavaja taimer"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 sekund"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kaamera seaded"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokaamera seaded"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Pildi suurus"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapikslit"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikslit"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pikslit"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapikslit"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pikslit"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M pikslit"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Mpiks. (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3M pikslit"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M pikslit"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automaatne"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Lõpmatus"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMAATNE"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"LÕPMATUS"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Välgurežiim"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"VÄLGUREŽIIM"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automaatne"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Sees"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Väljas"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMAATVÄLK"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"VÄLK ON SEES"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"VÄLK ON VÄLJAS"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Valge tasakaal"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"VALGE TASAKAAL"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automaatne"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Hõõglamp"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Päevavalgus"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Päevavalguslamp"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Pilves"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMAATNE"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"HÕÕGLAMP"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"PÄEVAVALGUS"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"PÄEVAVALGUSLAMP"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"PILVINE"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Stseenirežiim"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automaatne"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Öö"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Päikeseloojang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Pidu"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"PUUDUB"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"TOIMING"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"ÖÖ"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"PÄIKESELOOJANG"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"PIDU"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"PÖÖRDLOENDUSTAIMER"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TAIMER VÄLJA"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUND"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDIT"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUNDIT"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUNDIT"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Seda ei saa stseenirežiimis valida."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Säriaeg"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"SÄRIAEG"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"ESIKAAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"TAGAKAAMERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Teie USB-mäluseadme ruum on otsa saamas. Muutke kvaliteediseadeid või kustutage kujutisi või teisi faile."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Teie SD-kaardi ruum on otsa saamas. Muutke kvaliteedi seadeid või kustutage kujutisi või teisi faile."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Kosmoses"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Päikeseloojang"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Teie video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Pange seade käest ära."\n"Astuge korraks vaateväljast eemale."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Pange seade käest ära.\nAstuge korraks vaateväljast eemale."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Puudutage salvestamise ajal foto jäädvustamiseks."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Video salvestamine algas."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Video salvestamine lõppes."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Aktiveeri videorežiim"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Aktiveeri panoraamrežiim"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Lülitu uuele panoraamile"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Lülitu uuesti fokusseerimisele"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Arvustuse tühistamine"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Arvustus valmis"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Uue võtte ülevaade"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Esita videot"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Peata video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Laadi video uuesti"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Videomängija ajariba"</string>
     <string name="capital_on" msgid="5491353494964003567">"SEES"</string>
     <string name="capital_off" msgid="7231052688467970897">"VÄLJAS"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Väljas"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Määrake kestus sekundites"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Aega foto tegemiseni"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Kas jätta meelde fotode jäädvustamise asukohad?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Märkige oma fotodele ja videotele jäädvustamise asukoht."\n\n"Muud rakendused pääsevad lisaks salvestatud piltidele juurde ka sellele teabele."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Märkige oma fotodele ja videotele jäädvustamise asukoht.\n\nMuud rakendused pääsevad lisaks salvestatud piltidele juurde ka sellele teabele."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Ei, tänan"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Jah"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kaamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Otsing"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotod"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumid"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ROHKEM VALIKUID"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"SEADED"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotot"</item>
diff --git a/res/values-fa/filtershow_strings.xml b/res/values-fa/filtershow_strings.xml
index 7c5872d..ca4dce6 100644
--- a/res/values-fa/filtershow_strings.xml
+++ b/res/values-fa/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"ویرایشگر عکس"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"تصویر بارگیری نمی‌شود!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"نسخه اصلی را نمی‌توان ویرایش کرد"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"تنظیم تصویر زمینه"</string>
+    <string name="download_failure" msgid="5923323939788582895">"دانلود عکس انجام نشد. شبکه در دسترس نیست."</string>
     <string name="original" msgid="3524493791230430897">"اصلی"</string>
     <string name="borders" msgid="2067345080568684614">"حاشیه‌ها"</string>
+    <string name="custom_border" msgid="8679893731790931871">"سفارشی"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"لغو عمل"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"انجام مجدد"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"نمایش سابقه"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"پنهان کردن سابقه"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"نمایش وضعیت تصویر"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"پنهان کردن وضعیت تصویر"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"نمایش جلوه‌های اعمال شده"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"پنهان کردن جلوه‌های اعمال شده"</string>
+    <string name="export_image" msgid="3202835713172222134">"صادر کردن"</string>
+    <string name="print_image" msgid="1942989216591621413">"چاپ"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"صدور تصویر صاف"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"تصویر صادرشده نسخه‌ای فاقد سابقه ویرایش خواهد بود."</string>
+    <string name="quality" msgid="179292110309050529">"کیفیت"</string>
+    <string name="size" msgid="4639404642236356037">"اندازه"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"تنظیمات"</string>
     <string name="unsaved" msgid="8704442449002374375">"تغییرات ذخیره نشده‌ای در این تصویر وجود دارد."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"آیا می‌خواهید پیش از خروج تغییرات ذخیره شود؟"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"ذخیره و خروج"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"درحال پردازش تصویر با وضوح کامل ..."</string>
     <string name="exit" msgid="242642957038770113">"خروج"</string>
     <string name="history" msgid="455767361472692409">"سابقه"</string>
     <string name="reset" msgid="9013181350779592937">"بازنشانی"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"هایلایت"</string>
     <string name="curvesRGB" msgid="915010781090477550">"نمودارها"</string>
     <string name="vignette" msgid="934721068851885390">"محو لبه‌ها"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"حاشیه تاریک"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"نوردهی"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"اشباع رنگ"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"کنتراست"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"افت"</string>
     <string name="redeye" msgid="4508883127049472069">"قرمزی چشم"</string>
     <string name="imageDraw" msgid="6918552177844486656">"طراحی"</string>
     <string name="straighten" msgid="26025591664983528">"صاف‌ کردن"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"نگاتیو"</string>
     <string name="none" msgid="6633966646410296520">"هیچکدام"</string>
     <string name="edge" msgid="7036064886242147551">"لبه‌ها"</string>
-    <string name="kmeans" msgid="1630263230946107457">"وارهول"</string>
+    <string name="kmeans" msgid="2080952022674981541">"چندرنگی‌"</string>
     <string name="downsample" msgid="3552938534146980104">"کاهش وضوح"</string>
+    <string name="grad" msgid="546774853424848655">"فارغ‌التحصیل"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"روشنایی"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"کنتراست"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"اشباع رنگ"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"اصلی"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"قرمز"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"زرد"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"سبز"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"سبز آبی"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"آبی"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"زرشکی"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"سبک"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"جدید"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"قرمز"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"سبز"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"آبی"</string>
     <string name="draw_style" msgid="2036125061987325389">"سبک"</string>
     <string name="draw_size" msgid="4360005386104151209">"اندازه"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"رنگ‌مایه"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"اشباع رنگ"</string>
+    <string name="draw_value" msgid="6571604055161538273">"روشنایی"</string>
     <string name="draw_color" msgid="2119030386987211193">"رنگ"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"خطوط"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"نشانگر"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"سبک پاشش"</string>
     <string name="draw_clear" msgid="6728155515454921052">"پاک کردن"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"ضخامت"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"اندازه گوشه"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"رنگ"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"پاک کردن"</string>
     <string name="color_pick_select" msgid="734312818059057394">"رنگ سفارشی را انتخاب کنید"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"رنگ را انتخاب کنید"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"انتخاب اندازه"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"تأیید"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"اصلی"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"نتیجه"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"ذخیره تصویر"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"در حال پردازش…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"ذخیره پیش‌تنظیم فعلی"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"مدیریت پیش‌تنظیم‌های کاربر"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"پیش‌تنظیم جدید"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"نام از پیش تعیین شده"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"اطلاعات"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"نام تصویر"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"اندازه تصویر"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"هیستوگرام"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"داده EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"پیش‌تنظیم"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"نسخه"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"اصلی"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"فعلی"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"مدل"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"دیافراگم"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"فاصله کانونی"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"فاصله سوژه"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"تاریخ عکس‌برداری"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"عدد F"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"زمان نوردهی"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"حق نسخه‌برداری"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 200e41e..4e1d2b6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"چرخش به راست"</string>
     <string name="no_such_item" msgid="5315144556325243400">"مورد یافت نشد."</string>
     <string name="edit" msgid="1502273844748580847">"ویرایش"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"ویرایش ساده"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"پردازش درخواست‌های ذخیره در حافظهٔ پنهان"</string>
     <string name="caching_label" msgid="4521059045896269095">"در حال ذخیره در حافظهٔ پنهان..."</string>
     <string name="crop_action" msgid="3427470284074377001">"برش"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"اتصال به دوربین امکان‌پذیر نیست."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"به دلیل خط مشی‌های امنیتی، دوربین غیرفعال شده است."</string>
     <string name="camera_label" msgid="6346560772074764302">"دوربین"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"دوربین فیلمبرداری"</string>
     <string name="wait" msgid="8600187532323801552">"لطفاً منتظر بمانید…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"قبل از استفاده از دوربین حافظهٔ USB را وصل کنید."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"قبل از استفاده از دوربین یک کارت SD وارد کنید."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"تنظیمات دوربین"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"تنظیمات دوربین فیلمبرداری"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"اندازه تصویر"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"۱۳ مگا پیکسل"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"۸ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"۵ مگاپیکسل"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"‫۴ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"۳ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"۲ مگاپیکسل"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"‫۲ مگاپیکسل (۱۶:۹)‏"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"۱.۳ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"۱ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"خودکار"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"بی نهایت"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"ماکرو"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"خودکار"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"بی‌نهایت"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"ماکرو"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"حالت فلاش"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"حالت فلاش"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"خودکار"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"روشن"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"خاموش"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"فلاش خودکار"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"فلاش روشن"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"فلاش خاموش"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"توازن سفیدی"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"توازن سفیدی"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"خودکار"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"تابان"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"روشنایی روز"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"فلورسنت"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"ابری"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"خودکار"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"تابان"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"روشنایی روز"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"فلورسنت"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ابری"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"حالت منظره"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"خودکار"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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">"۳ ثانیه"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"۱۰ ثانیه"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"۱۵ ثانیه"</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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"حافظهٔ USB پر است. تنظیمات کیفیت را تغییر دهید یا برخی تصاویر یا سایر فایل‌ها را حذف کنید."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"کارت SD شما پر شده است. تنظیمات کیفیت را تغییر دهید یا برخی تصاویر یا فایل‌های دیگر را حذف کنید."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"در فضا"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"غروب آفتاب"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"ویدئوی شما"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"دستگاه خود را کنار بگذارید."\n"برای یک لحظه از دید خارج شوید."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"دستگاه خود را کنار بگذارید.\nبرای یک لحظه از دید خارج شوید."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"برای گرفتن عکس در هنگام ضبط لمس کنید."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"ضبط ویدیو شروع شد."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"ضبط ویدیو متوقف شد."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"رفتن به ویدئو"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"رفتن به پانوراما"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"تغییر به پانورامای جدید"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"تغییر به فوکوس مجدد"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"لغو بازبینی"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"بازبینی انجام شد"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"بازبینی عکس مجدد"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"پخش ویدیو"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"توقف موقت ویدیو"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"تازه‌سازی ویدیو"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"نوار زمان پخش‌کننده ویدیو"</string>
     <string name="capital_on" msgid="5491353494964003567">"روشن"</string>
     <string name="capital_off" msgid="7231052688467970897">"خاموش"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"خاموش"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"تنظیم مدت زمان به ثانیه"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"شمارش معکوس برای گرفتن یک عکس"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"موقعیت مکانی عکس به‌خاطر سپرده شود؟"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"محل گرفتن عکس‌ها و ویدیوها را به آنها برچسب کنید."\n\n" سایر برنامه‌ها می‌توانند به این اطلاعات در کنار تصاویر ذخیره شده شما دسترسی پیدا کنند."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"محل گرفتن عکس‌ها و ویدیوها را به آنها برچسب کنید.\n\n سایر برنامه‌ها می‌توانند به این اطلاعات در کنار تصاویر ذخیره شده شما دسترسی پیدا کنند."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"نه متشکرم"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"بله"</string>
     <string name="menu_camera" msgid="3476709832879398998">"دوربین"</string>
     <string name="menu_search" msgid="7580008232297437190">"جستجو"</string>
     <string name="tab_photos" msgid="9110813680630313419">"عکس‌ها"</string>
     <string name="tab_albums" msgid="8079449907770685691">"آلبوم‌ها"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"گزینه‌های بیشتر"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"تنظیمات"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d عکس"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d عکس "</item>
diff --git a/res/values-fi/filtershow_strings.xml b/res/values-fi/filtershow_strings.xml
index 0ad3542..9568a11 100644
--- a/res/values-fi/filtershow_strings.xml
+++ b/res/values-fi/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Kuvanmuokkaussovellus"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Kuvaa ei voi ladata."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Alkuperäistä ei voi muokata"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Asetetaan taustakuvaa"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Kuvan lataaminen epäonnistui. Verkkoon ei saada yhteyttä."</string>
     <string name="original" msgid="3524493791230430897">"Alkuperäinen"</string>
     <string name="borders" msgid="2067345080568684614">"Reunukset"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Muokattu"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Kumoa"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Toista"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Näytä historia"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Piilota historia"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Näytä kuvan tila"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Piilota kuvan tila"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Näytä käytetyt tehosteet"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Piilota käytetyt tehosteet"</string>
+    <string name="export_image" msgid="3202835713172222134">"Vie"</string>
+    <string name="print_image" msgid="1942989216591621413">"Tulosta"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Vie yksitasoinen kuva"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Vietävä kuva on kopio ilman historiatietoja."</string>
+    <string name="quality" msgid="179292110309050529">"Laatu"</string>
+    <string name="size" msgid="4639404642236356037">"Koko"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Asetukset"</string>
     <string name="unsaved" msgid="8704442449002374375">"Tähän kuvaan on tehty muutoksia, joita ei ole tallennettu."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Haluatko tallentaa ennen sulkemista?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Tallenna ja sulje"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Käsitellään korkearesoluutioista kuvaa…"</string>
     <string name="exit" msgid="242642957038770113">"Sulje"</string>
     <string name="history" msgid="455767361472692409">"Historia"</string>
     <string name="reset" msgid="9013181350779592937">"Palauta"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Valokohdat"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Valotuskäyrät"</string>
     <string name="vignette" msgid="934721068851885390">"Vinjetti"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjetti"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Valotus"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Kylläisyys"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrasti"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Haipuma"</string>
     <string name="redeye" msgid="4508883127049472069">"Punasilmäisyys"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Piirrä"</string>
     <string name="straighten" msgid="26025591664983528">"Suorista"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatiivi"</string>
     <string name="none" msgid="6633966646410296520">"Ei mitään"</string>
     <string name="edge" msgid="7036064886242147551">"Reunat"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posteris."</string>
     <string name="downsample" msgid="3552938534146980104">"Pienennys"</string>
+    <string name="grad" msgid="546774853424848655">"Asteittainen"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Kirkkaus"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrasti"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Värikylläisyys"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Ensisijainen"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Punainen"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Keltainen"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Vihreä"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Turkoosi"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Sininen"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Tyyli"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"uusi"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Punainen"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Vihreä"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Sininen"</string>
     <string name="draw_style" msgid="2036125061987325389">"Tyyli"</string>
     <string name="draw_size" msgid="4360005386104151209">"Koko"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Sävy"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Värikylläisyys"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Kirkkaus"</string>
     <string name="draw_color" msgid="2119030386987211193">"Väri"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Viivat"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Tussi"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Roiskeet"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Tyhjennä"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Paksuus"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Kulman koko"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Väri"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Tyhjennä"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Valitse oma väri"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Valitse väri"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Valitse koko"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Alkuperäinen"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Tulos"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Tallennetaan kuvaa"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Käsitellään…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Tallenna nykyinen esiasetus"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Hallitse käytt. esiasetuksia"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Uusi esiasetus"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Esiasetuksen nimi"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Tietoja"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Kuvan nimi"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Kuvakoko"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogrammi"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-tiedot"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Esiasetus"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versio"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Alkuperäinen"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Nykyinen"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Malli"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Aukko"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Polttoväli"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Kohteen etäisyys"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Kuvauspäivä"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F-luku"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Valotusaika"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Tekijänoikeudet"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6617999..4b3f0bd 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Kierrä myötäpäivään"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Kohdetta ei löytynyt."</string>
     <string name="edit" msgid="1502273844748580847">"Muokkaa"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Yksinkert. muokkaus"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Käsitellään välimuistipyyntöjä"</string>
     <string name="caching_label" msgid="4521059045896269095">"Vie välimuist."</string>
     <string name="crop_action" msgid="3427470284074377001">"Rajaa"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Ei saada yhteyttä kameraan."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera on poistettu käytöstä suojauskäytäntöjen vuoksi."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="wait" msgid="8600187532323801552">"Odota…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Ota USB-tallennustila käyttöön ennen kameran käyttöä."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Aseta SD-kortti ennen kameran käyttämistä."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Takaisin"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Etupuoli"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Tallennussijainti"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"SIJAINTI"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Ajastin"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 sekunti"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameran asetukset"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokameran asetukset"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Kuvan koko"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapikseliä"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikseliä"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapikseliä"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapikseliä"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapikseliä"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapikseliä"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 megap. (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapiks."</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapikseli"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automaattinen"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Loputon"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMAATTINEN"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"LOPUTON"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Salaman tila"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"SALAMAN TILA"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automaattinen"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Käytössä"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Pois käytöstä"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMAATTINEN SALAMA"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"SALAMA PÄÄLLÄ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"SALAMA POIS"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Valkotasapaino"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"VALKOTASAPAINO"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automaattinen"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Hehkulamppuvalo"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Päivänvalo"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Loisteputkivalo"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Pilvinen"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMAATTINEN"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"HEHKULAMPPUVALO"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"PÄIVÄNVALO"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"LOISTEPUTKIVALO"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"PILVINEN"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Kuvaustila"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automaattinen"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Yö"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Auringonlasku"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Juhlat"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"EI MITÄÄN"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"TOIMINTA"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"YÖ"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"AURINGONLASKU"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"JUHLAT"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"AJASTIN"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"AJASTIN EI OLE KÄYTÖSSÄ"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUNTI"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNTIA"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUNTIA"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUNTIA"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Ei valittavissa kuvaustilassa."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Valotus"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"VALOTUS"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"ETUKAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"TAKAKAMERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB-tallennustilasi on vähissä. Vaihda laatuasetusta tai poista kuvia tai muita tiedostoja."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD-korttisi tila on vähissä. Vaihda laatuasetusta tai poista kuvia tai muita tiedostoja."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Avaruus"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Auringonlasku"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Oma videosi"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Aseta laite alustalle."\n"Astu hetkeksi pois kuvasta."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Aseta laite alustalle.\nAstu hetkeksi pois kuvasta."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Ota kuva tallennuksen aikana koskettamalla ruutua."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Videon tallennus on alkanut."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Videon tallennus on pysäytetty."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Vaihda videotilaan"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Vaihda panoraamatilaan"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Vaihda uuteen panoraamaan"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Vaihda uudelleentarkennustilaan"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Peruuta"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Tarkistus valmis"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Kuvaa uudelleen"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Katso video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Keskeytä video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Lataa video uudelleen"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Videosoittimen aikapalkki"</string>
     <string name="capital_on" msgid="5491353494964003567">"KÄYTÖSSÄ"</string>
     <string name="capital_off" msgid="7231052688467970897">"POIS KÄYTÖSTÄ"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Pois käytöstä"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Aseta kesto sekunteina"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Kuva otetaan, kun ajastin saavuttaa nollan"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Muistetaanko valokuvien sijainnit?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Merkitse valokuviin ja videoihin niiden kuvauspaikat."\n\n"Muut sovellukset voivat käyttää näitä tietoja tallennettujen kuviesi yhteydessä."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Merkitse valokuviin ja videoihin niiden kuvauspaikat.\n\nMuut sovellukset voivat käyttää näitä tietoja tallennettujen kuviesi yhteydessä."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Ei kiitos"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Kyllä"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Haku"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Kuvat"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumit"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"LISÄÄ VAIHTOEHTOJA"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ASETUKSET"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d valokuva"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d valokuvaa"</item>
diff --git a/res/values-fr-rCA/filtershow_strings.xml b/res/values-fr-rCA/filtershow_strings.xml
new file mode 100644
index 0000000..c516f69
--- /dev/null
+++ b/res/values-fr-rCA/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Photo Editor"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Impossible de charger l\'image."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Impossible de modifier l\'original"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Définition du fond d\'écran en cours…"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Impossible de télécharger la photo. Réseau indisponible."</string>
+    <string name="original" msgid="3524493791230430897">"Original"</string>
+    <string name="borders" msgid="2067345080568684614">"Contours"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Personnalisé"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Annuler"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Répéter"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Afficher les effets appliqués"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Masquer les effets appliqués"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exporter"</string>
+    <string name="print_image" msgid="1942989216591621413">"Imprimer"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exporter l\'image aplatie"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"L\'image exportée sera une copie, sans historique."</string>
+    <string name="quality" msgid="179292110309050529">"Qualité"</string>
+    <string name="size" msgid="4639404642236356037">"Taille"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Paramètres"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Certaines modifications apportées à l\'image n\'ont pas été enregistrées."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Souhaitez-vous enregistrer les modifications avant de fermer le programme?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Enregistrer et quitter"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Traitement de l\'image haute résolution en cours…"</string>
+    <string name="exit" msgid="242642957038770113">"Quitter"</string>
+    <string name="history" msgid="455767361472692409">"Historique"</string>
+    <string name="reset" msgid="9013181350779592937">"Réinitialiser"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Effets appliqués"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Comparer"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Appliquer"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Réinitialiser"</string>
+    <string name="aspect" msgid="4025244950820813059">"Aspect"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Aucun"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Fixé"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Petite planète"</string>
+    <string name="exposure" msgid="6526397045949374905">"Exposition"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Netteté"</string>
+    <string name="contrast" msgid="2310908487756769019">"Contraste"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Couleurs vives"</string>
+    <string name="saturation" msgid="7026791551032438585">"Saturation"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"Filtre N&amp;B"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Coloration auto"</string>
+    <string name="hue" msgid="6231252147971086030">"Teinte"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Ombres"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Reflets"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Courbes"</string>
+    <string name="vignette" msgid="934721068851885390">"Vignette"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignette"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposition"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturation"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contraste"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Transition"</string>
+    <string name="redeye" msgid="4508883127049472069">"Yeux rouges"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Dessiner"</string>
+    <string name="straighten" msgid="26025591664983528">"Redresser"</string>
+    <string name="crop" msgid="5781263790107850771">"Rogner"</string>
+    <string name="rotate" msgid="2796802553793795371">"Pivoter"</string>
+    <string name="mirror" msgid="5482518108154883096">"Miroir"</string>
+    <string name="negative" msgid="6998313764388022201">"Négatif"</string>
+    <string name="none" msgid="6633966646410296520">"Aucun"</string>
+    <string name="edge" msgid="7036064886242147551">"Bords"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Postérisation"</string>
+    <string name="downsample" msgid="3552938534146980104">"Réduction"</string>
+    <string name="grad" msgid="546774853424848655">"Graduée"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Luminosité"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contraste"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturation"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Principal"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rouge"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Jaune"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Vert"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Bleu"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Style"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nouvelle"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RVB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Rouge"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Vert"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Bleu"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Style"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Taille"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Nuance"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturation"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Luminosité"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Couleur"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Lignes"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marqueur"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Éclaboussures"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Effacer"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Largeur"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Taille d\'angle"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Couleur"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Effacer"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Sélection couleur personnalisée"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Sélectionner couleur"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Sélectionner la taille"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Résultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Enregistrer l\'image"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Traitement en cours..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Enregistrer préréglage actuel"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Gérer préréglages utilisateur"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nouveau préréglage"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nom du préréglage"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Détails"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nom de l\'image"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Taille de l\'image"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogramme"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Données EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Préréglage"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Version"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Originale"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Actuelle"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modèle"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Ouverture"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Longueur focale"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distance du sujet"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Date de création"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Ouverture de diaphragme"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Durée d\'exposition"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Droits d\'auteur"</string>
+</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..3ee21ed
--- /dev/null
+++ b/res/values-fr-rCA/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Galerie"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Cadre d\'image"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Lecteur Google Vidéos"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Chargement de la vidéo..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"Chargement de l\'image..."</string>
+    <string name="loading_account" msgid="928195413034552034">"Chargement infos compte..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Reprendre la vidéo"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"Reprendre la lecture à partir de %s?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Reprendre la lecture"</string>
+    <string name="loading" msgid="7038208555304563571">"Chargement en cours..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Impossible de charger"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Impossible de charger l\'image."</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"Aucune vignette"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Recommencer"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"OK"</string>
+    <string name="ok" msgid="5296833083983263293">"OK"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Appuyer sur un visage pour commencer."</string>
+    <string name="saving_image" msgid="7270334453636349407">"Enregistrement de l\'image..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Enregistrement de l\'image dans l\'album <xliff:g id="ALBUM_NAME">%1$s</xliff:g>…"</string>
+    <string name="save_error" msgid="6857408774183654970">"Impossible d\'enregistrer l\'image rognée."</string>
+    <string name="crop_label" msgid="521114301871349328">"Rogner l\'image"</string>
+    <string name="trim_label" msgid="274203231381209979">"Découper la vidéo"</string>
+    <string name="select_image" msgid="7841406150484742140">"Sélectionner photo"</string>
+    <string name="select_video" msgid="4859510992798615076">"Sélectionner vidéo"</string>
+    <string name="select_item" msgid="2816923896202086390">"Sélectionner élément"</string>
+    <string name="select_album" msgid="1557063764849434077">"Sélectionner l\'album"</string>
+    <string name="select_group" msgid="6744208543323307114">"Sélectionner groupe"</string>
+    <string name="set_image" msgid="2331476809308010401">"Utiliser l\'image comme"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Sélectionner"</string>
+    <string name="wallpaper" msgid="140165383777262070">"Définition du fond d\'écran…"</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Fond d\'écran"</string>
+    <string name="delete" msgid="2839695998251824487">"Supprimer"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Supprimer élément sélectionné?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Suppr. éléments sélectionnés?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Confirmer"</string>
+    <string name="cancel" msgid="3637516880917356226">"Annuler"</string>
+    <string name="share" msgid="3619042788254195341">"Partager"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Partager la vue panoramique"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Partager comme photo"</string>
+    <string name="deleted" msgid="6795433049119073871">"Supprimé"</string>
+    <string name="undo" msgid="2930873956446586313">"ANNULER"</string>
+    <string name="select_all" msgid="3403283025220282175">"Tout sélectionner"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Tout désélectionner"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Diaporama"</string>
+    <string name="details" msgid="8415120088556445230">"Détails"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d élément(s) sur %2$d :"</string>
+    <string name="close" msgid="5585646033158453043">"Fermer"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Passer en mode Appareil photo"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d sélectionnés"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d sélectionnés"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d sélectionnés"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d sélectionnés"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d sélectionnés"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d sélectionnés"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d sélectionnés"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d sélectionnés"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d sélectionnés"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Afficher sur la carte"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Rotation vers la gauche"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Faire pivoter vers la droite"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Impossible de trouver l\'élément."</string>
+    <string name="edit" msgid="1502273844748580847">"Modifier"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Modification simple"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Demandes de mise en cache en cours de traitement"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Mise en cache…"</string>
+    <string name="crop_action" msgid="3427470284074377001">"Rogner"</string>
+    <string name="trim_action" msgid="703098114452883524">"Rogner"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Couper le son"</string>
+    <string name="set_as" msgid="3636764710790507868">"Définir comme"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Impossible de couper le son."</string>
+    <string name="video_err" msgid="7003051631792271009">"Impossible de lire la vidéo."</string>
+    <string name="group_by_location" msgid="316641628989023253">"Par emplacement"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"Par heure"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"Par libellé"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"Par personne"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"Par album"</string>
+    <string name="group_by_size" msgid="153766174950394155">"Par taille"</string>
+    <string name="untagged" msgid="7281481064509590402">"Aucun libellé"</string>
+    <string name="no_location" msgid="4043624857489331676">"Aucun lieu"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Certains lieux n\'ont pas pu être identifiés en raison de problèmes réseau."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Impossible de télécharger les photos de cet album. Veuillez réessayer plus tard."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Images uniquement"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Vidéos uniquement"</string>
+    <string name="show_all" msgid="6963292714584735149">"Images et vidéos"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Galerie photos"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"Aucune photo."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Image rognée enregistrée dans <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"Aucun album disponible."</string>
+    <string name="empty_album" msgid="4542880442593595494">"Aucune image/vidéo disponible."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Messages"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Rendre disponible hors ligne"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Actualiser"</string>
+    <string name="done" msgid="217672440064436595">"Terminé"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%1$d élément(s) sur %2$d :"</string>
+    <string name="title" msgid="7622928349908052569">"Titre"</string>
+    <string name="description" msgid="3016729318096557520">"Description"</string>
+    <string name="time" msgid="1367953006052876956">"À intervalles réguliers"</string>
+    <string name="location" msgid="3432705876921618314">"Lieu"</string>
+    <string name="path" msgid="4725740395885105824">"Chemin"</string>
+    <string name="width" msgid="9215847239714321097">"Largeur"</string>
+    <string name="height" msgid="3648885449443787772">"Hauteur"</string>
+    <string name="orientation" msgid="4958327983165245513">"Orientation"</string>
+    <string name="duration" msgid="8160058911218541616">"Durée"</string>
+    <string name="mimetype" msgid="8024168704337990470">"Type MIME"</string>
+    <string name="file_size" msgid="8486169301588318915">"Taille fichier"</string>
+    <string name="maker" msgid="7921835498034236197">"Fabricant"</string>
+    <string name="model" msgid="8240207064064337366">"Modèle"</string>
+    <string name="flash" msgid="2816779031261147723">"Flash"</string>
+    <string name="aperture" msgid="5920657630303915195">"Ouverture"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Longueur focale"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Balance des blancs"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Durée d\'expo"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"Manuel"</string>
+    <string name="auto" msgid="4296941368722892821">"Auto"</string>
+    <string name="flash_on" msgid="7891556231891837284">"Flash déclenché"</string>
+    <string name="flash_off" msgid="1445443413822680010">"Flash désactivé"</string>
+    <string name="unknown" msgid="3506693015896912952">"Inconnue"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Original"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Instantané"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Décoloration"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Bleu"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"Noir et blanc"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Intense"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"Rayons X"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Lithographie"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Activation de consultation d\'album hors connexion."</item>
+    <item quantity="other" msgid="4948604338155959389">"Activation consultation d\'albums hors connexion."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Cet élément est stocké localement et disponible hors connexion."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"Tous les albums"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Albums locaux"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"Appareils MTP"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Albums Picasa"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> disponible(s)"</string>
+    <string name="size_below" msgid="2074956730721942260">"jusqu\'à <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> ou plus"</string>
+    <string name="size_between" msgid="8779660840898917208">"de <xliff:g id="MIN_SIZE">%1$s</xliff:g> à <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"Importer"</string>
+    <string name="import_complete" msgid="3875040287486199999">"Téléversement terminé"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Échec de l\'importation."</string>
+    <string name="camera_connected" msgid="916021826223448591">"Appareil photo connecté."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Appareil photo déconnecté."</string>
+    <string name="click_import" msgid="6407959065464291972">"Appuyez ici pour importer"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Sélectionner un album"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Affichage aléatoire des images"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Sélectionner une image"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Sélectionner images"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Diaporama"</string>
+    <string name="albums" msgid="7320787705180057947">"Albums"</string>
+    <string name="times" msgid="2023033894889499219">"Fois"</string>
+    <string name="locations" msgid="6649297994083130305">"Positions"</string>
+    <string name="people" msgid="4114003823747292747">"Personnes"</string>
+    <string name="tags" msgid="5539648765482935955">"Balises"</string>
+    <string name="group_by" msgid="4308299657902209357">"Grouper par"</string>
+    <string name="settings" msgid="1534847740615665736">"Paramètres"</string>
+    <string name="add_account" msgid="4271217504968243974">"Ajouter un compte"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Appareil photo"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Télécharger"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Photos en ligne retouchées"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"Importation terminée"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Capture d\'écran"</string>
+    <string name="help" msgid="7368960711153618354">"AIDE"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"Aucune mémoire"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"Aucune mémoire de stockage externe disponible."</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Pellicule"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Grille"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Affichage plein écran"</string>
+    <string name="trimming" msgid="9122385768369143997">"Découpe en cours"</string>
+    <string name="muting" msgid="5094925919589915324">"Coupure du son"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Veuillez patienter."</string>
+    <string name="save_into" msgid="9155488424829609229">"Enregistrement de la vidéo dans l\'album \"<xliff:g id="ALBUM_NAME">%1$s</xliff:g>\" en cours…"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Découpe impossible : la vidéo cible est trop courte."</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Rendu de vue panoramique…"</string>
+    <string name="save" msgid="613976532235060516">"Enregistrer"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Analyse du contenu en cours..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d éléments analysés"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d élément analysé"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d éléments analysés"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Tri en cours..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Analyse terminée."</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Importation en cours..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"Aucun contenu n\'est disponible pour une importation sur cet appareil."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"Aucun appareil MTP n\'est connecté."</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Erreur au niveau de l\'appareil photo."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Impossible d\'établir une connexion avec l\'appareil photo."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"L\'appareil photo a été désactivé en raison des règles de sécurité."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Appareil photo"</string>
+    <string name="wait" msgid="8600187532323801552">"Veuillez patienter…"</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Veuillez installer une mémoire de stockage USB avant d\'utiliser l\'appareil photo."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Veuillez insérer une carte SD avant d\'utiliser l\'appareil photo."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Préparation de la mémoire de stockage USB…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"Préparation de la carte SD…"</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Impossible d\'accéder à la mémoire de stockage USB."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Impossible d\'accéder à la carte SD."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"ANNULER"</string>
+    <string name="review_ok" msgid="1156261588693116433">"OK"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Enregistrement en mode Écoulement de temps"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Sélectionner caméra"</string>
+    <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Retour"</string>
+    <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Avant"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Enregistrer la position"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"POSITION"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Compte à rebours"</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one" msgid="1654523400981245448">"1 seconde"</item>
+    <item quantity="other" msgid="6455381617076792481">"%d secondes"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Compte à rebours sonore"</string>
+    <string name="setting_off" msgid="4480039384202951946">"DÉSACTIVÉE"</string>
+    <string name="setting_on" msgid="8602246224465348901">"ACTIVÉE"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualité vidéo"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Élevée"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Faible"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Intervalle de temps"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Paramètres de l\'application Appareil photo"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mode Caméra"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Taille de l\'image"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Mpx (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mise au point"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infini"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMATIQUE"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINI"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Mode Flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODE FLASH"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Auto"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Activé"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Désactivé"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTOMATIQUE"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ACTIVÉ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH DÉSACTIVÉ"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balance des blancs"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALANCE DES BLANCS"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Auto"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescent"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Lumière du jour"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescent"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Nuageux"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMATIQUE"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENT"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"LUMIÈRE DU JOUR"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENT"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"NUAGEUX"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Mode Scène"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Auto"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Action"</string>
+    <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nuit"</string>
+    <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Coucher de soleil"</string>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fête"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"AUCUN"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ACTION"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NUIT"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"COUCHER DE SOLEIL"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FÊTE"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"COMPTE À REBOURS"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"MINUTEUR DÉSACTIVÉ"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SECONDE"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SECONDES"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SECONDES"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SECONDES"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Ce paramètre ne peut pas être sélectionné en mode Scène."</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Exposition"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOSITION"</string>
+    <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
+    <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"CAMÉRA FRONTALE"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"CAMÉRA ARRIÈRE"</string>
+    <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"La mémoire de stockage USB est pleine. Définissez la qualité sur une valeur plus basse ou supprimez des images ou d\'autres types de fichiers."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Votre carte SD est pleine. Modifiez les paramètres de qualité, ou supprimez des images ou des fichiers."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Taille maximale atteinte"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Trop rapide"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Préparation vue panoramique..."</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Impossible d\'enregistrer le panoramique."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Capture vue panoramique"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Vue panoramique précédente en attente"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Enregistrement en cours..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Rendu de vue panoramique…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Appuyez pour mise au point"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Effets"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Aucun"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Compresser"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Grands yeux"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Grande bouche"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Petite bouche"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Gros nez"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Petits yeux"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Dans l\'espace"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Coucher de soleil"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Votre vidéo"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Posez votre appareil.\nSortez du cadre quelques instants."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Appuyez pour prendre une photo pendant l\'enregistrement"</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"L\'enregistrement vidéo a commencé."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"L\'enregistrement vidéo s\'est arrêté."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Instantané vidéo désactivé en cas d\'activation des effets spéciaux."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Effacer les effets"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"DRÔLES DE TÊTES"</string>
+    <string name="effect_background" msgid="6579360207378171022">"ARRIÈRE-PLAN"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Bouton de l\'obturateur"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Bouton \"Menu\""</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Photo la plus récente"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Interrupteur des caméras avant et arrière"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Sélecteur du mode Photo, Vidéo ou Panoramique"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Plus de paramètres"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Fermer les paramètres"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Contrôle du zoom"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Diminuer %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Augmenter %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"Case à cocher %1$s"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Mode Appareil photo"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Passer en mode vidéo"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Passer en mode panoramique"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Passer au nouveau mode panoramique"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Basculer pour mettre au point à nouveau"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Examen – Annuler"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Examen – OK"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Examiner la deuxième prise de la photo"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Lire la vidéo"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Interrompre la vidéo"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Revoir la vidéo"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Barre chronologique du lecteur vidéo"</string>
+    <string name="capital_on" msgid="5491353494964003567">"ACTIVÉ"</string>
+    <string name="capital_off" msgid="7231052688467970897">"DÉSACTIVÉE"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Désactivé"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"1 demi-seconde"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 seconde"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1 seconde et demie"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 secondes"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2 secondes et demie"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 secondes"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 secondes"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 secondes"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 secondes"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 secondes"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 secondes"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 secondes"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 secondes"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"1 demi-minute"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 minute"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1 minute et demie"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2 minutes et demie"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 minutes"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"1 demi-heure"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 heure"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1 heure et demie"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 heures"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2 heures et demie"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 heures"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 heures"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 heures"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 heures"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 heures"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 heures"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 heures"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 heures"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"secondes"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"minutes"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"heures"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Terminé"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Définir l\'intervalle de temps"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"La fonctionnalité Time Lapse est désactivée. Veuillez l\'activer pour définir un intervalle."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"La fonctionnalité de compte à rebours est désactivée. Activez-la pour effectuer un compte à rebours avant de prendre une photo."</string>
+    <string name="set_duration" msgid="5578035312407161304">"Définir la durée en secondes"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Compte à rebours avant la photo"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Se souvenir du lieu des photos?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Ajoutez des tags à vos photos et à vos vidéos pour identifier l\'endroit de la prise de vue.\n\nD\'autres applications peuvent accéder à ces informations, ainsi qu\'aux images enregistrées."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"Non, merci"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Oui"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Appareil photo"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Recherche"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Photos"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Albums"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"PLUS D\'OPTIONS"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"Paramètres"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d photo"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d photos"</item>
+  </plurals>
+</resources>
diff --git a/res/values-fr/filtershow_strings.xml b/res/values-fr/filtershow_strings.xml
index c77817c..a0f58b8 100644
--- a/res/values-fr/filtershow_strings.xml
+++ b/res/values-fr/filtershow_strings.xml
@@ -18,30 +18,39 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Outil de retouche photo"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Impossible de charger l\'image."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Impossible de modifier l\'original."</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Définition du fond d\'écran en cours…"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Impossible de télécharger la photo. Réseau indisponible."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Contours"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Personnalisé"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Annuler"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Rétablir"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Afficher historique"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Masquer l\'historique"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Afficher état image"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Masquer état image"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Afficher les effets appliqués"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Masquer les effets appliqués"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exporter"</string>
+    <string name="print_image" msgid="1942989216591621413">"Imprimer"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exporter l\'image aplatie"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"L\'image exportée est une copie, sans historique."</string>
+    <string name="quality" msgid="179292110309050529">"Qualité"</string>
+    <string name="size" msgid="4639404642236356037">"Dimensions"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Paramètres"</string>
     <string name="unsaved" msgid="8704442449002374375">"Certaines modifications apportées à l\'image n\'ont pas été enregistrées."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Souhaitez-vous enregistrer les modifications avant de fermer le programme ?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Enregistrer et quitter"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Traitement de l\'image haute résolution en cours…"</string>
     <string name="exit" msgid="242642957038770113">"Quitter"</string>
     <string name="history" msgid="455767361472692409">"Historique"</string>
-    <string name="reset" msgid="9013181350779592937">"Réinitialiser"</string>
+    <string name="reset" msgid="9013181350779592937">"Rétablir"</string>
     <!-- no translation found for history_original (150973253194312841) -->
     <skip />
     <string name="imageState" msgid="8632586742752891968">"Effets appliqués"</string>
     <string name="compare_original" msgid="8140838959007796977">"Comparer"</string>
     <string name="apply_effect" msgid="1218288221200568947">"Appliquer"</string>
-    <string name="reset_effect" msgid="7712605581024929564">"Réinitialiser"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Rétablir"</string>
     <string name="aspect" msgid="4025244950820813059">"Aspect"</string>
     <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
     <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Reflets"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Courbes"</string>
     <string name="vignette" msgid="934721068851885390">"Vignetage"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignetage"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposition"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturation"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contraste"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Transition"</string>
     <string name="redeye" msgid="4508883127049472069">"Yeux rouges"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Dessiner"</string>
     <string name="straighten" msgid="26025591664983528">"Redresser"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Négatif"</string>
     <string name="none" msgid="6633966646410296520">"Aucun"</string>
     <string name="edge" msgid="7036064886242147551">"Bords"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Postéris."</string>
     <string name="downsample" msgid="3552938534146980104">"Réduction"</string>
+    <string name="grad" msgid="546774853424848655">"Graduation"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Luminosité"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contraste"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturation"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Principal"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rouge"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Jaune"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Vert"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Bleu"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Style"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nouveau"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RVB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rouge"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Vert"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Bleu"</string>
     <string name="draw_style" msgid="2036125061987325389">"Style"</string>
     <string name="draw_size" msgid="4360005386104151209">"Taille"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Teinte"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturation"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Luminosité"</string>
     <string name="draw_color" msgid="2119030386987211193">"Couleur"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Lignes"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marqueur"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Éclaboussures"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Effacer"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Largeur"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Taille d\'angle"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Couleur"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Effacer"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Sélection couleur personnalisée"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Sélectionner couleur"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Sélectionner la taille"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Image originale"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Résultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Enregistrement de l\'image en cours…"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Traitement en cours..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Enregistrer le préréglage actuel"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Gérer préréglages utilisateur"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nouveau préréglage"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nom du préréglage"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informations"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Titre de l\'image"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Dimensions de l\'image"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogramme"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Données EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Préréglage"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Version"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Originale"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Actuelle"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modèle"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Ouverture"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Longueur focale"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distance du sujet"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Date de prise de vue"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Ouverture de diaphragme"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Temps d\'exposition"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Droits d\'auteur"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d4e9132..fad7649 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Faire pivoter à droite"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Impossible de trouver l\'élément."</string>
     <string name="edit" msgid="1502273844748580847">"Retoucher"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Modification simple"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Demandes de mise en cache en cours de traitement"</string>
     <string name="caching_label" msgid="4521059045896269095">"Mise en cache…"</string>
     <string name="crop_action" msgid="3427470284074377001">"Rogner"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Impossible d\'établir une connexion avec l\'appareil photo."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"L\'appareil photo a été désactivé en raison des règles de sécurité."</string>
     <string name="camera_label" msgid="6346560772074764302">"Appareil photo"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Caméra"</string>
     <string name="wait" msgid="8600187532323801552">"Veuillez patienter..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Veuillez installer une mémoire de stockage USB avant d\'utiliser l\'appareil photo."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Veuillez insérer une carte SD avant d\'utiliser l\'appareil photo."</string>
@@ -234,7 +234,8 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Arrière"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Avant"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Enregist. position"</string>
-    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Compte à rebours"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"POSITION"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Retardateur"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 seconde"</item>
     <item quantity="other" msgid="6455381617076792481">"%d secondes"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Paramètres appareil photo"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mode Caméra"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Taille d\'image"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 mégapixels"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 mégapixels"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpx"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 Mpx"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Mpx (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 M pixels"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infini"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMATIQUE"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINI"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Mode Flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODE FLASH"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatique"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Activé"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Désactivé"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTOMATIQUE"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ACTIVÉ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH DÉSACTIVÉ"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balance des blancs"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALANCE DES BLANCS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatique"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescent"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Lumière du jour"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescent"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Nuageux"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMATIQUE"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENT"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"LUMIÈRE DU JOUR"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENT"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"NUAGEUX"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Mode Scène"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatique"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nuit"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Coucher de soleil"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fête"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"AUCUN"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ACTION"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NUIT"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"COUCHER DE SOLEIL"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FÊTE"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"RETARDATEUR"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"MINUTEUR DÉSACTIVÉ"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SECONDE"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SECONDES"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SECONDES"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SECONDES"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Ce paramètre ne peut pas être sélectionné en mode Scène."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposition"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOSITION"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"CAMÉRA FRONTALE"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"CAMÉRA ARRIÈRE"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"La mémoire de stockage USB est pleine. Définissez la qualité sur une valeur plus basse ou supprimez des images ou d\'autres types de fichiers."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Votre carte SD est pleine. Modifiez le paramètre de qualité ou supprimez des images ou des fichiers."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Dans l\'espace"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Coucher soleil"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Votre vidéo"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Posez votre appareil."\n"Sortez du cadre quelques instants."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Posez votre appareil.\nSortez du cadre quelques instants."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Appuyez pour prendre une photo pendant l\'enregistrement"</string>
     <string name="video_recording_started" msgid="4132915454417193503">"L\'enregistrement vidéo a commencé."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"L\'enregistrement vidéo s\'est arrêté."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Mode vidéo"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Mode panoramique"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Passer au nouveau mode panoramique"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Activer le mode Refocus"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Examen – Annuler"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Examen – OK"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Examiner la deuxième prise de la photo"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Lire la vidéo"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Interrompre la vidéo"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Revoir la vidéo"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Barre chronologique du lecteur vidéo"</string>
     <string name="capital_on" msgid="5491353494964003567">"ACTIVÉ"</string>
     <string name="capital_off" msgid="7231052688467970897">"DÉSACTIVÉ"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Désactivé"</string>
@@ -382,17 +419,19 @@
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"OK"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Définir l\'intervalle de temps"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"La fonctionnalité Time Lapse est désactivée. Veuillez l\'activer pour définir un intervalle."</string>
-    <string name="set_timer_help" msgid="5007708849404589472">"La fonctionnalité de compte à rebours est désactivée. Activez-la pour effectuer un compte à rebours avant de prendre une photo."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Le retardateur est désactivé. Activez-le pour déclencher un compte à rebours avant de prendre une photo."</string>
     <string name="set_duration" msgid="5578035312407161304">"Définir la durée en secondes"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Compte à rebours avant la photo"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Se souvenir du lieu des photos ?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Ajoutez des tags à vos photos et à vos vidéos pour identifier l\'endroit de la prise de vue."\n\n"D\'autres applications peuvent accéder à ces informations, ainsi qu\'aux images enregistrées."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Ajoutez des tags à vos photos et à vos vidéos pour identifier l\'endroit de la prise de vue.\n\nD\'autres applications peuvent accéder à ces informations, ainsi qu\'aux images enregistrées."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Non, merci"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Oui"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Appareil photo"</string>
     <string name="menu_search" msgid="7580008232297437190">"Recherche"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Photos"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albums"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"PLUS D\'OPTIONS"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"PARAMÈTRES"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d photo"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d photos"</item>
diff --git a/res/values-hi/filtershow_strings.xml b/res/values-hi/filtershow_strings.xml
index 99d5e55..81123b8 100644
--- a/res/values-hi/filtershow_strings.xml
+++ b/res/values-hi/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"फ़ोटो संपादक"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"चित्र लोड नहीं हो सकता!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"मूल को संपादित नहीं कर सकते"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"वॉलपेपर सेट हो रहा है"</string>
+    <string name="download_failure" msgid="5923323939788582895">"फ़ोटो डाउनलोड नहीं किया जा सका. नेटवर्क अनुपलब्ध है."</string>
     <string name="original" msgid="3524493791230430897">"मूल"</string>
     <string name="borders" msgid="2067345080568684614">"बॉर्डर"</string>
+    <string name="custom_border" msgid="8679893731790931871">"कस्टम"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"पूर्ववत करें"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"फिर से करें"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"इतिहास दिखाएं"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"इतिहास छिपाएं"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"चित्र स्थिति दिखाएं"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"चित्र स्थिति छिपाएं"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"लागू प्रभाव दिखाएं"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"लागू प्रभाव छिपाएं"</string>
+    <string name="export_image" msgid="3202835713172222134">"निर्यात करें"</string>
+    <string name="print_image" msgid="1942989216591621413">"प्रिंट करें"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"चौरस चित्र निर्यात करें"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"निर्यात किया गया चित्र, इतिहास के बिना एक प्रतिलिपि होगा."</string>
+    <string name="quality" msgid="179292110309050529">"गुणवत्ता"</string>
+    <string name="size" msgid="4639404642236356037">"आकार"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"सेटिंग"</string>
     <string name="unsaved" msgid="8704442449002374375">"इस चित्र में न सहेजे गए बदलाव हैं."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"क्या आप बाहर निकलने के पहले सहेजना चाहते हैं?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"सहेजें और बाहर निकलें"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"पूर्ण रिज़ॉल्यूशन चित्र प्रोसेस हो रहा है..."</string>
     <string name="exit" msgid="242642957038770113">"बाहर निकलें"</string>
     <string name="history" msgid="455767361472692409">"इतिहास"</string>
     <string name="reset" msgid="9013181350779592937">"रीसेट करें"</string>
@@ -40,7 +49,7 @@
     <skip />
     <string name="imageState" msgid="8632586742752891968">"लागू किए गए प्रभाव"</string>
     <string name="compare_original" msgid="8140838959007796977">"तुलना करें"</string>
-    <string name="apply_effect" msgid="1218288221200568947">"लागू करें"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"*"</string>
     <string name="reset_effect" msgid="7712605581024929564">"रीसेट करें"</string>
     <string name="aspect" msgid="4025244950820813059">"पहलू"</string>
     <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"हाइलाइट"</string>
     <string name="curvesRGB" msgid="915010781090477550">"वक्र"</string>
     <string name="vignette" msgid="934721068851885390">"विनेट"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"विनेट"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"एक्सपोज़र"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"संतृप्तता"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"कंट्रास्ट"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"गिरावट"</string>
     <string name="redeye" msgid="4508883127049472069">"रेड आई"</string>
     <string name="imageDraw" msgid="6918552177844486656">"रेखांकन"</string>
     <string name="straighten" msgid="26025591664983528">"सीधा करें"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"नेगेटिव"</string>
     <string name="none" msgid="6633966646410296520">"कुछ नहीं"</string>
     <string name="edge" msgid="7036064886242147551">"किनारे"</string>
-    <string name="kmeans" msgid="1630263230946107457">"वारहोल"</string>
+    <string name="kmeans" msgid="2080952022674981541">"पोस्टराइज़ करें"</string>
     <string name="downsample" msgid="3552938534146980104">"डाउनसेंपल"</string>
+    <string name="grad" msgid="546774853424848655">"ग्रेजुएटेड"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"चमक"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"कंट्रास्ट"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"संतृप्तता"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"मुख्‍य"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"लाल"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"पीला"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"हरा"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"हरिताभ नीला"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"नीला"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"मैजेंटा"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"शैली"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"नई"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"लाल"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"हरा"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"नीला"</string>
     <string name="draw_style" msgid="2036125061987325389">"शैली"</string>
     <string name="draw_size" msgid="4360005386104151209">"आकार"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"रंग"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"संतृप्तता"</string>
+    <string name="draw_value" msgid="6571604055161538273">"चमक"</string>
     <string name="draw_color" msgid="2119030386987211193">"रंग"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"रेखाएं"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"मार्कर"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"स्पैटर"</string>
     <string name="draw_clear" msgid="6728155515454921052">"साफ़ करें"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"मोटाई"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"किनारे का आकार"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"रंग"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"साफ़ करें"</string>
     <string name="color_pick_select" msgid="734312818059057394">"कस्टम रंग चुनें"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"रंग चुनें"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"आकार चुनें"</string>
-    <string name="draw_size_accept" msgid="6781529716526190028">"ठीक"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"ठीक है"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"मूल"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"चित्र सहेजा जा रहा है"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"प्रोसस हो रहा है..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान प्रीसेट सहेजें"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"उपयोगकर्ता प्रीसेट प्रबंधित करें"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"नया प्रीसेट"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"नाम प्रीसेट करें"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"जानकारी"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"चित्र का नाम"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"चित्र का आकार"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"हिस्टोग्राम"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF डेटा"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"प्रीसेट"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"संस्करण"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"मूल"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"वर्तमान"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"मॉडल"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"एपर्चर"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"फ़ोकल लंबाई"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"विषय से दूरी"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"फ़ोटो लेने का दिनांक"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F स्टॉप"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"एक्स्पोज़र समय"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"कॉपीराइट"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3fdaf76..acf5964 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -32,13 +32,13 @@
     <string name="fail_to_load_image" msgid="6155388718549782425">"चित्र लोड नहीं हो सकी"</string>
     <string name="no_thumbnail" msgid="284723185546429750">"कोई थंबनेल नहीं"</string>
     <string name="resume_playing_restart" msgid="5471008499835769292">"पुन: प्रारंभ करें"</string>
-    <string name="crop_save_text" msgid="152200178986698300">"ठीक"</string>
-    <string name="ok" msgid="5296833083983263293">"ठीक"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"ठीक है"</string>
+    <string name="ok" msgid="5296833083983263293">"ठीक है"</string>
     <string name="multiface_crop_help" msgid="2554690102655855657">"शुरू करने के लिए कोई चेहरा स्‍पर्श करें."</string>
     <string name="saving_image" msgid="7270334453636349407">"चित्र सहेज रहा है…"</string>
     <string name="filtershow_saving_image" msgid="6659463980581993016">"चित्र <xliff:g id="ALBUM_NAME">%1$s</xliff:g> में सहेजा जा रहा है …"</string>
     <string name="save_error" msgid="6857408774183654970">"काट-छांट की गई चित्र को नहीं सहेज सका."</string>
-    <string name="crop_label" msgid="521114301871349328">"चित्र काटें"</string>
+    <string name="crop_label" msgid="521114301871349328">"चित्र काट-छांट करें"</string>
     <string name="trim_label" msgid="274203231381209979">"वीडियो ट्रिम करें"</string>
     <string name="select_image" msgid="7841406150484742140">"फ़ोटो को चुनें"</string>
     <string name="select_video" msgid="4859510992798615076">"वीडियो को चुनें"</string>
@@ -83,11 +83,12 @@
     <item quantity="one" msgid="5030162638216034260">"%1$d चयनित"</item>
     <item quantity="other" msgid="3512041363942842738">"%1$d चयनित"</item>
   </plurals>
-    <string name="show_on_map" msgid="6157544221201750980">"मानचित्र पर दिखाएं"</string>
+    <string name="show_on_map" msgid="6157544221201750980">"नक्शे पर दिखाएं"</string>
     <string name="rotate_left" msgid="5888273317282539839">"बाएं घुमाएं"</string>
     <string name="rotate_right" msgid="6776325835923384839">"दाएं घुमाएं"</string>
     <string name="no_such_item" msgid="5315144556325243400">"आइटम नहीं ढूंढा जा सका."</string>
     <string name="edit" msgid="1502273844748580847">"संपादित करें"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"सरल संपादन"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"संचय अनुरोध संसाधित कर रहा है"</string>
     <string name="caching_label" msgid="4521059045896269095">"संचय कर रहा है..."</string>
     <string name="crop_action" msgid="3427470284074377001">"काट-छांट करें"</string>
@@ -106,14 +107,14 @@
     <string name="no_location" msgid="4043624857489331676">"कोई स्थान नहीं"</string>
     <string name="no_connectivity" msgid="7164037617297293668">"नेटवर्क समस्‍याओं के कारण कुछ स्‍थानों को पहचाना नहीं जा सका."</string>
     <string name="sync_album_error" msgid="1020688062900977530">"इस एल्बम के फ़ोटो डाउनलोड नहीं किए जा सके. बाद में पुन: प्रयास करें."</string>
-    <string name="show_images_only" msgid="7263218480867672653">"केवल छवियां"</string>
+    <string name="show_images_only" msgid="7263218480867672653">"केवल चित्र"</string>
     <string name="show_videos_only" msgid="3850394623678871697">"केवल वीडियो"</string>
-    <string name="show_all" msgid="6963292714584735149">"छवियां और वीडियो"</string>
+    <string name="show_all" msgid="6963292714584735149">"चित्र और वीडियो"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"फ़ोटो गैलरी"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"कोई फ़ोटो नहीं."</string>
     <string name="crop_saved" msgid="1595985909779105158">"काट-छांट की गई चित्र को <xliff:g id="FOLDER_NAME">%s</xliff:g> में सहेजा गया."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"कोई एल्‍बम उपलब्‍ध नहीं."</string>
-    <string name="empty_album" msgid="4542880442593595494">"O छवियां/वीडियो उपलब्‍ध."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O चित्र/वीडियो उपलब्‍ध."</string>
     <string name="picasa_posts" msgid="1497721615718760613">"पोस्ट"</string>
     <string name="make_available_offline" msgid="5157950985488297112">"ऑफ़लाइन उपलब्ध कराएं"</string>
     <string name="sync_picasa_albums" msgid="8522572542111169872">"रीफ्रेश करें"</string>
@@ -176,7 +177,7 @@
     <string name="widget_type_album" msgid="6013045393140135468">"कोई एल्बम चुनें"</string>
     <string name="widget_type_shuffle" msgid="8594622705019763768">"सभी छवियों का क्रम बदलें"</string>
     <string name="widget_type_photo" msgid="6267065337367795355">"कोई चित्र चुनें"</string>
-    <string name="widget_type" msgid="1364653978966343448">"छवियां चुनें"</string>
+    <string name="widget_type" msgid="1364653978966343448">"चित्र चुनें"</string>
     <string name="slideshow_dream_name" msgid="6915963319933437083">"स्लाइडशो"</string>
     <string name="albums" msgid="7320787705180057947">"एल्बम"</string>
     <string name="times" msgid="2023033894889499219">"इतने बार"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"कैमरे से कनेक्‍ट नहीं कर सकता."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"सुरक्षा नीतियों के कारण कैमरा अक्षम कर दिया गया है."</string>
     <string name="camera_label" msgid="6346560772074764302">"कैमरा"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"कैमकॉर्डर"</string>
     <string name="wait" msgid="8600187532323801552">"कृपया प्रतीक्षा करें..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"कैमरे का उपयोग करने से पहले USB संग्रहण माउंट करें."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"कैमरे का उपयोग करने से पहले SD कार्ड डालें."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"कैमरा सेटिंग"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"कैमकॉर्डर सेटिंग"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"चित्र आकार"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M पिक्सेल (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"स्वत:"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"अनंत"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"मैक्रो"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"स्वत:"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"अनंत"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"मैक्रो"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"फ़्लैश मोड"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"फ़्लैश मोड"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"स्वत:"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"चालू"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"बंद"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"फ़्लैश स्वत:"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"फ़्लैश चालू"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"फ़्लैश बंद"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"श्वेत संतुलन"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"श्वेत संतुलन"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"स्वत:"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"अत्यधिक चमकीला"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"दिन का प्रकाश"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"फ़्लोरेसेंट"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"बदली"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"स्वत:"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"अत्यधिक चमकीला"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"दिन का प्रकाश"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"फ़्लोरेसेंट"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"बादलयुक्त"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"दृश्य मोड"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"स्वत:"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,13 +297,28 @@
     <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>
+    <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>
+    <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 />
-    <string name="dialog_ok" msgid="6263301364153382152">"ठीक"</string>
-    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"आपके USB संग्रहण में स्थान कम है. गुणवत्ता सेटिंग बदलें या कुछ छवियां या अन्य फ़ाइलें हटाएं."</string>
-    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"आपके SD कार्ड में स्थान कम है. गुणवत्ता सेटिंग बदलें या कुछ छवियां या अन्य फ़ाइलें हटाएं."</string>
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"आपके USB संग्रहण में स्थान कम है. गुणवत्ता सेटिंग बदलें या कुछ चित्र या अन्य फ़ाइलें हटाएं."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"आपके SD कार्ड में स्थान कम है. गुणवत्ता सेटिंग बदलें या कुछ चित्र या अन्य फ़ाइलें हटाएं."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"आकार सीमा पहुंची."</string>
     <string name="pano_too_fast_prompt" msgid="2823839093291374709">"बहुत तेज़"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"पैनोरामा तैयार हो रहा है"</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"अंतरिक्ष में"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"सूर्यास्त"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"आपका वीडियो"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"अपने उपकरण को सेट करें."\n"कुछ समय के लिए दृश्य से बाहर निकलें."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"अपने उपकरण को सेट करें.\nकुछ समय के लिए दृश्य से बाहर निकलें."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"रिकॉर्डिंग के दौरान फ़ोटो लेने के लिए स्‍पर्श करें."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"वीडियो रिकॉर्डिंग प्रारंभ हो गई है."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"वीडियो रिकॉर्डिंग रुक गई है."</string>
@@ -319,7 +351,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"शटर बटन"</string>
     <string name="accessibility_menu_button" msgid="7140794046259897328">"मेनू बटन"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"हाल ही का फ़ोटो"</string>
-    <string name="accessibility_camera_picker" msgid="8807945470215734566">"अगला और पिछला कैमरा स्‍विच"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"सामने और पीछे के कैमरा का स्‍विच"</string>
     <string name="accessibility_mode_picker" msgid="3278002189966833100">"कैमरा, वीडियो या पैनोरामा चयनकर्ता"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"अधिक सेटिंग नियंत्रण"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"सेटिंग नियंत्रण बंद करें"</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"वीडियो पर स्विच करें"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"पैनोरामा पर स्विच करें"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"नए पैनोरामा पर स्विच करें"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"रीफ़ोकस पर स्विच करें"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"समीक्षा रद्द कर दी गई"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"समीक्षा पूर्ण"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"समीक्षा रीटेक"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"वीडियो चलाएं"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"वीडियो पॉज़ करें"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"वीडियो पुन: लोड करें"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"वीडियो प्लेयर समय बार"</string>
     <string name="capital_on" msgid="5491353494964003567">"चालू"</string>
     <string name="capital_off" msgid="7231052688467970897">"बंद"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"बंद"</string>
@@ -385,14 +422,16 @@
     <string name="set_timer_help" msgid="5007708849404589472">"काउंटडाउन टाइमर बंद है. चित्र लेने से पहले उल्‍टी गिनती करने के लिए इसे चालू करें."</string>
     <string name="set_duration" msgid="5578035312407161304">"अवधि को सेकंड में सेट करें"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"फ़ोटो लेने के लिए उल्टी गिनती कर रहा है"</string>
-    <string name="remember_location_title" msgid="9060472929006917810">"फ़ोटो के स्थान याद हैं?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"अपने फ़ोटो और वीडियो को उन स्थानों के साथ टैग करें जहां वे लिए गए हैं."\n\n"अन्य एप्लिकेशन आपके सहेजे गए चित्रों सहित इस जानकारी का उपयोग कर सकते हैं."</string>
-    <string name="remember_location_no" msgid="7541394381714894896">"नहीं, धन्‍यवाद"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"फ़ोटो के स्थान याद रखना हैं?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"अपने फ़ोटो और वीडियो को उन स्थानों के साथ टैग करें जहां वे लिए गए हैं.\n\nअन्य एप्स आपके सहेजे गए चित्रों सहित इस जानकारी का उपयोग कर सकते हैं."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"नहीं, रहने दें"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"हां"</string>
     <string name="menu_camera" msgid="3476709832879398998">"कैमरा"</string>
     <string name="menu_search" msgid="7580008232297437190">"खोज"</string>
     <string name="tab_photos" msgid="9110813680630313419">"फ़ोटो"</string>
     <string name="tab_albums" msgid="8079449907770685691">"एल्बम"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"अधिक विकल्प"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"सेटिंग"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d फ़ोटो"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d फ़ोटो"</item>
diff --git a/res/values-hr/filtershow_strings.xml b/res/values-hr/filtershow_strings.xml
index 7403dd8..01068dc 100644
--- a/res/values-hr/filtershow_strings.xml
+++ b/res/values-hr/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Uređivač fotografija"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Nije moguće učitati sliku!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Izvornik se ne može urediti"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Postavljanje pozadinske slike"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Fotografija nije preuzeta. Mreža nije dostupna."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Obrubi"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Prilagođeno"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Poništi"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Ponovi"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Prikaži povijest"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Sakrij povijest"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Prikaži stanje slike"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Sakrij stanje slike"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Prikaži primijenjene efekte"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Sakrij primijenjene efekte"</string>
+    <string name="export_image" msgid="3202835713172222134">"Izvezi"</string>
+    <string name="print_image" msgid="1942989216591621413">"Ispis"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Izvoz spljoštene slike"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Izvezena slika bit će kopija, bez povijesti."</string>
+    <string name="quality" msgid="179292110309050529">"Kvaliteta"</string>
+    <string name="size" msgid="4639404642236356037">"Veličina"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Postavke"</string>
     <string name="unsaved" msgid="8704442449002374375">"Neke promjene slike nisu spremljene."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Želite li spremiti prije nego što iziđete?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Spremanje i izlaz"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Obrada slike u punoj razlučivosti..."</string>
     <string name="exit" msgid="242642957038770113">"Izlaz"</string>
     <string name="history" msgid="455767361472692409">"Povijest"</string>
     <string name="reset" msgid="9013181350779592937">"Poništi"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Isticanja"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Krivulje"</string>
     <string name="vignette" msgid="934721068851885390">"Vinjeta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjeta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Ekspozicija"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Zasićenost"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"S kontrastom"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Slab. svjetline"</string>
     <string name="redeye" msgid="4508883127049472069">"Crvene oči"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Crtanje"</string>
     <string name="straighten" msgid="26025591664983528">"Poravnanje"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativ"</string>
     <string name="none" msgid="6633966646410296520">"Ništa"</string>
     <string name="edge" msgid="7036064886242147551">"Rubovi"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posteriz."</string>
     <string name="downsample" msgid="3552938534146980104">"Smanji"</string>
+    <string name="grad" msgid="546774853424848655">"Stupnjevano"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Svjetlina"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"S kontrastom"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Zasićenost"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Glavno"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Crvena"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Žuta"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zelena"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cijan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Plava"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Grimizna"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"novo"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Crveno"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Zeleno"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Plavo"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
     <string name="draw_size" msgid="4360005386104151209">"Veličina"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Ton"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Zasićenost"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Svjetlina"</string>
     <string name="draw_color" msgid="2119030386987211193">"Boja"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Crte"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Oznaka"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Prskanje"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Izbriši"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Debljina"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Veličina kuta"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Boja"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Izbriši"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Odabir prilagođene boje"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Odabir boje"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Odabir veličine"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"U redu"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Izvornik"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Rezultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Spremanje slike"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"U obradi..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Spremi trenutačnu postavku"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Upravljaj korisnič. postavkama"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nova definirana postavka"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Naziv definirane postavke"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informacije"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Naziv slike"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Veličina slike"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Podaci EXIF prikaza"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Definirano"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Verzija"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Izvornik"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Trenutačno"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Otvor blende"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Žarišna duljina"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Udaljenost predmeta"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Datum snimanja"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Vrijeme ekspozicije"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autorska prava"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3e3c33a..09d8478 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Rotiraj udesno"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Nije moguće pronaći stavku."</string>
     <string name="edit" msgid="1502273844748580847">"Uredi"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Osnovno uređivanje"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Obrada zahtjeva za predmemoriju"</string>
     <string name="caching_label" msgid="4521059045896269095">"U predmemoriju…"</string>
     <string name="crop_action" msgid="3427470284074377001">"Obreži"</string>
@@ -150,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Plavo"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Crno-bijelo"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Žućkasto"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"X Process"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Bijela kava"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litografija"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Povezivanje s fotoaparatom nije moguće."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Fotoaparat je onemogućen zbog sigurnosnih pravila."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparat"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Kamera"</string>
     <string name="wait" msgid="8600187532323801552">"Pričekajte…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Prije upotrebe fotoaparata instalirajte USB memoriju."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Prije upotrebe fotoaparata umetnite SD karticu."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Natrag"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Naprijed"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Lokacija pohranjivanja"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOKACIJA"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Timer za odbrojavanje"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 sekunda"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Postavke fotoaparata"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Postavke kamere"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Veličina slike"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapiksela"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapiksela"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 mpiks.(16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatski"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Beskonačno"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMATSKI"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"BESKONAČNO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Način bljeskalice"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"NAČIN BLJESKALICE"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatski"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Uključeno"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Isključeno"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMATSKA BLJESKALICA"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BLJESKALICA UKLJUČENA"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"BLJESKALICA ISKLJUČENA"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balans bijele boje"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALANS BIJELE"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatski"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Svjetlosni izvor sa žarnom niti"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Dnevno svjetlo"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescentno"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Oblačno"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMATSKI"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"SVJETLOST ŽARULJE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DNEVNO SVJETLO"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENTNO"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"OBLAČNO"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Način scene"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatski"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noć"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zalazak sunca"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Zabava"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NIŠTA"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"RADNJA"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOĆ"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ZALAZAK SUNCA"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"ZABAVA"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"MJERAČ VREMENA ZA ODBROJAVANJE"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ODBROJAVANJE JE ISKLJUČENO"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUNDA"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDE"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUNDI"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUNDI"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"U načinu scene ne može se odabirati."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozicija"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EKSPOZICIJA"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"VDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"PREDNJI FOTOAPARAT"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"STRAŽNJI FOTOAPARAT"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"U redu"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Na vašoj USB memoriji ponestaje prostora. Primijenite postavku kvalitete ili izbrišite neke slike ili druge datoteke."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na vašoj kartici SD ponestaje prostora. Primijenite postavku kvalitete ili izbrišite neke slike ili druge datoteke."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"U svemiru"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zalazak sunca"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Vaš videozapis"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"U nastavku postavite ​​uređaj."\n"Odmaknite se na trenutak."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"U nastavku postavite ​​uređaj.\nOdmaknite se na trenutak."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Dodirnite za fotografiranje tijekom snimanja."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Pokrenuto je snimanje videozapisa."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Zaustavljeno je snimanje videozapisa."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Prebaci na videozapis"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Prebaci na panoramski način"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Prijeđi na novu panoramu"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Prebaci na promjenu fokusa"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Odustani"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Završeno"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Ponovi snimanje u pregledu"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Reproduciraj videozapis"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pauziraj videozapis"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Ponovno učitaj videozapis"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Vremenska traka reprodukcije videozapisa"</string>
     <string name="capital_on" msgid="5491353494964003567">"UKLJUČI"</string>
     <string name="capital_off" msgid="7231052688467970897">"ISKLJUČI"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Isključeno"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Postavite trajanje u sekundama"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Odbrojavanje do snimanja fotografije"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Zapamtiti lokacije fotografija?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Dodajte svojim fotografijama i videozapisima oznake lokacija na kojima su snimljeni."\n\n"Ostale aplikacije mogu pristupiti tim podacima s vašim spremljenim slikama."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Dodajte svojim fotografijama i videozapisima oznake lokacija na kojima su snimljeni.\n\nOstale aplikacije mogu pristupiti tim podacima s vašim spremljenim slikama."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Ne, hvala"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Da"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Fotoaparat"</string>
     <string name="menu_search" msgid="7580008232297437190">"Pretraživanje"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotografije"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumi"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"DODATNE OPCIJE"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"POSTAVKE"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d slika"</item>
     <item quantity="other" msgid="3813306834113858135">"Br. slika: %1$d"</item>
diff --git a/res/values-hu/filtershow_strings.xml b/res/values-hu/filtershow_strings.xml
index 769c62b..ab1c5c7 100644
--- a/res/values-hu/filtershow_strings.xml
+++ b/res/values-hu/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Fényképszerkesztő"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Nem sikerült betölteni a képet!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Az eredetit nem lehet szerkeszteni."</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Háttérkép beállítása"</string>
+    <string name="download_failure" msgid="5923323939788582895">"A fénykép letöltése nem sikerült. A hálózat nem érhető el."</string>
     <string name="original" msgid="3524493791230430897">"Eredeti"</string>
     <string name="borders" msgid="2067345080568684614">"Szegélyek"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Egyéni"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Visszavonás"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Ismétlés"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Előzmények"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Előzmények elrejtése"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Képállapot"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Állapot elrejtés"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Alkalmazott effektek"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Alkalmazott effektek elrejtése"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportálás"</string>
+    <string name="print_image" msgid="1942989216591621413">"Nyomtatás"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Egyrétegű kép exportálása"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Az exportált kép előzmények nélküli másolat lesz."</string>
+    <string name="quality" msgid="179292110309050529">"Minőség"</string>
+    <string name="size" msgid="4639404642236356037">"Méret"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Beállítások"</string>
     <string name="unsaved" msgid="8704442449002374375">"Nem mentett módosítások vannak a képen."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Szeretne menteni a kilépés előtt?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Mentés és kilépés"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Teljes felbontású kép feldolgozása..."</string>
     <string name="exit" msgid="242642957038770113">"Kilépés"</string>
     <string name="history" msgid="455767361472692409">"Előzmények"</string>
     <string name="reset" msgid="9013181350779592937">"Visszaállítás"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Kiemelések"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Görbék"</string>
     <string name="vignette" msgid="934721068851885390">"Vignetta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignettálás"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Expozíció"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Telítettség"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontraszt"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Fényveszteség"</string>
     <string name="redeye" msgid="4508883127049472069">"Vörösszem"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Rajzok"</string>
     <string name="straighten" msgid="26025591664983528">"Kiegyenesítés"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatív"</string>
     <string name="none" msgid="6633966646410296520">"Nincs"</string>
     <string name="edge" msgid="7036064886242147551">"Szélek"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Poszterizálás"</string>
     <string name="downsample" msgid="3552938534146980104">"Kicsinyítés"</string>
+    <string name="grad" msgid="546774853424848655">"Átmenetes"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Fényerő"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontraszt"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Telítettség"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Elsődleges"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Piros"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Sárga"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zöld"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Zöldeskék"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Kék"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stílus"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"új"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Piros"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Zöld"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Kék"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stílus"</string>
     <string name="draw_size" msgid="4360005386104151209">"Méret"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Színárnyalat"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Telítettség"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Fényerő"</string>
     <string name="draw_color" msgid="2119030386987211193">"Szín"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Vonalak"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Filctoll"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Fröcskölés"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Törlés"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Vastagság"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Sarokméret"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Szín"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Törlés"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Egyéni szín kiválasztása"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Szín kiválasztása"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Méret kiválasztása"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Eredeti"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Eredmény"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Kép mentése"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Feldolgozás…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Jelenlegi sablon mentése"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Felhasználói beállítások"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Új sablon"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Sablon neve"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Információ"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Képnév"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Képméret"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Hisztogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-adatok"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Sablon"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Verzió"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Eredeti"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Aktuális"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modell"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Rekesz"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Fókusztávolság"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Téma távolsága"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Készítés dátuma"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F-szám"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Expozíciós idő"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Szerzői jog"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b348679..ff52a96 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -40,7 +40,7 @@
     <string name="save_error" msgid="6857408774183654970">"Nem lehet menteni a vágott képet."</string>
     <string name="crop_label" msgid="521114301871349328">"Kép levágása"</string>
     <string name="trim_label" msgid="274203231381209979">"Videó vágása"</string>
-    <string name="select_image" msgid="7841406150484742140">"Fénykép kiválasztása"</string>
+    <string name="select_image" msgid="7841406150484742140">"Fotó kiválasztása"</string>
     <string name="select_video" msgid="4859510992798615076">"Videó kiválasztása"</string>
     <string name="select_item" msgid="2816923896202086390">"Elem kiválasztása"</string>
     <string name="select_album" msgid="1557063764849434077">"Album kiválasztása"</string>
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Forgatás jobbra"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Nem található az elem."</string>
     <string name="edit" msgid="1502273844748580847">"Szerkesztés"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Egyszerű szerkesztés"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Tárolási kérelmek feldolgozása"</string>
     <string name="caching_label" msgid="4521059045896269095">"Gyorsítótárazás..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Körbevágás"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Nem lehet csatlakozni a kamerához."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"A biztonsági házirendek miatt a kamera le van tiltva."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="wait" msgid="8600187532323801552">"Kérjük, várjon..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Kérjük, csatoljon egy USB-tárat a kamera használata előtt."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"A kamera használatához helyezzen be egy SD-kártyát."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Vissza"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Előre néző"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Hely tárolása"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"HELY"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Visszaszámlálás-időzítő"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 másodperc"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera beállításai"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamera beállításai"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Képméret"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapixel"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixel"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapixel"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 MP (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatikus"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Végtelen"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makró"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMATIKUS"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"VÉGTELEN"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRÓ"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Vakumód"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"VAKU MÓD"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatikus"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Be"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Ki"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMATIKUS VAKU"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"VAKU BEKAPCSOLVA"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"VAKU KIKAPCSOLVA"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Fehéregyensúly"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"FEHÉREGYENSÚLY"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatikus"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Izzólámpa"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Nappali fény"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fénycső"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Felhős"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMATIKUS"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"IZZÓLÁMPA"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"NAPPALI FÉNY"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FÉNYCSŐ"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"FELHŐS"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Kép jellege"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatikus"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Éjszakai"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Napnyugta"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Buli"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"EGYIK SEM"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"AKCIÓ"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"ÉJSZAKA"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"NAPNYUGTA"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"BULI"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"VISSZASZÁMLÁLÁS-IDŐZÍTŐ"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"IDŐZÍTŐ KI"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 MÁSODPERC"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 MÁSODPERC"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 MÁSODPERC"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 MÁSODPERC"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Nem választható ebben a módban."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Megvilágítás"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPONÁLÁS"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"ELÜLSŐ KAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"HÁTSÓ KAMERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Az USB-táron kezd elfogyni a hely. Módosítsa a minőségi beállításokat, vagy töröljön néhány képet vagy egyéb fájlt."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Az SD-kártyán kezd elfogyni a hely. Módosítsa a minőségi beállításokat, vagy töröljön néhány képet vagy egyéb fájlt."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Az űrben"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Napnyugta"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Saját videó"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Tegye le a készüléket."\n"Lépjen ki a képből egy pillanatra."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Tegye le a készüléket.\nLépjen ki a képből egy pillanatra."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Érintse meg fotó készítéséhez felvétel közben."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"A videorögzítés elindult."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"A videorögzítés leállt."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Videó mód"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Panoráma mód"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Váltás az új Panoráma módra"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Váltás újrafókuszálásra"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Törlés"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Kész"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Ellenőrzés – új felvétel"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Videó lejátszása"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Videó szüneteltetése"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Videó újratöltése"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Videolejátszó idősávja"</string>
     <string name="capital_on" msgid="5491353494964003567">"BE"</string>
     <string name="capital_off" msgid="7231052688467970897">"KI"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Ki"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Időtartam megadása másodpercben"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Visszaszámlálás a fényképezésig"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Szeretné eltárolni a felvételek helyszínét?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Címkézze fel a fotókat és videókat a hellyel, ahol készítette őket."\n\n"Más alkalmazások hozzáférnek ehhez az információhoz és a mentett képekhez."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Címkézze fel a fotókat és videókat a hellyel, ahol készítette őket.\n\nMás alkalmazások hozzáférnek ehhez az információhoz és a mentett képekhez."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nem, köszönöm."</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Igen"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Keresés"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotók"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumok"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"TOVÁBBI LEHETŐSÉGEK"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"BEÁLLÍTÁSOK"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d fotó"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotó"</item>
diff --git a/res/values-hy-rAM/filtershow_strings.xml b/res/values-hy-rAM/filtershow_strings.xml
new file mode 100644
index 0000000..26863d8
--- /dev/null
+++ b/res/values-hy-rAM/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Լուսանկարի խմբագրիչ"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Չհաջողվեց բեռնել պատկերը:"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Հնարավոր չէ խմբագրել բնօրինակը"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Պաստառը տեղադրվում է"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Չհաջողվեց ներբեռնել լուսանկարը: Ցանցն անհասանելի է:"</string>
+    <string name="original" msgid="3524493791230430897">"Բնօրինակ"</string>
+    <string name="borders" msgid="2067345080568684614">"Սահմանները"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Հատուկ"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Հետարկել"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Կրկնել"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Ցույց տալ կիրառված էֆեկտները"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Թաքցնել կիրառված էֆեկտները"</string>
+    <string name="export_image" msgid="3202835713172222134">"Արտահանել"</string>
+    <string name="print_image" msgid="1942989216591621413">"Տպել"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Արտահանել հարթված պատկերը"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Արտահանված պատկերը կլինի պատճեն՝ առանց պատմության:"</string>
+    <string name="quality" msgid="179292110309050529">"Որակը"</string>
+    <string name="size" msgid="4639404642236356037">"Չափը"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Կարգավորումներ"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Կան չպահված փոփոխություններ այս պատկերի վրա:"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Ուզո՞ւմ եք պահել դուրս գալուց առաջ"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Պահել և դուրս գալ"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Մշակվում է լրիվ լուծաչափով պատկերը..."</string>
+    <string name="exit" msgid="242642957038770113">"Ելք"</string>
+    <string name="history" msgid="455767361472692409">"Պատմություն"</string>
+    <string name="reset" msgid="9013181350779592937">"Վերակայել"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Կիրառված էֆեկտներ"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Համեմատել"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Կիրառել"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Վերակայել"</string>
+    <string name="aspect" msgid="4025244950820813059">"Տեսակետ"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Ոչ մեկը"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Ամրակայված"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Փոքր Երկիր"</string>
+    <string name="exposure" msgid="6526397045949374905">"Լուսավորություն"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Հստակություն"</string>
+    <string name="contrast" msgid="2310908487756769019">"Ցայտունություն"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Տատանում"</string>
+    <string name="saturation" msgid="7026791551032438585">"Հագեցում"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"Սև/Սպ զտիչ"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Ինքնագույն"</string>
+    <string name="hue" msgid="6231252147971086030">"Գուներանգ"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Ստվերներ"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Լուսային էֆեկտ"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Կորեր"</string>
+    <string name="vignette" msgid="934721068851885390">"Շրջանակ"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Շրջանակ"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Լուսավորություն"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Հագեցում"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Ցայտունություն"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Տարէջք"</string>
+    <string name="redeye" msgid="4508883127049472069">"Կարմիր աչք"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Նկարել"</string>
+    <string name="straighten" msgid="26025591664983528">"Կարգի բերել"</string>
+    <string name="crop" msgid="5781263790107850771">"Եզրատել"</string>
+    <string name="rotate" msgid="2796802553793795371">"Պտտել"</string>
+    <string name="mirror" msgid="5482518108154883096">"Հայելային"</string>
+    <string name="negative" msgid="6998313764388022201">"Բացասական"</string>
+    <string name="none" msgid="6633966646410296520">"Ոչ մեկը"</string>
+    <string name="edge" msgid="7036064886242147551">"Եզրեր"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Պաստառացում"</string>
+    <string name="downsample" msgid="3552938534146980104">"Ցածրորակ"</string>
+    <string name="grad" msgid="546774853424848655">"Խտացված"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Պայծառություն"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Ցայտունություն"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Հագեցում"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Հիմնական"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Կարմիր"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Դեղին"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Կանաչ"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Երկնագույն"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Կապույտ"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Մանուշակագույն"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Ոճը"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"նոր"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Կարմիր"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Կանաչ"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Կապույտ"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Ոճ"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Չափ"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Գուներանգ"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Հագեցում"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Պայծառություն"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Գույն"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Գծեր"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Նշիչ"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Ցայտել"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Մաքրել"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Հաստությունը"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Անկյունի չափը"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Գույնը"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Մաքրել"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Ընտրել հատուկ գույն"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Ընտրել գույնը"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Ընտրել չափը"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"Լավ"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Բնօրինակ"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Արդյունք"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Պատկերը պահվում է"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Մշակվում է..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Պահել ներկայիս նախակայումը"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Կառավարել օգտվողի նախակայումները"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Նոր նախակայում"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Նախակայման անունը"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Տեղեկություններ"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Պատկերի անունը"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Պատկերի չափը"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Ժամանակագրություն"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF տվյալներ"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Նախակայումը"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Տարբերակը"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Բնօրինակը"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Ընթացիկը"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Մոդելը"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Բացվածքը"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Ֆոկուսի չափը"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Սուբյեկտի հեռավորությունը"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Լուսանկարման ամսաթիվը"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Լուսավորման ժամանակը"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Հեղինակային իրավունք"</string>
+</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000..89a7be4
--- /dev/null
+++ b/res/values-hy-rAM/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Պատկերասրահ"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Նկարի շրջանակ"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Տեսանվագարկիչ"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Տեսանյութը բեռնվում է..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"Բեռնվում է պատկերը..."</string>
+    <string name="loading_account" msgid="928195413034552034">"Հաշիվը բեռնվում է..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Վերսկսել տեսանյութը"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"Վերսկսե՞լ նվագարկումը %s-ից"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Վերսկսել նվագարկումը"</string>
+    <string name="loading" msgid="7038208555304563571">"Բեռնում..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Չհաջողվեց բեռնել"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Չհաջողվեց բեռնել պատկերը"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"Առանց մանրապատկերի"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Սկսել"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"Լավ"</string>
+    <string name="ok" msgid="5296833083983263293">"Լավ"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Դիպչեք դեմքին՝ սկսելու համար:"</string>
+    <string name="saving_image" msgid="7270334453636349407">"Պատկերը պահվում է..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Նկարը պահվում է <xliff:g id="ALBUM_NAME">%1$s</xliff:g>-ում..."</string>
+    <string name="save_error" msgid="6857408774183654970">"Չհաջողվեց պահել եզրատված պատկերը:"</string>
+    <string name="crop_label" msgid="521114301871349328">"Եզրատել նկարը"</string>
+    <string name="trim_label" msgid="274203231381209979">"Կտրել տեսանյութը"</string>
+    <string name="select_image" msgid="7841406150484742140">"Ընտրել լուսանկար"</string>
+    <string name="select_video" msgid="4859510992798615076">"Ընտրել տեսանյութ"</string>
+    <string name="select_item" msgid="2816923896202086390">"Ընտրել նյութ"</string>
+    <string name="select_album" msgid="1557063764849434077">"Ընտրել ալբոմ"</string>
+    <string name="select_group" msgid="6744208543323307114">"Ընտրել խումբ"</string>
+    <string name="set_image" msgid="2331476809308010401">"Սահմանել նկարը որպես"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Սահմանել պաստառ"</string>
+    <string name="wallpaper" msgid="140165383777262070">"Տեղադրում ենք պաստառը..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Պաստառ"</string>
+    <string name="delete" msgid="2839695998251824487">"Ջնջել"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Ջնջե՞լ ընտրված նյութը:"</item>
+    <item quantity="other" msgid="5874316486520635333">"Ջնջե՞լ ընտրված տարրերը"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Հաստատել"</string>
+    <string name="cancel" msgid="3637516880917356226">"Չեղարկել"</string>
+    <string name="share" msgid="3619042788254195341">"Կիսվել"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Կիսվել համայնապատկերով"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Կիսվել որպես լուսանկար"</string>
+    <string name="deleted" msgid="6795433049119073871">"Ջնջված է"</string>
+    <string name="undo" msgid="2930873956446586313">"Հետարկել"</string>
+    <string name="select_all" msgid="3403283025220282175">"Ընտրել բոլորը"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Ապանշել բոլորը"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Ներկայացում"</string>
+    <string name="details" msgid="8415120088556445230">"Մանրամասներ"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d of %2$d տարր՝"</string>
+    <string name="close" msgid="5585646033158453043">"Փակել"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Փոխարկել դեպի ֆոտոխցիկ"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d ընտրված"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d ընտրված"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d ընտրված"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d ընտրված"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d ընտրված"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d ընտրված"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d ընտրված"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d ընտրված"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d ընտրված"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Ցույց տալ քարտեզի վրա"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Պտտել ձախ"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Պտտել աջ"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Հնարավոր չէ գտնել տարրը:"</string>
+    <string name="edit" msgid="1502273844748580847">"Խմբագրել"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Պարզ խմբագրում"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Մշակվում են քեշավորման հարցումները"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Քեշավորում..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"Կտրել"</string>
+    <string name="trim_action" msgid="703098114452883524">"Կտրել"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Խլացնել"</string>
+    <string name="set_as" msgid="3636764710790507868">"Սահմանել որպես"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Հնարավոր չէ համրեցնել տեսանյութը:"</string>
+    <string name="video_err" msgid="7003051631792271009">"Անհնար է նվագարկել տեսանյութը:"</string>
+    <string name="group_by_location" msgid="316641628989023253">"Ըստ տեղանքի"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"Ըստ ժամանակի"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"Ըստ պիտակների"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"Ըստ մարդկանց"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"Ըստ ալբոմների"</string>
+    <string name="group_by_size" msgid="153766174950394155">"Ըստ չափի"</string>
+    <string name="untagged" msgid="7281481064509590402">"Չպիտակավորված"</string>
+    <string name="no_location" msgid="4043624857489331676">"Տեղանքներ չկան"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Որոշ տեղանքներ անհնար է նույնականացնել՝ ցանցին միացման խնդիրների պատճառով:"</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Չհաջողվեց ներբեռնել լուսանկարները այս ալբոմի մեջ: Փորձեք ավելի ուշ:"</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Միայն նկարները"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Միայն տեսանյութերը"</string>
+    <string name="show_all" msgid="6963292714584735149">"Նկարներ և տեսանյութեր"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Պատկերասրահ"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"Լուսանկարներ չկան:"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Եզրատված պատկերը պահվել է <xliff:g id="FOLDER_NAME">%s</xliff:g>-ում:"</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"Հասանելի ալբոմներ չկան:"</string>
+    <string name="empty_album" msgid="4542880442593595494">"O նկարներ/տեսանյութեր հասանելի են:"</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Գրառումներ"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Հասանելի դարձնել անցանց"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Թարմացնել"</string>
+    <string name="done" msgid="217672440064436595">"Կատարված է"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"նյութ %1$d` %2$d-ից"</string>
+    <string name="title" msgid="7622928349908052569">"Վերնագիր"</string>
+    <string name="description" msgid="3016729318096557520">"Նկարագրություն"</string>
+    <string name="time" msgid="1367953006052876956">"Ժամանակը"</string>
+    <string name="location" msgid="3432705876921618314">"Տեղակայում"</string>
+    <string name="path" msgid="4725740395885105824">"Ուղի"</string>
+    <string name="width" msgid="9215847239714321097">"Լայնությունը"</string>
+    <string name="height" msgid="3648885449443787772">"Հասակ"</string>
+    <string name="orientation" msgid="4958327983165245513">"Դիրքավորում"</string>
+    <string name="duration" msgid="8160058911218541616">"Տևողությունը"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME-տեսակը"</string>
+    <string name="file_size" msgid="8486169301588318915">"Ֆայլի չափը"</string>
+    <string name="maker" msgid="7921835498034236197">"Ստեղծող"</string>
+    <string name="model" msgid="8240207064064337366">"Մոդել"</string>
+    <string name="flash" msgid="2816779031261147723">"Լուսաթարթիչ"</string>
+    <string name="aperture" msgid="5920657630303915195">"Բացվածք"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Ֆոկուսի չափը"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Սպիտակի կշիռ"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Լուսավորման ժամանակը"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"մմ"</string>
+    <string name="manual" msgid="6608905477477607865">"Ձեռքով"</string>
+    <string name="auto" msgid="4296941368722892821">"Ինքնուրույն"</string>
+    <string name="flash_on" msgid="7891556231891837284">"Լուսաթարթիչը միացված է"</string>
+    <string name="flash_off" msgid="1445443413822680010">"Առանց լուսաթարթիչ"</string>
+    <string name="unknown" msgid="3506693015896912952">"Անհայտ"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Բնօրինակ"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Հնորակ"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Ակնթարթային"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Սպիտակեցնել"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Կապույտ"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"Սև/Սպ"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Դեղնարկիչ"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X Գործընթաց"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Լատտե"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Լիտոգրաֆ"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Ալբոմը հասանելի դարձնել անցանց:"</item>
+    <item quantity="other" msgid="4948604338155959389">"Ալբոմները հասանելի դարձնել անցանց:"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Նյութը պահվում է տեղում և հասանելի է անցանց:"</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"Բոլոր ալբոմները"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Տեղային ալբոմներ"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP սարքեր"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa ալբոմներ"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> ազատ"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> կամ փոքր"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> կամ ավելի մեծ"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g>-ից <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"Ներմուծել"</string>
+    <string name="import_complete" msgid="3875040287486199999">"Ներմուծումն ավարտված է"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Ներմուծը չի հաջողվել"</string>
+    <string name="camera_connected" msgid="916021826223448591">"Ֆոտոխցիկը միացված է:"</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Ֆոտոխցիկն անջատված է:"</string>
+    <string name="click_import" msgid="6407959065464291972">"Հպեք այստեղ՝ մուտքագրման համար"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Ընտրել ալբոմ"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Խառնել բոլոր պատկերները"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Ընտրել պատկեր"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Ընտրեք պատկերներ"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Ներկայացում"</string>
+    <string name="albums" msgid="7320787705180057947">"Ալբոմներ"</string>
+    <string name="times" msgid="2023033894889499219">"Ժամանակներ"</string>
+    <string name="locations" msgid="6649297994083130305">"Տեղանքներ"</string>
+    <string name="people" msgid="4114003823747292747">"Մարդիկ"</string>
+    <string name="tags" msgid="5539648765482935955">"Պիտակներ"</string>
+    <string name="group_by" msgid="4308299657902209357">"Խմբավորել"</string>
+    <string name="settings" msgid="1534847740615665736">"Կարգավորումներ"</string>
+    <string name="add_account" msgid="4271217504968243974">"Ավելացնել հաշիվ"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Ֆոտոխցիկ"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Ներբեռնել"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Խմբագրված առցանց լուսանկարներ"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"Ներմուծված"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Էկրանի հանույթ"</string>
+    <string name="help" msgid="7368960711153618354">"Օգնություն"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"Պահոց չկա"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"Արտաքին պահոց հասանելի չէ"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Կինոժապավենի տեսք"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Ցանցային տեսք"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Լիաէկրան տեսք"</string>
+    <string name="trimming" msgid="9122385768369143997">"Կտրում"</string>
+    <string name="muting" msgid="5094925919589915324">"Խլացում"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Խնդրում ենք սպասել"</string>
+    <string name="save_into" msgid="9155488424829609229">"Տեսանյութը պահվում է <xliff:g id="ALBUM_NAME">%1$s</xliff:g>-ում ..."</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Հնարավոր չէ եզրատել. թիրախային տեսանյութը շատ կարճ է"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Կազմվում է համայնապատկեր"</string>
+    <string name="save" msgid="613976532235060516">"Պահել"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Բովանդակությունը սկանավորվում է..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d նյութ սկանավորվել է"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d նյութ սկանավորվել է"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d տարր սկանավորվել են"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Տեսակավորում..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Սկանավորումն ավարտվեց"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Ներմուծվում է..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"Այս սարքի մեջ ներմուծման համար հասանելի բովանդակություն չկա:"</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"Միացված MTP սարք չկա"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Ֆոտոխցիկի սխալ"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Հնարավոր չէ միանալ ֆոտոխցիկին:"</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Ֆոտոխցիկն անջատված է՝ անվտանգության քաղաքականության նկատառումներից ելնելով:"</string>
+    <string name="camera_label" msgid="6346560772074764302">"Ֆոտոխցիկ"</string>
+    <string name="wait" msgid="8600187532323801552">"Խնդրում ենք սպասել..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Տեսախցիկն օգտագործելուց առաջ նրան միացրեք USB պահոց:"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Տեսախցիկն օգտագործելուց առաջ տեղադրեք SD քարտ:"</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Պատրաստվում է USB պահոցը..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"Պատրաստվում է SD քարտը..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB պահուստը հասանելի չէ:"</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD քարտը հասանելի չէ:"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"Չեղարկել"</string>
+    <string name="review_ok" msgid="1156261588693116433">"Կատարված է"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Ժամանակի սպառումով տեսագրություն"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Ընտրել տեսախցիկը"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d վայրկյան"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Հետհաշվարկի ազդ"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Անջատված է"</string>
+    <string name="setting_on" msgid="8602246224465348901">"Միացված է"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Տեսանյութի որակը"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Բարձր"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Ցածր"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Ժամանակի լրացում"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Տեսախցիկի կարգավորումներ"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Տեսախցիկի կարգավորումներ"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Նկարի չափը"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2Մ պիքսել (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Կենտրոնացման ռեժիմ"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Ինքնուրույն"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Անսահման"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Մակրո"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"Ինքնուրույն"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"Անսահման"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"Մակրո"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Լուսաթարթման ռեժիմ"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"Լուսաթարթման ռեժիմ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Ինքնուրույն"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Միացված է"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Անջատված է"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"Ավտոմատ լուսաթարթում"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"Լուսաթարթումը միացված է"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"Լուսաթարթիչն անջատված է"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Սպիտակի կշիռ"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"Սպիտակի կշիռ"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Ինքնուրույն"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Բոցավառ"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Ցերեկային լույս"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Ցերեկային լուսավորություն"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Ամպամած"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"Ինքնուրույն"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"Շիկացած"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"Ցերեկային լույս"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"Ցերեկային լուսավորություն"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"Ամպամած"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Տեսարանային ռեժիմ"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Ինքնուրույն"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Գործողություն"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Ձեր USB պահոցի ազատ տարածքը սպառվում է: Փոխեք որակի կարգավորումները կամ ջնջեք որոշ նկարներ կամ ֆայլեր:"</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Ձեր SD քարտի ազատ տարածքը սպառվում է: Փոխեք որակի կարգավորումները կամ ջնջեք որոշ նկարներ կամ ֆայլեր:"</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Սահմանափակման չափը սպառված է:"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Շատ արագ"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Պատրաստվում է համայնապատկեր"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Չհաջողվեց պահել համայնապատկերը:"</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Համայնապատկեր"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Համայնապատկերի լուսանկարում"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Սպասում ենք նախորդ համայնապատկերին"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Պահվում է..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Կազմվում է համայնապատկեր"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Հպեք՝ կենտրոնացնելու համար:"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Էֆեկտներ"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Ոչ մեկը"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Ճզմում"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Մեծ աչքեր"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Մեծ բերան"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Փոքր բերան"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Մեծ քիթ"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Փոքր աչքեր"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Տիեզերքում"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Մայրամուտ"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Ձեր տեսանյութը"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Ցած դրեք ձեր սարքը\nՄի պահ դուրս եկեք տեսադաշտից:"</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Դիպչեք՝ տեսագրության ընթացքում լուսանկարելու համար:"</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"Տեսագրությունը սկսված է:"</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"Տեսագրությունը դադարեցված է:"</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Տեսանյութի ճեպապատկերումն անջատված է, երբ առկա են հատուկ էֆեկտներ:"</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Մաքրել էֆեկտները"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"Հիմար դեմքեր"</string>
+    <string name="effect_background" msgid="6579360207378171022">"Ետնատեսք"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Փականի կոճակ"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Ընտրացանկի կոճակ"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Ամենավերջին լուսանկարը"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Առջևի ու ետևի տեսախցիկի փոխարկում"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Ֆոտոխցիկի, տեսախցիկի կամ համայնապատկերի ընտրիչ"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Ավելի շատ կարգավորիչներ"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Փակել կարգավորիչները"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Խոշորացման կարգավորիչ"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Նվազում %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Մեծացնել %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s նշման վանդակ"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Փոխարկել դեպի լուսանկարը"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Փոխարկել դեպի տեսանյութ"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Փոխարկել դեպի համայնապատկեր"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Փոխարկել դեպի նոր համայնապատկեր"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Փոխարկել կրկնաֆոկուսի ռեժիմի"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Վերանայման դադարեցում"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Դիտարկումն արված է"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Վերանայման վերսկսում"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Նվագարկել տեսանյութը"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Դադարեցնել տեսանյութի դիտումը"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Վերաբեռնել տեսանյութը"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Տեսանվագարկիչի ժամագոտի"</string>
+    <string name="capital_on" msgid="5491353494964003567">"Միացված է"</string>
+    <string name="capital_off" msgid="7231052688467970897">"Անջատված"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Անջատված"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 ժամ"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"վայրկյան"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"րոպե"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"ժամ"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Կատարված է"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Սահմանել ժամանակահատված"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Ժամանակի սպառման հնարավորությունն անջատված է: Միացրեք այն՝ ժամանակամիջոց սահմանելու համար:"</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Հետհաշվարկի ժամաչափն անջատված է: Միացրեք այն՝ լուսանկարելուց առաջ հետհաշվարկի համար:"</string>
+    <string name="set_duration" msgid="5578035312407161304">"Սահմանել տևողությունը վայրկյաններով"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Լուսանկարման հետհաշվարկ"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Հիշե՞լ լուսանկարների վայրերը"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Ձեր լուսանկարներում և տեսանյութերում նշեք, թե որտեղ են դրանք արվել:\n\n Այլ ծրագրերը կարող են օգտվել այդ տեղեկատվությունից՝ ձեր պահած նկարների հետ մեկտեղ:"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"Ոչ, շնորհակալություն"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Այո"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Ֆոտոխցիկ"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Որոնել"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Լուսանկարներ"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Ալբոմներ"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"Այլ ընտրանքներ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"Կարգավորումներ"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d լուսանկար"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d լուսանկար"</item>
+  </plurals>
+</resources>
diff --git a/res/values-hy/filtershow_strings.xml b/res/values-hy/filtershow_strings.xml
new file mode 100644
index 0000000..6f8e933
--- /dev/null
+++ b/res/values-hy/filtershow_strings.xml
@@ -0,0 +1,145 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Լուսանկարի խմբագրիչ"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Չհաջողվեց բեռնել պատկերը:"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Պաստառը տեղադրվում է"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Չհաջողվեց ներբեռնել լուսանկարը: Ցանցն անհասանելի է:"</string>
+    <string name="original" msgid="3524493791230430897">"Բնօրինակ"</string>
+    <string name="saved" msgid="6678827180814174711">"Պահված է"</string>
+    <string name="borders" msgid="2067345080568684614">"Սահմանները"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Հետարկել"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Կրկնել"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Ցույց տալ կիրառված էֆեկտները"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Թաքցնել կիրառված էֆեկտները"</string>
+    <string name="export_image" msgid="3202835713172222134">"Արտահանել"</string>
+    <string name="print_image" msgid="1942989216591621413">"Տպել"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Արտահանել հարթված պատկերը"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Արտահանված պատկերը կլինի պատճեն՝ առանց պատմության:"</string>
+    <string name="quality" msgid="179292110309050529">"Որակը"</string>
+    <string name="size" msgid="4639404642236356037">"Չափը"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Կարգավորումներ"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Կան չպահված փոփոխություններ այս պատկերի վրա:"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Ուզո՞ւմ եք պահել դուրս գալուց առաջ"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Պահել և դուրս գալ"</string>
+    <string name="exit" msgid="242642957038770113">"Ելք"</string>
+    <string name="history" msgid="455767361472692409">"Պատմություն"</string>
+    <string name="reset" msgid="9013181350779592937">"Վերակայել"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Կիրառված էֆեկտներ"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Համեմատել"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Կիրառել"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Վերակայել"</string>
+    <string name="aspect" msgid="4025244950820813059">"Տեսակետ"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Ոչ մեկը"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Ամրակայված"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Փոքր Երկիր"</string>
+    <string name="exposure" msgid="6526397045949374905">"Լուսավորություն"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Հստակություն"</string>
+    <string name="contrast" msgid="2310908487756769019">"Ցայտունություն"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Տատանում"</string>
+    <string name="saturation" msgid="7026791551032438585">"Հագեցում"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"Սև/Սպ զտիչ"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Ինքնագույն"</string>
+    <string name="hue" msgid="6231252147971086030">"Գուներանգ"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Ստվերներ"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Լուսային էֆեկտ"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Կորեր"</string>
+    <string name="vignette" msgid="934721068851885390">"Շրջանակ"</string>
+    <string name="redeye" msgid="4508883127049472069">"Կարմիր աչք"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Նկարել"</string>
+    <string name="straighten" msgid="26025591664983528">"Կարգի բերել"</string>
+    <string name="crop" msgid="5781263790107850771">"Եզրատել"</string>
+    <string name="rotate" msgid="2796802553793795371">"Պտտել"</string>
+    <string name="mirror" msgid="5482518108154883096">"Հայելային"</string>
+    <string name="negative" msgid="6998313764388022201">"Բացասական"</string>
+    <string name="none" msgid="6633966646410296520">"Ոչ մեկը"</string>
+    <string name="edge" msgid="7036064886242147551">"Եզրեր"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Պաստառացում"</string>
+    <string name="downsample" msgid="3552938534146980104">"Ցածրորակ"</string>
+    <string name="grad" msgid="546774853424848655">"Խտացված"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Պայծառություն"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Ցայտունություն"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Հագեցում"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Հիմնական"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Կարմիր"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Դեղին"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Կանաչ"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Երկնագույն"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Կապույտ"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Մանուշակագույն"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Ոճը"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"նոր"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Կարմիր"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Կանաչ"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Կապույտ"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Ոճ"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Չափ"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Գուներանգ"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Հագեցում"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Պայծառություն"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Գույն"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Գծեր"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Նշիչ"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Ցայտել"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Մաքրել"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Ընտրել հատուկ գույն"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Ընտրել գույնը"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Ընտրել չափը"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"Լավ"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Բնօրինակ"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Արդյունք"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Պատկերը պահվում է"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Մշակվում է..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Պահել ներկայիս նախակայումը"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Կառավարել օգտվողի նախակայումները"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Նոր նախակայում"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Նախակայման անունը"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Տեղեկություններ"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Պատկերի անունը"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Պատկերի չափը"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Ժամանակագրություն"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF տվյալներ"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Նախակայումը"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Տարբերակը"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Բնօրինակը"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Ընթացիկը"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Մոդելը"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Բացվածքը"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Ֆոկուսի չափը"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Սուբյեկտի հեռավորությունը"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Լուսանկարման ամսաթիվը"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Լուսավորման ժամանակը"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Հեղինակային իրավունք"</string>
+</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
new file mode 100644
index 0000000..452510e
--- /dev/null
+++ b/res/values-hy/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Սրահ"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Նկարի շրջանակ"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Տեսանվագարկիչ"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Տեսանյութը բեռնվում է..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"Բեռնվում է պատկերը..."</string>
+    <string name="loading_account" msgid="928195413034552034">"Հաշիվը բեռնվում է..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Վերսկսել տեսանյութը"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"Վերսկսե՞լ նվագարկումը %s-ից"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Վերսկսել նվագարկումը"</string>
+    <string name="loading" msgid="7038208555304563571">"Բեռնում..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Չհաջողվեց բեռնել"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Չհաջողվեց բեռնել պատկերը"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"Առանց մանրապատկերի"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Սկսել"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"Լավ"</string>
+    <string name="ok" msgid="5296833083983263293">"Լավ"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Դիպչեք դեմքին՝ սկսելու համար:"</string>
+    <string name="saving_image" msgid="7270334453636349407">"Պատկերը պահվում է..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Նկարը պահվում է <xliff:g id="ALBUM_NAME">%1$s</xliff:g>-ում..."</string>
+    <string name="save_error" msgid="6857408774183654970">"Չհաջողվեց պահել եզրատված պատկերը:"</string>
+    <string name="crop_label" msgid="521114301871349328">"Եզրատել նկարը"</string>
+    <string name="trim_label" msgid="274203231381209979">"Կտրել տեսանյութը"</string>
+    <string name="select_image" msgid="7841406150484742140">"Ընտրել լուսանկար"</string>
+    <string name="select_video" msgid="4859510992798615076">"Ընտրել տեսանյութ"</string>
+    <string name="select_item" msgid="2816923896202086390">"Ընտրել նյութ"</string>
+    <string name="select_album" msgid="1557063764849434077">"Ընտրել ալբոմ"</string>
+    <string name="select_group" msgid="6744208543323307114">"Ընտրել խումբ"</string>
+    <string name="set_image" msgid="2331476809308010401">"Սահմանել նկարը որպես"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Սահմանել պաստառ"</string>
+    <string name="wallpaper" msgid="140165383777262070">"Տեղադրում ենք պաստառը..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Պաստառ"</string>
+    <string name="delete" msgid="2839695998251824487">"Ջնջել"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Ջնջե՞լ ընտրված նյութը:"</item>
+    <item quantity="other" msgid="5874316486520635333">"Ջնջե՞լ ընտրված տարրերը"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Հաստատել"</string>
+    <string name="cancel" msgid="3637516880917356226">"Չեղարկել"</string>
+    <string name="share" msgid="3619042788254195341">"Կիսվել"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Կիսվել համայնապատկերով"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Կիսվել որպես լուսանկար"</string>
+    <string name="deleted" msgid="6795433049119073871">"Ջնջված է"</string>
+    <string name="undo" msgid="2930873956446586313">"Հետարկել"</string>
+    <string name="select_all" msgid="3403283025220282175">"Ընտրել բոլորը"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Ապանշել բոլորը"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Ներկայացում"</string>
+    <string name="details" msgid="8415120088556445230">"Մանրամասներ"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d of %2$d տարր՝"</string>
+    <string name="close" msgid="5585646033158453043">"Փակել"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Փոխարկել դեպի ֆոտոխցիկ"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d ընտրված"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d ընտրված"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d ընտրված"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d ընտրված"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d ընտրված"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d ընտրված"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d ընտրված"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d ընտրված"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d ընտրված"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Ցույց տալ քարտեզի վրա"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Պտտել ձախ"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Պտտել աջ"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Հնարավոր չէ գտնել տարրը:"</string>
+    <string name="edit" msgid="1502273844748580847">"Խմբագրել"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Պարզ խմբագրում"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Մշակվում են քեշավորման հարցումները"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Քեշավորում..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"Կտրել"</string>
+    <string name="trim_action" msgid="703098114452883524">"Կտրել"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Խլացնել"</string>
+    <string name="set_as" msgid="3636764710790507868">"Սահմանել որպես"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Հնարավոր չէ համրեցնել տեսանյութը:"</string>
+    <string name="video_err" msgid="7003051631792271009">"Անհնար է նվագարկել տեսանյութը:"</string>
+    <string name="group_by_location" msgid="316641628989023253">"Ըստ տեղանքի"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"Ըստ ժամանակի"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"Ըստ պիտակների"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"Ըստ մարդկանց"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"Ըստ ալբոմների"</string>
+    <string name="group_by_size" msgid="153766174950394155">"Ըստ չափի"</string>
+    <string name="untagged" msgid="7281481064509590402">"Չպիտակավորված"</string>
+    <string name="no_location" msgid="4043624857489331676">"Տեղանքներ չկան"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Որոշ տեղանքներ անհնար է նույնականացնել՝ ցանցին միացման խնդիրների պատճառով:"</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Չհաջողվեց ներբեռնել լուսանկարները այս ալբոմի մեջ: Փորձեք ավելի ուշ:"</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Միայն նկարները"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Միայն տեսանյութերը"</string>
+    <string name="show_all" msgid="6963292714584735149">"Նկարներ և տեսանյութեր"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Պատկերասրահ"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"Լուսանկարներ չկան:"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Եզրատված պատկերը պահվել է <xliff:g id="FOLDER_NAME">%s</xliff:g>-ում:"</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"Հասանելի ալբոմներ չկան:"</string>
+    <string name="empty_album" msgid="4542880442593595494">"O նկարներ/տեսանյութեր հասանելի են:"</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Գրառումներ"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Հասանելի դարձնել անցանց"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Թարմացնել"</string>
+    <string name="done" msgid="217672440064436595">"Կատարված է"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"նյութ %1$d` %2$d-ից"</string>
+    <string name="title" msgid="7622928349908052569">"Վերնագիր"</string>
+    <string name="description" msgid="3016729318096557520">"Նկարագրություն"</string>
+    <string name="time" msgid="1367953006052876956">"Ժամանակը"</string>
+    <string name="location" msgid="3432705876921618314">"Տեղակայում"</string>
+    <string name="path" msgid="4725740395885105824">"Ուղի"</string>
+    <string name="width" msgid="9215847239714321097">"Լայնությունը"</string>
+    <string name="height" msgid="3648885449443787772">"Հասակ"</string>
+    <string name="orientation" msgid="4958327983165245513">"Դիրքավորում"</string>
+    <string name="duration" msgid="8160058911218541616">"Տևողությունը"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME-տեսակը"</string>
+    <string name="file_size" msgid="8486169301588318915">"Ֆայլի չափը"</string>
+    <string name="maker" msgid="7921835498034236197">"Ստեղծող"</string>
+    <string name="model" msgid="8240207064064337366">"Մոդել"</string>
+    <string name="flash" msgid="2816779031261147723">"Լուսաթարթիչ"</string>
+    <string name="aperture" msgid="5920657630303915195">"Բացվածք"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Ֆոկուսի չափը"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Սպիտակի կշիռ"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Լուսավորման ժամանակը"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"մմ"</string>
+    <string name="manual" msgid="6608905477477607865">"Ձեռքով"</string>
+    <string name="auto" msgid="4296941368722892821">"Ինքնուրույն"</string>
+    <string name="flash_on" msgid="7891556231891837284">"Լուսաթարթիչը միացված է"</string>
+    <string name="flash_off" msgid="1445443413822680010">"Առանց լուսաթարթիչ"</string>
+    <string name="unknown" msgid="3506693015896912952">"Անհայտ"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Բնօրինակ"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Հնորակ"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Ակնթարթային"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Սպիտակեցնել"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Կապույտ"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"Սև/Սպ"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Դեղնարկիչ"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X Գործընթաց"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Լատտե"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Լիտոգրաֆ"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Ալբոմը հասանելի դարձնել անցանց:"</item>
+    <item quantity="other" msgid="4948604338155959389">"Ալբոմները հասանելի դարձնել անցանց:"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Նյութը պահվում է տեղում և հասանելի է անցանց:"</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"Բոլոր ալբոմները"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Տեղային ալբոմներ"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP սարքեր"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa ալբոմներ"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> ազատ"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> կամ փոքր"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> կամ ավելի մեծ"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g>-ից <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"Ներմուծել"</string>
+    <string name="import_complete" msgid="3875040287486199999">"Ներմուծումն ավարտված է"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Ներմուծը չի հաջողվել"</string>
+    <string name="camera_connected" msgid="916021826223448591">"Ֆոտոխցիկը միացված է:"</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Ֆոտոխցիկն անջատված է:"</string>
+    <string name="click_import" msgid="6407959065464291972">"Հպեք այստեղ՝ մուտքագրման համար"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Ընտրել ալբոմ"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Խառնել բոլոր պատկերները"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Ընտրել պատկեր"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Ընտրեք պատկերներ"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Ներկայացում"</string>
+    <string name="albums" msgid="7320787705180057947">"Ալբոմներ"</string>
+    <string name="times" msgid="2023033894889499219">"Ժամանակներ"</string>
+    <string name="locations" msgid="6649297994083130305">"Տեղանքներ"</string>
+    <string name="people" msgid="4114003823747292747">"Մարդիկ"</string>
+    <string name="tags" msgid="5539648765482935955">"Պիտակներ"</string>
+    <string name="group_by" msgid="4308299657902209357">"Խմբավորել"</string>
+    <string name="settings" msgid="1534847740615665736">"Կարգավորումներ"</string>
+    <string name="add_account" msgid="4271217504968243974">"Ավելացնել հաշիվ"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Ֆոտոխցիկ"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Ներբեռնել"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Խմբագրված առցանց լուսանկարներ"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"Ներմուծված"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Էկրանի հանույթ"</string>
+    <string name="help" msgid="7368960711153618354">"Օգնություն"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"Պահոց չկա"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"Արտաքին պահոց հասանելի չէ"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Կինոժապավենի տեսք"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Ցանցային տեսք"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Լիաէկրան տեսք"</string>
+    <string name="trimming" msgid="9122385768369143997">"Կտրում"</string>
+    <string name="muting" msgid="5094925919589915324">"Խլացում"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Խնդրում ենք սպասել"</string>
+    <string name="save_into" msgid="9155488424829609229">"Տեսանյութը պահվում է <xliff:g id="ALBUM_NAME">%1$s</xliff:g>-ում ..."</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Հնարավոր չէ եզրատել. թիրախային տեսանյութը շատ կարճ է"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Կազմվում է համայնապատկեր"</string>
+    <string name="save" msgid="613976532235060516">"Պահել"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Բովանդակությունը սկանավորվում է..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d նյութ սկանավորվել է"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d նյութ սկանավորվել է"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d տարր սկանավորվել են"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Տեսակավորում..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Սկանավորումն ավարտվեց"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Ներմուծվում է..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"Այս սարքի մեջ ներմուծման համար հասանելի բովանդակություն չկա:"</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"Միացված MTP սարք չկա"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Ֆոտոխցիկի սխալ"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Հնարավոր չէ միանալ ֆոտոխցիկին:"</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Ֆոտոխցիկն անջատված է՝ անվտանգության քաղաքականության նկատառումներից ելնելով:"</string>
+    <string name="camera_label" msgid="6346560772074764302">"Ֆոտոխցիկ"</string>
+    <string name="wait" msgid="8600187532323801552">"Խնդրում ենք սպասել..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Տեսախցիկն օգտագործելուց առաջ նրան միացրեք USB պահոց:"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Տեսախցիկն օգտագործելուց առաջ տեղադրեք SD քարտ:"</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Պատրաստվում է USB պահոցը..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"Պատրաստվում է SD քարտը..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB պահուստը հասանելի չէ:"</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD քարտը հասանելի չէ:"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"Չեղարկել"</string>
+    <string name="review_ok" msgid="1156261588693116433">"Կատարված է"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Ժամանակի սպառումով տեսագրություն"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Ընտրել տեսախցիկը"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d վայրկյան"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Հետհաշվարկի ազդ"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Անջատված է"</string>
+    <string name="setting_on" msgid="8602246224465348901">"Միացված է"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Տեսանյութի որակը"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Բարձր"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Ցածր"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Ժամանակի լրացում"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Տեսախցիկի կարգավորումներ"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Տեսախցիկի կարգավորումներ"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Նկարի չափը"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2Մ պիքսել (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1Մ պիքսել"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Կենտրոնացման ռեժիմ"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Ինքնուրույն"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Անսահման"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Մակրո"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"Ինքնուրույն"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"Անսահման"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"Մակրո"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Լուսաթարթման ռեժիմ"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"Լուսաթարթման ռեժիմ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Ինքնուրույն"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Միացված է"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Անջատված է"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"Ավտոմատ լուսաթարթում"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"Լուսաթարթումը միացված է"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"Լուսաթարթիչն անջատված է"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Սպիտակի կշիռ"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"Սպիտակի կշիռ"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Ինքնուրույն"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Բոցավառ"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Ցերեկային լույս"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Ցերեկային լուսավորություն"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Ամպամած"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"Ինքնուրույն"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"Շիկացած"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"Ցերեկային լույս"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"Ցերեկային լուսավորություն"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"Ամպամած"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Տեսարանային ռեժիմ"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Ինքնուրույն"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Գործողություն"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Ձեր USB պահոցի ազատ տարածքը սպառվում է: Փոխեք որակի կարգավորումները կամ ջնջեք որոշ նկարներ կամ ֆայլեր:"</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Ձեր SD քարտի ազատ տարածքը սպառվում է: Փոխեք որակի կարգավորումները կամ ջնջեք որոշ նկարներ կամ ֆայլեր:"</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Սահմանափակման չափը սպառված է:"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Շատ արագ"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Պատրաստվում է համայնապատկեր"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Չհաջողվեց պահել համայնապատկերը:"</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Համայնապատկեր"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Համայնապատկերի լուսանկարում"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Սպասում ենք նախորդ համայնապատկերին"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Պահվում է..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Կազմվում է համայնապատկեր"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Հպեք՝ կենտրոնացնելու համար:"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Էֆեկտներ"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Ոչ մեկը"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Ճզմում"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Մեծ աչքեր"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Մեծ բերան"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Փոքր բերան"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Մեծ քիթ"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Փոքր աչքեր"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Տիեզերքում"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Մայրամուտ"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Ձեր տեսանյութը"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Ցած դրեք ձեր սարքը\nՄի պահ դուրս եկեք տեսադաշտից:"</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Դիպչեք՝ տեսագրության ընթացքում լուսանկարելու համար:"</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"Տեսագրությունը սկսված է:"</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"Տեսագրությունը դադարեցված է:"</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Տեսանյութի ճեպապատկերումն անջատված է, երբ առկա են հատուկ էֆեկտներ:"</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Մաքրել էֆեկտները"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"Հիմար դեմքեր"</string>
+    <string name="effect_background" msgid="6579360207378171022">"Ետնատեսք"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Փականի կոճակ"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Ընտրացանկի կոճակ"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Ամենավերջին լուսանկարը"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Առջևի ու ետևի տեսախցիկի փոխարկում"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Ֆոտոխցիկի, տեսախցիկի կամ համայնապատկերի ընտրիչ"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Ավելի շատ կարգավորիչներ"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Փակել կարգավորիչները"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Խոշորացման կարգավորիչ"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Նվազում %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Մեծացնել %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s նշման վանդակ"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Փոխարկել դեպի լուսանկարը"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Փոխարկել դեպի տեսանյութ"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Փոխարկել դեպի համայնապատկեր"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Փոխարկել դեպի նոր համայնապատկեր"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Փոխարկել կրկնաֆոկուսի ռեժիմի"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Վերանայման դադարեցում"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Դիտարկումն արված է"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Վերանայման վերսկսում"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Նվագարկել տեսանյութը"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Դադարեցնել տեսանյութի դիտումը"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Վերաբեռնել տեսանյութը"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Տեսանվագարկիչի ժամագոտի"</string>
+    <string name="capital_on" msgid="5491353494964003567">"Միացված է"</string>
+    <string name="capital_off" msgid="7231052688467970897">"Անջատված"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Անջատված"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 վայրկյան"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 րոպե"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 ժամ"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 ժամ"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"վայրկյան"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"րոպե"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"ժամ"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Կատարված է"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Սահմանել ժամանակահատված"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Ժամանակի սպառման հնարավորությունն անջատված է: Միացրեք այն՝ ժամանակամիջոց սահմանելու համար:"</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Հետհաշվարկի ժամաչափն անջատված է: Միացրեք այն՝ լուսանկարելուց առաջ հետհաշվարկի համար:"</string>
+    <string name="set_duration" msgid="5578035312407161304">"Սահմանել տևողությունը վայրկյաններով"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Լուսանկարման հետհաշվարկ"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Հիշե՞լ լուսանկարների վայրերը"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Ձեր լուսանկարներում և տեսանյութերում նշեք, թե որտեղ են դրանք արվել:\n\n Այլ ծրագրերը կարող են օգտվել այդ տեղեկատվությունից՝ ձեր պահած նկարների հետ մեկտեղ:"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"Ոչ, շնորհակալություն"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Այո"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Ֆոտոխցիկ"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Որոնել"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Լուսանկարներ"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Ալբոմներ"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"Այլ ընտրանքներ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"Կարգավորումներ"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d լուսանկար"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d լուսանկար"</item>
+  </plurals>
+</resources>
diff --git a/res/values-in/filtershow_strings.xml b/res/values-in/filtershow_strings.xml
index fe03370..3cc8b33 100644
--- a/res/values-in/filtershow_strings.xml
+++ b/res/values-in/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor Foto"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Tidak dapat memuat gambar!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Tidak dapat mengedit aslinya"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Menyetel wallpaper"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Tidak dapat mengunduh foto. Jaringan tidak tersedia."</string>
     <string name="original" msgid="3524493791230430897">"Asli"</string>
     <string name="borders" msgid="2067345080568684614">"Batas"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Khusus"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Batalkan"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Ulangi"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Tampilkan Riwayat"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Sembunyikan Riwayat"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Tampilkan Status"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Sembunyikan Status"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Tampilkan Efek yang Diterapkan"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Sembunyikan Efek yang Diterapkan"</string>
+    <string name="export_image" msgid="3202835713172222134">"Ekspor"</string>
+    <string name="print_image" msgid="1942989216591621413">"Cetak"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Ekspor Gambar yang Dipipihkan"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Gambar yang diekspor akan berupa salinan, tanpa riwayat."</string>
+    <string name="quality" msgid="179292110309050529">"Kualitas"</string>
+    <string name="size" msgid="4639404642236356037">"Ukuran"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Setelan"</string>
     <string name="unsaved" msgid="8704442449002374375">"Ada perubahan yang belum tersimpan pada gambar ini."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Ingin menyimpan sebelum keluar?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Simpan dan Keluar"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Memproses gambar resolusi penuh..."</string>
     <string name="exit" msgid="242642957038770113">"Keluar"</string>
     <string name="history" msgid="455767361472692409">"Riwayat"</string>
     <string name="reset" msgid="9013181350779592937">"Setel Ulang"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Sorotan"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Kurva"</string>
     <string name="vignette" msgid="934721068851885390">"Vinyet"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinyet"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Pencahayaan"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturasi"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontras"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Falloff"</string>
     <string name="redeye" msgid="4508883127049472069">"Mata Merah"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Gambar"</string>
     <string name="straighten" msgid="26025591664983528">"Luruskan"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatif"</string>
     <string name="none" msgid="6633966646410296520">"Tidak ada"</string>
     <string name="edge" msgid="7036064886242147551">"Tepi"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterisasi"</string>
     <string name="downsample" msgid="3552938534146980104">"Downsample"</string>
+    <string name="grad" msgid="546774853424848655">"Graduasi"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Kecerahan"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontras"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturasi"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Utama"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Merah"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Kuning"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Hijau"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Sian"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Biru"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Gaya"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"baru"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Merah"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Hijau"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Biru"</string>
     <string name="draw_style" msgid="2036125061987325389">"Gaya"</string>
     <string name="draw_size" msgid="4360005386104151209">"Ukuran"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Corak"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturasi"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Kecerahan"</string>
     <string name="draw_color" msgid="2119030386987211193">"Warna"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Garis"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Penanda"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Percikan"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Hapus"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Ketebalan"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Ukuran Pojok"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Warna"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Hapus"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Pilih warna khusus"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Pilih Warna"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Pilih Ukuran"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"Oke"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Asli"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Hasil"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Menyimpan Gambar"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Memproses..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Simpan prasetel saat ini"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Kelola prasetel pengguna"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Prasetel Baru"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nama Prasetel"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informasi"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nama Gambar"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Ukuran Gambar"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Data EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Prasetel"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versi"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Asli"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Terbaru"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Bukaan"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Panjang Fokal"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Jarak Subjek"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Tanggal diambil"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Setop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Waktu Pencahayaan"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Hak Cipta"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e282fbe..8a6d2cc 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Putar ke kanan"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Tidak dapat menemukan item."</string>
     <string name="edit" msgid="1502273844748580847">"Edit"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Edit Sederhana"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Memproses permintaan menyimpan ke cache"</string>
     <string name="caching_label" msgid="4521059045896269095">"Smpn ke tmbolok"</string>
     <string name="crop_action" msgid="3427470284074377001">"Pangkas"</string>
@@ -135,8 +136,8 @@
     <string name="flash" msgid="2816779031261147723">"Lampu Kilat"</string>
     <string name="aperture" msgid="5920657630303915195">"Bukaan"</string>
     <string name="focal_length" msgid="1291383769749877010">"Jarak Fokus"</string>
-    <string name="white_balance" msgid="1582509289994216078">"Kseimbangn pth"</string>
-    <string name="exposure_time" msgid="3990163680281058826">"Lama pncahyaan"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Seimbang putih"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Pencahayaan"</string>
     <string name="iso" msgid="5028296664327335940">"ISO"</string>
     <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
     <string name="manual" msgid="6608905477477607865">"Manual"</string>
@@ -145,7 +146,7 @@
     <string name="flash_off" msgid="1445443413822680010">"Tanpa lampu kilat"</string>
     <string name="unknown" msgid="3506693015896912952">"Tidak diketahui"</string>
     <string name="ffx_original" msgid="372686331501281474">"Asli"</string>
-    <string name="ffx_vintage" msgid="8348759951363844780">"Lawas"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instan"</string>
     <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Biru"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Tidak dapat terhubung ke kamera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera telah dinonaktifkan karena kebijakan keamanan."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Perekam video"</string>
     <string name="wait" msgid="8600187532323801552">"Harap tunggu…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pasang penyimpanan USB sebelum menggunakan kamera."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Masukkan kartu SD sebelum menggunakan kamera."</string>
@@ -234,6 +234,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 penyimpanan"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOKASI"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Penghitung mundur"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 detik"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Setelan kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Setelan perekam video"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Ukuran gambar"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M piksel"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M piksel"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M piksel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M piksel"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M piksel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M piksel (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 M piksel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 M piksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Otomatis"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Ketakterbatasan"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"OTOMATIS"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"TAK TERBATAS"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Mode lampu kilat"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODE LAMPU KILAT"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Otomatis"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Pada"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Mati"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"LAMPU KILAT OTOMATIS"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"LAMPU KILAT NYALA"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"LAMPU KILAT MATI"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Keseimbangan putih"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"KESEIMBANGAN PUTIH"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Otomatis"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Berpijar"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Siang Hari"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluoresens"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Berawan"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"OTOMATIS"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"BERPIJAR"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"SIANG HARI"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESENS"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"BERAWAN"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Mode adegan"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Otomatis"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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">"Pesta"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"TIDAK ADA"</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">"PESTA"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"PENGHITUNG WAKTU MUNDUR"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"PENGHITUNG WAKTU MATI"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 DETIK"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 DETIK"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 DETIK"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 DETIK"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Tidak dapat dipilih dalam mode adegan."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Pencahayaan"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"PENCAHAYAAN"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <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">"Oke"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Penyimpanan USB Anda kehabisan ruang kosong. Ubah setelan kualitas atau hapus beberapa gambar atau file lain."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Kartu SD Anda kehabisan ruang kosong. Ubah setelan kualitas atau hapus beberapa gambar atau file lain."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Luar angkasa"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Mthari trbenam"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Video Anda"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Letakkan perangkat Anda."\n"Menyingkirlah sejenak dari bidang bidik."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Letakkan perangkat Anda.\nMenyingkirlah sejenak dari bidang bidik."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Sentuh untuk mengambil foto saat sedang merekam."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Perekaman video telah dimulai."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Perekaman video telah berhenti."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Alihkan ke video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Alihkan ke panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Beralih ke panorama baru"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Alihkan ke Fokus Ulang"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Tinjauan dibatalkan"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Tinjauan selesai"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Tinjau pengambilan ulang"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Putar video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Jeda video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Muat ulang video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Bilah waktu pemutar video"</string>
     <string name="capital_on" msgid="5491353494964003567">"NYALA"</string>
     <string name="capital_off" msgid="7231052688467970897">"MATI"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Nonaktif"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Setel durasi dalam detik"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Menghitung mundur untuk mengambil foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Ingat lokasi foto?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Beri tag foto dan video Anda dengan lokasi tempat pengambilannya."\n\n"Aplikasi lain dapat mengakses informasi ini beserta gambar Anda yang tersimpan."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Beri tag foto dan video Anda dengan lokasi tempat pengambilannya.\n\nAplikasi lain dapat mengakses informasi ini beserta gambar Anda yang tersimpan."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Tidak, terima kasih"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ya"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Telusuri"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Foto"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Album"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"OPSI LAINNYA"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"SETELAN"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d foto"</item>
diff --git a/res/values-it/filtershow_strings.xml b/res/values-it/filtershow_strings.xml
index 39edea7..d140238 100644
--- a/res/values-it/filtershow_strings.xml
+++ b/res/values-it/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor di foto"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Impossibile caricare l\'immagine."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Impossibile modificare l\'originale"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Impostazione dello sfondo"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Impossibile scaricare la foto. Rete non disponibile."</string>
     <string name="original" msgid="3524493791230430897">"Originale"</string>
     <string name="borders" msgid="2067345080568684614">"Bordi"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Personalizzato"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Annulla"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Ripeti"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Mostra cronologia"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Nascondi cronologia"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Mostra stato immagine"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Nascondi stato img"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Mostra effetti applicati"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Nascondi effetti applicati"</string>
+    <string name="export_image" msgid="3202835713172222134">"Esporta"</string>
+    <string name="print_image" msgid="1942989216591621413">"Stampa"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Esporta immagine appiattita"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"L\'immagine esportata sarà una copia e non conterrà la cronologia."</string>
+    <string name="quality" msgid="179292110309050529">"Qualità"</string>
+    <string name="size" msgid="4639404642236356037">"Dimensioni"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Impostazioni"</string>
     <string name="unsaved" msgid="8704442449002374375">"L\'immagine ha modifiche non salvate."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Vuoi salvare prima di uscire?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Salva ed esci"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Elaborazione dell\'immagine a risoluzione piena in corso..."</string>
     <string name="exit" msgid="242642957038770113">"Esci"</string>
     <string name="history" msgid="455767361472692409">"Cronologia"</string>
     <string name="reset" msgid="9013181350779592937">"Reimposta"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Alte luci"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Curve"</string>
     <string name="vignette" msgid="934721068851885390">"Vignetta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignetta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Esposizione"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturazione"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contrasto"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Cascata"</string>
     <string name="redeye" msgid="4508883127049472069">"Occhi rossi"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Disegna"</string>
     <string name="straighten" msgid="26025591664983528">"Raddrizza"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativo"</string>
     <string name="none" msgid="6633966646410296520">"Nessuno"</string>
     <string name="edge" msgid="7036064886242147551">"Bordi"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterizza"</string>
     <string name="downsample" msgid="3552938534146980104">"Sottocampionare"</string>
+    <string name="grad" msgid="546774853424848655">"Sfumata"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Luminosità"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contrasto"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturazione"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Principale"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rosso"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Giallo"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Verde"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Ciano"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blu"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stile"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nuovo"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rosso"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Verde"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Blu"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stile"</string>
     <string name="draw_size" msgid="4360005386104151209">"Dimensioni"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Tonalità"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturazione"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Luminosità"</string>
     <string name="draw_color" msgid="2119030386987211193">"Colore"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linee"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Evidenziatore"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spruzzo"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Cancella"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Spessore"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Dim. angolo"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Colore"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Cancella"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Scegli colore personalizzato"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Seleziona colore"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Seleziona dimensioni"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Originale"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Risultato"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Salvataggio immagine"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Elaborazione in corso..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Salva preset corrente"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Gestisci preset utente"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nuovo preset"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nome preset"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informazioni"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nome immagine"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Dimensioni immagine"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Istogramma"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Dati EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Preset"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versione"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Originale"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Attuale"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modello"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Apertura"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Lunghezza focale"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distanza soggetto"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Data scatto"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F/stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Tempo esposizione"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Copyright"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a3cbf32..5e04317 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Ruota a destra"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Impossibile trovare l\'elemento."</string>
     <string name="edit" msgid="1502273844748580847">"Modifica"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Modifica semplice"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Elaborazione richieste memorizzazione cache"</string>
     <string name="caching_label" msgid="4521059045896269095">"Memorizzazione..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Ritaglia"</string>
@@ -179,7 +180,7 @@
     <string name="widget_type" msgid="1364653978966343448">"Scegli immagini"</string>
     <string name="slideshow_dream_name" msgid="6915963319933437083">"Presentazione"</string>
     <string name="albums" msgid="7320787705180057947">"Album"</string>
-    <string name="times" msgid="2023033894889499219">"Volte"</string>
+    <string name="times" msgid="2023033894889499219">"Data"</string>
     <string name="locations" msgid="6649297994083130305">"Luoghi"</string>
     <string name="people" msgid="4114003823747292747">"Persone"</string>
     <string name="tags" msgid="5539648765482935955">"Tag"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Impossibile collegarsi alla fotocamera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"La fotocamera è stata disattivata in base a norme di sicurezza."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotocamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videocamera"</string>
     <string name="wait" msgid="8600187532323801552">"Attendere..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Monta l\'archivio USB prima di utilizzare la fotocamera."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Per usare la fotocamera devi inserire una scheda SD."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Posteriore"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Frontale"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Registra località"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOCALITÀ"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Timer conto alla rovescia"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 secondo"</item>
@@ -242,8 +243,8 @@
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
     <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip conto alla rov."</string>
-    <string name="setting_off" msgid="4480039384202951946">"Disattivata"</string>
-    <string name="setting_on" msgid="8602246224465348901">"Attiva"</string>
+    <string name="setting_off" msgid="4480039384202951946">"OFF"</string>
+    <string name="setting_on" msgid="8602246224465348901">"ON"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualità video"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Alta"</string>
     <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Bassa"</string>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Impostazioni fotocamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Impostazioni videocamera"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Dimensioni foto"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M pixel"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 Mpixel"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 MP"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Mpixel (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 MP"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatica"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Modalità flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODALITÀ FLASH"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatica"</string>
-    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Attiva"</string>
-    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Non attiva"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ON"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"OFF"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTO"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ATTIVO"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH DISATTIVATO"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Bilanciamento bianco"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BILANCIAMENTO DEL BIANCO"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatico"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Luce incandescenza"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Luce diurna"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Luce neon"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Nuvoloso"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"LUCE INCANDESCENZA"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"LUCE DIURNA"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"LUCE NEON"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"NUVOLOSO"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modalità scena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatica"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Notturna"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Tramonto"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Festa"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NESSUNA"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"AZIONE"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOTTE"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"TRAMONTO"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FESTA"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"TIMER CONTO ALLA ROVESCIA"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TIMER DISATTIVATO"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SECONDO"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SECONDI"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SECONDI"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SECONDI"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Non selezionabile in modalità scena."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Esposizione"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"ESPOSIZIONE"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"FOTOCAMERA ANTERIORE"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"FOTOCAMERA POSTERIORE"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Lo spazio dell\'archivio USB si sta esaurendo. Cambia l\'impostazione di qualità o elimina alcune immagini o altri file."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Lo spazio della scheda SD si sta esaurendo. Cambia l\'impostazione di qualità o elimina alcune immagini o altri file."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Nello spazio"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Tramonto"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Il tuo video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Posa il tuo dispositivo."\n"Esci dalla visualizzazione per un attimo."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Posa il tuo dispositivo.\nEsci dalla visualizzazione per un attimo."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Tocca per scattare foto durante la registrazione."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"La registrazione video è stata avviata."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"La registrazione video è stata interrotta."</string>
@@ -331,12 +363,17 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Passa a video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Passa a panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Passa al nuovo panorama"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Passa a Refocus"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Annulla verifica"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Verifica terminata"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Scatta/Riprendi di nuovo per recensione"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Riproduci video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Metti in pausa video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Ricarica video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Barra temporale del video player"</string>
     <string name="capital_on" msgid="5491353494964003567">"ON"</string>
     <string name="capital_off" msgid="7231052688467970897">"OFF"</string>
-    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Non attivo"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"OFF"</string>
     <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0,5 secondi"</string>
     <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 secondo"</string>
     <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1,5 secondi"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Imposta la durata in secondi"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Conto alla rovescia per scattare una foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Memorizzare i luoghi delle foto?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Aggiungi alle foto e ai video tag relativi alle località in cui sono stati ripresi."\n\n"Altre applicazioni possono accedere a queste informazioni e alle tue immagini salvate."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Aggiungi alle foto e ai video tag relativi alle località in cui sono stati ripresi.\n\nAltre applicazioni possono accedere a queste informazioni e alle tue immagini salvate."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"No, grazie"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Sì"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Fotocamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Cerca"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Foto"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Album"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ALTRE OPZIONI"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"IMPOSTAZIONI"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d foto"</item>
diff --git a/res/values-iw/filtershow_strings.xml b/res/values-iw/filtershow_strings.xml
index 79075a5..1b18346 100644
--- a/res/values-iw/filtershow_strings.xml
+++ b/res/values-iw/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"עורך תמונות"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"לא ניתן להעלות את התמונה!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"לא ניתן לערוך מקור"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"מגדיר טפט"</string>
+    <string name="download_failure" msgid="5923323939788582895">"לא ניתן היה להוריד את התמונה. הרשת לא זמינה."</string>
     <string name="original" msgid="3524493791230430897">"מקור"</string>
     <string name="borders" msgid="2067345080568684614">"גבולות"</string>
+    <string name="custom_border" msgid="8679893731790931871">"מותאם אישית"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"בטל"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"בצע מחדש"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"הצג היסטוריה"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"הסתר היסטוריה"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"הצג מצב תמונה"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"הסתר מצב תמונה"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"הצג אפקטים שהוחלו"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"הסתר אפקטים שהוחלו"</string>
+    <string name="export_image" msgid="3202835713172222134">"יצא"</string>
+    <string name="print_image" msgid="1942989216591621413">"הדפס"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"יצא את התמונה המשוטחת"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"התמונה שיוצאה תהיה עותק, ללא ההיסטוריה."</string>
+    <string name="quality" msgid="179292110309050529">"איכות"</string>
+    <string name="size" msgid="4639404642236356037">"גודל"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"הגדרות"</string>
     <string name="unsaved" msgid="8704442449002374375">"יש בתמונה הזו שינויים שלא נשמרו."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"האם אתה רוצה לשמור לפני היציאה?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"שמור וצא"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"מעבד תמונה ברזולוציה מלאה..."</string>
     <string name="exit" msgid="242642957038770113">"צא"</string>
     <string name="history" msgid="455767361472692409">"היסטוריה"</string>
     <string name="reset" msgid="9013181350779592937">"אפס"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"הדגשות"</string>
     <string name="curvesRGB" msgid="915010781090477550">"קימורים"</string>
     <string name="vignette" msgid="934721068851885390">"עמעום קצוות"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"דהייה בשוליים"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"חשיפה"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"רוויה"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"ניגודיות"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"הדרגה"</string>
     <string name="redeye" msgid="4508883127049472069">"עיניים אדומות"</string>
     <string name="imageDraw" msgid="6918552177844486656">"צייר"</string>
     <string name="straighten" msgid="26025591664983528">"יישר"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"נגטיב"</string>
     <string name="none" msgid="6633966646410296520">"ללא"</string>
     <string name="edge" msgid="7036064886242147551">"קצוות"</string>
-    <string name="kmeans" msgid="1630263230946107457">"וורהול"</string>
+    <string name="kmeans" msgid="2080952022674981541">"פוסטריזציה"</string>
     <string name="downsample" msgid="3552938534146980104">"הקטן תמונה"</string>
+    <string name="grad" msgid="546774853424848655">"מדורגת"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"בהירות"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"ניגודיות"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"רוויה"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"ראשי"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"אדום"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"צהוב"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"ירוק"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"ציאן"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"כחול"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"מגנטה"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"סגנון"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"חדש"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"אדום"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"ירוק"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"כחול"</string>
     <string name="draw_style" msgid="2036125061987325389">"סגנון"</string>
     <string name="draw_size" msgid="4360005386104151209">"גודל"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"צבע"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"רוויה"</string>
+    <string name="draw_value" msgid="6571604055161538273">"בהירות"</string>
     <string name="draw_color" msgid="2119030386987211193">"צבע"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"קווים"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"עט סימון"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"התזה"</string>
     <string name="draw_clear" msgid="6728155515454921052">"נקה"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"עובי"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"גודל פינה"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"צבע"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"נקה"</string>
     <string name="color_pick_select" msgid="734312818059057394">"בחר צבע מותאם אישית"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"בחר צבע"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"בחר גודל"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"אישור"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"מקור"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"תוצאה"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"שומר תמונה"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"נמצא בעיבוד..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"שמור קביעה נוכחית המוגדרת מראש"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"נהל הגדרות משתמש קבועות מראש"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"הגדרה חדשה קבועה מראש"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"שם מוגדר מראש"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"מידע"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"שם תמונה"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"גודל תמונה"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"היסטוגרמה"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"נתוני EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"הגדרה קבועה מראש"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"גרסה"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"מקורית"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"נוכחית"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"דגם"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"צמצם"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"רוחק מוקד"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"מרחק מנושא הצילום"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"תאריך הצילום"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"זמן חשיפה"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"זכויות יוצרים"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2a73e42..7104209 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"סובב ימינה"</string>
     <string name="no_such_item" msgid="5315144556325243400">"הפריט לא נמצא."</string>
     <string name="edit" msgid="1502273844748580847">"ערוך"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"עריכה פשוטה"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"מעבד בקשות העברה למטמון"</string>
     <string name="caching_label" msgid="4521059045896269095">"מעביר למטמון..."</string>
     <string name="crop_action" msgid="3427470284074377001">"חתוך"</string>
@@ -137,7 +138,7 @@
     <string name="focal_length" msgid="1291383769749877010">"רוחק מוקד"</string>
     <string name="white_balance" msgid="1582509289994216078">"איזון לבן"</string>
     <string name="exposure_time" msgid="3990163680281058826">"זמן חשיפה"</string>
-    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="iso" msgid="5028296664327335940">"מהירות ISO‏"</string>
     <string name="unit_mm" msgid="1125768433254329136">"מ\"מ"</string>
     <string name="manual" msgid="6608905477477607865">"ידנית"</string>
     <string name="auto" msgid="4296941368722892821">"אוטומטי"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"לא ניתן להתחבר למצלמה."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"המצלמה הושבתה בשל מדיניות אבטחה."</string>
     <string name="camera_label" msgid="6346560772074764302">"מצלמה"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"מצלמת וידאו"</string>
     <string name="wait" msgid="8600187532323801552">"המתן..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"טען אחסון USB לפני השימוש במצלמה."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"הכנס כרטיס SD לפני השימוש במצלמה."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"הגדרות מצלמה"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"הגדרות מצלמת וידאו"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"גודל תמונה"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 מגה פיקסל"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 מגה פיקסל"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 מגה פיקסלים"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 מגה פיקסל"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 מגה פיקסלים"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 מגה פיקסלים"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M פיקסל (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 מגה פיקסלים"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"מגה פיקסל אחד"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"אוטומטי"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"אינסוף"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"מאקרו"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"אוטומטי"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"אינסוף"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"מאקרו"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"מצב Flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"מצב מבזק"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"אוטומטי"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"מופעל"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"כבוי"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"מבזק אוטומטי"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"מבזק פועל"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"מבזק כבוי"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"איזון לבן"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"איזון לבן"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"אוטומטי"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"זוהר"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"אור יום"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"פלואורסנט"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"מעונן"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"אוטומטי"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"זוהר"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"אור יום"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"פלואורסנט"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"מעונן"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"מצב נוף"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"אוטומטי"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"אוזל המקום באמצעי האחסון מסוג USB. שנה את הגדרת האיכות או מחק כמה תמונות או קבצים אחרים."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"השטח בכרטיס SD אוזל. שנה את הגדרת האיכות או מחק חלק מהתמונות או קבצים אחרים."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"בחלל"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"שקיעה"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"הסרטון שלך"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"הנח את המכשיר."\n"צא לרגע מהתמונה."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"הנח את המכשיר.\nצא לרגע מהתמונה."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"גע כדי לצלם תמונה במהלך ההקלטה."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"הקלטת וידאו החלה."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"הקלטת וידאו הופסקה."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"עבור לווידאו"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"עבור לפנורמה"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"עבור לפנורמה חדשה"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"עבור ל\'מיקוד מחדש\'"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"ביטול בדיקה"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"בדיקה בוצעה"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"הצג צילום חוזר"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"הפעל סרטון"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"השהה סרטון"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"טען סרטון מחדש"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"סרגל הזמן של נגן הסרטונים"</string>
     <string name="capital_on" msgid="5491353494964003567">"פועל"</string>
     <string name="capital_off" msgid="7231052688467970897">"כבוי"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"כבוי"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"הגדר משך זמן בשניות"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"סופר לאחור עד לצילום תמונה"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"האם לזכור מיקומי תמונות?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"מתייג את התמונות והסרטונים שלך לציון המקומות שבהם צולמו."\n\n"יישומים אחרים יכולים לגשת למידע זה, כולל תמונות שנשמרו."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"מתייג את התמונות והסרטונים שלך לציון המקומות שבהם צולמו.\n\nאפליקציות אחרות יכולות לגשת למידע זה, כולל תמונות שנשמרו."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"לא, תודה"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"כן"</string>
     <string name="menu_camera" msgid="3476709832879398998">"מצלמה"</string>
     <string name="menu_search" msgid="7580008232297437190">"חיפוש"</string>
     <string name="tab_photos" msgid="9110813680630313419">"תמונות"</string>
     <string name="tab_albums" msgid="8079449907770685691">"אלבומים"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"אפשרויות נוספות"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"הגדרות"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"תמונה %1$d"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d תמונות"</item>
diff --git a/res/values-ja/filtershow_strings.xml b/res/values-ja/filtershow_strings.xml
index 447ca7a..c57d378 100644
--- a/res/values-ja/filtershow_strings.xml
+++ b/res/values-ja/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"フォトエディタ"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"画像を読み込めません"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"元の画像を編集できません"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"壁紙を設定しています"</string>
+    <string name="download_failure" msgid="5923323939788582895">"画像をダウンロードできませんでした。ネットワークを使用できません。"</string>
     <string name="original" msgid="3524493791230430897">"元の画像"</string>
     <string name="borders" msgid="2067345080568684614">"境界"</string>
+    <string name="custom_border" msgid="8679893731790931871">"カスタム"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"元に戻す"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"やり直し"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"履歴を表示する"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"履歴を表示しない"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"画像ステータスを表示"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"画像ステータスを非表示"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"適用済みの効果を表示"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"適用済みの効果を非表示"</string>
+    <string name="export_image" msgid="3202835713172222134">"エクスポート"</string>
+    <string name="print_image" msgid="1942989216591621413">"印刷"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"統合された画像をエクスポート"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"エクスポートされる画像はコピーであり、履歴はありません。"</string>
+    <string name="quality" msgid="179292110309050529">"画質"</string>
+    <string name="size" msgid="4639404642236356037">"サイズ"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"設定"</string>
     <string name="unsaved" msgid="8704442449002374375">"この画像には保存されていない変更があります。"</string>
     <string name="save_before_exit" msgid="2680660633675916712">"終了する前に保存しますか?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"保存して終了"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"最大解像度の画像を処理しています..."</string>
     <string name="exit" msgid="242642957038770113">"終了"</string>
     <string name="history" msgid="455767361472692409">"履歴"</string>
     <string name="reset" msgid="9013181350779592937">"リセット"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"ハイライト"</string>
     <string name="curvesRGB" msgid="915010781090477550">"カーブ"</string>
     <string name="vignette" msgid="934721068851885390">"周辺減光"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"周辺減光"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"露出"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"彩度"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"コントラスト"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"フォールオフ"</string>
     <string name="redeye" msgid="4508883127049472069">"赤目処理"</string>
     <string name="imageDraw" msgid="6918552177844486656">"描画"</string>
     <string name="straighten" msgid="26025591664983528">"傾き調整"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"白黒反転"</string>
     <string name="none" msgid="6633966646410296520">"なし"</string>
     <string name="edge" msgid="7036064886242147551">"エッジ"</string>
-    <string name="kmeans" msgid="1630263230946107457">"ウォーホル"</string>
+    <string name="kmeans" msgid="2080952022674981541">"ポスタライズ"</string>
     <string name="downsample" msgid="3552938534146980104">"縮小"</string>
+    <string name="grad" msgid="546774853424848655">"段階的"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"明るさ"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"コントラスト"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"彩度"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"メイン"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"赤"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"黄"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"緑"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"水色"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"青"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"マゼンタ"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"スタイル"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"新規"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"赤"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"緑"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"青"</string>
     <string name="draw_style" msgid="2036125061987325389">"スタイル"</string>
     <string name="draw_size" msgid="4360005386104151209">"サイズ"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"色彩"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"彩度"</string>
+    <string name="draw_value" msgid="6571604055161538273">"明るさ"</string>
     <string name="draw_color" msgid="2119030386987211193">"色"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"線"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"マーカー"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"スパッタリング"</string>
     <string name="draw_clear" msgid="6728155515454921052">"消去"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"太さ"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"角のサイズ"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"色"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"消去"</string>
     <string name="color_pick_select" msgid="734312818059057394">"ユーザー定義の色を選択"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"色の選択"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"サイズの選択"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"元の画像"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"結果"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"画像を保存しています"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"処理しています..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"現在のプリセットを保存"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"ユーザープリセットを管理"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"新しいプリセット"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"プリセット名"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"情報"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"画像名"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"画像サイズ"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ヒストグラム"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIFデータ"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"プリセット"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"バージョン"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"以前のバージョン"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"現在のバージョン"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"モデル"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"絞り"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"レンズ焦点距離"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"被写体距離"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"撮影日"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Fストップ"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"露出時間"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"著作権"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c86d932..10797b1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"右に回転"</string>
     <string name="no_such_item" msgid="5315144556325243400">"アイテムが見つかりませんでした。"</string>
     <string name="edit" msgid="1502273844748580847">"編集"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"シンプルな編集"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"キャッシュリクエストを処理しています"</string>
     <string name="caching_label" msgid="4521059045896269095">"キャッシュ中..."</string>
     <string name="crop_action" msgid="3427470284074377001">"トリミング"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"カメラに接続できません。"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"カメラはセキュリティポリシーにより無効になっています。"</string>
     <string name="camera_label" msgid="6346560772074764302">"カメラ"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"ビデオ録画"</string>
     <string name="wait" msgid="8600187532323801552">"お待ちください..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"カメラを使用する前にUSBストレージをマウントしてください。"</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"カメラを使用する前にSDカードを挿入してください。"</string>
@@ -234,6 +234,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>
+    <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>
@@ -241,7 +242,7 @@
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"カウントダウン時にビープ音"</string>
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"タイマー時にビープ音"</string>
     <string name="setting_off" msgid="4480039384202951946">"OFF"</string>
     <string name="setting_on" msgid="8602246224465348901">"ON"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"動画の画質"</string>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"カメラ設定"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ビデオ録画設定"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"画像サイズ"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13Mピクセル"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8Mピクセル"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5メガピクセル"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4Mピクセル"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3メガピクセル"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2メガピクセル"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2Mピクセル(16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3メガピクセル"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1メガピクセル"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"オート"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"無限遠"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"マクロ"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"オート"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"無限遠"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"マクロ"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"フラッシュモード"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"フラッシュモード"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"オート"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ON"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"OFF"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"フラッシュオート"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"フラッシュON"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"フラッシュOFF"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"ホワイトバランス"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"ホワイトバランス"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"オート"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"白熱灯"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"昼光"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"蛍光灯"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"曇り"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"オート"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"白熱灯"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"昼光"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"蛍光灯"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"曇り"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"撮影モード"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"オート"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"カウントダウンタイマー"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"タイマーOFF"</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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USBストレージの空き領域が少なくなっています。画質設定を変更するか、画像など一部のファイルを削除してください。"</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SDカードの空き領域が少なくなっています。画質設定を変更するか、画像などのファイルを一部削除してください。"</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"宇宙空間"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"夕焼け"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"あなたの動画"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"端末をセッティングします。"\n"少しの間フレームの外に出ます。"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"端末をセッティングします。\n少しの間フレームの外に出ます。"</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"録画中にタップして静止画を撮影できます。"</string>
     <string name="video_recording_started" msgid="4132915454417193503">"録画を開始しました。"</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"録画を停止しました。"</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"動画に切り替え"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"パノラマに切り替え"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"新しいパノラマに切り替える"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"リフォーカスに切り替える"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"レビュー - キャンセル"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"レビュー - 完了"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"撮り直しを確認"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"動画を再生"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"動画を一時停止"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"動画を再読み込み"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"動画プレーヤーのタイムバー"</string>
     <string name="capital_on" msgid="5491353494964003567">"ON"</string>
     <string name="capital_off" msgid="7231052688467970897">"OFF"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"OFF"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"設定時間(秒数)"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"画像を撮影するまでカウントダウンします"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"撮影場所を記録しますか?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"画像や動画に撮影場所のタグを付けることができます。"\n\n"他のアプリから、保存された画像とともに撮影場所の情報にもアクセスできるようになります。"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"画像や動画に撮影場所のタグを付けることができます。\n\n他のアプリから、保存された画像とともに撮影場所の情報にもアクセスできるようになります。"</string>
     <string name="remember_location_no" msgid="7541394381714894896">"いいえ"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"はい"</string>
     <string name="menu_camera" msgid="3476709832879398998">"カメラ"</string>
     <string name="menu_search" msgid="7580008232297437190">"検索"</string>
     <string name="tab_photos" msgid="9110813680630313419">"写真"</string>
     <string name="tab_albums" msgid="8079449907770685691">"アルバム"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"その他のオプション"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"設定"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d枚の画像"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d枚の画像"</item>
diff --git a/res/values-ka-rGE/filtershow_strings.xml b/res/values-ka-rGE/filtershow_strings.xml
new file mode 100644
index 0000000..729d69f
--- /dev/null
+++ b/res/values-ka-rGE/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"ფოტო რედაქტორი"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"სურათი ვერ იტვირთება"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"ორიგინალის რედაქტირება ვერ ხერხდება"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"ფონის დაყენება"</string>
+    <string name="download_failure" msgid="5923323939788582895">"ფოტოს ჩამოტვირთვა ვერ მოხერხდა. ქსელი მიუწვდომელია."</string>
+    <string name="original" msgid="3524493791230430897">"ორიგინალი"</string>
+    <string name="borders" msgid="2067345080568684614">"კონტური"</string>
+    <string name="custom_border" msgid="8679893731790931871">"მორგებული"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"მოქმედების გაუქმება"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"გამეორება"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"გამოყენებული ეფექტების ჩვენება"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"გამოყენებული ეფექტის დამალვა"</string>
+    <string name="export_image" msgid="3202835713172222134">"ექსპორტი"</string>
+    <string name="print_image" msgid="1942989216591621413">"ბეჭდვა"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"გაერთიანებული სურათის ექსპორტი"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"ექსპორტირებული სურათი იქნება ასლი, ისტორიის გარეშე."</string>
+    <string name="quality" msgid="179292110309050529">"ხარისხი"</string>
+    <string name="size" msgid="4639404642236356037">"ზომა"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"პარამეტრები"</string>
+    <string name="unsaved" msgid="8704442449002374375">"ამ სურათში განხორციელებული ცვლილებები არ შენახულა."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"გსურთ გასვლამდე შენახვა?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"შენახვა და გასვლა"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"მიმდინარეობს სრული გარჩევადობის სურათის დამუშავება..."</string>
+    <string name="exit" msgid="242642957038770113">"გასვლა"</string>
+    <string name="history" msgid="455767361472692409">"ისტორია"</string>
+    <string name="reset" msgid="9013181350779592937">"საწყის პრამეტრებზე დაბრუნება"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"გამოყენებული ეფექტები"</string>
+    <string name="compare_original" msgid="8140838959007796977">"შედარება"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"გამოყენება"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"საწყის პრამეტრებზე დაბრუნება"</string>
+    <string name="aspect" msgid="4025244950820813059">"შეფარდება"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"არც ერთი"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"მუდმივი"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"დამრგვალება"</string>
+    <string name="exposure" msgid="6526397045949374905">"ექსპოზიცია"</string>
+    <string name="sharpness" msgid="6463103068318055412">"სიმკვეთრე"</string>
+    <string name="contrast" msgid="2310908487756769019">"კონტრასტი"</string>
+    <string name="vibrance" msgid="3326744578577835915">"ფერთა სიძლიერე"</string>
+    <string name="saturation" msgid="7026791551032438585">"ინტენსივობა"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"შ/თ ფილტრი"</string>
+    <string name="wbalance" msgid="6346581563387083613">"ავტორეჟიმი"</string>
+    <string name="hue" msgid="6231252147971086030">"ტონი"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"ჩრდილები"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"ციმები"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"მრუდები"</string>
+    <string name="vignette" msgid="934721068851885390">"ვინიეტირება"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"ვინიეტირება"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"ექსპოზიცია"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"ინტენსივობა"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"კონტრასტი"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"შემცირება"</string>
+    <string name="redeye" msgid="4508883127049472069">"წითელი თვალები"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"ხატვა"</string>
+    <string name="straighten" msgid="26025591664983528">"გასწორება"</string>
+    <string name="crop" msgid="5781263790107850771">"ჩამოჭრა"</string>
+    <string name="rotate" msgid="2796802553793795371">"შეტრიალება"</string>
+    <string name="mirror" msgid="5482518108154883096">"არეკვლა"</string>
+    <string name="negative" msgid="6998313764388022201">"ნეგატივი"</string>
+    <string name="none" msgid="6633966646410296520">"არც ერთი"</string>
+    <string name="edge" msgid="7036064886242147551">"კიდეები"</string>
+    <string name="kmeans" msgid="2080952022674981541">"პოსტერიზაცია"</string>
+    <string name="downsample" msgid="3552938534146980104">"შემცირება"</string>
+    <string name="grad" msgid="546774853424848655">"გრადაციული"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"სიკაშკაშე"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"კონტრასტი"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"ინტენსივობა"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"მთავარი"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"წითელი"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"ყვითელი"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"მწვანე"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"ციანი"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"ლურჯი"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"მაჯენტა"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"სტილი"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ახალი"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"წითელი"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"მწვანე"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"ლურჯი"</string>
+    <string name="draw_style" msgid="2036125061987325389">"სტილი"</string>
+    <string name="draw_size" msgid="4360005386104151209">"ზომა"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"ფერადოვნება"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"ინტენსივობა"</string>
+    <string name="draw_value" msgid="6571604055161538273">"სიკაშკაშე"</string>
+    <string name="draw_color" msgid="2119030386987211193">"ფერი"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"ხაზები"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"მარკერი"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"შხეფები"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"წაშლა"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"სისქე"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"კუთხის ზომა"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"ფერი"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"გასუფთავება"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"აირჩიეთ საკუთარი ფერი"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"აირჩიეთ ფერი"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"აირჩიეთ ზომა"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"კარგი"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"ორიგინალი"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"შედეგი"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"მიმდინარეობს სურათების შენახვა"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"მიმდინარეობს დამუშავება..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"მიმდინარე პარამეტრის შენახვა"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"მომხმარებლების პარამეტრ.მართვა"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"ახალი პარამეტრი"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"დამახსოვრებული პარამეტრების სახელი"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"ინფორმაცია"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"სურათის სახელი"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"სურათის ზომა"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ისტოგრამა"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF მონაცემები"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"წინასწ.დადგენ."</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"ვერსია"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"ორიგინალი"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"მიმდინარე"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"მოდელი"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"აპერტურა"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"ფოკუსური მანძილი"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"ობიექტის დისტანცია"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"გადაღების თარიღი"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"ექსპოზიციის დრო"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"საავტორო უფლებები"</string>
+</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000..0901347
--- /dev/null
+++ b/res/values-ka-rGE/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"გალერეა"</string>
+    <string name="gadget_title" msgid="259405922673466798">"სურათის ჩარჩო"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"ვიდეო დამკვრელი"</string>
+    <string name="loading_video" msgid="4013492720121891585">"ვიდეოს ჩატვირთვა…"</string>
+    <string name="loading_image" msgid="1200894415793838191">"სურათი იტვირთება ..."</string>
+    <string name="loading_account" msgid="928195413034552034">"ანგარიშის ჩატვირთვა…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"ვიდეოს ჩვენების განახლება"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"განვაახლოთ ვიდეოს ჩვენება %s-დან?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"ჩვენების განახლება"</string>
+    <string name="loading" msgid="7038208555304563571">"ჩატვირთვა…"</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"ვერ ჩამოიტვირთა"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"სურათი ვერ ჩამოიტვირთა"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"ესკიზი ვერ მოიძებნა"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"ხელახლა დაწყება"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"კარგი"</string>
+    <string name="ok" msgid="5296833083983263293">"OK"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"შეეხეთ სახეს დასაწყებად."</string>
+    <string name="saving_image" msgid="7270334453636349407">"სურათის შენახვა ..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"სურათის შენახვა ალბოში <xliff:g id="ALBUM_NAME">%1$s</xliff:g> ..."</string>
+    <string name="save_error" msgid="6857408774183654970">"ჩამოჭრილი სურათის შენახვა ვერ მოხერხდა."</string>
+    <string name="crop_label" msgid="521114301871349328">"სურათის ჩამოჭრა"</string>
+    <string name="trim_label" msgid="274203231381209979">"ვიდეოს კვეცა"</string>
+    <string name="select_image" msgid="7841406150484742140">"ფოტოს შერჩევა"</string>
+    <string name="select_video" msgid="4859510992798615076">"ვიდეოს შერჩევა"</string>
+    <string name="select_item" msgid="2816923896202086390">"ერთეულის შერჩევა"</string>
+    <string name="select_album" msgid="1557063764849434077">"ალბომის არჩევა"</string>
+    <string name="select_group" msgid="6744208543323307114">"ჯგუფის არჩევა"</string>
+    <string name="set_image" msgid="2331476809308010401">"სურათის დაყენება, როგორც"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"ფონის დაყენება"</string>
+    <string name="wallpaper" msgid="140165383777262070">"ფონის დაყენება…"</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"ფონი"</string>
+    <string name="delete" msgid="2839695998251824487">"წაშლა"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"წაიშალოს არჩეული ერთეული?"</item>
+    <item quantity="other" msgid="5874316486520635333">"გსურთ შერჩეული ერთეულების წაშლა?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"დადასტურება"</string>
+    <string name="cancel" msgid="3637516880917356226">"გაუქმება"</string>
+    <string name="share" msgid="3619042788254195341">"გაზიარება"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"პანორამის გაზიარება"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"ფოტოს სახით გაზიარება"</string>
+    <string name="deleted" msgid="6795433049119073871">"წაშლილი"</string>
+    <string name="undo" msgid="2930873956446586313">"ქმედების გაუქმება"</string>
+    <string name="select_all" msgid="3403283025220282175">"ყველას არჩევა"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"ყველა მონიშვნის მოხსნა"</string>
+    <string name="slideshow" msgid="4355906903247112975">"სლაიდშოუ"</string>
+    <string name="details" msgid="8415120088556445230">"დეტალები"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d %2$d ერთეულიდან:"</string>
+    <string name="close" msgid="5585646033158453043">"დახურვა"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"კამერაზე გადართვა"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"შერჩეულია %1$d"</item>
+    <item quantity="one" msgid="2478365152745637768">"შერჩეულია %1$d"</item>
+    <item quantity="other" msgid="754722656147810487">"შერჩეულია %1$d"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"შერჩეულია %1$d"</item>
+    <item quantity="one" msgid="6184377003099987825">"შერჩეულია %1$d"</item>
+    <item quantity="other" msgid="53105607141906130">"შერჩეულია %1$d"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"შერჩეულია %1$d"</item>
+    <item quantity="one" msgid="5030162638216034260">"შერჩეულია %1$d"</item>
+    <item quantity="other" msgid="3512041363942842738">"შერჩეულია %1$d"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"რუკაზე ჩვენება"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"მარცხნივ შებრუნება"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"მარჯვნივ შეტრიალება"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"ვერ მოიძებნა."</string>
+    <string name="edit" msgid="1502273844748580847">"რედაქტირება"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"მარტივი შესწორება"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"ქეშირების თხოვნის პროცესირება"</string>
+    <string name="caching_label" msgid="4521059045896269095">"ქეშირება..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"ჩამოჭრა"</string>
+    <string name="trim_action" msgid="703098114452883524">"მოკვეცა"</string>
+    <string name="mute_action" msgid="5296241754753306251">"დადუმება"</string>
+    <string name="set_as" msgid="3636764710790507868">"დააყენე როგორც"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"ვიდეოს დადუმება ვერ ხერხდება."</string>
+    <string name="video_err" msgid="7003051631792271009">"ვიდეოს ჩართვა ვერ ხერხდება."</string>
+    <string name="group_by_location" msgid="316641628989023253">"მდებარეობის მიხედვით"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"დროის მიხედვით"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"თეგების მიხედვით"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"ადამიანების მიხედვით"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"ალბომის მიხედვით"</string>
+    <string name="group_by_size" msgid="153766174950394155">"ზომის მიხედვით"</string>
+    <string name="untagged" msgid="7281481064509590402">"დაუთეგავი"</string>
+    <string name="no_location" msgid="4043624857489331676">"მდებარეობა უცნობია"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"ზოგიერთი ადგილის დადგენა შეუძლებელი აღმოჩნდა ქსელის პრობლემების გამო."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"ალბომში ფოტოების ჩამოტვირთვა ვერ მოხერხდა. სცადეთ ხელაr."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"მხოლოდ სურათები"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"მხოლოდ ვიდეოები"</string>
+    <string name="show_all" msgid="6963292714584735149">"სურათები და ვიდეოები"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"ფოტო გალერეა"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"ფოტოები არ არის."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"ჩამოჭრილი სურათი შენახულია <xliff:g id="FOLDER_NAME">%s</xliff:g>-ში."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"არ არის ხელმისაწვდომი ალბომები."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O გამოსახულება/ვიდეო."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"ჩანაწერები"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"ხაზგარეშე ხელმისაწვდომობა"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"განახლება"</string>
+    <string name="done" msgid="217672440064436595">"დასრულდა"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%1$d %2$d ერთეულიდან:"</string>
+    <string name="title" msgid="7622928349908052569">"სათაური"</string>
+    <string name="description" msgid="3016729318096557520">"აღწერა"</string>
+    <string name="time" msgid="1367953006052876956">"დრო"</string>
+    <string name="location" msgid="3432705876921618314">"ადგილმდებარეობა"</string>
+    <string name="path" msgid="4725740395885105824">"მდებარეობა"</string>
+    <string name="width" msgid="9215847239714321097">"სიგანე"</string>
+    <string name="height" msgid="3648885449443787772">"სიმაღლე"</string>
+    <string name="orientation" msgid="4958327983165245513">"ორიენტაცია"</string>
+    <string name="duration" msgid="8160058911218541616">"ხანგრძლივობა:"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME ტიპი"</string>
+    <string name="file_size" msgid="8486169301588318915">"ფაილის ზომა"</string>
+    <string name="maker" msgid="7921835498034236197">"ავტორი"</string>
+    <string name="model" msgid="8240207064064337366">"მოდელი"</string>
+    <string name="flash" msgid="2816779031261147723">"ბლიცი"</string>
+    <string name="aperture" msgid="5920657630303915195">"აპერტურა"</string>
+    <string name="focal_length" msgid="1291383769749877010">"ფოკუსური მანძილი"</string>
+    <string name="white_balance" msgid="1582509289994216078">"თეთრის ბალანსი"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"ექსპოზიციის დრო"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"მმ"</string>
+    <string name="manual" msgid="6608905477477607865">"ხელით"</string>
+    <string name="auto" msgid="4296941368722892821">"ავტომატურად"</string>
+    <string name="flash_on" msgid="7891556231891837284">"ბლიც-განათებით"</string>
+    <string name="flash_off" msgid="1445443413822680010">"ფლეშ განათების გარეშე"</string>
+    <string name="unknown" msgid="3506693015896912952">"უცნობი"</string>
+    <string name="ffx_original" msgid="372686331501281474">"ორიგინალი"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"ვინტაჟი"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"უეცარი"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"გახუნება"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"ლურჯი"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"შ/თ"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"შეკვეცა"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X-პროცესი"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"ლატე"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"ლითო"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"ალბომზე ხაზგარეშე ხელმისაწვდომობა"</item>
+    <item quantity="other" msgid="4948604338155959389">"ალბომებზე ხაზგარეშე ხელმისაწვდომობა"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"ეს ერთეული შენახულია ადგილობრივად და ხელმისაწვდომია ხაზგარეშე."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"ყველა ალბომი"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"ხაზგარეშე ალბომები"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP მოწყობილობები"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa-ს ალბომები"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> თავისუფალი"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> ან ნაკლები"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> ან  მეტი"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g>-დან <xliff:g id="MAX_SIZE">%2$s</xliff:g>-მდე"</string>
+    <string name="Import" msgid="3985447518557474672">"იმპორტი"</string>
+    <string name="import_complete" msgid="3875040287486199999">"იმპორტირება დასრულდა"</string>
+    <string name="import_fail" msgid="8497942380703298808">"წარმატებული იმპორტირება"</string>
+    <string name="camera_connected" msgid="916021826223448591">"კამერა მიერთებულია."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"კამერა გამოერთებულია."</string>
+    <string name="click_import" msgid="6407959065464291972">"იმპორტის დასაწყებად შეეხეთ აქ"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"ალბომის არჩევა"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"ყველა სურათის გადანაცვლება"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"სურათის არჩევა"</string>
+    <string name="widget_type" msgid="1364653978966343448">"სურათების არჩევა"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"სლაიდშოუ"</string>
+    <string name="albums" msgid="7320787705180057947">"ალბომები"</string>
+    <string name="times" msgid="2023033894889499219">"თარიღები"</string>
+    <string name="locations" msgid="6649297994083130305">"ადგილები"</string>
+    <string name="people" msgid="4114003823747292747">"ადამიანები"</string>
+    <string name="tags" msgid="5539648765482935955">"თეგები"</string>
+    <string name="group_by" msgid="4308299657902209357">"დაჯგუფება:"</string>
+    <string name="settings" msgid="1534847740615665736">"პარამეტრები"</string>
+    <string name="add_account" msgid="4271217504968243974">"ანგარიშის დამატება"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"კამერა"</string>
+    <string name="folder_download" msgid="7186215137642323932">"ჩამოტვირთვა"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"რედაქტირებული ონლაინ ფოტოები"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"იმპორტირებული"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"ეკრანის ანაბეჭდი"</string>
+    <string name="help" msgid="7368960711153618354">"დახმარება"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"მეხსიერება ვერ მოიძებნა."</string>
+    <string name="no_external_storage" msgid="95726173164068417">"გარე მეხსიერება მიუწვდომელია"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"ფოტოფირის ხედი"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ბადის ხედი"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"სრულეკრანიანი ხედი"</string>
+    <string name="trimming" msgid="9122385768369143997">"კვეცა"</string>
+    <string name="muting" msgid="5094925919589915324">"დადუმება"</string>
+    <string name="please_wait" msgid="7296066089146487366">"გთხოვთ, მოითმინოთ"</string>
+    <string name="save_into" msgid="9155488424829609229">"ვიდეოს შენახვა ალბოში <xliff:g id="ALBUM_NAME">%1$s</xliff:g> ..."</string>
+    <string name="trim_too_short" msgid="751593965620665326">"ჩამოჭრა შეუძლებელია : სამიზნე ვიდეო ზედმეტად მოკლეა"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"პანორამის შექმნა"</string>
+    <string name="save" msgid="613976532235060516">"შენახვა"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"კონტენტის სკანირება..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"მოხდა %1$d ერთეულის სკანირება"</item>
+    <item quantity="one" msgid="4340019444460561648">"მოხდა %1$d ერთეულის სკანირება"</item>
+    <item quantity="other" msgid="3138021473860555499">"მოხდა %1$d ერთეულის სკანირება"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"დახარისხება..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"სკანირება დასრულებულია"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"მიმდინარეობს იმპორტი..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"ამ მოწყობილობაზე იმპორტისათვის კონტენტი მიუწვდომელია."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"არ არის მიერთებული MTP მოწყობილობა"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"კამერის შეცდომა"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"კამერასთან დაკავშირება შეუძლებელია."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"კამერა გათიშული იქნა უსაფრთხოების პოლიტიკის გამო."</string>
+    <string name="camera_label" msgid="6346560772074764302">"კამერა"</string>
+    <string name="wait" msgid="8600187532323801552">"გთხოვთ, დაელოდოთ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"მიუერთეთ USB მეხსიერება კამერის გამოყენებამდე."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"კამერის გამოყენებამდე ჩადეთ SD ბარათი."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB მეხსიერების მომზადება…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD ბარათის მომზადება…"</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB მეხსიერება მიუწვდომელი იყო."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD ბარათი მიუწვდომელი იყო."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"გაუქმება"</string>
+    <string name="review_ok" msgid="1156261588693116433">"დასრულდა"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"ინტერვალური გადაღება"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"კამერის არჩევა"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d წამი"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"ტაიმერის ხმა"</string>
+    <string name="setting_off" msgid="4480039384202951946">"გამორთული"</string>
+    <string name="setting_on" msgid="8602246224465348901">"ჩართული"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"ვიდეოს ხარისხი"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"მაღალი ხარისხი"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"დაბალი"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"შენელებული გადაღება"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"კამერის პარამეტრები"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ვიდეოჩამწერის პარამეტრები"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"სურათის ზომა"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 მპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 მპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 მეგაპიქსელი (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 მპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"ფოკუს რეჟიმი"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ავტომატური"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"უსასრულობა"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"მაკრო"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ავტომატური"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"უსასრულობა"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"მაკრო"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"ფლეშ რეჟიმი"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"ბლიცის რეჟიმი"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"ავტომატურად"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ჩართული"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"გამორთულია"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"ავტო ბლიცი"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"ბლიცი ჩართულია"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ფლეშის გამორთვა"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"თეთრის ბალანსი"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"თეთრის ბალანსი"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"ავტომატურად"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"გახურების ნათურა"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"მზის სინათლე"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ლუმინესცენტური"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"მოღრუბლული"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ავტომატური"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"გავარვარებული"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"დღის სინათლე"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ლუმინესცენტური"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ღრუბლიანი"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"ხედის რეჟიმი"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"ავტომატური"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"მოქმედება"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"თქვენი  USB მეხსიერების თავისუფალი სივრცე იწურება. შეცვალეთ ხარისხის პარამეტრი ან წაშალეთ ზოგიერთი სურათი ან სხვა ფაილები."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"თქვენი SD ბარათის თავისუფალი სივრცე იწურება. შეცვალეთ ხარისხის პარამეტრი ან წაშალეთ ზოგიერთი სურათი ან სხვა ფაილები."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"ზომის მაქსიმალური ზღვარი მიღწეულია."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"ძალიან სწრაფი"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"პანორამის მომზადება"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"პანორამის შენახვა ვერ მოხერხდა."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"პანორამა"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"პანორამის შექმნა..."</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"წინა პანორამის მოლოდინშია"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"ინახება..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"პანორამის შექმნა"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"შეეხეთ ფოკუსში მოსაქცევად."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"ეფექტები"</string>
+    <string name="effect_none" msgid="3601545724573307541">"არც ერთი"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"დაწვრილება"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"დიდი თვალები"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"დიდი პირი"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"პატარა პირი"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"დიდი ცხვირი"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"პატარა თვალები"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"კოსმოსში"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"მზის ჩასვლა"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"თქვენი ვიდეო"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"დააყენეთ მოწყობილობა.\nცოტა ხნით გაიწიეთ, რომ კამერაში არ ჩანდეთ."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"შეეხეთ, რომ გადაიღოთ სურათი ჩაწერისას."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"ვიდეოს ჩაწერა დაიწყო."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"ვიდეოს ჩაწერა შეწყდა."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"შეუძლებელია ვიდეო ანაბეჭდის აღება, თუკი ჩართულია სპეცეფექტები."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"ეფექტების მოცილება"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"სულელური სახეები"</string>
+    <string name="effect_background" msgid="6579360207378171022">"ფონი"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"საკეტი ღილაკი"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"მენიუს ღილაკი"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"უახლესი ფოტო"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"წინა ან უკანა კამერაზე გადართვა"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"ფოტო, ვიდეო ან პანორამის რეჟიმის ამრჩევი"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"დამატებითი პარამეტრები"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"პარამეტრების მართვის დახურვა"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"მასშტაბირების კონტროლი"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s შემცირება"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"მატება %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s მოსანიშნი ველი"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"ფოტოზე გადართვა"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"ვიდეოზე გადართვა"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"პანორამაზე გადართვა"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"ახალ პანორამაზე გადართვა"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"გადართეთ ხელახლა ფოკუსირებისათვის"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"გადახედვის გაუქმება"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"გადახედვა დასრულებულია"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"ხელახლა გადაღება გადახედვისთვის"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"ვიდეოს ჩართვა"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"ვიდეოს შეჩერება"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"ვიდეოს გადატვირთვა"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"ვიდეო დამკვრელის დროის ზოლი"</string>
+    <string name="capital_on" msgid="5491353494964003567">"ჩართული"</string>
+    <string name="capital_off" msgid="7231052688467970897">"გამორთულია"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"გამორთული"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1,5 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0,5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2,5 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 საათი"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"წამი"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"წუთი"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"საათი"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"დასრულდა"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"დროის ინტერვალის დაყენება"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"შენელებული გადაღების ფუნქცია გათიშულია. ჩართეთ დროის ინტერვალის სანახავად."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"უკუმიმართულებით ათვლის ტაიმერი გათიშულია. ჩართეთ სურათის გადაღებამდე დროის უკუმიმართულებით ასათვლელად."</string>
+    <string name="set_duration" msgid="5578035312407161304">"ხანგრძლიობის წამებში დაყენება"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"გადაღებამდე უკუთვლა"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"გსურთ ფოტოს გადაღების ადგილის დამახსოვრება?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"დათეგეთ თქვენი ფოტოების და ვიდეოების გადაღების ადგილები.\n\nსხვა აპებს თქვენს დამახსოვრებულ სურათებთან ერთად ამ ინფორმაციაზე წვდომაც გააჩნიათ."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"არა, გმადლობთ"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"დიახ"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"კამერა"</string>
+    <string name="menu_search" msgid="7580008232297437190">"ძიება"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Photos"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"ალბომები"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"სხვა პარამეტრები"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"პარამეტრები"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d ფოტო"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d ფოტო"</item>
+  </plurals>
+</resources>
diff --git a/res/values-ka/filtershow_strings.xml b/res/values-ka/filtershow_strings.xml
new file mode 100644
index 0000000..7dcaa48
--- /dev/null
+++ b/res/values-ka/filtershow_strings.xml
@@ -0,0 +1,145 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"ფოტო რედაქტორი"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"სურათი ვერ იტვირთება"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"ფონის დაყენება"</string>
+    <string name="download_failure" msgid="5923323939788582895">"ფოტოს ჩამოტვირთვა ვერ მოხერხდა. ქსელი მიუწვდომელია."</string>
+    <string name="original" msgid="3524493791230430897">"ორიგინალი"</string>
+    <string name="saved" msgid="6678827180814174711">"დამახსოვრებული"</string>
+    <string name="borders" msgid="2067345080568684614">"კონტური"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"მოქმედების გაუქმება"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"გამეორება"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"გამოყენებული ეფექტების ჩვენება"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"გამოყენებული ეფექტის დამალვა"</string>
+    <string name="export_image" msgid="3202835713172222134">"ექსპორტი"</string>
+    <string name="print_image" msgid="1942989216591621413">"ბეჭდვა"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"გაერთიანებული სურათის ექსპორტი"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"ექსპორტირებული სურათი იქნება ასლი, ისტორიის გარეშე."</string>
+    <string name="quality" msgid="179292110309050529">"ხარისხი"</string>
+    <string name="size" msgid="4639404642236356037">"ზომა"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"პარამეტრები"</string>
+    <string name="unsaved" msgid="8704442449002374375">"ამ სურათში განხორციელებული ცვლილებები არ შენახულა."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"გსურთ გასვლამდე შენახვა?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"შენახვა და გასვლა"</string>
+    <string name="exit" msgid="242642957038770113">"გასვლა"</string>
+    <string name="history" msgid="455767361472692409">"ისტორია"</string>
+    <string name="reset" msgid="9013181350779592937">"საწყის პრამეტრებზე დაბრუნება"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"გამოყენებული ეფექტები"</string>
+    <string name="compare_original" msgid="8140838959007796977">"შედარება"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"გამოყენება"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"საწყის პრამეტრებზე დაბრუნება"</string>
+    <string name="aspect" msgid="4025244950820813059">"შეფარდება"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"არც ერთი"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"მუდმივი"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"დამრგვალება"</string>
+    <string name="exposure" msgid="6526397045949374905">"ექსპოზიცია"</string>
+    <string name="sharpness" msgid="6463103068318055412">"სიმკვეთრე"</string>
+    <string name="contrast" msgid="2310908487756769019">"კონტრასტი"</string>
+    <string name="vibrance" msgid="3326744578577835915">"ფერთა სიძლიერე"</string>
+    <string name="saturation" msgid="7026791551032438585">"ინტენსივობა"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"შ/თ ფილტრი"</string>
+    <string name="wbalance" msgid="6346581563387083613">"ავტორეჟიმი"</string>
+    <string name="hue" msgid="6231252147971086030">"ტონი"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"ჩრდილები"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"ციმები"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"მრუდები"</string>
+    <string name="vignette" msgid="934721068851885390">"ვინიეტირება"</string>
+    <string name="redeye" msgid="4508883127049472069">"წითელი თვალები"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"ხატვა"</string>
+    <string name="straighten" msgid="26025591664983528">"გასწორება"</string>
+    <string name="crop" msgid="5781263790107850771">"ჩამოჭრა"</string>
+    <string name="rotate" msgid="2796802553793795371">"შეტრიალება"</string>
+    <string name="mirror" msgid="5482518108154883096">"არეკვლა"</string>
+    <string name="negative" msgid="6998313764388022201">"ნეგატივი"</string>
+    <string name="none" msgid="6633966646410296520">"არც ერთი"</string>
+    <string name="edge" msgid="7036064886242147551">"კიდეები"</string>
+    <string name="kmeans" msgid="2080952022674981541">"პოსტერიზაცია"</string>
+    <string name="downsample" msgid="3552938534146980104">"შემცირება"</string>
+    <string name="grad" msgid="546774853424848655">"გრადაციული"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"სიკაშკაშე"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"კონტრასტი"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"ინტენსივობა"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"მთავარი"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"წითელი"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"ყვითელი"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"მწვანე"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"ციანი"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"ლურჯი"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"მაჯენტა"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"სტილი"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ახალი"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"წითელი"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"მწვანე"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"ლურჯი"</string>
+    <string name="draw_style" msgid="2036125061987325389">"სტილი"</string>
+    <string name="draw_size" msgid="4360005386104151209">"ზომა"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"ფერადოვნება"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"ინტენსივობა"</string>
+    <string name="draw_value" msgid="6571604055161538273">"სიკაშკაშე"</string>
+    <string name="draw_color" msgid="2119030386987211193">"ფერი"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"ხაზები"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"მარკერი"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"შხეფები"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"წაშლა"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"აირჩიეთ საკუთარი ფერი"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"აირჩიეთ ფერი"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"აირჩიეთ ზომა"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"კარგი"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"ორიგინალი"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"შედეგი"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"მიმდინარეობს სურათების შენახვა"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"მიმდინარეობს დამუშავება..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"მიმდინარე პარამეტრის შენახვა"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"მომხმარებლების პარამეტრ.მართვა"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"ახალი პარამეტრი"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"დამახსოვრებული პარამეტრების სახელი"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"ინფორმაცია"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"სურათის სახელი"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"სურათის ზომა"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ისტოგრამა"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF მონაცემები"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"წინასწ.დადგენ."</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"ვერსია"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"ორიგინალი"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"მიმდინარე"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"მოდელი"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"აპერტურა"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"ფოკუსური მანძილი"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"ობიექტის დისტანცია"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"გადაღების თარიღი"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"ექსპოზიციის დრო"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"საავტორო უფლებები"</string>
+</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
new file mode 100644
index 0000000..0901347
--- /dev/null
+++ b/res/values-ka/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"გალერეა"</string>
+    <string name="gadget_title" msgid="259405922673466798">"სურათის ჩარჩო"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"ვიდეო დამკვრელი"</string>
+    <string name="loading_video" msgid="4013492720121891585">"ვიდეოს ჩატვირთვა…"</string>
+    <string name="loading_image" msgid="1200894415793838191">"სურათი იტვირთება ..."</string>
+    <string name="loading_account" msgid="928195413034552034">"ანგარიშის ჩატვირთვა…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"ვიდეოს ჩვენების განახლება"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"განვაახლოთ ვიდეოს ჩვენება %s-დან?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"ჩვენების განახლება"</string>
+    <string name="loading" msgid="7038208555304563571">"ჩატვირთვა…"</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"ვერ ჩამოიტვირთა"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"სურათი ვერ ჩამოიტვირთა"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"ესკიზი ვერ მოიძებნა"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"ხელახლა დაწყება"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"კარგი"</string>
+    <string name="ok" msgid="5296833083983263293">"OK"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"შეეხეთ სახეს დასაწყებად."</string>
+    <string name="saving_image" msgid="7270334453636349407">"სურათის შენახვა ..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"სურათის შენახვა ალბოში <xliff:g id="ALBUM_NAME">%1$s</xliff:g> ..."</string>
+    <string name="save_error" msgid="6857408774183654970">"ჩამოჭრილი სურათის შენახვა ვერ მოხერხდა."</string>
+    <string name="crop_label" msgid="521114301871349328">"სურათის ჩამოჭრა"</string>
+    <string name="trim_label" msgid="274203231381209979">"ვიდეოს კვეცა"</string>
+    <string name="select_image" msgid="7841406150484742140">"ფოტოს შერჩევა"</string>
+    <string name="select_video" msgid="4859510992798615076">"ვიდეოს შერჩევა"</string>
+    <string name="select_item" msgid="2816923896202086390">"ერთეულის შერჩევა"</string>
+    <string name="select_album" msgid="1557063764849434077">"ალბომის არჩევა"</string>
+    <string name="select_group" msgid="6744208543323307114">"ჯგუფის არჩევა"</string>
+    <string name="set_image" msgid="2331476809308010401">"სურათის დაყენება, როგორც"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"ფონის დაყენება"</string>
+    <string name="wallpaper" msgid="140165383777262070">"ფონის დაყენება…"</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"ფონი"</string>
+    <string name="delete" msgid="2839695998251824487">"წაშლა"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"წაიშალოს არჩეული ერთეული?"</item>
+    <item quantity="other" msgid="5874316486520635333">"გსურთ შერჩეული ერთეულების წაშლა?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"დადასტურება"</string>
+    <string name="cancel" msgid="3637516880917356226">"გაუქმება"</string>
+    <string name="share" msgid="3619042788254195341">"გაზიარება"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"პანორამის გაზიარება"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"ფოტოს სახით გაზიარება"</string>
+    <string name="deleted" msgid="6795433049119073871">"წაშლილი"</string>
+    <string name="undo" msgid="2930873956446586313">"ქმედების გაუქმება"</string>
+    <string name="select_all" msgid="3403283025220282175">"ყველას არჩევა"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"ყველა მონიშვნის მოხსნა"</string>
+    <string name="slideshow" msgid="4355906903247112975">"სლაიდშოუ"</string>
+    <string name="details" msgid="8415120088556445230">"დეტალები"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d %2$d ერთეულიდან:"</string>
+    <string name="close" msgid="5585646033158453043">"დახურვა"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"კამერაზე გადართვა"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"შერჩეულია %1$d"</item>
+    <item quantity="one" msgid="2478365152745637768">"შერჩეულია %1$d"</item>
+    <item quantity="other" msgid="754722656147810487">"შერჩეულია %1$d"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"შერჩეულია %1$d"</item>
+    <item quantity="one" msgid="6184377003099987825">"შერჩეულია %1$d"</item>
+    <item quantity="other" msgid="53105607141906130">"შერჩეულია %1$d"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"შერჩეულია %1$d"</item>
+    <item quantity="one" msgid="5030162638216034260">"შერჩეულია %1$d"</item>
+    <item quantity="other" msgid="3512041363942842738">"შერჩეულია %1$d"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"რუკაზე ჩვენება"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"მარცხნივ შებრუნება"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"მარჯვნივ შეტრიალება"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"ვერ მოიძებნა."</string>
+    <string name="edit" msgid="1502273844748580847">"რედაქტირება"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"მარტივი შესწორება"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"ქეშირების თხოვნის პროცესირება"</string>
+    <string name="caching_label" msgid="4521059045896269095">"ქეშირება..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"ჩამოჭრა"</string>
+    <string name="trim_action" msgid="703098114452883524">"მოკვეცა"</string>
+    <string name="mute_action" msgid="5296241754753306251">"დადუმება"</string>
+    <string name="set_as" msgid="3636764710790507868">"დააყენე როგორც"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"ვიდეოს დადუმება ვერ ხერხდება."</string>
+    <string name="video_err" msgid="7003051631792271009">"ვიდეოს ჩართვა ვერ ხერხდება."</string>
+    <string name="group_by_location" msgid="316641628989023253">"მდებარეობის მიხედვით"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"დროის მიხედვით"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"თეგების მიხედვით"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"ადამიანების მიხედვით"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"ალბომის მიხედვით"</string>
+    <string name="group_by_size" msgid="153766174950394155">"ზომის მიხედვით"</string>
+    <string name="untagged" msgid="7281481064509590402">"დაუთეგავი"</string>
+    <string name="no_location" msgid="4043624857489331676">"მდებარეობა უცნობია"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"ზოგიერთი ადგილის დადგენა შეუძლებელი აღმოჩნდა ქსელის პრობლემების გამო."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"ალბომში ფოტოების ჩამოტვირთვა ვერ მოხერხდა. სცადეთ ხელაr."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"მხოლოდ სურათები"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"მხოლოდ ვიდეოები"</string>
+    <string name="show_all" msgid="6963292714584735149">"სურათები და ვიდეოები"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"ფოტო გალერეა"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"ფოტოები არ არის."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"ჩამოჭრილი სურათი შენახულია <xliff:g id="FOLDER_NAME">%s</xliff:g>-ში."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"არ არის ხელმისაწვდომი ალბომები."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O გამოსახულება/ვიდეო."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"ჩანაწერები"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"ხაზგარეშე ხელმისაწვდომობა"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"განახლება"</string>
+    <string name="done" msgid="217672440064436595">"დასრულდა"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%1$d %2$d ერთეულიდან:"</string>
+    <string name="title" msgid="7622928349908052569">"სათაური"</string>
+    <string name="description" msgid="3016729318096557520">"აღწერა"</string>
+    <string name="time" msgid="1367953006052876956">"დრო"</string>
+    <string name="location" msgid="3432705876921618314">"ადგილმდებარეობა"</string>
+    <string name="path" msgid="4725740395885105824">"მდებარეობა"</string>
+    <string name="width" msgid="9215847239714321097">"სიგანე"</string>
+    <string name="height" msgid="3648885449443787772">"სიმაღლე"</string>
+    <string name="orientation" msgid="4958327983165245513">"ორიენტაცია"</string>
+    <string name="duration" msgid="8160058911218541616">"ხანგრძლივობა:"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME ტიპი"</string>
+    <string name="file_size" msgid="8486169301588318915">"ფაილის ზომა"</string>
+    <string name="maker" msgid="7921835498034236197">"ავტორი"</string>
+    <string name="model" msgid="8240207064064337366">"მოდელი"</string>
+    <string name="flash" msgid="2816779031261147723">"ბლიცი"</string>
+    <string name="aperture" msgid="5920657630303915195">"აპერტურა"</string>
+    <string name="focal_length" msgid="1291383769749877010">"ფოკუსური მანძილი"</string>
+    <string name="white_balance" msgid="1582509289994216078">"თეთრის ბალანსი"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"ექსპოზიციის დრო"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"მმ"</string>
+    <string name="manual" msgid="6608905477477607865">"ხელით"</string>
+    <string name="auto" msgid="4296941368722892821">"ავტომატურად"</string>
+    <string name="flash_on" msgid="7891556231891837284">"ბლიც-განათებით"</string>
+    <string name="flash_off" msgid="1445443413822680010">"ფლეშ განათების გარეშე"</string>
+    <string name="unknown" msgid="3506693015896912952">"უცნობი"</string>
+    <string name="ffx_original" msgid="372686331501281474">"ორიგინალი"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"ვინტაჟი"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"უეცარი"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"გახუნება"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"ლურჯი"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"შ/თ"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"შეკვეცა"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X-პროცესი"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"ლატე"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"ლითო"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"ალბომზე ხაზგარეშე ხელმისაწვდომობა"</item>
+    <item quantity="other" msgid="4948604338155959389">"ალბომებზე ხაზგარეშე ხელმისაწვდომობა"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"ეს ერთეული შენახულია ადგილობრივად და ხელმისაწვდომია ხაზგარეშე."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"ყველა ალბომი"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"ხაზგარეშე ალბომები"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP მოწყობილობები"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa-ს ალბომები"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> თავისუფალი"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> ან ნაკლები"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> ან  მეტი"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g>-დან <xliff:g id="MAX_SIZE">%2$s</xliff:g>-მდე"</string>
+    <string name="Import" msgid="3985447518557474672">"იმპორტი"</string>
+    <string name="import_complete" msgid="3875040287486199999">"იმპორტირება დასრულდა"</string>
+    <string name="import_fail" msgid="8497942380703298808">"წარმატებული იმპორტირება"</string>
+    <string name="camera_connected" msgid="916021826223448591">"კამერა მიერთებულია."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"კამერა გამოერთებულია."</string>
+    <string name="click_import" msgid="6407959065464291972">"იმპორტის დასაწყებად შეეხეთ აქ"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"ალბომის არჩევა"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"ყველა სურათის გადანაცვლება"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"სურათის არჩევა"</string>
+    <string name="widget_type" msgid="1364653978966343448">"სურათების არჩევა"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"სლაიდშოუ"</string>
+    <string name="albums" msgid="7320787705180057947">"ალბომები"</string>
+    <string name="times" msgid="2023033894889499219">"თარიღები"</string>
+    <string name="locations" msgid="6649297994083130305">"ადგილები"</string>
+    <string name="people" msgid="4114003823747292747">"ადამიანები"</string>
+    <string name="tags" msgid="5539648765482935955">"თეგები"</string>
+    <string name="group_by" msgid="4308299657902209357">"დაჯგუფება:"</string>
+    <string name="settings" msgid="1534847740615665736">"პარამეტრები"</string>
+    <string name="add_account" msgid="4271217504968243974">"ანგარიშის დამატება"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"კამერა"</string>
+    <string name="folder_download" msgid="7186215137642323932">"ჩამოტვირთვა"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"რედაქტირებული ონლაინ ფოტოები"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"იმპორტირებული"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"ეკრანის ანაბეჭდი"</string>
+    <string name="help" msgid="7368960711153618354">"დახმარება"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"მეხსიერება ვერ მოიძებნა."</string>
+    <string name="no_external_storage" msgid="95726173164068417">"გარე მეხსიერება მიუწვდომელია"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"ფოტოფირის ხედი"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ბადის ხედი"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"სრულეკრანიანი ხედი"</string>
+    <string name="trimming" msgid="9122385768369143997">"კვეცა"</string>
+    <string name="muting" msgid="5094925919589915324">"დადუმება"</string>
+    <string name="please_wait" msgid="7296066089146487366">"გთხოვთ, მოითმინოთ"</string>
+    <string name="save_into" msgid="9155488424829609229">"ვიდეოს შენახვა ალბოში <xliff:g id="ALBUM_NAME">%1$s</xliff:g> ..."</string>
+    <string name="trim_too_short" msgid="751593965620665326">"ჩამოჭრა შეუძლებელია : სამიზნე ვიდეო ზედმეტად მოკლეა"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"პანორამის შექმნა"</string>
+    <string name="save" msgid="613976532235060516">"შენახვა"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"კონტენტის სკანირება..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"მოხდა %1$d ერთეულის სკანირება"</item>
+    <item quantity="one" msgid="4340019444460561648">"მოხდა %1$d ერთეულის სკანირება"</item>
+    <item quantity="other" msgid="3138021473860555499">"მოხდა %1$d ერთეულის სკანირება"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"დახარისხება..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"სკანირება დასრულებულია"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"მიმდინარეობს იმპორტი..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"ამ მოწყობილობაზე იმპორტისათვის კონტენტი მიუწვდომელია."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"არ არის მიერთებული MTP მოწყობილობა"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"კამერის შეცდომა"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"კამერასთან დაკავშირება შეუძლებელია."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"კამერა გათიშული იქნა უსაფრთხოების პოლიტიკის გამო."</string>
+    <string name="camera_label" msgid="6346560772074764302">"კამერა"</string>
+    <string name="wait" msgid="8600187532323801552">"გთხოვთ, დაელოდოთ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"მიუერთეთ USB მეხსიერება კამერის გამოყენებამდე."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"კამერის გამოყენებამდე ჩადეთ SD ბარათი."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB მეხსიერების მომზადება…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD ბარათის მომზადება…"</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB მეხსიერება მიუწვდომელი იყო."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD ბარათი მიუწვდომელი იყო."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"გაუქმება"</string>
+    <string name="review_ok" msgid="1156261588693116433">"დასრულდა"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"ინტერვალური გადაღება"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"კამერის არჩევა"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d წამი"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"ტაიმერის ხმა"</string>
+    <string name="setting_off" msgid="4480039384202951946">"გამორთული"</string>
+    <string name="setting_on" msgid="8602246224465348901">"ჩართული"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"ვიდეოს ხარისხი"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"მაღალი ხარისხი"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"დაბალი"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"შენელებული გადაღება"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"კამერის პარამეტრები"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ვიდეოჩამწერის პარამეტრები"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"სურათის ზომა"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 მპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 მპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 მეგაპიქსელი (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 მპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 მეგაპიქსელი"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"ფოკუს რეჟიმი"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ავტომატური"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"უსასრულობა"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"მაკრო"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ავტომატური"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"უსასრულობა"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"მაკრო"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"ფლეშ რეჟიმი"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"ბლიცის რეჟიმი"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"ავტომატურად"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ჩართული"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"გამორთულია"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"ავტო ბლიცი"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"ბლიცი ჩართულია"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ფლეშის გამორთვა"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"თეთრის ბალანსი"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"თეთრის ბალანსი"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"ავტომატურად"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"გახურების ნათურა"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"მზის სინათლე"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ლუმინესცენტური"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"მოღრუბლული"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ავტომატური"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"გავარვარებული"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"დღის სინათლე"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ლუმინესცენტური"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ღრუბლიანი"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"ხედის რეჟიმი"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"ავტომატური"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"მოქმედება"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"თქვენი  USB მეხსიერების თავისუფალი სივრცე იწურება. შეცვალეთ ხარისხის პარამეტრი ან წაშალეთ ზოგიერთი სურათი ან სხვა ფაილები."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"თქვენი SD ბარათის თავისუფალი სივრცე იწურება. შეცვალეთ ხარისხის პარამეტრი ან წაშალეთ ზოგიერთი სურათი ან სხვა ფაილები."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"ზომის მაქსიმალური ზღვარი მიღწეულია."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"ძალიან სწრაფი"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"პანორამის მომზადება"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"პანორამის შენახვა ვერ მოხერხდა."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"პანორამა"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"პანორამის შექმნა..."</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"წინა პანორამის მოლოდინშია"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"ინახება..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"პანორამის შექმნა"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"შეეხეთ ფოკუსში მოსაქცევად."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"ეფექტები"</string>
+    <string name="effect_none" msgid="3601545724573307541">"არც ერთი"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"დაწვრილება"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"დიდი თვალები"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"დიდი პირი"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"პატარა პირი"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"დიდი ცხვირი"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"პატარა თვალები"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"კოსმოსში"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"მზის ჩასვლა"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"თქვენი ვიდეო"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"დააყენეთ მოწყობილობა.\nცოტა ხნით გაიწიეთ, რომ კამერაში არ ჩანდეთ."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"შეეხეთ, რომ გადაიღოთ სურათი ჩაწერისას."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"ვიდეოს ჩაწერა დაიწყო."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"ვიდეოს ჩაწერა შეწყდა."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"შეუძლებელია ვიდეო ანაბეჭდის აღება, თუკი ჩართულია სპეცეფექტები."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"ეფექტების მოცილება"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"სულელური სახეები"</string>
+    <string name="effect_background" msgid="6579360207378171022">"ფონი"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"საკეტი ღილაკი"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"მენიუს ღილაკი"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"უახლესი ფოტო"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"წინა ან უკანა კამერაზე გადართვა"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"ფოტო, ვიდეო ან პანორამის რეჟიმის ამრჩევი"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"დამატებითი პარამეტრები"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"პარამეტრების მართვის დახურვა"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"მასშტაბირების კონტროლი"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s შემცირება"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"მატება %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s მოსანიშნი ველი"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"ფოტოზე გადართვა"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"ვიდეოზე გადართვა"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"პანორამაზე გადართვა"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"ახალ პანორამაზე გადართვა"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"გადართეთ ხელახლა ფოკუსირებისათვის"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"გადახედვის გაუქმება"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"გადახედვა დასრულებულია"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"ხელახლა გადაღება გადახედვისთვის"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"ვიდეოს ჩართვა"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"ვიდეოს შეჩერება"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"ვიდეოს გადატვირთვა"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"ვიდეო დამკვრელის დროის ზოლი"</string>
+    <string name="capital_on" msgid="5491353494964003567">"ჩართული"</string>
+    <string name="capital_off" msgid="7231052688467970897">"გამორთულია"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"გამორთული"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1,5 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 წამი"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0,5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 წუთი"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2,5 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 საათი"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 საათი"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"წამი"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"წუთი"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"საათი"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"დასრულდა"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"დროის ინტერვალის დაყენება"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"შენელებული გადაღების ფუნქცია გათიშულია. ჩართეთ დროის ინტერვალის სანახავად."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"უკუმიმართულებით ათვლის ტაიმერი გათიშულია. ჩართეთ სურათის გადაღებამდე დროის უკუმიმართულებით ასათვლელად."</string>
+    <string name="set_duration" msgid="5578035312407161304">"ხანგრძლიობის წამებში დაყენება"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"გადაღებამდე უკუთვლა"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"გსურთ ფოტოს გადაღების ადგილის დამახსოვრება?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"დათეგეთ თქვენი ფოტოების და ვიდეოების გადაღების ადგილები.\n\nსხვა აპებს თქვენს დამახსოვრებულ სურათებთან ერთად ამ ინფორმაციაზე წვდომაც გააჩნიათ."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"არა, გმადლობთ"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"დიახ"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"კამერა"</string>
+    <string name="menu_search" msgid="7580008232297437190">"ძიება"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Photos"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"ალბომები"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"სხვა პარამეტრები"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"პარამეტრები"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d ფოტო"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d ფოტო"</item>
+  </plurals>
+</resources>
diff --git a/res/values-km-rKH/filtershow_strings.xml b/res/values-km-rKH/filtershow_strings.xml
new file mode 100644
index 0000000..d57b8a9
--- /dev/null
+++ b/res/values-km-rKH/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"កម្មវិធី​កែ​​​រូបថត"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"មិន​អាច​ផ្ទុក​រូបភាព​!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"មិន​អាច​កែ​សម្រួល​ច្បាប់​ដើម"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"ការ​កំណត់​ផ្ទាំង​រូបភាព"</string>
+    <string name="download_failure" msgid="5923323939788582895">"មិន​អាច​ផ្ទុក​រូបថត​ឡើង។ មិន​មានការ​ត​​បណ្ដាញ។"</string>
+    <string name="original" msgid="3524493791230430897">"ដើម"</string>
+    <string name="borders" msgid="2067345080568684614">"ស៊ុម"</string>
+    <string name="custom_border" msgid="8679893731790931871">"តាម​តម្រូវ​ការ"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"មិន​ធ្វើវិញ"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"ធ្វើ​វិញ"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"បង្ហាញ​បែបផែន​​បាន​អនុវត្ត"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"លាក់​បែបផែន​បាន​​អនុវត្ត"</string>
+    <string name="export_image" msgid="3202835713172222134">"នាំ​ចេញ"</string>
+    <string name="print_image" msgid="1942989216591621413">"បោះពុម្ព"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"នាំចេញ​រូបភាព​​រាប​ស្មើ"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"នឹង​ចម្លង​រូបភាព​ដែល​បាន​នាំចេញ ដោយ​គ្មាន​ប្រវត្តិ។"</string>
+    <string name="quality" msgid="179292110309050529">"គុណភាព"</string>
+    <string name="size" msgid="4639404642236356037">"ទំហំ"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"ការ​កំណត់"</string>
+    <string name="unsaved" msgid="8704442449002374375">"មាន​ការ​ផ្លាស់ប្ដូរ​​​មិន​បាន​រក្សាទុក​លើ​​រូបភាព​នេះ​។"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"តើ​អ្នក​ចង់​រក្សា​ទុក​មុន​ពេល​ចេញ?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"រក្សា​ទុក​​ ហើយ​ចេញ"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"កំពុង​ដំណើរការ​គុណភាព​បង្ហាញ​រូបភាព​ពេញលេញ..."</string>
+    <string name="exit" msgid="242642957038770113">"ចេញ"</string>
+    <string name="history" msgid="455767361472692409">"ប្រវត្តិ"</string>
+    <string name="reset" msgid="9013181350779592937">"កំណត់​ឡើងវិញ"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"បែបផែន​បាន​​អនុវត្ត"</string>
+    <string name="compare_original" msgid="8140838959007796977">"ប្រៀបធៀប"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"អនុវត្ត"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"កំណត់​ឡើងវិញ"</string>
+    <string name="aspect" msgid="4025244950820813059">"សមាមាត្រ"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"៤៖៣"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"៣៖៤"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"៤៖៦"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"៥៖៧"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"៧៖៥"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"១៦៖៩"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"គ្មាន"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"បាន​កែ"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"ភព​តូច"</string>
+    <string name="exposure" msgid="6526397045949374905">"បង្ហាញ"</string>
+    <string name="sharpness" msgid="6463103068318055412">"ភាព​ច្បាស់"</string>
+    <string name="contrast" msgid="2310908487756769019">"កម្រិត​ពណ៌"</string>
+    <string name="vibrance" msgid="3326744578577835915">"បន្ថែម​ពណ៌"</string>
+    <string name="saturation" msgid="7026791551032438585">"តិត្ថិភាព"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"តម្រង​ស/ខ្មី"</string>
+    <string name="wbalance" msgid="6346581563387083613">"ពណ៌​ស្វ័យប្រវត្តិ"</string>
+    <string name="hue" msgid="6231252147971086030">"ពណ៌​លាំៗ"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"ស្រមោល"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"រំលេច"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"ខ្សែ​កោង"</string>
+    <string name="vignette" msgid="934721068851885390">"ផុស​ចេញ"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"ផុស​ចេញ"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"បង្ហាញ"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"តិត្ថិភាព"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"កម្រិត​ពណ៌"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"បន្ថយ"</string>
+    <string name="redeye" msgid="4508883127049472069">"ភ្នែក​ក្រហម"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"គូរ"</string>
+    <string name="straighten" msgid="26025591664983528">"តម្រង់"</string>
+    <string name="crop" msgid="5781263790107850771">"ច្រឹប"</string>
+    <string name="rotate" msgid="2796802553793795371">"បង្វិល"</string>
+    <string name="mirror" msgid="5482518108154883096">"ឆ្លុះ"</string>
+    <string name="negative" msgid="6998313764388022201">"អវិជ្ជមាន"</string>
+    <string name="none" msgid="6633966646410296520">"គ្មាន"</string>
+    <string name="edge" msgid="7036064886242147551">"គែម"</string>
+    <string name="kmeans" msgid="2080952022674981541">"ប័ណ្ណ​ពាណិជ្ជកម្ម"</string>
+    <string name="downsample" msgid="3552938534146980104">"បន្ថយ​អត្រា"</string>
+    <string name="grad" msgid="546774853424848655">"ក្រិត"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"ពន្លឺ"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"កម្រិត​ពណ៌"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"តិត្ថិភាព"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"​សំខាន់"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"ពណ៌ក្រហម"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"ពណ៌លឿង"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"ពណ៌​បៃតង"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"ពណ៌ផ្ទៃមេឃ"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"ពណ៌ខៀវ"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"ពណ៌ក្រហម​ស្វាយ"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"រចនាប័ទ្ម"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ថ្មី"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"ក្រហម"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"បៃតង"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"ខៀវ"</string>
+    <string name="draw_style" msgid="2036125061987325389">"រចនាប័ទ្ម"</string>
+    <string name="draw_size" msgid="4360005386104151209">"ទំហំ"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"ពណ៌​លាំ​ៗ"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"តិត្ថិភាព"</string>
+    <string name="draw_value" msgid="6571604055161538273">"ពន្លឺ"</string>
+    <string name="draw_color" msgid="2119030386987211193">"ពណ៌"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"បន្ទាត់"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"សញ្ញា​សម្គាល់"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"បាចសាច"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"សម្អាត"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"កម្រាស់"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"ទំហំ​ជ្រុង"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"ពណ៌"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"សម្អាត"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"ជ្រើស​ពណ៌​តាម​តម្រូវ​ការ"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"ជ្រើស​ពណ៌"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"ជ្រើស​ទំហំ"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"យល់​ព្រម"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"ដើម"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"លទ្ធផល"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"រក្សាទុក​រូបភាព"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"កំពុង​ដំណើរ​ការ ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"រក្សា​ទុក​ការ​កំណត់​ជា​​មុន​បច្ចុប្បន្ន"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"គ្រប់គ្រង​ការ​កំណត់​ជាមុន​របស់​អ្នក​ប្រើ"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"កំណត់​ជា​មុន​ថ្មី"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"ឈ្មោះ​កំណត់​ជាមុន"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"ព័ត៌មាន"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"ឈ្មោះ​រូបភាព"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"ទំហំ​រូបភាព"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"គំនូស​តាង​​​របារ"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"ទិន្នន័យ EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"កំណត់​ជា​​មុន"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"កំណែ"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"ដើម"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"បច្ចុប្បន្ន"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"ម៉ូដែល"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"លំហ"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"ប្រវែង​ប្រសព្វ"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"ចម្ងាយ​​វត្ថុ"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"កាលបរិច្ឆេទ​ថត"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"បញ្ឈប់ F"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"ពេលវេលា​បង្ហាញ"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"រក្សាសិទ្ធិ"</string>
+</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000..8da5b74
--- /dev/null
+++ b/res/values-km-rKH/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"វិចិត្រ​សាល"</string>
+    <string name="gadget_title" msgid="259405922673466798">"ស៊ុម​រូបភាព"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"កម្មវិធី​ចាក់​វីដេអូ"</string>
+    <string name="loading_video" msgid="4013492720121891585">"កំពុង​ផ្ទុក​វីដេអូ..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"កំពុង​ផ្ទុក​រូបភាព..."</string>
+    <string name="loading_account" msgid="928195413034552034">"កំពុង​ផ្ទុក​គណនី..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"បន្ត​វីដេអូ"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"បន្ត​ចាក់​ពី %s ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"បន្ត​ការ​ចាក់"</string>
+    <string name="loading" msgid="7038208555304563571">"កំពុង​ផ្ទុក..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"មិន​អាច​ផ្ទុក"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"មិន​អាច​ផ្ទុក​រូបភាព"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"គ្មាន​រូបភាព​តូច"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"ចាប់ផ្ដើម"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"យល់​ព្រម"</string>
+    <string name="ok" msgid="5296833083983263293">"យល់​ព្រម"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"ប៉ះ​មុខ​ ដើម្បី​ចាប់ផ្ដើម​​។"</string>
+    <string name="saving_image" msgid="7270334453636349407">"កំពុង​រក្សាទុក​រូបភាព..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"កំពុង​រក្សាទុក​រូបភាព​ក្នុង <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="save_error" msgid="6857408774183654970">"មិន​អាច​រក្សាទុក​រូបភាព​បាន​ច្រឹប។"</string>
+    <string name="crop_label" msgid="521114301871349328">"ច្រឹប​រូបភាព"</string>
+    <string name="trim_label" msgid="274203231381209979">"កាត់​តម្រឹម​វីដេអូ"</string>
+    <string name="select_image" msgid="7841406150484742140">"ជ្រើស​រូបថត"</string>
+    <string name="select_video" msgid="4859510992798615076">"ជ្រើស​វីដេអូ"</string>
+    <string name="select_item" msgid="2816923896202086390">"ជ្រើស​ធាតុ"</string>
+    <string name="select_album" msgid="1557063764849434077">"ជ្រើស​អាល់ប៊ុម"</string>
+    <string name="select_group" msgid="6744208543323307114">"ជ្រើស​ក្រុម"</string>
+    <string name="set_image" msgid="2331476809308010401">"កំណត់​រូបភាព​ជា"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"កំណត់​ផ្ទាំង​រូបភាព"</string>
+    <string name="wallpaper" msgid="140165383777262070">"កំពុង​កំណត់​ផ្ទាំង​រូបភាព..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"ផ្ទាំង​រូបភាព"</string>
+    <string name="delete" msgid="2839695998251824487">"លុប"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"លុប​ធាតុ​ដែល​បាន​ជ្រើស​?"</item>
+    <item quantity="other" msgid="5874316486520635333">"លុប​ធាតុ​ដែល​បាន​ជ្រើស​​​?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"បញ្ជាក់"</string>
+    <string name="cancel" msgid="3637516880917356226">"បោះ​បង់"</string>
+    <string name="share" msgid="3619042788254195341">"ចែក​រំលែក"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"​ចែករំលែក​ទេសភាព"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"ចែករំលែក​ជា​រូបថត"</string>
+    <string name="deleted" msgid="6795433049119073871">"បាន​លុប"</string>
+    <string name="undo" msgid="2930873956446586313">"​មិន​​ធ្វើ​វិញ"</string>
+    <string name="select_all" msgid="3403283025220282175">"ជ្រើស​ទាំងអស់"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"មិន​ជ្រើស​ទាំងអស់"</string>
+    <string name="slideshow" msgid="4355906903247112975">"បញ្ចាំង​ស្លាយ"</string>
+    <string name="details" msgid="8415120088556445230">"សេចក្ដី​លម្អិត"</string>
+    <string name="details_title" msgid="2611396603977441273">"ធាតុ %1$d នៃ %2$d ៖"</string>
+    <string name="close" msgid="5585646033158453043">"បិទ"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"ប្ដូរ​ទៅ​ម៉ាស៊ីន​ថត"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="one" msgid="2478365152745637768">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="other" msgid="754722656147810487">"បាន​ជ្រើស %1$d"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="one" msgid="6184377003099987825">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="other" msgid="53105607141906130">"បាន​ជ្រើស %1$d"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="one" msgid="5030162638216034260">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="other" msgid="3512041363942842738">"បាន​ជ្រើស %1$d"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"បង្ហាញ​​លើ​ផែនទី"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"បង្វិល​ឆ្វេង"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"បង្វិល​ស្ដាំ"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"រក​មិន​ឃើញ​ធាតុ។"</string>
+    <string name="edit" msgid="1502273844748580847">"កែសម្រួល"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"កែ​សម្រួល​ធម្មតា"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"ដំណើរការ​សំណើ​ដាក់​ក្នុង​ឃ្លាំង"</string>
+    <string name="caching_label" msgid="4521059045896269095">"កំពុង​ដាក់​ក្នុង​ឃ្លាំង..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"ច្រឹប"</string>
+    <string name="trim_action" msgid="703098114452883524">"កាត់​តម្រឹម"</string>
+    <string name="mute_action" msgid="5296241754753306251">"ស្ងាត់"</string>
+    <string name="set_as" msgid="3636764710790507868">"កំណត់​ជា"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"មិន​អាច​បិទ​សំឡេង​វីដេអូ"</string>
+    <string name="video_err" msgid="7003051631792271009">"មិន​អាច​ចាក់​វីដេអូ។"</string>
+    <string name="group_by_location" msgid="316641628989023253">"តាម​ទីតាំង"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"តាម​ពេលវេលា"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"តាម​ស្លាក"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"តាម​​មនុស្ស"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"តាម​អាល់ប៊ុម"</string>
+    <string name="group_by_size" msgid="153766174950394155">"តាម​​ទំហំ"</string>
+    <string name="untagged" msgid="7281481064509590402">"មិន​បាន​ដាក់​ស្លាក"</string>
+    <string name="no_location" msgid="4043624857489331676">"គ្មាន​ទីតាំង"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"មិន​អាច​កំណត់​ទីតាំង​មួយ​ចំនួន ដោយ​សារ​បញ្ហា​បណ្ដាញ"</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"មិន​អាច​ទាញ​យក​រូបថត​ក្នុង​អាល់ប៊ុម​នេះ។ ព្យាយាម​ម្ដង​ទៀត​ពេលក្រោយ។"</string>
+    <string name="show_images_only" msgid="7263218480867672653">"តែ​រូបភាព"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"តែ​វីដេអូ"</string>
+    <string name="show_all" msgid="6963292714584735149">"រូបភាព &amp; វីដេអូ"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"វិចិត្រសាល​រូបភាព"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"គ្មាន​រូបថត។"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"បាន​រក្សាទុក​រូបភាព​បាន​ច្រឹប​ក្នុង <xliff:g id="FOLDER_NAME">%s</xliff:g> ។"</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"មិន​មាន​អាល់ប៊ុម"</string>
+    <string name="empty_album" msgid="4542880442593595494">"មាន​រូបភាព/វីដេអូ O"</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"ប្រកាស"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"ធ្វើ​ឲ្យ​ប្រើ​បាន​ក្រៅ​បណ្ដាញ"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"ផ្ទុក​ឡើង​វិញ"</string>
+    <string name="done" msgid="217672440064436595">"រួចរាល់"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"ធាតុ %1$d នៃ %2$d ៖"</string>
+    <string name="title" msgid="7622928349908052569">"ចំណង​ជើង"</string>
+    <string name="description" msgid="3016729318096557520">"ការ​ពិពណ៌នា"</string>
+    <string name="time" msgid="1367953006052876956">"ពេលវេលា"</string>
+    <string name="location" msgid="3432705876921618314">"ទី​តាំង"</string>
+    <string name="path" msgid="4725740395885105824">"ផ្លូវ"</string>
+    <string name="width" msgid="9215847239714321097">"ទទឹង"</string>
+    <string name="height" msgid="3648885449443787772">"កម្ពស់"</string>
+    <string name="orientation" msgid="4958327983165245513">"ការណែនាំ"</string>
+    <string name="duration" msgid="8160058911218541616">"រយៈពេល"</string>
+    <string name="mimetype" msgid="8024168704337990470">"ប្រភេទ MIME"</string>
+    <string name="file_size" msgid="8486169301588318915">"ទំហំ​​ឯកសារ"</string>
+    <string name="maker" msgid="7921835498034236197">"ម៉ាក"</string>
+    <string name="model" msgid="8240207064064337366">"ម៉ូដែល"</string>
+    <string name="flash" msgid="2816779031261147723">"បាញ់​ពន្លឺ"</string>
+    <string name="aperture" msgid="5920657630303915195">"លំហ"</string>
+    <string name="focal_length" msgid="1291383769749877010">"ប្រវែង​ប្រសព្វ៖"</string>
+    <string name="white_balance" msgid="1582509289994216078">"តុល្យភាព​ពណ៌​ស"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"ពេល​បង្ហាញ"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"ម.ម."</string>
+    <string name="manual" msgid="6608905477477607865">"ដោយ​ដៃ"</string>
+    <string name="auto" msgid="4296941368722892821">"ស្វ័យប្រវត្តិ"</string>
+    <string name="flash_on" msgid="7891556231891837284">"បាញ់​ពន្លឺ"</string>
+    <string name="flash_off" msgid="1445443413822680010">"មិន​បាញ់​ពន្លឺ"</string>
+    <string name="unknown" msgid="3506693015896912952">"មិន​ស្គាល់"</string>
+    <string name="ffx_original" msgid="372686331501281474">"ដើម"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"ត្នោត"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"ភ្លឺ"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"ដក​ពណ៌"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"ខៀវ"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"ស/ខ្មៅ"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"លឿង"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"ដំណើរការ X"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"កាហ្វេ"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"ត្នោត​ស្រាល"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"ធ្វើ​ឲ្យ​អាល់ប៊ុម​អាច​ប្រើ​បាន​ក្រៅ​បណ្ដាញ។"</item>
+    <item quantity="other" msgid="4948604338155959389">"ធ្វើ​ឲ្យ​អាល់ប៊ុម​អាច​ប្រើ​បាន​ក្រៅ​បណ្ដាញ"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"បាន​រក្សាទុក​ធាតុ​នេះ​ក្នុង​មូលដ្ឋាន​ និង​អាច​​ប្រើ​ក្រៅ​បណ្ដាញ​បាន។"</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"អាល់ប៊ុម​ទាំងអស់"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"អាល់ប៊ុម​មូលដ្ឋាន"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"ឧបករណ៍ MTP"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"អាល់ប៊ុម​ Picasa"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"ទំនេរ <xliff:g id="BYTES">%s</xliff:g>"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> ឬ​តូចជាង"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> ឬ​ធំ​ជាង"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> ដល់ <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"នាំចូល"</string>
+    <string name="import_complete" msgid="3875040287486199999">"ការ​នាំចូល​បាន​បញ្ចប់"</string>
+    <string name="import_fail" msgid="8497942380703298808">"នាំចូល​មិន​បាន​ជោគជ័យ"</string>
+    <string name="camera_connected" msgid="916021826223448591">"បាន​ភ្ជាប់​ម៉ាស៊ីន​ថត​។"</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"បាន​ផ្ដាច់​ម៉ាស៊ីន​ថត។"</string>
+    <string name="click_import" msgid="6407959065464291972">"ប៉ះ​នៅ​ទីនេះ​ ដើម្បី​នាំចូល"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"ជ្រើស​អាល់ប៊ុម"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"ច្របល់​រូបភាព​ទាំងអស់"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"ជ្រើស​រូបភាព"</string>
+    <string name="widget_type" msgid="1364653978966343448">"ជ្រើស​រូបភាព"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"បញ្ចាំង​ស្លាយ"</string>
+    <string name="albums" msgid="7320787705180057947">"អាល់ប៊ុម"</string>
+    <string name="times" msgid="2023033894889499219">"ពេលវេលា"</string>
+    <string name="locations" msgid="6649297994083130305">"ទីតាំង"</string>
+    <string name="people" msgid="4114003823747292747">"មនុស្ស"</string>
+    <string name="tags" msgid="5539648765482935955">"ស្លាក"</string>
+    <string name="group_by" msgid="4308299657902209357">"ដាក់​ជា​ក្រុម"</string>
+    <string name="settings" msgid="1534847740615665736">"ការ​កំណត់"</string>
+    <string name="add_account" msgid="4271217504968243974">"បន្ថែម​គណនី"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"ម៉ាស៊ីន​ថត"</string>
+    <string name="folder_download" msgid="7186215137642323932">"ទាញ​យក"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"បាន​កែ​រូបថត​លើ​បណ្ដាញ"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"បាន​នាំចូល"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"រូបថត​អេក្រង់"</string>
+    <string name="help" msgid="7368960711153618354">"ជំនួយ"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"គ្មាន​ឧបករណ៍​ផ្ទុក"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"មិន​មាន​ឧបករណ៍​ផ្ទុក​ខាង​ក្រៅ"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"ទិដ្ឋភាព​ហ្វីល"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ទិដ្ឋភាព​ក្រឡា"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"ទិដ្ឋភាព​ពេញ​អេក្រង់"</string>
+    <string name="trimming" msgid="9122385768369143997">"កាត់​តម្រឹម"</string>
+    <string name="muting" msgid="5094925919589915324">"ដក​ចេញ"</string>
+    <string name="please_wait" msgid="7296066089146487366">"សូម​រង់ចាំ"</string>
+    <string name="save_into" msgid="9155488424829609229">"កំពុង​រក្សាទុក​វីដេអូ​ក្នុង <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"មិន​អាច​តម្រឹម៖ វីដេអូ​គោលដៅ​ខ្លី​ពេក"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"បង្ហាញ​ទេសភាព"</string>
+    <string name="save" msgid="613976532235060516">"រក្សាទុក"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"កំពុង​វិភាគ​រក​មាតិកា..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"បាន​វិភាគ​រក​ធាតុ %1$d"</item>
+    <item quantity="one" msgid="4340019444460561648">"បាន​វិភាគ​រក​ធាតុ %1$d"</item>
+    <item quantity="other" msgid="3138021473860555499">"បាន​វិភាគ​រក​ធាតុ %1$d"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"កំពុង​តម្រៀប..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"ការ​វិភាគ​រក​រួចរាល់"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"កំពុង​នាំចូល..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"មិន​មាន​មាតិកា​សម្រាប់​​នាំចូល​លើ​ឧបករណ៍​នេះ។"</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"មិន​មាន​ឧបករណ៍​ MTP បាន​តភ្ជាប់"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"កំហុស​ម៉ាស៊ីន​ថត"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"មិន​អាច​តភ្ជាប់​ម៉ាស៊ីន​ថត។"</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"បាន​បិទ​ម៉ាស៊ីន​ថត ដោយ​សារ​តែ​គោលនយោបាយ​សុវត្ថិភាព។"</string>
+    <string name="camera_label" msgid="6346560772074764302">"ម៉ាស៊ីន​ថត"</string>
+    <string name="wait" msgid="8600187532323801552">"សូម​រង់ចាំ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"ភ្ជាប់​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​មុន​ពេល​ប្រើ​ម៉ាស៊ីន​ថត។"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"បញ្ចូល​កាត​អេសឌី​មុន​នឹង​ប្រើ​ម៉ាស៊ីន​ថត។"</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"កំពុង​រៀបចំ​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"កំពុង​រៀបចំ​កាត​អេសឌី..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"មិន​អាច​ចូល​ដំណើរការ​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី។"</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"មិន​អាច​ចូល​ដំណើរការ​កាត​អេសឌី។"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"បោះ​បង់"</string>
+    <string name="review_ok" msgid="1156261588693116433">"រួចរាល់"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"ថត​សុពលភាព​រយៈពេល"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"ជ្រើស​ម៉ាស៊ីន​ថត"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d វិនាទី"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"សំឡេង​ប៊ីប​​អំឡុង​ពេល​រាប់"</string>
+    <string name="setting_off" msgid="4480039384202951946">"បិទ"</string>
+    <string name="setting_on" msgid="8602246224465348901">"បើក"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"គុណភាព​វីដេអូ"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"ខ្ពស់"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"ទាប"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"សុពលភាព​ពេលវេលា"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"ការ​កំណត់​ម៉ាស៊ីន​ថត"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ការ​កំណត់​ម៉ាស៊ីន​ថត​វីដេអូ"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"ទំហំ​រូបភាព"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"១៣ មេហ្គាភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"៨ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"៥ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"៤ មេហ្គា​​ភីក​សែល"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"៣ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"២ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"២ មេហ្គាភីក​សែល (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"១.៣ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"១ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"របៀប​ផ្ដោត"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"និរន្ត"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"ម៉ាក្រូ"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"និរន្ត"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"ម៉ាក្រូ"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"របៀប​បាញ់​ពន្លឺ"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"របៀប​បាញ់​ពន្លឺ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"បើក"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"បិទ"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"បាញ់​ពន្លឺ​ស្វ័យ​ប្រវត្តិ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"បើក​ការ​បាញ់​ពន្លឺ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"បិទ​ការ​បាញ់​ពន្លឺ"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"តុល្យភាព​ពណ៌​ស"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"តុល្យភាព​ពណ៌ស"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"ពណ៌ស"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"ពន្លឺថ្ងៃ"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"រលើប"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"ពពក"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ពណ៌ស"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ពន្លឺថ្ងៃ"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"រលើប"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ពពក"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"របៀប​រូបភាព"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"សកម្មភាព"</string>
+    <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>
+    <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>
+    <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">"៣ វិនាទី"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"១០ វិនាទី"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"១៥​ វិនាទី"</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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​របស់​អ្នក​ពេញ​ហើយ។ ប្ដូរ​ការ​កំណត់​គុណភាព ឬ​លុប​​រូបភាព ឬ​ឯកសារ​មួយ​ចំនួន​ចេញ។"</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"កាត​អេសឌី​របស់​អ្នក​ពេញ​ហើយ។ ប្ដូរ​ការ​កំណត់​គុណភាព ឬ​លុប​រូបភាព​ ឬ​ឯកសារ​​មួយ​ចំនួន​ចេញ។"</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"បាន​ដល់​​ដែន​កំណត់​ទំហំ។"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"លឿន​ពេក"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"រៀបចំ​ទេសភាព"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"មិន​អាច​រក្សា​ទុក​ទេសភាព​។"</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"ទេសភាព"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"ចាប់​យក​ទេសភាព"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"រង់ចាំ​ទេសភាព​មុន"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"កំពុង​រក្សាទុក..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"បង្ហាញ​ទេសភាព"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"ប៉ះ ដើម្បី​ផ្ដោត។"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"បែបផែន"</string>
+    <string name="effect_none" msgid="3601545724573307541">"គ្មាន"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"ច្របាច់​មុខ"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ភ្នែក​ធំ"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"មាត់​ធំ"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"មាត់​​តូច"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"ច្រមុះ​ធំ"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"ភ្នែក​​តូច"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"ក្នុង​លំហ"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"ថ្ងៃលិច"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"វីដេអូ​របស់​អ្នក"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"ដាក់​ឧបករណ៍​របស់​អ្នក​ចុះក្រោម​បន្តិច។\n ដើរ​ចេញ​ពី​ទិដ្ឋភាព​មួយ​ភ្លែត។"</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"ប៉ះ ដើម្បី​ថត​រូប​ខណៈ​ដែល​កំពុង​ថត​វីដេអូ។"</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"ចាប់ផ្ដើម​ថត​វីដេអូ។"</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"បញ្ឈប់​ការ​ថត​វីដេអូ។"</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"បាន​បិទ​រូបថត​វីដេអូ ពេល​បាន​បើក​បែបផែន​ពិសេស។"</string>
+    <string name="clear_effects" msgid="5485339175014139481">"សម្អាត​បែបផែន"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"មុខ​ឆ្កួតៗ"</string>
+    <string name="effect_background" msgid="6579360207378171022">"ផ្ទៃ​ខាង​ក្រោយ"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"ប៊ូតុង​​ការពារ"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"ប៊ូតុង​ម៉ឺនុយ"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"រូបថត​ថ្មី​បំផុត"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"ប្ដូរ​ម៉ាស៊ីន​ថត​មុខ និង​ក្រោយ"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"កម្មវិធី​ជ្រើស​ម៉ាស៊ីន​ថត វីដេអូ ឬ​ទេសភាព"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"ពិនិត្យ​ការ​កំណត់​ផ្សេង​ទៀត"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"បិទ​ការ​ពិនិត្យ​ការ​កំណត់"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"ត្រួត​ពិនិត្យ​ការ​ពង្រីក"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"បន្ថយ %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"បង្កើន %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"ប្រអប់​ធីក %1$s"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"ប្ដូរ​ទៅ​រូបថត"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"ប្ដូរ​ទៅ​វីដេអូ"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"ប្ដូរ​ទៅ​ទេសភាព"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"ប្ដូរ​ទៅ​ទេសភាព​ថ្មី"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"ប្ដូរ​ទៅ​ផ្ដោត​​ឡើងវិញ"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"បោះបង់​ការ​ពិនិត្យ​មើល"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"បាន​ពិនិត្យ​រួចរាល់"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"ពិនិត្យ​មើល​ឡើងវិញ"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"ចាក់​វីដេអូ"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"ផ្អាក​វីដេអូ"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"ផ្ទុក​វីដេអូ​ឡើងវិញ"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"របារ​ពេលវេលា​កម្មវិធី​ចាក់​វីដេអូ"</string>
+    <string name="capital_on" msgid="5491353494964003567">"បើក"</string>
+    <string name="capital_off" msgid="7231052688467970897">"បិទ"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"បិទ"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"០.៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"១ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"១.៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"២ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"២.៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"៣ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"៤ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"៦ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"១០ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"១២ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"១៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"២៤ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"០.៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"១ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"១.៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"២ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"២.៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"៣ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"៤ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"៦ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"១០ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"១២ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"១៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"២៤ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"០.៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"១ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"១.៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"២ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"២.៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"៣ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"៤ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"៦ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"១០ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"១២ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"១៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"២៤ ម៉ោង"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"វិនាទី"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"នាទី"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"ម៉ោង"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"រួចរាល់"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"កំណត់​ចន្លោះ​ពេល"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"បាន​បិទ​សុពលភាព​ពេលវេលា។ បើ​វា ដើម្បី​កំណត់​ចន្លោះ​ពេល។"</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"បាន​បិទ​កម្មវិធី​កំណត់​ពេលវេលា​រាប់​​។ បើក​វា​ ដើម្បី​រាប់​មុន​ពេល​ថត​រូប។"</string>
+    <string name="set_duration" msgid="5578035312407161304">"កំណត់​រយៈពេល​គិត​ជា​វិនាទី"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"កំពុង​រាប់​ ​ដើម្បី​ថត​រូប"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"ចងចាំ​ទីតាំង​រូបថត​?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"ដាក់​ស្លាក​រូបថត និង​វីដេអូ​​របស់​អ្នក​​ពី​ទីតាំង​ដែល​អ្នក​បាន​ថត។\n\nកម្មវិធី​ផ្សេង​អាច​ចូល​មើល​​ប្រើ​ព័ត៌មាន​នេះ​ជា​មួយ​នឹង​រូបភាព​បាន​រក្សាទុក​របស់​អ្នក។"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"ទេ អរគុណ"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"បាទ/ចាស"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"ម៉ាស៊ីន​ថត"</string>
+    <string name="menu_search" msgid="7580008232297437190">"ស្វែងរក"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"រូបថត"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"អាល់ប៊ុម"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ជម្រើស​ច្រើន​ទៀត"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ការ​កំណត់"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"រូបថត %1$d"</item>
+    <item quantity="other" msgid="3813306834113858135">"រូបថត %1$d"</item>
+  </plurals>
+</resources>
diff --git a/res/values-km/filtershow_strings.xml b/res/values-km/filtershow_strings.xml
new file mode 100644
index 0000000..f0ddbd3
--- /dev/null
+++ b/res/values-km/filtershow_strings.xml
@@ -0,0 +1,145 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"កម្មវិធី​កែ​​​រូបថត"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"មិន​អាច​ផ្ទុក​រូបភាព​!"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"ការ​កំណត់​ផ្ទាំង​រូបភាព"</string>
+    <string name="download_failure" msgid="5923323939788582895">"មិន​អាច​ផ្ទុក​រូបថត​ឡើង។ មិន​មានការ​ត​​បណ្ដាញ។"</string>
+    <string name="original" msgid="3524493791230430897">"ដើម"</string>
+    <string name="saved" msgid="6678827180814174711">"បាន​រក្សា​ទុក"</string>
+    <string name="borders" msgid="2067345080568684614">"ស៊ុម"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"មិន​ធ្វើវិញ"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"ធ្វើ​វិញ"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"បង្ហាញ​បែបផែន​​បាន​អនុវត្ត"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"លាក់​បែបផែន​បាន​​អនុវត្ត"</string>
+    <string name="export_image" msgid="3202835713172222134">"នាំ​ចេញ"</string>
+    <string name="print_image" msgid="1942989216591621413">"បោះពុម្ព"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"នាំចេញ​រូបភាព​​រាប​ស្មើ"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"នឹង​ចម្លង​រូបភាព​ដែល​បាន​នាំចេញ ដោយ​គ្មាន​ប្រវត្តិ។"</string>
+    <string name="quality" msgid="179292110309050529">"គុណភាព"</string>
+    <string name="size" msgid="4639404642236356037">"ទំហំ"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"ការ​កំណត់"</string>
+    <string name="unsaved" msgid="8704442449002374375">"មាន​ការ​ផ្លាស់ប្ដូរ​​​មិន​បាន​រក្សាទុក​លើ​​រូបភាព​នេះ​។"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"តើ​អ្នក​ចង់​រក្សា​ទុក​មុន​ពេល​ចេញ?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"រក្សា​ទុក​​ ហើយ​ចេញ"</string>
+    <string name="exit" msgid="242642957038770113">"ចេញ"</string>
+    <string name="history" msgid="455767361472692409">"ប្រវត្តិ"</string>
+    <string name="reset" msgid="9013181350779592937">"កំណត់​ឡើងវិញ"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"បែបផែន​បាន​​អនុវត្ត"</string>
+    <string name="compare_original" msgid="8140838959007796977">"ប្រៀបធៀប"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"អនុវត្ត"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"កំណត់​ឡើងវិញ"</string>
+    <string name="aspect" msgid="4025244950820813059">"សមាមាត្រ"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"៤៖៣"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"៣៖៤"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"៤៖៦"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"៥៖៧"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"៧៖៥"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"១៦៖៩"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"គ្មាន"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"បាន​កែ"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"ភព​តូច"</string>
+    <string name="exposure" msgid="6526397045949374905">"បង្ហាញ"</string>
+    <string name="sharpness" msgid="6463103068318055412">"ភាព​ច្បាស់"</string>
+    <string name="contrast" msgid="2310908487756769019">"កម្រិត​ពណ៌"</string>
+    <string name="vibrance" msgid="3326744578577835915">"បន្ថែម​ពណ៌"</string>
+    <string name="saturation" msgid="7026791551032438585">"តិត្ថិភាព"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"តម្រង​ស/ខ្មី"</string>
+    <string name="wbalance" msgid="6346581563387083613">"ពណ៌​ស្វ័យប្រវត្តិ"</string>
+    <string name="hue" msgid="6231252147971086030">"ពណ៌​លាំៗ"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"ស្រមោល"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"រំលេច"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"ខ្សែ​កោង"</string>
+    <string name="vignette" msgid="934721068851885390">"ផុស​ចេញ"</string>
+    <string name="redeye" msgid="4508883127049472069">"ភ្នែក​ក្រហម"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"គូរ"</string>
+    <string name="straighten" msgid="26025591664983528">"តម្រង់"</string>
+    <string name="crop" msgid="5781263790107850771">"ច្រឹប"</string>
+    <string name="rotate" msgid="2796802553793795371">"បង្វិល"</string>
+    <string name="mirror" msgid="5482518108154883096">"ឆ្លុះ"</string>
+    <string name="negative" msgid="6998313764388022201">"អវិជ្ជមាន"</string>
+    <string name="none" msgid="6633966646410296520">"គ្មាន"</string>
+    <string name="edge" msgid="7036064886242147551">"គែម"</string>
+    <string name="kmeans" msgid="2080952022674981541">"ប័ណ្ណ​ពាណិជ្ជកម្ម"</string>
+    <string name="downsample" msgid="3552938534146980104">"បន្ថយ​អត្រា"</string>
+    <string name="grad" msgid="546774853424848655">"ក្រិត"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"ពន្លឺ"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"កម្រិត​ពណ៌"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"តិត្ថិភាព"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"​សំខាន់"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"ពណ៌ក្រហម"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"ពណ៌លឿង"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"ពណ៌​បៃតង"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"ពណ៌ផ្ទៃមេឃ"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"ពណ៌ខៀវ"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"ពណ៌ក្រហម​ស្វាយ"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"រចនាប័ទ្ម"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ថ្មី"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"ក្រហម"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"បៃតង"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"ខៀវ"</string>
+    <string name="draw_style" msgid="2036125061987325389">"រចនាប័ទ្ម"</string>
+    <string name="draw_size" msgid="4360005386104151209">"ទំហំ"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"ពណ៌​លាំ​ៗ"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"តិត្ថិភាព"</string>
+    <string name="draw_value" msgid="6571604055161538273">"ពន្លឺ"</string>
+    <string name="draw_color" msgid="2119030386987211193">"ពណ៌"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"បន្ទាត់"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"សញ្ញា​សម្គាល់"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"បាចសាច"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"សម្អាត"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"ជ្រើស​ពណ៌​តាម​តម្រូវ​ការ"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"ជ្រើស​ពណ៌"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"ជ្រើស​ទំហំ"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"យល់​ព្រម"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"ដើម"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"លទ្ធផល"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"រក្សាទុក​រូបភាព"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"កំពុង​ដំណើរ​ការ ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"រក្សា​ទុក​ការ​កំណត់​ជា​​មុន​បច្ចុប្បន្ន"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"គ្រប់គ្រង​ការ​កំណត់​ជាមុន​របស់​អ្នក​ប្រើ"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"កំណត់​ជា​មុន​ថ្មី"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"ឈ្មោះ​កំណត់​ជាមុន"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"ព័ត៌មាន"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"ឈ្មោះ​រូបភាព"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"ទំហំ​រូបភាព"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"គំនូស​តាង​​​របារ"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"ទិន្នន័យ EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"កំណត់​ជា​​មុន"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"កំណែ"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"ដើម"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"បច្ចុប្បន្ន"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"ម៉ូដែល"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"លំហ"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"ប្រវែង​ប្រសព្វ"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"ចម្ងាយ​​វត្ថុ"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"កាលបរិច្ឆេទ​ថត"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"បញ្ឈប់ F"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"ពេលវេលា​បង្ហាញ"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"រក្សាសិទ្ធិ"</string>
+</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
new file mode 100644
index 0000000..8da5b74
--- /dev/null
+++ b/res/values-km/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"វិចិត្រ​សាល"</string>
+    <string name="gadget_title" msgid="259405922673466798">"ស៊ុម​រូបភាព"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"កម្មវិធី​ចាក់​វីដេអូ"</string>
+    <string name="loading_video" msgid="4013492720121891585">"កំពុង​ផ្ទុក​វីដេអូ..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"កំពុង​ផ្ទុក​រូបភាព..."</string>
+    <string name="loading_account" msgid="928195413034552034">"កំពុង​ផ្ទុក​គណនី..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"បន្ត​វីដេអូ"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"បន្ត​ចាក់​ពី %s ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"បន្ត​ការ​ចាក់"</string>
+    <string name="loading" msgid="7038208555304563571">"កំពុង​ផ្ទុក..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"មិន​អាច​ផ្ទុក"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"មិន​អាច​ផ្ទុក​រូបភាព"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"គ្មាន​រូបភាព​តូច"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"ចាប់ផ្ដើម"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"យល់​ព្រម"</string>
+    <string name="ok" msgid="5296833083983263293">"យល់​ព្រម"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"ប៉ះ​មុខ​ ដើម្បី​ចាប់ផ្ដើម​​។"</string>
+    <string name="saving_image" msgid="7270334453636349407">"កំពុង​រក្សាទុក​រូបភាព..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"កំពុង​រក្សាទុក​រូបភាព​ក្នុង <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="save_error" msgid="6857408774183654970">"មិន​អាច​រក្សាទុក​រូបភាព​បាន​ច្រឹប។"</string>
+    <string name="crop_label" msgid="521114301871349328">"ច្រឹប​រូបភាព"</string>
+    <string name="trim_label" msgid="274203231381209979">"កាត់​តម្រឹម​វីដេអូ"</string>
+    <string name="select_image" msgid="7841406150484742140">"ជ្រើស​រូបថត"</string>
+    <string name="select_video" msgid="4859510992798615076">"ជ្រើស​វីដេអូ"</string>
+    <string name="select_item" msgid="2816923896202086390">"ជ្រើស​ធាតុ"</string>
+    <string name="select_album" msgid="1557063764849434077">"ជ្រើស​អាល់ប៊ុម"</string>
+    <string name="select_group" msgid="6744208543323307114">"ជ្រើស​ក្រុម"</string>
+    <string name="set_image" msgid="2331476809308010401">"កំណត់​រូបភាព​ជា"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"កំណត់​ផ្ទាំង​រូបភាព"</string>
+    <string name="wallpaper" msgid="140165383777262070">"កំពុង​កំណត់​ផ្ទាំង​រូបភាព..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"ផ្ទាំង​រូបភាព"</string>
+    <string name="delete" msgid="2839695998251824487">"លុប"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"លុប​ធាតុ​ដែល​បាន​ជ្រើស​?"</item>
+    <item quantity="other" msgid="5874316486520635333">"លុប​ធាតុ​ដែល​បាន​ជ្រើស​​​?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"បញ្ជាក់"</string>
+    <string name="cancel" msgid="3637516880917356226">"បោះ​បង់"</string>
+    <string name="share" msgid="3619042788254195341">"ចែក​រំលែក"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"​ចែករំលែក​ទេសភាព"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"ចែករំលែក​ជា​រូបថត"</string>
+    <string name="deleted" msgid="6795433049119073871">"បាន​លុប"</string>
+    <string name="undo" msgid="2930873956446586313">"​មិន​​ធ្វើ​វិញ"</string>
+    <string name="select_all" msgid="3403283025220282175">"ជ្រើស​ទាំងអស់"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"មិន​ជ្រើស​ទាំងអស់"</string>
+    <string name="slideshow" msgid="4355906903247112975">"បញ្ចាំង​ស្លាយ"</string>
+    <string name="details" msgid="8415120088556445230">"សេចក្ដី​លម្អិត"</string>
+    <string name="details_title" msgid="2611396603977441273">"ធាតុ %1$d នៃ %2$d ៖"</string>
+    <string name="close" msgid="5585646033158453043">"បិទ"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"ប្ដូរ​ទៅ​ម៉ាស៊ីន​ថត"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="one" msgid="2478365152745637768">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="other" msgid="754722656147810487">"បាន​ជ្រើស %1$d"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="one" msgid="6184377003099987825">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="other" msgid="53105607141906130">"បាន​ជ្រើស %1$d"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="one" msgid="5030162638216034260">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="other" msgid="3512041363942842738">"បាន​ជ្រើស %1$d"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"បង្ហាញ​​លើ​ផែនទី"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"បង្វិល​ឆ្វេង"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"បង្វិល​ស្ដាំ"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"រក​មិន​ឃើញ​ធាតុ។"</string>
+    <string name="edit" msgid="1502273844748580847">"កែសម្រួល"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"កែ​សម្រួល​ធម្មតា"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"ដំណើរការ​សំណើ​ដាក់​ក្នុង​ឃ្លាំង"</string>
+    <string name="caching_label" msgid="4521059045896269095">"កំពុង​ដាក់​ក្នុង​ឃ្លាំង..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"ច្រឹប"</string>
+    <string name="trim_action" msgid="703098114452883524">"កាត់​តម្រឹម"</string>
+    <string name="mute_action" msgid="5296241754753306251">"ស្ងាត់"</string>
+    <string name="set_as" msgid="3636764710790507868">"កំណត់​ជា"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"មិន​អាច​បិទ​សំឡេង​វីដេអូ"</string>
+    <string name="video_err" msgid="7003051631792271009">"មិន​អាច​ចាក់​វីដេអូ។"</string>
+    <string name="group_by_location" msgid="316641628989023253">"តាម​ទីតាំង"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"តាម​ពេលវេលា"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"តាម​ស្លាក"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"តាម​​មនុស្ស"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"តាម​អាល់ប៊ុម"</string>
+    <string name="group_by_size" msgid="153766174950394155">"តាម​​ទំហំ"</string>
+    <string name="untagged" msgid="7281481064509590402">"មិន​បាន​ដាក់​ស្លាក"</string>
+    <string name="no_location" msgid="4043624857489331676">"គ្មាន​ទីតាំង"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"មិន​អាច​កំណត់​ទីតាំង​មួយ​ចំនួន ដោយ​សារ​បញ្ហា​បណ្ដាញ"</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"មិន​អាច​ទាញ​យក​រូបថត​ក្នុង​អាល់ប៊ុម​នេះ។ ព្យាយាម​ម្ដង​ទៀត​ពេលក្រោយ។"</string>
+    <string name="show_images_only" msgid="7263218480867672653">"តែ​រូបភាព"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"តែ​វីដេអូ"</string>
+    <string name="show_all" msgid="6963292714584735149">"រូបភាព &amp; វីដេអូ"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"វិចិត្រសាល​រូបភាព"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"គ្មាន​រូបថត។"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"បាន​រក្សាទុក​រូបភាព​បាន​ច្រឹប​ក្នុង <xliff:g id="FOLDER_NAME">%s</xliff:g> ។"</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"មិន​មាន​អាល់ប៊ុម"</string>
+    <string name="empty_album" msgid="4542880442593595494">"មាន​រូបភាព/វីដេអូ O"</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"ប្រកាស"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"ធ្វើ​ឲ្យ​ប្រើ​បាន​ក្រៅ​បណ្ដាញ"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"ផ្ទុក​ឡើង​វិញ"</string>
+    <string name="done" msgid="217672440064436595">"រួចរាល់"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"ធាតុ %1$d នៃ %2$d ៖"</string>
+    <string name="title" msgid="7622928349908052569">"ចំណង​ជើង"</string>
+    <string name="description" msgid="3016729318096557520">"ការ​ពិពណ៌នា"</string>
+    <string name="time" msgid="1367953006052876956">"ពេលវេលា"</string>
+    <string name="location" msgid="3432705876921618314">"ទី​តាំង"</string>
+    <string name="path" msgid="4725740395885105824">"ផ្លូវ"</string>
+    <string name="width" msgid="9215847239714321097">"ទទឹង"</string>
+    <string name="height" msgid="3648885449443787772">"កម្ពស់"</string>
+    <string name="orientation" msgid="4958327983165245513">"ការណែនាំ"</string>
+    <string name="duration" msgid="8160058911218541616">"រយៈពេល"</string>
+    <string name="mimetype" msgid="8024168704337990470">"ប្រភេទ MIME"</string>
+    <string name="file_size" msgid="8486169301588318915">"ទំហំ​​ឯកសារ"</string>
+    <string name="maker" msgid="7921835498034236197">"ម៉ាក"</string>
+    <string name="model" msgid="8240207064064337366">"ម៉ូដែល"</string>
+    <string name="flash" msgid="2816779031261147723">"បាញ់​ពន្លឺ"</string>
+    <string name="aperture" msgid="5920657630303915195">"លំហ"</string>
+    <string name="focal_length" msgid="1291383769749877010">"ប្រវែង​ប្រសព្វ៖"</string>
+    <string name="white_balance" msgid="1582509289994216078">"តុល្យភាព​ពណ៌​ស"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"ពេល​បង្ហាញ"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"ម.ម."</string>
+    <string name="manual" msgid="6608905477477607865">"ដោយ​ដៃ"</string>
+    <string name="auto" msgid="4296941368722892821">"ស្វ័យប្រវត្តិ"</string>
+    <string name="flash_on" msgid="7891556231891837284">"បាញ់​ពន្លឺ"</string>
+    <string name="flash_off" msgid="1445443413822680010">"មិន​បាញ់​ពន្លឺ"</string>
+    <string name="unknown" msgid="3506693015896912952">"មិន​ស្គាល់"</string>
+    <string name="ffx_original" msgid="372686331501281474">"ដើម"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"ត្នោត"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"ភ្លឺ"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"ដក​ពណ៌"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"ខៀវ"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"ស/ខ្មៅ"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"លឿង"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"ដំណើរការ X"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"កាហ្វេ"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"ត្នោត​ស្រាល"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"ធ្វើ​ឲ្យ​អាល់ប៊ុម​អាច​ប្រើ​បាន​ក្រៅ​បណ្ដាញ។"</item>
+    <item quantity="other" msgid="4948604338155959389">"ធ្វើ​ឲ្យ​អាល់ប៊ុម​អាច​ប្រើ​បាន​ក្រៅ​បណ្ដាញ"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"បាន​រក្សាទុក​ធាតុ​នេះ​ក្នុង​មូលដ្ឋាន​ និង​អាច​​ប្រើ​ក្រៅ​បណ្ដាញ​បាន។"</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"អាល់ប៊ុម​ទាំងអស់"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"អាល់ប៊ុម​មូលដ្ឋាន"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"ឧបករណ៍ MTP"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"អាល់ប៊ុម​ Picasa"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"ទំនេរ <xliff:g id="BYTES">%s</xliff:g>"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> ឬ​តូចជាង"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> ឬ​ធំ​ជាង"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> ដល់ <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"នាំចូល"</string>
+    <string name="import_complete" msgid="3875040287486199999">"ការ​នាំចូល​បាន​បញ្ចប់"</string>
+    <string name="import_fail" msgid="8497942380703298808">"នាំចូល​មិន​បាន​ជោគជ័យ"</string>
+    <string name="camera_connected" msgid="916021826223448591">"បាន​ភ្ជាប់​ម៉ាស៊ីន​ថត​។"</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"បាន​ផ្ដាច់​ម៉ាស៊ីន​ថត។"</string>
+    <string name="click_import" msgid="6407959065464291972">"ប៉ះ​នៅ​ទីនេះ​ ដើម្បី​នាំចូល"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"ជ្រើស​អាល់ប៊ុម"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"ច្របល់​រូបភាព​ទាំងអស់"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"ជ្រើស​រូបភាព"</string>
+    <string name="widget_type" msgid="1364653978966343448">"ជ្រើស​រូបភាព"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"បញ្ចាំង​ស្លាយ"</string>
+    <string name="albums" msgid="7320787705180057947">"អាល់ប៊ុម"</string>
+    <string name="times" msgid="2023033894889499219">"ពេលវេលា"</string>
+    <string name="locations" msgid="6649297994083130305">"ទីតាំង"</string>
+    <string name="people" msgid="4114003823747292747">"មនុស្ស"</string>
+    <string name="tags" msgid="5539648765482935955">"ស្លាក"</string>
+    <string name="group_by" msgid="4308299657902209357">"ដាក់​ជា​ក្រុម"</string>
+    <string name="settings" msgid="1534847740615665736">"ការ​កំណត់"</string>
+    <string name="add_account" msgid="4271217504968243974">"បន្ថែម​គណនី"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"ម៉ាស៊ីន​ថត"</string>
+    <string name="folder_download" msgid="7186215137642323932">"ទាញ​យក"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"បាន​កែ​រូបថត​លើ​បណ្ដាញ"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"បាន​នាំចូល"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"រូបថត​អេក្រង់"</string>
+    <string name="help" msgid="7368960711153618354">"ជំនួយ"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"គ្មាន​ឧបករណ៍​ផ្ទុក"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"មិន​មាន​ឧបករណ៍​ផ្ទុក​ខាង​ក្រៅ"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"ទិដ្ឋភាព​ហ្វីល"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ទិដ្ឋភាព​ក្រឡា"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"ទិដ្ឋភាព​ពេញ​អេក្រង់"</string>
+    <string name="trimming" msgid="9122385768369143997">"កាត់​តម្រឹម"</string>
+    <string name="muting" msgid="5094925919589915324">"ដក​ចេញ"</string>
+    <string name="please_wait" msgid="7296066089146487366">"សូម​រង់ចាំ"</string>
+    <string name="save_into" msgid="9155488424829609229">"កំពុង​រក្សាទុក​វីដេអូ​ក្នុង <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"មិន​អាច​តម្រឹម៖ វីដេអូ​គោលដៅ​ខ្លី​ពេក"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"បង្ហាញ​ទេសភាព"</string>
+    <string name="save" msgid="613976532235060516">"រក្សាទុក"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"កំពុង​វិភាគ​រក​មាតិកា..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"បាន​វិភាគ​រក​ធាតុ %1$d"</item>
+    <item quantity="one" msgid="4340019444460561648">"បាន​វិភាគ​រក​ធាតុ %1$d"</item>
+    <item quantity="other" msgid="3138021473860555499">"បាន​វិភាគ​រក​ធាតុ %1$d"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"កំពុង​តម្រៀប..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"ការ​វិភាគ​រក​រួចរាល់"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"កំពុង​នាំចូល..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"មិន​មាន​មាតិកា​សម្រាប់​​នាំចូល​លើ​ឧបករណ៍​នេះ។"</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"មិន​មាន​ឧបករណ៍​ MTP បាន​តភ្ជាប់"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"កំហុស​ម៉ាស៊ីន​ថត"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"មិន​អាច​តភ្ជាប់​ម៉ាស៊ីន​ថត។"</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"បាន​បិទ​ម៉ាស៊ីន​ថត ដោយ​សារ​តែ​គោលនយោបាយ​សុវត្ថិភាព។"</string>
+    <string name="camera_label" msgid="6346560772074764302">"ម៉ាស៊ីន​ថត"</string>
+    <string name="wait" msgid="8600187532323801552">"សូម​រង់ចាំ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"ភ្ជាប់​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​មុន​ពេល​ប្រើ​ម៉ាស៊ីន​ថត។"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"បញ្ចូល​កាត​អេសឌី​មុន​នឹង​ប្រើ​ម៉ាស៊ីន​ថត។"</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"កំពុង​រៀបចំ​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"កំពុង​រៀបចំ​កាត​អេសឌី..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"មិន​អាច​ចូល​ដំណើរការ​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី។"</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"មិន​អាច​ចូល​ដំណើរការ​កាត​អេសឌី។"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"បោះ​បង់"</string>
+    <string name="review_ok" msgid="1156261588693116433">"រួចរាល់"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"ថត​សុពលភាព​រយៈពេល"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"ជ្រើស​ម៉ាស៊ីន​ថត"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d វិនាទី"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"សំឡេង​ប៊ីប​​អំឡុង​ពេល​រាប់"</string>
+    <string name="setting_off" msgid="4480039384202951946">"បិទ"</string>
+    <string name="setting_on" msgid="8602246224465348901">"បើក"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"គុណភាព​វីដេអូ"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"ខ្ពស់"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"ទាប"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"សុពលភាព​ពេលវេលា"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"ការ​កំណត់​ម៉ាស៊ីន​ថត"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ការ​កំណត់​ម៉ាស៊ីន​ថត​វីដេអូ"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"ទំហំ​រូបភាព"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"១៣ មេហ្គាភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"៨ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"៥ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"៤ មេហ្គា​​ភីក​សែល"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"៣ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"២ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"២ មេហ្គាភីក​សែល (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"១.៣ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"១ មេហ្គា​ភីកសែល"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"របៀប​ផ្ដោត"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"និរន្ត"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"ម៉ាក្រូ"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"និរន្ត"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"ម៉ាក្រូ"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"របៀប​បាញ់​ពន្លឺ"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"របៀប​បាញ់​ពន្លឺ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"បើក"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"បិទ"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"បាញ់​ពន្លឺ​ស្វ័យ​ប្រវត្តិ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"បើក​ការ​បាញ់​ពន្លឺ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"បិទ​ការ​បាញ់​ពន្លឺ"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"តុល្យភាព​ពណ៌​ស"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"តុល្យភាព​ពណ៌ស"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"ពណ៌ស"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"ពន្លឺថ្ងៃ"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"រលើប"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"ពពក"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ពណ៌ស"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ពន្លឺថ្ងៃ"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"រលើប"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ពពក"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"របៀប​រូបភាព"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"ស្វ័យប្រវត្តិ"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"សកម្មភាព"</string>
+    <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>
+    <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>
+    <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">"៣ វិនាទី"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"១០ វិនាទី"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"១៥​ វិនាទី"</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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​របស់​អ្នក​ពេញ​ហើយ។ ប្ដូរ​ការ​កំណត់​គុណភាព ឬ​លុប​​រូបភាព ឬ​ឯកសារ​មួយ​ចំនួន​ចេញ។"</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"កាត​អេសឌី​របស់​អ្នក​ពេញ​ហើយ។ ប្ដូរ​ការ​កំណត់​គុណភាព ឬ​លុប​រូបភាព​ ឬ​ឯកសារ​​មួយ​ចំនួន​ចេញ។"</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"បាន​ដល់​​ដែន​កំណត់​ទំហំ។"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"លឿន​ពេក"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"រៀបចំ​ទេសភាព"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"មិន​អាច​រក្សា​ទុក​ទេសភាព​។"</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"ទេសភាព"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"ចាប់​យក​ទេសភាព"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"រង់ចាំ​ទេសភាព​មុន"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"កំពុង​រក្សាទុក..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"បង្ហាញ​ទេសភាព"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"ប៉ះ ដើម្បី​ផ្ដោត។"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"បែបផែន"</string>
+    <string name="effect_none" msgid="3601545724573307541">"គ្មាន"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"ច្របាច់​មុខ"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ភ្នែក​ធំ"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"មាត់​ធំ"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"មាត់​​តូច"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"ច្រមុះ​ធំ"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"ភ្នែក​​តូច"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"ក្នុង​លំហ"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"ថ្ងៃលិច"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"វីដេអូ​របស់​អ្នក"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"ដាក់​ឧបករណ៍​របស់​អ្នក​ចុះក្រោម​បន្តិច។\n ដើរ​ចេញ​ពី​ទិដ្ឋភាព​មួយ​ភ្លែត។"</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"ប៉ះ ដើម្បី​ថត​រូប​ខណៈ​ដែល​កំពុង​ថត​វីដេអូ។"</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"ចាប់ផ្ដើម​ថត​វីដេអូ។"</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"បញ្ឈប់​ការ​ថត​វីដេអូ។"</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"បាន​បិទ​រូបថត​វីដេអូ ពេល​បាន​បើក​បែបផែន​ពិសេស។"</string>
+    <string name="clear_effects" msgid="5485339175014139481">"សម្អាត​បែបផែន"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"មុខ​ឆ្កួតៗ"</string>
+    <string name="effect_background" msgid="6579360207378171022">"ផ្ទៃ​ខាង​ក្រោយ"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"ប៊ូតុង​​ការពារ"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"ប៊ូតុង​ម៉ឺនុយ"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"រូបថត​ថ្មី​បំផុត"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"ប្ដូរ​ម៉ាស៊ីន​ថត​មុខ និង​ក្រោយ"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"កម្មវិធី​ជ្រើស​ម៉ាស៊ីន​ថត វីដេអូ ឬ​ទេសភាព"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"ពិនិត្យ​ការ​កំណត់​ផ្សេង​ទៀត"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"បិទ​ការ​ពិនិត្យ​ការ​កំណត់"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"ត្រួត​ពិនិត្យ​ការ​ពង្រីក"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"បន្ថយ %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"បង្កើន %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"ប្រអប់​ធីក %1$s"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"ប្ដូរ​ទៅ​រូបថត"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"ប្ដូរ​ទៅ​វីដេអូ"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"ប្ដូរ​ទៅ​ទេសភាព"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"ប្ដូរ​ទៅ​ទេសភាព​ថ្មី"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"ប្ដូរ​ទៅ​ផ្ដោត​​ឡើងវិញ"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"បោះបង់​ការ​ពិនិត្យ​មើល"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"បាន​ពិនិត្យ​រួចរាល់"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"ពិនិត្យ​មើល​ឡើងវិញ"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"ចាក់​វីដេអូ"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"ផ្អាក​វីដេអូ"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"ផ្ទុក​វីដេអូ​ឡើងវិញ"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"របារ​ពេលវេលា​កម្មវិធី​ចាក់​វីដេអូ"</string>
+    <string name="capital_on" msgid="5491353494964003567">"បើក"</string>
+    <string name="capital_off" msgid="7231052688467970897">"បិទ"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"បិទ"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"០.៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"១ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"១.៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"២ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"២.៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"៣ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"៤ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"៦ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"១០ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"១២ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"១៥ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"២៤ វិនាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"០.៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"១ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"១.៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"២ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"២.៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"៣ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"៤ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"៦ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"១០ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"១២ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"១៥ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"២៤ នាទី"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"០.៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"១ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"១.៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"២ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"២.៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"៣ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"៤ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"៦ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"១០ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"១២ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"១៥ ម៉ោង"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"២៤ ម៉ោង"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"វិនាទី"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"នាទី"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"ម៉ោង"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"រួចរាល់"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"កំណត់​ចន្លោះ​ពេល"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"បាន​បិទ​សុពលភាព​ពេលវេលា។ បើ​វា ដើម្បី​កំណត់​ចន្លោះ​ពេល។"</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"បាន​បិទ​កម្មវិធី​កំណត់​ពេលវេលា​រាប់​​។ បើក​វា​ ដើម្បី​រាប់​មុន​ពេល​ថត​រូប។"</string>
+    <string name="set_duration" msgid="5578035312407161304">"កំណត់​រយៈពេល​គិត​ជា​វិនាទី"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"កំពុង​រាប់​ ​ដើម្បី​ថត​រូប"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"ចងចាំ​ទីតាំង​រូបថត​?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"ដាក់​ស្លាក​រូបថត និង​វីដេអូ​​របស់​អ្នក​​ពី​ទីតាំង​ដែល​អ្នក​បាន​ថត។\n\nកម្មវិធី​ផ្សេង​អាច​ចូល​មើល​​ប្រើ​ព័ត៌មាន​នេះ​ជា​មួយ​នឹង​រូបភាព​បាន​រក្សាទុក​របស់​អ្នក។"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"ទេ អរគុណ"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"បាទ/ចាស"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"ម៉ាស៊ីន​ថត"</string>
+    <string name="menu_search" msgid="7580008232297437190">"ស្វែងរក"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"រូបថត"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"អាល់ប៊ុម"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ជម្រើស​ច្រើន​ទៀត"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ការ​កំណត់"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"រូបថត %1$d"</item>
+    <item quantity="other" msgid="3813306834113858135">"រូបថត %1$d"</item>
+  </plurals>
+</resources>
diff --git a/res/values-ko/filtershow_strings.xml b/res/values-ko/filtershow_strings.xml
index 6e9f29b..fb5239c 100644
--- a/res/values-ko/filtershow_strings.xml
+++ b/res/values-ko/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"사진 편집기"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"이미지를 로드할 수 없습니다."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"원본 수정할 수 없음"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"배경화면 설정 중"</string>
+    <string name="download_failure" msgid="5923323939788582895">"네트워크를 사용할 수 없기 때문에 사진을 다운로드할 수 없습니다."</string>
     <string name="original" msgid="3524493791230430897">"원본"</string>
     <string name="borders" msgid="2067345080568684614">"테두리"</string>
+    <string name="custom_border" msgid="8679893731790931871">"맞춤"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"실행취소"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"다시실행"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"기록 표시"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"기록 숨기기"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"이미지 상태 표시"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"이미지 상태 숨기기"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"적용된 효과 표시"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"적용된 효과 숨기기"</string>
+    <string name="export_image" msgid="3202835713172222134">"내보내기"</string>
+    <string name="print_image" msgid="1942989216591621413">"인쇄"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"평면 이미지 내보내기"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"내보내는 이미지는 기록이 없는 사본입니다."</string>
+    <string name="quality" msgid="179292110309050529">"화질"</string>
+    <string name="size" msgid="4639404642236356037">"크기"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"설정"</string>
     <string name="unsaved" msgid="8704442449002374375">"이 이미지에 저장하지 않은 변경사항이 있습니다."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"저장하고 나서 종료하시겠습니까?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"저장 및 종료"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"전체 해상도 이미지 처리 중..."</string>
     <string name="exit" msgid="242642957038770113">"종료"</string>
     <string name="history" msgid="455767361472692409">"기록"</string>
     <string name="reset" msgid="9013181350779592937">"초기화"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"하이라이트"</string>
     <string name="curvesRGB" msgid="915010781090477550">"곡선"</string>
     <string name="vignette" msgid="934721068851885390">"비네트"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"비네트"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"노출"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"채도"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"대비"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"감소"</string>
     <string name="redeye" msgid="4508883127049472069">"적목현상 없애기"</string>
     <string name="imageDraw" msgid="6918552177844486656">"그리기"</string>
     <string name="straighten" msgid="26025591664983528">"수평조절"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"네거티브"</string>
     <string name="none" msgid="6633966646410296520">"선택 안 함"</string>
     <string name="edge" msgid="7036064886242147551">"가장자리"</string>
-    <string name="kmeans" msgid="1630263230946107457">"워홀"</string>
+    <string name="kmeans" msgid="2080952022674981541">"포스터"</string>
     <string name="downsample" msgid="3552938534146980104">"다운샘플"</string>
+    <string name="grad" msgid="546774853424848655">"그라데이션"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"밝기"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"대비"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"채도"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"기본"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"빨간색"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"노란색"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"녹색"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"청록색"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"파란색"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"자홍색"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"스타일"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"새 이미지"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"빨간색"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"녹색"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"파란색"</string>
     <string name="draw_style" msgid="2036125061987325389">"스타일"</string>
     <string name="draw_size" msgid="4360005386104151209">"크기"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"색조"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"채도"</string>
+    <string name="draw_value" msgid="6571604055161538273">"밝기"</string>
     <string name="draw_color" msgid="2119030386987211193">"색상"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"선"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"마커"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"튀기기"</string>
     <string name="draw_clear" msgid="6728155515454921052">"삭제"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"폭 조절"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"모서리 크기"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"색상"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"지우기"</string>
     <string name="color_pick_select" msgid="734312818059057394">"맞춤 색상 선택"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"색상 선택"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"크기 선택"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"확인"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"원본"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"결과"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"이미지 저장 중"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"처리 중..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"현재 사전설정 저장"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"사용자 사전설정 관리"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"새로운 사전설정"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"프리셋 이름"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"정보"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"이미지 이름"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"이미지 크기"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"히스토그램"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF 데이터"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"사전설정"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"버전"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"원본"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"현재"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"모델"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"조리개"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"초점 거리"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"피사체 거리"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"촬영 날짜"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F 스톱"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"노출 시간"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"저작권"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a6d4a5d..e2499dc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"오른쪽으로 회전"</string>
     <string name="no_such_item" msgid="5315144556325243400">"항목을 찾을 수 없습니다."</string>
     <string name="edit" msgid="1502273844748580847">"수정"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"간편 수정"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"캐시 요청을 처리하는 중"</string>
     <string name="caching_label" msgid="4521059045896269095">"캐시하는 중..."</string>
     <string name="crop_action" msgid="3427470284074377001">"자르기"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"카메라에 연결할 수 없습니다."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"보안 정책으로 인해 카메라 사용이 중지되었습니다."</string>
     <string name="camera_label" msgid="6346560772074764302">"카메라"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"캠코더"</string>
     <string name="wait" msgid="8600187532323801552">"잠시 기다려 주세요..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"카메라를 사용하기 전에 USB 저장소를 마운트하세요."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"카메라를 사용하기 전에 SD 카드를 삽입하세요."</string>
@@ -234,6 +234,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>
+    <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>
@@ -241,7 +242,7 @@
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"카운트다운하는 동안 신호음 울리기"</string>
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"카운트다운 신호음 켜기"</string>
     <string name="setting_off" msgid="4480039384202951946">"OFF"</string>
     <string name="setting_on" msgid="8602246224465348901">"ON"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"동영상 화질"</string>
@@ -251,11 +252,14 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"카메라 설정"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"캠코더 설정"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"사진 크기"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"1300만 화소"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M 픽셀"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M 픽셀"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4백만 화소"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M 픽셀"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M 픽셀"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M 픽셀"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2백만 화소(16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"130만 픽셀"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M 픽셀"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
     <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"자동"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"무한"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"매크로"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"자동"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"무한"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"매크로"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"플래시 모드"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"플래시 모드"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"자동"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ON"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"OFF"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"자동 플래시"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"플래시 사용"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"플래시 사용 안함"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"화이트 밸런스"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"화이트 밸런스"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"자동"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"백열"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"일광"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"형광"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"흐림"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"자동"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"백열"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"일광"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"형광"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"흐림"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"장면 모드"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"자동"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB 저장장치의 공간이 부족합니다. 화질 설정을 변경하거나 일부 이미지 또는 기타 파일을 삭제하세요."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD 카드의 공간이 부족합니다. 화질 설정을 변경하거나 일부 이미지 또는 기타 파일을 삭제하세요."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"우주"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"일몰"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"내 동영상"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"기기를 내려놓습니다."\n"잠시 동안 시야를 벗어납니다."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"기기를 내려놓습니다.\n잠시 동안 시야를 벗어납니다."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"녹화 중에 사진을 찍으려면 터치하세요."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"동영상 녹화가 시작되었습니다."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"동영상 녹화가 중지되었습니다."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"동영상으로 전환"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"파노라마로 전환"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"새 파노라마로 전환"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"초점 다시 맞춤 모드로 전환"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"리뷰 취소"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"리뷰 완료"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"다시 찍기 검토"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"동영상 재생"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"동영상 일지중지"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"동영상 새로고침"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"동영상 플레이어 시간 표시 막대"</string>
     <string name="capital_on" msgid="5491353494964003567">"ON"</string>
     <string name="capital_off" msgid="7231052688467970897">"OFF"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"사용 안함"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"시간 설정(초)"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"사진을 찍으려면 카운트다운하세요."</string>
     <string name="remember_location_title" msgid="9060472929006917810">"사진 위치를 기록하시겠습니까?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"촬영한 위치로 사진과 동영상에 태그를 지정하세요."\n\n"다른 앱이 저장된 이미지와 더불어 이 정보에 액세스할 수 있습니다."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"촬영한 위치로 사진과 동영상에 태그를 지정하세요.\n\n다른 앱이 저장된 이미지와 함께 이 정보를 볼 수 있습니다."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"아니요"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"예"</string>
     <string name="menu_camera" msgid="3476709832879398998">"카메라"</string>
     <string name="menu_search" msgid="7580008232297437190">"검색"</string>
     <string name="tab_photos" msgid="9110813680630313419">"사진"</string>
     <string name="tab_albums" msgid="8079449907770685691">"앨범"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"옵션 더보기"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"설정"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"사진 %1$d장"</item>
     <item quantity="other" msgid="3813306834113858135">"사진 %1$d장"</item>
diff --git a/res/values-lo-rLA/filtershow_strings.xml b/res/values-lo-rLA/filtershow_strings.xml
new file mode 100644
index 0000000..6ee79f5
--- /dev/null
+++ b/res/values-lo-rLA/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"ໂຕແກ້ໄຂຮູບ"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"ບໍ່ສາມາດໂຫລດຮູບດັ່ງກ່າວໄດ້!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"ບໍ່​ສາ​ມາດ​ແກ້​ໄຂຕົ້ນ​ສະ​ບັບໄດ້"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"ກຳລັງຕັ້ງພາບພື້ນຫຼັງ"</string>
+    <string name="download_failure" msgid="5923323939788582895">"ບໍ່ສາມາດດາວໂຫລດຮູບໄດ້. ເຄືອຂ່າຍບໍ່ສາມາດນຳໃຊ້ໄດ້."</string>
+    <string name="original" msgid="3524493791230430897">"ຕົ້ນສະບັບ"</string>
+    <string name="borders" msgid="2067345080568684614">"ຂອບ"</string>
+    <string name="custom_border" msgid="8679893731790931871">"ກຳນົດເອງ"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"ຍົກເລີກ"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"ເຮັດຊ້ຳ"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"ສະແດງເອັບເຟັກທີ່ນຳໃຊ້"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"ເຊື່ອງເອັບເຟັກທີ່ນຳໃຊ້"</string>
+    <string name="export_image" msgid="3202835713172222134">"ສົ່ງອອກ"</string>
+    <string name="print_image" msgid="1942989216591621413">"ພິມ"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Export Flattened Image"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"ຮູບທີ່ຖືກສົ່ງອອກຈະຖືກສຳເນົາໄວ້, ໂດຍຈະບໍ່ບັນທຶກໄວ້ໃນປະຫວັດ."</string>
+    <string name="quality" msgid="179292110309050529">"ຄຸນ​ນະ​ພາບ"</string>
+    <string name="size" msgid="4639404642236356037">"ຂະໜາດ"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"ການຕັ້ງຄ່າ"</string>
+    <string name="unsaved" msgid="8704442449002374375">"ມີການປ່ຽນແປງທີ່ຍັງບໍ່ໄດ້ຖືກບັນທຶກໃນຮູບນີ້."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"ທ່ານຕ້ອງການບັນທຶກກ່ອນອອກບໍ່?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"ບັນທຶກ ແລະອອກ"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"ກຳລັງດຳເນີນການກັບຮູບພາບຂະໜາດເຕັມ..."</string>
+    <string name="exit" msgid="242642957038770113">"ອອກ"</string>
+    <string name="history" msgid="455767361472692409">"ປະຫວັດ"</string>
+    <string name="reset" msgid="9013181350779592937">"ຄືນຄ່າ"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"ນຳໃຊ້ເອັບເຟັກ"</string>
+    <string name="compare_original" msgid="8140838959007796977">"ປຽບທຽບ"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"ນຳໃຊ້"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"ຄືນຄ່າ"</string>
+    <string name="aspect" msgid="4025244950820813059">"ສັດສ່ວນ"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"ບໍ່ໃຊ້"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"ຄົງທີ່"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"ດາວເຄາະນ້ອຍ"</string>
+    <string name="exposure" msgid="6526397045949374905">"ການຮັບແສງ"</string>
+    <string name="sharpness" msgid="6463103068318055412">"ຄວາມຄົມຊັດ"</string>
+    <string name="contrast" msgid="2310908487756769019">"ຄວາມເຂັ້ມ"</string>
+    <string name="vibrance" msgid="3326744578577835915">"ຄວາມສົດຂອງສີ"</string>
+    <string name="saturation" msgid="7026791551032438585">"ຄວາມແຈດຂອງສີ"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"ກັ່ນຕອງ BW"</string>
+    <string name="wbalance" msgid="6346581563387083613">"ປັບສີອັດຕະໂນມັດ"</string>
+    <string name="hue" msgid="6231252147971086030">"ໂທນສີ"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"ເງົາ"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"ໄຮໄລ"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"ເສັ້ນໂຄ້ງ"</string>
+    <string name="vignette" msgid="934721068851885390">"ຂອບດຳ"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"ຂອບດຳ"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"ການຮັບແສງ"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"ຄວາມເຂັ້ມຂອງສີ"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"ຄວາມເຂັ້ມ"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"ຂອບມືດ"</string>
+    <string name="redeye" msgid="4508883127049472069">"ຕາແດງ"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"ແຕ້ມ"</string>
+    <string name="straighten" msgid="26025591664983528">"ເຮັດໃຫ້ຊື່"</string>
+    <string name="crop" msgid="5781263790107850771">"ຕັດຮູບ"</string>
+    <string name="rotate" msgid="2796802553793795371">"ໝຸນ"</string>
+    <string name="mirror" msgid="5482518108154883096">"ແວ່ນສະທ້ອນ"</string>
+    <string name="negative" msgid="6998313764388022201">"ເນກາຕີບ"</string>
+    <string name="none" msgid="6633966646410296520">"ບໍ່ໃຊ້"</string>
+    <string name="edge" msgid="7036064886242147551">"ເສັ້ນຂອບ"</string>
+    <string name="kmeans" msgid="2080952022674981541">"ແບບສີໂປສເຕີ"</string>
+    <string name="downsample" msgid="3552938534146980104">"ຫຼຸດຂະໜາດຮູບລົງ"</string>
+    <string name="grad" msgid="546774853424848655">"ການໄລ່ສີ"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"ຄວາມສະຫວ່າງ"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"ຄວາມເຂັ້ມ"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"ຄວາມແຈດຂອງສີ"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"ຫຼັກ"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"ແດງ"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"ເຫຼືອງ"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"ຂຽວ"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"ຟ້າຂຽວ"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"ຟ້າ"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"ແດງມ່ວງ"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"ຮູບແບບ"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ໃໝ່"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"ສີແດງ"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"ສີຂຽວ"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"ສີຟ້າ"</string>
+    <string name="draw_style" msgid="2036125061987325389">"ສະຕາຍ"</string>
+    <string name="draw_size" msgid="4360005386104151209">"ຂະໜາດ"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"ໂທນສີ"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"ຄວາມແຈດຂອງສີ"</string>
+    <string name="draw_value" msgid="6571604055161538273">"ຄວາມສະຫວ່າງ"</string>
+    <string name="draw_color" msgid="2119030386987211193">"ສີ"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"ເສັ້ນ"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"ເຄື່ອງຫມາຍ"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"ສາດສີ"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"ລຶບລ້າງ"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"ຄວາມໜາ"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"ຂະໜາດຂອງມຸມ"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"ສີ"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"ລຶບຂອບ"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"ເລືອກສີທີ່ກຳໜົດເອງ"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"ເລືອກສີ"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"ເລືອກຂະໜາດ"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"ຕົກລົງ"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"ຕົ້ນສະບັບ"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"ຜົນໄດ້ຮັບ"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"ກຳລັງບັນທຶກພາບ"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"ກຳລັງປະມວນຜົນ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"ບັນທຶກພຣີເຊັນປັດຈຸບັນ"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"ຈັດການພຣີເຊັນຜູ່ໃຊ້"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"ພຣີເຊັນໃໝ່"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"ຊື່ Preset"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"ຂໍ້​ມູນ​ຂ່າວ​ສານ"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"ຊື່ຮູບ"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"ຂະ​ຫນາດ​ຮູບ"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ຮິສໂຕແກຣມ"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"ຂໍ້​ມູນ EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"ຄ່າສຳເລັດຮູບ:"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"ເວີຊັນ"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"ຕົ້ນສະບັບ"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"ປັດຈຸບັດ"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"ຮຸ່ນ"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"ຮູຮັບແສງ"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"ທາງຍາວໂຟກັສ"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"ໄລຍະຫ່າງວັດຖຸ"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"ວັນທີຖ່າຍ"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"ຮູຮັບແຮງ"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"ເວລາຮັບແສງ"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"ລິຂະສິດ"</string>
+</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000..618cc29
--- /dev/null
+++ b/res/values-lo-rLA/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"ຄັງຮູບ"</string>
+    <string name="gadget_title" msgid="259405922673466798">"ຂອບຮູບ"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"ເຄື່ອງຫຼິ້ນວິດີໂອ"</string>
+    <string name="loading_video" msgid="4013492720121891585">"ກໍາລັງໂຫລດວີດີໂອ..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"ກໍາລັງໂຫລດຮູບພາບ..."</string>
+    <string name="loading_account" msgid="928195413034552034">"ກໍາລັງໂຫລດບັນຊີ..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"ສືບຕໍ່ວິດີໂອ"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"ສືບຕໍ່ຫຼິ້ນຈາກ %s ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"ສືບຕໍ່ຫຼິ້ນວິດີໂອ"</string>
+    <string name="loading" msgid="7038208555304563571">"ກຳລັງໂຫລດ..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"ບໍ່ສາມາດໂຫຼດໄດ້"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"ບໍ່ສາມາດໂຫຼດຮູບພາບດັ່ງກ່າວ"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"ບໍ່ມີຮູບນ້ອຍ"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"ເລີ່ມຕົ້ນໃຫມ່"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"ຕົກລົງ"</string>
+    <string name="ok" msgid="5296833083983263293">"ຕົກລົງ"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"ສຳພັດໃສ່ໃບໜ້າເພື່ອເລີ່ມ."</string>
+    <string name="saving_image" msgid="7270334453636349407">"ກຳລັງບັນທຶກຮູບ..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"ກຳລັງບັກທຶກຮູບໃສ່ <xliff:g id="ALBUM_NAME">%1$s</xliff:g> ..."</string>
+    <string name="save_error" msgid="6857408774183654970">"ບໍ່ສາມາດບັນທຶກຮູບທີ່ຕັດໄດ້."</string>
+    <string name="crop_label" msgid="521114301871349328">"ຕັດຮູບ"</string>
+    <string name="trim_label" msgid="274203231381209979">"ຕັດວິດີໂອ"</string>
+    <string name="select_image" msgid="7841406150484742140">"ເລືອກຮູບ"</string>
+    <string name="select_video" msgid="4859510992798615076">"ເລືອກວິດີໂອ"</string>
+    <string name="select_item" msgid="2816923896202086390">"ກະລຸນາເລືອກລາຍການ"</string>
+    <string name="select_album" msgid="1557063764849434077">"ເລືອກອະລະບ້ຳ"</string>
+    <string name="select_group" msgid="6744208543323307114">"ເລືອກກຸ່ມ"</string>
+    <string name="set_image" msgid="2331476809308010401">"ຕັ້ງຮູບເປັນ"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"ຕັ້ງເປັນພາບພື້ນຫຼັງ"</string>
+    <string name="wallpaper" msgid="140165383777262070">"ກຳລັງຕັ້ງຮູບພື້ນຫຼັງ..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"ຮູບພື້ນຫຼັງ"</string>
+    <string name="delete" msgid="2839695998251824487">"ລຶບ"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"ລຶບລາຍການທີ່ເລືອກ?"</item>
+    <item quantity="other" msgid="5874316486520635333">"ລຶບລາຍການທີ່ເລືອກບໍ່?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"ຢືນຢັນ"</string>
+    <string name="cancel" msgid="3637516880917356226">"ຍົກເລີກ"</string>
+    <string name="share" msgid="3619042788254195341">"ແບ່ງປັນ"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"ແບ່ງປັນພາໂນຣາມາ"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"ແບ່ງປັນເປັນຮູບ"</string>
+    <string name="deleted" msgid="6795433049119073871">"ລຶບແລ້ວ"</string>
+    <string name="undo" msgid="2930873956446586313">"ແກ້ໄຂຄືນ"</string>
+    <string name="select_all" msgid="3403283025220282175">"ເລືອກທັງໝົດ"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"ຍົກເລີກການເລືອກທັງໝົດ"</string>
+    <string name="slideshow" msgid="4355906903247112975">"ສະໄລ້ໂຊ"</string>
+    <string name="details" msgid="8415120088556445230">"ລາຍລະອຽດ"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d of %2$d ລາຍການ:"</string>
+    <string name="close" msgid="5585646033158453043">"ປິດ"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"ປ່ຽນໄປຫາກ້ອງ"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d ຖືກເລືອກແລ້ວ"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d ຖືກເລືອກແລ້ວ"</item>
+    <item quantity="other" msgid="754722656147810487">"ເລືອກ %1$d ລາຍການແລ້ວ"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"ເລືອກ %1$d ອະລະບ້ຳແລ້ວ"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d ຖືກເລືອກແລ້ວ"</item>
+    <item quantity="other" msgid="53105607141906130">"ເລືອກ %1$d ອະລະບ້ຳແລ້ວ"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d ຖືກເລືອກແລ້ວ"</item>
+    <item quantity="one" msgid="5030162638216034260">"ເລືອກ %1$d ກຸ່ມແລ້ວ"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d ຖືກເລືອກແລ້ວ"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"ສະແດງໃນແຜນທີ່"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"ໝຸນຊ້າຍ"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"ໝຸນຂວາ"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"ບໍ່ສາມາດຊອກຫາລາຍການໄດ້."</string>
+    <string name="edit" msgid="1502273844748580847">"ແກ້ໄຂ"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"ແກ້ໄຂແບບງ່າຍດາຍ"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"ກຳລັງປະມວນຜົນຄຳຮ້ອງຂໍເກັບຂໍ້ມູນຊົ່ວຄາວ"</string>
+    <string name="caching_label" msgid="4521059045896269095">"ກຳລັງເກັບຄວາມຈຳຊົ່ວຄາວ..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"ຕັດ"</string>
+    <string name="trim_action" msgid="703098114452883524">"ຕັດ"</string>
+    <string name="mute_action" msgid="5296241754753306251">"ປີດສຽງ"</string>
+    <string name="set_as" msgid="3636764710790507868">"ຕັ້ງເປັນ"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"ບໍ່ສາມາດປິດສຽງວິດີໂອ."</string>
+    <string name="video_err" msgid="7003051631792271009">"ບໍ່ສາມາດຫຼິ້ນວີດີໂອໄດ້."</string>
+    <string name="group_by_location" msgid="316641628989023253">"ໂດຍສະຖານທີ່"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"ຕາມເວລາ"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"ຕາມແທັກ"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"ຕາມຄົນ"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"ຕາມອະລະ້ຳ"</string>
+    <string name="group_by_size" msgid="153766174950394155">"ຕາມຂະໜາດ"</string>
+    <string name="untagged" msgid="7281481064509590402">"ບໍ່ມີແທັກ"</string>
+    <string name="no_location" msgid="4043624857489331676">"ບໍ່ມີສະຖານທີ່"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"ຕຳແໜ່ງບາງບ່ອນບໍ່ສາມາດລະບຸໄດ້ ເນື່ອງຈາກບັນຫາການເຊື່ອມຕໍ່ເຄືອຂ່າຍ."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"ບໍ່ສາມາດດາວໂຫລດຮູບຈາກອະລະບ້ຳນີ້ໄດ້. ລອງໃໝ່ໃນພາຍຫຼັງ."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"ຮູບເທົ່ານັ້ນ"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"ວິດີໂອເທົ່ານັ້ນ"</string>
+    <string name="show_all" msgid="6963292714584735149">"ຮູບ &amp; ວິດີໂອ"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"ຄັງຮູບພາບ"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"ບໍ່ມີຮູບ."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"ຮູບທີ່ຖືກຕັດໄດ້ຖືກບັນທຶກໄປຫາ <xliff:g id="FOLDER_NAME">%s</xliff:g> ແລ້ວ."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"ບໍ່ມີອະລະບ້ຳ."</string>
+    <string name="empty_album" msgid="4542880442593595494">"ມີ 0 ຮູບ/ວິດີໂອ."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"ໂພສ"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"ເຮັດໃຫ້ນຳໃຊ້ແບບອອບລາຍໄດ້"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"ເອີ້ນຂໍ້ມູນໃໝ່"</string>
+    <string name="done" msgid="217672440064436595">"ແລ້ວໆ"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%1$d ໃນ %2$d ລາຍການ:"</string>
+    <string name="title" msgid="7622928349908052569">"ຊື່"</string>
+    <string name="description" msgid="3016729318096557520">"ຄຳອະທິບາຍ"</string>
+    <string name="time" msgid="1367953006052876956">"ເວລາ"</string>
+    <string name="location" msgid="3432705876921618314">"ຕຳແໜ່ງ"</string>
+    <string name="path" msgid="4725740395885105824">"ເສັ້ນທາງ"</string>
+    <string name="width" msgid="9215847239714321097">"ກວ້າງ"</string>
+    <string name="height" msgid="3648885449443787772">"ລວງສູງ"</string>
+    <string name="orientation" msgid="4958327983165245513">"ທິດທາງໜ້າຈໍ"</string>
+    <string name="duration" msgid="8160058911218541616">"ໄລຍະເວລາ"</string>
+    <string name="mimetype" msgid="8024168704337990470">"ປະເພດ MIME"</string>
+    <string name="file_size" msgid="8486169301588318915">"ຂະໜາດໄຟລ໌"</string>
+    <string name="maker" msgid="7921835498034236197">"ຍີ່ຫໍ້"</string>
+    <string name="model" msgid="8240207064064337366">"ໂມເດວ"</string>
+    <string name="flash" msgid="2816779031261147723">"ແຟລຊ"</string>
+    <string name="aperture" msgid="5920657630303915195">"ຮູຮັບແສງ"</string>
+    <string name="focal_length" msgid="1291383769749877010">"ໄລຍະໂຟກັສ:"</string>
+    <string name="white_balance" msgid="1582509289994216078">"ຄວາມດຸ່ນດ່ຽວສີຂາວ"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"ເວລາການຮັບແສງ"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"ມມ"</string>
+    <string name="manual" msgid="6608905477477607865">"ຕັ້ງຄ່າເອງ"</string>
+    <string name="auto" msgid="4296941368722892821">"ອັດຕະໂນມັດ"</string>
+    <string name="flash_on" msgid="7891556231891837284">"ຍິງແຟລດ"</string>
+    <string name="flash_off" msgid="1445443413822680010">"ບໍ່ມີແຟລດ"</string>
+    <string name="unknown" msgid="3506693015896912952">"ບໍ່ຮູ້ຈັກ"</string>
+    <string name="ffx_original" msgid="372686331501281474">"ຕົ້ນສະບັບ"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"ຍ້ອນຍຸກ"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"ແຈ້ງ"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"ກັດສີ"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"ສີຟ້າ"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"ຂາວດຳ"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"ພັນ"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"ຂະບວນການ X"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"ລາເຕ້"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Litho"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"ເຮັດໃຫ້ອະລະບ້ຳສາມາດເບິ່ງແບບອອບລາຍໄດ້."</item>
+    <item quantity="other" msgid="4948604338155959389">"ກຳລັງເຮັດໃຫ້ອະລະບ້ຳສາມາດເບິ່ງອອບລາຍໄດ້."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"ລາຍການນີ້ໄດ້ຖືກເກັບຮັກສາໄວ້ໃນເຄື່ອງ ແລະສາມາດໃຊ້ອອບລາຍໄດ້."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"ອະລະບ້ຳທັງໝົດ"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"ອະລະບ້ຳໃນເຄື່ອງ"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"ອຸປະກອນ MTP"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"ອະລະບ້ຳ Picasa"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"ໃຊ້ໄດ້ອີກ <xliff:g id="BYTES">%s</xliff:g>"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> ຫຼື ຕ່ຳກວ່າ"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> ຫຼືສູງກວ່າ"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> ຫາ <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"ນຳເຂົ້າ"</string>
+    <string name="import_complete" msgid="3875040287486199999">"ການນຳເຂົ້າສຳເລັດແລ້ວ"</string>
+    <string name="import_fail" msgid="8497942380703298808">"ການນຳເຂົ້າບໍ່ປະສົບຜົນສຳເລັດ"</string>
+    <string name="camera_connected" msgid="916021826223448591">"ເຊື່ອມຕໍ່ກ້ອງແລ້ວ."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"ຕັດການເຊື່ອມຕໍ່ກ້ອງແລ້ວ."</string>
+    <string name="click_import" msgid="6407959065464291972">"ແຕະບ່ອນນີ້ເພື່ອນຳເຂົ້າ"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"ເລືອກອະລະບ້ຳ"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"ສະລັບຮູບທັງໝົດ"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"ເລືອກຮູບໃດນຶ່ງ"</string>
+    <string name="widget_type" msgid="1364653978966343448">"ເລືອກຮູບ"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"ສະໄລ້ໂຊ"</string>
+    <string name="albums" msgid="7320787705180057947">"ອະລະບ້ຳ"</string>
+    <string name="times" msgid="2023033894889499219">"ເວລາ"</string>
+    <string name="locations" msgid="6649297994083130305">"ສະຖານທີ່"</string>
+    <string name="people" msgid="4114003823747292747">"ຄົນ"</string>
+    <string name="tags" msgid="5539648765482935955">"ແທັກ"</string>
+    <string name="group_by" msgid="4308299657902209357">"ຈັດກຸ່ມຕາມ"</string>
+    <string name="settings" msgid="1534847740615665736">"ຕັ້ງຄ່າ"</string>
+    <string name="add_account" msgid="4271217504968243974">"ເພີ່ມບັນຊີ"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"ກ້ອງ"</string>
+    <string name="folder_download" msgid="7186215137642323932">"ດາວໂຫລດ"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"ແກ້ໄຂຮູບອອນລາຍ"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"ນຳເຂົ້າແລ້ວ"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"ພາບໜ້າຈໍ"</string>
+    <string name="help" msgid="7368960711153618354">"ຊ່ວຍເຫຼືອ"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"ບໍ່ມີບ່ອນເກັບຂໍ້ມູນ"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"ບໍ່ມີອຸປະກອນເກັບຂໍ້ມູນພາຍນອກ"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"ມຸມມອງ Filmstrip"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ມຸມມອງຕາຂ່າຍ"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"ເບິ່ງແບບເຕັມຈໍ"</string>
+    <string name="trimming" msgid="9122385768369143997">"ກຳລັງຕັດ"</string>
+    <string name="muting" msgid="5094925919589915324">"ກຳລັງປິດສຽງ"</string>
+    <string name="please_wait" msgid="7296066089146487366">"ກະລຸນາລໍຖ້າ"</string>
+    <string name="save_into" msgid="9155488424829609229">"ກຳລັງບັນທຶກວິດີໂອໃສ່ <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"ບໍ່ສາມາດຕັດໄດ້ : ວິດີໂອເປົ້າໝາຍສັ້ນເກີນໄປ"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"ກຳລັງປະມວນຜົນຮູບພາໂນຣາມາ"</string>
+    <string name="save" msgid="613976532235060516">"ບັນທຶກ"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"ກຳລັງສະແກນຂໍ້ມູນ..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"ສະແກນ %1$d ລາຍການແລ້ວ"</item>
+    <item quantity="one" msgid="4340019444460561648">"ສະແກນ %1$d ລາຍການແລ້ວ"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d ລາຍການຖືກສະແກນແລ້ວ"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"ກຳລັງຈັດຮຽງ..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"ການສະແກນແລ້ວໆ"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"ກຳລັງນຳເຂົ້າ..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"ບໍ່ມີຂໍ້ມູນເພື່ອນຳເຂົ້າສຳລັບອຸປະກອນນີ້."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"ບໍ່ມີອຸປະກອນ MTP ເຊື່ອມຕໍ່ຢູ່"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"ກ້ອງຖ່າຍຮູບຜິດພາດ"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"ບໍ່ສາມາດເຊື່ອມຕໍ່ກັບກ້ອງໄດ້."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"ກ້ອງໄດ້ຖືກປິດໄວ້ເນື່ອງຈາກນະໂຍບາຍຄວາມປອດໄພ."</string>
+    <string name="camera_label" msgid="6346560772074764302">"ກ້ອງ"</string>
+    <string name="wait" msgid="8600187532323801552">"ກະລຸນາລໍຖ້າ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"ໃສ່ບ່ອນຈັດເກັບຂໍ້ມູນ ກ່ອນນຳໃຊ້ກ້ອງ."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"ໃສ່ SD card ກ່ອນນຳໃຊ້ກ້ອງ."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"ກຳລັງກະກຽມບ່ອນຈັດເກັບຂໍ້ມູນ USB..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"ກຳລັງກະກຽມ SD card ..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"ບໍ່ສາມາດເຂົ້າເຖິງບ່ອນຈັດເກັບຂໍ້ມູນ ໄດ້."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"ບໍ່ສາມາດເຂົ້າເຖິງ SD card ໄດ້."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"ຍົກເລີກ"</string>
+    <string name="review_ok" msgid="1156261588693116433">"ແລ້ວໆ"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"ການບັນທຶກພາບທາມແລບ"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"ເລືອກກ້ອງ"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d ວິນາທີ"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"ສຽງປີີ້ບໃນເວລານັບຖອຍຫຼັງ"</string>
+    <string name="setting_off" msgid="4480039384202951946">"ປິດ"</string>
+    <string name="setting_on" msgid="8602246224465348901">"ເປີດ"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"ຄຸນນະພາບຂອງວິດີໂອ"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"ສູງ"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"ຕ່ຳ"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"ທາມແລບ"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"ຕັ້ງຄ່າກ້ອງ"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ຕັ້ງຄ່າກ້ອງວິດີໂອ"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"ຂະໜາດຮູບ"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13ລ້ານ ພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4ລ້ານ ພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2ລ້ານ ພິກເຊວ (16:9​)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"ໂໝດໂຟກັສ"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"ອິນຟິນິຕີ"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"ມາໂຄຣ"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"ອິນຟິນິຕີ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"ມາໂຄຣ"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"ໂໝດແຟລຊ"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"ໂໝດແຟລຊ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ເປີດ"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"ປິດ"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"ໃຊ້ແຟລຊອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"ເປີດແຟລຊ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ປິດແຟລຊຢູ່"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"ສົມດຸນສີຂາວ"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"ສົມດຸນສີຂາວ"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"ໄຟຫຼອດໄສ້"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"ແສງແດດ"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ໄຟຟລູອໍເຣສເຊນ"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"ຟ້າຄຶ້ມ"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ຫຼອດໄຟສົ້ມ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ກາງເວັນ"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ໄຟຟລູອໍເຣສເຊນ"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ຟ້າບົດ"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"ຮູບແບບສາກ"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"ແອັກຊັນ"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"ບ່ອນຈັດເກັບຂໍ້ມູນ USB ຂອງທ່ານກຳລັງຈະເຕັມ. ໃຫ້ປ່ຽນການຕັ້ງຄ່າຄຸນນະພາບ ຫຼືລຶບຮູບໃດນຶ່ງ ຫຼືໄຟລ໌ອື່ນໆອອກກ່ອນ."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD card ຂອງທ່ານກຳລັງຈະເຕັມ. ໃຫ້ປ່ຽນການຕັ້ງຄ່າຄຸນນະພາບ ຫຼືລຶບຮູບໃດນຶ່ງ ຫຼືໄຟລ໌ອື່ນໆອອກກ່ອນ."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"ເຖິງຂີດຈຳກັດຂອງຂະໜາດແລ້ວ."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"ໄວເກີນໄປ"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"ກຳລັງກຽມຮູບພາໂນຣາມາ"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"ບໍ່ສາມາດບັນທຶກຮູບພາໂນຣາມາໄດ້."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"ພາໂນຣາມາ"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"ກຳລັງຖ່າຍພາໂນຣາມາ"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"ກຳລັງລໍຖ້າພາໂນຣາມາອັນກ່ອນ"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"ກຳລັງບັນທຶກ..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"ກຳລັງປະມວນຜົນຮູບພາໂນຣາມາ"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"ສຳພັດເພື່ອໂຟກັສ."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"ເອັບເຟັກ"</string>
+    <string name="effect_none" msgid="3601545724573307541">"ບໍ່ໃຊ້"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"ໜ້າຍີ່"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ຕາໃຫຍ່"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"ປາກໃຫຍ່"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"ປາກນ້ອຍ"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"ດັງໃຫຍ່"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"ຕານ້ອຍ"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"ໃນອະວະກາດ"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"ຕາເວັນຕົກ"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"ວິດີໂອຂອງທ່ານ"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"ວາງອຸປະກອນຈອງທ່ານລົງ.\nແລ້ວຍາງອອກຈາກມຸມມອງບຶດນຶ່ງ."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"ແຕະເພື່ອຖ່າຍຮູບໃນລະຫວ່າງບັນທຶກວິດີໂອ."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"ການບັນທຶກວິດີໂອໄດ້ເລີ່ມຕົ້ນແລ້ວ."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"ການບັນທຶກວິດີໂອໄດ້ຢຸດແລ້ວ."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"ການຈັບພາບວິດີໂອຈະຖືກປິດນຳໃຊ້ ເມື່ອໃຊ້ເອັບເຟັກພິເສດ."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"ລຶບລ້າງເອັບເຟັກ"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"ໜ້າຕະຫລົກ"</string>
+    <string name="effect_background" msgid="6579360207378171022">"ພາບພື້ນຫຼັງ"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"ປຸ່ມຊັດເຕີ"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"ປຸ່ມເມນູ"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"ຮູບພາບຫຼ້າສຸດ"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"ສະລັບກ້ອງໜ້າ ແລະ ຫຼັງ"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"ໂຕເລືອກກ້ອງຖ່າຍຮູບ, ກ້ອງວິດີໂອ ຫຼືພາໂນຣາມາ"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"ໂຕຄວບຄຸມການຕັ້ງຄ່າເພີ່ມເຕີມ"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"ປິດໂຕຄວບຄຸມການຕັ້ງຄ່າ"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"ໂຕຄວບຄຸມການຊູມ"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"ຫຼຸດລົງ %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"ເພີ່ມ %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"ກ່ອງເຄື່ອງໝາຍ %1$s"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"ປ່ຽນໄປໂໝດຮູບ"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"ປ່ຽນໄປໂໝດວິດີໂອ"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"ປ່ຽນໄປໂໝດພາໂນຣາມາ"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"ປ່ຽນໄປໂໝດພາໂນຣາມາແບບໃໝ່"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"ສັບ​ປ່ຽນ​ເປັນ Refocus"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"ການກວດສອບໃຫ້ຍົກເລີກ"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"ການກວດກາສຳເລັດ"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"ການກວດສອບໃຫ້ຖ່າຍຄືນ"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"ຫຼິ້ນວິດີໂອ"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"ຢຸດວິດີໂອຊົ່ວຄາວ"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"ໂຫຼດວິດີໂອໃໝ່"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"ແຖບເວລາຂອງໂປຣແກຣມຫຼິ້ນວິດີໂອ"</string>
+    <string name="capital_on" msgid="5491353494964003567">"ເປີດ"</string>
+    <string name="capital_off" msgid="7231052688467970897">"ປິດ"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"ປິດ"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 ຊົ່ວໂມງ"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"ວິນາທີ"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"ນາທີ"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"ຊົ່ວໂມງ"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"ແລ້ວໆ"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"ກໍານົດໄລຍະເວລາ"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"ຄວາມສາມາດ ທາມແລບ ຖືກປິດໄວ້ຢູ່. ໃຫ້ເປີດມັນຂຶ້ນເພື່ອຕັ້ງຄ່າໄລຍະຫ່າງການຖ່າຍແຕ່ລະຄັ້ງ."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"ໂຕນັບເວລາຖອຍຫຼັງຖືກປິດໄວ້. ໃຫ້ເປີດມັນຂຶ້ນເພື່ອໃຫ້ນັບຖອຍຫຼັງກ່ອນຖ່າຍຮູບ."</string>
+    <string name="set_duration" msgid="5578035312407161304">"ຕັ້ງໄລຍະເວລາເປັນວິນາທີ"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"ກຳລັງນັບຖອຍຫຼັງເພື່ອຖ່າຍຮູບ"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"ຈື່ຂໍ້ມູນສະຖານທີ່ຂອງຮູບບໍ່?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"ແທັກສະຖານທີ່ທີ່ຖ່າຍໃຫ້ຮູບ ແລະວິດີໂອຂອງທ່ານ.\n\nແອັບຯອື່ນໆສາມາດເຂົ້າເຖິງຂໍ້ມູນນີ້ໄດ້ ພ້ອມກັບຮູບທີ່ທ່ານບັນທຶກ."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"ບໍ່, ຂອບໃຈ"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"ຕົກລົງ"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"ກ້ອງ"</string>
+    <string name="menu_search" msgid="7580008232297437190">"ຊອກຫາ"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"ຮູບພາບ"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"ອະລະບ້ຳ"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ການຕັ້ງຄ່າ"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d ຮູບ"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d ຮູບ"</item>
+  </plurals>
+</resources>
diff --git a/res/values-lo/filtershow_strings.xml b/res/values-lo/filtershow_strings.xml
new file mode 100644
index 0000000..2b12ccc
--- /dev/null
+++ b/res/values-lo/filtershow_strings.xml
@@ -0,0 +1,145 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"ໂຕແກ້ໄຂຮູບ"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"ບໍ່ສາມາດໂຫລດຮູບດັ່ງກ່າວໄດ້!"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"ກຳລັງຕັ້ງພາບພື້ນຫຼັງ"</string>
+    <string name="download_failure" msgid="5923323939788582895">"ບໍ່ສາມາດດາວໂຫລດຮູບໄດ້. ເຄືອຂ່າຍບໍ່ສາມາດນຳໃຊ້ໄດ້."</string>
+    <string name="original" msgid="3524493791230430897">"ຕົ້ນສະບັບ"</string>
+    <string name="saved" msgid="6678827180814174711">"ບັນທຶກແລ້ວ"</string>
+    <string name="borders" msgid="2067345080568684614">"ຂອບ"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"ຍົກເລີກ"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"ເຮັດຊ້ຳ"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"ສະແດງເອັບເຟັກທີ່ນຳໃຊ້"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"ເຊື່ອງເອັບເຟັກທີ່ນຳໃຊ້"</string>
+    <string name="export_image" msgid="3202835713172222134">"ສົ່ງອອກ"</string>
+    <string name="print_image" msgid="1942989216591621413">"ພິມ"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Export Flattened Image"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"ຮູບທີ່ຖືກສົ່ງອອກຈະຖືກສຳເນົາໄວ້, ໂດຍຈະບໍ່ບັນທຶກໄວ້ໃນປະຫວັດ."</string>
+    <string name="quality" msgid="179292110309050529">"ຄຸນ​ນະ​ພາບ"</string>
+    <string name="size" msgid="4639404642236356037">"ຂະໜາດ"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"ການຕັ້ງຄ່າ"</string>
+    <string name="unsaved" msgid="8704442449002374375">"ມີການປ່ຽນແປງທີ່ຍັງບໍ່ໄດ້ຖືກບັນທຶກໃນຮູບນີ້."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"ທ່ານຕ້ອງການບັນທຶກກ່ອນອອກບໍ່?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"ບັນທຶກ ແລະອອກ"</string>
+    <string name="exit" msgid="242642957038770113">"ອອກ"</string>
+    <string name="history" msgid="455767361472692409">"ປະຫວັດ"</string>
+    <string name="reset" msgid="9013181350779592937">"ຄືນຄ່າ"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"ນຳໃຊ້ເອັບເຟັກ"</string>
+    <string name="compare_original" msgid="8140838959007796977">"ປຽບທຽບ"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"ນຳໃຊ້"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"ຄືນຄ່າ"</string>
+    <string name="aspect" msgid="4025244950820813059">"ສັດສ່ວນ"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"ບໍ່ໃຊ້"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"ຄົງທີ່"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"ດາວເຄາະນ້ອຍ"</string>
+    <string name="exposure" msgid="6526397045949374905">"ການຮັບແສງ"</string>
+    <string name="sharpness" msgid="6463103068318055412">"ຄວາມຄົມຊັດ"</string>
+    <string name="contrast" msgid="2310908487756769019">"ຄວາມເຂັ້ມ"</string>
+    <string name="vibrance" msgid="3326744578577835915">"ຄວາມສົດຂອງສີ"</string>
+    <string name="saturation" msgid="7026791551032438585">"ຄວາມແຈດຂອງສີ"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"ກັ່ນຕອງ BW"</string>
+    <string name="wbalance" msgid="6346581563387083613">"ປັບສີອັດຕະໂນມັດ"</string>
+    <string name="hue" msgid="6231252147971086030">"ໂທນສີ"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"ເງົາ"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"ໄຮໄລ"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"ເສັ້ນໂຄ້ງ"</string>
+    <string name="vignette" msgid="934721068851885390">"ຂອບດຳ"</string>
+    <string name="redeye" msgid="4508883127049472069">"ຕາແດງ"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"ແຕ້ມ"</string>
+    <string name="straighten" msgid="26025591664983528">"ເຮັດໃຫ້ຊື່"</string>
+    <string name="crop" msgid="5781263790107850771">"ຕັດຮູບ"</string>
+    <string name="rotate" msgid="2796802553793795371">"ໝຸນ"</string>
+    <string name="mirror" msgid="5482518108154883096">"ແວ່ນສະທ້ອນ"</string>
+    <string name="negative" msgid="6998313764388022201">"ເນກາຕີບ"</string>
+    <string name="none" msgid="6633966646410296520">"ບໍ່ໃຊ້"</string>
+    <string name="edge" msgid="7036064886242147551">"ເສັ້ນຂອບ"</string>
+    <string name="kmeans" msgid="2080952022674981541">"ແບບສີໂປສເຕີ"</string>
+    <string name="downsample" msgid="3552938534146980104">"ຫຼຸດຂະໜາດຮູບລົງ"</string>
+    <string name="grad" msgid="546774853424848655">"ການໄລ່ສີ"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"ຄວາມສະຫວ່າງ"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"ຄວາມເຂັ້ມ"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"ຄວາມແຈດຂອງສີ"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"ຫຼັກ"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"ແດງ"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"ເຫຼືອງ"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"ຂຽວ"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"ຟ້າຂຽວ"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"ຟ້າ"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"ແດງມ່ວງ"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"ຮູບແບບ"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ໃໝ່"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"ສີແດງ"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"ສີຂຽວ"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"ສີຟ້າ"</string>
+    <string name="draw_style" msgid="2036125061987325389">"ສະຕາຍ"</string>
+    <string name="draw_size" msgid="4360005386104151209">"ຂະໜາດ"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"ໂທນສີ"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"ຄວາມແຈດຂອງສີ"</string>
+    <string name="draw_value" msgid="6571604055161538273">"ຄວາມສະຫວ່າງ"</string>
+    <string name="draw_color" msgid="2119030386987211193">"ສີ"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"ເສັ້ນ"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"ເຄື່ອງຫມາຍ"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"ສາດສີ"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"ລຶບລ້າງ"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"ເລືອກສີທີ່ກຳໜົດເອງ"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"ເລືອກສີ"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"ເລືອກຂະໜາດ"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"ຕົກລົງ"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"ຕົ້ນສະບັບ"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"ຜົນໄດ້ຮັບ"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"ກຳລັງບັນທຶກພາບ"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"ກຳລັງປະມວນຜົນ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"ບັນທຶກພຣີເຊັນປັດຈຸບັນ"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"ຈັດການພຣີເຊັນຜູ່ໃຊ້"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"ພຣີເຊັນໃໝ່"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"ຊື່ Preset"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"ຂໍ້​ມູນ​ຂ່າວ​ສານ"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"ຊື່ຮູບ"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"ຂະ​ຫນາດ​ຮູບ"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ຮິສໂຕແກຣມ"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"ຂໍ້​ມູນ EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"ຄ່າສຳເລັດຮູບ:"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"ເວີຊັນ"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"ຕົ້ນສະບັບ"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"ປັດຈຸບັດ"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"ຮຸ່ນ"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"ຮູຮັບແສງ"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"ທາງຍາວໂຟກັສ"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"ໄລຍະຫ່າງວັດຖຸ"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"ວັນທີຖ່າຍ"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"ຮູຮັບແຮງ"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"ເວລາຮັບແສງ"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"ລິຂະສິດ"</string>
+</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
new file mode 100644
index 0000000..a640de8
--- /dev/null
+++ b/res/values-lo/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"ຄັງຮູບ"</string>
+    <string name="gadget_title" msgid="259405922673466798">"ຂອບຮູບ"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"ເຄື່ອງຫຼິ້ນວິດີໂອ"</string>
+    <string name="loading_video" msgid="4013492720121891585">"ກໍາລັງໂຫລດວີດີໂອ..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"ກໍາລັງໂຫລດຮູບພາບ..."</string>
+    <string name="loading_account" msgid="928195413034552034">"ກໍາລັງໂຫລດບັນຊີ..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"ສືບຕໍ່ວິດີໂອ"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"ສືບຕໍ່ຫຼິ້ນຈາກ %s ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"ສືບຕໍ່ຫຼິ້ນວິດີໂອ"</string>
+    <string name="loading" msgid="7038208555304563571">"ກຳລັງໂຫລດ..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"ບໍ່ສາມາດໂຫຼດໄດ້"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"ບໍ່ສາມາດໂຫຼດຮູບພາບດັ່ງກ່າວ"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"ບໍ່ມີຮູບນ້ອຍ"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"ເລີ່ມຕົ້ນໃຫມ່"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"ຕົກລົງ"</string>
+    <string name="ok" msgid="5296833083983263293">"ຕົກລົງ"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"ສຳພັດໃສ່ໃບໜ້າເພື່ອເລີ່ມ."</string>
+    <string name="saving_image" msgid="7270334453636349407">"ກຳລັງບັນທຶກຮູບ..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"ກຳລັງບັກທຶກຮູບໃສ່ <xliff:g id="ALBUM_NAME">%1$s</xliff:g> ..."</string>
+    <string name="save_error" msgid="6857408774183654970">"ບໍ່ສາມາດບັນທຶກຮູບທີ່ຕັດໄດ້."</string>
+    <string name="crop_label" msgid="521114301871349328">"ຕັດຮູບ"</string>
+    <string name="trim_label" msgid="274203231381209979">"ຕັດວິດີໂອ"</string>
+    <string name="select_image" msgid="7841406150484742140">"ເລືອກຮູບ"</string>
+    <string name="select_video" msgid="4859510992798615076">"ເລືອກວິດີໂອ"</string>
+    <string name="select_item" msgid="2816923896202086390">"ກະລຸນາເລືອກລາຍການ"</string>
+    <string name="select_album" msgid="1557063764849434077">"ເລືອກອະລະບ້ຳ"</string>
+    <string name="select_group" msgid="6744208543323307114">"ເລືອກກຸ່ມ"</string>
+    <string name="set_image" msgid="2331476809308010401">"ຕັ້ງຮູບເປັນ"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"ຕັ້ງເປັນພາບພື້ນຫຼັງ"</string>
+    <string name="wallpaper" msgid="140165383777262070">"ກຳລັງຕັ້ງຮູບພື້ນຫຼັງ..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"ຮູບພື້ນຫຼັງ"</string>
+    <string name="delete" msgid="2839695998251824487">"ລຶບ"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"ລຶບລາຍການທີ່ເລືອກ?"</item>
+    <item quantity="other" msgid="5874316486520635333">"ລຶບລາຍການທີ່ເລືອກບໍ່?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"ຢືນຢັນ"</string>
+    <string name="cancel" msgid="3637516880917356226">"ຍົກເລີກ"</string>
+    <string name="share" msgid="3619042788254195341">"ແບ່ງປັນ"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"ແບ່ງປັນພາໂນຣາມາ"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"ແບ່ງປັນເປັນຮູບ"</string>
+    <string name="deleted" msgid="6795433049119073871">"ລຶບແລ້ວ"</string>
+    <string name="undo" msgid="2930873956446586313">"ແກ້ໄຂຄືນ"</string>
+    <string name="select_all" msgid="3403283025220282175">"ເລືອກທັງໝົດ"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"ຍົກເລີກການເລືອກທັງໝົດ"</string>
+    <string name="slideshow" msgid="4355906903247112975">"ສະໄລ້ໂຊ"</string>
+    <string name="details" msgid="8415120088556445230">"ລາຍລະອຽດ"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d of %2$d ລາຍການ:"</string>
+    <string name="close" msgid="5585646033158453043">"ປິດ"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"ປ່ຽນໄປຫາກ້ອງ"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d ຖືກເລືອກແລ້ວ"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d ຖືກເລືອກແລ້ວ"</item>
+    <item quantity="other" msgid="754722656147810487">"ເລືອກ %1$d ລາຍການແລ້ວ"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"ເລືອກ %1$d ອະລະບ້ຳແລ້ວ"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d ຖືກເລືອກແລ້ວ"</item>
+    <item quantity="other" msgid="53105607141906130">"ເລືອກ %1$d ອະລະບ້ຳແລ້ວ"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d ຖືກເລືອກແລ້ວ"</item>
+    <item quantity="one" msgid="5030162638216034260">"ເລືອກ %1$d ກຸ່ມແລ້ວ"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d ຖືກເລືອກແລ້ວ"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"ສະແດງໃນແຜນທີ່"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"ໝຸນຊ້າຍ"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"ໝຸນຂວາ"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"ບໍ່ສາມາດຊອກຫາລາຍການໄດ້."</string>
+    <string name="edit" msgid="1502273844748580847">"ແກ້ໄຂ"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"ແກ້ໄຂແບບງ່າຍດາຍ"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"ກຳລັງປະມວນຜົນຄຳຮ້ອງຂໍເກັບຂໍ້ມູນຊົ່ວຄາວ"</string>
+    <string name="caching_label" msgid="4521059045896269095">"ກຳລັງເກັບຄວາມຈຳຊົ່ວຄາວ..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"ຕັດ"</string>
+    <string name="trim_action" msgid="703098114452883524">"ຕັດ"</string>
+    <string name="mute_action" msgid="5296241754753306251">"ປີດສຽງ"</string>
+    <string name="set_as" msgid="3636764710790507868">"ຕັ້ງເປັນ"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"ບໍ່ສາມາດປິດສຽງວິດີໂອ."</string>
+    <string name="video_err" msgid="7003051631792271009">"ບໍ່ສາມາດຫຼິ້ນວີດີໂອໄດ້."</string>
+    <string name="group_by_location" msgid="316641628989023253">"ໂດຍສະຖານທີ່"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"ຕາມເວລາ"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"ຕາມແທັກ"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"ຕາມຄົນ"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"ຕາມອະລະ້ຳ"</string>
+    <string name="group_by_size" msgid="153766174950394155">"ຕາມຂະໜາດ"</string>
+    <string name="untagged" msgid="7281481064509590402">"ບໍ່ມີແທັກ"</string>
+    <string name="no_location" msgid="4043624857489331676">"ບໍ່ມີສະຖານທີ່"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"ຕຳແໜ່ງບາງບ່ອນບໍ່ສາມາດລະບຸໄດ້ ເນື່ອງຈາກບັນຫາການເຊື່ອມຕໍ່ເຄືອຂ່າຍ."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"ບໍ່ສາມາດດາວໂຫລດຮູບຈາກອະລະບ້ຳນີ້ໄດ້. ລອງໃໝ່ໃນພາຍຫຼັງ."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"ຮູບເທົ່ານັ້ນ"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"ວິດີໂອເທົ່ານັ້ນ"</string>
+    <string name="show_all" msgid="6963292714584735149">"ຮູບ &amp; ວິດີໂອ"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"ຄັງຮູບພາບ"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"ບໍ່ມີຮູບ."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"ຮູບທີ່ຖືກຕັດໄດ້ຖືກບັນທຶກໄປຫາ <xliff:g id="FOLDER_NAME">%s</xliff:g> ແລ້ວ."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"ບໍ່ມີອະລະບ້ຳ."</string>
+    <string name="empty_album" msgid="4542880442593595494">"ມີ 0 ຮູບ/ວິດີໂອ."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"ໂພສ"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"ເຮັດໃຫ້ນຳໃຊ້ແບບອອບລາຍໄດ້"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"ເອີ້ນຂໍ້ມູນໃໝ່"</string>
+    <string name="done" msgid="217672440064436595">"ແລ້ວໆ"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%1$d ໃນ %2$d ລາຍການ:"</string>
+    <string name="title" msgid="7622928349908052569">"ຊື່"</string>
+    <string name="description" msgid="3016729318096557520">"ຄຳອະທິບາຍ"</string>
+    <string name="time" msgid="1367953006052876956">"ເວລາ"</string>
+    <string name="location" msgid="3432705876921618314">"ຕຳແໜ່ງ"</string>
+    <string name="path" msgid="4725740395885105824">"ເສັ້ນທາງ"</string>
+    <string name="width" msgid="9215847239714321097">"ກວ້າງ"</string>
+    <string name="height" msgid="3648885449443787772">"ລວງສູງ"</string>
+    <string name="orientation" msgid="4958327983165245513">"ທິດທາງໜ້າຈໍ"</string>
+    <string name="duration" msgid="8160058911218541616">"ໄລຍະເວລາ"</string>
+    <string name="mimetype" msgid="8024168704337990470">"ປະເພດ MIME"</string>
+    <string name="file_size" msgid="8486169301588318915">"ຂະໜາດໄຟລ໌"</string>
+    <string name="maker" msgid="7921835498034236197">"ຍີ່ຫໍ້"</string>
+    <string name="model" msgid="8240207064064337366">"ໂມເດວ"</string>
+    <string name="flash" msgid="2816779031261147723">"ແຟລຊ"</string>
+    <string name="aperture" msgid="5920657630303915195">"ຮູຮັບແສງ"</string>
+    <string name="focal_length" msgid="1291383769749877010">"ໄລຍະໂຟກັສ:"</string>
+    <string name="white_balance" msgid="1582509289994216078">"ຄວາມດຸ່ນດ່ຽວສີຂາວ"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"ເວລາການຮັບແສງ"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"ມມ"</string>
+    <string name="manual" msgid="6608905477477607865">"ຕັ້ງຄ່າເອງ"</string>
+    <string name="auto" msgid="4296941368722892821">"ອັດຕະໂນມັດ"</string>
+    <string name="flash_on" msgid="7891556231891837284">"ຍິງແຟລດ"</string>
+    <string name="flash_off" msgid="1445443413822680010">"ບໍ່ມີແຟລດ"</string>
+    <string name="unknown" msgid="3506693015896912952">"ບໍ່ຮູ້ຈັກ"</string>
+    <string name="ffx_original" msgid="372686331501281474">"ຕົ້ນສະບັບ"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"ຍ້ອນຍຸກ"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"ແຈ້ງ"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"ກັດສີ"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"ສີຟ້າ"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"ຂາວດຳ"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"ພັນ"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"ຂະບວນການ X"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"ລາເຕ້"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Litho"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"ເຮັດໃຫ້ອະລະບ້ຳສາມາດເບິ່ງແບບອອບລາຍໄດ້."</item>
+    <item quantity="other" msgid="4948604338155959389">"ກຳລັງເຮັດໃຫ້ອະລະບ້ຳສາມາດເບິ່ງອອບລາຍໄດ້."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"ລາຍການນີ້ໄດ້ຖືກເກັບຮັກສາໄວ້ໃນເຄື່ອງ ແລະສາມາດໃຊ້ອອບລາຍໄດ້."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"ອະລະບ້ຳທັງໝົດ"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"ອະລະບ້ຳໃນເຄື່ອງ"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"ອຸປະກອນ MTP"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"ອະລະບ້ຳ Picasa"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"ໃຊ້ໄດ້ອີກ <xliff:g id="BYTES">%s</xliff:g>"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> ຫຼື ຕ່ຳກວ່າ"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> ຫຼືສູງກວ່າ"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> ຫາ <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"ນຳເຂົ້າ"</string>
+    <string name="import_complete" msgid="3875040287486199999">"ການນຳເຂົ້າສຳເລັດແລ້ວ"</string>
+    <string name="import_fail" msgid="8497942380703298808">"ການນຳເຂົ້າບໍ່ປະສົບຜົນສຳເລັດ"</string>
+    <string name="camera_connected" msgid="916021826223448591">"ເຊື່ອມຕໍ່ກ້ອງແລ້ວ."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"ຕັດການເຊື່ອມຕໍ່ກ້ອງແລ້ວ."</string>
+    <string name="click_import" msgid="6407959065464291972">"ແຕະບ່ອນນີ້ເພື່ອນຳເຂົ້າ"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"ເລືອກອະລະບ້ຳ"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"ສະລັບຮູບທັງໝົດ"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"ເລືອກຮູບໃດນຶ່ງ"</string>
+    <string name="widget_type" msgid="1364653978966343448">"ເລືອກຮູບ"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"ສະໄລ້ໂຊ"</string>
+    <string name="albums" msgid="7320787705180057947">"ອະລະບ້ຳ"</string>
+    <string name="times" msgid="2023033894889499219">"ເວລາ"</string>
+    <string name="locations" msgid="6649297994083130305">"ສະຖານທີ່"</string>
+    <string name="people" msgid="4114003823747292747">"ຄົນ"</string>
+    <string name="tags" msgid="5539648765482935955">"ແທັກ"</string>
+    <string name="group_by" msgid="4308299657902209357">"ຈັດກຸ່ມຕາມ"</string>
+    <string name="settings" msgid="1534847740615665736">"ຕັ້ງຄ່າ"</string>
+    <string name="add_account" msgid="4271217504968243974">"ເພີ່ມບັນຊີ"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"ກ້ອງ"</string>
+    <string name="folder_download" msgid="7186215137642323932">"ດາວໂຫລດ"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"ແກ້ໄຂຮູບອອນລາຍ"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"ນຳເຂົ້າແລ້ວ"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"ພາບໜ້າຈໍ"</string>
+    <string name="help" msgid="7368960711153618354">"ຊ່ວຍເຫຼືອ"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"ບໍ່ມີບ່ອນເກັບຂໍ້ມູນ"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"ບໍ່ມີອຸປະກອນເກັບຂໍ້ມູນພາຍນອກ"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"ມຸມມອງ Filmstrip"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ມຸມມອງຕາຂ່າຍ"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"ເບິ່ງແບບເຕັມຈໍ"</string>
+    <string name="trimming" msgid="9122385768369143997">"ກຳລັງຕັດ"</string>
+    <string name="muting" msgid="5094925919589915324">"ກຳລັງປິດສຽງ"</string>
+    <string name="please_wait" msgid="7296066089146487366">"ກະລຸນາລໍຖ້າ"</string>
+    <string name="save_into" msgid="9155488424829609229">"ກຳລັງບັນທຶກວິດີໂອໃສ່ <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"ບໍ່ສາມາດຕັດໄດ້ : ວິດີໂອເປົ້າໝາຍສັ້ນເກີນໄປ"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"ກຳລັງປະມວນຜົນຮູບພາໂນຣາມາ"</string>
+    <string name="save" msgid="613976532235060516">"ບັນທຶກ"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"ກຳລັງສະແກນຂໍ້ມູນ..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"ສະແກນ %1$d ລາຍການແລ້ວ"</item>
+    <item quantity="one" msgid="4340019444460561648">"ສະແກນ %1$d ລາຍການແລ້ວ"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d ລາຍການຖືກສະແກນແລ້ວ"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"ກຳລັງຈັດຮຽງ..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"ການສະແກນແລ້ວໆ"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"ກຳລັງນຳເຂົ້າ..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"ບໍ່ມີຂໍ້ມູນເພື່ອນຳເຂົ້າສຳລັບອຸປະກອນນີ້."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"ບໍ່ມີອຸປະກອນ MTP ເຊື່ອມຕໍ່ຢູ່"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"ກ້ອງຖ່າຍຮູບຜິດພາດ"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"ບໍ່ສາມາດເຊື່ອມຕໍ່ກັບກ້ອງໄດ້."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"ກ້ອງໄດ້ຖືກປິດໄວ້ເນື່ອງຈາກນະໂຍບາຍຄວາມປອດໄພ."</string>
+    <string name="camera_label" msgid="6346560772074764302">"ກ້ອງ"</string>
+    <string name="wait" msgid="8600187532323801552">"ກະລຸນາລໍຖ້າ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"ໃສ່ບ່ອນຈັດເກັບຂໍ້ມູນ ກ່ອນນຳໃຊ້ກ້ອງ."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"ໃສ່ SD card ກ່ອນນຳໃຊ້ກ້ອງ."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"ກຳລັງກະກຽມບ່ອນຈັດເກັບຂໍ້ມູນ USB..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"ກຳລັງກະກຽມ SD card ..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"ບໍ່ສາມາດເຂົ້າເຖິງບ່ອນຈັດເກັບຂໍ້ມູນ ໄດ້."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"ບໍ່ສາມາດເຂົ້າເຖິງ SD card ໄດ້."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"ຍົກເລີກ"</string>
+    <string name="review_ok" msgid="1156261588693116433">"ແລ້ວໆ"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"ການບັນທຶກພາບທາມແລບ"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"ເລືອກກ້ອງ"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d ວິນາທີ"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"ສຽງປີີ້ບໃນເວລານັບຖອຍຫຼັງ"</string>
+    <string name="setting_off" msgid="4480039384202951946">"ປິດ"</string>
+    <string name="setting_on" msgid="8602246224465348901">"ເປີດ"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"ຄຸນນະພາບຂອງວິດີໂອ"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"ສູງ"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"ຕ່ຳ"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"ທາມແລບ"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"ຕັ້ງຄ່າກ້ອງ"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ຕັ້ງຄ່າກ້ອງວິດີໂອ"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"ຂະໜາດຮູບ"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13ລ້ານ ພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4ລ້ານ ພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2ລ້ານ ພິກເຊວ (16:9​)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 ລ້ານພິກເຊວ"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"ໂໝດໂຟກັສ"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"ອິນຟິນິຕີ"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"ມາໂຄຣ"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"ອິນຟິນິຕີ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"ມາໂຄຣ"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"ໂໝດແຟລຊ"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"ໂໝດແຟລຊ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ເປີດ"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"ປິດ"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"ໃຊ້ແຟລຊອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"ເປີດແຟລຊ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ປິດແຟລຊຢູ່"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"ສົມດຸນສີຂາວ"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"ສົມດຸນສີຂາວ"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"ໄຟຫຼອດໄສ້"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"ແສງແດດ"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ໄຟຟລູອໍເຣສເຊນ"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"ຟ້າຄຶ້ມ"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ແສງກ້າ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ກາງເວັນ"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ໄຟຟລູອໍເຣສເຊນ"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ຟ້າບົດ"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"ຮູບແບບສາກ"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"ອັດຕະໂນມັດ"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"ແອັກຊັນ"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"ບ່ອນຈັດເກັບຂໍ້ມູນ USB ຂອງທ່ານກຳລັງຈະເຕັມ. ໃຫ້ປ່ຽນການຕັ້ງຄ່າຄຸນນະພາບ ຫຼືລຶບຮູບໃດນຶ່ງ ຫຼືໄຟລ໌ອື່ນໆອອກກ່ອນ."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD card ຂອງທ່ານກຳລັງຈະເຕັມ. ໃຫ້ປ່ຽນການຕັ້ງຄ່າຄຸນນະພາບ ຫຼືລຶບຮູບໃດນຶ່ງ ຫຼືໄຟລ໌ອື່ນໆອອກກ່ອນ."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"ເຖິງຂີດຈຳກັດຂອງຂະໜາດແລ້ວ."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"ໄວເກີນໄປ"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"ກຳລັງກຽມຮູບພາໂນຣາມາ"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"ບໍ່ສາມາດບັນທຶກຮູບພາໂນຣາມາໄດ້."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"ພາໂນຣາມາ"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"ກຳລັງຖ່າຍພາໂນຣາມາ"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"ກຳລັງລໍຖ້າພາໂນຣາມາອັນກ່ອນ"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"ກຳລັງບັນທຶກ..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"ກຳລັງປະມວນຜົນຮູບພາໂນຣາມາ"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"ສຳພັດເພື່ອໂຟກັສ."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"ເອັບເຟັກ"</string>
+    <string name="effect_none" msgid="3601545724573307541">"ບໍ່ໃຊ້"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"ໜ້າຍີ່"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ຕາໃຫຍ່"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"ປາກໃຫຍ່"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"ປາກນ້ອຍ"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"ດັງໃຫຍ່"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"ຕານ້ອຍ"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"ໃນອະວະກາດ"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"ຕາເວັນຕົກ"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"ວິດີໂອຂອງທ່ານ"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"ວາງອຸປະກອນຈອງທ່ານລົງ.\nແລ້ວຍາງອອກຈາກມຸມມອງບຶດນຶ່ງ."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"ແຕະເພື່ອຖ່າຍຮູບໃນລະຫວ່າງບັນທຶກວິດີໂອ."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"ການບັນທຶກວິດີໂອໄດ້ເລີ່ມຕົ້ນແລ້ວ."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"ການບັນທຶກວິດີໂອໄດ້ຢຸດແລ້ວ."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"ການຈັບພາບວິດີໂອຈະຖືກປິດນຳໃຊ້ ເມື່ອໃຊ້ເອັບເຟັກພິເສດ."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"ລຶບລ້າງເອັບເຟັກ"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"ໜ້າຕະຫລົກ"</string>
+    <string name="effect_background" msgid="6579360207378171022">"ພາບພື້ນຫຼັງ"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"ປຸ່ມຊັດເຕີ"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"ປຸ່ມເມນູ"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"ຮູບພາບຫຼ້າສຸດ"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"ສະລັບກ້ອງໜ້າ ແລະ ຫຼັງ"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"ໂຕເລືອກກ້ອງຖ່າຍຮູບ, ກ້ອງວິດີໂອ ຫຼືພາໂນຣາມາ"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"ໂຕຄວບຄຸມການຕັ້ງຄ່າເພີ່ມເຕີມ"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"ປິດໂຕຄວບຄຸມການຕັ້ງຄ່າ"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"ໂຕຄວບຄຸມການຊູມ"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"ຫຼຸດລົງ %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"ເພີ່ມ %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"ກ່ອງເຄື່ອງໝາຍ %1$s"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"ປ່ຽນໄປໂໝດຮູບ"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"ປ່ຽນໄປໂໝດວິດີໂອ"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"ປ່ຽນໄປໂໝດພາໂນຣາມາ"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"ປ່ຽນໄປໂໝດພາໂນຣາມາແບບໃໝ່"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"ສັບ​ປ່ຽນ​ເປັນ Refocus"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"ການກວດສອບໃຫ້ຍົກເລີກ"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"ການກວດກາສຳເລັດ"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"ການກວດສອບໃຫ້ຖ່າຍຄືນ"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"ຫຼິ້ນວິດີໂອ"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"ຢຸດວິດີໂອຊົ່ວຄາວ"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"ໂຫຼດວິດີໂອໃໝ່"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"ແຖບເວລາຂອງໂປຣແກຣມຫຼິ້ນວິດີໂອ"</string>
+    <string name="capital_on" msgid="5491353494964003567">"ເປີດ"</string>
+    <string name="capital_off" msgid="7231052688467970897">"ປິດ"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"ປິດ"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 ວິນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 ນາທີ"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 ຊົ່ວໂມງ"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 ຊົ່ວໂມງ"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"ວິນາທີ"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"ນາທີ"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"ຊົ່ວໂມງ"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"ແລ້ວໆ"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"ກໍານົດໄລຍະເວລາ"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"ຄວາມສາມາດ ທາມແລບ ຖືກປິດໄວ້ຢູ່. ໃຫ້ເປີດມັນຂຶ້ນເພື່ອຕັ້ງຄ່າໄລຍະຫ່າງການຖ່າຍແຕ່ລະຄັ້ງ."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"ໂຕນັບເວລາຖອຍຫຼັງຖືກປິດໄວ້. ໃຫ້ເປີດມັນຂຶ້ນເພື່ອໃຫ້ນັບຖອຍຫຼັງກ່ອນຖ່າຍຮູບ."</string>
+    <string name="set_duration" msgid="5578035312407161304">"ຕັ້ງໄລຍະເວລາເປັນວິນາທີ"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"ກຳລັງນັບຖອຍຫຼັງເພື່ອຖ່າຍຮູບ"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"ຈື່ຂໍ້ມູນສະຖານທີ່ຂອງຮູບບໍ່?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"ແທັກສະຖານທີ່ທີ່ຖ່າຍໃຫ້ຮູບ ແລະວິດີໂອຂອງທ່ານ.\n\nແອັບຯອື່ນໆສາມາດເຂົ້າເຖິງຂໍ້ມູນນີ້ໄດ້ ພ້ອມກັບຮູບທີ່ທ່ານບັນທຶກ."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"ບໍ່, ຂອບໃຈ"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"ຕົກລົງ"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"ກ້ອງ"</string>
+    <string name="menu_search" msgid="7580008232297437190">"ຊອກຫາ"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"ຮູບພາບ"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"ອະລະບ້ຳ"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ການຕັ້ງຄ່າ"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d ຮູບ"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d ຮູບ"</item>
+  </plurals>
+</resources>
diff --git a/res/values-lt/filtershow_strings.xml b/res/values-lt/filtershow_strings.xml
index 6a884b9..dc1b7d5 100644
--- a/res/values-lt/filtershow_strings.xml
+++ b/res/values-lt/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Nuotraukų redagavimo priemonė"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Nepavyksta įkelti vaizdo!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Originalo redaguoti negalima."</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Nustatomas ekrano fonas"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Nepavyko atsisiųsti nuotraukos. Tinklas nepasiekiamas."</string>
     <string name="original" msgid="3524493791230430897">"Originalas"</string>
     <string name="borders" msgid="2067345080568684614">"Kraštinės"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Tinkintas"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Anuliuoti"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Grąžinti"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Rodyti istoriją"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Slėpti istoriją"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Rodyti vaizdo būseną"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Slėpti vaizdo būseną"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Rodyti pritaikytus efektus"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Slėpti pritaikytus efektus"</string>
+    <string name="export_image" msgid="3202835713172222134">"Eksportuoti"</string>
+    <string name="print_image" msgid="1942989216591621413">"Spausdinti"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Eksportuoti išlygintą vaizdą"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Eksportuotas vaizdas bus kopija be istorijos."</string>
+    <string name="quality" msgid="179292110309050529">"Kokybė"</string>
+    <string name="size" msgid="4639404642236356037">"Dydis"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Nustatymai"</string>
     <string name="unsaved" msgid="8704442449002374375">"Yra neišsaugotų šio vaizdo pakeitimų."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Ar norite išsaugoti prieš išeidami?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Išsaugoti ir išeiti"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Apdorojami visos skyros vaizdai..."</string>
     <string name="exit" msgid="242642957038770113">"Išeiti"</string>
     <string name="history" msgid="455767361472692409">"Istorija"</string>
     <string name="reset" msgid="9013181350779592937">"Nust. iš naujo"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Paryškinimai"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Kreivės"</string>
     <string name="vignette" msgid="934721068851885390">"Vinjetė"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjetė"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Išlaikymas"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Spalvų sodrumas"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrastas"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Kraštų tamsin."</string>
     <string name="redeye" msgid="4508883127049472069">"Raudonos akys"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Piešti"</string>
     <string name="straighten" msgid="26025591664983528">"Ištiesinti"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatyvas"</string>
     <string name="none" msgid="6633966646410296520">"Nėra"</string>
     <string name="edge" msgid="7036064886242147551">"Kraštai"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Vorholas"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Pav. plak."</string>
     <string name="downsample" msgid="3552938534146980104">"Mažinimas"</string>
+    <string name="grad" msgid="546774853424848655">"Gradientinis"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Skaistis"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrastas"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Spalvų sodrumas"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Pagrindinis"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Raudona"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Geltona"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Žalia"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Žalsvai mėlyna"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Mėlyna"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Purpurinė"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stilius"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"naujas"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Raudona"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Žalia"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Mėlyna"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stilius"</string>
     <string name="draw_size" msgid="4360005386104151209">"Dydis"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Atspalvis"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Spalvų sodrum."</string>
+    <string name="draw_value" msgid="6571604055161538273">"Skaistis"</string>
     <string name="draw_color" msgid="2119030386987211193">"Spalva"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linijos"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Žymeklis"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Taškymas"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Išvalyti"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Storis"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Kampo dydis"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Spalva"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Išvalyti"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Pasirinkti tinkintą spalvą"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Pasirinkti spalvą"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Pasirinkti dydį"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"Gerai"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Originalus"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Rezultatas"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Išsaugomas vaizdas"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Apdorojama..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Išsaug. esamus išankst. nust."</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Tvarkyti naud. išankst. nust."</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nauji išankstiniai nustatymai"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Išankstinis pavadinimas"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informacija"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Vaizdo pavadinimas"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Vaizdo dydis"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histograma"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF duomenys"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Išankstiniai nustatymai"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versija"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Pradinė"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Dabartinė"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modelis"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Diafragma"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Židinio nuotolis"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Atstumas iki objekto"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Fotografavimo data"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F rodiklis"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Išlaikymo laikas"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autorių teisės"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index b36c6e7..5e86a12 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Sukti į dešinę"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Nepavyko surasti elemento."</string>
     <string name="edit" msgid="1502273844748580847">"Redaguoti"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Papr. redagavimas"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Talpinimo užklausų apdorojimas"</string>
     <string name="caching_label" msgid="4521059045896269095">"Talpinama…"</string>
     <string name="crop_action" msgid="3427470284074377001">"Apkarpyti"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Nepavyksta prisijungti prie kameros."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Dėl saugumo politikos kamera neleidžiama."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparatas"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Nešiojamoji vaizdo kamera ir magnetofonas"</string>
     <string name="wait" msgid="8600187532323801552">"Palaukite..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Prieš naudodami fotoaparatą įrenkite USB atmintį."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Prieš naudodami fotoaparatą įdėkite SD kortelę."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Atgal"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Šriftas"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Išsaugoti vietą"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"VIETOVĖ"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Atvirkštinis laikmatis"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 sek."</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Fotoaparato nustatymai"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nešiojamosios vaizdo kameros ir magnetofono nustatymai"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Paveikslėlio dydis"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapiks."</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapiks."</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 mln. piks."</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapikseliai"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 mln. piks."</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 mln. piks."</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 megap. (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 mln. piks."</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 mln. piks."</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatiškai"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Begalybė"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makrokomanda"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMATINIS"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"BEGALYBĖ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKROKOMANDA"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"„Flash“ režimas"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"BLYKSTĖS REŽIMAS"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatiškai"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Įjungta"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Išjungta"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMATINĖ BLYKSTĖ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BLYKSTĖ ĮJUNGTA"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"BLYKSTĖ IŠJUNGTA"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Baltos spalvos balansas"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALTOS SPALVOS BALANSAS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatiškai"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Akinančiai skaistus"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Dienos šviesa"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescencinis"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Debesuota"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMATINIS"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"AKINANČIAI SKAISTUS"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DIENOS ŠVIESA"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENCINIS"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"DEBESUOTA"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scenų režimas"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatiškai"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Naktis"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Saulėlydis"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Vakarėlis"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NĖRA"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"VEIKSMAS"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NAKTIS"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"SAULĖLYDIS"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"VAKARĖLIS"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ATVIRKŠTINIS LAIKMATIS"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"IŠJUNGTI LAIKMATĮ"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEK."</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEK."</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEK."</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEK."</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Negalima pasirinkti, kai veikia scenos režimas."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Išlaikymas"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"IŠLAIKYMAS"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"PRIEKINIS FOTOAPARATAS"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"UŽPAKALINIS FOTOAPARATAS"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"Gerai"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB atmintinėje trūksta vietos. Pakeiskite kokybės nustatymą arba ištrinkite kelis vaizdus ar kitus failus."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD kortelėje trūksta vietos. Pakeiskite kokybės nustatymą arba ištrinkite kelis vaizdus ar kitus failus."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Kosmose"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Saulėlydis"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Vaizdo įr."</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Išjunkite įrenginį."\n"Trumpam išeikite iš rodinio."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Išjunkite įrenginį.\nTrumpam išeikite iš rodinio."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Palieskite, kad įrašydami nufotografuotumėte."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Prasidėjo vaizdo įrašo įrašymas."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Vaizdo įrašo įrašymas sustabdytas."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Perjungti į vaizdo įrašo režimą"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Perjungti į panoramos režimą"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Perjungti į naują panoramą"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Perjungti į pakartotino fokusavimo režimą"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Atšaukimas peržiūros režimu"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Atlikta peržiūros režimu"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Peržiūrėti / fotografuoti arba filmuoti iš naujo"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Leisti vaizdo įrašą"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pristabdyti vaizdo įrašą"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Įkelti vaizdo įrašą iš naujo"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Vaizdo įrašų grotuvo laiko juosta"</string>
     <string name="capital_on" msgid="5491353494964003567">"ĮJUNGTA"</string>
     <string name="capital_off" msgid="7231052688467970897">"IŠJUNGTA"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Išj."</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Nustatyti trukmę sekundėmis"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Skaičiuojamas laikas iki fotografavimo"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Atsiminti nuotraukų vietas?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Žymėkite nuotraukas ir vaizdo įrašus nurodydami vietas, kur jie buvo sukurti."\n\n"Kitos programos gali pasiekti šią informaciją kartu su išsaugotais vaizdais."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Žymėkite nuotraukas ir vaizdo įrašus nurodydami vietas, kur jie buvo sukurti.\n\nKitos programos gali pasiekti šią informaciją kartu su išsaugotais vaizdais."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Ne, ačiū"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Taip"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Fotoaparatas"</string>
     <string name="menu_search" msgid="7580008232297437190">"Paieška"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Nuotraukos"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumai"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"DAUGIAU PARINKČIŲ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"NUSTATYMAI"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"Nuotraukų: %1$d"</item>
     <item quantity="other" msgid="3813306834113858135">"Nuotraukų: %1$d"</item>
diff --git a/res/values-lv/filtershow_strings.xml b/res/values-lv/filtershow_strings.xml
index cf2ffc1..3416574 100644
--- a/res/values-lv/filtershow_strings.xml
+++ b/res/values-lv/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Fotoattēlu redaktors"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Nevar ielādēt attēlu."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Nevar rediģēt oriģinālu."</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Notiek fona tapetes iestatīšana"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Nevarēja lejupielādēt fotoattēlu. Tīkls nav pieejams."</string>
     <string name="original" msgid="3524493791230430897">"Oriģināls"</string>
     <string name="borders" msgid="2067345080568684614">"Robežas"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Pielāgots"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Atsaukt"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Atcelt atsaukšanu"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Rādīt vēsturi"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Slēpt vēsturi"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Rādīt attēla statusu"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Slēpt attēla statusu"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Rādīt lietotos efektus"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Slēpt lietotos efektus"</string>
+    <string name="export_image" msgid="3202835713172222134">"Eksportēt"</string>
+    <string name="print_image" msgid="1942989216591621413">"Drukāt"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Eksportēt saplacinātu attēlu"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Eksportētais attēls būs kopija, kurā nebūs ietverta vēsture."</string>
+    <string name="quality" msgid="179292110309050529">"Kvalitāte"</string>
+    <string name="size" msgid="4639404642236356037">"Izmēri"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Iestatījumi"</string>
     <string name="unsaved" msgid="8704442449002374375">"Šajā attēlā ir veiktas izmaiņas, kas nav saglabātas."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Vai vēlaties saglabāt pirms iziešanas?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Saglabāt un iziet"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Notiek pilnas izšķirtspējas attēla apstrāde..."</string>
     <string name="exit" msgid="242642957038770113">"Iziet"</string>
     <string name="history" msgid="455767361472692409">"Vēsture"</string>
     <string name="reset" msgid="9013181350779592937">"Atiestatīt"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Gaišās vietas"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Līknes"</string>
     <string name="vignette" msgid="934721068851885390">"Vinjete"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjete"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Ekspozīcija"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Piesātinājums"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrasts"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Kritums"</string>
     <string name="redeye" msgid="4508883127049472069">"Sarkano acu ef."</string>
     <string name="imageDraw" msgid="6918552177844486656">"Zīmējumi"</string>
     <string name="straighten" msgid="26025591664983528">"Iztaisnošana"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatīvs"</string>
     <string name="none" msgid="6633966646410296520">"Nav"</string>
     <string name="edge" msgid="7036064886242147551">"Malas"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Vorhols"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Plakāts"</string>
     <string name="downsample" msgid="3552938534146980104">"Sam. liel."</string>
+    <string name="grad" msgid="546774853424848655">"Uzlabots"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Spilgtums"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrasts"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Piesātinājums"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Galvenā"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Sarkana"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Dzeltena"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zaļa"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Ciānzila"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Zila"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Fuksīnsarkana"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stils"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"jauns"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Sarkans"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Zaļš"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Zils"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stils"</string>
     <string name="draw_size" msgid="4360005386104151209">"Izmēri"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Nokrāsa"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Piesātinājums"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Spilgtums"</string>
     <string name="draw_color" msgid="2119030386987211193">"Krāsa"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Līnijas"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marķieris"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Šļakatas"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Notīrīt"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Biezums"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Stūra izmērs"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Krāsa"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Notīrīt"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Izvēlēties pielāgotu krāsu"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Krāsas atlase"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Izmēru atlase"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"Labi"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Sākotnējais"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Rezultāts"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Notiek attēla saglabāšana"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Notiek apstrāde..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Saglab. pašreiz. pirmsiestat."</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Pārv. lietotāja pirmsiestatīj."</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Jauns pirmsiestatījums"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Pirmsiestatītais nosaukums"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informācija"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Attēla nosaukums"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Attēla izmēri"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogramma"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF dati"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Pirmsiestatīt"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versija"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Sākotnējā"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Pašreizējā"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modelis"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Apertūra"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Fokusa attālums"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Objekta attālums"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Uzņemšanas datums"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F-stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Ekspozīcijas ilgums"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autortiesības"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 04385ba..8b35db6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Pagriezt pa labi"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Nevarēja atrast vienumu."</string>
     <string name="edit" msgid="1502273844748580847">"Rediģēt"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Parauga rediģēšana"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Tiek apstrādāti pieprasījumi rakstīšanai kešatmiņā"</string>
     <string name="caching_label" msgid="4521059045896269095">"Glabā kešatm..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Apgriezt"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Nevar izveidot savienojumu ar kameru."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera ir atspējota drošības politiku dēļ."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="wait" msgid="8600187532323801552">"Lūdzu, uzgaidiet…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pirms kameras lietošanas pievienojiet USB atmiņu."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Pirms kameras izmantošanas ievietojiet SD karti."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Atpakaļ"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Priekšpuse"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Saglabāt atrašanās vietu"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"ATRAŠANĀS VIETA"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Laika atskaites taimeris"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 sekunde"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameras iestatījumi"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokameras iestatījumi"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Attēla izmērs"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapikseļi"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikseļi"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapikseļi"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapikseļi"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapikseļi"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapikseļi"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 megap. (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapikseļi"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapikselis"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automātiski"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Bezgalība"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMĀTISKI"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"BEZGALĪBA"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Zibspuldzes režīms"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"ZIBSPULDZES REŽĪMS"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automātiski"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Ieslēgts"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Izslēgt"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMĀTISKĀ ZIBSPULDZE"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"IESLĒGTA ZIBSPULDZE"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"IZSLĒGTA ZIBSPULDZE"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Baltās krāsas balanss"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALTĀ BALANSS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automātiski"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Spožs"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Dienasgaisma"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescējošs"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Mākoņains"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMĀTISKI"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"KVĒLSPULDZE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DIENASGAISMA"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCĒJOŠS"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"MĀKOŅAINS"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Ainas režīms"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automātiski"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nakts"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Saulriets"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Viesības"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NAV"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"SPRAIGA DARBĪBA"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NAKTS"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"SAULRIETS"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"BALLĪTE"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"LAIKA ATSKAITES TAIMERIS"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TAIMERIS IR IZSLĒGTS"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUNDE"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDES"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUNDES"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUNDES"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Nevar atlasīt ainavas režīmā."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozīcija"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EKSPOZĪCIJA"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"AUGSTS DINAMISKAIS DIAPAZONS"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"PRIEKŠĒJĀ KAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"AIZMUGURĒJĀ KAMERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"Labi"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB atmiņa drīz būs pilna. Mainiet kvalitātes iestatījumu vai dzēsiet dažus attēlus vai citus failus."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD karte drīz būs pilna. Mainiet kvalitātes iestatījumu vai dzēsiet dažus attēlus vai citus failus."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Kosmosā"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Saulriets"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Videoklips"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Novietojiet ierīci uz leju."\n"Uz brīdi izejiet no kameras skata."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Novietojiet ierīci uz leju.\nUz brīdi izejiet no kameras skata."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Pieskarieties, lai uzņemtu fotoattēlu ieraksta laikā."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Video ierakstīšana ir sākta."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Video ierakstīšana ir pārtraukta."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Pārslēgt uz video režīmu"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Pārslēgt uz panorāmas režīmu"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Pārslēgties uz jaunu panorāmu"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Pārslēgt uz pārfokusēšanas režīmu"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Atcelt pārskatīšanu"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Pabeigt pārskatīšanu"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Pārskatīt atkārtotu attēlu"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Atskaņot videoklipu"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pārtraukt videoklipa atskaņošanu"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Atkārtoti ielādēt videoklipu"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Videoklipu atskaņotāja laika josla"</string>
     <string name="capital_on" msgid="5491353494964003567">"IESLĒGTS"</string>
     <string name="capital_off" msgid="7231052688467970897">"IZSLĒGTS"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Beidzies"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Iestatīt ilgumu sekundēs"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Notiek laika skaitīšana līdz fotoattēla uzņemšanai"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Vai atcerēties fotoattēlu uzņemšanas vietas?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Atzīmē jūsu fotoattēlos un videoklipos atrašanās vietas, kurās tie tika uzņemti."\n\n"Citas lietotnes var piekļūt šai informācijai līdz ar saglabātajiem attēliem."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Atzīmē jūsu fotoattēlos un videoklipos atrašanās vietas, kurās tie tika uzņemti.\n\nCitas lietotnes var piekļūt šai informācijai līdz ar saglabātajiem attēliem."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nē, paldies!"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Jā"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Meklēt"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotoattēli"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumi"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"CITAS OPCIJAS"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"IESTATĪJUMI"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d fotoattēls"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotoattēli"</item>
diff --git a/res/values-mn-rMN/filtershow_strings.xml b/res/values-mn-rMN/filtershow_strings.xml
new file mode 100644
index 0000000..310c63d
--- /dev/null
+++ b/res/values-mn-rMN/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Фото Засагч"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Зураг ачааллах боломжгүй!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Эх хувийг засах боломжгүй"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Ханын зураг тохируулж байна"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Зургийг татаж авч чадсангүй. Сүлжээ боломжгүй."</string>
+    <string name="original" msgid="3524493791230430897">"Эх хувь"</string>
+    <string name="borders" msgid="2067345080568684614">"Ирмэг"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Тусгай"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Буцаах"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Дахин хийх"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Ашигласан эффект харуулах"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ашигласан Эффектийг Нуух"</string>
+    <string name="export_image" msgid="3202835713172222134">"Экспортлох"</string>
+    <string name="print_image" msgid="1942989216591621413">"Хэвлэх"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Нэгтгэсэн зургийг экспорт хийх"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Экспорт хийгдсэн зураг нь хуулбар байх бөгөөд түүх үлдэхгүй."</string>
+    <string name="quality" msgid="179292110309050529">"Чанар"</string>
+    <string name="size" msgid="4639404642236356037">"Хэмжээ"</string>
+    <string name="x" msgid="6810256999024563662">"х"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Тохиргоо"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Энэ зурагт хийсэн өөрчлөлтийг хадгалаагүй байна."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Та гарахаасаа өмнө хадгалахыг хүсэж байна уу?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Хадгалаад гарах"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Бүрэн нарийвчлалтай зургийг боловсруулж байна..."</string>
+    <string name="exit" msgid="242642957038770113">"Гарах"</string>
+    <string name="history" msgid="455767361472692409">"Түүх"</string>
+    <string name="reset" msgid="9013181350779592937">"Бүгдийг цэвэрлэх"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Ашигласан Эффект"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Харьцуулах"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Ашиглах"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Бүгдийг цэвэрлэх"</string>
+    <string name="aspect" msgid="4025244950820813059">"Үзэмж"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Байхгүй"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Бэхлэгдсэн"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Жижиг Гариг"</string>
+    <string name="exposure" msgid="6526397045949374905">"Гаргах"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Хурцлах"</string>
+    <string name="contrast" msgid="2310908487756769019">"Ялгарал"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Өнгөжүүлэлт"</string>
+    <string name="saturation" msgid="7026791551032438585">"Өнгө ялгалт"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"BW филтер"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Авто өнгө"</string>
+    <string name="hue" msgid="6231252147971086030">"Үндсэн өнгөжүүлэлт"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Сүүдэр"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Тодруулах"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Муруй"</string>
+    <string name="vignette" msgid="934721068851885390">"Хөрөг"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Хөрөг"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Илчлэлт"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Өнгө ялгалт"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Ялгаралт"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Бууралт"</string>
+    <string name="redeye" msgid="4508883127049472069">"Улаан нүд"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Зурах"</string>
+    <string name="straighten" msgid="26025591664983528">"Шулуутгах"</string>
+    <string name="crop" msgid="5781263790107850771">"Тайрах"</string>
+    <string name="rotate" msgid="2796802553793795371">"Эргүүлэлт"</string>
+    <string name="mirror" msgid="5482518108154883096">"Толь"</string>
+    <string name="negative" msgid="6998313764388022201">"Сөрөг"</string>
+    <string name="none" msgid="6633966646410296520">"Байхгүй"</string>
+    <string name="edge" msgid="7036064886242147551">"Ирмэг тодруулах"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Зурагт хуудас"</string>
+    <string name="downsample" msgid="3552938534146980104">"Багасгах"</string>
+    <string name="grad" msgid="546774853424848655">"Шаталсан"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Тодролт"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Ялгаралт"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Өнгө ялгалт"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Үндсэн"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Улаан"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Шар"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Ногоон"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Шар хөх"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Цэнхэр"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Улаан"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Загвар"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"шинэ"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Улаан"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Ногоон"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Цэнхэр"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Стайл"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Хэмжээ"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Өнгө"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Өнгө ялгалт"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Тодролт"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Өнгө"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Шулуун"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Тэмдэглэгч"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Шүрших"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Арилгах"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Зузаан"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Булангийн хэмжээ"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Өнгө"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Цэвэрлэх"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Өнгө тохируулж сонгох"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Өнгө сонгох"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Хэмжээ сонгох"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"Тийм"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Эх хувь"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Үр дүн"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Зургийг хадгалж байна"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Боловсруулж байна..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Одоогийн тохируулгыг хадгалах"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Хэрэглэгчийн урьдчилан хадгалсан тохируулгуудыг удирдах"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Шинэ урьдчилан хадгалсан тохируулга"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Урьдчилан оруулсан нэр"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Мэдээлэл"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Зургийн нэр"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Зургийн хэмжээ"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Гистограм"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF Дата"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Урьдчилан тохируулах"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Хувилбар"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Эх хувь"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Одоогийн"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Модел"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Өрц"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Фокусын зай"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Биетийн Зай"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Огноо"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Зогсолт"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Буулгалтын хугацаа"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Зохиогчийн эрх"</string>
+</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000..b84c773
--- /dev/null
+++ b/res/values-mn-rMN/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Цомог"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Зургийн фрэйм"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Видео тоглуулагч"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Видеог ачааллаж байна…"</string>
+    <string name="loading_image" msgid="1200894415793838191">"Зураг ачааллаж байна…"</string>
+    <string name="loading_account" msgid="928195413034552034">"Акаунтыг ачааллаж байна…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Видеог үргэлжлүүлэх"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"%s-с үргэлжлүүлэн тоглуулах уу ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Үргэлжлүүлэн тоглуулах"</string>
+    <string name="loading" msgid="7038208555304563571">"Ачааллаж байна..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Ачааллах боломжгүй"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Зураг ачааллах боломжгүй"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"Товчлол зураггүй"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Эхлүүлэх"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"Тийм"</string>
+    <string name="ok" msgid="5296833083983263293">"Тийм"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Эхлэх бол нүүрэнд хүрнэ үү."</string>
+    <string name="saving_image" msgid="7270334453636349407">"Зураг хадгалж байна…"</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Зургийг <xliff:g id="ALBUM_NAME">%1$s</xliff:g>-д хадгалж байна …"</string>
+    <string name="save_error" msgid="6857408774183654970">"Тайрагдсан зургийг хадгалж чадсангүй."</string>
+    <string name="crop_label" msgid="521114301871349328">"Зураг тайрах"</string>
+    <string name="trim_label" msgid="274203231381209979">"Видео тайрах"</string>
+    <string name="select_image" msgid="7841406150484742140">"Зураг сонгох"</string>
+    <string name="select_video" msgid="4859510992798615076">"Видео сонгоно уу"</string>
+    <string name="select_item" msgid="2816923896202086390">"Сонгоно уу"</string>
+    <string name="select_album" msgid="1557063764849434077">"Альбом сонгох"</string>
+    <string name="select_group" msgid="6744208543323307114">"Грүп сонгох"</string>
+    <string name="set_image" msgid="2331476809308010401">"Зургийг тохируулах"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Ханын зураг болгох"</string>
+    <string name="wallpaper" msgid="140165383777262070">"Ханын зургийг тохируулж байна…"</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Ханын зураг"</string>
+    <string name="delete" msgid="2839695998251824487">"Устгах"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Сонгогдсоныг устгах уу?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Сонгогдсоныг устгах уу?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Бататгах"</string>
+    <string name="cancel" msgid="3637516880917356226">"Цуцлах"</string>
+    <string name="share" msgid="3619042788254195341">"Хуваалцах"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Панорама хуваалцах"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Зураг хуваалцах"</string>
+    <string name="deleted" msgid="6795433049119073871">"Устгасан"</string>
+    <string name="undo" msgid="2930873956446586313">"БУЦАХ"</string>
+    <string name="select_all" msgid="3403283025220282175">"Бүгдийг сонгох"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Бүгдийг сонгохгүй"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Слайд харуулах"</string>
+    <string name="details" msgid="8415120088556445230">"Дэлгэрэнгүй"</string>
+    <string name="details_title" msgid="2611396603977441273">"%2$d-с %1$d:"</string>
+    <string name="close" msgid="5585646033158453043">"Хаах"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Камерлуу солих"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d сонгогдсон"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d сонгогдсон"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d сонгогдсон"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d сонгогдсон"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d сонгогдсон"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d сонгогдсон"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d сонгогдсон"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d сонгогдсон"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d сонгогдсон"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Газрын зураг дээр харуулах"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Зүүн эргүүлэх"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Баруун эргүүлэх"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Олж чадсангүй."</string>
+    <string name="edit" msgid="1502273844748580847">"Засах"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Энгийн засвар"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Нөөцлөх хүсэлтийг гүйцэтгэж байна"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Кеш хийж байна…"</string>
+    <string name="crop_action" msgid="3427470284074377001">"Тайрах"</string>
+    <string name="trim_action" msgid="703098114452883524">"Тайрах"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Дууг хаах"</string>
+    <string name="set_as" msgid="3636764710790507868">"Тохируулах"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Видеог дуугүй болгож чадсангүй."</string>
+    <string name="video_err" msgid="7003051631792271009">"Видео тоглуулах боломжгүй."</string>
+    <string name="group_by_location" msgid="316641628989023253">"Байршлаар"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"Цагаар"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"Шошгоор"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"Хүмүүсээр"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"Альбомаар"</string>
+    <string name="group_by_size" msgid="153766174950394155">"Хэмжээгээр"</string>
+    <string name="untagged" msgid="7281481064509590402">"Шошгогүй"</string>
+    <string name="no_location" msgid="4043624857489331676">"Байршилгүй"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Сүлжээний асуудлаас шалтгаалж зарим байршил танигдсангүй."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Энэ альбомын зургуудыг татаж авч чадсангүй. Дараа дахин оролдоно уу."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Зөвхөн зураг"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Зөвхөн видео"</string>
+    <string name="show_all" msgid="6963292714584735149">"Зураг ба видео"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Зургийн Цомог"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"Зураггүй"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Тайрсан зураг <xliff:g id="FOLDER_NAME">%s</xliff:g>-д хадгалагдав."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"Альбом байхгүй"</string>
+    <string name="empty_album" msgid="4542880442593595494">"Зураг/видео байхгүй"</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Бичээс"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Оффлайнд боломжтой болгох"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Дахин ачаалах"</string>
+    <string name="done" msgid="217672440064436595">"Дуусгах"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"нийт %2$d-н %1$d :"</string>
+    <string name="title" msgid="7622928349908052569">"Гарчиг"</string>
+    <string name="description" msgid="3016729318096557520">"Тайлбар"</string>
+    <string name="time" msgid="1367953006052876956">"Цаг"</string>
+    <string name="location" msgid="3432705876921618314">"Байршил"</string>
+    <string name="path" msgid="4725740395885105824">"Зам"</string>
+    <string name="width" msgid="9215847239714321097">"Өргөн"</string>
+    <string name="height" msgid="3648885449443787772">"Өндөр"</string>
+    <string name="orientation" msgid="4958327983165245513">"Чиглэл"</string>
+    <string name="duration" msgid="8160058911218541616">"Үргэлжлэх хугацаа"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME төрөл"</string>
+    <string name="file_size" msgid="8486169301588318915">"Файлын хэмжээ"</string>
+    <string name="maker" msgid="7921835498034236197">"Хийгч"</string>
+    <string name="model" msgid="8240207064064337366">"Загвар"</string>
+    <string name="flash" msgid="2816779031261147723">"Гэрэл"</string>
+    <string name="aperture" msgid="5920657630303915195">"Нүх"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Фокусын зай"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Цагаан баланс"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Гаргах цаг"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"Гараар"</string>
+    <string name="auto" msgid="4296941368722892821">"Автомат"</string>
+    <string name="flash_on" msgid="7891556231891837284">"Гэрэл ассан"</string>
+    <string name="flash_off" msgid="1445443413822680010">"Гэрэлгүй"</string>
+    <string name="unknown" msgid="3506693015896912952">"Тодорхойгүй"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Эх хувь"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Хуучны"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Гэрэлтүүлэх"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Цайралт"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Цэнхэр"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"B/W"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Шаргал"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X процесс"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Латте"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Өнгөгүй"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Альбомыг оффлайнаар ашигладаг болгож байна."</item>
+    <item quantity="other" msgid="4948604338155959389">"Альбомыг оффлайнаар харах боломжтой болгож байна."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Локалд хадгалагдсан ба оффлайнаар харах боломжтой."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"Бүх альбом"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Локал альбом"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP төхөөрөмж"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Пикаса альбом"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> чөлөөтэй"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g>-с доош"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> дээш"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g>-с <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"Импортлох"</string>
+    <string name="import_complete" msgid="3875040287486199999">"Импорт дууслаа"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Импорт амжилтгүй"</string>
+    <string name="camera_connected" msgid="916021826223448591">"Камер холбоотой."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Камер холбогдоогүй"</string>
+    <string name="click_import" msgid="6407959065464291972">"Импортлох бол энд хүрнэ үү"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Альбом сонгох"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Бүх зургийг холих"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Зураг сонгоно уу"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Зураг сонгох"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Слайд харуулах"</string>
+    <string name="albums" msgid="7320787705180057947">"Альбом"</string>
+    <string name="times" msgid="2023033894889499219">"Давтамж"</string>
+    <string name="locations" msgid="6649297994083130305">"Байршил"</string>
+    <string name="people" msgid="4114003823747292747">"Хүмүүс"</string>
+    <string name="tags" msgid="5539648765482935955">"Шошго"</string>
+    <string name="group_by" msgid="4308299657902209357">"Груплэх"</string>
+    <string name="settings" msgid="1534847740615665736">"Тохиргоо"</string>
+    <string name="add_account" msgid="4271217504968243974">"Акаунт нэмэх"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Камер"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Татаж авах"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Онлайн зассан зураг"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"Импортолсон"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Агшин дэлгэц"</string>
+    <string name="help" msgid="7368960711153618354">"Тусламж"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"Сангүй"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"Гадаад сан байхгүй"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Зургийн хальсаар харах"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Хүснэгтээр харах"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Бүтэн дэлгэцээр үзэх"</string>
+    <string name="trimming" msgid="9122385768369143997">"Тайрч байна"</string>
+    <string name="muting" msgid="5094925919589915324">"Дуугүй"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Түр хүлээнэ үү ..."</string>
+    <string name="save_into" msgid="9155488424829609229">"Видеог <xliff:g id="ALBUM_NAME">%1$s</xliff:g>-д хадгалж байна …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Тайрах боломжгүй : Видео хэт богино байна"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Панорама зурж байна"</string>
+    <string name="save" msgid="613976532235060516">"Хадгалах"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Контентыг скан хийж байна..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d скан хийгдэв"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d скан хийгдэв"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d файл скан хийгдсэн"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Эрэмбэлж байна..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Скан хийж дууслаа."</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Импортлож байна..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"Энэ төхөөрөмжрүү импортлох контент байхгүй байна."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"MTP төхөөрөмж холбогдоогүй байна"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Камерын алдаа"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Камертай холбогдож чадсангүй."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Аюулгүйн үүднээс камерыг идэвхгүй болгосон."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Камер"</string>
+    <string name="wait" msgid="8600187532323801552">"Түр хүлээнэ үү ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Камер ашиглахын өмнө USB сан залгана уу."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Камер ашиглахын өмнө SD карт хийнэ үү."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB сан бэлдэж байна…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD карт бэлдэж байна…"</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB санд хандаж чадсангүй."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD картад хандаж чадсангүй."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"Цуцлах"</string>
+    <string name="review_ok" msgid="1156261588693116433">"Дуусгах"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Цагийн урсгал бичигдэж байна"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Камер сонгох"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d секунд"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Цаг тоолж байхад дохио дуугарах"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Идэвхгүй"</string>
+    <string name="setting_on" msgid="8602246224465348901">"Идэвхтэй"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Видео чанар"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Сайн"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Муу"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Цагийн урсгал"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Камерын тохиргоо"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Камерын тохиргоо"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Зургийн хэмжээ"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M пиксел (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Фокус горим"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Автомат"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Хязгааргүй"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Макро"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"Автомат"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"ХЯЗГААРГҮЙ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"МАКРО"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Гэрлийн горим"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"ГЭРЛИЙН ГОРИМ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Автомат"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Идэвхтэй"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Идэвхгүй"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"ГЭРЭЛ АВТОМАТ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"ГЭРЭЛТЭЙ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ГЭРЭЛ ИДЭВХГҮЙ"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Цагаан баланс"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"ЦАГААН БАЛАНС"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Автомат"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Гэрэлтэй"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Нарны гэрэл"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Өдрийн гэрэл"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Үүлэрхэг"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"Автомат"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ГЭРЭЛТЭЙ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ӨДРИЙН ГЭРЭЛ"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ӨДРИЙНГЭРЭЛ"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ҮҮЛТЭЙ"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Тохируулсан горим"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Автомат"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Үйлдлүүд"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Таны USB сан зайгүй болсон байна. Зарим зураг болон файлын чанарын тохиргоог өөрчлөх юмуу устгана уу."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Таны USB сан зайгүй болсон байна. Зарим зураг болон файлын чанарын тохиргоог өөрчлөх юмуу устгана уу."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Хэмжээний хязгаар хүрэв."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Хэт хурдан"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Панорама бэлдэж байна"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Панорама хадгалагдсангүй."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Панорамаг авч байна"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Өмнөх панорамаг хүлээж байна"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Хадгалж байна..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Панорамаг зурж байна"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Фокуслах бол хүрнэ үү."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Эффект"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Байхгүй"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Шахалт"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Том нүд"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Том ам"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Жижиг ам"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Том хамар"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Жижиг нүд"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Огторгуй"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Нар шингэх"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Таны видео"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Төхөөрөмжийг доош харуулна\nТүр харахаас гарна уу"</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Бичиж байх үед хүрч зураг авах боломжтой."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"Видео бичиж эхлэв."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"Видео бичих зогсов."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Тусгай эффект хийгдсэн үед видео агшин зураг боломжгүй."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Эффектийг арилгах"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"ИНЭЭДМИЙН ЦАРАЙ"</string>
+    <string name="effect_background" msgid="6579360207378171022">"АРЫН"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Хаах товч"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Цэсний товч"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Хамгийн сүүлийн зураг"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Урд болон арын камер солих"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Камер, видео болон панорама сонгогч"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Илүү олон тохиргооны контрол"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Тохиргооын контролыг хаах"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Өсгөх контрол"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Багасгах %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Өсгөх %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s сонгох нүд"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Зурагруу солих"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Видеоруу солих"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Панорамаруу солих"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Панорамаруу солих"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Дахин фокуслах руу сэлгэх"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Цуцлах"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Зураг авав"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Зураг авах"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Видео тоглуулах"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Видеог түр зогсоох"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Видеог дахин ачааллах"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Видео тоглуулагчийн цаг хавтан"</string>
+    <string name="capital_on" msgid="5491353494964003567">"Идэвхижсэн"</string>
+    <string name="capital_off" msgid="7231052688467970897">"Идэвхгүй"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Зогсоох"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 цаг"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"секунд"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"минут"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"цаг"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Дуусгах"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Хугацааны интервал тохируулах"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Цагын урсгал идэвхгүй. Цагийн интервалыг тохируулах бол идэвхтэй болгоно уу."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Цаг тоологч идэвхгүй. Зураг авахын өмнө цаг тоологчийг идэвхтэй болгоно уу."</string>
+    <string name="set_duration" msgid="5578035312407161304">"Үргэлжлэх хугацааг секундээр тохируулах"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Зураг авахаар цаг тоолж байна"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Зургийн байршлыг санаж байна уу?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Өөрийн зураг болон видеог авсан газрын байршлаар нь шошго өгнө үү.\n\nБусад апп-с энэ мэдээлэл болон хадгалагдсан зурагт хандах боломжтой."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"Үгүй"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Тийм"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Камер"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Хайх"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Зураг"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Альбом"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"НЭМЭЛТ СОНГОЛТ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ТОХИРГОО"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d зураг"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d зураг"</item>
+  </plurals>
+</resources>
diff --git a/res/values-mn/filtershow_strings.xml b/res/values-mn/filtershow_strings.xml
new file mode 100644
index 0000000..3d58bd9
--- /dev/null
+++ b/res/values-mn/filtershow_strings.xml
@@ -0,0 +1,150 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Фото Засагч"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Зураг ачааллах боломжгүй!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Эх хувийг засах боломжгүй"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Ханын зураг тохируулж байна"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Зургийг татаж авч чадсангүй. Сүлжээ боломжгүй."</string>
+    <string name="original" msgid="3524493791230430897">"Эх хувь"</string>
+    <string name="saved" msgid="6678827180814174711">"Хадгалагдсан"</string>
+    <string name="borders" msgid="2067345080568684614">"Ирмэг"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Буцаах"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Дахин хийх"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Ашигласан эффект харуулах"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ашигласан Эффектийг Нуух"</string>
+    <string name="export_image" msgid="3202835713172222134">"Экспортлох"</string>
+    <string name="print_image" msgid="1942989216591621413">"Хэвлэх"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Нэгтгэсэн зургийг экспорт хийх"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Экспорт хийгдсэн зураг нь хуулбар байх бөгөөд түүх үлдэхгүй."</string>
+    <string name="quality" msgid="179292110309050529">"Чанар"</string>
+    <string name="size" msgid="4639404642236356037">"Хэмжээ"</string>
+    <string name="x" msgid="6810256999024563662">"х"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Тохиргоо"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Энэ зурагт хийсэн өөрчлөлтийг хадгалаагүй байна."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Та гарахаасаа өмнө хадгалахыг хүсэж байна уу?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Хадгалаад гарах"</string>
+    <string name="exit" msgid="242642957038770113">"Гарах"</string>
+    <string name="history" msgid="455767361472692409">"Түүх"</string>
+    <string name="reset" msgid="9013181350779592937">"Бүгдийг цэвэрлэх"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Ашигласан Эффект"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Харьцуулах"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Ашиглах"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Бүгдийг цэвэрлэх"</string>
+    <string name="aspect" msgid="4025244950820813059">"Үзэмж"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Байхгүй"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Бэхлэгдсэн"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Жижиг Гариг"</string>
+    <string name="exposure" msgid="6526397045949374905">"Гаргах"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Хурцлах"</string>
+    <string name="contrast" msgid="2310908487756769019">"Ялгарал"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Өнгөжүүлэлт"</string>
+    <string name="saturation" msgid="7026791551032438585">"Өнгө ялгалт"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"BW филтер"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Авто өнгө"</string>
+    <string name="hue" msgid="6231252147971086030">"Үндсэн өнгөжүүлэлт"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Сүүдэр"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Тодруулах"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Муруй"</string>
+    <string name="vignette" msgid="934721068851885390">"Хөрөг"</string>
+    <string name="redeye" msgid="4508883127049472069">"Улаан нүд"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Зурах"</string>
+    <string name="straighten" msgid="26025591664983528">"Шулуутгах"</string>
+    <string name="crop" msgid="5781263790107850771">"Тайрах"</string>
+    <string name="rotate" msgid="2796802553793795371">"Эргүүлэлт"</string>
+    <string name="mirror" msgid="5482518108154883096">"Толь"</string>
+    <string name="negative" msgid="6998313764388022201">"Сөрөг"</string>
+    <string name="none" msgid="6633966646410296520">"Байхгүй"</string>
+    <string name="edge" msgid="7036064886242147551">"Ирмэг тодруулах"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Зурагт хуудас"</string>
+    <string name="downsample" msgid="3552938534146980104">"Багасгах"</string>
+    <string name="grad" msgid="546774853424848655">"Шаталсан"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Тодролт"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Ялгаралт"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Өнгө ялгалт"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Үндсэн"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Улаан"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Шар"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Ногоон"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Шар хөх"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Цэнхэр"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Улаан"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Загвар"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"шинэ"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Улаан"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Ногоон"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Цэнхэр"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Стайл"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Хэмжээ"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Өнгө"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Өнгө ялгалт"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Тодролт"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Өнгө"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Шулуун"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Тэмдэглэгч"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Шүрших"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Арилгах"</string>
+    <string name="color_border_size" msgid="8745307483517793073">"зузаан"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Булангийн хэмжээ"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Өнгө"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Цэвэрлэх"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Өнгө тохируулж сонгох"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Өнгө сонгох"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Хэмжээ сонгох"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"Тийм"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Эх хувь"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Үр дүн"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Зургийг хадгалж байна"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Боловсруулж байна..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Одоогийн тохируулгыг хадгалах"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Хэрэглэгчийн урьдчилан хадгалсан тохируулгуудыг удирдах"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Шинэ урьдчилан хадгалсан тохируулга"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Урьдчилан оруулсан нэр"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Мэдээлэл"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Зургийн нэр"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Зургийн хэмжээ"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Гистограм"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF Дата"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Урьдчилан тохируулах"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Хувилбар"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Эх хувь"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Одоогийн"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Модел"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Өрц"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Фокусын зай"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Биетийн Зай"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Огноо"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Зогсолт"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Буулгалтын хугацаа"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Зохиогчийн эрх"</string>
+</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
new file mode 100644
index 0000000..b84c773
--- /dev/null
+++ b/res/values-mn/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Цомог"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Зургийн фрэйм"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Видео тоглуулагч"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Видеог ачааллаж байна…"</string>
+    <string name="loading_image" msgid="1200894415793838191">"Зураг ачааллаж байна…"</string>
+    <string name="loading_account" msgid="928195413034552034">"Акаунтыг ачааллаж байна…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Видеог үргэлжлүүлэх"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"%s-с үргэлжлүүлэн тоглуулах уу ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Үргэлжлүүлэн тоглуулах"</string>
+    <string name="loading" msgid="7038208555304563571">"Ачааллаж байна..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Ачааллах боломжгүй"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Зураг ачааллах боломжгүй"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"Товчлол зураггүй"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Эхлүүлэх"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"Тийм"</string>
+    <string name="ok" msgid="5296833083983263293">"Тийм"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Эхлэх бол нүүрэнд хүрнэ үү."</string>
+    <string name="saving_image" msgid="7270334453636349407">"Зураг хадгалж байна…"</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Зургийг <xliff:g id="ALBUM_NAME">%1$s</xliff:g>-д хадгалж байна …"</string>
+    <string name="save_error" msgid="6857408774183654970">"Тайрагдсан зургийг хадгалж чадсангүй."</string>
+    <string name="crop_label" msgid="521114301871349328">"Зураг тайрах"</string>
+    <string name="trim_label" msgid="274203231381209979">"Видео тайрах"</string>
+    <string name="select_image" msgid="7841406150484742140">"Зураг сонгох"</string>
+    <string name="select_video" msgid="4859510992798615076">"Видео сонгоно уу"</string>
+    <string name="select_item" msgid="2816923896202086390">"Сонгоно уу"</string>
+    <string name="select_album" msgid="1557063764849434077">"Альбом сонгох"</string>
+    <string name="select_group" msgid="6744208543323307114">"Грүп сонгох"</string>
+    <string name="set_image" msgid="2331476809308010401">"Зургийг тохируулах"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Ханын зураг болгох"</string>
+    <string name="wallpaper" msgid="140165383777262070">"Ханын зургийг тохируулж байна…"</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Ханын зураг"</string>
+    <string name="delete" msgid="2839695998251824487">"Устгах"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Сонгогдсоныг устгах уу?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Сонгогдсоныг устгах уу?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Бататгах"</string>
+    <string name="cancel" msgid="3637516880917356226">"Цуцлах"</string>
+    <string name="share" msgid="3619042788254195341">"Хуваалцах"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Панорама хуваалцах"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Зураг хуваалцах"</string>
+    <string name="deleted" msgid="6795433049119073871">"Устгасан"</string>
+    <string name="undo" msgid="2930873956446586313">"БУЦАХ"</string>
+    <string name="select_all" msgid="3403283025220282175">"Бүгдийг сонгох"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Бүгдийг сонгохгүй"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Слайд харуулах"</string>
+    <string name="details" msgid="8415120088556445230">"Дэлгэрэнгүй"</string>
+    <string name="details_title" msgid="2611396603977441273">"%2$d-с %1$d:"</string>
+    <string name="close" msgid="5585646033158453043">"Хаах"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Камерлуу солих"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d сонгогдсон"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d сонгогдсон"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d сонгогдсон"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d сонгогдсон"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d сонгогдсон"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d сонгогдсон"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d сонгогдсон"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d сонгогдсон"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d сонгогдсон"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Газрын зураг дээр харуулах"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Зүүн эргүүлэх"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Баруун эргүүлэх"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Олж чадсангүй."</string>
+    <string name="edit" msgid="1502273844748580847">"Засах"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Энгийн засвар"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Нөөцлөх хүсэлтийг гүйцэтгэж байна"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Кеш хийж байна…"</string>
+    <string name="crop_action" msgid="3427470284074377001">"Тайрах"</string>
+    <string name="trim_action" msgid="703098114452883524">"Тайрах"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Дууг хаах"</string>
+    <string name="set_as" msgid="3636764710790507868">"Тохируулах"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Видеог дуугүй болгож чадсангүй."</string>
+    <string name="video_err" msgid="7003051631792271009">"Видео тоглуулах боломжгүй."</string>
+    <string name="group_by_location" msgid="316641628989023253">"Байршлаар"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"Цагаар"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"Шошгоор"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"Хүмүүсээр"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"Альбомаар"</string>
+    <string name="group_by_size" msgid="153766174950394155">"Хэмжээгээр"</string>
+    <string name="untagged" msgid="7281481064509590402">"Шошгогүй"</string>
+    <string name="no_location" msgid="4043624857489331676">"Байршилгүй"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Сүлжээний асуудлаас шалтгаалж зарим байршил танигдсангүй."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Энэ альбомын зургуудыг татаж авч чадсангүй. Дараа дахин оролдоно уу."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Зөвхөн зураг"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Зөвхөн видео"</string>
+    <string name="show_all" msgid="6963292714584735149">"Зураг ба видео"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Зургийн Цомог"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"Зураггүй"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Тайрсан зураг <xliff:g id="FOLDER_NAME">%s</xliff:g>-д хадгалагдав."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"Альбом байхгүй"</string>
+    <string name="empty_album" msgid="4542880442593595494">"Зураг/видео байхгүй"</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Бичээс"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Оффлайнд боломжтой болгох"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Дахин ачаалах"</string>
+    <string name="done" msgid="217672440064436595">"Дуусгах"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"нийт %2$d-н %1$d :"</string>
+    <string name="title" msgid="7622928349908052569">"Гарчиг"</string>
+    <string name="description" msgid="3016729318096557520">"Тайлбар"</string>
+    <string name="time" msgid="1367953006052876956">"Цаг"</string>
+    <string name="location" msgid="3432705876921618314">"Байршил"</string>
+    <string name="path" msgid="4725740395885105824">"Зам"</string>
+    <string name="width" msgid="9215847239714321097">"Өргөн"</string>
+    <string name="height" msgid="3648885449443787772">"Өндөр"</string>
+    <string name="orientation" msgid="4958327983165245513">"Чиглэл"</string>
+    <string name="duration" msgid="8160058911218541616">"Үргэлжлэх хугацаа"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME төрөл"</string>
+    <string name="file_size" msgid="8486169301588318915">"Файлын хэмжээ"</string>
+    <string name="maker" msgid="7921835498034236197">"Хийгч"</string>
+    <string name="model" msgid="8240207064064337366">"Загвар"</string>
+    <string name="flash" msgid="2816779031261147723">"Гэрэл"</string>
+    <string name="aperture" msgid="5920657630303915195">"Нүх"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Фокусын зай"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Цагаан баланс"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Гаргах цаг"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"Гараар"</string>
+    <string name="auto" msgid="4296941368722892821">"Автомат"</string>
+    <string name="flash_on" msgid="7891556231891837284">"Гэрэл ассан"</string>
+    <string name="flash_off" msgid="1445443413822680010">"Гэрэлгүй"</string>
+    <string name="unknown" msgid="3506693015896912952">"Тодорхойгүй"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Эх хувь"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Хуучны"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Гэрэлтүүлэх"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Цайралт"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Цэнхэр"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"B/W"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Шаргал"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X процесс"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Латте"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Өнгөгүй"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Альбомыг оффлайнаар ашигладаг болгож байна."</item>
+    <item quantity="other" msgid="4948604338155959389">"Альбомыг оффлайнаар харах боломжтой болгож байна."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Локалд хадгалагдсан ба оффлайнаар харах боломжтой."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"Бүх альбом"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Локал альбом"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP төхөөрөмж"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Пикаса альбом"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> чөлөөтэй"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g>-с доош"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> дээш"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g>-с <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"Импортлох"</string>
+    <string name="import_complete" msgid="3875040287486199999">"Импорт дууслаа"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Импорт амжилтгүй"</string>
+    <string name="camera_connected" msgid="916021826223448591">"Камер холбоотой."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Камер холбогдоогүй"</string>
+    <string name="click_import" msgid="6407959065464291972">"Импортлох бол энд хүрнэ үү"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Альбом сонгох"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Бүх зургийг холих"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Зураг сонгоно уу"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Зураг сонгох"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Слайд харуулах"</string>
+    <string name="albums" msgid="7320787705180057947">"Альбом"</string>
+    <string name="times" msgid="2023033894889499219">"Давтамж"</string>
+    <string name="locations" msgid="6649297994083130305">"Байршил"</string>
+    <string name="people" msgid="4114003823747292747">"Хүмүүс"</string>
+    <string name="tags" msgid="5539648765482935955">"Шошго"</string>
+    <string name="group_by" msgid="4308299657902209357">"Груплэх"</string>
+    <string name="settings" msgid="1534847740615665736">"Тохиргоо"</string>
+    <string name="add_account" msgid="4271217504968243974">"Акаунт нэмэх"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Камер"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Татаж авах"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Онлайн зассан зураг"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"Импортолсон"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Агшин дэлгэц"</string>
+    <string name="help" msgid="7368960711153618354">"Тусламж"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"Сангүй"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"Гадаад сан байхгүй"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Зургийн хальсаар харах"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Хүснэгтээр харах"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Бүтэн дэлгэцээр үзэх"</string>
+    <string name="trimming" msgid="9122385768369143997">"Тайрч байна"</string>
+    <string name="muting" msgid="5094925919589915324">"Дуугүй"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Түр хүлээнэ үү ..."</string>
+    <string name="save_into" msgid="9155488424829609229">"Видеог <xliff:g id="ALBUM_NAME">%1$s</xliff:g>-д хадгалж байна …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Тайрах боломжгүй : Видео хэт богино байна"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Панорама зурж байна"</string>
+    <string name="save" msgid="613976532235060516">"Хадгалах"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Контентыг скан хийж байна..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d скан хийгдэв"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d скан хийгдэв"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d файл скан хийгдсэн"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Эрэмбэлж байна..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Скан хийж дууслаа."</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Импортлож байна..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"Энэ төхөөрөмжрүү импортлох контент байхгүй байна."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"MTP төхөөрөмж холбогдоогүй байна"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Камерын алдаа"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Камертай холбогдож чадсангүй."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Аюулгүйн үүднээс камерыг идэвхгүй болгосон."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Камер"</string>
+    <string name="wait" msgid="8600187532323801552">"Түр хүлээнэ үү ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Камер ашиглахын өмнө USB сан залгана уу."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Камер ашиглахын өмнө SD карт хийнэ үү."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB сан бэлдэж байна…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD карт бэлдэж байна…"</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB санд хандаж чадсангүй."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD картад хандаж чадсангүй."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"Цуцлах"</string>
+    <string name="review_ok" msgid="1156261588693116433">"Дуусгах"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Цагийн урсгал бичигдэж байна"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Камер сонгох"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d секунд"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Цаг тоолж байхад дохио дуугарах"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Идэвхгүй"</string>
+    <string name="setting_on" msgid="8602246224465348901">"Идэвхтэй"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Видео чанар"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Сайн"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Муу"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Цагийн урсгал"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Камерын тохиргоо"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Камерын тохиргоо"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Зургийн хэмжээ"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M пиксел (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M пиксел"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Фокус горим"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Автомат"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Хязгааргүй"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Макро"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"Автомат"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"ХЯЗГААРГҮЙ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"МАКРО"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Гэрлийн горим"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"ГЭРЛИЙН ГОРИМ"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Автомат"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Идэвхтэй"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Идэвхгүй"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"ГЭРЭЛ АВТОМАТ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"ГЭРЭЛТЭЙ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ГЭРЭЛ ИДЭВХГҮЙ"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Цагаан баланс"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"ЦАГААН БАЛАНС"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Автомат"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Гэрэлтэй"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Нарны гэрэл"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Өдрийн гэрэл"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Үүлэрхэг"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"Автомат"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ГЭРЭЛТЭЙ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ӨДРИЙН ГЭРЭЛ"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ӨДРИЙНГЭРЭЛ"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ҮҮЛТЭЙ"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Тохируулсан горим"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Автомат"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Үйлдлүүд"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Таны USB сан зайгүй болсон байна. Зарим зураг болон файлын чанарын тохиргоог өөрчлөх юмуу устгана уу."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Таны USB сан зайгүй болсон байна. Зарим зураг болон файлын чанарын тохиргоог өөрчлөх юмуу устгана уу."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Хэмжээний хязгаар хүрэв."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Хэт хурдан"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Панорама бэлдэж байна"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Панорама хадгалагдсангүй."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Панорамаг авч байна"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Өмнөх панорамаг хүлээж байна"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Хадгалж байна..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Панорамаг зурж байна"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Фокуслах бол хүрнэ үү."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Эффект"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Байхгүй"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Шахалт"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Том нүд"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Том ам"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Жижиг ам"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Том хамар"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Жижиг нүд"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Огторгуй"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Нар шингэх"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Таны видео"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Төхөөрөмжийг доош харуулна\nТүр харахаас гарна уу"</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Бичиж байх үед хүрч зураг авах боломжтой."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"Видео бичиж эхлэв."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"Видео бичих зогсов."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Тусгай эффект хийгдсэн үед видео агшин зураг боломжгүй."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Эффектийг арилгах"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"ИНЭЭДМИЙН ЦАРАЙ"</string>
+    <string name="effect_background" msgid="6579360207378171022">"АРЫН"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Хаах товч"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Цэсний товч"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Хамгийн сүүлийн зураг"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Урд болон арын камер солих"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Камер, видео болон панорама сонгогч"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Илүү олон тохиргооны контрол"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Тохиргооын контролыг хаах"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Өсгөх контрол"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Багасгах %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Өсгөх %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s сонгох нүд"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Зурагруу солих"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Видеоруу солих"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Панорамаруу солих"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Панорамаруу солих"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Дахин фокуслах руу сэлгэх"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Цуцлах"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Зураг авав"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Зураг авах"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Видео тоглуулах"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Видеог түр зогсоох"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Видеог дахин ачааллах"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Видео тоглуулагчийн цаг хавтан"</string>
+    <string name="capital_on" msgid="5491353494964003567">"Идэвхижсэн"</string>
+    <string name="capital_off" msgid="7231052688467970897">"Идэвхгүй"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Зогсоох"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 секунд"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 минут"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 цаг"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 цаг"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"секунд"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"минут"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"цаг"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Дуусгах"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Хугацааны интервал тохируулах"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Цагын урсгал идэвхгүй. Цагийн интервалыг тохируулах бол идэвхтэй болгоно уу."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Цаг тоологч идэвхгүй. Зураг авахын өмнө цаг тоологчийг идэвхтэй болгоно уу."</string>
+    <string name="set_duration" msgid="5578035312407161304">"Үргэлжлэх хугацааг секундээр тохируулах"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Зураг авахаар цаг тоолж байна"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Зургийн байршлыг санаж байна уу?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Өөрийн зураг болон видеог авсан газрын байршлаар нь шошго өгнө үү.\n\nБусад апп-с энэ мэдээлэл болон хадгалагдсан зурагт хандах боломжтой."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"Үгүй"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Тийм"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Камер"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Хайх"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Зураг"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Альбом"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"НЭМЭЛТ СОНГОЛТ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ТОХИРГОО"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d зураг"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d зураг"</item>
+  </plurals>
+</resources>
diff --git a/res/values-ms-rMY/filtershow_strings.xml b/res/values-ms-rMY/filtershow_strings.xml
new file mode 100644
index 0000000..4d7464b
--- /dev/null
+++ b/res/values-ms-rMY/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor Foto"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Tidak dapat memuatkan imej!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Tidak boleh mengedit yang asal"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Menetapkan kertas dinding"</string>
+    <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="custom_border" msgid="8679893731790931871">"Peribadi"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Buat asal"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Buat semula"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Tunjukkan Kesan Digunakan"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Sembunyikan Kesan Digunakan"</string>
+    <string name="export_image" msgid="3202835713172222134">"Eksport"</string>
+    <string name="print_image" msgid="1942989216591621413">"Cetak"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Eksport Imej Terpepat"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Imej yang dieksport akan menjadi salinan, tanpa sejarah."</string>
+    <string name="quality" msgid="179292110309050529">"Kualiti"</string>
+    <string name="size" msgid="4639404642236356037">"Saiz"</string>
+    <string name="x" msgid="6810256999024563662">"x"</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>
+    <string name="save_and_exit" msgid="3628425023766687419">"Simpan dan Keluar"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Memproses imej resolusi penuh..."</string>
+    <string name="exit" msgid="242642957038770113">"Keluar"</string>
+    <string name="history" msgid="455767361472692409">"Sejarah"</string>
+    <string name="reset" msgid="9013181350779592937">"Tetapkan semula"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Kesan Digunakan"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Bandingkan"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Gunakan"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Tetapkan semula"</string>
+    <string name="aspect" msgid="4025244950820813059">"Aspek"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Tiada"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Dibetulkan"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Planet Kecil"</string>
+    <string name="exposure" msgid="6526397045949374905">"Dedahan"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Ketajaman"</string>
+    <string name="contrast" msgid="2310908487756769019">"Kontras"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Kecerahan"</string>
+    <string name="saturation" msgid="7026791551032438585">"Ketepuan"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"Penapis H &amp; P"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Autowarna"</string>
+    <string name="hue" msgid="6231252147971086030">"Rona"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Bayang-bayang"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Serlahan"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Lengkung"</string>
+    <string name="vignette" msgid="934721068851885390">"Vignet"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignet"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Dedahan"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Ketepuan"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontras"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Falloff"</string>
+    <string name="redeye" msgid="4508883127049472069">"Mata Merah"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Lukis"</string>
+    <string name="straighten" msgid="26025591664983528">"Luruskan"</string>
+    <string name="crop" msgid="5781263790107850771">"Pangkas"</string>
+    <string name="rotate" msgid="2796802553793795371">"Putar"</string>
+    <string name="mirror" msgid="5482518108154883096">"Cermin"</string>
+    <string name="negative" msgid="6998313764388022201">"Negatif"</string>
+    <string name="none" msgid="6633966646410296520">"Tiada"</string>
+    <string name="edge" msgid="7036064886242147551">"Pinggir"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Pmposteran"</string>
+    <string name="downsample" msgid="3552938534146980104">"Mengecil"</string>
+    <string name="grad" msgid="546774853424848655">"Bersenggat"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Kecerahan"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontras"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Ketepuan"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Utama"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Merah"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Kuning"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Hijau"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Biru kehijauan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Biru"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Gaya"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"baharu"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Merah"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Hijau"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Biru"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Gaya"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Saiz"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Rona"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Ketepuan"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Kecerahan"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Warna"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Garisan"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Penanda"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Percik"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Padam bersih"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Ketebalan"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Saiz Penjuru"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Warna"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Kosongkan"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Pilih warna peribadi"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Pilih Warna"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Pilih Saiz"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Asal"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Hasil"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Menyimpan Imej"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Memproses…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Simpan pratetapan semasa"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Urus pratetapan pengguna"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Pratetapan Baharu"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Pratetap Nama"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Maklumat"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nama Imej"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Saiz Imej"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Data EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Pratetap"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versi"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Asal"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Semasa"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Bukaan"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Jarak Fokus"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Jarak Subjek"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Tarikh diambil"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Hentian F"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Masa Dedahan"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Hak cipta"</string>
+</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..b9aeaf4
--- /dev/null
+++ b/res/values-ms-rMY/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"Galeri"</string>
+    <string name="gadget_title" msgid="259405922673466798">"Bingkai gambar"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"Pemain video"</string>
+    <string name="loading_video" msgid="4013492720121891585">"Memuatkan video..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"Memuatkan imej..."</string>
+    <string name="loading_account" msgid="928195413034552034">"Memuatkan akaun…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"Sambung semula video"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"Sambung semula proses main dari %s ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"Sambung semula proses main"</string>
+    <string name="loading" msgid="7038208555304563571">"Memuatkan..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"Tidak dapat memuatkan"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"Tidak dapat memuatkan imej"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"Tiada lakaran kenit"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"Mainkan semula dari mula"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"OK"</string>
+    <string name="ok" msgid="5296833083983263293">"OK"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"Sentuh muka untuk bermula."</string>
+    <string name="saving_image" msgid="7270334453636349407">"Menyimpan gambar..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"Menyimpan gambar ke <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="save_error" msgid="6857408774183654970">"Tidak dapat menyimpan imej yang dipangkas."</string>
+    <string name="crop_label" msgid="521114301871349328">"Pangkas gambar"</string>
+    <string name="trim_label" msgid="274203231381209979">"Potong video"</string>
+    <string name="select_image" msgid="7841406150484742140">"Pilih foto"</string>
+    <string name="select_video" msgid="4859510992798615076">"Pilih video"</string>
+    <string name="select_item" msgid="2816923896202086390">"Pilih item"</string>
+    <string name="select_album" msgid="1557063764849434077">"Pilih album"</string>
+    <string name="select_group" msgid="6744208543323307114">"Pilih kumpulan"</string>
+    <string name="set_image" msgid="2331476809308010401">"Tetapkan gambar sebagai"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"Tetapkan kertas dinding"</string>
+    <string name="wallpaper" msgid="140165383777262070">"Menetapkan kertas dinding…"</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"Kertas dinding"</string>
+    <string name="delete" msgid="2839695998251824487">"Padam"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"Padam item yang dipilih?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Padam item yang dipilih?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"Sahkan"</string>
+    <string name="cancel" msgid="3637516880917356226">"Batal"</string>
+    <string name="share" msgid="3619042788254195341">"Kongsi"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"Kongsi panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Kongsikan sebagai foto"</string>
+    <string name="deleted" msgid="6795433049119073871">"Dipadamkan"</string>
+    <string name="undo" msgid="2930873956446586313">"BUAT ASAL"</string>
+    <string name="select_all" msgid="3403283025220282175">"Pilih semua"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"Nyahpilih semua"</string>
+    <string name="slideshow" msgid="4355906903247112975">"Tayangan slaid"</string>
+    <string name="details" msgid="8415120088556445230">"Butiran"</string>
+    <string name="details_title" msgid="2611396603977441273">"%1$d dari %2$d item:"</string>
+    <string name="close" msgid="5585646033158453043">"Tutup"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"Bertukar kepada kamera"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d dipilih"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d dipilih"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d dipilih"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d dipilih"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d dipilih"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d dipilih"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d dipilih"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d dipilih"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d dipilih"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"Tunjukkan pada peta"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"Putar ke kiri"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"Putar ke kanan"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"Tidak dapat mencari item."</string>
+    <string name="edit" msgid="1502273844748580847">"Edit"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Edit Ringkas"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Memproses permintaan cache"</string>
+    <string name="caching_label" msgid="4521059045896269095">"Mengcache..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"Pangkas"</string>
+    <string name="trim_action" msgid="703098114452883524">"Pangkas"</string>
+    <string name="mute_action" msgid="5296241754753306251">"Redam"</string>
+    <string name="set_as" msgid="3636764710790507868">"Tetapkan sebagai"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"Tidak dapat meredam video."</string>
+    <string name="video_err" msgid="7003051631792271009">"Tidak boleh memainkan video."</string>
+    <string name="group_by_location" msgid="316641628989023253">"Mengikut lokasi"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"Mengikut masa"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"Mengikut teg"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"Mengikut orang"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"Mengikut album"</string>
+    <string name="group_by_size" msgid="153766174950394155">"Mengikut saiz"</string>
+    <string name="untagged" msgid="7281481064509590402">"Tidak ditanda namakan"</string>
+    <string name="no_location" msgid="4043624857489331676">"Tiada lokasi"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"Beberapa lokasi tidak dapat dikenal pasti kerana masalah rangkaian."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"Tidak dapat memuat turun foto dalam album ini. Cuba lagi nanti."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"Imej sahaja"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"Video sahaja"</string>
+    <string name="show_all" msgid="6963292714584735149">"Imej &amp; video"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"Galeri Foto"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"Tiada foto."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"Imej yang dipangkas disimpan ke <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"Tiada album tersedia."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O imej/video yang tersedia."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"Siaran"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Jadikan tersedia luar talian"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"Segar semula"</string>
+    <string name="done" msgid="217672440064436595">"Selesai"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%1$d dari %2$d item:"</string>
+    <string name="title" msgid="7622928349908052569">"Tajuk"</string>
+    <string name="description" msgid="3016729318096557520">"Perihalan"</string>
+    <string name="time" msgid="1367953006052876956">"Masa"</string>
+    <string name="location" msgid="3432705876921618314">"Lokasi"</string>
+    <string name="path" msgid="4725740395885105824">"Laluan"</string>
+    <string name="width" msgid="9215847239714321097">"Lebar"</string>
+    <string name="height" msgid="3648885449443787772">"Tinggi"</string>
+    <string name="orientation" msgid="4958327983165245513">"Orientasi"</string>
+    <string name="duration" msgid="8160058911218541616">"Tempoh"</string>
+    <string name="mimetype" msgid="8024168704337990470">"Jenis MIME"</string>
+    <string name="file_size" msgid="8486169301588318915">"Saiz fail"</string>
+    <string name="maker" msgid="7921835498034236197">"Pembuat"</string>
+    <string name="model" msgid="8240207064064337366">"Model"</string>
+    <string name="flash" msgid="2816779031261147723">"Flash"</string>
+    <string name="aperture" msgid="5920657630303915195">"Bukaan"</string>
+    <string name="focal_length" msgid="1291383769749877010">"Jarak Fokus"</string>
+    <string name="white_balance" msgid="1582509289994216078">"Imbangan putih"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"Masa dedahan"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"Manual"</string>
+    <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>
+    <string name="unknown" msgid="3506693015896912952">"Tak diketahui"</string>
+    <string name="ffx_original" msgid="372686331501281474">"Asli"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"Vintaj"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Semerta"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Peluntur"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"Biru"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"H &amp; P"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"Proses X"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"Litho"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"Menjadikan album tersedia di luar talian."</item>
+    <item quantity="other" msgid="4948604338155959389">"Menjadikan album tersedia di luar talian."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Item ini disimpan pada peranti dan tersedia di luar talian."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"Semua album"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"Album setempat"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"Peranti MTP"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Album Picasa"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> percuma"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> atau kurang"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> atau kurang"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> hingga <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"Import"</string>
+    <string name="import_complete" msgid="3875040287486199999">"Import selesai"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Import tidak berjaya"</string>
+    <string name="camera_connected" msgid="916021826223448591">"Kamera disambungkan."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Kamera diputuskan sambungan."</string>
+    <string name="click_import" msgid="6407959065464291972">"Sentuh di sini untuk mengimport"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"Pilih album"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"Rombak semua imej"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"Pilih imej"</string>
+    <string name="widget_type" msgid="1364653978966343448">"Pilih imej"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"Tayangan slaid"</string>
+    <string name="albums" msgid="7320787705180057947">"Album"</string>
+    <string name="times" msgid="2023033894889499219">"Masa"</string>
+    <string name="locations" msgid="6649297994083130305">"Lokasi"</string>
+    <string name="people" msgid="4114003823747292747">"Orang"</string>
+    <string name="tags" msgid="5539648765482935955">"Tanda nama"</string>
+    <string name="group_by" msgid="4308299657902209357">"Kumpulkan mengikut"</string>
+    <string name="settings" msgid="1534847740615665736">"Tetapan"</string>
+    <string name="add_account" msgid="4271217504968243974">"Tambah akaun"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"Kamera"</string>
+    <string name="folder_download" msgid="7186215137642323932">"Muat Turun"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"Foto Dalam Talian yang Diedit"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"Diimport"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Tangkapan skrin"</string>
+    <string name="help" msgid="7368960711153618354">"Bantuan"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"Tiada Storan"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"Tiada storan luar tersedia"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Pandangan jalur filem"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"Paparan grid"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"Pandangan skrin penuh"</string>
+    <string name="trimming" msgid="9122385768369143997">"Mencantas"</string>
+    <string name="muting" msgid="5094925919589915324">"Meredam"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Sila tunggu"</string>
+    <string name="save_into" msgid="9155488424829609229">"Menyimpan video ke <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Tidak boleh mencantas: video sasaran terlalu pendek"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"Menghasilkan panorama"</string>
+    <string name="save" msgid="613976532235060516">"Simpan"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"Mengimbas kandungan..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d item diimbas"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d item diimbas"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d item diimbas"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"Mengisih..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"Pengimbasan selesai"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"Mengimport..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"Tiada kandungan tersedia untuk diimport pada peranti ini."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"Tiada peranti MTP disambungkan"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Ralat kamera"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Tidak boleh menyambung kepada kamera."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Kamera telah dilumpuhkan kerana dasar keselamatan."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
+    <string name="wait" msgid="8600187532323801552">"Sila tunggu..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Lekapkan storan USB sebelum menggunakan kamera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Masukkan kad SD sebelum menggunakan kamera."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Menyediakan storan USB..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"Menyediakan kad SD..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Tidak dapat mengakses storan USB."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Tidak dapat mengakses kad SD."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"BATAL"</string>
+    <string name="review_ok" msgid="1156261588693116433">"SELESAI"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Rakaman selang masa"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"Pilih kamera"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d saat"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip kira detik"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Matikan"</string>
+    <string name="setting_on" msgid="8602246224465348901">"Hidupkan"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Kualiti video"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Tinggi"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Rendah"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Sela masa"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Tetapan kamera"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Tetapan kamkorder"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Saiz gambar"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M piksel"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"Piksel 8M"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M piksel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M piksel"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M piksel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M piksel"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mod fokus"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infiniti"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITI"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Mod denyar"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MOD DENYAR"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Auto"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Hidup"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Mati"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTO DENYAR"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"HIDUPKAN DENYAR"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"MATIKAN DENYAR"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Imbangan putih"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"IMBANGAN PUTIH"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Auto"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Berpijar"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Siang hari"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Pendarfluor"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Mendung"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"PIJAR"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"SIANG HARI"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"PENDARFLUOR"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"MENDUNG"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Mod pemandangan"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Auto"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Aksi"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Storan USB anda kehabisan ruang. Tukar tetapan mutu atau padamkan beberapa imej atau fail lain."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Kad SD anda kehabisan ruang. Tukar tetapan mutu atau padamkan beberapa imej atau fail lain."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Had saiz dicapai."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Trlalu cepat"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Menyediakan panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Tidak dapat menyimpan panorama."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Menangkap gambar panorama"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"Menunggu panorama sebelumnya"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Menyimpan…"</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"Menghasilkan panorama"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Sentuh untuk memfokus."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Kesan"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Tiada"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Picit"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Mata besar"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Mulut besar"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Mulut kecil"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Hidung besar"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Mata kecil"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Di angkasa"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"Matahari Terbenam"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"Video anda"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Tetapkan peranti anda ke bawah.\nKeluar dari pandangan seketika."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Sentuh untuk mengambil gambar semasa merakam."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"Rakaman video telah bermula."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"Rakaman video telah berhenti."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Petikan video dilumpuhkan apabila kesan khas dihidupkan."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"Padamkan kesan"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"MUKA BODOH"</string>
+    <string name="effect_background" msgid="6579360207378171022">"LATAR BELAKANG"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Butang pengatup"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"Butang menu"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto paling terbaru"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Suis kamera depan dan belakang"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Pemilih kamera, video atau panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Lagi kawalan tetapan"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Tutup kawalan tetapan"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Kawalan zum"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Pengurangan %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Tingkatkan %1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s kotak semak"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"Tukar ke foto"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Tukar kepada video"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Tukar kepada panorama"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Beralih ke panorama baharu"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Beralih ke Fokus Semula"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"Semakan dibatalkan"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Semakan selesai"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"Semak penggambaran semula"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Mainkan video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Jeda video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Muat semula video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Bar masa pemain video"</string>
+    <string name="capital_on" msgid="5491353494964003567">"HIDUPKAN"</string>
+    <string name="capital_off" msgid="7231052688467970897">"MATIKAN"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Dimatikan"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 saat"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 minit"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 jam"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 jam"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"saat"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"minit"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"jam"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Selesai"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Tetapkan Selang Masa"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Ciri selang masa dimatikan. Hidupkannya untuk menetapkan selang masa."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Pemasa hitung detik dimatikan. Hidupkannya untuk menghitung detik sebelum mengambil gambar."</string>
+    <string name="set_duration" msgid="5578035312407161304">"Tetapkan tempoh dalam saat"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"Menghitung detik untuk mengambil gambar"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Ingat lokasi foto?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Teg foto dan video anda dengan lokasi tempat diambil.\n\nApl lain boleh mengakses maklumat ini bersama dengan imej disimpan anda."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"Tidak, terima kasih"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"Ya"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
+    <string name="menu_search" msgid="7580008232297437190">"Cari"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"Foto"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"Album"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"LAGI PILIHAN"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"TETAPAN"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d foto"</item>
+  </plurals>
+</resources>
diff --git a/res/values-ms/filtershow_strings.xml b/res/values-ms/filtershow_strings.xml
index e41024f..7b18201 100644
--- a/res/values-ms/filtershow_strings.xml
+++ b/res/values-ms/filtershow_strings.xml
@@ -21,14 +21,21 @@
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Menetapkan kertas dinding"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Tidak dapat memuat turun foto. Rangkaian tidak tersedia."</string>
     <string name="original" msgid="3524493791230430897">"Asli"</string>
+    <string name="saved" msgid="6678827180814174711">"Disimpan"</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>
-    <string name="show_history_panel" msgid="7785810372502120090">"Tunjukkan Sejarah"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Sembunyikan Sejarah"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Tunjukkan Keadaan Imej"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Sembunyikan Keadaan Imej"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Tunjukkan Kesan Digunakan"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Sembunyikan Kesan Digunakan"</string>
+    <string name="export_image" msgid="3202835713172222134">"Eksport"</string>
+    <string name="print_image" msgid="1942989216591621413">"Cetak"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Eksport Imej Terpepat"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Imej yang dieksport akan menjadi salinan, tanpa sejarah."</string>
+    <string name="quality" msgid="179292110309050529">"Kualiti"</string>
+    <string name="size" msgid="4639404642236356037">"Saiz"</string>
+    <string name="x" msgid="6810256999024563662">"x"</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>
@@ -76,14 +83,30 @@
     <string name="negative" msgid="6998313764388022201">"Negatif"</string>
     <string name="none" msgid="6633966646410296520">"Tiada"</string>
     <string name="edge" msgid="7036064886242147551">"Pinggir"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Pmposteran"</string>
     <string name="downsample" msgid="3552938534146980104">"Mengecil"</string>
+    <string name="grad" msgid="546774853424848655">"Bersenggat"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Kecerahan"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontras"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Ketepuan"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Utama"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Merah"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Kuning"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Hijau"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Biru kehijauan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Biru"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Gaya"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"baharu"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Merah"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Hijau"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Biru"</string>
     <string name="draw_style" msgid="2036125061987325389">"Gaya"</string>
     <string name="draw_size" msgid="4360005386104151209">"Saiz"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Rona"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Ketepuan"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Kecerahan"</string>
     <string name="draw_color" msgid="2119030386987211193">"Warna"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Garisan"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Penanda"</string>
@@ -93,4 +116,30 @@
     <string name="color_pick_title" msgid="6195567431995308876">"Pilih Warna"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Pilih Saiz"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Asal"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Hasil"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Menyimpan Imej"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Memproses…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Simpan pratetapan semasa"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Urus pratetapan pengguna"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Pratetapan Baharu"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Pratetap Nama"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Maklumat"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nama Imej"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Saiz Imej"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Data EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Pratetap"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versi"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Asal"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Semasa"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Bukaan"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Jarak Fokus"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Jarak Subjek"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Tarikh diambil"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Hentian F"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Masa Dedahan"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Hak cipta"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index b1ed9b3..50949df 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Putar ke kanan"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Tidak dapat mencari item."</string>
     <string name="edit" msgid="1502273844748580847">"Edit"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Edit Ringkas"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Memproses permintaan cache"</string>
     <string name="caching_label" msgid="4521059045896269095">"Mengcache..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Pangkas"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Tidak boleh menyambung kepada kamera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera telah dilumpuhkan kerana dasar keselamatan."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Kamkorder"</string>
     <string name="wait" msgid="8600187532323801552">"Sila tunggu..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Lekapkan storan USB sebelum menggunakan kamera."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Masukkan kad SD sebelum menggunakan kamera."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Tetapan kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Tetapan kamkorder"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Saiz gambar"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M piksel"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"Piksel 8M"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M piksel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M piksel"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M piksel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M piksel (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M piksel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M piksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infiniti"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITI"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Mod denyar"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MOD DENYAR"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Auto"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Hidup"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Mati"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTO DENYAR"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"HIDUPKAN DENYAR"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"MATIKAN DENYAR"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Imbangan putih"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"IMBANGAN PUTIH"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Auto"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Berpijar"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Siang hari"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Pendarfluor"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Mendung"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"PIJAR"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"SIANG HARI"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"PENDARFLUOR"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"MENDUNG"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Mod pemandangan"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Storan USB anda kehabisan ruang. Tukar tetapan mutu atau padamkan beberapa imej atau fail lain."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Kad SD anda kehabisan ruang. Tukar tetapan mutu atau padamkan beberapa imej atau fail lain."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Di angkasa"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Matahari Terbenam"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Video anda"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Tetapkan peranti anda ke bawah."\n"Keluar dari pandangan seketika."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Tetapkan peranti anda ke bawah.\nKeluar dari pandangan seketika."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Sentuh untuk mengambil gambar semasa merakam."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Rakaman video telah bermula."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Rakaman video telah berhenti."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Tukar kepada video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Tukar kepada panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Beralih ke panorama baharu"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Beralih ke Fokus Semula"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Semakan dibatalkan"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Semakan selesai"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Semak penggambaran semula"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Mainkan video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Jeda video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Muat semula video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Bar masa pemain video"</string>
     <string name="capital_on" msgid="5491353494964003567">"HIDUPKAN"</string>
     <string name="capital_off" msgid="7231052688467970897">"MATIKAN"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Dimatikan"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Tetapkan tempoh dalam saat"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Menghitung detik untuk mengambil gambar"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Ingat lokasi foto?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Teg foto dan video anda dengan lokasi tempat diambil."\n\n"Apl lain boleh mengakses maklumat ini bersama dengan imej disimpan anda."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Teg foto dan video anda dengan lokasi tempat diambil.\n\nApl lain boleh mengakses maklumat ini bersama dengan imej disimpan anda."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Tidak, terima kasih"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ya"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Cari"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Foto"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Album"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"LAGI PILIHAN"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"TETAPAN"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d foto"</item>
diff --git a/res/values-nb/filtershow_strings.xml b/res/values-nb/filtershow_strings.xml
index 82af248..564361b 100644
--- a/res/values-nb/filtershow_strings.xml
+++ b/res/values-nb/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Bilderedigerer"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Kan ikke laste inn bildet."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Kan ikke redigere originalen"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Angir bakgrunn …"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Kunne ikke laste ned bildet. Nettverket er utilgjengelig."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Kantlinjer"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Spesialtilpasset"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Angre"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Gjør om"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Vis loggen"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Skjul loggen"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Vis bildetilstanden"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Skjul bildetilstanden"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Vis brukte effekter"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Skjul brukte effekter"</string>
+    <string name="export_image" msgid="3202835713172222134">"Eksporter"</string>
+    <string name="print_image" msgid="1942989216591621413">"Skriv ut"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Eksporter flatt bilde"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Det eksporterte bildet blir en kopi, uten loggen."</string>
+    <string name="quality" msgid="179292110309050529">"Kvalitet"</string>
+    <string name="size" msgid="4639404642236356037">"Størrelse"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Innstillinger"</string>
     <string name="unsaved" msgid="8704442449002374375">"Det er ulagrede endringer i dette bildet."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Vil du lagre før du avslutter?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Lagre og avslutt"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Behandler bilde i full oppløsning ..."</string>
     <string name="exit" msgid="242642957038770113">"Avslutt"</string>
     <string name="history" msgid="455767361472692409">"Logg"</string>
     <string name="reset" msgid="9013181350779592937">"Tilbakestill"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Lyse punkter"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Kurver"</string>
     <string name="vignette" msgid="934721068851885390">"Vignettering"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignett"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Eksponering"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Fargemetning"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Falloff"</string>
     <string name="redeye" msgid="4508883127049472069">"Røde øyne"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Tegn"</string>
     <string name="straighten" msgid="26025591664983528">"Rett opp"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativ"</string>
     <string name="none" msgid="6633966646410296520">"Ingen"</string>
     <string name="edge" msgid="7036064886242147551">"Rammer"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Plakat"</string>
     <string name="downsample" msgid="3552938534146980104">"Forminske"</string>
+    <string name="grad" msgid="546774853424848655">"Gradert"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Lysstyrke"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Fargemetning"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Hovedkontroll"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rød"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Gul"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Grønn"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blå"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nytt"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rød"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Grønn"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Blå"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
     <string name="draw_size" msgid="4360005386104151209">"Størrelse"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Fargetone"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Fargemetning"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Lysstyrke"</string>
     <string name="draw_color" msgid="2119030386987211193">"Farge"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linjer"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Merkepenn"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Drypp"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Fjern"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Tykkelse"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Hjørnestr."</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Farge"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Fjern"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Velg egendefinert farge"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Velg farge"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Velg størrelse"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Lagrer bilde …"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Behandler …"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Lagre forhåndsinnstillinger"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Admin. forhåndsinnstillinger"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Ny forhåndsinnstilling"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Forhåndsinnstilt navn"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informasjon"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Bildenavn"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Bildestørrelse"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-data"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Forhåndsinnstilling"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versjon"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Gjeldende"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modell"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Blender"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Brennvidde"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Motivavstand"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Fotograferingsdato"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F-stopp"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Eksponeringstid"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Opphavsrett"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9543f8a..d3f4de8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Roter mot høyre"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Finner ikke elementet."</string>
     <string name="edit" msgid="1502273844748580847">"Rediger"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Enkel redigering"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Behandler forespørsler om bufring"</string>
     <string name="caching_label" msgid="4521059045896269095">"Henter …"</string>
     <string name="crop_action" msgid="3427470284074377001">"Beskjær"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Kan ikke koble til kameraet."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kameraet har blitt deaktivert på grunn av retningslinjer for sikkerhet."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Video"</string>
     <string name="wait" msgid="8600187532323801552">"Vent litt…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Sett inn en USB-lagring før du bruker kameraet."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Sett inn et SD-kort før du bruker kameraet."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Bakside"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Forside"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Lagre sted i bilder"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"POSISJON"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Nedtellingstidtaker"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for pref_camera_timer_entry:other (6455381617076792481) -->
@@ -249,10 +250,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamerainnstillinger"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videoinnstillinger"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildestørrelse"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 M piksler"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapiksler"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapiksler"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M piksler"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapiksler"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapiksler"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M piksler (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapiksler"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -261,16 +265,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Autofokus"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Uendelig"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"UENDELIG"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Blitzmodus"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"BLITSMODUS"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatisk"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"På"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Av"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMATISK BLITS"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BLITS PÅ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"BLITS AV"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Hvitbalanse"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"HVITBALANSE"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatisk"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Flamme"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Dagslys"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Lysstoffrør"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Overskyet"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"HVITGLØDENDE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DAGSLYS"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCERENDE"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"OVERSKYET"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Velg scenemodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatisk"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -278,10 +295,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Natt"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fest"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"INGEN"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"HANDLING"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NATT"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"SOLNEDGANG"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FEST"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"NEDTELLINGSTIDTAKER"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"NEDTELLINGSTIDTAKEREN ER AV"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUND"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDER"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUNDER"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUNDER"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Kan ikke velges i scenemodus."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EKSPONERING"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"FRONTKAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"BAKRE KAMERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB-lagringsplass er snart oppbrukt. Endre kvalitetsinnstillingene, eller slett bilder eller andre filer."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Lagringsplassen på SD-kortet er snart oppbrukt. Endre kvalitetsinnstillingene, eller slett bilder eller andre filer."</string>
@@ -306,7 +338,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Verdensrommet"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgang"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Din video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Sett enheten ned."\n"Gå ut av syne et øyeblikk."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Sett enheten ned.\nGå ut av syne et øyeblikk."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Trykk for å ta et bilde mens du filmer."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Videoopptaket har startet."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Videoopptaket har stoppet."</string>
@@ -329,9 +361,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Bytt til video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Bytt til panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Bytt til ny panoramamodus"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Bytt til nytt fokus"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Avbryt redigering"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Redigering fullført"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Ta nytt bilde/video"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Spill av videoen"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Sett videoen på pause"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Last inn videoen på nytt"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Tidsrad for videoavspilleren"</string>
     <string name="capital_on" msgid="5491353494964003567">"PÅ"</string>
     <string name="capital_off" msgid="7231052688467970897">"AV"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Av"</string>
@@ -384,13 +421,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Still varighet i sekunder"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Teller ned før bildet tas"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Vil du huske bildestedene?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Merk bildene og videoene med hvor de ble tatt."\n\n"Andre apper kan bruke denne informasjonen med de lagrede bildene dine."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Merk bildene og videoene med hvor de ble tatt.\n\nAndre apper kan bruke denne informasjonen med de lagrede bildene dine."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nei takk"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ja"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Søk"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Bilder"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumer"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"FLERE ALTERNATIVER"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"INNSTILLINGER"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d bilde"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d bilder"</item>
diff --git a/res/values-ne-rNP/filtershow_strings.xml b/res/values-ne-rNP/filtershow_strings.xml
new file mode 100644
index 0000000..4085ce6
--- /dev/null
+++ b/res/values-ne-rNP/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"फोटो सम्पादक"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"तस्बिर लोड गर्न सकेन!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"मूल सम्पादन गर्न सक्दैन"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"सेटिङ वालपेपर"</string>
+    <string name="download_failure" msgid="5923323939788582895">"फोटो डाउनलोड गर्न सकेन। नेटवर्क उपलब्ध छैन।"</string>
+    <string name="original" msgid="3524493791230430897">"मूल"</string>
+    <string name="saved" msgid="6678827180814174711">"सुरक्षित गरियो"</string>
+    <string name="borders" msgid="2067345080568684614">"किनाराहरू"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"अन्डु गर्नुहोस्"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"पुनःगर्नुहोस्"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"एप्लाइड प्रभावहरू देखाउनुहोस्"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"एप्लाइड प्रभाव लुकाउनुहोस्"</string>
+    <string name="export_image" msgid="3202835713172222134">"निर्यात गर्नुहोस्"</string>
+    <string name="print_image" msgid="1942989216591621413">"प्रिन्ट गर्नुहोस्"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"सिधा गरिएको चित्र निर्यात गर्नुहोस्"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"निर्यात गरिएको चित्र इतिहास बिना प्रतिलिपि हुने छ।"</string>
+    <string name="quality" msgid="179292110309050529">"गुण"</string>
+    <string name="size" msgid="4639404642236356037">"आकार"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"सेटिङहरू"</string>
+    <string name="unsaved" msgid="8704442449002374375">"यो तस्बिरमा बचत नगरिएका परिवर्तनहरू छन्।"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"के तपाईँ निस्कनुभन्दा पहिले बचत गर्न चाहनु हुन्छ?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"बचत गरेर निस्कनुहोस्"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"पूर्ण रिजोलुसन चित्र प्रसोधन गर्दै"</string>
+    <string name="exit" msgid="242642957038770113">"निकास"</string>
+    <string name="history" msgid="455767361472692409">"इतिहास"</string>
+    <string name="reset" msgid="9013181350779592937">"पुनःसेट गर्नुहोस्"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"एप्लाइड प्रभावहरू"</string>
+    <string name="compare_original" msgid="8140838959007796977">"तुलना"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"लागू गर्नुहोस्"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"पुनःसेट गर्नुहोस्"</string>
+    <string name="aspect" msgid="4025244950820813059">"पक्ष"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"१:१"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"४:३"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"३:४"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"४:६"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"५:७"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"७:५"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"१६:९"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"कुनै पनि होइन"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"निश्चित"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"सानो ग्रह"</string>
+    <string name="exposure" msgid="6526397045949374905">"एक्सपोजर"</string>
+    <string name="sharpness" msgid="6463103068318055412">"तिखोपन"</string>
+    <string name="contrast" msgid="2310908487756769019">"अन्तर"</string>
+    <string name="vibrance" msgid="3326744578577835915">"भाइब्रेन्स"</string>
+    <string name="saturation" msgid="7026791551032438585">"सन्तृप्ति"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"BW फिल्टर"</string>
+    <string name="wbalance" msgid="6346581563387083613">"स्वतःरङ्ग"</string>
+    <string name="hue" msgid="6231252147971086030">"रङ्ग"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"छायाँहरू"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"हाइलाइटहरू"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"कर्भहरू"</string>
+    <string name="vignette" msgid="934721068851885390">"भिग्नेट"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"भिग्नेट"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"एक्स्पोजर"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"सेचुरेसन"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"भिन्नता"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"फलअफ्"</string>
+    <string name="redeye" msgid="4508883127049472069">"रातो आँखो"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"चित्र बनाउनुहोस्"</string>
+    <string name="straighten" msgid="26025591664983528">"सीधा गर्नुहोस्"</string>
+    <string name="crop" msgid="5781263790107850771">"क्रप गर्नुहोस्"</string>
+    <string name="rotate" msgid="2796802553793795371">"घुमाउनुहोस्"</string>
+    <string name="mirror" msgid="5482518108154883096">"ऐना"</string>
+    <string name="negative" msgid="6998313764388022201">"नकारात्मक"</string>
+    <string name="none" msgid="6633966646410296520">"कुनै पनि होइन"</string>
+    <string name="edge" msgid="7036064886242147551">"किनाराहरू"</string>
+    <string name="kmeans" msgid="2080952022674981541">"पोस्टेराइज गर्नुहोस्"</string>
+    <string name="downsample" msgid="3552938534146980104">"डाउनस्याम्पल"</string>
+    <string name="grad" msgid="546774853424848655">"Graduated"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"चमक"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"कन्ट्रास्ट"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"संतृप्तता"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"मुख्य"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"रातो"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"पहेँलो"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"हरियो"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"सायन"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"नीलो"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"म्याजेन्टा"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"शैली"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"नयाँ"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"रातो"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"हरियो"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"नीलो"</string>
+    <string name="draw_style" msgid="2036125061987325389">"शैली"</string>
+    <string name="draw_size" msgid="4360005386104151209">"आकार"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"रङ्ग"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"संतृप्तता"</string>
+    <string name="draw_value" msgid="6571604055161538273">"चमक"</string>
+    <string name="draw_color" msgid="2119030386987211193">"रङ्ग"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"पंक्तिहरू"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"चिन्हक"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"स्प्याटर"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"हटाउनुहोस्"</string>
+    <string name="color_border_size" msgid="8745307483517793073">"मोटाइ"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"कुना आकार"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"रङ"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"हटाउनुहोस्"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"कस्टम रङ्ग छान्नुहोस्"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"रङ्ग छान्नुहोस्"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"साइज चयन गर्नुहोस्"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"ठिक छ"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"मूल"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"चित्र सुरक्षित गर्दै"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"प्रसोधन गरिँदै ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान पूर्वसेट सुरक्षित गर्नुहोस्"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"प्रयोगकर्ता पूर्वसेटहरू प्रबन्ध गर्नुहोस्"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"नयाँ पूर्वसेट"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"पूर्वसेट नाम"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"सूचना"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"चित्र नाम"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"चित्र आकार"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"हिस्टोग्राम"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF डेटा"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"पूर्वसेट"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"संस्करण"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"मूल"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"वर्तमान"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"मोडेल"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"प्वाल"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"फोकल लम्बाइ:"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Subject Distance"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"मिति लिइयो"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"खु्ला गरिएको समय"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"प्रतिलिपि अधिकार"</string>
+</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
new file mode 100644
index 0000000..f1e06ae
--- /dev/null
+++ b/res/values-ne-rNP/strings.xml
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"ग्यालेरी"</string>
+    <string name="gadget_title" msgid="259405922673466798">"तस्बिर - फ्रेम"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"भिडियो प्लेयर"</string>
+    <string name="loading_video" msgid="4013492720121891585">"वीडियो लोड हुँदै ..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"तस्बिर लोड हुँदैछ..."</string>
+    <string name="loading_account" msgid="928195413034552034">"खाता लोड हुँदै ..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"भिडियो पुनःसुरु गर्नुहोस्"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"%s बाट खेल पुनःसुरु गर्ने?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"चलाउन जारी राख्नुहोस्"</string>
+    <string name="loading" msgid="7038208555304563571">"लोड हुँदै..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"लोड गर्न सकेन"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"तस्बिर लोड गर्न सकेन"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"कुनै थम्बनेल छैन"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"सुरु गर्नुहोस्"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"ठिक छ"</string>
+    <string name="ok" msgid="5296833083983263293">"ठिक छ"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"सुरु गर्नका लागि एउटा अनुहार छुनुहोस्।"</string>
+    <string name="saving_image" msgid="7270334453636349407">"तस्बिर बचत गरिँदै..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"<xliff:g id="ALBUM_NAME">%1$s</xliff:g> मा तस्बिर बचत गर्दै ..."</string>
+    <string name="save_error" msgid="6857408774183654970">"क्रप गरिएको तस्बिर बचत गर्न सकेन ।"</string>
+    <string name="crop_label" msgid="521114301871349328">"तस्बिर काट्नुहोस्"</string>
+    <string name="trim_label" msgid="274203231381209979">"भिडियो छाँट्नुहोस्"</string>
+    <string name="select_image" msgid="7841406150484742140">"तस्बिर छान्नुहोस्"</string>
+    <string name="select_video" msgid="4859510992798615076">"भिडियो छान्नुहोस्"</string>
+    <string name="select_item" msgid="2816923896202086390">"वस्तु छान्नुहोस्"</string>
+    <string name="select_album" msgid="1557063764849434077">"एल्बम चयन गर्नुहोस्"</string>
+    <string name="select_group" msgid="6744208543323307114">"समूह छान्नुहोस्"</string>
+    <string name="set_image" msgid="2331476809308010401">"को रूपमा तस्बिरलाई मिलाउनुहोस्"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"वलपेपर मिलाउनुहोस्"</string>
+    <string name="wallpaper" msgid="140165383777262070">"वालपेपर जडान गरिँदै..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"वालपेपर"</string>
+    <string name="delete" msgid="2839695998251824487">"मेट्नुहोस्"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"चयन गरिएकालाई हटाउने हो?"</item>
+    <item quantity="other" msgid="5874316486520635333">"छानिएका आइटमहरू हटाउने हो ?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"निश्चित गर्नुहोस्"</string>
+    <string name="cancel" msgid="3637516880917356226">"रद्द गर्नुहोस्"</string>
+    <string name="share" msgid="3619042788254195341">"साझेदारी गर्नुहोस्"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"दृश्य साझेदारी गर्नुहोस्"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"तस्बिरको रूपमा साझेदारी गर्नुहोस्"</string>
+    <string name="deleted" msgid="6795433049119073871">"मेटाइयो"</string>
+    <string name="undo" msgid="2930873956446586313">"रद्द गर्नुहोस्"</string>
+    <string name="select_all" msgid="3403283025220282175">"सबैलाई चयन गर्नुहोस्"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"सबै अचयन गर्नुहोस्"</string>
+    <string name="slideshow" msgid="4355906903247112975">"स्लाइड प्रदर्शन"</string>
+    <string name="details" msgid="8415120088556445230">"विवरणहरू"</string>
+    <!-- format error in translation for details_title (2611396603977441273) -->
+    <string name="close" msgid="5585646033158453043">"बन्द गर्नुहोस्"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"क्यामेरामा स्विच गर्नुहोस्"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_items_selected:zero (2142579311530586258) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_items_selected:one (2478365152745637768) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_albums_selected:one (6184377003099987825) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_groups_selected:zero (3466388370310869238) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_groups_selected:other (3512041363942842738) -->
+    <string name="show_on_map" msgid="6157544221201750980">"नक्सामा देखाउनुहोस्"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"बायाँ घुमाउनुहोस्"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"दायाँ घुमाउनुहोस्"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"आइटम पाइएन।"</string>
+    <string name="edit" msgid="1502273844748580847">"सम्पादन गर्नुहोस्"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"सरल सम्पादन"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"केसिङ अनुरोधहरूलाई प्रशोधन गरिँदै"</string>
+    <string name="caching_label" msgid="4521059045896269095">"क्यासिङ ..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"कोतर्नुहोस्"</string>
+    <string name="trim_action" msgid="703098114452883524">"छाँट्नुहोस्"</string>
+    <string name="mute_action" msgid="5296241754753306251">"आवाज बन्द गर्नुहोस्"</string>
+    <string name="set_as" msgid="3636764710790507868">"को रूपमा सेट गर्नुहोस्"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"भिडियोको आवाज बन्द गर्न सकेन"</string>
+    <string name="video_err" msgid="7003051631792271009">"भिडियो चलाउन सकेन।"</string>
+    <string name="group_by_location" msgid="316641628989023253">"स्थानबाट"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"समयद्वारा"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"ट्यागबाट"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"मानिसहरूद्वारा"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"एल्बमद्वारा"</string>
+    <string name="group_by_size" msgid="153766174950394155">"आकारले"</string>
+    <string name="untagged" msgid="7281481064509590402">"ट्याग नगरिएको"</string>
+    <string name="no_location" msgid="4043624857489331676">"कुनै स्थान छैन"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"नेटवर्क समस्याका कारण केही स्थानहरू पहिचान गर्न सकिएन।"</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"यो एल्बममा भएका फोटाहरू डाउनलोड गर्न सकेन। पछि पुनः प्रयास गर्नुहोस।"</string>
+    <string name="show_images_only" msgid="7263218480867672653">"तस्बिरहरू मात्र"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"भिडियो मात्र"</string>
+    <string name="show_all" msgid="6963292714584735149">"तस्बिरहरू र भिडियोहरू"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"फोटो ग्यालरी"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"तस्बिरहरू छैन।"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"काटिएको तस्बिरहरुलाई <xliff:g id="FOLDER_NAME">%s</xliff:g>मा बचत गरिएको छ।"</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"कुनै एल्बमहरू उपलब्ध छैनन्।"</string>
+    <string name="empty_album" msgid="4542880442593595494">"O तस्बिरहरू/भिडियोहरू उपलब्ध छन।"</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"डाकहरू"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"अफलाइन उपलब्ध गराउनुहोस्"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"ताजकिकरण गर्नुहोस्"</string>
+    <string name="done" msgid="217672440064436595">"भयो"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%2$d मध्ये %1$d वस्तुहरू:"</string>
+    <string name="title" msgid="7622928349908052569">"शीर्षक"</string>
+    <string name="description" msgid="3016729318096557520">"वर्णन"</string>
+    <string name="time" msgid="1367953006052876956">"समय"</string>
+    <string name="location" msgid="3432705876921618314">"स्थान"</string>
+    <string name="path" msgid="4725740395885105824">"बाटो"</string>
+    <string name="width" msgid="9215847239714321097">"चौडाइ"</string>
+    <string name="height" msgid="3648885449443787772">"उचाइ"</string>
+    <string name="orientation" msgid="4958327983165245513">"अभिविन्यास"</string>
+    <string name="duration" msgid="8160058911218541616">"अवधि:"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME प्रकार"</string>
+    <string name="file_size" msgid="8486169301588318915">"फाइल आकार:"</string>
+    <string name="maker" msgid="7921835498034236197">"निर्माता"</string>
+    <string name="model" msgid="8240207064064337366">"मोडेल"</string>
+    <string name="flash" msgid="2816779031261147723">"फ्ल्यास"</string>
+    <string name="aperture" msgid="5920657630303915195">"प्वाल:"</string>
+    <string name="focal_length" msgid="1291383769749877010">"फोकल लम्बाइ:"</string>
+    <string name="white_balance" msgid="1582509289994216078">"श्वेत सन्तुलन"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"एक्सपोजर समय"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"मिलिमिटर"</string>
+    <string name="manual" msgid="6608905477477607865">"हातैले"</string>
+    <string name="auto" msgid="4296941368722892821">"स्वतः"</string>
+    <string name="flash_on" msgid="7891556231891837284">"फ्ल्यास चलाइयो"</string>
+    <string name="flash_off" msgid="1445443413822680010">"फ्ल्यास छैन"</string>
+    <string name="unknown" msgid="3506693015896912952">"अज्ञात"</string>
+    <string name="ffx_original" msgid="372686331501281474">"मूल"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"भिन्टेज"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"तत्काल"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"सफा गर्नुहोस्"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"नीलो"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"B/W"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"मुक्का"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"x प्रक्रिया"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"लाट्टे"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"लिथो"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"एल्बम बनाउनलाई अफलाइन उपलब्ध छ।"</item>
+    <item quantity="other" msgid="4948604338155959389">"एल्बमहरू अफलाइन उपलब्ध गराइँदैं"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"यो वस्तु स्थानिय रूपमा भन्डारण गरिएको छ र अफलाइन उपलब्ध छ।"</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"सबै एल्बमहरू"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"स्थानीय एल्बमहरू"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP उपकरणहरू"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"पिकासा एल्बमहरू"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> निःशुल्क"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> वा कम"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> वा माथि"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> देखि <xliff:g id="MAX_SIZE">%2$s</xliff:g> सम्म"</string>
+    <string name="Import" msgid="3985447518557474672">"आयात गर्नुहोस्"</string>
+    <string name="import_complete" msgid="3875040287486199999">"आयात पुरा भयो"</string>
+    <string name="import_fail" msgid="8497942380703298808">"आयात असफल"</string>
+    <string name="camera_connected" msgid="916021826223448591">"क्यामेरासँग जोडियो।"</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"क्यामेरालाई अलग गरियो।"</string>
+    <string name="click_import" msgid="6407959065464291972">"आयात गर्नका लागि यहाँ स्पर्श गर्नुहोस्"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"एउटा एल्बम छान्नुहोस्"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"सबै तस्बिरहरू मिसाउनुहोस्"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"एउटा एल्बम छान्नुहोस्"</string>
+    <string name="widget_type" msgid="1364653978966343448">"तस्बिरहरू छान्नुहोस्"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"स्लाइड प्रदर्शन"</string>
+    <string name="albums" msgid="7320787705180057947">"एल्बमहरू"</string>
+    <string name="times" msgid="2023033894889499219">"पटक"</string>
+    <string name="locations" msgid="6649297994083130305">"स्थानहरू"</string>
+    <string name="people" msgid="4114003823747292747">"मानिसहरू"</string>
+    <string name="tags" msgid="5539648765482935955">"ट्यागहरू"</string>
+    <string name="group_by" msgid="4308299657902209357">"द्वारा समूह"</string>
+    <string name="settings" msgid="1534847740615665736">"सेटिङहरू"</string>
+    <string name="add_account" msgid="4271217504968243974">"खाता थप्नुहोस्"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"क्यामेरा"</string>
+    <string name="folder_download" msgid="7186215137642323932">"डाउनलोड"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"सम्पादित अनलाइन तस्बिरहरू"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"आयातित"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"स्क्रिनसट"</string>
+    <string name="help" msgid="7368960711153618354">"मद्दत"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"कुनै भण्डारण छैन"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"बाहिरी भन्डारण उपलब्ध छैन"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"फिल्मस्ट्राइप हेर्नुहोस्"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ग्रिड दृश्य"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"पूरा स्क्रिन दृश्य"</string>
+    <string name="trimming" msgid="9122385768369143997">"छाँटिँदै"</string>
+    <string name="muting" msgid="5094925919589915324">"म्युट गरिँदै"</string>
+    <string name="please_wait" msgid="7296066089146487366">"कृपया प्रतीक्षा गर्नुहोस् ..."</string>
+    <string name="save_into" msgid="9155488424829609229">"<xliff:g id="ALBUM_NAME">%1$s</xliff:g> मा भिडियो बचत गर्दै ..."</string>
+    <string name="trim_too_short" msgid="751593965620665326">"छाँट्न सकिँदैन: लक्ष्य भिडियो एकदम छोटो छ"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"दृश्य प्रतिपादन"</string>
+    <string name="save" msgid="613976532235060516">"बचत गर्नुहोस्"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"सामग्री स्क्यान हुदै..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d वस्तुहरू स्कयान गरिएका"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d वस्तु स्कयान गरिएको"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d आइटमहरू स्क्यान गरियो"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"क्रमबद्ध गर्दै..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"स्क्यान गरियो"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"आयात गर्दै..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"यो उपकरणमा आयात गर्नका लागि केही सामाग्री उपलब्ध छैन।"</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"कुनै MTP उपकरण जोडिएको छैन"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"क्यामेरा त्रुटि"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"क्यामेरासँग जडान गर्न सकेन"</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"सुरक्षा नीतिका कारण क्यामरा निष्क्रिय गरिएको छ।"</string>
+    <string name="camera_label" msgid="6346560772074764302">"क्यामेरा"</string>
+    <string name="wait" msgid="8600187532323801552">"कृपया प्रतीक्षा गर्नुहोस्..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"क्यामरा प्रयोग गर्नुभन्दा पहिले USB भण्डारण माउन्ट गर्नुहोस्।"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"क्यामेराको उपयोग गर्नु अघि SD कार्ड भित्र राख्नुहोस्।"</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB भन्डारण तैयार गरिँदै..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD कार्ड तैयार गरिँदै..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB भण्डारण प्रयोग गर्न सकेन।"</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD कार्ड प्रयोग गर्न सकेन।"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"रद्द गर्नुहोस्"</string>
+    <string name="review_ok" msgid="1156261588693116433">"भयो"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"समय गल्ती रिकर्डिङ"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"क्यामेरा चयन गर्नुहोस्"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d सेकन्ड"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"उल्टा गर्ने क्रममा बिप"</string>
+    <string name="setting_off" msgid="4480039384202951946">"बन्द"</string>
+    <string name="setting_on" msgid="8602246224465348901">"खुला"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"भिडियो गुणस्तर"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"उच्च"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"कम"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"समय गल्ती"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"क्यामरा सेटिङहरू"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"क्यामकोडर सेटिङहरू"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"चित्र आकार"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M पिक्सल"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"३ मेगा पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"२ मेगा पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M पिक्सेल (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"१ मेगा पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"फोकस मोड"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"स्वत:"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"अनन्तता"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"बृहद्"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"स्वत:"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"अनन्तता"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"बृहद्"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"फ्ल्यास मोड"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"फल्यास मोड"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"स्वत:"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"चालु"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"बन्द"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"फ्ल्यास अटो"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"फ्ल्यास खुला"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"फ्ल्यास बन्द"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"ह्वाइटब्यालेन्स"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"स्वेत सन्तुलन"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"स्वतः"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"चम्कने"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"दिनको प्रकाश"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"फ्लोरेसेन्ट"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"बादलु"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"स्वत:"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"चम्कने"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"दिनको प्रकाश"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"फ्लोरेसेन्ट"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"बादलु"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"दृश्य मोड"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"स्वत:"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"कार्य"</string>
+    <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>
+    <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>
+    <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">"३ सेकेन्ड"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"१० सेकेन्ड"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"१५ सेकेन्ड"</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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"तपाईँको USB भण्डारणको स्पेस सकिँदै छ। गुणस्तर सेटिङ परिवर्तन गर्नुहोस् अथवा केही तस्बिर वा अरू नै कुनै फाइलहरू मेट्नुहोस्।"</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"तपाईँको SD कार्डको स्पेस सकिँदै छ। गुणस्तर सेटिङ परिवर्तन गर्नुहोस् अथवा केही तस्बिर वा अरू नै केही मेट्नुहोस्।"</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"आकार सीमा पुग्यो।"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"अति छिटो"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"दृश्य तैयार गरिँदै"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"दृश्य बचत गर्न सकेन।"</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"दृश्य"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"दृश्य खिच्दै"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"अघिल्लो दृश्यको प्रतिक्षा गर्दै।"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"बचत गर्दै...."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"दृश्य प्रतिपादन"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"फोकस गर्न छुनुहोस्।"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"प्रभावहरू"</string>
+    <string name="effect_none" msgid="3601545724573307541">"कुनै पनि होइन"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"निचोर्नुहोस्"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ठूला आँखा"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"ठूलो मुख"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"सानो मुख"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"ठूलो नाक"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"साना आँखाहरू"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"अन्तरिक्षमा"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"सूर्यास्त"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"तपाईँको भिडियो"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"तपाईँको उपकरणलाई सेट गर्नुहोस्। \n एक छिनको लागि दृश्यबाट बाहिर निस्कनुहोस्।"</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"खिचिरहेको बेला तस्बिर लिनको लागि छुनुहोस्।"</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"भिडियो खिच्न सुरु भएको छ।"</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"भिडियो खिच्न रोकिएको छ।"</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"विशेष प्रभावहरू सक्षम भएको बेला भिडीयो स्न्यापसट असक्षम गरिएको हुन्छ।"</string>
+    <string name="clear_effects" msgid="5485339175014139481">"स्पष्ट प्रभावहरू"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"मूर्ख अनुहारहरू"</string>
+    <string name="effect_background" msgid="6579360207378171022">"पृष्ठभूमि"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"सटर बटन"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"मेनु बटन"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"सबभन्दा नयाँ तस्बिर"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"अगाडि र पछाडि क्यामरा स्विच"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"क्यामेरा, भिडियो वा दृश्य चयनकर्ता"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"अधिक सेटिङ नियन्त्रणहरू"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"सेटिङ नियन्त्रणहरू बन्द गर्नुहोस्"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"जुम नियन्त्रण"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s घटाउनुहोस्"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s बढाउनुहोस्"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for accessibility_check_box (7317447218256584181) -->
+    <skip />
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"फोटामा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"भिडियोमा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"दृश्यमा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"नयाँ दृश्यमा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"पुनः केन्द्रितमा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"समीक्षा रद्द गर्नुहोस्"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"समीक्षा गरियो"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"समीक्षा पुनः लिनुहोस्"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"भिडियो चलाउनुहोस्"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"भिडियो रोक्नुहोस्"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"भिडियो पुनः लोड गर्नुहोस्"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"भिडियो प्लेयर समय पट्टी"</string>
+    <string name="capital_on" msgid="5491353494964003567">"चालु"</string>
+    <string name="capital_off" msgid="7231052688467970897">"बन्द गर्नुहोस्"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"बन्द गर्नुहोस्"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"०.५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"१ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"१.५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"२ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"२.५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"३ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"४ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"६ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"१० सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"१२ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"१५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"२४ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"१ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"१.५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"१२ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"२.५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"३ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"४ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"६ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"१० मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"१२ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"१५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"२४ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"०.५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"१ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"१.५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"२ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"२.५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"३ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"४ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"६ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"१० घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"१२ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"१५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"२४ घन्टा"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"सेकेन्ड"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"मिनेट"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"घन्टा"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"भयो"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"समय मध्यान्तर सेट गर्नुहोस्"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"समय चूक सुविधा बन्द छ। समय मध्यान्तर मिलाउन खोल्नुहोस्।"</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"उल्टो गन्ने घडी बन्द छ। फोटो लिनु अगाडि गन्न खोल्नुहोस्।"</string>
+    <string name="set_duration" msgid="5578035312407161304">"सेकेन्डमा अवधि निर्धारित गर्नुहोस्"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"एउटा तस्बिर लिनका लागि उल्टा गन्दै"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"फोटो स्थानहरू याद गर्नुहोस?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"जहाँ लिइएको हो त्यस ठाँउका साथ आफ्ना फोटा र भिडियोहरू ट्याग गर्नुहोस्। \n \n तपाईँले बचत  गरेको तस्बिरहरूका साथै अरू अनुप्रयोगहरूले यी जानकारीहरू उपयोग गर्न सक्छन्।"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"धन्यावाद पर्दैन"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"हो"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"क्यामेरा"</string>
+    <string name="menu_search" msgid="7580008232297437190">"खोज्नुहोस्"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"तस्बिरहरू"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"एल्बमहरू"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"अरू विकल्पहरू"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"सेटिङहरू"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d तस्बिर"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d तस्बिरहरू"</item>
+  </plurals>
+</resources>
diff --git a/res/values-ne/filtershow_strings.xml b/res/values-ne/filtershow_strings.xml
new file mode 100644
index 0000000..5a85d8e
--- /dev/null
+++ b/res/values-ne/filtershow_strings.xml
@@ -0,0 +1,145 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"फोटो सम्पादक"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"तस्बिर लोड गर्न सकेन!"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"सेटिङ वालपेपर"</string>
+    <string name="download_failure" msgid="5923323939788582895">"फोटो डाउनलोड गर्न सकेन। नेटवर्क उपलब्ध छैन।"</string>
+    <string name="original" msgid="3524493791230430897">"मूल"</string>
+    <string name="saved" msgid="6678827180814174711">"सुरक्षित गरियो"</string>
+    <string name="borders" msgid="2067345080568684614">"किनाराहरू"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"अन्डु गर्नुहोस्"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"पुनःगर्नुहोस्"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"एप्लाइड प्रभावहरू देखाउनुहोस्"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"एप्लाइड प्रभाव लुकाउनुहोस्"</string>
+    <string name="export_image" msgid="3202835713172222134">"निर्यात गर्नुहोस्"</string>
+    <string name="print_image" msgid="1942989216591621413">"प्रिन्ट गर्नुहोस्"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"सिधा गरिएको चित्र निर्यात गर्नुहोस्"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"निर्यात गरिएको चित्र इतिहास बिना प्रतिलिपि हुने छ।"</string>
+    <string name="quality" msgid="179292110309050529">"गुण"</string>
+    <string name="size" msgid="4639404642236356037">"आकार"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"सेटिङहरू"</string>
+    <string name="unsaved" msgid="8704442449002374375">"यो तस्बिरमा बचत नगरिएका परिवर्तनहरू छन्।"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"के तपाईँ निस्कनुभन्दा पहिले बचत गर्न चाहनु हुन्छ?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"बचत गरेर निस्कनुहोस्"</string>
+    <string name="exit" msgid="242642957038770113">"निकास"</string>
+    <string name="history" msgid="455767361472692409">"इतिहास"</string>
+    <string name="reset" msgid="9013181350779592937">"पुनःसेट गर्नुहोस्"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"एप्लाइड प्रभावहरू"</string>
+    <string name="compare_original" msgid="8140838959007796977">"तुलना"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"लागू गर्नुहोस्"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"पुनःसेट गर्नुहोस्"</string>
+    <string name="aspect" msgid="4025244950820813059">"पक्ष"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"१:१"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"४:३"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"३:४"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"४:६"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"५:७"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"७:५"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"१६:९"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"कुनै पनि होइन"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"निश्चित"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"सानो ग्रह"</string>
+    <string name="exposure" msgid="6526397045949374905">"एक्सपोजर"</string>
+    <string name="sharpness" msgid="6463103068318055412">"तिखोपन"</string>
+    <string name="contrast" msgid="2310908487756769019">"अन्तर"</string>
+    <string name="vibrance" msgid="3326744578577835915">"भाइब्रेन्स"</string>
+    <string name="saturation" msgid="7026791551032438585">"सन्तृप्ति"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"BW फिल्टर"</string>
+    <string name="wbalance" msgid="6346581563387083613">"स्वतःरङ्ग"</string>
+    <string name="hue" msgid="6231252147971086030">"रङ्ग"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"छायाँहरू"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"हाइलाइटहरू"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"कर्भहरू"</string>
+    <string name="vignette" msgid="934721068851885390">"भिग्नेट"</string>
+    <string name="redeye" msgid="4508883127049472069">"रातो आँखो"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"चित्र बनाउनुहोस्"</string>
+    <string name="straighten" msgid="26025591664983528">"सीधा गर्नुहोस्"</string>
+    <string name="crop" msgid="5781263790107850771">"क्रप गर्नुहोस्"</string>
+    <string name="rotate" msgid="2796802553793795371">"घुमाउनुहोस्"</string>
+    <string name="mirror" msgid="5482518108154883096">"ऐना"</string>
+    <string name="negative" msgid="6998313764388022201">"नकारात्मक"</string>
+    <string name="none" msgid="6633966646410296520">"कुनै पनि होइन"</string>
+    <string name="edge" msgid="7036064886242147551">"किनाराहरू"</string>
+    <string name="kmeans" msgid="2080952022674981541">"पोस्टेराइज गर्नुहोस्"</string>
+    <string name="downsample" msgid="3552938534146980104">"डाउनस्याम्पल"</string>
+    <string name="grad" msgid="546774853424848655">"Graduated"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"चमक"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"कन्ट्रास्ट"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"संतृप्तता"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"मुख्य"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"रातो"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"पहेँलो"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"हरियो"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"सायन"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"नीलो"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"म्याजेन्टा"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"शैली"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"नयाँ"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"रातो"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"हरियो"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"नीलो"</string>
+    <string name="draw_style" msgid="2036125061987325389">"शैली"</string>
+    <string name="draw_size" msgid="4360005386104151209">"आकार"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"रङ्ग"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"संतृप्तता"</string>
+    <string name="draw_value" msgid="6571604055161538273">"चमक"</string>
+    <string name="draw_color" msgid="2119030386987211193">"रङ्ग"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"पंक्तिहरू"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"चिन्हक"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"स्प्याटर"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"हटाउनुहोस्"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"कस्टम रङ्ग छान्नुहोस्"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"रङ्ग छान्नुहोस्"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"साइज चयन गर्नुहोस्"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"ठिक छ"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"मूल"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"चित्र सुरक्षित गर्दै"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"प्रसोधन गरिँदै ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान पूर्वसेट सुरक्षित गर्नुहोस्"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"प्रयोगकर्ता पूर्वसेटहरू प्रबन्ध गर्नुहोस्"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"नयाँ पूर्वसेट"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"पूर्वसेट नाम"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"सूचना"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"चित्र नाम"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"चित्र आकार"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"हिस्टोग्राम"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF डेटा"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"पूर्वसेट"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"संस्करण"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"मूल"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"वर्तमान"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"मोडेल"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"प्वाल"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"फोकल लम्बाइ:"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Subject Distance"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"मिति लिइयो"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"खु्ला गरिएको समय"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"प्रतिलिपि अधिकार"</string>
+</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
new file mode 100644
index 0000000..f1e06ae
--- /dev/null
+++ b/res/values-ne/strings.xml
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"ग्यालेरी"</string>
+    <string name="gadget_title" msgid="259405922673466798">"तस्बिर - फ्रेम"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"भिडियो प्लेयर"</string>
+    <string name="loading_video" msgid="4013492720121891585">"वीडियो लोड हुँदै ..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"तस्बिर लोड हुँदैछ..."</string>
+    <string name="loading_account" msgid="928195413034552034">"खाता लोड हुँदै ..."</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"भिडियो पुनःसुरु गर्नुहोस्"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"%s बाट खेल पुनःसुरु गर्ने?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"चलाउन जारी राख्नुहोस्"</string>
+    <string name="loading" msgid="7038208555304563571">"लोड हुँदै..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"लोड गर्न सकेन"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"तस्बिर लोड गर्न सकेन"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"कुनै थम्बनेल छैन"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"सुरु गर्नुहोस्"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"ठिक छ"</string>
+    <string name="ok" msgid="5296833083983263293">"ठिक छ"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"सुरु गर्नका लागि एउटा अनुहार छुनुहोस्।"</string>
+    <string name="saving_image" msgid="7270334453636349407">"तस्बिर बचत गरिँदै..."</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"<xliff:g id="ALBUM_NAME">%1$s</xliff:g> मा तस्बिर बचत गर्दै ..."</string>
+    <string name="save_error" msgid="6857408774183654970">"क्रप गरिएको तस्बिर बचत गर्न सकेन ।"</string>
+    <string name="crop_label" msgid="521114301871349328">"तस्बिर काट्नुहोस्"</string>
+    <string name="trim_label" msgid="274203231381209979">"भिडियो छाँट्नुहोस्"</string>
+    <string name="select_image" msgid="7841406150484742140">"तस्बिर छान्नुहोस्"</string>
+    <string name="select_video" msgid="4859510992798615076">"भिडियो छान्नुहोस्"</string>
+    <string name="select_item" msgid="2816923896202086390">"वस्तु छान्नुहोस्"</string>
+    <string name="select_album" msgid="1557063764849434077">"एल्बम चयन गर्नुहोस्"</string>
+    <string name="select_group" msgid="6744208543323307114">"समूह छान्नुहोस्"</string>
+    <string name="set_image" msgid="2331476809308010401">"को रूपमा तस्बिरलाई मिलाउनुहोस्"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"वलपेपर मिलाउनुहोस्"</string>
+    <string name="wallpaper" msgid="140165383777262070">"वालपेपर जडान गरिँदै..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"वालपेपर"</string>
+    <string name="delete" msgid="2839695998251824487">"मेट्नुहोस्"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"चयन गरिएकालाई हटाउने हो?"</item>
+    <item quantity="other" msgid="5874316486520635333">"छानिएका आइटमहरू हटाउने हो ?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"निश्चित गर्नुहोस्"</string>
+    <string name="cancel" msgid="3637516880917356226">"रद्द गर्नुहोस्"</string>
+    <string name="share" msgid="3619042788254195341">"साझेदारी गर्नुहोस्"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"दृश्य साझेदारी गर्नुहोस्"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"तस्बिरको रूपमा साझेदारी गर्नुहोस्"</string>
+    <string name="deleted" msgid="6795433049119073871">"मेटाइयो"</string>
+    <string name="undo" msgid="2930873956446586313">"रद्द गर्नुहोस्"</string>
+    <string name="select_all" msgid="3403283025220282175">"सबैलाई चयन गर्नुहोस्"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"सबै अचयन गर्नुहोस्"</string>
+    <string name="slideshow" msgid="4355906903247112975">"स्लाइड प्रदर्शन"</string>
+    <string name="details" msgid="8415120088556445230">"विवरणहरू"</string>
+    <!-- format error in translation for details_title (2611396603977441273) -->
+    <string name="close" msgid="5585646033158453043">"बन्द गर्नुहोस्"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"क्यामेरामा स्विच गर्नुहोस्"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_items_selected:zero (2142579311530586258) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_items_selected:one (2478365152745637768) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_albums_selected:one (6184377003099987825) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_groups_selected:zero (3466388370310869238) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for number_of_groups_selected:other (3512041363942842738) -->
+    <string name="show_on_map" msgid="6157544221201750980">"नक्सामा देखाउनुहोस्"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"बायाँ घुमाउनुहोस्"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"दायाँ घुमाउनुहोस्"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"आइटम पाइएन।"</string>
+    <string name="edit" msgid="1502273844748580847">"सम्पादन गर्नुहोस्"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"सरल सम्पादन"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"केसिङ अनुरोधहरूलाई प्रशोधन गरिँदै"</string>
+    <string name="caching_label" msgid="4521059045896269095">"क्यासिङ ..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"कोतर्नुहोस्"</string>
+    <string name="trim_action" msgid="703098114452883524">"छाँट्नुहोस्"</string>
+    <string name="mute_action" msgid="5296241754753306251">"आवाज बन्द गर्नुहोस्"</string>
+    <string name="set_as" msgid="3636764710790507868">"को रूपमा सेट गर्नुहोस्"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"भिडियोको आवाज बन्द गर्न सकेन"</string>
+    <string name="video_err" msgid="7003051631792271009">"भिडियो चलाउन सकेन।"</string>
+    <string name="group_by_location" msgid="316641628989023253">"स्थानबाट"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"समयद्वारा"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"ट्यागबाट"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"मानिसहरूद्वारा"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"एल्बमद्वारा"</string>
+    <string name="group_by_size" msgid="153766174950394155">"आकारले"</string>
+    <string name="untagged" msgid="7281481064509590402">"ट्याग नगरिएको"</string>
+    <string name="no_location" msgid="4043624857489331676">"कुनै स्थान छैन"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"नेटवर्क समस्याका कारण केही स्थानहरू पहिचान गर्न सकिएन।"</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"यो एल्बममा भएका फोटाहरू डाउनलोड गर्न सकेन। पछि पुनः प्रयास गर्नुहोस।"</string>
+    <string name="show_images_only" msgid="7263218480867672653">"तस्बिरहरू मात्र"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"भिडियो मात्र"</string>
+    <string name="show_all" msgid="6963292714584735149">"तस्बिरहरू र भिडियोहरू"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"फोटो ग्यालरी"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"तस्बिरहरू छैन।"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"काटिएको तस्बिरहरुलाई <xliff:g id="FOLDER_NAME">%s</xliff:g>मा बचत गरिएको छ।"</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"कुनै एल्बमहरू उपलब्ध छैनन्।"</string>
+    <string name="empty_album" msgid="4542880442593595494">"O तस्बिरहरू/भिडियोहरू उपलब्ध छन।"</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"डाकहरू"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"अफलाइन उपलब्ध गराउनुहोस्"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"ताजकिकरण गर्नुहोस्"</string>
+    <string name="done" msgid="217672440064436595">"भयो"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%2$d मध्ये %1$d वस्तुहरू:"</string>
+    <string name="title" msgid="7622928349908052569">"शीर्षक"</string>
+    <string name="description" msgid="3016729318096557520">"वर्णन"</string>
+    <string name="time" msgid="1367953006052876956">"समय"</string>
+    <string name="location" msgid="3432705876921618314">"स्थान"</string>
+    <string name="path" msgid="4725740395885105824">"बाटो"</string>
+    <string name="width" msgid="9215847239714321097">"चौडाइ"</string>
+    <string name="height" msgid="3648885449443787772">"उचाइ"</string>
+    <string name="orientation" msgid="4958327983165245513">"अभिविन्यास"</string>
+    <string name="duration" msgid="8160058911218541616">"अवधि:"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME प्रकार"</string>
+    <string name="file_size" msgid="8486169301588318915">"फाइल आकार:"</string>
+    <string name="maker" msgid="7921835498034236197">"निर्माता"</string>
+    <string name="model" msgid="8240207064064337366">"मोडेल"</string>
+    <string name="flash" msgid="2816779031261147723">"फ्ल्यास"</string>
+    <string name="aperture" msgid="5920657630303915195">"प्वाल:"</string>
+    <string name="focal_length" msgid="1291383769749877010">"फोकल लम्बाइ:"</string>
+    <string name="white_balance" msgid="1582509289994216078">"श्वेत सन्तुलन"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"एक्सपोजर समय"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"मिलिमिटर"</string>
+    <string name="manual" msgid="6608905477477607865">"हातैले"</string>
+    <string name="auto" msgid="4296941368722892821">"स्वतः"</string>
+    <string name="flash_on" msgid="7891556231891837284">"फ्ल्यास चलाइयो"</string>
+    <string name="flash_off" msgid="1445443413822680010">"फ्ल्यास छैन"</string>
+    <string name="unknown" msgid="3506693015896912952">"अज्ञात"</string>
+    <string name="ffx_original" msgid="372686331501281474">"मूल"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"भिन्टेज"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"तत्काल"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"सफा गर्नुहोस्"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"नीलो"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"B/W"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"मुक्का"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"x प्रक्रिया"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"लाट्टे"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"लिथो"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"एल्बम बनाउनलाई अफलाइन उपलब्ध छ।"</item>
+    <item quantity="other" msgid="4948604338155959389">"एल्बमहरू अफलाइन उपलब्ध गराइँदैं"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"यो वस्तु स्थानिय रूपमा भन्डारण गरिएको छ र अफलाइन उपलब्ध छ।"</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"सबै एल्बमहरू"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"स्थानीय एल्बमहरू"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP उपकरणहरू"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"पिकासा एल्बमहरू"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> निःशुल्क"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> वा कम"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> वा माथि"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> देखि <xliff:g id="MAX_SIZE">%2$s</xliff:g> सम्म"</string>
+    <string name="Import" msgid="3985447518557474672">"आयात गर्नुहोस्"</string>
+    <string name="import_complete" msgid="3875040287486199999">"आयात पुरा भयो"</string>
+    <string name="import_fail" msgid="8497942380703298808">"आयात असफल"</string>
+    <string name="camera_connected" msgid="916021826223448591">"क्यामेरासँग जोडियो।"</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"क्यामेरालाई अलग गरियो।"</string>
+    <string name="click_import" msgid="6407959065464291972">"आयात गर्नका लागि यहाँ स्पर्श गर्नुहोस्"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"एउटा एल्बम छान्नुहोस्"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"सबै तस्बिरहरू मिसाउनुहोस्"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"एउटा एल्बम छान्नुहोस्"</string>
+    <string name="widget_type" msgid="1364653978966343448">"तस्बिरहरू छान्नुहोस्"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"स्लाइड प्रदर्शन"</string>
+    <string name="albums" msgid="7320787705180057947">"एल्बमहरू"</string>
+    <string name="times" msgid="2023033894889499219">"पटक"</string>
+    <string name="locations" msgid="6649297994083130305">"स्थानहरू"</string>
+    <string name="people" msgid="4114003823747292747">"मानिसहरू"</string>
+    <string name="tags" msgid="5539648765482935955">"ट्यागहरू"</string>
+    <string name="group_by" msgid="4308299657902209357">"द्वारा समूह"</string>
+    <string name="settings" msgid="1534847740615665736">"सेटिङहरू"</string>
+    <string name="add_account" msgid="4271217504968243974">"खाता थप्नुहोस्"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"क्यामेरा"</string>
+    <string name="folder_download" msgid="7186215137642323932">"डाउनलोड"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"सम्पादित अनलाइन तस्बिरहरू"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"आयातित"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"स्क्रिनसट"</string>
+    <string name="help" msgid="7368960711153618354">"मद्दत"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"कुनै भण्डारण छैन"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"बाहिरी भन्डारण उपलब्ध छैन"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"फिल्मस्ट्राइप हेर्नुहोस्"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ग्रिड दृश्य"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"पूरा स्क्रिन दृश्य"</string>
+    <string name="trimming" msgid="9122385768369143997">"छाँटिँदै"</string>
+    <string name="muting" msgid="5094925919589915324">"म्युट गरिँदै"</string>
+    <string name="please_wait" msgid="7296066089146487366">"कृपया प्रतीक्षा गर्नुहोस् ..."</string>
+    <string name="save_into" msgid="9155488424829609229">"<xliff:g id="ALBUM_NAME">%1$s</xliff:g> मा भिडियो बचत गर्दै ..."</string>
+    <string name="trim_too_short" msgid="751593965620665326">"छाँट्न सकिँदैन: लक्ष्य भिडियो एकदम छोटो छ"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"दृश्य प्रतिपादन"</string>
+    <string name="save" msgid="613976532235060516">"बचत गर्नुहोस्"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"सामग्री स्क्यान हुदै..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d वस्तुहरू स्कयान गरिएका"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d वस्तु स्कयान गरिएको"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d आइटमहरू स्क्यान गरियो"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"क्रमबद्ध गर्दै..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"स्क्यान गरियो"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"आयात गर्दै..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"यो उपकरणमा आयात गर्नका लागि केही सामाग्री उपलब्ध छैन।"</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"कुनै MTP उपकरण जोडिएको छैन"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"क्यामेरा त्रुटि"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"क्यामेरासँग जडान गर्न सकेन"</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"सुरक्षा नीतिका कारण क्यामरा निष्क्रिय गरिएको छ।"</string>
+    <string name="camera_label" msgid="6346560772074764302">"क्यामेरा"</string>
+    <string name="wait" msgid="8600187532323801552">"कृपया प्रतीक्षा गर्नुहोस्..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"क्यामरा प्रयोग गर्नुभन्दा पहिले USB भण्डारण माउन्ट गर्नुहोस्।"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"क्यामेराको उपयोग गर्नु अघि SD कार्ड भित्र राख्नुहोस्।"</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB भन्डारण तैयार गरिँदै..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD कार्ड तैयार गरिँदै..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB भण्डारण प्रयोग गर्न सकेन।"</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD कार्ड प्रयोग गर्न सकेन।"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"रद्द गर्नुहोस्"</string>
+    <string name="review_ok" msgid="1156261588693116433">"भयो"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"समय गल्ती रिकर्डिङ"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"क्यामेरा चयन गर्नुहोस्"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d सेकन्ड"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"उल्टा गर्ने क्रममा बिप"</string>
+    <string name="setting_off" msgid="4480039384202951946">"बन्द"</string>
+    <string name="setting_on" msgid="8602246224465348901">"खुला"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"भिडियो गुणस्तर"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"उच्च"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"कम"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"समय गल्ती"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"क्यामरा सेटिङहरू"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"क्यामकोडर सेटिङहरू"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"चित्र आकार"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M पिक्सल"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"३ मेगा पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"२ मेगा पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M पिक्सेल (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"१ मेगा पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"फोकस मोड"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"स्वत:"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"अनन्तता"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"बृहद्"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"स्वत:"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"अनन्तता"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"बृहद्"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"फ्ल्यास मोड"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"फल्यास मोड"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"स्वत:"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"चालु"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"बन्द"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"फ्ल्यास अटो"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"फ्ल्यास खुला"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"फ्ल्यास बन्द"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"ह्वाइटब्यालेन्स"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"स्वेत सन्तुलन"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"स्वतः"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"चम्कने"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"दिनको प्रकाश"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"फ्लोरेसेन्ट"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"बादलु"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"स्वत:"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"चम्कने"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"दिनको प्रकाश"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"फ्लोरेसेन्ट"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"बादलु"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"दृश्य मोड"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"स्वत:"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"कार्य"</string>
+    <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>
+    <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>
+    <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">"३ सेकेन्ड"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"१० सेकेन्ड"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"१५ सेकेन्ड"</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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"तपाईँको USB भण्डारणको स्पेस सकिँदै छ। गुणस्तर सेटिङ परिवर्तन गर्नुहोस् अथवा केही तस्बिर वा अरू नै कुनै फाइलहरू मेट्नुहोस्।"</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"तपाईँको SD कार्डको स्पेस सकिँदै छ। गुणस्तर सेटिङ परिवर्तन गर्नुहोस् अथवा केही तस्बिर वा अरू नै केही मेट्नुहोस्।"</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"आकार सीमा पुग्यो।"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"अति छिटो"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"दृश्य तैयार गरिँदै"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"दृश्य बचत गर्न सकेन।"</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"दृश्य"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"दृश्य खिच्दै"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"अघिल्लो दृश्यको प्रतिक्षा गर्दै।"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"बचत गर्दै...."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"दृश्य प्रतिपादन"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"फोकस गर्न छुनुहोस्।"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"प्रभावहरू"</string>
+    <string name="effect_none" msgid="3601545724573307541">"कुनै पनि होइन"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"निचोर्नुहोस्"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ठूला आँखा"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"ठूलो मुख"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"सानो मुख"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"ठूलो नाक"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"साना आँखाहरू"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"अन्तरिक्षमा"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"सूर्यास्त"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"तपाईँको भिडियो"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"तपाईँको उपकरणलाई सेट गर्नुहोस्। \n एक छिनको लागि दृश्यबाट बाहिर निस्कनुहोस्।"</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"खिचिरहेको बेला तस्बिर लिनको लागि छुनुहोस्।"</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"भिडियो खिच्न सुरु भएको छ।"</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"भिडियो खिच्न रोकिएको छ।"</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"विशेष प्रभावहरू सक्षम भएको बेला भिडीयो स्न्यापसट असक्षम गरिएको हुन्छ।"</string>
+    <string name="clear_effects" msgid="5485339175014139481">"स्पष्ट प्रभावहरू"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"मूर्ख अनुहारहरू"</string>
+    <string name="effect_background" msgid="6579360207378171022">"पृष्ठभूमि"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"सटर बटन"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"मेनु बटन"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"सबभन्दा नयाँ तस्बिर"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"अगाडि र पछाडि क्यामरा स्विच"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"क्यामेरा, भिडियो वा दृश्य चयनकर्ता"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"अधिक सेटिङ नियन्त्रणहरू"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"सेटिङ नियन्त्रणहरू बन्द गर्नुहोस्"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"जुम नियन्त्रण"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s घटाउनुहोस्"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s बढाउनुहोस्"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for accessibility_check_box (7317447218256584181) -->
+    <skip />
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"फोटामा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"भिडियोमा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"दृश्यमा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"नयाँ दृश्यमा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"पुनः केन्द्रितमा स्विच गर्नुहोस्"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"समीक्षा रद्द गर्नुहोस्"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"समीक्षा गरियो"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"समीक्षा पुनः लिनुहोस्"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"भिडियो चलाउनुहोस्"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"भिडियो रोक्नुहोस्"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"भिडियो पुनः लोड गर्नुहोस्"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"भिडियो प्लेयर समय पट्टी"</string>
+    <string name="capital_on" msgid="5491353494964003567">"चालु"</string>
+    <string name="capital_off" msgid="7231052688467970897">"बन्द गर्नुहोस्"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"बन्द गर्नुहोस्"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"०.५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"१ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"१.५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"२ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"२.५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"३ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"४ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"६ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"१० सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"१२ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"१५ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"२४ सेकेन्ड"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"१ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"१.५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"१२ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"२.५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"३ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"४ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"६ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"१० मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"१२ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"१५ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"२४ मिनेट"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"०.५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"१ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"१.५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"२ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"२.५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"३ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"४ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"६ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"१० घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"१२ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"१५ घन्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"२४ घन्टा"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"सेकेन्ड"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"मिनेट"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"घन्टा"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"भयो"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"समय मध्यान्तर सेट गर्नुहोस्"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"समय चूक सुविधा बन्द छ। समय मध्यान्तर मिलाउन खोल्नुहोस्।"</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"उल्टो गन्ने घडी बन्द छ। फोटो लिनु अगाडि गन्न खोल्नुहोस्।"</string>
+    <string name="set_duration" msgid="5578035312407161304">"सेकेन्डमा अवधि निर्धारित गर्नुहोस्"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"एउटा तस्बिर लिनका लागि उल्टा गन्दै"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"फोटो स्थानहरू याद गर्नुहोस?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"जहाँ लिइएको हो त्यस ठाँउका साथ आफ्ना फोटा र भिडियोहरू ट्याग गर्नुहोस्। \n \n तपाईँले बचत  गरेको तस्बिरहरूका साथै अरू अनुप्रयोगहरूले यी जानकारीहरू उपयोग गर्न सक्छन्।"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"धन्यावाद पर्दैन"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"हो"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"क्यामेरा"</string>
+    <string name="menu_search" msgid="7580008232297437190">"खोज्नुहोस्"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"तस्बिरहरू"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"एल्बमहरू"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"अरू विकल्पहरू"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"सेटिङहरू"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d तस्बिर"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d तस्बिरहरू"</item>
+  </plurals>
+</resources>
diff --git a/res/values-nl/filtershow_strings.xml b/res/values-nl/filtershow_strings.xml
index 4284f25..a5ef882 100644
--- a/res/values-nl/filtershow_strings.xml
+++ b/res/values-nl/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Foto-editor"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Kan de afbeelding niet laden."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Kan origineel niet bewerken"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Achtergrond instellen"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Kan de foto niet downloaden. Het netwerk is niet beschikbaar."</string>
     <string name="original" msgid="3524493791230430897">"Origineel"</string>
     <string name="borders" msgid="2067345080568684614">"Randen"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Aangepast"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Ongedaan maken"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Opnieuw"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Geschiedenis weerg."</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Geschiedenis verb."</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Afb.status weergeven"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Afb.status verbergen"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Toegepaste effecten weergeven"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Toegepaste effecten verbergen"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exporteren"</string>
+    <string name="print_image" msgid="1942989216591621413">"Afdrukken"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Afb. als één laag exporteren"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"De geëxporteerde afbeelding is een kopie, zonder de geschiedenis."</string>
+    <string name="quality" msgid="179292110309050529">"Kwaliteit"</string>
+    <string name="size" msgid="4639404642236356037">"Grootte"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Instellingen"</string>
     <string name="unsaved" msgid="8704442449002374375">"Er zijn niet-opgeslagen wijzigingen aangebracht in deze afbeelding."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Wilt u opslaan voordat u afsluit?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Opslaan en sluiten"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Afbeelding met volledige resolutie verwerken..."</string>
     <string name="exit" msgid="242642957038770113">"Sluiten"</string>
     <string name="history" msgid="455767361472692409">"Geschiedenis"</string>
     <string name="reset" msgid="9013181350779592937">"Opnieuw instellen"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Accenten"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Curven"</string>
     <string name="vignette" msgid="934721068851885390">"Vervloeien"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vervloeien"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Belichting"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Verzadiging"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Lichtafval"</string>
     <string name="redeye" msgid="4508883127049472069">"Rode ogen"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Tekenen"</string>
     <string name="straighten" msgid="26025591664983528">"Recht maken"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatief"</string>
     <string name="none" msgid="6633966646410296520">"Geen"</string>
     <string name="edge" msgid="7036064886242147551">"Randen"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Postereffect"</string>
     <string name="downsample" msgid="3552938534146980104">"Downsample"</string>
+    <string name="grad" msgid="546774853424848655">"Gegradueerd"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Helderheid"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Verzadiging"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Algemeen"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rood"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Geel"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Groen"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyaan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blauw"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stijl"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nieuw"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rood"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Groen"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Blauw"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stijl"</string>
     <string name="draw_size" msgid="4360005386104151209">"Grootte"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Kleurtoon"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Verzadiging"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Helderheid"</string>
     <string name="draw_color" msgid="2119030386987211193">"Kleur"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Lijnen"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Markeerstift"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spetters"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Wissen"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Dikte"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Grootte hoek"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Kleur"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Wissen"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Aangepaste kleur kiezen"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Kleur selecteren"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Formaat selecteren"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Oorspronkelijk"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultaat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Afbeelding opslaan"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Verwerken..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Huidige voorinstelling opslaan"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Voorinstell. gebruiker beheren"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nieuwe voorinstelling"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Naam voorinstelling"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informatie"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Naam afbeelding"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Afbeeldingsgrootte"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-data"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Voorinstelling"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versie"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Oorspronkelijk"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Huidig"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Diafragma"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Brandpuntafstand"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Afstand tot onderwerp"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Fotodatum"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Diafragmawaarde"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Belichtingstijd"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Auteursrecht"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b9b0544..9bda359 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Rechtsom draaien"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Kan item niet vinden."</string>
     <string name="edit" msgid="1502273844748580847">"Bewerken"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Eenvoudig bewerken"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Cacheverzoeken verwerken"</string>
     <string name="caching_label" msgid="4521059045896269095">"In cache opslaan..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Bijsnijden"</string>
@@ -190,7 +191,7 @@
     <string name="folder_download" msgid="7186215137642323932">"Downloaden"</string>
     <string name="folder_edited_online_photos" msgid="6278215510236800181">"Bewerkte online foto\'s"</string>
     <string name="folder_imported" msgid="2773581395524747099">"Geïmporteerd"</string>
-    <string name="folder_screenshot" msgid="7200396565864213450">"Schermafbeelding"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Screenshot"</string>
     <string name="help" msgid="7368960711153618354">"Help"</string>
     <string name="no_external_storage_title" msgid="2408933644249734569">"Geen opslag"</string>
     <string name="no_external_storage" msgid="95726173164068417">"Geen externe opslag beschikbaar"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Kan geen verbinding maken met de camera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"De camera is uitgeschakeld vanwege het beveiligingsbeleid."</string>
     <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
     <string name="wait" msgid="8600187532323801552">"Een ogenblik geduld..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Koppel de USB-opslag voordat u de camera gebruikt."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Plaats een SD-kaart voordat u de camera gebruikt."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Achterzijde"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Voorzijde"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Locatie opslaan"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOCATIE"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Afteltimer"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 seconde"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera-instellingen"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder-instellingen"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Grootte van foto"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M pixels"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixels"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M pixels"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M pixels (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatisch"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Oneindig"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMATISCH"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"ONEINDIG"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flitsmodus"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"FLITSMODUS"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatisch"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Aan"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Uit"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLITSER AUTOMATISCH"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLITSER AAN"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLITSER UIT"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Witbalans"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"WITBALANS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatisch"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Gloeilamp"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Daglicht"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescerend"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Bewolkt"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMATISCH"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"GLOEILAMP"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DAGLICHT"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCEREND"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"BEWOLKT"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scènemodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatisch"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nacht"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zonsondergang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Feest"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"GEEN"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ACTIE"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NACHT"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ZONSONDERGANG"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FEEST"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"AFTELTIMER"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TIMER UIT"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SECONDE"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SECONDEN"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SECONDEN"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SECONDEN"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Kan niet worden geselecteerd in scènemodus."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Belichting"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"BELICHTING"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"CAMERA AAN VOORZIJDE"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"CAMERA AAN ACHTERZIJDE"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Uw USB-opslag is bijna vol. Wijzig de kwaliteitsinstelling of verwijder enkele afbeeldingen of andere bestanden."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Uw SD-kaart is bijna vol. Wijzig de kwaliteitsinstelling of verwijder enkele afbeeldingen of andere bestanden."</string>
@@ -308,8 +340,8 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"In de ruimte"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zonsondergang"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Uw video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Zet uw apparaat neer."\n"Stap even uit beeld."</string>
-    <string name="video_snapshot_hint" msgid="18833576851372483">"Raak aan om een foto te maken tijdens een opname."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Zet uw apparaat neer.\nStap even uit beeld."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Tik op het scherm en maak een foto tijdens een opname"</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Video-opname is gestart."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Video-opname is gestopt."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videosnapshot staat uit als speciale effecten zijn ingeschakeld."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Overschakelen naar video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Overschakelen naar panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Overschakelen naar nieuwe panoramamodus"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Overschakelen naar Opnieuw scherpstellen"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Beoordeling: annuleren"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Beoordeling: gereed"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Opnieuw maken na beoordeling"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Video afspelen"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Video onderbreken"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Video opnieuw laden"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Tijdbalk videospeler"</string>
     <string name="capital_on" msgid="5491353494964003567">"AAN"</string>
     <string name="capital_off" msgid="7231052688467970897">"UIT"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Uit"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Duur in seconden instellen"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Aftellen om een foto te nemen"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Fotolocaties onthouden?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Label uw foto\'s en video\'s met de locaties waar ze zijn genomen."\n\n"Andere apps hebben toegang tot deze informatie en uw opgeslagen afbeeldingen."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Label uw foto\'s en video\'s met de locaties waar ze zijn genomen.\n\nAndere apps hebben toegang tot deze informatie en uw opgeslagen afbeeldingen."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nee, bedankt"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ja"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Camera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Zoeken"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Foto\'s"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albums"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"MEER OPTIES"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"INSTELLINGEN"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d foto\'s"</item>
diff --git a/res/values-pl/filtershow_strings.xml b/res/values-pl/filtershow_strings.xml
index 3166939..9f0c949 100644
--- a/res/values-pl/filtershow_strings.xml
+++ b/res/values-pl/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Edytor zdjęć"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Nie można wczytać zdjęcia."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Nie można edytować oryginału"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Ustawiam tapetę"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Nie można pobrać zdjęcia. Sieć jest niedostępna."</string>
     <string name="original" msgid="3524493791230430897">"Oryginalny"</string>
     <string name="borders" msgid="2067345080568684614">"Granice"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Niestandardowy"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Cofnij"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Ponów"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Pokaż historię"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Ukryj historię"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Pokaż stan obrazu"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Ukryj stan obrazu"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Pokaż zastosowane efekty"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ukryj zastosowane efekty"</string>
+    <string name="export_image" msgid="3202835713172222134">"Eksportuj"</string>
+    <string name="print_image" msgid="1942989216591621413">"Drukuj"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Eksportuj spłaszczony obraz"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Wyeksportowany obraz będzie kopią bez historii."</string>
+    <string name="quality" msgid="179292110309050529">"Jakość"</string>
+    <string name="size" msgid="4639404642236356037">"Wymiary"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Ustawienia"</string>
     <string name="unsaved" msgid="8704442449002374375">"Ten obraz zawiera niezapisane zmiany."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Czy chcesz zapisać przed zamknięciem?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Zapisz i zamknij"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Przetwarzam obraz w pełnej rozdzielczości..."</string>
     <string name="exit" msgid="242642957038770113">"Zamknij"</string>
     <string name="history" msgid="455767361472692409">"Historia"</string>
     <string name="reset" msgid="9013181350779592937">"Resetuj"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Podświetlenie"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Krzywe"</string>
     <string name="vignette" msgid="934721068851885390">"Winietowanie"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Winietowanie"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Ekspozycja"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Nasycenie"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Spadek"</string>
     <string name="redeye" msgid="4508883127049472069">"Czerwone oczy"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Rysuj"</string>
     <string name="straighten" msgid="26025591664983528">"Wyprostuj"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatyw"</string>
     <string name="none" msgid="6633966646410296520">"Brak"</string>
     <string name="edge" msgid="7036064886242147551">"Krawędzie"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posteryzacja"</string>
     <string name="downsample" msgid="3552938534146980104">"Zmniejsz"</string>
+    <string name="grad" msgid="546774853424848655">"Gradacyjny"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Jasność"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Nasycenie"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Główny"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Czerwony"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Żółty"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zielony"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyjan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Niebieski"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Amarantowy"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Styl"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nowa"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Czerwony"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Zielony"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Niebieski"</string>
     <string name="draw_style" msgid="2036125061987325389">"Styl"</string>
     <string name="draw_size" msgid="4360005386104151209">"Rozmiar"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Barwa"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Nasycenie"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Jasność"</string>
     <string name="draw_color" msgid="2119030386987211193">"Kolor"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linie"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Rozprysk"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Wyczyść"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Grubość"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Rozmiar narożnika"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Kolor"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Wyczyść"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Wybierz własny kolor"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Wybierz kolor"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Wybierz rozmiar"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Oryginał"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Wynik"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Zapisywanie obrazu"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Przetwarzam..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Zapisz bieżące ustawienia"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Zarządzaj gotowymi ustawieniami"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nowe gotowe ustawienie"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Wstępnie ustawiona nazwa"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informacje"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nazwa obrazu"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Rozmiar obrazu"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Dane EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Gotowe ustawienia"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Wersja"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Oryginalna"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Aktualna"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Przysłona"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Ogniskowa"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Odległość od obiektu"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Data zrobienia"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Nastawa przysłony"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Czas ekspozycji"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Prawa autorskie"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e2418aa..8162415 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Obróć w prawo"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Nie można znaleźć elementu."</string>
     <string name="edit" msgid="1502273844748580847">"Edytuj"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Prosta edycja"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Przetwarzanie żądań dotyczących buforowania"</string>
     <string name="caching_label" msgid="4521059045896269095">"Buforowanie…"</string>
     <string name="crop_action" msgid="3427470284074377001">"Przytnij"</string>
@@ -121,7 +122,7 @@
     <string name="sequence_in_set" msgid="7235465319919457488">"%1$d z %2$d elementów:"</string>
     <string name="title" msgid="7622928349908052569">"Tytuł"</string>
     <string name="description" msgid="3016729318096557520">"Opis"</string>
-    <string name="time" msgid="1367953006052876956">"Godzina"</string>
+    <string name="time" msgid="1367953006052876956">"Data/godzina"</string>
     <string name="location" msgid="3432705876921618314">"Lokalizacja"</string>
     <string name="path" msgid="4725740395885105824">"Ścieżka"</string>
     <string name="width" msgid="9215847239714321097">"Szerokość"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Nie można nawiązać połączenia z aparatem."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Aparat został wyłączony z powodu zasad bezpieczeństwa."</string>
     <string name="camera_label" msgid="6346560772074764302">"Aparat"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Kamera"</string>
     <string name="wait" msgid="8600187532323801552">"Proszę czekać…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Zanim użyjesz aparatu podłącz nośnik USB."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Przed przystąpieniem do korzystania z aparatu włóż kartę SD."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Tył"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Przód"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Zapis lokalizacji"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOKALIZACJA"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Samowyzwalacz"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 sekunda"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Ustawienia aparatu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ustawienia kamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Rozmiar zdjęcia"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikseli"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 Mpix"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpix"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Mpix"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapiksele"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Mpix"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Mpix"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 megapiksele (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 Mpix"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 Mpix"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Nieskończoność"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMATYCZNIE"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"NIESKOŃCZONOŚĆ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Lampa błyskowa"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"LAMPA BŁYSKOWA"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatyczna"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Włączona"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Wyłączona"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"LAMPA BŁYSKOWA AUTOMATYCZNIE"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"LAMPA BŁYSKOWA WŁĄCZONA"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"LAMPA BŁYSKOWA WYŁĄCZONA"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balans bieli"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALANS BIELI"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Auto"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Światło żarowe"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Światło dzienne"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescencja"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Zachmurzenie"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMATYCZNY"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ŚWIATŁO ŻAROWE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ŚWIATŁO DZIENNE"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENCJA"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ZACHMURZENIE"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Tryb scenerii"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zachód słońca"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Impreza"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"BRAK"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"AKCJA"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOC"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ZACHÓD SŁOŃCA"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"ZABAWA"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"SAMOWYZWALACZ"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"SAMOWYZWALACZ WYŁ."</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUNDA"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDY"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUND"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUND"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Opcja niedostępna w trybie scenerii."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozycja"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EKSPOZYCJA"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"PRZEDNI APARAT"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"TYLNY APARAT"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Na nośniku USB kończy się miejsce. Zmień ustawienie jakości bądź usuń niektóre zdjęcia lub inne pliki."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na karcie SD kończy się miejsce. Zmień ustawienie jakości bądź usuń niektóre zdjęcia lub inne pliki."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"W kosmosie"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zachód słońca"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Twój film"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Skieruj urządzenie w dół."\n"Opuść na chwilę kadr."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Skieruj urządzenie w dół.\nOpuść na chwilę kadr."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Dotknij, by zrobić zdjęcie podczas nagrywania."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Rozpoczęto nagrywanie filmu."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Zatrzymano nagrywanie filmu."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Przełącz na wideo"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Przełącz na panoramę"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Przełącz na nową panoramę"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Przełącz na tryb przywracania ostrości"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Przegląd: anulowanie"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Przegląd: gotowe"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Przegląd – zrób zdjęcie/nagraj film ponownie"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Odtwórz film"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Wstrzymaj film"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Załaduj ponownie film"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Pasek czasu w odtwarzaczu wideo"</string>
     <string name="capital_on" msgid="5491353494964003567">"WŁĄCZONY"</string>
     <string name="capital_off" msgid="7231052688467970897">"WYŁĄCZONY"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Wył."</string>
@@ -380,19 +417,21 @@
     <string name="time_lapse_minutes" msgid="7738520349259013762">"min"</string>
     <string name="time_lapse_hours" msgid="1776453661704997476">"godz."</string>
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Gotowe"</string>
-    <string name="set_time_interval" msgid="2970567717633813771">"Ustaw interwał czasu"</string>
-    <string name="set_time_interval_help" msgid="6665849510484821483">"Funkcja filmu poklatkowego jest wyłączona. Włącz ją, by ustawić interwał czasu."</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Ustaw odstęp czasu"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Funkcja filmu poklatkowego jest wyłączona. Włącz ją, by ustawić odstęp czasu."</string>
     <string name="set_timer_help" msgid="5007708849404589472">"Samowyzwalacz jest wyłączony. Włącz go, by odliczał czas pozostały do wykonania zdjęcia."</string>
     <string name="set_duration" msgid="5578035312407161304">"Ustaw czas w sekundach"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Odliczanie czasu pozostałego do zrobienia zdjęcia"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Zapamiętywać lokalizacje zdjęć?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Oznacz zdjęcia i filmy informacją, gdzie zostały zrobione."\n\n"Inne aplikacje mają dostęp do tych informacji wraz z zapisanymi zdjęciami."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Oznacz zdjęcia i filmy informacją, gdzie zostały zrobione.\n\nInne aplikacje mają dostęp do tych informacji wraz z zapisanymi zdjęciami."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nie, dziękuję"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Tak"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Aparat"</string>
     <string name="menu_search" msgid="7580008232297437190">"Szukaj"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Zdjęcia"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumy"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"WIĘCEJ OPCJI"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"USTAWIENIA"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d zdjęcie"</item>
     <item quantity="other" msgid="3813306834113858135">"Zdjęcia: %1$d"</item>
diff --git a/res/values-pt-rPT/filtershow_strings.xml b/res/values-pt-rPT/filtershow_strings.xml
index 1f144c0..05fff73 100644
--- a/res/values-pt-rPT/filtershow_strings.xml
+++ b/res/values-pt-rPT/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor de Fotografias"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Não é possível carregar a imagem!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Não é possível editar o original"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"A definir imagem de fundo"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Não foi possível transferir a fotografia. Rede não disponível."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Limites"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Personalizado"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Anular"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Refazer"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Mostrar Histórico"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Ocultar Histórico"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Ver Estado da Imagem"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Ocul. Estado Imagem"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Mostrar Efeitos Aplicados"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ocultar Efeitos Aplicados"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportar"</string>
+    <string name="print_image" msgid="1942989216591621413">"Imprimir"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exportar imagem plana"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"A imagem exportada será uma cópia, sem o histórico."</string>
+    <string name="quality" msgid="179292110309050529">"Qualidade"</string>
+    <string name="size" msgid="4639404642236356037">"Tamanho"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Definições"</string>
     <string name="unsaved" msgid="8704442449002374375">"Existem alterações a esta imagem não guardadas."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Pretende guardar antes de sair?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Guardar e Sair"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"A processar imagem de resolução total..."</string>
     <string name="exit" msgid="242642957038770113">"Sair"</string>
     <string name="history" msgid="455767361472692409">"Histórico"</string>
     <string name="reset" msgid="9013181350779592937">"Repor"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Destaques"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Curvas"</string>
     <string name="vignette" msgid="934721068851885390">"Vinheta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinheta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposição"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturação"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contraste"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Redução"</string>
     <string name="redeye" msgid="4508883127049472069">"Olhos Vermelhos"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Desenhar"</string>
     <string name="straighten" msgid="26025591664983528">"Endireitar"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativo"</string>
     <string name="none" msgid="6633966646410296520">"Nenhum"</string>
     <string name="edge" msgid="7036064886242147551">"Limites"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Póster"</string>
     <string name="downsample" msgid="3552938534146980104">"Subamostra"</string>
+    <string name="grad" msgid="546774853424848655">"Esbatida"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Brilho"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contraste"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturação"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Principal"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Vermelho"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Amarelo"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Verde"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Azul-turquesa"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Azul"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Estilo"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nova"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Vermelho"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Verde"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Azul"</string>
     <string name="draw_style" msgid="2036125061987325389">"Estilo"</string>
     <string name="draw_size" msgid="4360005386104151209">"Tamanho"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Tonalidade"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturação"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Brilho"</string>
     <string name="draw_color" msgid="2119030386987211193">"Cor"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linhas"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marcador"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Salpicar"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Limpar"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Espessura"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Tamanho do canto"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Cor"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Limpar"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Selecionar cor personalizada"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Selecionar a cor"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Selecionar Tamanho"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultado"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"A guardar imagem"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"A processar..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"A guardar predefinição atual"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Gerir predefinições utilizador"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nova predefinição"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nome Predefinido"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informações"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nome da imagem"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Tamanho da imagem"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histograma"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Dados EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Predefinição"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versão"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Atual"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modelo"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Abertura"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Distância Focal"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distância do Objeto"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Data de captura"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Número F"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Tempo de Exposição"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Direitos de autor"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6bea992..dcb3e8f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Rodar para a direita"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Não foi possível encontrar item."</string>
     <string name="edit" msgid="1502273844748580847">"Editar"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Edição Simples"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"A processar pedidos de colocação em cache"</string>
     <string name="caching_label" msgid="4521059045896269095">"A col. cache..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Recortar"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Não é possível efetuar ligação à câmara."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Devido a políticas de segurança, a câmara foi desativada."</string>
     <string name="camera_label" msgid="6346560772074764302">"Câmara"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Câmara de vídeo"</string>
     <string name="wait" msgid="8600187532323801552">"Aguarde..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Monte a memória de armazenamento USB antes de utilizar a câmara."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Insira um cartão SD antes de utilizar a câmara."</string>
@@ -229,11 +229,12 @@
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Não foi possível aceder ao cartão SD."</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string>
     <string name="review_ok" msgid="1156261588693116433">"CONCLUÍDO"</string>
-    <string name="time_lapse_title" msgid="4360632427760662691">"Gravação com lapso de tempo"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Gravação com intervalo de tempo"</string>
     <string name="pref_camera_id_title" msgid="4040791582294635851">"Escolher câmara"</string>
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Traseira"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Frontal"</string>
-    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Armazenar localização"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Incluir localização"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOCALIZAÇÃO"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Temporizador de contagem decr."</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 segundo"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Definições da câmara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Definições da câmara de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamanho da imagem"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 MP"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapíxeis"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 MP"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapíxeis"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapíxeis"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 MP (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapíxeis"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapíxel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automático"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMÁTICO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Modo flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODO FLASH"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automático"</string>
-    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Activado"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Ativado"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Desativado"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTOMÁTICO"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ATIVADO"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH DESATIVADO"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Equilíbrio dos brancos"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"EQUILÍBRIO DOS BRANCOS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automático"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescente"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Luz do dia"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescente"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Nublado"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMÁTICO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENTE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"LUZ DO DIA"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENTE"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"NUBLADO"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modo cenário"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automático"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nocturno"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ocaso"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Partido"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NENHUM"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"AÇÃO"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOITE"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"PÔR DO SOL"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FESTA"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"TEMPORIZADOR DE CONTAGEM DECRESCENTE"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TEMPORIZADOR DESATIVADO"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEGUNDO"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEGUNDOS"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEGUNDOS"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEGUNDOS"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Não selecionável no modo de cena."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOSIÇÃO"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"CÂMARA FRONTAL"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"CÂMARA POSTERIOR"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Está a ficar sem espaço no armazenamento USB. Altere as definições de qualidade ou elimine algumas imagens ou outros ficheiros."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Está a ficar sem espaço no cartão SD. Altere as definições de qualidade ou elimine algumas imagens ou outros ficheiros."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"No espaço"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Pôr do Sol"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"O seu vídeo"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Vire o seu aparelho para baixo."\n"Saia da vista por alguns momentos."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Vire o seu aparelho para baixo.\nSaia da vista por alguns momentos."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Toque para tirar uma fotografia durante a gravação."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"A gravação de vídeo foi iniciada."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"A gravação de vídeo foi parada."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Mudar para vídeo"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Mudar para panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Mudar para o novo panorama"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Mudar para focar novamente"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Comentário cancelado."</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Reveja o que está concluído"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Retomar comentário"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Reproduzir vídeo"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Interromper vídeo"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Atualizar vídeo"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Barra de tempo do leitor de vídeo"</string>
     <string name="capital_on" msgid="5491353494964003567">"ATIVADA"</string>
     <string name="capital_off" msgid="7231052688467970897">"DESATIVADA"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Desativado"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Definir a duração em segundos"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Contagem decrescente para tirar uma fotografia"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Memorizar localizações das fotografias?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Insira etiquetas nas suas fotografias e vídeos com as localizações onde foram capturados."\n\n"Outras aplicações podem aceder a estas informações juntamente com as suas imagens guardadas."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Insira etiquetas nas suas fotografias e vídeos com as localizações onde foram capturados.\n\nOutras aplicações podem aceder a estas informações juntamente com as suas imagens guardadas."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Não, obrigado"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Sim"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Câmara"</string>
     <string name="menu_search" msgid="7580008232297437190">"Pesquisa"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotografias"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Álbuns"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"MAIS OPÇÕES"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"DEFINIÇÕES"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d fotografia"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotog."</item>
diff --git a/res/values-pt/filtershow_strings.xml b/res/values-pt/filtershow_strings.xml
index bce7944..bca61b9 100644
--- a/res/values-pt/filtershow_strings.xml
+++ b/res/values-pt/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor de fotos"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Não é possível carregar a imagem!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Não é possível editar o original"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Definindo plano de fundo"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Não foi possível fazer o download da foto. Rede indisponível."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Bordas"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Personalizado"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Desfazer"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Refazer"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Mostrar histórico"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Ocultar histórico"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Mostrar estado"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Ocultar estado"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Mostrar efeitos aplicados"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ocultar efeitos aplicados"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportar"</string>
+    <string name="print_image" msgid="1942989216591621413">"Imprimir"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exportar imagem achatada"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"A imagem exportada será uma cópia, sem o histórico."</string>
+    <string name="quality" msgid="179292110309050529">"Qualidade"</string>
+    <string name="size" msgid="4639404642236356037">"Tamanho"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Configurações"</string>
     <string name="unsaved" msgid="8704442449002374375">"Existem alterações não salvas nesta imagem."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Deseja salvar antes de sair?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Salvar e sair"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Processando imagem em resolução máxima…"</string>
     <string name="exit" msgid="242642957038770113">"Sair"</string>
     <string name="history" msgid="455767361472692409">"Histórico"</string>
     <string name="reset" msgid="9013181350779592937">"Restaurar"</string>
@@ -61,12 +70,17 @@
     <string name="vibrance" msgid="3326744578577835915">"Vibração"</string>
     <string name="saturation" msgid="7026791551032438585">"Saturação"</string>
     <string name="bwfilter" msgid="8927492494576933793">"Filtro P&amp;B"</string>
-    <string name="wbalance" msgid="6346581563387083613">"Cor automática"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Cor auto."</string>
     <string name="hue" msgid="6231252147971086030">"Matiz"</string>
     <string name="shadow_recovery" msgid="3928572915300287152">"Sombras"</string>
     <string name="highlight_recovery" msgid="8262208470735204243">"Destaques"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Curvas"</string>
     <string name="vignette" msgid="934721068851885390">"Vinheta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinheta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposição"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturação"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contraste"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Queda"</string>
     <string name="redeye" msgid="4508883127049472069">"Olhos vermelhos"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Desenhar"</string>
     <string name="straighten" msgid="26025591664983528">"Endireitar"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativo"</string>
     <string name="none" msgid="6633966646410296520">"Nenhum"</string>
     <string name="edge" msgid="7036064886242147551">"Bordas"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"+Contraste"</string>
     <string name="downsample" msgid="3552938534146980104">"Diminuir"</string>
+    <string name="grad" msgid="546774853424848655">"Graduado"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Brilho"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contraste"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturação"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Principal"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Vermelho"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Amarelo"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Verde"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Ciano"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Azul"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Estilo"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"novo"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Vermelho"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Verde"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Azul"</string>
     <string name="draw_style" msgid="2036125061987325389">"Estilo"</string>
     <string name="draw_size" msgid="4360005386104151209">"Tamanho"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Matiz"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturação"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Brilho"</string>
     <string name="draw_color" msgid="2119030386987211193">"Cor"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linhas"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marcador"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Respingo"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Limpar"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Espessura"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Tam. do canto"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Cor"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Limpar"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Escolha uma cor personalizada"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Selecionar cor"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Selecionar tamanho"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultado"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Salvando imagem"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Processando…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Salvar versão atual"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Gerenciar versões do usuário"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nova versão"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nome da versão"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informações"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nome da imagem"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Tamanho da imagem"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histograma"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Dados EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Versão"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versão"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Atual"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modelo"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Abertura"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Distância focal"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distância do objeto"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Data da foto"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F-stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Tempo de exposição"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Direitos autorais"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 27b418f..d6015d3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Girar para a direita"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Não foi possível encontrar o item."</string>
     <string name="edit" msgid="1502273844748580847">"Editar"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Edição simples"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Processando solicitações de armazenamento em cache"</string>
     <string name="caching_label" msgid="4521059045896269095">"Cache..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Cortar"</string>
@@ -147,11 +148,11 @@
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant."</string>
-    <string name="ffx_bleach" msgid="8946700451603478453">"Branqueamento"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Desbotar"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Azul"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"P&amp;B"</string>
     <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
-    <string name="ffx_x_process" msgid="4779398678661811765">"Proc. cruzado"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X-pro"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litografia"</string>
   <plurals name="make_albums_available_offline">
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Não é possível conectar à câmera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"A câmera foi desativada devido às políticas de segurança."</string>
     <string name="camera_label" msgid="6346560772074764302">"Câmera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Filmadora"</string>
     <string name="wait" msgid="8600187532323801552">"Aguarde..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Monte o armazenamento USB antes de usar a câmera."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Insira um cartão SD antes de usar a câmera."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Traseira"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Visão frontal"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Local de armazenamento"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOCAL"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Contagem regressiva"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"Um segundo"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configurações da câmera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configurações da filmadora"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamanho da imagem"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 MP"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 MP"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 MP (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapixels"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automático"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Modo de flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODO DE FLASH"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automático"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Ativado"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Desativado"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTO"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH LIGADO"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH DESLIGADO"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balanço de branco"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALANÇO DE BRANCO"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automático"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescente"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Luz do dia"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescente"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Nublado"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENTE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"LUZ DO DIA"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENTE"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"NUBLADO"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modo de cena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automático"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Cena noturna"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Pôr-do-sol"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Festa"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NENHUM"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"AÇÃO"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOITE"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"PÔR-DO-SOL"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FESTA"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"CONTAGEM REGRESSIVA"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TEMPORIZADOR DESLIGADO"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEGUNDO"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEGUNDOS"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEGUNDOS"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEGUNDOS"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Não pode ser selecionado no modo de cena."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOSIÇÃO"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <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 TRASEIRA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Seu armazenamento USB está sem espaço. Altere a configuração de qualidade ou exclua algumas imagens ou outros arquivos."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Seu cartão SD está sem espaço. Altere a configuração de qualidade ou exclua algumas imagens ou outros arquivos."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"No espaço"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Pôr-do-sol"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Seu vídeo"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Abaixe seu dispositivo."\n"Saia de vista por um momento."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Abaixe seu dispositivo.\nSaia de vista por um momento."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Toque para tirar uma foto durante a gravação."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"A gravação de vídeo foi iniciada."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"A gravação de vídeo foi interrompida."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Alternar para vídeo"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Alterar para panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Alterar para panorama novo"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Troque para focar novamente"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Cancelar"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Revisão concluída"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Repetir anexo"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Reproduzir vídeo"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pausar vídeo"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Atualizar vídeo"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Barra de tempo do player de vídeo"</string>
     <string name="capital_on" msgid="5491353494964003567">"LIGADO"</string>
     <string name="capital_off" msgid="7231052688467970897">"DESLIGADO"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Desligado"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Definir duração em segundos"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Contagem regressiva para tirar foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Memorizar locais de fotos?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Marque seus vídeos e fotos com os locais onde foram gerados."\n\n"Outros aplicativos podem acessar essas informações juntamente com suas imagens salvas."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Marque seus vídeos e fotos com os locais onde foram gerados.\n\nOutros aplicativos podem acessar essas informações junto com suas imagens salvas."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Não, obrigado"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Sim"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Câmera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Pesquisar"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotos"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Álbuns"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"MAIS OPÇÕES"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"CONFIGURAÇÕES"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotos"</item>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index c022955..33a94a9 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -112,6 +112,8 @@
     <skip />
     <!-- no translation found for edit (1502273844748580847) -->
     <skip />
+    <!-- no translation found for simple_edit (2792835918347498211) -->
+    <skip />
     <!-- no translation found for process_caching_requests (8722939570307386071) -->
     <skip />
     <!-- no translation found for caching_label (4521059045896269095) -->
@@ -356,7 +358,6 @@
     <!-- no translation found for camera_disabled (8923911090533439312) -->
     <skip />
     <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Camera da video"</string>
     <string name="wait" msgid="8600187532323801552">"Spetgar..."</string>
     <!-- no translation found for no_storage (7335975356349008814) -->
     <skip />
@@ -379,6 +380,8 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Enavos"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Frunt"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Memorisar la posiziun"</string>
+    <!-- no translation found for pref_camera_location_label (2254270920298609161) -->
+    <skip />
     <!-- no translation found for pref_camera_timer_title (3105232208281893389) -->
     <skip />
     <!-- no translation found for pref_camera_timer_entry:one (1654523400981245448) -->
@@ -401,14 +404,20 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Parameters da la camera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Parameters da la camera da video"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Grondezza dal maletg"</string>
+    <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+    <skip />
     <!-- no translation found for pref_camera_picturesize_entry_8mp (259953780932849079) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_5mp (2882928212030661159) -->
     <skip />
+    <!-- no translation found for pref_camera_picturesize_entry_4mp (933242108272469142) -->
+    <skip />
     <!-- no translation found for pref_camera_picturesize_entry_3mp (741415860337400696) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2mp (1753709802245460393) -->
     <skip />
+    <!-- no translation found for pref_camera_picturesize_entry_2mp_wide (5359490802026616612) -->
+    <skip />
     <!-- no translation found for pref_camera_picturesize_entry_1_3mp (829109608140747258) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_1mp (1669725616780375066) -->
@@ -421,16 +430,42 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatic"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinit"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <!-- no translation found for pref_camera_focusmode_label_auto (8547956917516317183) -->
+    <skip />
+    <!-- no translation found for pref_camera_focusmode_label_infinity (4272904160062531778) -->
+    <skip />
+    <!-- no translation found for pref_camera_focusmode_label_macro (8749317592620908054) -->
+    <skip />
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Modus da chametg (flash)"</string>
+    <!-- no translation found for pref_camera_flashmode_label (7546741624882856171) -->
+    <skip />
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatic"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Activà"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Deactivà"</string>
+    <!-- no translation found for pref_camera_flashmode_label_auto (8854671890619026197) -->
+    <skip />
+    <!-- no translation found for pref_camera_flashmode_label_on (7347504762794840140) -->
+    <skip />
+    <!-- no translation found for pref_camera_flashmode_label_off (3541596735596053416) -->
+    <skip />
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Equiliber da l\'alv"</string>
+    <!-- no translation found for pref_camera_whitebalance_label (7467403405883190920) -->
+    <skip />
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatic"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Pair electric"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Glisch dal di"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Glisch da neon"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Nivlus"</string>
+    <!-- no translation found for pref_camera_whitebalance_label_auto (1479694362310491429) -->
+    <skip />
+    <!-- no translation found for pref_camera_whitebalance_label_incandescent (7427628260209908900) -->
+    <skip />
+    <!-- no translation found for pref_camera_whitebalance_label_daylight (1859710806141461399) -->
+    <skip />
+    <!-- no translation found for pref_camera_whitebalance_label_fluorescent (5173251749161337707) -->
+    <skip />
+    <!-- no translation found for pref_camera_whitebalance_label_cloudy (8230173517179285320) -->
+    <skip />
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modus da scena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatic"</string>
     <!-- no translation found for pref_camera_scenemode_entry_hdr (2923388802899511784) -->
@@ -440,11 +475,41 @@
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Rendida dal sulegl"</string>
     <!-- no translation found for pref_camera_scenemode_entry_party (907053529286788253) -->
     <skip />
+    <!-- no translation found for pref_camera_scenemode_label_auto (4475096836397300237) -->
+    <skip />
+    <!-- no translation found for pref_camera_scenemode_label_action (964748409622151496) -->
+    <skip />
+    <!-- no translation found for pref_camera_scenemode_label_night (1269871886845854574) -->
+    <skip />
+    <!-- no translation found for pref_camera_scenemode_label_sunset (2802732082948866877) -->
+    <skip />
+    <!-- no translation found for pref_camera_scenemode_label_party (1409459091844374828) -->
+    <skip />
+    <!-- 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 />
     <!-- no translation found for not_selectable_in_scene_mode (2970291701448555126) -->
     <skip />
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposiziun"</string>
+    <!-- no translation found for pref_exposure_label (552624394642497940) -->
+    <skip />
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <!-- no translation found for pref_camera_hdr_label (7217211253357027510) -->
+    <skip />
+    <!-- no translation found for pref_camera_id_label_back (8745553500400332333) -->
+    <skip />
+    <!-- no translation found for pref_camera_id_label_front (8699439330056996709) -->
+    <skip />
     <!-- no translation found for dialog_ok (6263301364153382152) -->
     <skip />
     <!-- no translation found for spaceIsLow_content (4401325203349203177) -->
@@ -538,12 +603,22 @@
     <skip />
     <!-- no translation found for accessibility_switch_to_new_panorama (8116783308051524188) -->
     <skip />
+    <!-- no translation found for accessibility_switch_to_refocus (4539294619557299903) -->
+    <skip />
     <!-- no translation found for accessibility_review_cancel (9070531914908644686) -->
     <skip />
     <!-- no translation found for accessibility_review_ok (7793302834271343168) -->
     <skip />
     <!-- no translation found for accessibility_review_retake (659300290054705484) -->
     <skip />
+    <!-- no translation found for accessibility_play_video (7596298365794810207) -->
+    <skip />
+    <!-- no translation found for accessibility_pause_video (6526344477133046653) -->
+    <skip />
+    <!-- no translation found for accessibility_reload_video (3250335917598607232) -->
+    <skip />
+    <!-- no translation found for accessibility_time_bar (1414029843602604531) -->
+    <skip />
     <!-- no translation found for capital_on (5491353494964003567) -->
     <skip />
     <!-- no translation found for capital_off (7231052688467970897) -->
@@ -662,6 +737,10 @@
     <skip />
     <!-- no translation found for tab_albums (8079449907770685691) -->
     <skip />
+    <!-- no translation found for camera_menu_more_label (6868642182125198710) -->
+    <skip />
+    <!-- no translation found for camera_menu_settings_label (875454962069404723) -->
+    <skip />
     <!-- no translation found for number_of_photos:one (6949174783125614798) -->
     <!-- no translation found for number_of_photos:other (3813306834113858135) -->
 </resources>
diff --git a/res/values-ro/filtershow_strings.xml b/res/values-ro/filtershow_strings.xml
index 1452123..6fbdb38 100644
--- a/res/values-ro/filtershow_strings.xml
+++ b/res/values-ro/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor foto"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Nu se poate încărca imaginea!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Nu se poate modifica originalul"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Se setează imaginea de fundal"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Nu s-au putut descărca fotografiile. Rețea indisponibilă."</string>
     <string name="original" msgid="3524493791230430897">"Originală"</string>
     <string name="borders" msgid="2067345080568684614">"Chenar"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Personalizat"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Anulaţi"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Repetaţi"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Afişaţi istoricul"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Ascundeţi istoricul"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Afişaţi stare foto."</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Ascundeţi stare foto"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Afișați efectele aplicate"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ascundeți efectele aplicate"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportați"</string>
+    <string name="print_image" msgid="1942989216591621413">"Printați"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exportați imaginea aplatizată"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Imaginea exportată va fi o copie, fără istoric."</string>
+    <string name="quality" msgid="179292110309050529">"Calitate"</string>
+    <string name="size" msgid="4639404642236356037">"Dimensiune"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Setări"</string>
     <string name="unsaved" msgid="8704442449002374375">"Ați adus modificări imaginii pe care nu le-ați salvat."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Doriți să salvați înainte de a ieși?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Salvați și ieșiți"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Se procesează imaginea la rezoluție maximă..."</string>
     <string name="exit" msgid="242642957038770113">"Ieșiți"</string>
     <string name="history" msgid="455767361472692409">"Istoric"</string>
     <string name="reset" msgid="9013181350779592937">"Resetaţi"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Puncte luminoz."</string>
     <string name="curvesRGB" msgid="915010781090477550">"Curbe"</string>
     <string name="vignette" msgid="934721068851885390">"Vignetare"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignetare"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Expunere"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturație"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Atenuare"</string>
     <string name="redeye" msgid="4508883127049472069">"Ochi roşii"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Desenați"</string>
     <string name="straighten" msgid="26025591664983528">"Îndreptare"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativ"</string>
     <string name="none" msgid="6633966646410296520">"Niciunul"</string>
     <string name="edge" msgid="7036064886242147551">"Margini"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterizare"</string>
     <string name="downsample" msgid="3552938534146980104">"Mostră"</string>
+    <string name="grad" msgid="546774853424848655">"Gradual"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Luminozitate"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturație"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Principal"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Roșu"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Galben"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Verde"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Albastru"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nou"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Roşu"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Verde"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Albastru"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
     <string name="draw_size" msgid="4360005386104151209">"Dimensiune"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Culoare"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturație"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Luminozitate"</string>
     <string name="draw_color" msgid="2119030386987211193">"Culoare"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linii"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Stropire"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Ștergeți"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Grosimea"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Dimens. unghi"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Culoare"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Ștergeți"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Alegeți culoarea personalizată"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Selectați culoarea"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Selectați dimensiunea"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Rezultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Se salvează imaginea"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Se procesează..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Salvați presetarea curentă"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Gestionați presetările"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Presetare nouă"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nume prestabilit"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informații"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Numele imaginii"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Dimensiunea imaginii"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogramă"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Date EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Presetare"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versiune"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Actual"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Apertură"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Distanța focală"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distanța subiectului"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Data realizării"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Timp de expunere"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Drepturi de autor"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 50c6af8..826285e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -60,7 +60,7 @@
     <string name="share_panorama" msgid="2569029972820978718">"Trimiteți panorama"</string>
     <string name="share_as_photo" msgid="8959225188897026149">"Trimiteți fotografia"</string>
     <string name="deleted" msgid="6795433049119073871">"Ștearsă"</string>
-    <string name="undo" msgid="2930873956446586313">"ANULAŢI"</string>
+    <string name="undo" msgid="2930873956446586313">"ANULAȚI"</string>
     <string name="select_all" msgid="3403283025220282175">"Selectaţi-le pe toate"</string>
     <string name="deselect_all" msgid="5758897506061723684">"Deselectaţi-le pe toate"</string>
     <string name="slideshow" msgid="4355906903247112975">"Prezentare"</string>
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Rotiţi spre dreapta"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Elementul nu a putut fi găsit."</string>
     <string name="edit" msgid="1502273844748580847">"Editaţi"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Editare simplă"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Se proces. solicit. de stocare în memoria cache"</string>
     <string name="caching_label" msgid="4521059045896269095">"Mem. cache..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Decupaţi"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Nu se poate conecta la camera foto."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Camera foto a fost dezactivată din cauza politicilor de securitate."</string>
     <string name="camera_label" msgid="6346560772074764302">"Cameră foto"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Cameră video"</string>
     <string name="wait" msgid="8600187532323801552">"Aşteptaţi…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Înainte de a utiliza camera foto, montaţi dispozitivul de stocare USB."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Introduceţi un card SD înainte de a utiliza camera foto."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Înapoi"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Frontal"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Stocaţi locaţia"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOCAȚIE"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Cronometru numărătoare inversă"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"O secundă"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Setările camerei foto"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Setările camerei video"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Dimensiune fotografie"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapixeli"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixeli"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 MP"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 MP"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 MP (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 MP"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automat"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinit"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTOMAT"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINIT"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Mod flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MOD BLIȚ"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automat"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Activat"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Dezactivată"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"BLIȚ AUTOMAT"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BLIȚ ACTIVAT"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"BLIȚ DEZACTIVAT"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balanţă de alb"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BALANS DE ALB"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automat"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescent"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Lumină de zi"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescent"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Înnorat"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTOMAT"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENT"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"LUMINĂ DE ZI"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENT"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ÎNNORAT"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Mod Scenă"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automat"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noapte"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Apus de soare"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Petrecere"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"NICIUNA"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ACȚIUNE"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOAPTE"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"APUS DE SOARE"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"PETRECERE"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"CRONOMETRU NUMĂRARE INVERSĂ"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TEMPORIZATOR DEZACTIVAT"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"O SECUNDĂ"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SECUNDE"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SECUNDE"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SECUNDE"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Nu este selectabil în modul scenă."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Expunere"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPUNERE"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"CAMERA FOTO FRONTALĂ"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"CAMERA FOTO SPATE"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Spaţiul de stocare USB este aproape ocupat. Editaţi setarea de calitate sau ştergeţi câteva imagini ori alte fişiere."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Cardul SD rămâne fără spaţiu de stocare. Editaţi setarea de calitate sau ştergeţi câteva imagini sau alte fişiere."</string>
@@ -308,13 +340,13 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"În spaţiu"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Apus de soare"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Videoclip"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Aşezaţi dispozitivul jos."\n"Ieşiţi din cadru un moment."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Aşezaţi dispozitivul jos.\nIeşiţi din cadru un moment."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Atingeţi pentru a fotografia în timpul înregistrării."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"A început înregistrarea videoclipului."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Înregistrarea videoclipului s-a oprit."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Instant. video este dezact. când efectele speciale sunt pornite."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Ștergeţi efectul"</string>
-    <string name="effect_silly_faces" msgid="8107732405347155777">"FEŢE PROSTUŢE"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"FEȚE PROSTUȚE"</string>
     <string name="effect_background" msgid="6579360207378171022">"FUNDAL"</string>
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Butonul Declanşaţi"</string>
     <string name="accessibility_menu_button" msgid="7140794046259897328">"Butonul Meniu"</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Comutaţi la camera video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Comutaţi la panoramă"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Comutaţi la o panoramă nouă"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Comutați la refocalizare"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Anulaţi examinarea"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Terminaţi examinarea"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Refaceţi"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Redați videoclipul"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Întrerupeți videoclipul"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Reîncărcați videoclipul"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Bara temporală a playerului video"</string>
     <string name="capital_on" msgid="5491353494964003567">"ACTIVAT"</string>
     <string name="capital_off" msgid="7231052688467970897">"DEZACTIVAT"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Dezactivat"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Setați durata în secunde"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Numărătoare inversă până la fotografiere"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Doriţi să vă amintiţi locaţiile fotografiilor?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Etichetaţi-vă fotografiile şi videoclipurile cu locaţiile în care acestea au fost create."\n\n"Alte aplicaţii pot accesa aceste informaţii, împreună cu imaginile salvate."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Etichetaţi-vă fotografiile şi videoclipurile cu locaţiile în care acestea au fost create.\n\nAlte aplicaţii pot accesa aceste informaţii, împreună cu imaginile salvate."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nu, mulţumesc"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Da"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Cameră foto"</string>
     <string name="menu_search" msgid="7580008232297437190">"Căutați"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotografii"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albume"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"MAI MULTE OPȚIUNI"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"SETĂRI"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d fotografie"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotografii"</item>
diff --git a/res/values-ru/filtershow_strings.xml b/res/values-ru/filtershow_strings.xml
index f20447f..ee05908 100644
--- a/res/values-ru/filtershow_strings.xml
+++ b/res/values-ru/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Графический редактор"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Не удалось загрузить изображение."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Не удалось загрузить оригинал"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Установка обоев…"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Не удалось скачать фото: сеть недоступна."</string>
     <string name="original" msgid="3524493791230430897">"Оригинал"</string>
-    <string name="borders" msgid="2067345080568684614">"Границы"</string>
+    <string name="borders" msgid="2067345080568684614">"Рамка"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Пользовательский"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Отмена"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Повторить"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Показать историю"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Скрыть историю"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Показать состояние"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Скрыть состояние"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Отобразить эффекты"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Скрыть эффекты"</string>
+    <string name="export_image" msgid="3202835713172222134">"Экспортировать"</string>
+    <string name="print_image" msgid="1942989216591621413">"Печать"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Экспорт с объединением слоев"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Экспортированное изображение будет копией без истории изменений"</string>
+    <string name="quality" msgid="179292110309050529">"Качество"</string>
+    <string name="size" msgid="4639404642236356037">"Размер"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Настройки"</string>
     <string name="unsaved" msgid="8704442449002374375">"У вас есть несохраненные изменения."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Сохранить изменения?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Сохранить и закрыть"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Сохранение..."</string>
     <string name="exit" msgid="242642957038770113">"Закрыть"</string>
     <string name="history" msgid="455767361472692409">"История"</string>
     <string name="reset" msgid="9013181350779592937">"Сброс"</string>
@@ -40,7 +49,7 @@
     <skip />
     <string name="imageState" msgid="8632586742752891968">"Эффекты"</string>
     <string name="compare_original" msgid="8140838959007796977">"Сравнить"</string>
-    <string name="apply_effect" msgid="1218288221200568947">"Применить:"</string>
+    <string name="apply_effect" msgid="1218288221200568947"></string>
     <string name="reset_effect" msgid="7712605581024929564">"Сброс"</string>
     <string name="aspect" msgid="4025244950820813059">"Формат"</string>
     <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
@@ -59,38 +68,89 @@
     <string name="sharpness" msgid="6463103068318055412">"Резкость"</string>
     <string name="contrast" msgid="2310908487756769019">"Контраст"</string>
     <string name="vibrance" msgid="3326744578577835915">"Vibrance"</string>
-    <string name="saturation" msgid="7026791551032438585">"Насыщ-сть"</string>
+    <string name="saturation" msgid="7026791551032438585">"Насыщенность"</string>
     <string name="bwfilter" msgid="8927492494576933793">"Ч/Б"</string>
     <string name="wbalance" msgid="6346581563387083613">"Авторежим"</string>
     <string name="hue" msgid="6231252147971086030">"Оттенок"</string>
     <string name="shadow_recovery" msgid="3928572915300287152">"Тени"</string>
     <string name="highlight_recovery" msgid="8262208470735204243">"Блики"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Кривые"</string>
-    <string name="vignette" msgid="934721068851885390">"Виньет-ние"</string>
+    <string name="vignette" msgid="934721068851885390">"Виньетирование"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Виньетирование"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Выдержка"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Насыщенность"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Контрастность"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Уровень"</string>
     <string name="redeye" msgid="4508883127049472069">"Красные глаза"</string>
-    <string name="imageDraw" msgid="6918552177844486656">"Подмалевок"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Рисование"</string>
     <string name="straighten" msgid="26025591664983528">"Выровнять"</string>
-    <string name="crop" msgid="5781263790107850771">"Кадрирование"</string>
+    <string name="crop" msgid="5781263790107850771">"Кадрировать"</string>
     <string name="rotate" msgid="2796802553793795371">"Повернуть"</string>
     <string name="mirror" msgid="5482518108154883096">"Отразить"</string>
     <string name="negative" msgid="6998313764388022201">"Негатив"</string>
     <string name="none" msgid="6633966646410296520">"Оригинал"</string>
     <string name="edge" msgid="7036064886242147551">"Края"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Уорхол"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Постеризация"</string>
     <string name="downsample" msgid="3552938534146980104">"Уменьшить"</string>
+    <string name="grad" msgid="546774853424848655">"Градиент"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Яркость"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Контраст"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Насыщенность"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Основной"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Красный"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Желтый"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Зеленый"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Голубой"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Синий"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Пурпурный"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Стиль"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"новый"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Красный"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Зеленый"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Синий"</string>
     <string name="draw_style" msgid="2036125061987325389">"Стиль"</string>
     <string name="draw_size" msgid="4360005386104151209">"Размер"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Тон"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Насыщенность"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Яркость"</string>
     <string name="draw_color" msgid="2119030386987211193">"Цвет"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Линии"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Маркер"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Распыление"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Очистить"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Ширина"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Границы"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Цвет"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Удалить"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Выбрать свой цвет"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Выберите цвет"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Выберите размер"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"ОК"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Как в оригинале"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Результат"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Сохранение…"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Обработка…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Сохранить этот набор настроек"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Управление настройками"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Новый набор настроек"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Название шаблона"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"О фото"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Название"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Размер"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Гистограмма"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Данные EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Добавить"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Добавить"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Оригинал"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Текущая"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Модель"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Диафрагма"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Фокусное расстояние"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Расстояние до объекта"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Дата съемки"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Единица диафрагмы"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Выдержка"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Авторское право"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7bb107f..606951c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Повернуть вправо"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Элемент не найден."</string>
     <string name="edit" msgid="1502273844748580847">"Изменить"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Простая правка"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Обработка запросов на кэширование"</string>
     <string name="caching_label" msgid="4521059045896269095">"Кэширование..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Кадрировать"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Не удалось подключиться к камере."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Камера отключена в соответствии с политикой безопасности."</string>
     <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Видеокамера"</string>
     <string name="wait" msgid="8600187532323801552">"Подождите..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Подключите USB-накопитель перед использованием камеры."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Вставьте SD-карту перед использованием камеры."</string>
@@ -234,27 +234,31 @@
     <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>
-    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Таймер обратного отсчета"</string>
+    <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>
     <item quantity="other" msgid="6455381617076792481">"%d сек."</item>
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Сигнал"</string>
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Звук таймера"</string>
     <string name="setting_off" msgid="4480039384202951946">"Выкл."</string>
     <string name="setting_on" msgid="8602246224465348901">"Вкл."</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Качество видео"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Высокое качество"</string>
     <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Низкое качество"</string>
-    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Замедленная съемка"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Замедл. съемка"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Настройки камеры"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Настройки видеокамеры"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер фото"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 мегапикс."</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Мпикс."</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Мпикс."</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Мпикс. (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"640 х 480 пикс."</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Авто"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Бесконечность"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Макро"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"АВТО"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"БЕСКОНЕЧНОСТЬ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"МАКРОСЪЕМКА"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Режим вспышки"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"РЕЖИМ ВСПЫШКИ"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Авто"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Вкл."</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Выкл."</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"АВТО"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"ВКЛ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ВЫКЛ"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Баланс белого"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"БАЛАНС БЕЛОГО"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Авто"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Лампа накаливания"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Солнечный свет"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Лампа дн. света"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Пасмурный день"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"АВТО"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ЛАМПА НАКАЛИВАНИЯ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ДНЕВНОЙ СВЕТ"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ЛАМПА ДНЕВНОГО СВЕТА"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ПАСМУРНО"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Режим съемки"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Авто"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"Эффект HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Место на USB-накопителе заканчивается. Измените настройки качества или удалите ненужные изображения и другие файлы."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Место на вашей SD-карте заканчивается. Измените настройки качества или удалите ненужные изображения и другие файлы."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Космос"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Закат"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Мои видео"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Установите устройство на твердой поверхности."\n"Затем отойдите, чтобы вас было видно в камеру."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Установите устройство на твердой поверхности.\nЗатем отойдите, чтобы вас было видно в камеру."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Нажмите, чтобы сделать фотографию во время записи."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Запись начата"</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Запись остановлена"</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Режим \"Видео\""</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Режим \"Панорама\""</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Создать панораму"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Рефокусировка"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Отмена"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Готово"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Ещё раз"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Воспроизвести видео"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Пауза"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Перезагрузить видео"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Полоса прокрутки видеоплеера"</string>
     <string name="capital_on" msgid="5491353494964003567">"I"</string>
     <string name="capital_off" msgid="7231052688467970897">"O"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Выкл."</string>
@@ -382,17 +419,19 @@
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Готово"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Задайте интервал"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"Сначала включите режим замедленной съемки."</string>
-    <string name="set_timer_help" msgid="5007708849404589472">"Таймер обратного отсчета отключен. Включите его, чтобы сделать снимок с задержкой."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Чтобы камера фотографировала с задержкой, включите эту функцию."</string>
     <string name="set_duration" msgid="5578035312407161304">"Время"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Обратный отсчет перед съемкой"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Сохранять место съемки?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Информация о месте съемки будет автоматически добавляться в описание ваших фотографий и видеозаписей."\n\n"Доступ к этим данным, а также к самим фотографиям и видео смогут получить и другие приложения."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Информация о месте съемки будет автоматически добавляться в описание ваших фотографий и видеозаписей.\n\nДоступ к этим данным, а также к самим фотографиям и видео смогут получить и другие приложения."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Нет, спасибо"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Да"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Камера"</string>
     <string name="menu_search" msgid="7580008232297437190">"Поиск"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Фото"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Альбомы"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ЕЩЁ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"НАСТРОЙКИ"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d фото"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d фото"</item>
diff --git a/res/values-si-rLK/filtershow_strings.xml b/res/values-si-rLK/filtershow_strings.xml
new file mode 100644
index 0000000..a9a22f4
--- /dev/null
+++ b/res/values-si-rLK/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"ඡායාරූප සංස්කාරක"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"පින්තුරය පූරණය කිරීමට නොහැක!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"මුල් පිටපත සංස්කරණය කළ නොහැක"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"වෝල්පේපරය සැකසේ"</string>
+    <string name="download_failure" msgid="5923323939788582895">"ඡායාරූපය බාගැනීමට නොහැකි විය, ජාලය ලබාගත නොහැක."</string>
+    <string name="original" msgid="3524493791230430897">"මුල්"</string>
+    <string name="saved" msgid="6678827180814174711">"සුරකින ලදි"</string>
+    <string name="borders" msgid="2067345080568684614">"බෝඩර"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"අස් කරන්න"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"නැවත කරන්න"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"යෙදූ විලාස පෙන්වන්න"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"යෙදූ විලාස සඟවන්න"</string>
+    <string name="export_image" msgid="3202835713172222134">"නිර්යාත කරන්න"</string>
+    <string name="print_image" msgid="1942989216591621413">"මුද්‍රණය කරන්න"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"පැතලි කළ පින්තූරය නිර්යාත කිරීම"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"නිර්යාත කළ පින්තූරය ඉතිහාසය නොමැති පිටපතක් වනු ඇත."</string>
+    <string name="quality" msgid="179292110309050529">"තත්වය"</string>
+    <string name="size" msgid="4639404642236356037">"ප්‍රමාණය"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"සැකසීම්"</string>
+    <string name="unsaved" msgid="8704442449002374375">"මෙම පින්තුරයට සුරැකුණ නැති වෙනස් කිරීම් ඇත."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"පිටවීමට පෙර සුරැකීමට ඔබට අවශ්‍යද?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"සුරැකීම සහ පිටවිම"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"සම්පූර්ණ විභේදන පින්තූරයක් සකසමින්..."</string>
+    <string name="exit" msgid="242642957038770113">"පිටවන්න"</string>
+    <string name="history" msgid="455767361472692409">"ඉතිහාසය"</string>
+    <string name="reset" msgid="9013181350779592937">"යළි පිහිටුවන්න"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"යෙදූ විලාස"</string>
+    <string name="compare_original" msgid="8140838959007796977">"සසඳන්න"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"යොදන්න"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"යළි පිහිටුවන්න"</string>
+    <string name="aspect" msgid="4025244950820813059">"ස්වරූපය"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"කිසිවක් නැත"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"නියම කළ"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"කුඩා ග්‍රහලොව"</string>
+    <string name="exposure" msgid="6526397045949374905">"නිරාවරණය"</string>
+    <string name="sharpness" msgid="6463103068318055412">"තියුණු බව"</string>
+    <string name="contrast" msgid="2310908487756769019">"ප්‍රභේදනය"</string>
+    <string name="vibrance" msgid="3326744578577835915">"පැහැපත් බව"</string>
+    <string name="saturation" msgid="7026791551032438585">"සන්තෘප්ත"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"BW පෙරනය"</string>
+    <string name="wbalance" msgid="6346581563387083613">"ස්වයං වර්ණය"</string>
+    <string name="hue" msgid="6231252147971086030">"පාට"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"සෙවණැලි"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"උද්දීපන"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"වක්‍ර"</string>
+    <string name="vignette" msgid="934721068851885390">"ග්‍රන්ථාලංකරණය"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"විග්නෙට්"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"නිරාවරණය"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"සන්තෘප්තිය"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"ප්‍රභේදනය"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"අඩු වීම"</string>
+    <string name="redeye" msgid="4508883127049472069">"රතු ඇස"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"ඇඳීම"</string>
+    <string name="straighten" msgid="26025591664983528">"ඇද හැරීම"</string>
+    <string name="crop" msgid="5781263790107850771">"කප්පාදු කිරීම"</string>
+    <string name="rotate" msgid="2796802553793795371">"කරකවන්න"</string>
+    <string name="mirror" msgid="5482518108154883096">"දර්පණය"</string>
+    <string name="negative" msgid="6998313764388022201">"දළ සේයාපටය"</string>
+    <string name="none" msgid="6633966646410296520">"කිසිවක් නැත"</string>
+    <string name="edge" msgid="7036064886242147551">"දාර"</string>
+    <string name="kmeans" msgid="2080952022674981541">"පෝස්ටරගත කරන්න"</string>
+    <string name="downsample" msgid="3552938534146980104">"කුඩාසාම්පලය"</string>
+    <string name="grad" msgid="546774853424848655">"අනුක්‍රමික"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"දීප්තිමත් බව"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"ප්‍රභේදනය"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"සන්තෘප්තිය"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"මූලික"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"රතු"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"කහ"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"කොළ"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"මයුර නිල්"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"නිල්"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"දම්පාට තද රතු"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"විලාසය"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"නව"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"රතු"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"කොළ"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"නිල්"</string>
+    <string name="draw_style" msgid="2036125061987325389">"විලාසය"</string>
+    <string name="draw_size" msgid="4360005386104151209">"ප්‍රමාණය"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"පැහැය"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"සන්තෘප්තිය"</string>
+    <string name="draw_value" msgid="6571604055161538273">"දීප්තිමත් බව"</string>
+    <string name="draw_color" msgid="2119030386987211193">"වර්ණය"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"රේඛා"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"ලකුණ"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"ස්පැටර්"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"හිස් කරන්න"</string>
+    <string name="color_border_size" msgid="8745307483517793073">"ඝනකම"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"මුලු ප්‍රමාණය"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"වර්ණය"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"හිස් කරන්න"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"අභිමත වර්ණය තෝරන්න"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"වර්ණය තෝරන්න"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"ප්‍රමාණය තෝරන්න"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"හරි"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"මුල්"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"ප්‍රතිඵලය"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"පින්තූරය සුරකමින්"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"සකසමින්..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"වර්තමාන පෙර සැකසුම සුරකින්න"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"පරිශීලක පෙර සැකසුම් කළමනාකරණය"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"නව පෙර සැකසුම"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"පෙරසැකසුම් නම"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"තොරතුරු"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"පින්තූර නම"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"පින්තූර ප්‍රමාණය"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ජාලරේඛය"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF දත්ත"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"පෙර සැකසුම"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"අනුවාදය"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"මුල්"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"වර්තමාන"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"අනුකෘතිය"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"විවරය"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"නාභි දුර"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"වස්තු දුර"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"ලබාගත් දවස"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F නැවතුම"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"නිරාවරණ කාලය"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"ප්‍රකාශන හිමිකම"</string>
+</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
new file mode 100644
index 0000000..6d97397
--- /dev/null
+++ b/res/values-si-rLK/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"ගැලරිය"</string>
+    <string name="gadget_title" msgid="259405922673466798">"පින්තූර රාමුව"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"වීඩියෝ ධාවකය"</string>
+    <string name="loading_video" msgid="4013492720121891585">"විඩියෝව පූරණය වේ…"</string>
+    <string name="loading_image" msgid="1200894415793838191">"පින්තුරය පූරණය වේ…"</string>
+    <string name="loading_account" msgid="928195413034552034">"ගිණුම පූරණය වේ…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"වීඩියෝව යළි පටන්ගන්න"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"%s වෙතින් ධාවනය යළි අරඹන්නද ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"ධාවනය නැවත පටන් ගැනීම"</string>
+    <string name="loading" msgid="7038208555304563571">"පූරණය වේ…"</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"පූරණය කළ නොහැකි විය"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"පින්තුරය පූරණය කළ නොහැකි විය"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"සිඟිති රූ නැත"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"යළි මුල සිට අරඹන්න"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"හරි"</string>
+    <string name="ok" msgid="5296833083983263293">"හරි"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"ඇරඹීමට මුහුණක් ස්පර්ශ කරන්න."</string>
+    <string name="saving_image" msgid="7270334453636349407">"පින්තූරය සුරැකේ…"</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"<xliff:g id="ALBUM_NAME">%1$s</xliff:g> වෙත පින්තූරය සුරැකේ …"</string>
+    <string name="save_error" msgid="6857408774183654970">"කප්පාදු කළ පින්තුරය සුරැකීමට නොහැකි විය."</string>
+    <string name="crop_label" msgid="521114301871349328">"පින්තූරය කප්පාදු කරන්න"</string>
+    <string name="trim_label" msgid="274203231381209979">"වීඩියෝවේ අහුකොන් කපන්න"</string>
+    <string name="select_image" msgid="7841406150484742140">"ඡායාරූපය තෝරන්න"</string>
+    <string name="select_video" msgid="4859510992798615076">"වීඩියෝව තෝරන්න"</string>
+    <string name="select_item" msgid="2816923896202086390">"අයිතමය තෝරන්න"</string>
+    <string name="select_album" msgid="1557063764849434077">"ඇල්බමය තෝරන්න"</string>
+    <string name="select_group" msgid="6744208543323307114">"කණ්ඩායම තෝරන්න"</string>
+    <string name="set_image" msgid="2331476809308010401">"ලෙස පින්තූරය සකසන්න"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"වෝල්පේපරය සකසන්න"</string>
+    <string name="wallpaper" msgid="140165383777262070">"වෝල්පේපරය සැකසේ…"</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"වෝල්පේපරය"</string>
+    <string name="delete" msgid="2839695998251824487">"මකන්න"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"තෝරගත් අයිතමය මකන්නද?"</item>
+    <item quantity="other" msgid="5874316486520635333">"තෝරාගත් අයිතම මකන්නද?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"තහවුරු කරන්න"</string>
+    <string name="cancel" msgid="3637516880917356226">"අවලංගු කරන්න"</string>
+    <string name="share" msgid="3619042788254195341">"බෙදාගන්න"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"පරිදර්ශනය බෙදා ගන්න"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"ඡායාරූපය ලෙස බෙදා ගන්න"</string>
+    <string name="deleted" msgid="6795433049119073871">"මකාදමන ලද"</string>
+    <string name="undo" msgid="2930873956446586313">"අස් කරන්න"</string>
+    <string name="select_all" msgid="3403283025220282175">"සියල්ල තෝරන්න"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"සියල්ල තෝරා නොගන්න"</string>
+    <string name="slideshow" msgid="4355906903247112975">"කදා දර්ශනය"</string>
+    <string name="details" msgid="8415120088556445230">"විස්තර"</string>
+    <string name="details_title" msgid="2611396603977441273">"අයිතම %2$d කින් %1$d:"</string>
+    <string name="close" msgid="5585646033158453043">"වසන්න"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"කැමරාව වෙත මාරු වන්න"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d තෝරා ගැනිණි"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d තෝරා ගැනිණි"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d තෝරා ගන්නා ලදි"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d තෝරා ගන්නා ලදි"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d තෝරා ගැනිණි"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d තෝරා ගන්නා ලදි"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d තෝරා ගැනිණි"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d තෝරා ගන්නා ලදි"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d තෝරා ගැනිණි"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"සිතියම මත පෙන්වන්න"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"වමට කරකවන්න"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"දකුණට කරකවන්න"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"අයිතමය සොයාගැනීමට නොහැකි විය."</string>
+    <string name="edit" msgid="1502273844748580847">"සංස්කරණය කරන්න"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"සරල සංස්කරණය"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"හැඹිලිගත කිරීමේ ඉල්ලීම් සකස් කෙරේ"</string>
+    <string name="caching_label" msgid="4521059045896269095">"හැඹිලිගත වේ…"</string>
+    <string name="crop_action" msgid="3427470284074377001">"කප්පාදු කිරීම"</string>
+    <string name="trim_action" msgid="703098114452883524">"අහුකොන් කපන්න"</string>
+    <string name="mute_action" msgid="5296241754753306251">"නිශ්ශබ්ද කරන්න"</string>
+    <string name="set_as" msgid="3636764710790507868">"ලෙස සකසන්න"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"වීඩියෝව නිශ්ශබ්ද කළ නොහැක."</string>
+    <string name="video_err" msgid="7003051631792271009">"වීඩියෝව ධාවනය කළ නොහැක."</string>
+    <string name="group_by_location" msgid="316641628989023253">"ස්ථානය මගින්"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"කාලය මගින්"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"ටැග මගින්"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"ජනතාව මගින්"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"ඇල්බමය මගින්"</string>
+    <string name="group_by_size" msgid="153766174950394155">"ප්‍රමාණය මගින්"</string>
+    <string name="untagged" msgid="7281481064509590402">"ටැග් නොකළ"</string>
+    <string name="no_location" msgid="4043624857489331676">"ස්ථානයක් නැත"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"ජාල ගැටලු හේතුවෙන් සමහර ස්ථාන හඳුනාගැනීමට නොහැකි විය."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"මෙම ඇල්බමයෙහි ඡායාරූප බාගැනීමට නොහැකි විය. පසුව යළි උත්සාහ කරන්න."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"පින්තුරය පමණී"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"වීඩියෝ පමණී"</string>
+    <string name="show_all" msgid="6963292714584735149">"පින්තුර සහ වීඩියෝ"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"ඡායාරූප ගැලරිය"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"ඡායාරූප නැත."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"<xliff:g id="FOLDER_NAME">%s</xliff:g> වෙත කප්පාදු කළ පින්තුරය සුරැකිණි."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"ඇල්බම ලබා ගත නොහැක."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O පින්තුර/වීඩියෝ ලබාගත හැක."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"පළ කිරීම්"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"නොබැඳිව ලබාගත හැකි කිරීම."</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"නැවුම් කරන්න"</string>
+    <string name="done" msgid="217672440064436595">"හරි"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%2$d හි %1$d අයිතම:"</string>
+    <string name="title" msgid="7622928349908052569">"මාතෘකාව"</string>
+    <string name="description" msgid="3016729318096557520">"විස්තරය"</string>
+    <string name="time" msgid="1367953006052876956">"කාලය"</string>
+    <string name="location" msgid="3432705876921618314">"පිහිටීම"</string>
+    <string name="path" msgid="4725740395885105824">"මග"</string>
+    <string name="width" msgid="9215847239714321097">"පළල"</string>
+    <string name="height" msgid="3648885449443787772">"උස"</string>
+    <string name="orientation" msgid="4958327983165245513">"දිශානතිය"</string>
+    <string name="duration" msgid="8160058911218541616">"කාල සීමාව"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME වර්ගය"</string>
+    <string name="file_size" msgid="8486169301588318915">"ගොනු ප්‍රමාණය"</string>
+    <string name="maker" msgid="7921835498034236197">"නිමැවුම්කරු"</string>
+    <string name="model" msgid="8240207064064337366">"මාදිලිය"</string>
+    <string name="flash" msgid="2816779031261147723">"Flash"</string>
+    <string name="aperture" msgid="5920657630303915195">"විවරය"</string>
+    <string name="focal_length" msgid="1291383769749877010">"නාභි දුර"</string>
+    <string name="white_balance" msgid="1582509289994216078">"සුදු සමබරතාව"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"නිරාවරණ කාලය"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"අතින් කරන"</string>
+    <string name="auto" msgid="4296941368722892821">"ස්වයංක්‍රීය"</string>
+    <string name="flash_on" msgid="7891556231891837284">"සැණෙලි පත්තු කරන ලදී"</string>
+    <string name="flash_off" msgid="1445443413822680010">"සැණෙලි නැත"</string>
+    <string name="unknown" msgid="3506693015896912952">"නොදනී"</string>
+    <string name="ffx_original" msgid="372686331501281474">"මුල්"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"වින්ටාජ්"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"ක්ෂණික"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"විරංජනය කරන්න"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"නිල්"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"ක/සු"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"පන්ච්"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X ක්‍රියාවලිය"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"කෝපි වර්ණ"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"ලිතෝ"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"ඇල්බමය නොබැඳිව ලබාගත හැකි කිරීම."</item>
+    <item quantity="other" msgid="4948604338155959389">"ඇල්බමය නොබැඳිව ලබාගත හැකි කිරීම."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"මෙම අයිතමය ස්ථානිකව ගබඩා කර ඇති අතර නොබැඳිව ලබා ගත හැක."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"සියලු ඇල්බම"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"ස්ථානික ඇල්බම"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP උපාංග"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa ඇල්බම"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> නිදහස්"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> හෝ පහළ"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> හෝ ඉහළ"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> සිට <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"ආයාත කරන්න"</string>
+    <string name="import_complete" msgid="3875040287486199999">"ආයාත කිරීම සම්පුර්ණයි"</string>
+    <string name="import_fail" msgid="8497942380703298808">"ආයාත කිරීම අසාර්ථකයි"</string>
+    <string name="camera_connected" msgid="916021826223448591">"කැමරාව සම්බන්ධ කරන ලදි."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"කැමරාව විසන්ධි කරන ලදි."</string>
+    <string name="click_import" msgid="6407959065464291972">"ආයාත කිරීමට මෙහි ස්පර්ශ කරන්න"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"ඇල්බමයක් තෝරන්න"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"සියලු පින්තුර කළවම් කරන්න"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"පින්තුරයක් තෝරන්න"</string>
+    <string name="widget_type" msgid="1364653978966343448">"පින්තුර තෝරන්න"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"කදා දර්ශනය"</string>
+    <string name="albums" msgid="7320787705180057947">"ඇල්බම"</string>
+    <string name="times" msgid="2023033894889499219">"වාර ගණන"</string>
+    <string name="locations" msgid="6649297994083130305">"ස්ථාන:"</string>
+    <string name="people" msgid="4114003823747292747">"ජනතාව"</string>
+    <string name="tags" msgid="5539648765482935955">"ටැගයන්"</string>
+    <string name="group_by" msgid="4308299657902209357">"කාණ්ඩයම මගින්"</string>
+    <string name="settings" msgid="1534847740615665736">"සැකසීම්"</string>
+    <string name="add_account" msgid="4271217504968243974">"ගිණුමක් එක් කරන්න"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"කැමරාව"</string>
+    <string name="folder_download" msgid="7186215137642323932">"බාගන්න"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"සංස්කරණය කළ සබැඳි ඡායාරූප"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"ආයාත කළ"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"තිර රුව"</string>
+    <string name="help" msgid="7368960711153618354">"උදවු"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"ආචයනයක් නැත."</string>
+    <string name="no_external_storage" msgid="95726173164068417">"බාහිර ආචයනයක් ලබා ගත නොහැක"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Filmstrip දසුන"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ජාල දසුන"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"සම්පුර්ණ තිරයේ පෙනුම"</string>
+    <string name="trimming" msgid="9122385768369143997">"අහුකොන් කැපීම"</string>
+    <string name="muting" msgid="5094925919589915324">"නිහඬ කිරීම"</string>
+    <string name="please_wait" msgid="7296066089146487366">"කරුණාකර රැඳී සිටින්න"</string>
+    <string name="save_into" msgid="9155488424829609229">"<xliff:g id="ALBUM_NAME">%1$s</xliff:g> වෙත වීඩියෝව සුරැකේ …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"පෑහීමට නොහැක : ඉලක්ක වීඩියෝව ඉතා කෙටිය"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"පරිදර්ශනය ප්‍රවාචනය"</string>
+    <string name="save" msgid="613976532235060516">"සුරකින්න"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"අන්තර්ගතය පරිලෝකනය වේ..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d අයිතම ස්කෑන් කරන ලදී"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d අයිතමය ස්කෑන් කරන ලදී"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d අයිතම ස්කෑන් කරන ලදී"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"අනුපිළිවෙලට සැකසේ..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"පරිලෝකනය කිරීම නිමයි"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"ආයාත කරමින්..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"මෙම උපාංගය මත ආයාත කිරීම සඳහා අන්තර්ගතය ලබාගත නොහැක."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"MTP උපාංගයක් සබැඳී නොමැත"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"කැමරා දෝෂය"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"කැමරාව වෙත සම්බන්ධ කළ නොහැක."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"ආරක්ෂණ ප්‍රතිපත්ති නිසා කැමරාව අබල කර ඇත."</string>
+    <string name="camera_label" msgid="6346560772074764302">"කැමරාව"</string>
+    <string name="wait" msgid="8600187532323801552">"කරුණාකර රැඳී සිටින්න..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"කැමරාව භාවිතා කිරීමට පෙර USB ආචිත නංවන්න."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"කැමරාව භාවිතා කිරීමට පෙර SD කාඩ් පතක් ඇතුලු කරන්න."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB ආචයනය පිළියෙළ කෙරේ…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD කාඩ්පත පිළියෙළ කෙරේ…"</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB ආචයනයට ප්‍රවේශ විය නොහැක."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD කාඩ් පතට ප්‍රවේශ විය නොහැක."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"අවලංගු කිරීම"</string>
+    <string name="review_ok" msgid="1156261588693116433">"හරි"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"කාලය ඉකුත්වීමේ පටිගත කිරීම"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"කැමරාව තෝරන්න"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d තත්පර"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"ආපස්සට ගණන් කිරීමේ බීප් නාදය"</string>
+    <string name="setting_off" msgid="4480039384202951946">"අක්‍රිය කරන්න"</string>
+    <string name="setting_on" msgid="8602246224465348901">"සක්‍රීයයි"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"වීඩියෝ ගුණත්වය"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"ඉහළ"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"පහල"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"කාලය ඉකුත්වීම"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"කැමරා සැකසීම්"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"කැම්කෝඩර සැකසීම්"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"පින්තූර ප්‍රමාණය"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M පික්සල්"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"පික්සල 8M"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"පික්සල 5M"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M පික්සල්"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"පික්සල 3M"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"පික්සල 2M"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M පික්සල් (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"පික්සල 1.3M"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"පික්සල 1M"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"නාභිගත ප්‍රකාරය"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ස්වයං"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"අනන්තය"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"මැක්‍රො"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ස්වයං"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"අනන්තය"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"මැක්‍රො"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"සැණෙළි ප්‍රකාරය"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"සැණෙළි ආකාරය"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"ස්වයංක්‍රීය"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"සක්‍රීයයි"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"අක්‍රිය කරන්න"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"සැණෙලි ස්වයං"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"සැණෙලිය සක්‍රියයි"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"සැණෙළිය අක්‍රියයි"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"සුදු සමබරතාව"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"සුදු සමබරතාවය"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"ස්වයංක්‍රීය"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"තාපදීප්ත"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"දිවා ආලෝකය"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ප්‍රතිදීපන"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"නොපැහැදිලි"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ස්වයං"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"තාපදීප්ත"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"දිවා ආලෝකය"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ප්‍රතිදීපන"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"නොපැහැදිලි"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"සිදුවීම් ආකාරය"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"ස්වයංක්‍රීය"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"ක්‍රියාව"</string>
+    <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>
+    <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>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"COUNTDOWN කාල යන්ත්‍රය"</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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"ඔබගේ USB ආචයනයේ ඉඩ ඉවර වෙමින් පවතී. ගුණත්ව සැකසීම් වෙනස් කරන්න නැතහොත් සමහර පින්තුර හෝ වෙනත් ගොනු මකන්න."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"ඔබගේ SD කාඩ් පතේ ඉඩ ඉවර වෙමින් පවතී. ගුණත්ව සැකසීම් වෙනස් කරන්න හෝ සමහර පින්තුරය හෝ වෙනත් ගොනු මකන්න."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"ප්‍රමාණයේ සීමාව ලඟාවී ඇත."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"ඉතා වේගවත්"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"පරිදර්ශනය පිළියෙල වේ"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"පරිදර්ශනය සුරැකිය නොහැක."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"පැනරෝමා"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"පරිදර්ශනය ග්‍රහණය කෙරේ"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"පෙර පරිදර්ශනය සඳහා රැඳී සිටී"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"සුරැකේ...."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"පරිදර්ශනය ප්‍රවාචනය"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"නාභිගත කිරීමට ස්පර්ශ කරන්න"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"විලාස"</string>
+    <string name="effect_none" msgid="3601545724573307541">"කිසිවක් නැත"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"මිරිකන්න"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ලොකු ඇස්"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"ලොකු කට"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"කුඩා කට"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"ලොකු නහය"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"කුඩා ඇස්"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"අවකාශයෙහි"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"හිරු බැසීම"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"ඔබගේ වීඩියෝව"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"ඔබගේ උපාංගය පැත්තකින් තබන්න.\nමොහොතකට දසුනෙන් ඈත් වන්න."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"පටිගත කිරීම අතරතුර ඡායාරූපයක් ගැනීමට ස්පර්ශ කරන්න."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"වීඩියෝව පටිගත කිරීම ඇරඹී ඇත."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"වීඩියෝව පටිගත කිරීම නැවතී ඇත."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"විශේෂ විලාස සක්‍රිය විට වීඩියෝ සැණ රුව අබල කර ඇත."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"විලාස හිස් කරන්න"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"මෝඩ මුහුණු"</string>
+    <string name="effect_background" msgid="6579360207378171022">"පසුබිම"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"සංවාරක බොත්තම"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"මෙනු බොත්තම"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"බොහොමයක් මෑතකාලීන ජායාරූපය"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"ඉදිරිපස සහ පසුපස කැමරා ස්විචය"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"කැමරාව, වීඩියෝව, හෝ පරිදර්ශනය තෝරන්න"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"වැඩිපුර සැකසීම් පාලන"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"සැකසීම් පාලන වසන්න"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"විශාලනය පාලන"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s අඩු කරන්න"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s වැඩි කරන්න"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s සලකුණු කොටුව"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"ඡායාරූපය වෙත මාරු වන්න"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"වීඩියෝව වෙත මාරු වන්න"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"පරිදර්ශනය වෙත මාරු වන්න"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"නව පරිදර්ශනය වෙත මාරු වන්න"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"නැවත නාභිගත කිරීමට මාරුවෙන්න"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"අවලංගු කිරීම සමාලෝචනය කරන්න"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"සමාලෝචනය නිමය"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"යළිගැනීම සමාලෝචනය කරන්න"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"වීඩියෝව ධාවනය කරන්න"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"විඩියෝව විරාම කරන්න"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"වීඩියෝව යළි පූරණය කරන්න"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"වීඩියෝ ධාවක කාල තීරය"</string>
+    <string name="capital_on" msgid="5491353494964003567">"සක්‍රිය"</string>
+    <string name="capital_off" msgid="7231052688467970897">"අක්‍රිය"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"අක්‍රිය කරන්න"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"තත්පර 0.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"තත්පර 1"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"තත්පර 1.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"තත්පර 2"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"තත්පර 2.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"තත්පර 3"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"තත්පර 4"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"තත්පර 5"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"තත්පර 6"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"තත්පර 10"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"තත්පර 12"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"තත්පර 15"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"තත්පර 24"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"මිනිත්තු 0.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"මිනිත්තු 1"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"මිනිත්තු 1.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"මිනිත්තු 2"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"මිනිත්තු 2.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"මිනිත්තු 3"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"මිනිත්තු 4"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"මිනිත්තු 5"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"මිනිත්තු 6"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"මිනිත්තු 10"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"මිනිත්තු 12"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"මිනිත්තු 15"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"මිනිත්තු 24"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"පැය 0.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"පැය 1"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"පැය 1.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"පැය 2"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"පැය 2.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"පැය 3"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"පැය 4"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"පැය 5"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"පැය 6"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"පැය 10"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"පැය 12"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"පැය 15"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"පැය 24"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"තත්පර"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"මිනිත්තු"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"පැය"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"හරි"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"කාල අන්තරය පිහිටුවන්න"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"කාලය ඉකුත්වීමේ විශේෂාංගය අක්‍රියයි. කාල අන්තරය පිහිටුවීමට එය සක්‍රිය කරන්න."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"ගණනය කිරීමේ මුහුර්තකය අක්‍රියයි. පින්තූරයක් ගැනීමට පෙර ගණනය කිරීමට එය සක්‍රිය කරන්න."</string>
+    <string name="set_duration" msgid="5578035312407161304">"තත්පර වලින් කාල පරාස සකසන්න"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"ඡායාරූපයක් ගැනීමට ආපස්සට ගණන් කෙරේ"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"ඡායාරූප ස්ථාන මතකද?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"ඔබගේ ඡායාරූප සහ වීඩියෝ ඒවා ගත් ස්ථානය සමගින් ටැග් කරන්න.\n\nවෙනත් යෙදුම් වලට ඔබගේ සුරැකි පින්තුර සමගින් මෙම තොරතුරු වෙත ප්‍රවේශ විය හැක."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"එපා ස්තුතියි"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"ඔව්"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"කැමරාව"</string>
+    <string name="menu_search" msgid="7580008232297437190">"සෙවීම"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"ඡායාරූප"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"ඇල්බම"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"තව විකල්ප"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"සැකසීම්"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d ඡායාරූපය"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d ඡායාරූප"</item>
+  </plurals>
+</resources>
diff --git a/res/values-si/filtershow_strings.xml b/res/values-si/filtershow_strings.xml
new file mode 100644
index 0000000..5a8535e
--- /dev/null
+++ b/res/values-si/filtershow_strings.xml
@@ -0,0 +1,145 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"ඡායාරූප සංස්කාරක"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"පින්තුරය පූරණය කිරීමට නොහැක!"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"වෝල්පේපරය සැකසේ"</string>
+    <string name="download_failure" msgid="5923323939788582895">"ඡායාරූපය බාගැනීමට නොහැකි විය, ජාලය ලබාගත නොහැක."</string>
+    <string name="original" msgid="3524493791230430897">"මුල්"</string>
+    <string name="saved" msgid="6678827180814174711">"සුරකින ලදි"</string>
+    <string name="borders" msgid="2067345080568684614">"බෝඩර"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"අස් කරන්න"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"නැවත කරන්න"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"යෙදූ විලාස පෙන්වන්න"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"යෙදූ විලාස සඟවන්න"</string>
+    <string name="export_image" msgid="3202835713172222134">"නිර්යාත කරන්න"</string>
+    <string name="print_image" msgid="1942989216591621413">"මුද්‍රණය කරන්න"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"පැතලි කළ පින්තූරය නිර්යාත කිරීම"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"නිර්යාත කළ පින්තූරය ඉතිහාසය නොමැති පිටපතක් වනු ඇත."</string>
+    <string name="quality" msgid="179292110309050529">"තත්වය"</string>
+    <string name="size" msgid="4639404642236356037">"ප්‍රමාණය"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"සැකසීම්"</string>
+    <string name="unsaved" msgid="8704442449002374375">"මෙම පින්තුරයට සුරැකුණ නැති වෙනස් කිරීම් ඇත."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"පිටවීමට පෙර සුරැකීමට ඔබට අවශ්‍යද?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"සුරැකීම සහ පිටවිම"</string>
+    <string name="exit" msgid="242642957038770113">"පිටවන්න"</string>
+    <string name="history" msgid="455767361472692409">"ඉතිහාසය"</string>
+    <string name="reset" msgid="9013181350779592937">"යළි පිහිටුවන්න"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"යෙදූ විලාස"</string>
+    <string name="compare_original" msgid="8140838959007796977">"සසඳන්න"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"යොදන්න"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"යළි පිහිටුවන්න"</string>
+    <string name="aspect" msgid="4025244950820813059">"ස්වරූපය"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"කිසිවක් නැත"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"නියම කළ"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"කුඩා ග්‍රහලොව"</string>
+    <string name="exposure" msgid="6526397045949374905">"නිරාවරණය"</string>
+    <string name="sharpness" msgid="6463103068318055412">"තියුණු බව"</string>
+    <string name="contrast" msgid="2310908487756769019">"ප්‍රභේදනය"</string>
+    <string name="vibrance" msgid="3326744578577835915">"පැහැපත් බව"</string>
+    <string name="saturation" msgid="7026791551032438585">"සන්තෘප්ත"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"BW පෙරනය"</string>
+    <string name="wbalance" msgid="6346581563387083613">"ස්වයං වර්ණය"</string>
+    <string name="hue" msgid="6231252147971086030">"පාට"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"සෙවණැලි"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"උද්දීපන"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"වක්‍ර"</string>
+    <string name="vignette" msgid="934721068851885390">"ග්‍රන්ථාලංකරණය"</string>
+    <string name="redeye" msgid="4508883127049472069">"රතු ඇස"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"ඇඳීම"</string>
+    <string name="straighten" msgid="26025591664983528">"ඇද හැරීම"</string>
+    <string name="crop" msgid="5781263790107850771">"කප්පාදු කිරීම"</string>
+    <string name="rotate" msgid="2796802553793795371">"කරකවන්න"</string>
+    <string name="mirror" msgid="5482518108154883096">"දර්පණය"</string>
+    <string name="negative" msgid="6998313764388022201">"දළ සේයාපටය"</string>
+    <string name="none" msgid="6633966646410296520">"කිසිවක් නැත"</string>
+    <string name="edge" msgid="7036064886242147551">"දාර"</string>
+    <string name="kmeans" msgid="2080952022674981541">"පෝස්ටරගත කරන්න"</string>
+    <string name="downsample" msgid="3552938534146980104">"කුඩාසාම්පලය"</string>
+    <string name="grad" msgid="546774853424848655">"අනුක්‍රමික"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"දීප්තිමත් බව"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"ප්‍රභේදනය"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"සන්තෘප්තිය"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"මූලික"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"රතු"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"කහ"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"කොළ"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"මයුර නිල්"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"නිල්"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"දම්පාට තද රතු"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"විලාසය"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"නව"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"රතු"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"කොළ"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"නිල්"</string>
+    <string name="draw_style" msgid="2036125061987325389">"විලාසය"</string>
+    <string name="draw_size" msgid="4360005386104151209">"ප්‍රමාණය"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"පැහැය"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"සන්තෘප්තිය"</string>
+    <string name="draw_value" msgid="6571604055161538273">"දීප්තිමත් බව"</string>
+    <string name="draw_color" msgid="2119030386987211193">"වර්ණය"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"රේඛා"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"ලකුණ"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"ස්පැටර්"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"හිස් කරන්න"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"අභිමත වර්ණය තෝරන්න"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"වර්ණය තෝරන්න"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"ප්‍රමාණය තෝරන්න"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"හරි"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"මුල්"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"ප්‍රතිඵලය"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"පින්තූරය සුරකමින්"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"සකසමින්..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"වර්තමාන පෙර සැකසුම සුරකින්න"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"පරිශීලක පෙර සැකසුම් කළමනාකරණය"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"නව පෙර සැකසුම"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"පෙරසැකසුම් නම"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"තොරතුරු"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"පින්තූර නම"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"පින්තූර ප්‍රමාණය"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ජාලරේඛය"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF දත්ත"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"පෙර සැකසුම"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"අනුවාදය"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"මුල්"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"වර්තමාන"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"අනුකෘතිය"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"විවරය"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"නාභි දුර"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"වස්තු දුර"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"ලබාගත් දවස"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F නැවතුම"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"නිරාවරණ කාලය"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"ප්‍රකාශන හිමිකම"</string>
+</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
new file mode 100644
index 0000000..6d97397
--- /dev/null
+++ b/res/values-si/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"ගැලරිය"</string>
+    <string name="gadget_title" msgid="259405922673466798">"පින්තූර රාමුව"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"වීඩියෝ ධාවකය"</string>
+    <string name="loading_video" msgid="4013492720121891585">"විඩියෝව පූරණය වේ…"</string>
+    <string name="loading_image" msgid="1200894415793838191">"පින්තුරය පූරණය වේ…"</string>
+    <string name="loading_account" msgid="928195413034552034">"ගිණුම පූරණය වේ…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"වීඩියෝව යළි පටන්ගන්න"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"%s වෙතින් ධාවනය යළි අරඹන්නද ?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"ධාවනය නැවත පටන් ගැනීම"</string>
+    <string name="loading" msgid="7038208555304563571">"පූරණය වේ…"</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"පූරණය කළ නොහැකි විය"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"පින්තුරය පූරණය කළ නොහැකි විය"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"සිඟිති රූ නැත"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"යළි මුල සිට අරඹන්න"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"හරි"</string>
+    <string name="ok" msgid="5296833083983263293">"හරි"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"ඇරඹීමට මුහුණක් ස්පර්ශ කරන්න."</string>
+    <string name="saving_image" msgid="7270334453636349407">"පින්තූරය සුරැකේ…"</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"<xliff:g id="ALBUM_NAME">%1$s</xliff:g> වෙත පින්තූරය සුරැකේ …"</string>
+    <string name="save_error" msgid="6857408774183654970">"කප්පාදු කළ පින්තුරය සුරැකීමට නොහැකි විය."</string>
+    <string name="crop_label" msgid="521114301871349328">"පින්තූරය කප්පාදු කරන්න"</string>
+    <string name="trim_label" msgid="274203231381209979">"වීඩියෝවේ අහුකොන් කපන්න"</string>
+    <string name="select_image" msgid="7841406150484742140">"ඡායාරූපය තෝරන්න"</string>
+    <string name="select_video" msgid="4859510992798615076">"වීඩියෝව තෝරන්න"</string>
+    <string name="select_item" msgid="2816923896202086390">"අයිතමය තෝරන්න"</string>
+    <string name="select_album" msgid="1557063764849434077">"ඇල්බමය තෝරන්න"</string>
+    <string name="select_group" msgid="6744208543323307114">"කණ්ඩායම තෝරන්න"</string>
+    <string name="set_image" msgid="2331476809308010401">"ලෙස පින්තූරය සකසන්න"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"වෝල්පේපරය සකසන්න"</string>
+    <string name="wallpaper" msgid="140165383777262070">"වෝල්පේපරය සැකසේ…"</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"වෝල්පේපරය"</string>
+    <string name="delete" msgid="2839695998251824487">"මකන්න"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"තෝරගත් අයිතමය මකන්නද?"</item>
+    <item quantity="other" msgid="5874316486520635333">"තෝරාගත් අයිතම මකන්නද?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"තහවුරු කරන්න"</string>
+    <string name="cancel" msgid="3637516880917356226">"අවලංගු කරන්න"</string>
+    <string name="share" msgid="3619042788254195341">"බෙදාගන්න"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"පරිදර්ශනය බෙදා ගන්න"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"ඡායාරූපය ලෙස බෙදා ගන්න"</string>
+    <string name="deleted" msgid="6795433049119073871">"මකාදමන ලද"</string>
+    <string name="undo" msgid="2930873956446586313">"අස් කරන්න"</string>
+    <string name="select_all" msgid="3403283025220282175">"සියල්ල තෝරන්න"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"සියල්ල තෝරා නොගන්න"</string>
+    <string name="slideshow" msgid="4355906903247112975">"කදා දර්ශනය"</string>
+    <string name="details" msgid="8415120088556445230">"විස්තර"</string>
+    <string name="details_title" msgid="2611396603977441273">"අයිතම %2$d කින් %1$d:"</string>
+    <string name="close" msgid="5585646033158453043">"වසන්න"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"කැමරාව වෙත මාරු වන්න"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"%1$d තෝරා ගැනිණි"</item>
+    <item quantity="one" msgid="2478365152745637768">"%1$d තෝරා ගැනිණි"</item>
+    <item quantity="other" msgid="754722656147810487">"%1$d තෝරා ගන්නා ලදි"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"%1$d තෝරා ගන්නා ලදි"</item>
+    <item quantity="one" msgid="6184377003099987825">"%1$d තෝරා ගැනිණි"</item>
+    <item quantity="other" msgid="53105607141906130">"%1$d තෝරා ගන්නා ලදි"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"%1$d තෝරා ගැනිණි"</item>
+    <item quantity="one" msgid="5030162638216034260">"%1$d තෝරා ගන්නා ලදි"</item>
+    <item quantity="other" msgid="3512041363942842738">"%1$d තෝරා ගැනිණි"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"සිතියම මත පෙන්වන්න"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"වමට කරකවන්න"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"දකුණට කරකවන්න"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"අයිතමය සොයාගැනීමට නොහැකි විය."</string>
+    <string name="edit" msgid="1502273844748580847">"සංස්කරණය කරන්න"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"සරල සංස්කරණය"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"හැඹිලිගත කිරීමේ ඉල්ලීම් සකස් කෙරේ"</string>
+    <string name="caching_label" msgid="4521059045896269095">"හැඹිලිගත වේ…"</string>
+    <string name="crop_action" msgid="3427470284074377001">"කප්පාදු කිරීම"</string>
+    <string name="trim_action" msgid="703098114452883524">"අහුකොන් කපන්න"</string>
+    <string name="mute_action" msgid="5296241754753306251">"නිශ්ශබ්ද කරන්න"</string>
+    <string name="set_as" msgid="3636764710790507868">"ලෙස සකසන්න"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"වීඩියෝව නිශ්ශබ්ද කළ නොහැක."</string>
+    <string name="video_err" msgid="7003051631792271009">"වීඩියෝව ධාවනය කළ නොහැක."</string>
+    <string name="group_by_location" msgid="316641628989023253">"ස්ථානය මගින්"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"කාලය මගින්"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"ටැග මගින්"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"ජනතාව මගින්"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"ඇල්බමය මගින්"</string>
+    <string name="group_by_size" msgid="153766174950394155">"ප්‍රමාණය මගින්"</string>
+    <string name="untagged" msgid="7281481064509590402">"ටැග් නොකළ"</string>
+    <string name="no_location" msgid="4043624857489331676">"ස්ථානයක් නැත"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"ජාල ගැටලු හේතුවෙන් සමහර ස්ථාන හඳුනාගැනීමට නොහැකි විය."</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"මෙම ඇල්බමයෙහි ඡායාරූප බාගැනීමට නොහැකි විය. පසුව යළි උත්සාහ කරන්න."</string>
+    <string name="show_images_only" msgid="7263218480867672653">"පින්තුරය පමණී"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"වීඩියෝ පමණී"</string>
+    <string name="show_all" msgid="6963292714584735149">"පින්තුර සහ වීඩියෝ"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"ඡායාරූප ගැලරිය"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"ඡායාරූප නැත."</string>
+    <string name="crop_saved" msgid="1595985909779105158">"<xliff:g id="FOLDER_NAME">%s</xliff:g> වෙත කප්පාදු කළ පින්තුරය සුරැකිණි."</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"ඇල්බම ලබා ගත නොහැක."</string>
+    <string name="empty_album" msgid="4542880442593595494">"O පින්තුර/වීඩියෝ ලබාගත හැක."</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"පළ කිරීම්"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"නොබැඳිව ලබාගත හැකි කිරීම."</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"නැවුම් කරන්න"</string>
+    <string name="done" msgid="217672440064436595">"හරි"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"%2$d හි %1$d අයිතම:"</string>
+    <string name="title" msgid="7622928349908052569">"මාතෘකාව"</string>
+    <string name="description" msgid="3016729318096557520">"විස්තරය"</string>
+    <string name="time" msgid="1367953006052876956">"කාලය"</string>
+    <string name="location" msgid="3432705876921618314">"පිහිටීම"</string>
+    <string name="path" msgid="4725740395885105824">"මග"</string>
+    <string name="width" msgid="9215847239714321097">"පළල"</string>
+    <string name="height" msgid="3648885449443787772">"උස"</string>
+    <string name="orientation" msgid="4958327983165245513">"දිශානතිය"</string>
+    <string name="duration" msgid="8160058911218541616">"කාල සීමාව"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME වර්ගය"</string>
+    <string name="file_size" msgid="8486169301588318915">"ගොනු ප්‍රමාණය"</string>
+    <string name="maker" msgid="7921835498034236197">"නිමැවුම්කරු"</string>
+    <string name="model" msgid="8240207064064337366">"මාදිලිය"</string>
+    <string name="flash" msgid="2816779031261147723">"Flash"</string>
+    <string name="aperture" msgid="5920657630303915195">"විවරය"</string>
+    <string name="focal_length" msgid="1291383769749877010">"නාභි දුර"</string>
+    <string name="white_balance" msgid="1582509289994216078">"සුදු සමබරතාව"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"නිරාවරණ කාලය"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"mm"</string>
+    <string name="manual" msgid="6608905477477607865">"අතින් කරන"</string>
+    <string name="auto" msgid="4296941368722892821">"ස්වයංක්‍රීය"</string>
+    <string name="flash_on" msgid="7891556231891837284">"සැණෙලි පත්තු කරන ලදී"</string>
+    <string name="flash_off" msgid="1445443413822680010">"සැණෙලි නැත"</string>
+    <string name="unknown" msgid="3506693015896912952">"නොදනී"</string>
+    <string name="ffx_original" msgid="372686331501281474">"මුල්"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"වින්ටාජ්"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"ක්ෂණික"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"විරංජනය කරන්න"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"නිල්"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"ක/සු"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"පන්ච්"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X ක්‍රියාවලිය"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"කෝපි වර්ණ"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"ලිතෝ"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"ඇල්බමය නොබැඳිව ලබාගත හැකි කිරීම."</item>
+    <item quantity="other" msgid="4948604338155959389">"ඇල්බමය නොබැඳිව ලබාගත හැකි කිරීම."</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"මෙම අයිතමය ස්ථානිකව ගබඩා කර ඇති අතර නොබැඳිව ලබා ගත හැක."</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"සියලු ඇල්බම"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"ස්ථානික ඇල්බම"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP උපාංග"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa ඇල්බම"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"<xliff:g id="BYTES">%s</xliff:g> නිදහස්"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> හෝ පහළ"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> හෝ ඉහළ"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> සිට <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"ආයාත කරන්න"</string>
+    <string name="import_complete" msgid="3875040287486199999">"ආයාත කිරීම සම්පුර්ණයි"</string>
+    <string name="import_fail" msgid="8497942380703298808">"ආයාත කිරීම අසාර්ථකයි"</string>
+    <string name="camera_connected" msgid="916021826223448591">"කැමරාව සම්බන්ධ කරන ලදි."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"කැමරාව විසන්ධි කරන ලදි."</string>
+    <string name="click_import" msgid="6407959065464291972">"ආයාත කිරීමට මෙහි ස්පර්ශ කරන්න"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"ඇල්බමයක් තෝරන්න"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"සියලු පින්තුර කළවම් කරන්න"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"පින්තුරයක් තෝරන්න"</string>
+    <string name="widget_type" msgid="1364653978966343448">"පින්තුර තෝරන්න"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"කදා දර්ශනය"</string>
+    <string name="albums" msgid="7320787705180057947">"ඇල්බම"</string>
+    <string name="times" msgid="2023033894889499219">"වාර ගණන"</string>
+    <string name="locations" msgid="6649297994083130305">"ස්ථාන:"</string>
+    <string name="people" msgid="4114003823747292747">"ජනතාව"</string>
+    <string name="tags" msgid="5539648765482935955">"ටැගයන්"</string>
+    <string name="group_by" msgid="4308299657902209357">"කාණ්ඩයම මගින්"</string>
+    <string name="settings" msgid="1534847740615665736">"සැකසීම්"</string>
+    <string name="add_account" msgid="4271217504968243974">"ගිණුමක් එක් කරන්න"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"කැමරාව"</string>
+    <string name="folder_download" msgid="7186215137642323932">"බාගන්න"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"සංස්කරණය කළ සබැඳි ඡායාරූප"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"ආයාත කළ"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"තිර රුව"</string>
+    <string name="help" msgid="7368960711153618354">"උදවු"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"ආචයනයක් නැත."</string>
+    <string name="no_external_storage" msgid="95726173164068417">"බාහිර ආචයනයක් ලබා ගත නොහැක"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"Filmstrip දසුන"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"ජාල දසුන"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"සම්පුර්ණ තිරයේ පෙනුම"</string>
+    <string name="trimming" msgid="9122385768369143997">"අහුකොන් කැපීම"</string>
+    <string name="muting" msgid="5094925919589915324">"නිහඬ කිරීම"</string>
+    <string name="please_wait" msgid="7296066089146487366">"කරුණාකර රැඳී සිටින්න"</string>
+    <string name="save_into" msgid="9155488424829609229">"<xliff:g id="ALBUM_NAME">%1$s</xliff:g> වෙත වීඩියෝව සුරැකේ …"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"පෑහීමට නොහැක : ඉලක්ක වීඩියෝව ඉතා කෙටිය"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"පරිදර්ශනය ප්‍රවාචනය"</string>
+    <string name="save" msgid="613976532235060516">"සුරකින්න"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"අන්තර්ගතය පරිලෝකනය වේ..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"%1$d අයිතම ස්කෑන් කරන ලදී"</item>
+    <item quantity="one" msgid="4340019444460561648">"%1$d අයිතමය ස්කෑන් කරන ලදී"</item>
+    <item quantity="other" msgid="3138021473860555499">"%1$d අයිතම ස්කෑන් කරන ලදී"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"අනුපිළිවෙලට සැකසේ..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"පරිලෝකනය කිරීම නිමයි"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"ආයාත කරමින්..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"මෙම උපාංගය මත ආයාත කිරීම සඳහා අන්තර්ගතය ලබාගත නොහැක."</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"MTP උපාංගයක් සබැඳී නොමැත"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"කැමරා දෝෂය"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"කැමරාව වෙත සම්බන්ධ කළ නොහැක."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"ආරක්ෂණ ප්‍රතිපත්ති නිසා කැමරාව අබල කර ඇත."</string>
+    <string name="camera_label" msgid="6346560772074764302">"කැමරාව"</string>
+    <string name="wait" msgid="8600187532323801552">"කරුණාකර රැඳී සිටින්න..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"කැමරාව භාවිතා කිරීමට පෙර USB ආචිත නංවන්න."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"කැමරාව භාවිතා කිරීමට පෙර SD කාඩ් පතක් ඇතුලු කරන්න."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB ආචයනය පිළියෙළ කෙරේ…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD කාඩ්පත පිළියෙළ කෙරේ…"</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB ආචයනයට ප්‍රවේශ විය නොහැක."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD කාඩ් පතට ප්‍රවේශ විය නොහැක."</string>
+    <string name="review_cancel" msgid="8188009385853399254">"අවලංගු කිරීම"</string>
+    <string name="review_ok" msgid="1156261588693116433">"හරි"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"කාලය ඉකුත්වීමේ පටිගත කිරීම"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"කැමරාව තෝරන්න"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d තත්පර"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"ආපස්සට ගණන් කිරීමේ බීප් නාදය"</string>
+    <string name="setting_off" msgid="4480039384202951946">"අක්‍රිය කරන්න"</string>
+    <string name="setting_on" msgid="8602246224465348901">"සක්‍රීයයි"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"වීඩියෝ ගුණත්වය"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"ඉහළ"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"පහල"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"කාලය ඉකුත්වීම"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"කැමරා සැකසීම්"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"කැම්කෝඩර සැකසීම්"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"පින්තූර ප්‍රමාණය"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M පික්සල්"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"පික්සල 8M"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"පික්සල 5M"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M පික්සල්"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"පික්සල 3M"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"පික්සල 2M"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M පික්සල් (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"පික්සල 1.3M"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"පික්සල 1M"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"නාභිගත ප්‍රකාරය"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ස්වයං"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"අනන්තය"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"මැක්‍රො"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"ස්වයං"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"අනන්තය"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"මැක්‍රො"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"සැණෙළි ප්‍රකාරය"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"සැණෙළි ආකාරය"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"ස්වයංක්‍රීය"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"සක්‍රීයයි"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"අක්‍රිය කරන්න"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"සැණෙලි ස්වයං"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"සැණෙලිය සක්‍රියයි"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"සැණෙළිය අක්‍රියයි"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"සුදු සමබරතාව"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"සුදු සමබරතාවය"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"ස්වයංක්‍රීය"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"තාපදීප්ත"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"දිවා ආලෝකය"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ප්‍රතිදීපන"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"නොපැහැදිලි"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ස්වයං"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"තාපදීප්ත"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"දිවා ආලෝකය"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ප්‍රතිදීපන"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"නොපැහැදිලි"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"සිදුවීම් ආකාරය"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"ස්වයංක්‍රීය"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"ක්‍රියාව"</string>
+    <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>
+    <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>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"COUNTDOWN කාල යන්ත්‍රය"</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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"ඔබගේ USB ආචයනයේ ඉඩ ඉවර වෙමින් පවතී. ගුණත්ව සැකසීම් වෙනස් කරන්න නැතහොත් සමහර පින්තුර හෝ වෙනත් ගොනු මකන්න."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"ඔබගේ SD කාඩ් පතේ ඉඩ ඉවර වෙමින් පවතී. ගුණත්ව සැකසීම් වෙනස් කරන්න හෝ සමහර පින්තුරය හෝ වෙනත් ගොනු මකන්න."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"ප්‍රමාණයේ සීමාව ලඟාවී ඇත."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"ඉතා වේගවත්"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"පරිදර්ශනය පිළියෙල වේ"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"පරිදර්ශනය සුරැකිය නොහැක."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"පැනරෝමා"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"පරිදර්ශනය ග්‍රහණය කෙරේ"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"පෙර පරිදර්ශනය සඳහා රැඳී සිටී"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"සුරැකේ...."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"පරිදර්ශනය ප්‍රවාචනය"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"නාභිගත කිරීමට ස්පර්ශ කරන්න"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"විලාස"</string>
+    <string name="effect_none" msgid="3601545724573307541">"කිසිවක් නැත"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"මිරිකන්න"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ලොකු ඇස්"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"ලොකු කට"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"කුඩා කට"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"ලොකු නහය"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"කුඩා ඇස්"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"අවකාශයෙහි"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"හිරු බැසීම"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"ඔබගේ වීඩියෝව"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"ඔබගේ උපාංගය පැත්තකින් තබන්න.\nමොහොතකට දසුනෙන් ඈත් වන්න."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"පටිගත කිරීම අතරතුර ඡායාරූපයක් ගැනීමට ස්පර්ශ කරන්න."</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"වීඩියෝව පටිගත කිරීම ඇරඹී ඇත."</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"වීඩියෝව පටිගත කිරීම නැවතී ඇත."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"විශේෂ විලාස සක්‍රිය විට වීඩියෝ සැණ රුව අබල කර ඇත."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"විලාස හිස් කරන්න"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"මෝඩ මුහුණු"</string>
+    <string name="effect_background" msgid="6579360207378171022">"පසුබිම"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"සංවාරක බොත්තම"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"මෙනු බොත්තම"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"බොහොමයක් මෑතකාලීන ජායාරූපය"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"ඉදිරිපස සහ පසුපස කැමරා ස්විචය"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"කැමරාව, වීඩියෝව, හෝ පරිදර්ශනය තෝරන්න"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"වැඩිපුර සැකසීම් පාලන"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"සැකසීම් පාලන වසන්න"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"විශාලනය පාලන"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s අඩු කරන්න"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s වැඩි කරන්න"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s සලකුණු කොටුව"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"ඡායාරූපය වෙත මාරු වන්න"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"වීඩියෝව වෙත මාරු වන්න"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"පරිදර්ශනය වෙත මාරු වන්න"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"නව පරිදර්ශනය වෙත මාරු වන්න"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"නැවත නාභිගත කිරීමට මාරුවෙන්න"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"අවලංගු කිරීම සමාලෝචනය කරන්න"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"සමාලෝචනය නිමය"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"යළිගැනීම සමාලෝචනය කරන්න"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"වීඩියෝව ධාවනය කරන්න"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"විඩියෝව විරාම කරන්න"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"වීඩියෝව යළි පූරණය කරන්න"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"වීඩියෝ ධාවක කාල තීරය"</string>
+    <string name="capital_on" msgid="5491353494964003567">"සක්‍රිය"</string>
+    <string name="capital_off" msgid="7231052688467970897">"අක්‍රිය"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"අක්‍රිය කරන්න"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"තත්පර 0.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"තත්පර 1"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"තත්පර 1.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"තත්පර 2"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"තත්පර 2.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"තත්පර 3"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"තත්පර 4"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"තත්පර 5"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"තත්පර 6"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"තත්පර 10"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"තත්පර 12"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"තත්පර 15"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"තත්පර 24"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"මිනිත්තු 0.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"මිනිත්තු 1"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"මිනිත්තු 1.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"මිනිත්තු 2"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"මිනිත්තු 2.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"මිනිත්තු 3"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"මිනිත්තු 4"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"මිනිත්තු 5"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"මිනිත්තු 6"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"මිනිත්තු 10"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"මිනිත්තු 12"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"මිනිත්තු 15"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"මිනිත්තු 24"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"පැය 0.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"පැය 1"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"පැය 1.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"පැය 2"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"පැය 2.5"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"පැය 3"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"පැය 4"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"පැය 5"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"පැය 6"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"පැය 10"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"පැය 12"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"පැය 15"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"පැය 24"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"තත්පර"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"මිනිත්තු"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"පැය"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"හරි"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"කාල අන්තරය පිහිටුවන්න"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"කාලය ඉකුත්වීමේ විශේෂාංගය අක්‍රියයි. කාල අන්තරය පිහිටුවීමට එය සක්‍රිය කරන්න."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"ගණනය කිරීමේ මුහුර්තකය අක්‍රියයි. පින්තූරයක් ගැනීමට පෙර ගණනය කිරීමට එය සක්‍රිය කරන්න."</string>
+    <string name="set_duration" msgid="5578035312407161304">"තත්පර වලින් කාල පරාස සකසන්න"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"ඡායාරූපයක් ගැනීමට ආපස්සට ගණන් කෙරේ"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"ඡායාරූප ස්ථාන මතකද?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"ඔබගේ ඡායාරූප සහ වීඩියෝ ඒවා ගත් ස්ථානය සමගින් ටැග් කරන්න.\n\nවෙනත් යෙදුම් වලට ඔබගේ සුරැකි පින්තුර සමගින් මෙම තොරතුරු වෙත ප්‍රවේශ විය හැක."</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"එපා ස්තුතියි"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"ඔව්"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"කැමරාව"</string>
+    <string name="menu_search" msgid="7580008232297437190">"සෙවීම"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"ඡායාරූප"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"ඇල්බම"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"තව විකල්ප"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"සැකසීම්"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d ඡායාරූපය"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d ඡායාරූප"</item>
+  </plurals>
+</resources>
diff --git a/res/values-sk/filtershow_strings.xml b/res/values-sk/filtershow_strings.xml
index 1e9c813..198e429 100644
--- a/res/values-sk/filtershow_strings.xml
+++ b/res/values-sk/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor fotografií"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Obrázok sa nepodarilo načítať!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Originál sa nedá upraviť"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Prebieha nastavovanie tapety"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Fotografiu sa nepodarilo prevziať. Sieť nie je k dispozícii."</string>
     <string name="original" msgid="3524493791230430897">"Pôvodné"</string>
     <string name="borders" msgid="2067345080568684614">"Okraje"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Vlastný"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Späť"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Znova"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Zobraziť históriu"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Skryť históriu"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Zobraz. stav obrázka"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Skryť stav obrázka"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Zobraziť použité efekty"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Skryť použité efekty"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportovať"</string>
+    <string name="print_image" msgid="1942989216591621413">"Tlačiť"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exportovať vyrovnaný obrázok"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Exportovaný obrázok bude kópia bez histórie."</string>
+    <string name="quality" msgid="179292110309050529">"Kvalitné"</string>
+    <string name="size" msgid="4639404642236356037">"Veľkosť"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Nastavenia"</string>
     <string name="unsaved" msgid="8704442449002374375">"Niektoré zmeny obrázka nie sú uložené."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Chcete zmeny pred ukončením uložiť?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Uložiť a ukončiť"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Prebieha spracovávanie obrázku v plnom rozlíšení..."</string>
     <string name="exit" msgid="242642957038770113">"Ukončiť"</string>
     <string name="history" msgid="455767361472692409">"História"</string>
     <string name="reset" msgid="9013181350779592937">"Obnoviť"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Najsvetlejšie tóny"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Krivky"</string>
     <string name="vignette" msgid="934721068851885390">"Vineta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vineta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Expozícia"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Sýtosť"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Pokles"</string>
     <string name="redeye" msgid="4508883127049472069">"Červené oči"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Kresliť"</string>
     <string name="straighten" msgid="26025591664983528">"Vyrovnať"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatív"</string>
     <string name="none" msgid="6633966646410296520">"Žiadne"</string>
     <string name="edge" msgid="7036064886242147551">"Hrany"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterizácia"</string>
     <string name="downsample" msgid="3552938534146980104">"Zmen.vzor."</string>
+    <string name="grad" msgid="546774853424848655">"Stupňovanie"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Jas"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Sýtosť"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Hlavné"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Červená"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Žltá"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zelená"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Azúrová"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Modrá"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Purpurová"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Štýl"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nový"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Červená"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Zelená"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Modrá"</string>
     <string name="draw_style" msgid="2036125061987325389">"Štýl"</string>
     <string name="draw_size" msgid="4360005386104151209">"Veľkosť"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Odtieň"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Sýtosť"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Jas"</string>
     <string name="draw_color" msgid="2119030386987211193">"Farba"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Čiary"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Zvýrazňovač"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Škvrna"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Vymazať"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Hrúbka"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Veľkosť rohu"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Farba"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Vymazať"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Vybrať vlastnú farbu"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Vyberte farbu"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Vyberte veľkosť"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Pôvodné"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Výsledok"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Prebieha ukladanie obrázka"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Prebieha spracovanie..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Uložiť aktuálnu predvoľbu"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Správa používateľ. predvolieb"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nová predvoľba"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Názov predvoľby"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informácie"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Názov"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Veľkosť"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Údaje EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Predvoľba"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Verzia"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Pôvodné"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Aktuálne"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Clona"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Ohnisková vzdialenosť"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Vzdialenosť objektu"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Dátum vytvorenia"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Clona"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Expozičný čas"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autorské práva"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 938c7ba..58890a5 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Otočiť doprava"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Položku sa nepodarilo nájsť."</string>
     <string name="edit" msgid="1502273844748580847">"Upraviť"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Jednoduchá úprava"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Spracovávanie žiadostí o ulož. do vyrovnáv. pamäte"</string>
     <string name="caching_label" msgid="4521059045896269095">"Do pamäte..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Orezať"</string>
@@ -190,7 +191,7 @@
     <string name="folder_download" msgid="7186215137642323932">"Preberanie"</string>
     <string name="folder_edited_online_photos" msgid="6278215510236800181">"Upravené fotografie online"</string>
     <string name="folder_imported" msgid="2773581395524747099">"Importované"</string>
-    <string name="folder_screenshot" msgid="7200396565864213450">"Snímka obrazovky"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"Snímky obrazovky"</string>
     <string name="help" msgid="7368960711153618354">"Pomocník"</string>
     <string name="no_external_storage_title" msgid="2408933644249734569">"Žiadny ukladací priestor"</string>
     <string name="no_external_storage" msgid="95726173164068417">"K dispozícii nie je žiadny externý ukladací priestor"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Nedá sa pripojiť k fotoaparátu."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Fotoaparát je zakázaný z dôvodu bezpečnostných pravidiel."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparát"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="wait" msgid="8600187532323801552">"Čakajte, prosím..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pred použitím fotoaparátu pripojte zdieľané úložisko USB."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Pred použitím fotoaparátu vložte kartu SD."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Zozadu"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Spredu"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Úložné miesto"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"POLOHA"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Časovač odpočítavania"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 s"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavenia fotoaparátu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavenie videokamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Veľkosť fotografie"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixelov"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpx"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixlov"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 MP"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixle"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapixle"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 MP (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapixlov"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Nekonečno"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"NEKONEČNO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Režim blesku"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"REŽIM BLESKU"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Auto"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Zapnuté"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Vypnuté"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMATICKÝ BLESK"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BLESK ZAPNUTÝ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"BLESK VYPNUTÝ"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Vyváženie bielej"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"VYVÁŽENIE BIELEJ"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Auto"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Žiariace"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Denné svetlo"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Svetielkujúce"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Zamračené"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ŽIAROVKA"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DENNÉ SVETLO"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ŽIARIVKA"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ZAMRAČENÉ"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scénický režim"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Západ slnka"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Strana"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"ŽIADNE"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"AKCIA"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NOC"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"ZÁPAD SLNKA"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"VEČIEROK"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ČASOVAČ ODPOČÍTAVANIA"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ČASOVAČ VYPNUTÝ"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUNDA"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDY"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKÚND"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKÚND"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Nie je možné vybrať v scénickom režime."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Expozícia"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPOZÍCIA"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"PREDNÝ FOTOAPARÁT"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"ZADNÝ FOTOAPARÁT"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"V ukladacom priestore USB je málo miesta. Zmeňte nastavenie kvality alebo odstráňte niektoré obrázky či iné súbory."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na karte SD je málo miesta. Zmeňte nastavenie kvality alebo odstráňte niektoré obrázky či iné súbory."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Vo vesmíre"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Západ slnka"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Vaše video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Položte svoje zariadenie."\n"Vyjdite na chvíľu zo zorného poľa."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Položte svoje zariadenie.\nVyjdite na chvíľu zo zorného poľa."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Dotykom môžete počas záznamu fotiť."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Záznam videa bol spustený."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Záznam videa bol zastavený."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Prepnúť do režimu videa"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Prepnúť na panorámu"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Prepnúť na novú panorámu"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Prepnúť do režimu Opätovné zaostrenie"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Zrušiť"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Hotovo"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Nasnímať znova"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Prehrať video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pozastaviť video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Znova načítať video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Časový pruh prehrávača videí"</string>
     <string name="capital_on" msgid="5491353494964003567">"ZAPNUTÉ"</string>
     <string name="capital_off" msgid="7231052688467970897">"VYPNUTÉ"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Vypnuté"</string>
@@ -385,14 +422,16 @@
     <string name="set_timer_help" msgid="5007708849404589472">"Časovač odpočítavania je vypnutý. Ak chcete odpočítavať pred aktivovaním spúšte fotoaparátu, zapnite ho."</string>
     <string name="set_duration" msgid="5578035312407161304">"Nastavte dobu trvania v sekundách"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Odpočítavanie spúšte fotoaparátu"</string>
-    <string name="remember_location_title" msgid="9060472929006917810">"Zapamätať si, kde boli fotografie vytvorené?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Označte pre fotografie a videá polohy, kde boli zaznamenané."\n\n"Ostatné aplikácie môžu pristupovať k týmto informáciám aj k vašim uloženým snímkam."</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Zapamätať si, kde boli fotky vytvorené?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Pridajte k fotkám a videám polohy, kde boli zaznamenané.\n\nOstatné aplikácie môžu pristupovať k týmto informáciám spolu s prístupom k vašim uloženým snímkam."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nie, ďakujem"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Áno"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Fotoaparát"</string>
     <string name="menu_search" msgid="7580008232297437190">"Vyhľadávanie"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotografie"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumy"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ĎALŠIE MOŽNOSTI"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"NASTAVENIA"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d fotografia"</item>
     <item quantity="other" msgid="3813306834113858135">"Fotografie: %1$d"</item>
diff --git a/res/values-sl/filtershow_strings.xml b/res/values-sl/filtershow_strings.xml
index 7b288e6..b53f44c 100644
--- a/res/values-sl/filtershow_strings.xml
+++ b/res/values-sl/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Urejevalnik fotografij"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Slike ni mogoče naložiti."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Izvirnika ni mogoče urejati"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Nastavljanje ozadja"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Fotografije ni bilo mogoče prenesti. Omrežje ni na voljo."</string>
     <string name="original" msgid="3524493791230430897">"Izvirnik"</string>
     <string name="borders" msgid="2067345080568684614">"Obrobe"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Po meri"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Razveljavi"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Uveljavi"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Pokaži zgodovino"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Skrij zgodovino"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Pokaži stanje slike"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Skrij stanje slike"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Pokaži uporabljene učinke"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Skrij uporabljene učinke"</string>
+    <string name="export_image" msgid="3202835713172222134">"Izvozi"</string>
+    <string name="print_image" msgid="1942989216591621413">"Natisni"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Izvoz enoplastne slike"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Izvožena slika bo kopija in brez zgodovine."</string>
+    <string name="quality" msgid="179292110309050529">"Kakovost"</string>
+    <string name="size" msgid="4639404642236356037">"Velikost"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Nastavitve"</string>
     <string name="unsaved" msgid="8704442449002374375">"Spremembe te slike niso shranjene."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Ali želite pred zapiranjem shraniti?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Shrani in zapri"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Obdelava slike v polni ločljivosti ..."</string>
     <string name="exit" msgid="242642957038770113">"Izhod"</string>
     <string name="history" msgid="455767361472692409">"Zgodovina"</string>
     <string name="reset" msgid="9013181350779592937">"Ponastavi"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Svetli deli"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Krivulje"</string>
     <string name="vignette" msgid="934721068851885390">"Vinjeta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjeta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Osvetlitev"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Nasičenost"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Pojemanje"</string>
     <string name="redeye" msgid="4508883127049472069">"Rdeče oči"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Risanje"</string>
     <string name="straighten" msgid="26025591664983528">"Poravnanje"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativ"</string>
     <string name="none" msgid="6633966646410296520">"Brez"</string>
     <string name="edge" msgid="7036064886242147551">"Robovi"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Poster"</string>
     <string name="downsample" msgid="3552938534146980104">"Zmanjšanje velikosti"</string>
+    <string name="grad" msgid="546774853424848655">"Stopenjsko"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Svetlost"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Nasičenost"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Glavni kontrolnik"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Rdeča"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Rumena"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zelena"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cijan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Modra"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Slog"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"novo"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Rdeče"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Zeleno"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Modro"</string>
     <string name="draw_style" msgid="2036125061987325389">"Slog"</string>
     <string name="draw_size" msgid="4360005386104151209">"Velikost"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Odtenek"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Nasičenost"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Svetlost"</string>
     <string name="draw_color" msgid="2119030386987211193">"Barva"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Črte"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Flomaster"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Packe"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Izbriši"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Debelina"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Velikost kota"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Barva"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Izbriši"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Izberite barvo po meri"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Izberite barvo"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Izberite velikost"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"V redu"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Izvirnik"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Rezultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Shranjevanje slike"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Obdelovanje ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Shrani trenutno privz. nastav."</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Upravlj. uporab. priv. nastav."</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nova privzeta nastavitev"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Vnaprej nastavljeno ime"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Podatki"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Ime slike"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Velikost slike"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Podatki EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Privzeto"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Različica"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Izvirnik"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Trenutno"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Zaslonka"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Goriščna razdalja"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Oddaljenost motiva"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Datum posnetka"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Zaslonsko število"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Čas osvetlitve"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Avtorske pravice"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0d8a634..df6f0a7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Zasukaj desno"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Ni mogoče najti elementa."</string>
     <string name="edit" msgid="1502273844748580847">"Urejanje"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Preprosto urejanje"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Obdelava zahtev za predpomnjenje"</string>
     <string name="caching_label" msgid="4521059045896269095">"Predpomnjenje ..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Obrezovanje"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Povezava s fotoaparatom ni mogoča."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Fotoaparat je onemogočen zaradi varnostnih pravilnikov."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparat"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Kamera"</string>
     <string name="wait" msgid="8600187532323801552">"Počakajte ..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pred uporabo fotoaparata vpnite pomnilnik USB."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Pred uporabo fotoaparata vstavite kartico SD."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Nazaj"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Pred"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Shrani lokacijo"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"LOKACIJA"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Odštevalnik"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 s"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavitve fotoaparata"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavitve kamere"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Velikost slike"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 mio sl. pik"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 milijonov slikovnih pik"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M sl. pik"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 M sl. pik"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M sl. pik"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 M sl. pik"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 M pik (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 M sl. pik"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 M sl. pik"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Samodejno"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Neskončno"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"SAMODEJNO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"NESKONČNO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Način bliskavice"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"NAČIN BLISKAVICE"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Samodejno"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Vključeno"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Izključeno"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"SAMODEJNA BLISKAVICA"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BLISKAVICA VKLOPLJENA"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"BLISKAVICA IZKLOPLJENA"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Izravnava beline"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"NASTAVITEV BELINE"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Samodejno"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Žareče"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Dnevna svetloba"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescenčno"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Oblačno"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"SAMODEJNO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ŽAREČE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DNEVNA SVETLOBA"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENČNO"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"OBLAČNO"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scenski način"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Samodejno"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noč"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sončni zahod"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Stranka"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"BREZ"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"DEJANJE"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"PONOČI"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"SONČNI ZAHOD"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"ZABAVA"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ODŠTEVALNIK"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"MERILNIK ČASA IZKLOPLJEN"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUNDA"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDE"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUND"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUND"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Ni mogoče izbrati v načinu prizora."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Osvetlitev"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"OSVETLITEV"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"FOTOAPARAT SPREDAJ"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"FOTOAPARAT ZADAJ"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"V redu"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Na vašem pomnilniku USB zmanjkuje prostora. Spremenite nastavitev kakovosti ali izbrišite nekaj slik ali drugih datotek."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Na kartici SD zmanjkuje prostora. Spremenite nastavitev kakovosti ali izbrišite nekaj slik ali drugih datotek."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"V vesolju"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sončni zahod"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Vaš video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Odložite napravo."\n"Za trenutek stopite iz vidnega polja."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Odložite napravo.\nZa trenutek stopite iz vidnega polja."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Dotaknite se, če želite fotografirati med snemanjem."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Snemanje se je začelo."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Snemanje se je ustavilo."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Preklop na videoposnetek"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Preklop na panoramo"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Preklopi v novo panoramo"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Preklopi na vnovično ostrenje"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Preklic pregleda"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Pregled opravljen"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Vnovični pregled posnetka"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Predvajaj videoposnetek"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Začasno ustavi videoposnetek"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Znova naloži videoposnetek"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Časovna vrstica videopredvajalnika"</string>
     <string name="capital_on" msgid="5491353494964003567">"VKLOPLJENO"</string>
     <string name="capital_off" msgid="7231052688467970897">"IZKLOPLJENO"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Izklopljeno"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Nastavite trajanje v sekundah"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Odštevanje pred fotografiranjem"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Beleženje lokacije fotografije?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Fotografije in videoposnetke označite z lokacijami, na katerih so posneti."\n\n"Druge aplikacije lahko dostopajo do teh podatkov skupaj s shranjenimi slikami."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Fotografije in videoposnetke označite z lokacijami, na katerih so posneti.\n\nDruge aplikacije lahko dostopajo do teh podatkov skupaj s shranjenimi slikami."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Ne, hvala"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Da"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Fotoaparat"</string>
     <string name="menu_search" msgid="7580008232297437190">"Išči"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotografije"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albumi"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"VEČ MOŽNOSTI"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"NASTAVITVE"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d fotografija"</item>
     <item quantity="other" msgid="3813306834113858135">"Št. fotografij: %1$d"</item>
diff --git a/res/values-sr/filtershow_strings.xml b/res/values-sr/filtershow_strings.xml
index 5b4d8f5..d7482f1 100644
--- a/res/values-sr/filtershow_strings.xml
+++ b/res/values-sr/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Уређивач слика"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Није могуће учитати слику!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Није могуће изменити оригинал"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Подешавање позадине"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Није могуће преузети слику. Мрежа није доступна."</string>
     <string name="original" msgid="3524493791230430897">"Оригинална"</string>
     <string name="borders" msgid="2067345080568684614">"Ивице"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Прилагођено"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Опозови"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Понови"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Прикажи историју"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Сакриј историју"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Прикажи статус слике"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Сакриј статус слике"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Прикажи примењене ефекте"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Сакриј примењене ефекте"</string>
+    <string name="export_image" msgid="3202835713172222134">"Извези"</string>
+    <string name="print_image" msgid="1942989216591621413">"Штампај"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Извези једнослојну слику"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Извезена слика биће копија без историје."</string>
+    <string name="quality" msgid="179292110309050529">"Квалитет"</string>
+    <string name="size" msgid="4639404642236356037">"Величина"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Подешавања"</string>
     <string name="unsaved" msgid="8704442449002374375">"Постоје несачуване измене ове слике."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Желите ли да сачувате пре него што изађете?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Сачувај и изађи"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Обрађивање слике у пуној резолуцији..."</string>
     <string name="exit" msgid="242642957038770113">"Изађи"</string>
     <string name="history" msgid="455767361472692409">"Историја"</string>
     <string name="reset" msgid="9013181350779592937">"Поново постави"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Истицања"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Криве"</string>
     <string name="vignette" msgid="934721068851885390">"Вињета"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Вињета"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Експозиција"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Засићеност боја"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Контраст"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Слаб. светлости"</string>
     <string name="redeye" msgid="4508883127049472069">"Црвене очи"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Цртање"</string>
     <string name="straighten" msgid="26025591664983528">"Исправљање"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Негатив"</string>
     <string name="none" msgid="6633966646410296520">"Ниједно"</string>
     <string name="edge" msgid="7036064886242147551">"Ивице"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Ворхол"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Постеризуј"</string>
     <string name="downsample" msgid="3552938534146980104">"Смањи"</string>
+    <string name="grad" msgid="546774853424848655">"Градација"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Осветљеност"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Контраст"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Засићеност боја"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Главно"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Црвена"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Жута"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Зелена"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Цијан"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Плава"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Магента"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Стил"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ново"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Црвена"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Зелена"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Плава"</string>
     <string name="draw_style" msgid="2036125061987325389">"Стил"</string>
     <string name="draw_size" msgid="4360005386104151209">"Величина"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Нијанса"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Засићен. боја"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Осветљеност"</string>
     <string name="draw_color" msgid="2119030386987211193">"Боја"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Линије"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Означивач"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Прскање"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Обриши"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Дебљина"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Величина угла"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Боја"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Обриши"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Изабери прилагођену боју"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Избор боје"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Избор величине"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"Потврди"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Оригинална"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Резултат"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Чување слике"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Обрађује се..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Сачувај актуелна подешавања"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Управљај корисничким подеш."</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Ново унапред одређено подешав."</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Назив унапред одр. подешавања"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Информације"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Назив слике"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Величина слике"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Хистограм"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF подаци"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Унапред подешено"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Верзија"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Оригинал"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Актуелно"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Модел"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Отвор за светло"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Жижна даљина"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Удаљеност субјекта"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Датум снимања"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Жижни број"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Време експозиције"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Ауторска права"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4b20924..54d2b83 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Ротирај удесно"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Није могуће пронаћи ставку."</string>
     <string name="edit" msgid="1502273844748580847">"Измени"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Једноставне измене"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Обрада захтева за кеширање"</string>
     <string name="caching_label" msgid="4521059045896269095">"Кеширање..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Опсеци"</string>
@@ -150,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Плаво"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Црно-бело"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Пунч"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"X Process"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Испрано"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Литографски"</string>
@@ -219,14 +220,13 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Није могуће повезати се са камером."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Камера је онемогућена због смерница за безбедност."</string>
     <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Камкордер"</string>
     <string name="wait" msgid="8600187532323801552">"Сачекајте…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Прикључите USB меморију пре коришћења камере."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Уметните SD картицу пре коришћења камере."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Припрема USB меморије…"</string>
     <string name="preparing_sd" product="default" msgid="2914969119574812666">"Припремање SD картице…"</string>
-    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Није било могуће приступити USB меморији."</string>
-    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Није било могуће приступити SD картици."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Није могуће приступити USB меморији."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Није могуће приступити SD картици."</string>
     <string name="review_cancel" msgid="8188009385853399254">"ОТКАЖИ"</string>
     <string name="review_ok" msgid="1156261588693116433">"ГОТОВО"</string>
     <string name="time_lapse_title" msgid="4360632427760662691">"Снимањe у дужем интервалу"</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Подешавања камере"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Подешавања камкордера"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Величина слике"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 мегапискела"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 мегапиксела (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 мегапиксел"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Аутоматски"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Бесконачност"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Макро"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"АУТОМАТСКИ"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"БЕСКОНАЧНОСТ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"МАКРО"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Режим блица"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"РЕЖИМ БЛИЦА"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Аутоматски"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Укључено"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Искључено"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"АУТОМАТСКИ БЛИЦ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"УКЉУЧИ БЛИЦ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ИСКЉУЧИ БЛИЦ"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Баланс беле боје"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"БАЛАНС БЕЛЕ"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Аутоматски"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Усијано"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Дневна светлост"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Флуоресцентно"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Облачно"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"АУТОМАТСКИ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"УСИЈАНО"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ДНЕВНА СВЕТЛОСТ"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ФЛУОРЕСЦЕНТНО"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ОБЛАЧНО"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Режим сцене"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Аутоматски"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"На вашој USB меморији понестаје места. Промените подешавања квалитета или избришите неке слике или друге датотеке."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"На вашој SD картици понестаје места. Промените поставке квалитета или избришите неке слике или друге датотеке."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"У свемиру"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Залазак сунца"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Ваш видео"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Спустите уређај."\n"Изађите из кадра на тренутак."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Спустите уређај.\nИзађите из кадра на тренутак."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Додирните да бисте направили фотографију током снимања."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Снимање видео садржаја је започето."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Снимање видео садржаја је заустављено."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Пребаци на видео"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Пребаци на панораму"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Пребаци на нову панораму"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Пребаци на Поновно фокусирање"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Откажи у режиму прегледа"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Довршено у режиму прегледа"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Поново сними за преглед"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Пусти видео"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Паузирај видео"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Поново учитај видео"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Трака за време видео плејера"</string>
     <string name="capital_on" msgid="5491353494964003567">"УКЉУЧEНO"</string>
     <string name="capital_off" msgid="7231052688467970897">"ИСКЉУЧEНO"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Искључено"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Подеси трајање у секундама"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Одбројавање за снимање слике"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Желите ли да запамтите локације слика?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Додајте сликама и видео снимцима ознаке са местима где су снимљени."\n\n"Друге апликације могу да приступе овим информацијама заједно са сачуваним сликама."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Додајте сликама и видео снимцима ознаке са местима где су снимљени.\n\nДруге апликације могу да приступе овим информацијама заједно са сачуваним сликама."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Не, хвала"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Да"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Камера"</string>
     <string name="menu_search" msgid="7580008232297437190">"Претражи"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Слике"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Албуми"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ЈОШ ОПЦИЈА"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"ПОДЕШАВАЊА"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d слика"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d слика"</item>
diff --git a/res/values-sv/filtershow_strings.xml b/res/values-sv/filtershow_strings.xml
index 36e235b..030a8c1 100644
--- a/res/values-sv/filtershow_strings.xml
+++ b/res/values-sv/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Fotoredigerare"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Det går inte att läsa in bilden."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Det går inte att redigera originalet"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Bakgrund anges"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Det gick inte att hämta fotot. Nätverket är inte tillgängligt."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Ramar"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Anpassat"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Ångra"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Gör om"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Visa historik"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Dölj historik"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Visa bildläge"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Dölj bildläge"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Visa tillämpade effekter"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Dölj tillämpade effekter"</string>
+    <string name="export_image" msgid="3202835713172222134">"Exportera"</string>
+    <string name="print_image" msgid="1942989216591621413">"Skriv ut"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Exportera m. sammanlagda lager"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Den exporterade bilden kommer att vara en kopia utan historik."</string>
+    <string name="quality" msgid="179292110309050529">"Kvalitet"</string>
+    <string name="size" msgid="4639404642236356037">"Storlek"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Inställningar"</string>
     <string name="unsaved" msgid="8704442449002374375">"Det finns ändringar i bilden som inte har sparats."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Vill du spara innan du avslutar?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Spara och avsluta"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Bearbetar högupplöst bild …"</string>
     <string name="exit" msgid="242642957038770113">"Avsluta"</string>
     <string name="history" msgid="455767361472692409">"Historik"</string>
     <string name="reset" msgid="9013181350779592937">"Återställ"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Högdagrar"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Kurvor"</string>
     <string name="vignette" msgid="934721068851885390">"Vignette"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignette"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exponering"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Mättnad"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Ljusdjup"</string>
     <string name="redeye" msgid="4508883127049472069">"Röda ögon"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Rita"</string>
     <string name="straighten" msgid="26025591664983528">"Räta ut"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negativ"</string>
     <string name="none" msgid="6633966646410296520">"Inga"</string>
     <string name="edge" msgid="7036064886242147551">"Kanter"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Färgreduk."</string>
     <string name="downsample" msgid="3552938534146980104">"Nedsampla"</string>
+    <string name="grad" msgid="546774853424848655">"Övertonad"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Ljusstyrka"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Mättnad"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Primär"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Röd"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Gul"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Grön"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blå"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"nytt"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Röd"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Grön"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Blå"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
     <string name="draw_size" msgid="4360005386104151209">"Storlek"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Nyans"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Mättnad"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Ljusstyrka"</string>
     <string name="draw_color" msgid="2119030386987211193">"Färg"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Linjer"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Märkpenna"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Stänk"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Rensa"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Tjocklek"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Hörnformat"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Färg"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Rensa"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Välj anpassad färg"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Välj färg"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Välj storlek"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Sparar bilden"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Bearbetar ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Spara aktuellt förval"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Hantera egna förval"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nytt förval"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Förvalt namn"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Information"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Bildnamn"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Bildstorlek"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF-data"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Förval"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Version"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Aktuell"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modell"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Bländare"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Brännvidd"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Avstånd till motiv"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Fotodatum"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Bländartal"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Exponeringstid"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Upphovsrätt"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6b73bed..ca67f49 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Rotera åt höger"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Det gick inte att hitta objektet."</string>
     <string name="edit" msgid="1502273844748580847">"Redigera"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Enkel redigering"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Begäran om cachelagring bearbetas"</string>
     <string name="caching_label" msgid="4521059045896269095">"Cachelagrar ..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Beskär"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Det går inte att ansluta till kameran."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kameran har inaktiverats på grund av gällande säkerhetspolicyer."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="wait" msgid="8600187532323801552">"Vänta…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Sätt i USB-lagringsenheten innan du använder kameran."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Sätt i ett SD-kort innan du använder kameran."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Bakre"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Främre"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Spara plats"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"PLATS"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Nedräkningstimer"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 sekund"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamerainställningar"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamerainställningar"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildstorlek"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapixlar"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixel"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixlar"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapixlar"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixlar"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapixlar"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 mp (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapixlar"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatiskt"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Oändligt"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"OÄNDLIGT"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Blixtläge"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"BLIXTLÄGE"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatiskt"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"På"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Av"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"AUTOMATISK BLIXT"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BLIXT PÅ"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"AVSTÄNGD BLIXT"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Vitbalans"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"VITBALANS"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatiskt"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Självlysande"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Dagsljus"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescerande"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Molnigt"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"SJÄLVLYSANDE"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DAGSLJUS"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCERANDE"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"MOLNIGT"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scenläge"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatiskt"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Natt"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgång"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fest"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"INGA"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"ACTION"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"NATT"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"SOLNEDGÅNG"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"FEST"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"NEDRÄKNINGSTIMER"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TIMER AV"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SEKUND"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SEKUNDER"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SEKUNDER"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SEKUNDER"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Inte valbart i scenläget."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exponering"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"EXPONERING"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"FRÄMRE KAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"BAKRE KAMERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Din USB-lagringsenhet börjar bli full. Ändra kvalitetsinställningen eller ta bort några bilder eller andra filer."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Den delade lagringsenheten börjar bli full. Ändra inställningen för kvalitet eller ta bort några bilder eller andra filer."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"I rymden"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgång"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Din video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Lägg ned enheten"\n"Ställ dig utom synhåll för ett ögonblick."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Lägg ned enheten\nStäll dig utom synhåll för ett ögonblick."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Tryck om du vill ta ett foto medan du spelar in."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Videoinspelningen har börjat."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Videoinspelningen har stoppats."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Byt till video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Byt till panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Byt till det nya panoramaläget"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Byt läge till Ändra fokus"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Avbryt"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Klar"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Omtagning"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Spela upp videoklipp"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Pausa videoklippet"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Läs in video igen"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Videospelarens tidsindikator"</string>
     <string name="capital_on" msgid="5491353494964003567">"PÅ"</string>
     <string name="capital_off" msgid="7231052688467970897">"AV"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Av"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Ange längden i sekunder"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Nedräkning innan fotot tas"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Vill du spara platser för foton?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Tagga dina foton och videor med de platser där de tas eller spelas in."\n\n"Andra appar kan få åtkomst till den här informationen tillsammans med dina sparade bilder."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Tagga dina foton och videor med de platser där de tas eller spelas in.\n\nAndra appar kan få åtkomst till den här informationen tillsammans med dina sparade bilder."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nej tack"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ja"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Sök"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Foton"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Album"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"FLER ALTERNATIV"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"INSTÄLLNINGAR"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d foton"</item>
diff --git a/res/values-sw/filtershow_strings.xml b/res/values-sw/filtershow_strings.xml
index 11320cb..f0c6bf5 100644
--- a/res/values-sw/filtershow_strings.xml
+++ b/res/values-sw/filtershow_strings.xml
@@ -16,23 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="title_activity_filter_show" msgid="2036539130684382763">"Uhariri Picha"</string>
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Zana ya Kuhariri Picha"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Haiwezi kupakia picha!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Haiwezi kubadilisha asili"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Inaweka mandhari"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Haikuweza kupakua picha. Mtandao haupatikani."</string>
     <string name="original" msgid="3524493791230430897">"Asili"</string>
     <string name="borders" msgid="2067345080568684614">"Kingo"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Maalum"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Tendua"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Rudia"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Onyesha Historia"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Ficha Historia"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Onyesha Hali ya Picha"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Ficha Hali ya Picha"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Onyesha Athari Zilizotumika"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ficha Athari ambazo Zimetekelezwa"</string>
+    <string name="export_image" msgid="3202835713172222134">"Hamisha"</string>
+    <string name="print_image" msgid="1942989216591621413">"Chapa"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Tuma Picha Bapa"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Picha itakayohamishwa itakuwa nakala, bila historia."</string>
+    <string name="quality" msgid="179292110309050529">"Ubora"</string>
+    <string name="size" msgid="4639404642236356037">"Ukubwa"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Mipangilio"</string>
     <string name="unsaved" msgid="8704442449002374375">"Kuna mabadiliko ambayo hayajahifadhiwa ya picha hii."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Je, unataka kuhifadhi kabla hujaondoka?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Hifadhi na Uondoke"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Inachakata picha yenye ubora kamili..."</string>
     <string name="exit" msgid="242642957038770113">"Ondoka"</string>
     <string name="history" msgid="455767361472692409">"Historia"</string>
     <string name="reset" msgid="9013181350779592937">"Weka upya"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Sehemu zenye ung\'avu zaidi"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Pindo"</string>
     <string name="vignette" msgid="934721068851885390">"Vignete"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Nakshi"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Kiasi cha mwangaza"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Ukolezaji"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Utofautishaji"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Punguza nakshi"</string>
     <string name="redeye" msgid="4508883127049472069">"Jicho Jekundu"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Chora"</string>
     <string name="straighten" msgid="26025591664983528">"Nyoosha"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Hasi"</string>
     <string name="none" msgid="6633966646410296520">"Umekamilisha"</string>
     <string name="edge" msgid="7036064886242147551">"Pambizoni"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Weka kwenye bango"</string>
     <string name="downsample" msgid="3552938534146980104">"Sampuli ndogo"</string>
+    <string name="grad" msgid="546774853424848655">"Iliyoboreshwa"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Ung\'avu"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Utofautishaji"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Ukolezaji"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Kuu"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Nyekundu"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Manjano"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Kijani"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Samawati-Kijani"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Samawati"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Majenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Mtindo"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"mpya"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Nyekundu"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Kijani"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Samawati"</string>
     <string name="draw_style" msgid="2036125061987325389">"Mtindo"</string>
     <string name="draw_size" msgid="4360005386104151209">"Ukubwa"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Rangi"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Ukolezaji"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Ung\'avu"</string>
     <string name="draw_color" msgid="2119030386987211193">"Rangi"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Mistari"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Kialamisho"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Tapanya"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Futa"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Unene"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Ukubwa wa Pembe"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Rangi"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Futa"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Chagua rangi maalum"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Chagua Rangi"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Chagua Ukubwa"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"SAWA"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Asili"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Matokeo"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Inahifadhi picha"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Inachakata..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Hifadhi mipangilio msingi ya sasa"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Dhibiti mipangilio msingi ya mtumiaji"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Mipangilio msingi Mipya"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Weka Jina Kabla"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Habari"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Jina la Picha"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Ukubwa wa Picha"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogramu"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Data ya Exif"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Mipangilio msingi"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Toleo"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Halisi"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Hivi sasa"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Muundo"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Kitundu cha kamera"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Urefu wa Lengo"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Umbali wa Kinachopigwa picha"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Tarehe iliyochukuliwa"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Muda ambao Kilango cha kamera kinakaa wazi"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Hakimilki"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5be0128..c14f90d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -91,6 +91,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Zungusha kulia"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Hakuweza kupata kipengee."</string>
     <string name="edit" msgid="1502273844748580847">"Hariri"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Kuhariri Rahisi"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Maombi ya kuakibisha michakato"</string>
     <string name="caching_label" msgid="4521059045896269095">"Inaakibisha..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Punguza"</string>
@@ -120,7 +121,7 @@
     <string name="picasa_posts" msgid="1497721615718760613">"Zilizowekwa"</string>
     <string name="make_available_offline" msgid="5157950985488297112">"Fanya ipatikane nje ya mtandao"</string>
     <string name="sync_picasa_albums" msgid="8522572542111169872">"Onyesha upya"</string>
-    <string name="done" msgid="217672440064436595">"Kwisha"</string>
+    <string name="done" msgid="217672440064436595">"Nimemaliza"</string>
     <string name="sequence_in_set" msgid="7235465319919457488">"Vipengee %1$d kati ya %2$d:"</string>
     <string name="title" msgid="7622928349908052569">"Kichwa"</string>
     <string name="description" msgid="3016729318096557520">"Maelezo"</string>
@@ -145,7 +146,7 @@
     <string name="manual" msgid="6608905477477607865">"Mwongozo"</string>
     <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>
+    <string name="flash_off" msgid="1445443413822680010">"Hakuna mmweko"</string>
     <string name="unknown" msgid="3506693015896912952">"Usiojulikana"</string>
     <string name="ffx_original" msgid="372686331501281474">"Asili"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Ukale"</string>
@@ -172,17 +173,17 @@
     <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_complete" msgid="3875040287486199999">"Kuingiza Kumekamilika"</string>
-    <string name="import_fail" msgid="8497942380703298808">"Haijafaulu kuleta"</string>
+    <string name="import_fail" msgid="8497942380703298808">"Haijaweza kuingiza"</string>
     <string name="camera_connected" msgid="916021826223448591">"Kamera imeunganishwa."</string>
     <string name="camera_disconnected" msgid="2100559901676329496">"Kamera imetenganishwa."</string>
-    <string name="click_import" msgid="6407959065464291972">"Gusa hapa kuleta"</string>
+    <string name="click_import" msgid="6407959065464291972">"Gusa hapa ili uingize"</string>
     <string name="widget_type_album" msgid="6013045393140135468">"Chagua albamu"</string>
     <string name="widget_type_shuffle" msgid="8594622705019763768">"Changanya picha zote"</string>
     <string name="widget_type_photo" msgid="6267065337367795355">"Chagua picha"</string>
     <string name="widget_type" msgid="1364653978966343448">"Chagua picha"</string>
     <string name="slideshow_dream_name" msgid="6915963319933437083">"Onyesho la slaidi"</string>
     <string name="albums" msgid="7320787705180057947">"Albamu"</string>
-    <string name="times" msgid="2023033894889499219">"Nyakati"</string>
+    <string name="times" msgid="2023033894889499219">"Wakati"</string>
     <string name="locations" msgid="6649297994083130305">"Mahali"</string>
     <string name="people" msgid="4114003823747292747">"Watu"</string>
     <string name="tags" msgid="5539648765482935955">"Lebo"</string>
@@ -222,7 +223,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Haiwezi kuungana na kamera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera imelemazwa kwa sababu ya sera za usalama."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Kamkoda"</string>
     <string name="wait" msgid="8600187532323801552">"Tafadhali subiri…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pachika hifadhi ya USB kabla ya kutumia kamera."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Chomeka kadi ya SD kabla ya kutumia kamera."</string>
@@ -236,15 +236,16 @@
     <string name="pref_camera_id_title" msgid="4040791582294635851">"Chagua kamera"</string>
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Nyuma"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Mbele"</string>
-    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Mahali pa hifadhi"</string>
-    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Kipima muda cha kuhesabu"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Rekodi mahali"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"MAHALI"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Kipima muda"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"Sekunde 1"</item>
     <item quantity="other" msgid="6455381617076792481">"Sekunde %d"</item>
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Toa mlio wakati wa kuhesabu"</string>
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Toa mlio inapohesabu"</string>
     <string name="setting_off" msgid="4480039384202951946">"Imezimwa"</string>
     <string name="setting_on" msgid="8602246224465348901">"Imewashwa"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Ubora wa video"</string>
@@ -254,10 +255,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Mipangilio ya kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mipangilio ya kamkoda"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Ukubwa wa picha"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"Pikseli 13M"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"Pikseli 8M"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"Pikseli 5M"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"Pikseli za 4M"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"Pikseli 3M"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"Pikseli 2M"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"Pikseli za 2M  (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"Pikseli 1.3M"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"Pikseli 1M"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -266,27 +270,55 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Otomatiki"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Pasipo mwisho"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
-    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Hali ya mweka"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"OTOMATIKI"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"PASIPO MWISHO"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Hali ya mmweko"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"HALI YA MWEKO"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Otomatiki"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Washa"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Zima"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"MMWEKO OTOMATIKI"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"MMWEKO UMEWASHWA"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"MMWEKO UMEZIMWA"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Usawazishaji wa weupe"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"USAWAZISHAJI WA WEUPE"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Kioto"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"King\'arishaji"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Mwangaza wa mchana"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Kiakisi mwanga"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Mawingu"</string>
-    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"gumzo ya mandhari"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"OTOMATIKI"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"KING\'ARISHAJI"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"MCHANA"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"KIAKISI MWANGA"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"MAWINGU"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Hali ya mandhari"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Otomatiki"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Kitendo"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Usiku"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Machweo"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Karamu"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"HAKUNA"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"KITENDO"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"USIKU"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"MACHWEO"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"SHEREHE"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"KIPIMA MUDA"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"KIPIMA WAKATI KIMEZIMWA"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"SEKUNDE 1"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"SEKUNDE 3"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"SEKUNDE 10"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"SEKUNDE 15"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Haiwezi kuchaguliwa ikiwa katika hali ya mandhari."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Kiasi cha mwangaza"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"KIASI CHA MWANGAZA"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"KAMERA YA MBELE"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"KAMERA YA NYUMA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"SAWA"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Hifadhi yako ya USB inaishiwa na nafasi. Badilisha mipangilio ya ubora au futa baadhi ya picha au faili."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Nafasi ya kadi yako ya SD inaelekea kuisha. Badlisha mpangilio wa ubora au futa baadhi ya picha au faili zingine."</string>
@@ -311,7 +343,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Kwenya nafasi"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Jua kutua"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Video yako"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Weka kifaa chako chini."\n"Toka nje ya muonekano kwa muda."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Weka kifaa chako chini.\nToka nje ya muonekano kwa muda."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Gusa ili upige picha wakati unarekodi."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Kurekodi kwa video kumeanza."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Kurekodi kwa video kumekomeshwa."</string>
@@ -336,12 +368,17 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Badilisha hadi kwa video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Badilisha hadi panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Badili hadi kwenye panorama mpya"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Badilisha ili Ulenge upya"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Ukaguzi umeghairiwa"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Ukaguzi umekamilika"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Kagua ukaguzi"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Cheza video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Sitisha video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Pakia video upya"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Ubao wa muda wa kicheza video"</string>
     <string name="capital_on" msgid="5491353494964003567">"IMEWASHWA"</string>
     <string name="capital_off" msgid="7231052688467970897">"IMEZIMWA"</string>
-    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Imezimwa"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Kimezimwa"</string>
     <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"Sekunde 0.5"</string>
     <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"Sekunde 1"</string>
     <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"Sekunde 1.5"</string>
@@ -384,20 +421,22 @@
     <string name="time_lapse_seconds" msgid="2105521458391118041">"sekunde"</string>
     <string name="time_lapse_minutes" msgid="7738520349259013762">"dakika"</string>
     <string name="time_lapse_hours" msgid="1776453661704997476">"saa"</string>
-    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Imekamilika"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Nimemaliza"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Weka Nafasi ya Muda"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"Kipengele cha muda kupita kimezimika. Kiwashe ili kuweka nafasi ya muda."</string>
-    <string name="set_timer_help" msgid="5007708849404589472">"Kipima muda cha kuhesabu kimezimwa. Kiwashe ili kihesabu kabla ya kupiga picha."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Kipima muda kimezimwa. Kiwashe ili kihesabu kabla ya kupiga picha."</string>
     <string name="set_duration" msgid="5578035312407161304">"Weka muda katika sekunde"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Inahesabu ili kupiga picha"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Kumbuka maeneo ya picha?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Tambulisha picha na video zako kwa maeneo ambapo zinachukuliwa."\n\n"Programu nyingine zinaweza kufikia maelezo haya kando na picha zako zilizohifadhiwa."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Tambulisha picha na video zako kwa maeneo ambapo zinachukuliwa.\n\nProgramu nyingine zinaweza kufikia maelezo haya kando na picha zako zilizohifadhiwa."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"La, asante"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ndiyo"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Tafuta"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Picha"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albamu"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"CHAGUO ZAIDI"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"MIPANGILIO"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"Picha %1$d"</item>
     <item quantity="other" msgid="3813306834113858135">"Picha %1$d"</item>
diff --git a/res/values-th/filtershow_strings.xml b/res/values-th/filtershow_strings.xml
index 0b98128..7a2fcf5 100644
--- a/res/values-th/filtershow_strings.xml
+++ b/res/values-th/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"โปรแกรมตกแต่งรูปภาพ"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"ไม่สามารถโหลดภาพ!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"ไม่สามารถแก้ไขต้นฉบับ"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"กำลังตั้งค่าวอลเปเปอร์"</string>
+    <string name="download_failure" msgid="5923323939788582895">"ไม่สามารถดาวน์โหลดภาพ เครือข่ายไม่พร้อมใช้งาน"</string>
     <string name="original" msgid="3524493791230430897">"ต้นฉบับ"</string>
     <string name="borders" msgid="2067345080568684614">"ขอบ"</string>
+    <string name="custom_border" msgid="8679893731790931871">"กำหนดเอง"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"เลิกทำ"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"ทำซ้ำ"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"แสดงประวัติ"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"ซ่อนประวัติ"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"สถานะแสดงภาพ"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"สถานะซ่อนภาพ"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"แสดงเอฟเฟ็กต์ที่ใช้"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"ซ่อนเอฟเฟ็กต์ที่ใช้"</string>
+    <string name="export_image" msgid="3202835713172222134">"ส่งออก"</string>
+    <string name="print_image" msgid="1942989216591621413">"พิมพ์"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"ส่งออกภาพรวมเลเยอร์"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"รูปภาพที่ส่งออกจะเป็นสำเนา โดยที่ไม่มีประวัติ"</string>
+    <string name="quality" msgid="179292110309050529">"คุณภาพ"</string>
+    <string name="size" msgid="4639404642236356037">"ขนาด"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"การตั้งค่า"</string>
     <string name="unsaved" msgid="8704442449002374375">"มีการเปลี่ยนแปลงที่ไม่ได้บันทึกไปยังภาพนี้"</string>
     <string name="save_before_exit" msgid="2680660633675916712">"คุณต้องการบันทึกก่อนที่จะออกหรือไม่"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"บันทึกและออก"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"กำลังดำเนินการภาพความละเอียดเต็มรูปแบบ..."</string>
     <string name="exit" msgid="242642957038770113">"ออก"</string>
     <string name="history" msgid="455767361472692409">"ประวัติ"</string>
     <string name="reset" msgid="9013181350779592937">"รีเซ็ต"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"ไฮไลต์"</string>
     <string name="curvesRGB" msgid="915010781090477550">"เส้นโค้ง"</string>
     <string name="vignette" msgid="934721068851885390">"วิกเน็ตต์"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"ขอบมืด"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"การรับแสง"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"ความอิ่มตัว"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"คอนทราสต์"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"ฟอลออฟ"</string>
     <string name="redeye" msgid="4508883127049472069">"ตาแดง"</string>
     <string name="imageDraw" msgid="6918552177844486656">"วาดภาพ"</string>
     <string name="straighten" msgid="26025591664983528">"ทำให้ตรง"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"เนกาทีฟ"</string>
     <string name="none" msgid="6633966646410296520">"ไม่มี"</string>
     <string name="edge" msgid="7036064886242147551">"ขอบ"</string>
-    <string name="kmeans" msgid="1630263230946107457">"วอร์ฮอล"</string>
+    <string name="kmeans" msgid="2080952022674981541">"โปสเตอร์"</string>
     <string name="downsample" msgid="3552938534146980104">"ลดลง"</string>
+    <string name="grad" msgid="546774853424848655">"ไล่ระดับ"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"ความสว่าง"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"คอนทราสต์"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"ความอิ่มตัว"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"หลัก"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"แดง"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"เหลือง"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"เขียว"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"ฟ้า"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"น้ำเงิน"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"ม่วงแดง"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"รูปแบบ"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"ใหม่"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"สีแดง"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"สีเขียว"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"สีน้ำเงิน"</string>
     <string name="draw_style" msgid="2036125061987325389">"รูปแบบ"</string>
     <string name="draw_size" msgid="4360005386104151209">"ขนาด"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"โทนสี"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"ความอิ่มตัว"</string>
+    <string name="draw_value" msgid="6571604055161538273">"ความสว่าง"</string>
     <string name="draw_color" msgid="2119030386987211193">"สี"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"เส้น"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"สีเมจิก"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"สาดสี"</string>
     <string name="draw_clear" msgid="6728155515454921052">"ล้าง"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"ความหนา"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"ขนาดมุม"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"สี"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"ล้าง"</string>
     <string name="color_pick_select" msgid="734312818059057394">"เลือกสีที่กำหนดเอง"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"เลือกสี"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"เลือกขนาด"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"ตกลง"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"ต้นฉบับ"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"ผลลัพธ์"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"การบันทึกภาพ"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"กำลังดำเนินการ..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"บันทึกค่ากำหนดล่วงหน้าปัจจุบัน"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"จัดการค่ากำหนดของผู้ใช้"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"ค่าที่กำหนดล่วงหน้าใหม่"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"ชื่อที่กำหนดล่วงหน้า"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"ข้อมูล"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"ชื่อรูปภาพ"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"ขนาดรูปภาพ"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ฮิสโตแกรม"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"ข้อมูล EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"ค่าที่กำหนดล่วงหน้า"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"เวอร์ชัน"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"ดั้งเดิม"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"ปัจจุบัน"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"โมเดล"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"รูรับแสง"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"ความยาวโฟกัส"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"ระยะห่างของแบบ"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"วันที่ถ่าย"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"เวลาเปิดรับแสง"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"ลิขสิทธิ์"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b62c2f9..f54137b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"หมุนไปทางขวา"</string>
     <string name="no_such_item" msgid="5315144556325243400">"ไม่พบรายการ"</string>
     <string name="edit" msgid="1502273844748580847">"แก้ไข"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"แก้ไขแบบง่าย"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"กำลังประมวลผลคำขอให้แคช"</string>
     <string name="caching_label" msgid="4521059045896269095">"กำลังแคช..."</string>
     <string name="crop_action" msgid="3427470284074377001">"ตัด"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"ไม่สามารถเชื่อมต่อกับกล้องถ่ายรูป"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"กล้องถ่ายรูปถูกปิดใช้งานเนื่องจากนโยบายด้านความปลอดภัย"</string>
     <string name="camera_label" msgid="6346560772074764302">"กล้อง"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"กล้องวิดีโอ"</string>
     <string name="wait" msgid="8600187532323801552">"โปรดรอสักครู่..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"ต่อเชื่อมที่จัดเก็บข้อมูล USB ก่อนใช้กล้องถ่ายรูป"</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"ใส่การ์ด SD ก่อนใช้กล้องถ่ายรูป"</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"การตั้งค่ากล้องถ่ายรูป"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"การตั้งค่ากล้องวิดีโอ"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"ขนาดของภาพ"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 ล้านพิกเซล"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 ล้านพิกเซล"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M พิกเซล(16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"อัตโนมัติ"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"อินฟินิตี"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"มาโคร"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"อัตโนมัติ"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"อินฟินิตี"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"มาโคร"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"โหมดแฟลช"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"โหมดแฟลช"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"อัตโนมัติ"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"เปิด"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"ปิด"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"แฟลชอัตโนมัติ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"เปิดแฟลช"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"ปิดแฟลช"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"ไวต์บาลานซ์"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"ไวท์บาลานซ์"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"อัตโนมัติ"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"หลอดไส้"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"กลางวัน"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ฟลูออเรสเซนต์"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"เมฆมาก"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"อัตโนมัติ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"หลอดไส้"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"กลางวัน"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ฟลูออเรสเซนต์"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"เมฆมาก"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"โหมดสำเร็จรูป"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"อัตโนมัติ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"ที่เก็บข้อมูล USB ของคุณไม่มีพื้นที่เหลือ ให้เปลี่ยนการตั้งค่าคุณภาพหรือลบบางภาพหรือไฟล์อื่นๆ"</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"การ์ด SD ของคุณไม่มีพื้นที่เหลือ ให้เปลี่ยนการตั้งค่าคุณภาพหรือลบบางภาพหรือไฟล์อื่นๆ"</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"พื้นที่ว่าง"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"พระอาทิตย์ตก"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"วิดีโอของคุณ"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"พักอุปกรณ์ของคุณ"\n"ออกจากการแสดงผลเป็นเวลาสักครู่หนึ่ง"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"พักอุปกรณ์ของคุณ\nออกจากการแสดงผลเป็นเวลาสักครู่หนึ่ง"</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"แตะเพื่อถ่ายภาพในขณะบันทึก"</string>
     <string name="video_recording_started" msgid="4132915454417193503">"เริ่มบันทึกวิดีโอแล้ว"</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"หยุดบันทึกวิดีโอแล้ว"</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"เปลี่ยนเป็นวิดีโอ"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"เปลี่ยนเป็นภาพพาโนรามา"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"เปลี่ยนเป็นภาพพาโนรามาใหม่"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"สลับไปยังโหมดโฟกัสซ้ำ"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"ไม่ผ่านการตรวจสอบ"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"ผ่านการตรวจสอบ"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"ตรวจสอบการถ่ายภาพ/วิดีโอใหม่"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"เล่นวิดีโอ"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"หยุดวิดีโอชั่วคราว"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"โหลดวิดีโอซ้ำ"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"แถบเวลาของโปรแกรมเล่นวิดีโอ"</string>
     <string name="capital_on" msgid="5491353494964003567">"เปิด"</string>
     <string name="capital_off" msgid="7231052688467970897">"ปิด"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"ปิด"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"ตั้งระยะเวลาเป็นวินาที"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"นับถอยหลังเพื่อถ่ายภาพ"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"จดจำตำแหน่งภาพหรือไม่"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"แท็กรูปภาพและวิดีโอด้วยตำแหน่งที่ถ่ายภาพ"\n\n"แอปพลิเคชันอื่นๆ สามารถเข้าถึงข้อมูลนี้ตลอดจนภาพที่บันทึกไว้ของคุณได้"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"แท็กรูปภาพและวิดีโอด้วยตำแหน่งที่ถ่ายภาพ\n\nแอปพลิเคชันอื่นๆ สามารถเข้าถึงข้อมูลนี้ตลอดจนภาพที่บันทึกไว้ของคุณได้"</string>
     <string name="remember_location_no" msgid="7541394381714894896">"ไม่ ขอบคุณ"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"ใช่"</string>
     <string name="menu_camera" msgid="3476709832879398998">"กล้องถ่ายรูป"</string>
     <string name="menu_search" msgid="7580008232297437190">"ค้นหา"</string>
     <string name="tab_photos" msgid="9110813680630313419">"รูปภาพ"</string>
     <string name="tab_albums" msgid="8079449907770685691">"อัลบั้ม"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ตัวเลือกเพิ่มเติม"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"การตั้งค่า"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d ภาพ"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d ภาพ"</item>
diff --git a/res/values-tl/filtershow_strings.xml b/res/values-tl/filtershow_strings.xml
index 947db42..62498aa 100644
--- a/res/values-tl/filtershow_strings.xml
+++ b/res/values-tl/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor ng Larawan"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Hindi ma-load ang larawan!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Hindi ma-edit ang orihinal"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Itinatakda ang wallpaper"</string>
+    <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="custom_border" msgid="8679893731790931871">"Custom"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"I-undo"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"I-redo"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Ipakita Kasaysayan"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Kasaysayan Pagtago"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Ipakita Image State"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Itago Image State"</string>
+    <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="export_image" msgid="3202835713172222134">"I-export"</string>
+    <string name="print_image" msgid="1942989216591621413">"I-print"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"I-export Naka-flat na Larawan"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Magiging isang kopya ang na-export na larawan, na wala ang kasaysayan."</string>
+    <string name="quality" msgid="179292110309050529">"Kalidad"</string>
+    <string name="size" msgid="4639404642236356037">"Laki"</string>
+    <string name="x" msgid="6810256999024563662">"x"</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>
     <string name="save_and_exit" msgid="3628425023766687419">"I-save at Lumabas"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Pinoproseso ang larawang buo ang resolusyon..."</string>
     <string name="exit" msgid="242642957038770113">"Lumabas"</string>
     <string name="history" msgid="455767361472692409">"Kasaysayan"</string>
     <string name="reset" msgid="9013181350779592937">"I-reset"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Mga Highlight"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Mga Kurba"</string>
     <string name="vignette" msgid="934721068851885390">"Vignette"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vignette"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Exposure"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Saturation"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Contrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Falloff"</string>
     <string name="redeye" msgid="4508883127049472069">"Red Eye"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Gumuhit"</string>
     <string name="straighten" msgid="26025591664983528">"Ituwid"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negative"</string>
     <string name="none" msgid="6633966646410296520">"Wala"</string>
     <string name="edge" msgid="7036064886242147551">"Mga Gilid"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"I-posterize"</string>
     <string name="downsample" msgid="3552938534146980104">"Downsample"</string>
+    <string name="grad" msgid="546774853424848655">"Graduated"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Brightness"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturation"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Pangunahin"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Pula"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Dilaw"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Berde"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Asul"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Istilo"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"bago"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Pula"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Berde"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Asul"</string>
     <string name="draw_style" msgid="2036125061987325389">"Estilo"</string>
     <string name="draw_size" msgid="4360005386104151209">"Laki"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Kulay"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Saturation"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Brightness"</string>
     <string name="draw_color" msgid="2119030386987211193">"Kulay"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Mga Linya"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spatter"</string>
     <string name="draw_clear" msgid="6728155515454921052">"I-clear"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Kapal"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Laki ng Sulok"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Kulay"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"I-clear"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Pumili ng custom na kulay"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Pumili ng Kulay"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Pumili ng Laki"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Orihinal"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Resulta"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Pag-save ng Larawan"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Pinoproseso..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"I-save ang kasalukuyang preset"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Pamahalaan ang preset ng user"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Bagong Preset"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"I-preset ang Pangalan"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Impormasyon"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Pangalan ng Larawan"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Laki ng Larawan"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF Data"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Preset"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Bersyon"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Orihinal"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Kasalukuyan"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Modelo"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Aperture"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Focal Length"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Layo ng Subject"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Petsa kung kailan kinuha"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Exposure Time"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Copyright"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 82c2839..e01f062 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"I-rotate pakanan"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Hindi mahanap ang item."</string>
     <string name="edit" msgid="1502273844748580847">"I-edit"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Simpleng Pag-edit"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Pinoproseso ang mga kahilingan sa pag-cache"</string>
     <string name="caching_label" msgid="4521059045896269095">"Nagka-cache…"</string>
     <string name="crop_action" msgid="3427470284074377001">"I-crop"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Hindi makakonekta sa camera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Hindi na pinagana ang camera dahil sa mga patakaran sa seguridad."</string>
     <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
     <string name="wait" msgid="8600187532323801552">"Pakihintay…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"I-mount ang USB storage bago gamitin ang camera."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Magpasok ng isang SD card bago gamitin ang camera."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Mga setting ng kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mga setting ng camcorder"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Laki ng larawan"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M pixels"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixels"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pixels"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M pixels"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M pixel (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M pixels"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M pixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Walang Katapusan"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"AUTO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITY"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flash mode"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"FLASH MODE"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Auto"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Naka-on"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Naka-off"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTO"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"NAKA-ON ANG FLASH"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"NAKA-OFF ANG FLASH"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"White balance"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"WHITE BALANCE"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Auto"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Napakaliwanag"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Liwanag ng araw"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescent"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Maulap"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"AUTO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"INCANDESCENT"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"DAYLIGHT"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLUORESCENT"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"CLOUDY"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scene mode"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Nauubusan na ng puwang ang iyong imbakan na USB. Baguhin ang setting ng kalidad o tanggalin ang ilan sa mga larawan o ibang mga file."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Nauubusan na ng puwang ang SD card. Baguhin ang setting ng kalidad o tanggalin ang ilan sa mga larawan o ibang mga file."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Sa kalawakan"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Paglubog ng araw"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Iyong video"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Huwag munang gamitin ang iyong device."\n"Umalis muna nang ilang sandali."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Huwag munang gamitin ang iyong device.\nUmalis muna nang ilang sandali."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Pindutin upang kumuha ng larawan habang nagre-record."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Nagsimula na ang pag-record ng video."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Tumigil ang pag-record ng video."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Lumipat sa video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Lumipat sa panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Lumipat sa bagong panorama"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Lumipat sa Refocus"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Suriin ang pagkansela"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Tapos na ang pagsusuri"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Suriin ang muling pagkuha"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"I-play ang video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"I-pause ang video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"I-reload ang video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Bar ng oras ng video player"</string>
     <string name="capital_on" msgid="5491353494964003567">"I-ON"</string>
     <string name="capital_off" msgid="7231052688467970897">"I-OFF"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Pag-off"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Itakda ang tagal sa loob ng ilang segundo"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Nagbibilang upang kumuha ng larawan"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Tandaan ang mga lokasyon ng larawan?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"I-tag ang iyong mga larawan at video sa mga lokasyon kung saan kinunan ang mga iyon."\n\n"Maaaring i-access ng mga ibang app ang impormasyong ito kasama ng iyong mga na-save na larawan."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"I-tag ang iyong mga larawan at video sa mga lokasyon kung saan kinunan ang mga iyon.\n\nMaaaring i-access ng mga ibang app ang impormasyong ito kasama ng iyong mga na-save na larawan."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Hindi na, salamat"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Oo"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Camera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Maghanap"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Mga Larawan"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Mga Album"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"HIGIT PANG MGA PAGPIPILIAN"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"MGA SETTING"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d larawan"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d larawan"</item>
diff --git a/res/values-tr/filtershow_strings.xml b/res/values-tr/filtershow_strings.xml
index b460ef6..17fa9f2 100644
--- a/res/values-tr/filtershow_strings.xml
+++ b/res/values-tr/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Fotoğraf Düzenleyici"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Resim yüklenemiyor"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Orijinal düzenlenemiyor"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Duvar kağıdı ayarlanıyor"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Fotoğraf indirilemedi. Ağ kullanılamıyor."</string>
     <string name="original" msgid="3524493791230430897">"Orijinal"</string>
     <string name="borders" msgid="2067345080568684614">"Kenarlıklar"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Özel"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Geri al"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Yeniden yap"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Geçmişi Göster"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Geçmişi Gizle"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Resim Durumunu Göster"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Resim Durumunu Gizle"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Uygulanan Efektleri Göster"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Uygulanan Efektleri Gizle"</string>
+    <string name="export_image" msgid="3202835713172222134">"Dışa aktar"</string>
+    <string name="print_image" msgid="1942989216591621413">"Yazdır"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Düzleştirilen Resmi Dışa Aktar"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Dışa aktarılan resim, üzerinde yapılan işlemlere yönelik geçmiş bilgileri olmadan kopyalanır."</string>
+    <string name="quality" msgid="179292110309050529">"Kaliteli"</string>
+    <string name="size" msgid="4639404642236356037">"Boyut"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Ayarlar"</string>
     <string name="unsaved" msgid="8704442449002374375">"Bu resimde kaydedilmemiş değişiklikler var."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Çıkmadan önce kaydetmek ister misiniz?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Kaydet ve Çık"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Tam çözünürlüklü resim işleniyor..."</string>
     <string name="exit" msgid="242642957038770113">"Çıkış"</string>
     <string name="history" msgid="455767361472692409">"Geçmiş"</string>
     <string name="reset" msgid="9013181350779592937">"Sıfırla"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Parlak Noktalar"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Eğriler"</string>
     <string name="vignette" msgid="934721068851885390">"Vinyet"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinyet"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Pozlama"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Doygunluk"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Azalma"</string>
     <string name="redeye" msgid="4508883127049472069">"Kırmızı Göz"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Çiz"</string>
     <string name="straighten" msgid="26025591664983528">"Düzleştir"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Negatif"</string>
     <string name="none" msgid="6633966646410296520">"Hiçbiri"</string>
     <string name="edge" msgid="7036064886242147551">"Kenarlar"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Poster Efekti"</string>
     <string name="downsample" msgid="3552938534146980104">"Küçült"</string>
+    <string name="grad" msgid="546774853424848655">"Geçişli"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Parlaklık"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Doygunluk"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Ana"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Kırmızı"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Sarı"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Yeşil"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Camgöbeği"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Mavi"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Macenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"yeni"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Kırmızı"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Yeşil"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Mavi"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
     <string name="draw_size" msgid="4360005386104151209">"Boyut"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Ton"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Doygunluk"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Parlaklık"</string>
     <string name="draw_color" msgid="2119030386987211193">"Renk"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Çizgi"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Fosforlu kalem"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Serpme aracı"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Temizle"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Kalınlık"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Köşe Boyutu"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Renk"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Temizle"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Özel renk seç"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Renk Seçin"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Boyut Seçin"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"Tamam"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Orijinal"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Sonuç"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Resim Kaydediliyor"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"İşleniyor..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Mevcut hazır ayarı kaydet"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Kullanıcı hazır ayarlarını yönet"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Yeni Hazır Ayar"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Hazır Ayar Adı"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Bilgi"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Resim Adı"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Resim Boyutu"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF Verileri"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Hazır Ayar"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Sürüm"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Orijinal"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Mevcut"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Diyafram Açıklığı"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Odak Uzaklığı"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Nesnenin Uzaklığı"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Çekilme tarihi"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Durağı"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Pozlama Süresi"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Telif Hakkı"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 90407c0..8c76d01 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Sağa döndür"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Öğe bulunamadı."</string>
     <string name="edit" msgid="1502273844748580847">"Düzenle"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Basit Düzenleme"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Önbelleğe alma istekleri işleniyor"</string>
     <string name="caching_label" msgid="4521059045896269095">"Önbelleğe alınıyor..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Kırp"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Kameraya bağlanılamıyor."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera, güvenlik politikaları nedeniyle devre dışı bırakıldı."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Video Kamera"</string>
     <string name="wait" msgid="8600187532323801552">"Lütfen bekleyin..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Kamerayı kullanmadan önce USB bellek ekleyin."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Kamerayı kullanmadan önce bir SD kart takın."</string>
@@ -233,8 +233,9 @@
     <string name="pref_camera_id_title" msgid="4040791582294635851">"Kamera seç"</string>
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Arka"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Ön"</string>
-    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Depo konumu"</string>
-    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Zamanlayıcı"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Konumu kaydet"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"KONUM"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Geri sayım saati"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 saniye"</item>
     <item quantity="other" msgid="6455381617076792481">"%d saniye"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera ayarları"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Kamera ayarları"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Resim boyutu"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 M piksel"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M piksel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 M piksel"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M piksel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 M piksel (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3M piksel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M piksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Otomatik"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Sonsuz"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"OTOMATİK"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"SONSUZ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MAKRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flaş modu"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"FLAŞ MODU"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Otomatik"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Açık"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Kapalı"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"OTOMATİK FLAŞ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLAŞ AÇIK"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLAŞ KAPALI"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Beyaz dengesi"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"BEYAZ DENGESİ"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Otomatik"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Ampul"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Gün Işığı"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Floresan"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Bulutlu"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"OTOMATİK"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"AMPUL"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"GÜN IŞIĞI"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"FLORESAN"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"BULUTLU"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Sahne modu"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Otomatik"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Gece"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Gün batımı"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Parti"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"YOK"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"AKSİYON"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"GECE"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"GÜN BATIMI"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"PARTİ"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"GERİ SAYIM SAATİ"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ZAMANLAYICI KAPALI"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SANİYE"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SANİYE"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 SANİYE"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 SANİYE"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Sahne modunda seçilemez."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Pozlama"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"POZLAMA"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"ÖN KAMERA"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"ARKA KAMERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"Tamam"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB belleğinizde boş alan azaldı. Kalite ayarını değiştirin veya bazı resimleri ya da diğer dosyaları silin."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD kartınızda boş alan azaldı. Kalite ayarını değiştirin veya bazı resimleri ya da diğer dosyaları silin."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Uzayda"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Gün Batımı"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Videonuz"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Cihazınızı yerleştirin."\n"Kısa bir süre için görüntüden çıkın."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Cihazınızı yerleştirin.\nKısa bir süre için görüntüden çıkın."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Kayıt sırasında fotoğraf çekmek için dokunun."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Video kaydı başladı."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Video kaydı durdu."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Videoya geç"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Panorama moduna geç"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Yeni panoramaya geç"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Yeniden odaklamaya geç"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Yorumu iptal et"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Yorum tamamlandı"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"İncelemede tekrar çek"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Videoyu oynat"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Videoyu duraklat"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Videoyu yeniden yükle"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Video oynatıcı zaman çubuğu"</string>
     <string name="capital_on" msgid="5491353494964003567">"AÇ"</string>
     <string name="capital_off" msgid="7231052688467970897">"KAPAT"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Kapalı"</string>
@@ -382,17 +419,19 @@
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Bitti"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Zaman Aralığını Ayarla"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"Zaman atlama özelliği kapalı. Zaman aralığını ayarlamak için etkinleştirin."</string>
-    <string name="set_timer_help" msgid="5007708849404589472">"Zamanlayıcı kapalı. Fotoğraf çekmeden önce geri saymak için açın."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Geri sayım saati kapalı. Fotoğraf çekmeden önce geri saymak için açın."</string>
     <string name="set_duration" msgid="5578035312407161304">"Süreyi saniye cinsinden ayarlayın"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Fotoğraf çekmek için geri sayılıyor"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Fotoğrafların çekildiği yerler hatırlansın mı?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Fotoğraflarınızı ve videolarınızı çekildikleri konumlarla etiketleyin."\n\n"Diğer uygulamalar, kaydedilen görüntülerle birlikte bu bilgilere erişebilir."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Fotoğraflarınızı ve videolarınızı çekildikleri konumlarla etiketleyin.\n\nDiğer uygulamalar, kaydedilen görüntülerle birlikte bu bilgilere erişebilir."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Hayır, teşekkürler"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Evet"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Kamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Ara"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Fotoğraflar"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Albümler"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"DİĞER SEÇENEKLER"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"AYARLAR"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d fotoğraf"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotoğraf"</item>
diff --git a/res/values-uk/filtershow_strings.xml b/res/values-uk/filtershow_strings.xml
index f35d760..5fe6c89 100644
--- a/res/values-uk/filtershow_strings.xml
+++ b/res/values-uk/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Редактор фотографій"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Неможливо завантажити зображення."</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Не можна редагувати оригінал"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Встановлення фонового малюнка"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Не вдалося завантажити фотографію. Мережа не доступна."</string>
     <string name="original" msgid="3524493791230430897">"Оригінал"</string>
     <string name="borders" msgid="2067345080568684614">"Облямівка"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Спеціальний"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Відмінити"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Повторити"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Показати історію"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Сховати історію"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Показ. стан зображ."</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Сховати стан зображ."</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Показати застосовані ефекти"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Сховати застосовані ефекти"</string>
+    <string name="export_image" msgid="3202835713172222134">"Експортувати"</string>
+    <string name="print_image" msgid="1942989216591621413">"Друк"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Експорт спрощеного зображення"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Експортоване зображення буде копією без історії."</string>
+    <string name="quality" msgid="179292110309050529">"Якість"</string>
+    <string name="size" msgid="4639404642236356037">"Розмір"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Налаштування"</string>
     <string name="unsaved" msgid="8704442449002374375">"У зображенні є незбережені зміни."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Зберегти перед виходом?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Зберегти та вийти"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Обробка зображення максимальної роздільної здатності…"</string>
     <string name="exit" msgid="242642957038770113">"Вийти"</string>
     <string name="history" msgid="455767361472692409">"Історія"</string>
     <string name="reset" msgid="9013181350779592937">"Скинути"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Затемнення"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Криві"</string>
     <string name="vignette" msgid="934721068851885390">"Віньєтка"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Віньєтка"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Експозиція"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Насиченість"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Контраст"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Спад"</string>
     <string name="redeye" msgid="4508883127049472069">"Червоні очі"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Малювати"</string>
     <string name="straighten" msgid="26025591664983528">"Вирівнювання"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Негатив"</string>
     <string name="none" msgid="6633966646410296520">"Нічого"</string>
     <string name="edge" msgid="7036064886242147551">"Краї"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Ворхол"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Постер"</string>
     <string name="downsample" msgid="3552938534146980104">"Зниж.якість"</string>
+    <string name="grad" msgid="546774853424848655">"Розмічений"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Яскравість"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Контраст"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Насиченість"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Основний"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Червоний"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Жовтий"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Зелений"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Блакитний"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Синій"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Пурпуровий"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Стиль"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"новинка"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Червоний"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Зелений"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Синій"</string>
     <string name="draw_style" msgid="2036125061987325389">"Стиль"</string>
     <string name="draw_size" msgid="4360005386104151209">"Розмір"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Тон"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Насиченість"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Яскравість"</string>
     <string name="draw_color" msgid="2119030386987211193">"Колір"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Лінії"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Маркер"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Розпилення"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Очистити"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Товщина"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Розмір кута"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Колір"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Очистити"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Вибрати спеціальний колір"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Вибрати колір"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Вибрати розмір"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"ОК"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Оригінал"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Результат"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Зберігання зображення"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Обробка…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Зберегти цей набір налаштувань"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Керувати наборами налаштувань"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Новий набір налаштувань"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Назва набору налаштувань"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Інформація"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Назва зображення"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Розмір зображення"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Гістограма"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Дані EXІF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Набір налаштувань"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Версія"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Оригінал"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Поточна"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Модель"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Апертура"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Фокусна відстань"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Відстань до об’єкта"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Дата зйомки"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Поділка діафрагми"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Час експозиції"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Авторські права"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fc01c4a..aec2df8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Поверн. вправо"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Не вдалося знайти елемент."</string>
     <string name="edit" msgid="1502273844748580847">"Редагувати"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Просте редагування"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Виконується обробка запитів кешування"</string>
     <string name="caching_label" msgid="4521059045896269095">"Кешування..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Обрізати"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Неможливо підключитися до камери."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Камеру вимкнено відповідно до правил безпеки."</string>
     <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Відеокамера"</string>
     <string name="wait" msgid="8600187532323801552">"Зачекайте…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Підключіть носій USB перед тим, як користуватися камерою."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Вставте карту SD перед тим, як користуватися камерою."</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Налаштування камери"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Налашт-ня відеокамери"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Розмір фото"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 Мпікс."</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 мегапікселів"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Мпікс"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 Мпікс."</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Мпікс"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Мпікс"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 Мпікс. (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 Mпікс"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 Мпікс"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Автом."</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Безкінечн."</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Макро"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"АВТО"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"БЕЗКІНЕЧНІСТЬ"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"МАКРО"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Режим спалаху"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"РЕЖИМ СПАЛАХУ"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Автом."</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Увімк."</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Вимк."</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"АВТОМАТИЧНИЙ СПАЛАХ"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"СПАЛАХ УВІМК."</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"СПАЛАХ ВИМК."</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Баланс білого"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"БАЛАНС БІЛОГО"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Автом."</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Лампа розжар."</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Сонячно"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Флуоресцентний"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Хмарно"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"АВТО"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ЛАМПА РОЗЖАРЮВАННЯ"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"СОНЯЧНО"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ЛАМПА ДЕННОГО СВІТЛА"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ХМАРНО"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Режим зйомки"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Автом."</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"На носії USB недостатньо місця. Змініть налаштування якості чи видаліть зображення або інші файли."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"На карті SD недостатньо місця. Змініть налаштування якості чи видаліть зображення або інші файли."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"У космосі"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Захід сонця"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Ваше відео"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Покладіть свій пристрій."\n"На декілька секунд вийдіть із поля зору."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Покладіть свій пристрій.\nНа декілька секунд вийдіть із поля зору."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Торкніться, щоб сфотографувати під час запису."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Запис відео розпочався."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Запис відео припинився."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Перейти в режим відео"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Перейти в режим панорами"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Перейти в режим нової панорами"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Перейти в режим перефокусування"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Cкасувати перегляд"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Виконати перегляд"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Повторити в режимі перегляду"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Відтворити відео"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Призупинити відео"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Перезавантажити відео"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Панель часу відеопрогравача"</string>
     <string name="capital_on" msgid="5491353494964003567">"УВІМКНЕНО"</string>
     <string name="capital_off" msgid="7231052688467970897">"ВИМКНЕНО"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Вимкнено"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Установити тривалість у секундах"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Відлік перед зйомкою"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Зберігати місця з фотографій?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Додавайте до своїх фотографій і відео теги про місця, де їх було зроблено."\n\n"Інші програми можуть отримувати доступ до цієї інформації, а також ваших збережених зображень."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Додавайте до своїх фотографій і відео теги про місця, де їх було зроблено.\n\nІнші програми можуть отримувати доступ до цієї інформації, а також ваших збережених зображень."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Ні, дякую"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Так"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Камера"</string>
     <string name="menu_search" msgid="7580008232297437190">"Пошук"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Фотографії"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Альбоми"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"ІНШІ ОПЦІЇ"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"НАЛАШТУВАННЯ"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d фото"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d фото"</item>
diff --git a/res/values-vi/filtershow_strings.xml b/res/values-vi/filtershow_strings.xml
index 60b2f03..a060faf 100644
--- a/res/values-vi/filtershow_strings.xml
+++ b/res/values-vi/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Trình chỉnh sửa ảnh"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Không thể tải hình ảnh!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Không thể chỉnh sửa ảnh gốc"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Đang đặt hình nền"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Không thể tải xuống ảnh. Không có mạng."</string>
     <string name="original" msgid="3524493791230430897">"Gốc"</string>
     <string name="borders" msgid="2067345080568684614">"Đường viền"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Tùy chỉnh"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Hoàn tác"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Làm lại"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Hiển thị lịch sử"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Ẩn lịch sử"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Hiện tr.thái hình ảnh"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Ẩn tr.thái hình ảnh"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Hiển thị các hiệu ứng được áp dụng"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ẩn các hiệu ứng được áp dụng"</string>
+    <string name="export_image" msgid="3202835713172222134">"Xuất"</string>
+    <string name="print_image" msgid="1942989216591621413">"In"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Xuất hình ảnh đã làm phẳng"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Ảnh được xuất sẽ là một bản sao mà không có lịch sử."</string>
+    <string name="quality" msgid="179292110309050529">"Chất lượng"</string>
+    <string name="size" msgid="4639404642236356037">"Kích thước"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Cài đặt"</string>
     <string name="unsaved" msgid="8704442449002374375">"Có các thay đổi chưa được lưu đối với hình ảnh này."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Bạn có muốn lưu trước khi thoát không?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Lưu và thoát"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Đang xử lý hình ảnh có độ phân giải đầy đủ..."</string>
     <string name="exit" msgid="242642957038770113">"Thoát"</string>
     <string name="history" msgid="455767361472692409">"Lịch sử"</string>
     <string name="reset" msgid="9013181350779592937">"Đặt lại"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Vùng sáng"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Đồ thị màu"</string>
     <string name="vignette" msgid="934721068851885390">"Làm mờ nét ảnh"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Làm mờ nét ảnh"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Độ phơi sáng"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Độ bão hòa"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Độ tương phản"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Độ suy giảm"</string>
     <string name="redeye" msgid="4508883127049472069">"Mắt đỏ"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Vẽ"</string>
     <string name="straighten" msgid="26025591664983528">"Làm thẳng"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Âm bản"</string>
     <string name="none" msgid="6633966646410296520">"Không có"</string>
     <string name="edge" msgid="7036064886242147551">"Cạnh"</string>
-    <string name="kmeans" msgid="1630263230946107457">"Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Giảm màu"</string>
     <string name="downsample" msgid="3552938534146980104">"Giảm mẫu"</string>
+    <string name="grad" msgid="546774853424848655">"Đã chia độ"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Độ sáng"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Độ tương phản"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Bão hòa"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Điều khiển chính"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Đỏ"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Vàng"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Lục"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Lục lam"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Lam"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Đỏ tươi"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Kiểu"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"mới"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Đỏ"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Xanh lục"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Xanh lam"</string>
     <string name="draw_style" msgid="2036125061987325389">"Kiểu"</string>
     <string name="draw_size" msgid="4360005386104151209">"Kích thước"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Màu sắc"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Bão hòa"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Độ sáng"</string>
     <string name="draw_color" msgid="2119030386987211193">"Màu"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Đường vẽ"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Bút dạ"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Bút vẽ"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Xóa"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Độ dày"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Kích thước góc"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Màu"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Xóa"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Chọn màu tùy chỉnh"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Chọn màu"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Chọn kích thước"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Gốc"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Kết quả"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Đang lưu hình ảnh"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Đang xử lý..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Lưu giá trị đặt sẵn hiện tại"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Q.lý g.trị đặt sẵn của ng.dùng"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Giá trị đặt sẵn mới"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Tên đặt sẵn"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Thông tin"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Tên hình ảnh"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Kích thước hình ảnh"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Biểu đồ"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Dữ liệu EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"G.trị đặt sẵn"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Phiên bản"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Gốc"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Hiện tại"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Kiểu"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Khẩu độ"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Tiêu cự"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Khoảng cách đối tượng"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Ngày chụp"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Ngừng F"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Thời gian phơi sáng"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Bản quyền"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 6672f13..f199482 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Xoay phải"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Không thể tìm thấy mục."</string>
     <string name="edit" msgid="1502273844748580847">"Chỉnh sửa"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Chỉnh sửa đơn giản"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Đang xử lý yêu cầu lưu vào bộ nhớ cache"</string>
     <string name="caching_label" msgid="4521059045896269095">"Lưu cache..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Cắt"</string>
@@ -150,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Làm phai màu"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Màu xanh dương"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Đen/trắng"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Hơi vàng"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"Quá trình X"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litho"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Không thể kết nối với máy ảnh."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Máy ảnh đã bị tắt do chính sách bảo mật."</string>
     <string name="camera_label" msgid="6346560772074764302">"Máy ảnh"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Máy quay video"</string>
     <string name="wait" msgid="8600187532323801552">"Vui lòng đợi..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Kết nối bộ nhớ USB trước khi sử dụng máy ảnh."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Lắp thẻ SD trước khi sử dụng máy ảnh."</string>
@@ -234,6 +234,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Quay lại"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Trước"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Vị trí lưu trữ"</string>
+    <string name="pref_camera_location_label" msgid="2254270920298609161">"VỊ TRÍ"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"Đồng hồ đếm ngược"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 giây"</item>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Cài đặt máy ảnh"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Cài đặt máy quay video"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Kích thước ảnh"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M pixel"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixel"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pixel"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M pixel"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M pixel"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M pixel (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3M pixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M pixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Tự động"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Vô cùng"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"TỰ ĐỘNG"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"VÔ CỰC"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Chế độ flash"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"CHẾ ĐỘ FLASH"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Tự động"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Bật"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Tắt"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH TỰ ĐỘNG"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"BẬT FLASH"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"TẮT FLASH"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Cân bằng trắng"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"CÂN BẰNG TRẮNG"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Tự động"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Ánh sáng nóng"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Ánh sáng ban ngày"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Huỳnh quang"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Nhiều mây"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"TỰ ĐỘNG"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ÁNH SÁNG NÓNG"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ÁNH SÁNG BAN NGÀY"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"HUỲNH QUANG"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"NHIỀU MÂY"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Chế độ chụp cảnh"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Tự động"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ban đêm"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Hoàng hôn"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Bữa tiệc"</string>
+    <string name="pref_camera_scenemode_label_auto" msgid="4475096836397300237">"KHÔNG CÓ"</string>
+    <string name="pref_camera_scenemode_label_action" msgid="964748409622151496">"TÁC VỤ"</string>
+    <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"ĐÊM"</string>
+    <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"HOÀNG HÔN"</string>
+    <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"BỮA TIỆC"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ĐỒNG HỒ ĐẾM NGƯỢC"</string>
+    <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"TẮT BỘ TÍNH GIỜ"</string>
+    <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 GIÂY"</string>
+    <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 GIÂY"</string>
+    <string name="pref_camera_countdown_label_ten" msgid="6274681535347260279">"10 GIÂY"</string>
+    <string name="pref_camera_countdown_label_fifteen" msgid="4544824246687597089">"15 GIÂY"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Không thể chọn trong chế độ cảnh."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Phơi sáng"</string>
+    <string name="pref_exposure_label" msgid="552624394642497940">"ĐỘ PHƠI SÁNG"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
+    <string name="pref_camera_id_label_back" msgid="8745553500400332333">"MÁY ẢNH MẶT TRƯỚC"</string>
+    <string name="pref_camera_id_label_front" msgid="8699439330056996709">"MÁY ẢNH MẶT SAU"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Bộ nhớ USB của bạn sắp hết dung lượng. Thay đổi cài đặt chất lượng hoặc xóa một số ảnh hoặc tệp khác."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Thẻ SD của bạn sắp hết dung lượng. Thay đổi cài đặt chất lượng hoặc xóa một số ảnh hoặc tệp khác."</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Trong không gian"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Hoàng hôn"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Video của bạn"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Dừng thiết bị của bạn."\n"Thoát khỏi chế độ xem trong giây lát."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Dừng thiết bị của bạn.\nThoát khỏi chế độ xem trong giây lát."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Chạm để chụp ảnh trong khi quay."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Đã bắt đầu quay video."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Đã dừng quay video."</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Chuyển sang video"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Chuyển sang chế độ toàn cảnh"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Chuyển sang chế độ toàn cảnh mới"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Chuyển sang Lấy nét lại"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Hủy bài đánh giá"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Đánh giá xong"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Xem lại ảnh chụp lại"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Phát video"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Tạm dừng video"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Tải lại video"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Thanh thời gian của trình phát video"</string>
     <string name="capital_on" msgid="5491353494964003567">"BẬT"</string>
     <string name="capital_off" msgid="7231052688467970897">"TẮT"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Tắt"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Đặt thời gian trong vài giây"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Đếm ngược để chụp ảnh"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Nhớ vị trí chụp ảnh?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Gắn thẻ cho ảnh và video của bạn với những địa điểm mà ảnh đó được chụp và video đó được quay."\n\n"Các ứng dụng khác có thể truy cập vào thông tin này cùng với các hình ảnh đã lưu của bạn."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Gắn thẻ cho ảnh và video của bạn với những địa điểm mà ảnh đó được chụp và video đó được quay.\n\nCác ứng dụng khác có thể truy cập vào thông tin này cùng với các hình ảnh đã lưu của bạn."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Không, cảm ơn"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Có"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Máy ảnh"</string>
     <string name="menu_search" msgid="7580008232297437190">"Tìm kiếm"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Ảnh"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Album"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"TÙY CHỌN KHÁC"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"CÀI ĐẶT"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d ảnh"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d ảnh"</item>
diff --git a/res/values-zh-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml
index ec5f099..6eff897 100644
--- a/res/values-zh-rCN/filtershow_strings.xml
+++ b/res/values-zh-rCN/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"照片编辑器"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"无法加载该图片!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"无法编辑原图"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"正在设置壁纸"</string>
+    <string name="download_failure" msgid="5923323939788582895">"未连接到网络,因此无法下载照片。"</string>
     <string name="original" msgid="3524493791230430897">"原图"</string>
     <string name="borders" msgid="2067345080568684614">"边框"</string>
+    <string name="custom_border" msgid="8679893731790931871">"自定义"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"撤消"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"重做"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"显示历史记录"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"隐藏历史记录"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"显示图片状态"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"隐藏图片状态"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"显示已应用的效果"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"隐藏已应用的效果"</string>
+    <string name="export_image" msgid="3202835713172222134">"导出"</string>
+    <string name="print_image" msgid="1942989216591621413">"打印"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"导出平面图片"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"导出的图片将是副本,且不含任何编辑记录。"</string>
+    <string name="quality" msgid="179292110309050529">"品质"</string>
+    <string name="size" msgid="4639404642236356037">"大小"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"设置"</string>
     <string name="unsaved" msgid="8704442449002374375">"此图片的更改尚未保存。"</string>
     <string name="save_before_exit" msgid="2680660633675916712">"要在退出之前保存更改吗?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"保存并退出"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"正在处理完整分辨率图片…"</string>
     <string name="exit" msgid="242642957038770113">"退出"</string>
     <string name="history" msgid="455767361472692409">"历史记录"</string>
     <string name="reset" msgid="9013181350779592937">"重置"</string>
@@ -60,37 +69,88 @@
     <string name="contrast" msgid="2310908487756769019">"对比度"</string>
     <string name="vibrance" msgid="3326744578577835915">"自然饱和度"</string>
     <string name="saturation" msgid="7026791551032438585">"饱和度"</string>
-    <string name="bwfilter" msgid="8927492494576933793">"黑白过滤器"</string>
-    <string name="wbalance" msgid="6346581563387083613">"自动调整色彩"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"黑白滤镜"</string>
+    <string name="wbalance" msgid="6346581563387083613">"自动调色"</string>
     <string name="hue" msgid="6231252147971086030">"色调"</string>
     <string name="shadow_recovery" msgid="3928572915300287152">"阴影"</string>
     <string name="highlight_recovery" msgid="8262208470735204243">"强光"</string>
     <string name="curvesRGB" msgid="915010781090477550">"曲线"</string>
     <string name="vignette" msgid="934721068851885390">"晕影"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"晕影"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"曝光"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"饱和度"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"对比度"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"衰减率"</string>
     <string name="redeye" msgid="4508883127049472069">"红眼"</string>
-    <string name="imageDraw" msgid="6918552177844486656">"绘图"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"手绘"</string>
     <string name="straighten" msgid="26025591664983528">"拉直"</string>
-    <string name="crop" msgid="5781263790107850771">"裁剪"</string>
+    <string name="crop" msgid="5781263790107850771">"剪裁"</string>
     <string name="rotate" msgid="2796802553793795371">"旋转"</string>
     <string name="mirror" msgid="5482518108154883096">"镜像"</string>
     <string name="negative" msgid="6998313764388022201">"负片"</string>
     <string name="none" msgid="6633966646410296520">"无"</string>
     <string name="edge" msgid="7036064886242147551">"边缘亮化"</string>
-    <string name="kmeans" msgid="1630263230946107457">"波普效果"</string>
+    <string name="kmeans" msgid="2080952022674981541">"色调分离"</string>
     <string name="downsample" msgid="3552938534146980104">"下采样"</string>
+    <string name="grad" msgid="546774853424848655">"渐变"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"亮度"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"对比度"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"饱和度"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"主色"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"红色"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"黄色"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"绿色"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"青色"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"蓝色"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"紫红色"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"样式"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"新"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"红色"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"绿色"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"蓝色"</string>
     <string name="draw_style" msgid="2036125061987325389">"样式"</string>
     <string name="draw_size" msgid="4360005386104151209">"大小"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"色调"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"饱和度"</string>
+    <string name="draw_value" msgid="6571604055161538273">"亮度"</string>
     <string name="draw_color" msgid="2119030386987211193">"颜色"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"线条"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"记号笔"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"喷笔"</string>
     <string name="draw_clear" msgid="6728155515454921052">"清除"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"厚度"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"边角大小"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"颜色"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"清除"</string>
     <string name="color_pick_select" msgid="734312818059057394">"选择自定义颜色"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"选择颜色"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"选择大小"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"确定"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"原图"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"结果"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"正在保存图片"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"正在处理…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"保存当前预设"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"管理用户预设"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"新预设"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"预设名称"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"信息"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"图片名称"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"图片大小"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"直方图"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF 数据"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"预设"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"版本"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"原图"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"当前"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"型号"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"光圈"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"焦距"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"感光度"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"物距"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"拍摄日期"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"光圈值"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"曝光时间"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"版权"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cb89a4d..725c767 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -38,7 +38,7 @@
     <string name="saving_image" msgid="7270334453636349407">"正在保存照片..."</string>
     <string name="filtershow_saving_image" msgid="6659463980581993016">"正在将照片保存到“<xliff:g id="ALBUM_NAME">%1$s</xliff:g>”…"</string>
     <string name="save_error" msgid="6857408774183654970">"无法保存经过裁剪的图片。"</string>
-    <string name="crop_label" msgid="521114301871349328">"修剪照片"</string>
+    <string name="crop_label" msgid="521114301871349328">"剪裁照片"</string>
     <string name="trim_label" msgid="274203231381209979">"剪辑视频"</string>
     <string name="select_image" msgid="7841406150484742140">"选择照片"</string>
     <string name="select_video" msgid="4859510992798615076">"选择视频"</string>
@@ -88,9 +88,10 @@
     <string name="rotate_right" msgid="6776325835923384839">"向右旋转"</string>
     <string name="no_such_item" msgid="5315144556325243400">"找不到指定的项。"</string>
     <string name="edit" msgid="1502273844748580847">"编辑"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"简单编辑"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"正在处理缓存请求"</string>
     <string name="caching_label" msgid="4521059045896269095">"正在缓存..."</string>
-    <string name="crop_action" msgid="3427470284074377001">"修剪"</string>
+    <string name="crop_action" msgid="3427470284074377001">"剪裁"</string>
     <string name="trim_action" msgid="703098114452883524">"修剪"</string>
     <string name="mute_action" msgid="5296241754753306251">"静音"</string>
     <string name="set_as" msgid="3636764710790507868">"设置为"</string>
@@ -217,9 +218,8 @@
     <string name="ingest_no_device" msgid="3054128223131382122">"未连接 MTP 设备"</string>
     <string name="camera_error_title" msgid="6484667504938477337">"相机故障"</string>
     <string name="cannot_connect_camera" msgid="955440687597185163">"无法连接到相机。"</string>
-    <string name="camera_disabled" msgid="8923911090533439312">"由于安全政策的限制,相机已被停用。"</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"由于安全政策的限制,相机已被禁用。"</string>
     <string name="camera_label" msgid="6346560772074764302">"相机"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"摄像机"</string>
     <string name="wait" msgid="8600187532323801552">"请稍候..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"使用相机前请先装载 USB 存储设备。"</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"使用相机前请先插入 SD 卡。"</string>
@@ -233,7 +233,8 @@
     <string name="pref_camera_id_title" msgid="4040791582294635851">"选择摄像头"</string>
     <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>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"保存位置信息"</string>
+    <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>
@@ -250,11 +251,14 @@
     <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"延时"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相机设置"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"摄像机设置"</string>
-    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"照片大小"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"照片尺寸"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"1300万像素"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"800 万像素"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"500 万像素"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"400万像素"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"300 万像素"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"200 万像素"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"200万像素(16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"130 万像素"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"100 万像素"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"自动"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"无限远"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"微距"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"自动"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"无限远"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"微距"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"闪光模式"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"闪光灯模式"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"自动"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"开"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"关"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"自动闪光灯"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"打开闪光灯"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"关闭闪光灯"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"白平衡"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"白平衡"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"自动"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"白炽光"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"日光"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"荧光"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"阴天"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"自动"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"白炽光"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"日光"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"荧光"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"阴天"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"取景模式"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"自动"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"USB 存储设备空间不足,请更改照片品质设置,或删除某些照片或者其他文件。"</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"SD 卡空间不足,请更改照片品质设置,或删除某些照片或者其他文件。"</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"太空背景"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"日落"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"您的视频"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"把设备放好。"\n"离开镜头前片刻。"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"把设备放好。\n离开镜头前片刻。"</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"在录制视频过程中,轻触一下即可拍一张照片。"</string>
     <string name="video_recording_started" msgid="4132915454417193503">"已开始录制视频。"</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"已停止录制视频。"</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"切换到视频模式"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"切换到全景模式"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"切换到新的全景模式"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"切换为重新聚焦模式"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"取消"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"完成"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"重拍"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"播放视频"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"暂停视频"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"重新加载视频"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"视频播放器时间栏"</string>
     <string name="capital_on" msgid="5491353494964003567">"打开"</string>
     <string name="capital_off" msgid="7231052688467970897">"关闭"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"关闭"</string>
@@ -386,13 +423,15 @@
     <string name="set_duration" msgid="5578035312407161304">"设置倒数时间(秒)"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"拍照倒计时中"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"是否记住照片拍摄地点?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"为您的照片和视频标明拍摄地点。"\n\n"其他应用在查看您保存的图片时将可以访问这些信息。"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"为您的照片和视频标明拍摄地点。\n\n其他应用在查看您保存的照片和视频时将可以使用这些信息。"</string>
     <string name="remember_location_no" msgid="7541394381714894896">"不用了"</string>
-    <string name="remember_location_yes" msgid="862884269285964180">"是"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"好"</string>
     <string name="menu_camera" msgid="3476709832879398998">"相机"</string>
     <string name="menu_search" msgid="7580008232297437190">"搜索"</string>
     <string name="tab_photos" msgid="9110813680630313419">"照片"</string>
     <string name="tab_albums" msgid="8079449907770685691">"相册"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"更多选项"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"设置"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d张照片"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d张照片"</item>
diff --git a/res/values-zh-rHK/filtershow_strings.xml b/res/values-zh-rHK/filtershow_strings.xml
new file mode 100644
index 0000000..0fb849a
--- /dev/null
+++ b/res/values-zh-rHK/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"相片編輯程式"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"無法載入相片!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"無法編輯原圖"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"正在設定桌布"</string>
+    <string name="download_failure" msgid="5923323939788582895">"目前沒有網絡連線,因此無法下載相片。"</string>
+    <string name="original" msgid="3524493791230430897">"原始"</string>
+    <string name="borders" msgid="2067345080568684614">"邊框"</string>
+    <string name="custom_border" msgid="8679893731790931871">"自訂"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"復原"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"取消復原"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"顯示應用的效果"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"隱藏應用的效果"</string>
+    <string name="export_image" msgid="3202835713172222134">"匯出"</string>
+    <string name="print_image" msgid="1942989216591621413">"列印"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"匯出壓平的相片"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"匯出的相片是不附編輯記錄的複本。"</string>
+    <string name="quality" msgid="179292110309050529">"質素"</string>
+    <string name="size" msgid="4639404642236356037">"大小"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"設定"</string>
+    <string name="unsaved" msgid="8704442449002374375">"這張相片的變更尚未儲存。"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"您要在結束前儲存變更嗎?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"儲存並結束"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"正在處理全解像度相片…"</string>
+    <string name="exit" msgid="242642957038770113">"結束"</string>
+    <string name="history" msgid="455767361472692409">"記錄"</string>
+    <string name="reset" msgid="9013181350779592937">"重設"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"套用的效果"</string>
+    <string name="compare_original" msgid="8140838959007796977">"比較"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"應用"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"重設"</string>
+    <string name="aspect" msgid="4025244950820813059">"長寬比"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"無"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"已固定"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"蟲視視角"</string>
+    <string name="exposure" msgid="6526397045949374905">"曝光"</string>
+    <string name="sharpness" msgid="6463103068318055412">"銳利度"</string>
+    <string name="contrast" msgid="2310908487756769019">"對比"</string>
+    <string name="vibrance" msgid="3326744578577835915">"鮮艷度"</string>
+    <string name="saturation" msgid="7026791551032438585">"飽和度"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"黑白濾鏡"</string>
+    <string name="wbalance" msgid="6346581563387083613">"自動色彩校正"</string>
+    <string name="hue" msgid="6231252147971086030">"色調"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"陰影"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"亮點"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"曲線"</string>
+    <string name="vignette" msgid="934721068851885390">"暈影"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"炫影"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"曝光"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"飽和度"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"對比"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"衰減"</string>
+    <string name="redeye" msgid="4508883127049472069">"紅眼修正"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"繪圖"</string>
+    <string name="straighten" msgid="26025591664983528">"拉正"</string>
+    <string name="crop" msgid="5781263790107850771">"裁剪"</string>
+    <string name="rotate" msgid="2796802553793795371">"旋轉"</string>
+    <string name="mirror" msgid="5482518108154883096">"鏡子"</string>
+    <string name="negative" msgid="6998313764388022201">"負片"</string>
+    <string name="none" msgid="6633966646410296520">"無"</string>
+    <string name="edge" msgid="7036064886242147551">"邊緣特效"</string>
+    <string name="kmeans" msgid="2080952022674981541">"色調分離"</string>
+    <string name="downsample" msgid="3552938534146980104">"縮小取樣"</string>
+    <string name="grad" msgid="546774853424848655">"漸層"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"光暗度"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"對比"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"飽和度"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"代表色"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"紅色"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"黃色"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"綠色"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"洋青色"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"藍色"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"洋紅色"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"樣式"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"新漸層"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"紅色"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"綠色"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"藍色"</string>
+    <string name="draw_style" msgid="2036125061987325389">"樣式"</string>
+    <string name="draw_size" msgid="4360005386104151209">"大小"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"色調"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"飽和度"</string>
+    <string name="draw_value" msgid="6571604055161538273">"光暗度"</string>
+    <string name="draw_color" msgid="2119030386987211193">"顏色"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"線條"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"箱頭筆"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"潑濺"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"清除"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"厚度"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"邊角大小"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"顏色"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"清除"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"選擇自訂顏色"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"選取顏色"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"選取大小"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"確定"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"原圖"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"結果"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"正在儲存相片"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"處理中…"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"儲存目前的預設"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"管理使用者預設"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"新預設"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"預設名稱"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"資訊"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"相片名稱"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"相片大小"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"柱狀圖"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF 資料"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"預設"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"版本"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"原始版本"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"目前版本"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"型號"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"光圈"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"焦距"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"主題距離"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"拍攝日期"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"光圈孔徑"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"曝光時間"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"版權"</string>
+</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..68317d5
--- /dev/null
+++ b/res/values-zh-rHK/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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">
+    <string name="app_name" msgid="1928079047368929634">"圖片庫"</string>
+    <string name="gadget_title" msgid="259405922673466798">"相框"</string>
+    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
+    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
+    <string name="movie_view_label" msgid="3526526872644898229">"影片播放器"</string>
+    <string name="loading_video" msgid="4013492720121891585">"正在載入影片..."</string>
+    <string name="loading_image" msgid="1200894415793838191">"正在載入相片..."</string>
+    <string name="loading_account" msgid="928195413034552034">"正在載入帳戶…"</string>
+    <string name="resume_playing_title" msgid="8996677350649355013">"繼續播放影片"</string>
+    <string name="resume_playing_message" msgid="5184414518126703481">"要從 %s 繼續播放嗎?"</string>
+    <string name="resume_playing_resume" msgid="3847915469173852416">"繼續播放"</string>
+    <string name="loading" msgid="7038208555304563571">"正在載入..."</string>
+    <string name="fail_to_load" msgid="8394392853646664505">"無法載入"</string>
+    <string name="fail_to_load_image" msgid="6155388718549782425">"無法載入圖片"</string>
+    <string name="no_thumbnail" msgid="284723185546429750">"無縮圖"</string>
+    <string name="resume_playing_restart" msgid="5471008499835769292">"重新開始"</string>
+    <string name="crop_save_text" msgid="152200178986698300">"確定"</string>
+    <string name="ok" msgid="5296833083983263293">"確定"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"輕觸臉部即可開始。"</string>
+    <string name="saving_image" msgid="7270334453636349407">"正在儲存相片…"</string>
+    <string name="filtershow_saving_image" msgid="6659463980581993016">"正在將圖片儲存至「<xliff:g id="ALBUM_NAME">%1$s</xliff:g>」…"</string>
+    <string name="save_error" msgid="6857408774183654970">"無法儲存經裁剪的相片。"</string>
+    <string name="crop_label" msgid="521114301871349328">"裁剪相片"</string>
+    <string name="trim_label" msgid="274203231381209979">"修剪影片"</string>
+    <string name="select_image" msgid="7841406150484742140">"選取相片"</string>
+    <string name="select_video" msgid="4859510992798615076">"選取影片"</string>
+    <string name="select_item" msgid="2816923896202086390">"選取項目"</string>
+    <string name="select_album" msgid="1557063764849434077">"選取相簿"</string>
+    <string name="select_group" msgid="6744208543323307114">"選取群組"</string>
+    <string name="set_image" msgid="2331476809308010401">"將圖片設為"</string>
+    <string name="set_wallpaper" msgid="8491121226190175017">"設定桌布"</string>
+    <string name="wallpaper" msgid="140165383777262070">"正在設定桌布..."</string>
+    <string name="camera_setas_wallpaper" msgid="797463183863414289">"桌布"</string>
+    <string name="delete" msgid="2839695998251824487">"刪除"</string>
+  <plurals name="delete_selection">
+    <item quantity="one" msgid="6453379735401083732">"刪除選取的項目?"</item>
+    <item quantity="other" msgid="5874316486520635333">"刪除選取的項目?"</item>
+  </plurals>
+    <string name="confirm" msgid="8646870096527848520">"確認"</string>
+    <string name="cancel" msgid="3637516880917356226">"取消"</string>
+    <string name="share" msgid="3619042788254195341">"分享"</string>
+    <string name="share_panorama" msgid="2569029972820978718">"分享全景"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"以相片形式分享"</string>
+    <string name="deleted" msgid="6795433049119073871">"已刪除"</string>
+    <string name="undo" msgid="2930873956446586313">"復原"</string>
+    <string name="select_all" msgid="3403283025220282175">"全部選取"</string>
+    <string name="deselect_all" msgid="5758897506061723684">"取消全選"</string>
+    <string name="slideshow" msgid="4355906903247112975">"投影播放"</string>
+    <string name="details" msgid="8415120088556445230">"詳細資料"</string>
+    <string name="details_title" msgid="2611396603977441273">"第 %1$d 項 (共 %2$d 項):"</string>
+    <string name="close" msgid="5585646033158453043">"關閉"</string>
+    <string name="switch_to_camera" msgid="7280111806675169992">"切換至相機"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="2142579311530586258">"已選取 %1$d 個"</item>
+    <item quantity="one" msgid="2478365152745637768">"已選取 %1$d 個"</item>
+    <item quantity="other" msgid="754722656147810487">"已選取 %1$d 個"</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="zero" msgid="749292746814788132">"已選取 %1$d 個"</item>
+    <item quantity="one" msgid="6184377003099987825">"已選取 %1$d 個"</item>
+    <item quantity="other" msgid="53105607141906130">"已選取 %1$d 個"</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="zero" msgid="3466388370310869238">"已選取 %1$d 個"</item>
+    <item quantity="one" msgid="5030162638216034260">"已選取 %1$d 個"</item>
+    <item quantity="other" msgid="3512041363942842738">"已選取 %1$d 個"</item>
+  </plurals>
+    <string name="show_on_map" msgid="6157544221201750980">"在地圖上顯示"</string>
+    <string name="rotate_left" msgid="5888273317282539839">"向左旋轉"</string>
+    <string name="rotate_right" msgid="6776325835923384839">"向右旋轉"</string>
+    <string name="no_such_item" msgid="5315144556325243400">"找不到項目。"</string>
+    <string name="edit" msgid="1502273844748580847">"編輯"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"簡易編輯"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"正在處理快取要求"</string>
+    <string name="caching_label" msgid="4521059045896269095">"正在快取..."</string>
+    <string name="crop_action" msgid="3427470284074377001">"裁剪"</string>
+    <string name="trim_action" msgid="703098114452883524">"修剪"</string>
+    <string name="mute_action" msgid="5296241754753306251">"靜音"</string>
+    <string name="set_as" msgid="3636764710790507868">"設為"</string>
+    <string name="video_mute_err" msgid="6392457611270600908">"無法將影片設為靜音。"</string>
+    <string name="video_err" msgid="7003051631792271009">"無法播放影片。"</string>
+    <string name="group_by_location" msgid="316641628989023253">"按位置"</string>
+    <string name="group_by_time" msgid="9046168567717963573">"按時間"</string>
+    <string name="group_by_tags" msgid="3568731317210676160">"按標記"</string>
+    <string name="group_by_faces" msgid="1566351636227274906">"依人物分組"</string>
+    <string name="group_by_album" msgid="1532818636053818958">"按相簿"</string>
+    <string name="group_by_size" msgid="153766174950394155">"依大小分類"</string>
+    <string name="untagged" msgid="7281481064509590402">"無標記"</string>
+    <string name="no_location" msgid="4043624857489331676">"無地點資訊"</string>
+    <string name="no_connectivity" msgid="7164037617297293668">"網絡發生問題,因此部分位置無法辨別。"</string>
+    <string name="sync_album_error" msgid="1020688062900977530">"無法下載這本相簿中的相片,請稍後再試。"</string>
+    <string name="show_images_only" msgid="7263218480867672653">"僅顯示相片"</string>
+    <string name="show_videos_only" msgid="3850394623678871697">"僅顯示影片"</string>
+    <string name="show_all" msgid="6963292714584735149">"相片及影片"</string>
+    <string name="appwidget_title" msgid="6410561146863700411">"相片庫"</string>
+    <string name="appwidget_empty_text" msgid="1228925628357366957">"沒有相片。"</string>
+    <string name="crop_saved" msgid="1595985909779105158">"裁剪的相片已儲存至 <xliff:g id="FOLDER_NAME">%s</xliff:g>。"</string>
+    <string name="no_albums_alert" msgid="4111744447491690896">"沒有相簿。"</string>
+    <string name="empty_album" msgid="4542880442593595494">"O 可用相片/影片。"</string>
+    <string name="picasa_posts" msgid="1497721615718760613">"發佈"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"可在離線時瀏覽"</string>
+    <string name="sync_picasa_albums" msgid="8522572542111169872">"重新整理"</string>
+    <string name="done" msgid="217672440064436595">"完成"</string>
+    <string name="sequence_in_set" msgid="7235465319919457488">"第 %1$d 項 (共 %2$d 項):"</string>
+    <string name="title" msgid="7622928349908052569">"標題"</string>
+    <string name="description" msgid="3016729318096557520">"描述"</string>
+    <string name="time" msgid="1367953006052876956">"時間"</string>
+    <string name="location" msgid="3432705876921618314">"位置"</string>
+    <string name="path" msgid="4725740395885105824">"路徑"</string>
+    <string name="width" msgid="9215847239714321097">"寬度"</string>
+    <string name="height" msgid="3648885449443787772">"高度"</string>
+    <string name="orientation" msgid="4958327983165245513">"方向"</string>
+    <string name="duration" msgid="8160058911218541616">"通話時間"</string>
+    <string name="mimetype" msgid="8024168704337990470">"MIME 類型"</string>
+    <string name="file_size" msgid="8486169301588318915">"檔案大小"</string>
+    <string name="maker" msgid="7921835498034236197">"製造商"</string>
+    <string name="model" msgid="8240207064064337366">"模型"</string>
+    <string name="flash" msgid="2816779031261147723">"閃光燈"</string>
+    <string name="aperture" msgid="5920657630303915195">"光圈"</string>
+    <string name="focal_length" msgid="1291383769749877010">"焦距"</string>
+    <string name="white_balance" msgid="1582509289994216078">"白平衡"</string>
+    <string name="exposure_time" msgid="3990163680281058826">"曝光時間"</string>
+    <string name="iso" msgid="5028296664327335940">"ISO"</string>
+    <string name="unit_mm" msgid="1125768433254329136">"毫米"</string>
+    <string name="manual" msgid="6608905477477607865">"手動"</string>
+    <string name="auto" msgid="4296941368722892821">"自動"</string>
+    <string name="flash_on" msgid="7891556231891837284">"使用閃光燈"</string>
+    <string name="flash_off" msgid="1445443413822680010">"未使用閃光燈"</string>
+    <string name="unknown" msgid="3506693015896912952">"不明"</string>
+    <string name="ffx_original" msgid="372686331501281474">"原始"</string>
+    <string name="ffx_vintage" msgid="8348759951363844780">"復古"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"即時"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"漂白"</string>
+    <string name="ffx_blue_crush" msgid="6034283412305561226">"藍色"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"黑白"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"打孔"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"正片負沖"</string>
+    <string name="ffx_washout" msgid="4594160692176642735">"褐色"</string>
+    <string name="ffx_washout_color" msgid="8034075742195795219">"石版"</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one" msgid="2171596356101611086">"正在將相簿設為可離線瀏覽。"</item>
+    <item quantity="other" msgid="4948604338155959389">"正在將相簿設為可離線瀏覽。"</item>
+  </plurals>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"這個項目已儲存在本機上,並且可供離線使用。"</string>
+    <string name="set_label_all_albums" msgid="4581863582996336783">"所有相簿"</string>
+    <string name="set_label_local_albums" msgid="6698133661656266702">"本機相簿"</string>
+    <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP 裝置"</string>
+    <string name="set_label_picasa_albums" msgid="5356258354953935895">"Picasa 相簿"</string>
+    <string name="free_space_format" msgid="8766337315709161215">"可用空間:<xliff:g id="BYTES">%s</xliff:g>"</string>
+    <string name="size_below" msgid="2074956730721942260">"<xliff:g id="SIZE">%1$s</xliff:g> 以下"</string>
+    <string name="size_above" msgid="5324398253474104087">"<xliff:g id="SIZE">%1$s</xliff:g> 以上"</string>
+    <string name="size_between" msgid="8779660840898917208">"<xliff:g id="MIN_SIZE">%1$s</xliff:g> 至 <xliff:g id="MAX_SIZE">%2$s</xliff:g>"</string>
+    <string name="Import" msgid="3985447518557474672">"匯入"</string>
+    <string name="import_complete" msgid="3875040287486199999">"完成匯入"</string>
+    <string name="import_fail" msgid="8497942380703298808">"匯入失敗"</string>
+    <string name="camera_connected" msgid="916021826223448591">"相機已連線。"</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"相機已中斷連線。"</string>
+    <string name="click_import" msgid="6407959065464291972">"輕觸這裡即可匯入相簿"</string>
+    <string name="widget_type_album" msgid="6013045393140135468">"選擇相簿"</string>
+    <string name="widget_type_shuffle" msgid="8594622705019763768">"隨機播放所有圖片"</string>
+    <string name="widget_type_photo" msgid="6267065337367795355">"選擇相片"</string>
+    <string name="widget_type" msgid="1364653978966343448">"選擇相片"</string>
+    <string name="slideshow_dream_name" msgid="6915963319933437083">"投影播放"</string>
+    <string name="albums" msgid="7320787705180057947">"相簿"</string>
+    <string name="times" msgid="2023033894889499219">"時間"</string>
+    <string name="locations" msgid="6649297994083130305">"位置"</string>
+    <string name="people" msgid="4114003823747292747">"人物"</string>
+    <string name="tags" msgid="5539648765482935955">"標籤"</string>
+    <string name="group_by" msgid="4308299657902209357">"分組依據"</string>
+    <string name="settings" msgid="1534847740615665736">"設定"</string>
+    <string name="add_account" msgid="4271217504968243974">"新增帳戶"</string>
+    <string name="folder_camera" msgid="4714658994809533480">"相機"</string>
+    <string name="folder_download" msgid="7186215137642323932">"下載"</string>
+    <string name="folder_edited_online_photos" msgid="6278215510236800181">"已編輯的網上相片"</string>
+    <string name="folder_imported" msgid="2773581395524747099">"已匯入"</string>
+    <string name="folder_screenshot" msgid="7200396565864213450">"屏幕擷取畫面"</string>
+    <string name="help" msgid="7368960711153618354">"說明"</string>
+    <string name="no_external_storage_title" msgid="2408933644249734569">"沒有儲存裝置"</string>
+    <string name="no_external_storage" msgid="95726173164068417">"沒有可用的外部儲存裝置"</string>
+    <string name="switch_photo_filmstrip" msgid="8227883354281661548">"幻燈片檢視"</string>
+    <string name="switch_photo_grid" msgid="3681299459107925725">"格狀檢視"</string>
+    <string name="switch_photo_fullscreen" msgid="8360489096099127071">"全屏幕畫面"</string>
+    <string name="trimming" msgid="9122385768369143997">"剪輯中"</string>
+    <string name="muting" msgid="5094925919589915324">"正在設為靜音"</string>
+    <string name="please_wait" msgid="7296066089146487366">"請稍候"</string>
+    <string name="save_into" msgid="9155488424829609229">"正在將影片儲存至「<xliff:g id="ALBUM_NAME">%1$s</xliff:g>」…"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"無法剪輯:目標影片長度過短"</string>
+    <string name="pano_progress_text" msgid="1586851614586678464">"正在組合全景"</string>
+    <string name="save" msgid="613976532235060516">"儲存"</string>
+    <string name="ingest_scanning" msgid="1062957108473988971">"正在掃瞄內容..."</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="zero" msgid="2623289390474007396">"已掃瞄 %1$d 個項目"</item>
+    <item quantity="one" msgid="4340019444460561648">"已掃瞄 %1$d 個項目"</item>
+    <item quantity="other" msgid="3138021473860555499">"已掃瞄 %1$d 個項目"</item>
+  </plurals>
+    <string name="ingest_sorting" msgid="1028652103472581918">"正在排序..."</string>
+    <string name="ingest_scanning_done" msgid="8911916277034483430">"掃瞄完成"</string>
+    <string name="ingest_importing" msgid="7456633398378527611">"正在匯入..."</string>
+    <string name="ingest_empty_device" msgid="2010470482779872622">"沒有內容可供這部裝置匯入。"</string>
+    <string name="ingest_no_device" msgid="3054128223131382122">"未連接任何 MTP 裝置"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"相機發生錯誤"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"無法連接相機。"</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"由於安全性政策規定,相機已遭停用。"</string>
+    <string name="camera_label" msgid="6346560772074764302">"攝影機"</string>
+    <string name="wait" msgid="8600187532323801552">"請稍候..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"使用相機前,請先裝上 USB 儲存裝置。"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"使用相機前,請先插入 SD 記憶卡。"</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"正在準備 USB 儲存裝置..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"正在準備 SD 卡..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"無法存取 USB 儲存裝置。"</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"無法存取 SD 卡。"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"取消"</string>
+    <string name="review_ok" msgid="1156261588693116433">"完成"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"延時攝影錄製"</string>
+    <string name="pref_camera_id_title" msgid="4040791582294635851">"選擇相機"</string>
+    <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>
+    <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>
+    <item quantity="other" msgid="6455381617076792481">"%d 秒"</item>
+  </plurals>
+    <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
+    <skip />
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"倒數時發出嗶聲"</string>
+    <string name="setting_off" msgid="4480039384202951946">"關閉"</string>
+    <string name="setting_on" msgid="8602246224465348901">"開啟"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"影片品質"</string>
+    <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"高畫質"</string>
+    <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"低畫質"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"延時攝影"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"相機設定"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"攝錄影機設定"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"相片大小"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"1,300 萬像素"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 百萬像素"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 百萬像素"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"400 萬像素"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 百萬像素"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 百萬像素"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"200 萬像素 (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"130 萬像素"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 百萬像素"</string>
+    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"對焦模式"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"自動"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"無限大"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"微距"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"自動"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"無限"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"微距"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"閃光模式"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"閃光燈模式"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"自動"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"開"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"關"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"自動閃光燈"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"開啟閃光燈"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"關閉閃光燈"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"白平衡"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"白平衡"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"自動"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"鎢絲燈"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"日光"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"光管"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"陰天"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"自動"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"鎢絲燈"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"日光"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"光管"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"陰天"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"場景模式"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"自動"</string>
+    <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"動態"</string>
+    <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>
+    <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>
+    <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 />
+    <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>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"您的 USB 儲存裝置的空間即將用盡,請變更相片的品質設定,或是刪除部分相片或其他檔案。"</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"您 SD 記憶卡的空間即將用盡,請變更相片的品質設定,或是刪除部分相片或其他檔案。"</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"已達大小上限。"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"太快"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"正在準備全景預覽"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"無法儲存全景。"</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"全景"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"全景拍攝中"</string>
+    <string name="pano_dialog_waiting_previous" msgid="7800325815031423516">"正在等待先前的全景處理完成"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"正在儲存..."</string>
+    <string name="pano_review_rendering" msgid="2887552964129301902">"正在組合全景"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"輕觸即可對焦。"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"效果"</string>
+    <string name="effect_none" msgid="3601545724573307541">"無"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"擠壓"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"大眼睛"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"大嘴巴"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"小嘴巴"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"大鼻子"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"小眼睛"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"太空"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"日落"</string>
+    <string name="effect_backdropper_gallery" msgid="959158844620991906">"您的影片"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"放下您的裝置。\n暫時離開畫面。"</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"輕觸即可在攝錄期間拍照。"</string>
+    <string name="video_recording_started" msgid="4132915454417193503">"錄影已開始。"</string>
+    <string name="video_recording_stopped" msgid="5086919511555808580">"錄影已停止。"</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"於開啟特效時停用快照。"</string>
+    <string name="clear_effects" msgid="5485339175014139481">"清除效果"</string>
+    <string name="effect_silly_faces" msgid="8107732405347155777">"趣怪臉"</string>
+    <string name="effect_background" msgid="6579360207378171022">"背景"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"[快門] 按鈕"</string>
+    <string name="accessibility_menu_button" msgid="7140794046259897328">"選單按鈕"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"最近的相片"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"前置和後置鏡頭開關"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"相機、影片或全景選取工具"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"更多設定控制"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"關閉設定控制"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"縮放控制"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"減少%1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"增加%1$s"</string>
+    <string name="accessibility_check_box" msgid="7317447218256584181">"%1$s 選取方塊"</string>
+    <string name="accessibility_switch_to_camera" msgid="5951340774212969461">"切換至相片模式"</string>
+    <string name="accessibility_switch_to_video" msgid="4991396355234561505">"切換至影片模式"</string>
+    <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"切換至全景模式"</string>
+    <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"切換至新全景"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"切換至重新對焦模式"</string>
+    <string name="accessibility_review_cancel" msgid="9070531914908644686">"[檢視模式] 取消"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"[檢視模式] 完成"</string>
+    <string name="accessibility_review_retake" msgid="659300290054705484">"[檢視] 重拍"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"播放影片"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"暫停影片"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"重新載入影片"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"影片播放器時間軸"</string>
+    <string name="capital_on" msgid="5491353494964003567">"開啟"</string>
+    <string name="capital_off" msgid="7231052688467970897">"關閉"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"關閉"</string>
+    <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0.5 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1.5 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_2000" msgid="827813989647794389">"2 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_2500" msgid="5750464143606788153">"2.5 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_3000" msgid="2664846627499751396">"3 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_4000" msgid="7303255804306382651">"4 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_5000" msgid="6800566761690741841">"5 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_6000" msgid="8545447466540319539">"6 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_10000" msgid="3105568489694909852">"10 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_12000" msgid="6055574367392821047">"12 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_15000" msgid="2656164845371833761">"15 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2192628967233421512">"24 秒"</string>
+    <string name="pref_video_time_lapse_frame_interval_30000" msgid="5923393773260634461">"0.5 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_60000" msgid="4678581247918524850">"1 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_90000" msgid="1187029705069674152">"1.5 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_120000" msgid="145301938098991278">"2 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_150000" msgid="793707078196731912">"2.5 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_180000" msgid="1785467676466542095">"3 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_240000" msgid="3734507766184666356">"4 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_300000" msgid="7442765761995328639">"5 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_360000" msgid="6724596937972563920">"6 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_600000" msgid="6563665954471001352">"10 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_720000" msgid="8969801372893266408">"12 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_900000" msgid="5803172407245902896">"15 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="6286246349698492186">"24 分鐘"</string>
+    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="5042628461448570758">"0.5 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="6366071632666482636">"1 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="536117788694519019">"1.5 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="6846617415182608533">"2 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="4242839574025261419">"2.5 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="2766886102170605302">"3 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="7497934659667867582">"4 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="8783643014853837140">"5 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="5005078879234015432">"6 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="69942198321578519">"10 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 小時"</string>
+    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 小時"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"秒鐘"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"分鐘"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"小時"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"完成"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"設定時間間隔"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"延時攝影功能已關閉,請開啟以設定時間間隔。"</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"倒數計時器已關閉。如要在拍照前倒數,請先開啟。"</string>
+    <string name="set_duration" msgid="5578035312407161304">"設定倒數時間 (以秒為單位)"</string>
+    <string name="count_down_title_text" msgid="4976386810910453266">"為拍照倒數中"</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"記錄拍攝地點?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"為您的相片和影片標記拍攝地點。\n\n其他應用程式存取您所儲存的影像時,也可以存取這項資訊。"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"不,謝謝"</string>
+    <string name="remember_location_yes" msgid="862884269285964180">"是"</string>
+    <string name="menu_camera" msgid="3476709832879398998">"相機"</string>
+    <string name="menu_search" msgid="7580008232297437190">"搜尋"</string>
+    <string name="tab_photos" msgid="9110813680630313419">"相片"</string>
+    <string name="tab_albums" msgid="8079449907770685691">"專輯"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"更多選項"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"設定"</string>
+  <plurals name="number_of_photos">
+    <item quantity="one" msgid="6949174783125614798">"%1$d 張相片"</item>
+    <item quantity="other" msgid="3813306834113858135">"%1$d 張相片"</item>
+  </plurals>
+</resources>
diff --git a/res/values-zh-rTW/filtershow_strings.xml b/res/values-zh-rTW/filtershow_strings.xml
index 7bb6fb0..f689a0f 100644
--- a/res/values-zh-rTW/filtershow_strings.xml
+++ b/res/values-zh-rTW/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"相片編輯器"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"無法載入圖片!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"無法編輯原圖"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"正在設定桌布"</string>
+    <string name="download_failure" msgid="5923323939788582895">"目前沒有網路連線,因此無法下載相片。"</string>
     <string name="original" msgid="3524493791230430897">"原始"</string>
     <string name="borders" msgid="2067345080568684614">"邊框"</string>
+    <string name="custom_border" msgid="8679893731790931871">"自訂"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"復原"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"重做"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"顯示紀錄"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"隱藏紀錄"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"顯示圖片狀態"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"隱藏圖片狀態"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"顯示套用的效果"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"隱藏套用的效果"</string>
+    <string name="export_image" msgid="3202835713172222134">"匯出"</string>
+    <string name="print_image" msgid="1942989216591621413">"列印"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"匯出壓平合併的圖片"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"匯出的項目是不含紀錄的複製圖片。"</string>
+    <string name="quality" msgid="179292110309050529">"畫質"</string>
+    <string name="size" msgid="4639404642236356037">"大小"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"設定"</string>
     <string name="unsaved" msgid="8704442449002374375">"這張圖片的變更尚未儲存。"</string>
     <string name="save_before_exit" msgid="2680660633675916712">"您要在結束前儲存變更嗎?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"儲存並結束"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"正在處理完整解析度圖片..."</string>
     <string name="exit" msgid="242642957038770113">"結束"</string>
     <string name="history" msgid="455767361472692409">"紀錄"</string>
     <string name="reset" msgid="9013181350779592937">"重設"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"強光"</string>
     <string name="curvesRGB" msgid="915010781090477550">"曲線"</string>
     <string name="vignette" msgid="934721068851885390">"暈影"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"暈影"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"曝光"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"飽和度"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"對比"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"衰減"</string>
     <string name="redeye" msgid="4508883127049472069">"紅眼"</string>
     <string name="imageDraw" msgid="6918552177844486656">"繪圖"</string>
     <string name="straighten" msgid="26025591664983528">"拉正"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"負片效果"</string>
     <string name="none" msgid="6633966646410296520">"無"</string>
     <string name="edge" msgid="7036064886242147551">"邊緣特效"</string>
-    <string name="kmeans" msgid="1630263230946107457">"安迪沃荷"</string>
+    <string name="kmeans" msgid="2080952022674981541">"色調分離"</string>
     <string name="downsample" msgid="3552938534146980104">"縮小取樣"</string>
+    <string name="grad" msgid="546774853424848655">"漸層"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"亮度"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"對比"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"飽和度"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"主色"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"紅色"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"黃色"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"綠色"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"青色"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"藍色"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"洋紅色"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"樣式"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"新"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"紅色"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"綠色"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"藍色"</string>
     <string name="draw_style" msgid="2036125061987325389">"樣式"</string>
     <string name="draw_size" msgid="4360005386104151209">"尺寸"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"色調"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"飽和度"</string>
+    <string name="draw_value" msgid="6571604055161538273">"亮度"</string>
     <string name="draw_color" msgid="2119030386987211193">"顏色"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"線條"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"彩色筆"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"潑灑"</string>
     <string name="draw_clear" msgid="6728155515454921052">"清除"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"厚度"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"邊角大小"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"顏色"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"清除"</string>
     <string name="color_pick_select" msgid="734312818059057394">"選擇自訂顏色"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"選擇顏色"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"選擇尺寸"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"確定"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"原始"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"結果"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"正在儲存圖片"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"處理中..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"儲存目前的預設"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"管理使用者預設"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"新預設"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"預設名稱"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"資訊"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"圖片名稱"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"圖片大小"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"直方圖"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF 資料"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"預設"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"版本"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"原始版本"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"目前版本"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"型號"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"光圈"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"焦距"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"拍攝距離"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"拍攝日期"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"光圈孔徑"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"曝光時間"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"版權"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 079ea5d..c7a3d73 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -88,6 +88,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"向右旋轉"</string>
     <string name="no_such_item" msgid="5315144556325243400">"找不到項目。"</string>
     <string name="edit" msgid="1502273844748580847">"編輯"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"簡易編輯"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"正在處理快取要求"</string>
     <string name="caching_label" msgid="4521059045896269095">"快取中…"</string>
     <string name="crop_action" msgid="3427470284074377001">"裁剪"</string>
@@ -219,7 +220,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"無法連接相機。"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"由於安全性政策規定,相機已遭停用。"</string>
     <string name="camera_label" msgid="6346560772074764302">"相機"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"攝錄影機"</string>
     <string name="wait" msgid="8600187532323801552">"請稍候…"</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"使用相機前,請先插入 USB 儲存裝置。"</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"使用相機前,請先插入 SD 卡。"</string>
@@ -234,6 +234,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>
+    <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>
@@ -251,10 +252,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相機設定"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"攝錄影機設定"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"相片大小"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"1300 萬像素"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"800 萬像素"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"500 萬像素"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"400 萬像素"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"300 萬像素"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"200 萬像素"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"200 萬像素 (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"130 萬像素"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"100 萬像素"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -263,16 +267,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"自動"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"無限遠"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"微距"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"自動"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"無限遠"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"微距"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"閃光模式"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"閃光燈模式"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"自動"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"開啟"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"關閉"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"自動閃光燈"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"開啟閃光燈"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"關閉閃光燈"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"白平衡"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"白平衡"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"自動"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"鎢絲燈"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"日光"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"螢光燈"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"陰天"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"自動"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"鎢絲燈"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"日光"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"螢光燈"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"陰天"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"場景模式"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"自動"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"HDR"</string>
@@ -280,10 +297,25 @@
     <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>
+    <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>
+    <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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"您的 USB 儲存裝置的空間即將用盡,請變更圖片的品質設定,或是刪除部分圖片或其他檔案。"</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"您 SD 卡的空間即將不足,請變更圖片的品質設定,或是刪除部分圖片或其他檔案。"</string>
@@ -308,7 +340,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"太空"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"黃昏"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"您的影片"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"放下您的裝置"\n"暫時離開畫面。"</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"放下您的裝置\n暫時離開畫面。"</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"輕觸即可在錄製期間拍照。"</string>
     <string name="video_recording_started" msgid="4132915454417193503">"錄影程序已啟動。"</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"錄影程序已暫停。"</string>
@@ -331,9 +363,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"切換至影片模式"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"切換至全景模式"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"切換為新全景"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"切換至重新對焦模式"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"檢閱取消"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"檢閱完成"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"檢查重拍"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"播放影片"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"暫停影片"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"重新載入影片"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"影片播放器時間軸"</string>
     <string name="capital_on" msgid="5491353494964003567">"開啟"</string>
     <string name="capital_off" msgid="7231052688467970897">"關閉"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"關閉"</string>
@@ -382,17 +419,19 @@
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"完成"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"設定時間間隔"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"延時攝影功能已關閉,請開啟以設定時間間格。"</string>
-    <string name="set_timer_help" msgid="5007708849404589472">"倒數計時器目前為關閉狀態,開啓即可在拍照前倒數計時。"</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"倒數計時器目前為關閉狀態,開啟即可在拍照前倒數計時。"</string>
     <string name="set_duration" msgid="5578035312407161304">"設定倒數時間 (以秒為單位)"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"拍照倒數計時中"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"記錄拍攝地點?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"為您的相片和影片標記拍攝地點。"\n\n"其他應用程式可存取這項資訊及您所儲存的相片。"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"為您的相片和影片標記拍攝地點。\n\n其他應用程式可存取這項資訊及您所儲存的相片。"</string>
     <string name="remember_location_no" msgid="7541394381714894896">"不用了,謝謝"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"是"</string>
     <string name="menu_camera" msgid="3476709832879398998">"相機"</string>
     <string name="menu_search" msgid="7580008232297437190">"搜尋"</string>
     <string name="tab_photos" msgid="9110813680630313419">"相片"</string>
     <string name="tab_albums" msgid="8079449907770685691">"相簿"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"更多選項"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"設定"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d 張相片"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d 張相片"</item>
diff --git a/res/values-zu/filtershow_strings.xml b/res/values-zu/filtershow_strings.xml
index 8bdcbf0..f3b64aa 100644
--- a/res/values-zu/filtershow_strings.xml
+++ b/res/values-zu/filtershow_strings.xml
@@ -18,21 +18,30 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="title_activity_filter_show" msgid="2036539130684382763">"Isihleli sesithombe"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Ayikwazi ukulayisha isithombe!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Ayikwazi ukuhlela okwangempela"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"Isetha isithombe sangemuva"</string>
+    <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="custom_border" msgid="8679893731790931871">"Ngokwezifiso"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Hlehlisa"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Yenza kabusha"</string>
-    <string name="show_history_panel" msgid="7785810372502120090">"Bonisa umlando"</string>
-    <string name="hide_history_panel" msgid="2082672248771133871">"Fihla umlando"</string>
-    <string name="show_imagestate_panel" msgid="7132294085840948243">"Bonisa isimo sesithombe"</string>
-    <string name="hide_imagestate_panel" msgid="1135313661068111161">"Fihla isimo sesithombe"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Bonisa imiphumela esetshenzisiwe"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Fihla imiphumela esetshenzisiwe"</string>
+    <string name="export_image" msgid="3202835713172222134">"Hambisa"</string>
+    <string name="print_image" msgid="1942989216591621413">"Phrinta"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Thumela isithombe esiyisicaba"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Isithombe esihanjisiwe sizoba yikhophi, ngaphandle komlando."</string>
+    <string name="quality" msgid="179292110309050529">"Ikhwalithi"</string>
+    <string name="size" msgid="4639404642236356037">"Usayizi"</string>
+    <string name="x" msgid="6810256999024563662">"x"</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>
     <string name="save_and_exit" msgid="3628425023766687419">"Londoloza uphinde uphume"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Icubungula isithombe sokulungiswa okugcwele ..."</string>
     <string name="exit" msgid="242642957038770113">"Phuma"</string>
     <string name="history" msgid="455767361472692409">"Umlando"</string>
     <string name="reset" msgid="9013181350779592937">"Setha kabusha"</string>
@@ -67,6 +76,11 @@
     <string name="highlight_recovery" msgid="8262208470735204243">"Okubekwe obala"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Ukugobeka"</string>
     <string name="vignette" msgid="934721068851885390">"I-Vignette"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"I-Vignette"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Isibonelelo"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Ukugcwalisa isikhala"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Ukugqama"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"I-Falloff"</string>
     <string name="redeye" msgid="4508883127049472069">"Iso elibomvu"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Dweba"</string>
     <string name="straighten" msgid="26025591664983528">"Qondisa"</string>
@@ -76,21 +90,67 @@
     <string name="negative" msgid="6998313764388022201">"Inegethivu"</string>
     <string name="none" msgid="6633966646410296520">"Akunalutho"</string>
     <string name="edge" msgid="7036064886242147551">"Imiphetho"</string>
-    <string name="kmeans" msgid="1630263230946107457">"I-Warhol"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Ukumisaphuhle"</string>
     <string name="downsample" msgid="3552938534146980104">"I-Downsample"</string>
+    <string name="grad" msgid="546774853424848655">"Thole iziqu"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Ukugqama"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Ukugqama"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Gcwalisa isikhala"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Eyinhloko"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Okubomvu"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Okuliphuzi"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Okuluhlaza okotshani"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"I-Cyan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Okuluhlaza okwesibhakabhaka"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"I-Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Isitayela"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"okusha"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"I-RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"Okubomvu"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Okuluhlaza"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Okuluhlaza sasibhakabhaka"</string>
     <string name="draw_style" msgid="2036125061987325389">"Isitayela"</string>
     <string name="draw_size" msgid="4360005386104151209">"Usayizi"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"I-Hue"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Gcwalisa isikhala"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Ukugqama"</string>
     <string name="draw_color" msgid="2119030386987211193">"Umbala"</string>
     <string name="draw_style_line" msgid="9216476853904429628">"Imigqa"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Isiphawuli"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"I-Spatter"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Sula"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Ukuqina"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Usayizi wekhona"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Umbala"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Sula"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Khetha umbala wangokwezifiso"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Khetha umbala"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Khetha usayizi"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"KULUNGILE"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Okwangempela"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Umphumela"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Ilondoloza isithombe"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Iyacubungula..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Londoloza ukumisa kabusha kwamanje"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Phatha ukumisa kabusha komsebenzisi"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Ukumisa kabusha okusha"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Misa kabusha igama"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Ulwazi"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Igama lesithombe"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Usayizi wesithombe"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"I-Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Idatha ye-EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Misa kabusha"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Inguqulo"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Okwangempela"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Okwamanje"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Imodeli"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Imbobo"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Ubude befokhasi"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"I-ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Ibanga lesihloko"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Idethi ezithathwe ngayo"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Isikhathi esisobala"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"I-Copyright"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7e88404..f3ac66b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -90,6 +90,7 @@
     <string name="rotate_right" msgid="6776325835923384839">"Phendukisela kwesokudla"</string>
     <string name="no_such_item" msgid="5315144556325243400">"Yehlulekile ukuthola into yakho."</string>
     <string name="edit" msgid="1502273844748580847">"Hlela"</string>
+    <string name="simple_edit" msgid="2792835918347498211">"Ukuhlela okulula"</string>
     <string name="process_caching_requests" msgid="8722939570307386071">"Ilungisa izicelo zokufaka kwinqolobane"</string>
     <string name="caching_label" msgid="4521059045896269095">"Ukulondoloza isikhashana..."</string>
     <string name="crop_action" msgid="3427470284074377001">"Khropha"</string>
@@ -221,7 +222,6 @@
     <string name="cannot_connect_camera" msgid="955440687597185163">"Ayikwazi ukuxhuma ekhamereni."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Ikhamera inqunyiwe ngenxa yepolisi yezokuphepha."</string>
     <string name="camera_label" msgid="6346560772074764302">"Ikhamera"</string>
-    <string name="video_camera_label" msgid="2899292505526427293">"Ikhamera enerekhoda"</string>
     <string name="wait" msgid="8600187532323801552">"Sicela ulinde..."</string>
     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Sicela ukhweze isitoreji se-USB ngaphambi kokusebenzisa ikhamera."</string>
     <string name="no_storage" product="default" msgid="5137703033746873624">"Sicela ufake ikhadi le-SD ngaphambi kokusebenzisa ikhamera."</string>
@@ -236,6 +236,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>
+    <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>
@@ -245,7 +246,7 @@
     <skip />
     <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bhipha ngesikhathi sokubala ngokwehla"</string>
     <string name="setting_off" msgid="4480039384202951946">"Kucishile"</string>
-    <string name="setting_on" msgid="8602246224465348901">"Kuyakhanya"</string>
+    <string name="setting_on" msgid="8602246224465348901">"Vuliwe"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Ikhwalithi yevidiyo"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Phezulu"</string>
     <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Phansi"</string>
@@ -253,10 +254,13 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Izilungiselelo zekhamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Izilungiselelo zekhamera enerekhoda"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Usayizi wesithombe"</string>
+    <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M amaphikiseli"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M amaphikseli"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M amaphikseli"</string>
+    <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4M amaphikiseli"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M amaphikseli"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M amaphikseli"</string>
+    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M amaphikiseli (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M amaphikseli"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M amaphikseli"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
@@ -265,16 +269,29 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Okuzenzakalelayo"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Kwaphakade"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Imakhro"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="8547956917516317183">"OKUZENZAKALELAYO"</string>
+    <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"KWAPHAKADE"</string>
+    <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"IMAKHRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Imodi yokufulesh"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"IMODI YEFLESHI"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Okuzenzakalelayo"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Vuliwe"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Valiwe"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"UKUZENZAKALELA KWEFLESHI"</string>
+    <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"IFLESHI IVULIWE"</string>
+    <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"IFLESHI IVALIWE"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Bhalansa ubumhlophe"</string>
+    <string name="pref_camera_whitebalance_label" msgid="7467403405883190920">"UKULINGANA KOKUMHLOPHE"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Okuzenzakalelayo"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Mhlophe komlilo"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Emini"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Ukukhanya okumibalabala"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Kunamafu"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"OKUZENZAKALELAYO"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"MHLOPHE KOMLILO"</string>
+    <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"EMINI"</string>
+    <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"UKUKHANYA OKUMIBALABALA"</string>
+    <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"KUNAMAFU"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Imodi yesigcawu"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Okuzenzakalelayo"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="2923388802899511784">"i-HDR"</string>
@@ -282,10 +299,25 @@
     <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>
+    <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>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"ISIBALI 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 />
+    <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>
     <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Isitoreji se-USB yakho siphelelwa yisikhala. Shintsha ilungiselelo lekhwalithi noma susa ezinye izithombe noma amanye amafayela."</string>
     <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Ikhadi lakho le-SD liphelelwa isikhathi. Shintsha ilungiselelo lekhwalithi noma susa eminye imifanekiso noma amanye amafayela."</string>
@@ -310,7 +342,7 @@
     <string name="effect_backdropper_space" msgid="7935661090723068402">"Eskhaleni"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Ukushona kwelanga"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Ividiyo yakho"</string>
-    <string name="bg_replacement_message" msgid="9184270738916564608">"Setha idivayisi yakho phansi."\n"Isethe ingabonakali okwesikhashana."</string>
+    <string name="bg_replacement_message" msgid="9184270738916564608">"Setha idivayisi yakho phansi.\nIsethe ingabonakali okwesikhashana."</string>
     <string name="video_snapshot_hint" msgid="18833576851372483">"Thinta ukuze uthwebule isithombe ngenkathi uqopha."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Ukuqoshwa kwevidiyo sekuqalile."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Ukuqoshwa kwevidiyo sekumisiwe."</string>
@@ -333,9 +365,14 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Shintshela kwividiyo"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Shintshela kwi-panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Shintshela ku-panorama entsha"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Shintshela ekugxileni kabusha"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Buyekeza ukukhansela"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Ukubuyekeza kuphelile"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Ukuphindwa kuthathwe kwesibuyekezo"</string>
+    <string name="accessibility_play_video" msgid="7596298365794810207">"Dlala ividiyo"</string>
+    <string name="accessibility_pause_video" msgid="6526344477133046653">"Misa ividiyo okwesikhashana"</string>
+    <string name="accessibility_reload_video" msgid="3250335917598607232">"Layisha kabusha ividiyo"</string>
+    <string name="accessibility_time_bar" msgid="1414029843602604531">"Ibha yesikhathi sesidlali sevidiyo"</string>
     <string name="capital_on" msgid="5491353494964003567">"KUVULIWE"</string>
     <string name="capital_off" msgid="7231052688467970897">"KUCINYIWE"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Valiwe"</string>
@@ -388,13 +425,15 @@
     <string name="set_duration" msgid="5578035312407161304">"Setha ubude besikhathi bube amasekhondi"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Kubalwa ngokwehla kuze kufike ekuthatheni isithombe"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Khumbula izindawo zezithombe?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Maka izithombe zakho namavidiyo ngezindawo lapha zithathwe khona."\n\n"Ezinye izinhlelo zokusebenza zingafinyelela lolu lwazi nezithombe zakho ezilondoloziwe."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Maka izithombe zakho namavidiyo ngezindawo lapha zithathwe khona.\n\nEzinye izinhlelo zokusebenza zingafinyelela lolu lwazi nezithombe zakho ezilondoloziwe."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Cha ngiyabonga"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Yebo"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Ikhamera"</string>
     <string name="menu_search" msgid="7580008232297437190">"Sesha"</string>
     <string name="tab_photos" msgid="9110813680630313419">"Izithombe"</string>
     <string name="tab_albums" msgid="8079449907770685691">"Ama-albhamu"</string>
+    <string name="camera_menu_more_label" msgid="6868642182125198710">"IZINKETHO EZININGI"</string>
+    <string name="camera_menu_settings_label" msgid="875454962069404723">"IZILUNGISELELO"</string>
   <plurals name="number_of_photos">
     <item quantity="one" msgid="6949174783125614798">"%1$d isithombe"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d izithombe"</item>
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 0cc5f87..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SDK_VERSION := 16
-
-LOCAL_STATIC_JAVA_LIBRARIES := littlemock dexmaker
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := Gallery2Tests
-
-LOCAL_INSTRUMENTATION_FOR := Gallery2
-
-include $(BUILD_PACKAGE)
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
deleted file mode 100644
index f44156e..0000000
--- a/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.gallery3d.tests">
-
-    <application
-        android:debuggable="true">
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-             android:targetPackage="com.android.gallery3d"
-             android:label="Tests for GalleryNew3D application."/>
-
-    <instrumentation android:name="com.android.gallery3d.CameraTestRunner"
-            android:targetPackage="com.android.gallery3d"
-            android:label="Camera continuous test runner"/>
-
-    <instrumentation android:name="com.android.gallery3d.exif.ExifTestRunner"
-            android:targetPackage="com.android.gallery3d"
-            android:label="Tests for ExifParser."/>
-
-    <instrumentation android:name="com.android.gallery3d.jpegstream.JpegStreamTestRunner"
-            android:targetPackage="com.android.gallery3d"
-            android:label="Tests for JpegStream classes."/>
-
-    <instrumentation android:name="com.android.gallery3d.stress.CameraStressTestRunner"
-            android:targetPackage="com.android.gallery3d"
-            android:label="Camera stress test runner"/>
-
-    <instrumentation android:name="com.android.photos.data.DataTestRunner"
-            android:targetPackage="com.android.gallery3d"
-            android:label="Tests for android photo DataProviders."/>
-</manifest>
diff --git a/tests/exiftool_parser/parser.py b/tests/exiftool_parser/parser.py
deleted file mode 100755
index 7df23f1..0000000
--- a/tests/exiftool_parser/parser.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env python
-#
-# This parser parses the output from Phil Harvey's exiftool (version 9.02)
-# and convert it to xml format. It reads exiftool's output from stdin and
-# write the xml format to stdout.
-#
-# In order to get the raw infomation from exiftool, we need to enable the verbose
-# flag (-v2) of exiftool.
-#
-# Usage:
-#      exiftool -v2 img.jpg | ./parser.py >> output.xml
-#
-#
-
-import os
-import sys
-import re
-
-text = sys.stdin.read()
-
-print """<?xml version="1.0" encoding="utf-8"?>"""
-print "<exif>"
-
-# find the following two groups of string:
-#
-# 1. tag:
-#
-# | | | x) name = value
-# | | |     - Tag 0x1234
-#
-# 2. IFD indicator:
-#
-# | | | + [xxx directory with xx entries]
-#
-p = re.compile(
-        "(((?:\| )+)[0-9]*\)(?:(?:.*? = .*?)|(?:.*? \(SubDirectory\) -->))\n.*?- Tag 0x[0-9a-f]{4})" + "|"
-        + "(((?:\| )*)\+ \[.*? directory with [0-9]+ entries]$)"
-        , re.M)
-tags = p.findall(text)
-
-layer = 0
-ifds = []
-
-for s in tags:
-    # IFD indicator
-    if s[2]:
-        l = len(s[3])
-        ifd = s[2][l + 3:].split()[0]
-        new_layer = l / 2 + 1
-        if new_layer > layer:
-            ifds.append(ifd)
-        else:
-            for i in range(layer - new_layer):
-                ifds.pop()
-            ifds[-1] = ifd
-        layer = new_layer
-    else:
-        l = len(s[1])
-        s = s[0]
-        new_layer = l / 2
-        if new_layer < layer:
-            for i in range(layer - new_layer):
-                ifds.pop()
-        layer = new_layer
-
-        # find the ID
-        _id = re.search("0x[0-9a-f]{4}", s)
-        _id = _id.group(0)
-
-        # find the name
-        name = re.search("[0-9]*?\).*?(?:(?: = )|(?: \(SubDirectory\) -->))", s)
-        name = name.group(0).split()[1]
-
-        # find the raw value in the parenthesis
-        value = re.search("\(SubDirectory\) -->", s)
-        if value:
-            value = "NO_VALUE"
-        else:
-            value = re.search("\(.*\)\n", s)
-            if (name != 'Model' and value):
-                value = value.group(0)[1:-2]
-            else:
-                value = re.search("=.*\n", s)
-                value = value.group(0)[2:-1]
-                if "[snip]" in value:
-                    value = "NO_VALUE"
-
-        print ('    <tag ifd="' + ifds[-1] + '" id="'
-            + _id + '" name="' + name +'">' + value + "</tag>")
-print "</exif>"
diff --git a/tests/res/raw/android_lawn.mp4 b/tests/res/raw/android_lawn.mp4
deleted file mode 100644
index bdeffbe..0000000
--- a/tests/res/raw/android_lawn.mp4
+++ /dev/null
Binary files differ
diff --git a/tests/res/raw/galaxy_nexus.jpg b/tests/res/raw/galaxy_nexus.jpg
deleted file mode 100755
index de91df6..0000000
--- a/tests/res/raw/galaxy_nexus.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/res/raw/jpeg_control.jpg b/tests/res/raw/jpeg_control.jpg
deleted file mode 100644
index bb468a7..0000000
--- a/tests/res/raw/jpeg_control.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/res/xml/galaxy_nexus.xml b/tests/res/xml/galaxy_nexus.xml
deleted file mode 100644
index 55dd524..0000000
--- a/tests/res/xml/galaxy_nexus.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<exif>
-    <tag ifd="IFD0" id="0x0100" name="ImageWidth">2560</tag>
-    <tag ifd="IFD0" id="0x0101" name="ImageHeight">1920</tag>
-    <tag ifd="IFD0" id="0x010f" name="Make">google</tag>
-    <tag ifd="IFD0" id="0x0110" name="Model">Nexus S</tag>
-    <tag ifd="IFD0" id="0x0112" name="Orientation">1</tag>
-    <tag ifd="IFD0" id="0x0131" name="Software">MASTER</tag>
-    <tag ifd="IFD0" id="0x0132" name="ModifyDate">2012:07:30 16:28:42</tag>
-    <tag ifd="IFD0" id="0x0213" name="YCbCrPositioning">1</tag>
-    <tag ifd="IFD0" id="0x8769" name="ExifOffset">NO_VALUE</tag>
-    <tag ifd="ExifIFD" id="0x829a" name="ExposureTime">1/40</tag>
-    <tag ifd="ExifIFD" id="0x829d" name="FNumber">26/10</tag>
-    <tag ifd="ExifIFD" id="0x8822" name="ExposureProgram">3</tag>
-    <tag ifd="ExifIFD" id="0x8827" name="ISO">100</tag>
-    <tag ifd="ExifIFD" id="0x9000" name="ExifVersion">0220</tag>
-    <tag ifd="ExifIFD" id="0x9003" name="DateTimeOriginal">2012:07:30 16:28:42</tag>
-    <tag ifd="ExifIFD" id="0x9004" name="CreateDate">2012:07:30 16:28:42</tag>
-    <tag ifd="ExifIFD" id="0x9201" name="ShutterSpeedValue">50/10</tag>
-    <tag ifd="ExifIFD" id="0x9202" name="ApertureValue">30/10</tag>
-    <tag ifd="ExifIFD" id="0x9203" name="BrightnessValue">30/10</tag>
-    <tag ifd="ExifIFD" id="0x9204" name="ExposureCompensation">0/0</tag>
-    <tag ifd="ExifIFD" id="0x9205" name="MaxApertureValue">30/10</tag>
-    <tag ifd="ExifIFD" id="0x9207" name="MeteringMode">2</tag>
-    <tag ifd="ExifIFD" id="0x9209" name="Flash">0</tag>
-    <tag ifd="ExifIFD" id="0x920a" name="FocalLength">343/100</tag>
-    <tag ifd="ExifIFD" id="0x9286" name="UserComment">IICSAUser comments</tag>
-    <tag ifd="ExifIFD" id="0xa001" name="ColorSpace">1</tag>
-    <tag ifd="ExifIFD" id="0xa002" name="ExifImageWidth">2560</tag>
-    <tag ifd="ExifIFD" id="0xa003" name="ExifImageHeight">1920</tag>
-    <tag ifd="ExifIFD" id="0xa402" name="ExposureMode">0</tag>
-    <tag ifd="ExifIFD" id="0xa403" name="WhiteBalance">0</tag>
-    <tag ifd="ExifIFD" id="0xa406" name="SceneCaptureType">0</tag>
-    <tag ifd="IFD1" id="0x0100" name="ImageWidth">320</tag>
-    <tag ifd="IFD1" id="0x0101" name="ImageHeight">240</tag>
-    <tag ifd="IFD1" id="0x0103" name="Compression">6</tag>
-    <tag ifd="IFD1" id="0x0112" name="Orientation">1</tag>
-    <tag ifd="IFD1" id="0x011a" name="XResolution">72/1</tag>
-    <tag ifd="IFD1" id="0x011b" name="YResolution">72/1</tag>
-    <tag ifd="IFD1" id="0x0128" name="ResolutionUnit">2</tag>
-    <tag ifd="IFD1" id="0x0201" name="ThumbnailOffset">690</tag>
-    <tag ifd="IFD1" id="0x0202" name="ThumbnailLength">10447</tag>
-</exif>
diff --git a/tests/src/com/android/gallery3d/anim/AnimationTest.java b/tests/src/com/android/gallery3d/anim/AnimationTest.java
deleted file mode 100644
index c7d5dae..0000000
--- a/tests/src/com/android/gallery3d/anim/AnimationTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.anim;
-
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
-import android.view.animation.Interpolator;
-
-import junit.framework.TestCase;
-
-@SmallTest
-public class AnimationTest extends TestCase {
-    private static final String TAG = "AnimationTest";
-
-    public void testFloatAnimation() {
-        FloatAnimation a = new FloatAnimation(0f, 1f, 10);  // value 0 to 1.0, duration 10
-        a.start();                 // start animation
-        assertTrue(a.isActive());  // should be active now
-        a.calculate(0);            // set start time = 0
-        assertTrue(a.get() == 0);  // start value should be 0
-        a.calculate(1);            // calculate value for time 1
-        assertFloatEq(a.get(), 0.1f);
-        a.calculate(5);            // calculate value for time 5
-        assertTrue(a.get() == 0.5);//
-        a.calculate(9);            // calculate value for time 9
-        assertFloatEq(a.get(), 0.9f);
-        a.calculate(10);           // calculate value for time 10
-        assertTrue(!a.isActive()); // should be inactive now
-        assertTrue(a.get() == 1.0);//
-        a.start();                 // restart
-        assertTrue(a.isActive());  // should be active now
-        a.calculate(5);            // set start time = 5
-        assertTrue(a.get() == 0);  // start value should be 0
-        a.calculate(5+9);          // calculate for time 5+9
-        assertFloatEq(a.get(), 0.9f);
-    }
-
-    private static class MyInterpolator implements Interpolator {
-        public float getInterpolation(float input) {
-            return 4f * (input - 0.5f);  // maps [0,1] to [-2,2]
-        }
-    }
-
-    public void testInterpolator() {
-        FloatAnimation a = new FloatAnimation(0f, 1f, 10);  // value 0 to 1.0, duration 10
-        a.setInterpolator(new MyInterpolator());
-        a.start();                 // start animation
-        a.calculate(0);            // set start time = 0
-        assertTrue(a.get() == -2); // start value should be -2
-        a.calculate(1);            // calculate value for time 1
-        assertFloatEq(a.get(), -1.6f);
-        a.calculate(5);            // calculate value for time 5
-        assertTrue(a.get() == 0);  //
-        a.calculate(9);            // calculate value for time 9
-        assertFloatEq(a.get(), 1.6f);
-        a.calculate(10);           // calculate value for time 10
-        assertTrue(a.get() == 2);  //
-    }
-
-    public static void assertFloatEq(float expected, float actual) {
-        if (Math.abs(actual - expected) > 1e-6) {
-            Log.v(TAG, "expected: " + expected + ", actual: " + actual);
-            fail();
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/common/BlobCacheTest.java b/tests/src/com/android/gallery3d/common/BlobCacheTest.java
deleted file mode 100644
index 2a911c4..0000000
--- a/tests/src/com/android/gallery3d/common/BlobCacheTest.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.common;
-
-import com.android.gallery3d.common.BlobCache;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.Random;
-
-public class BlobCacheTest extends AndroidTestCase {
-    private static final String TAG = "BlobCacheTest";
-
-    @SmallTest
-    public void testReadIntLong() {
-        byte[] buf = new byte[9];
-        assertEquals(0, BlobCache.readInt(buf, 0));
-        assertEquals(0, BlobCache.readLong(buf, 0));
-        buf[0] = 1;
-        assertEquals(1, BlobCache.readInt(buf, 0));
-        assertEquals(1, BlobCache.readLong(buf, 0));
-        buf[3] = 0x7f;
-        assertEquals(0x7f000001, BlobCache.readInt(buf, 0));
-        assertEquals(0x7f000001, BlobCache.readLong(buf, 0));
-        assertEquals(0x007f0000, BlobCache.readInt(buf, 1));
-        assertEquals(0x007f0000, BlobCache.readLong(buf, 1));
-        buf[3] = (byte) 0x80;
-        buf[7] = (byte) 0xA0;
-        buf[0] = 0;
-        assertEquals(0x80000000, BlobCache.readInt(buf, 0));
-        assertEquals(0xA000000080000000L, BlobCache.readLong(buf, 0));
-        for (int i = 0; i < 8; i++) {
-            buf[i] = (byte) (0x11 * (i+8));
-        }
-        assertEquals(0xbbaa9988, BlobCache.readInt(buf, 0));
-        assertEquals(0xffeeddccbbaa9988L, BlobCache.readLong(buf, 0));
-        buf[8] = 0x33;
-        assertEquals(0x33ffeeddccbbaa99L, BlobCache.readLong(buf, 1));
-    }
-
-    @SmallTest
-    public void testWriteIntLong() {
-        byte[] buf = new byte[8];
-        BlobCache.writeInt(buf, 0, 0x12345678);
-        assertEquals(0x78, buf[0]);
-        assertEquals(0x56, buf[1]);
-        assertEquals(0x34, buf[2]);
-        assertEquals(0x12, buf[3]);
-        assertEquals(0x00, buf[4]);
-        BlobCache.writeLong(buf, 0, 0xffeeddccbbaa9988L);
-        for (int i = 0; i < 8; i++) {
-            assertEquals((byte) (0x11 * (i+8)), buf[i]);
-        }
-    }
-
-    @MediumTest
-    public void testChecksum() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, MAX_BYTES, true);
-        byte[] buf = new byte[0];
-        assertEquals(0x1, bc.checkSum(buf));
-        buf = new byte[1];
-        assertEquals(0x10001, bc.checkSum(buf));
-        buf[0] = 0x47;
-        assertEquals(0x480048, bc.checkSum(buf));
-        buf = new byte[3];
-        buf[0] = 0x10;
-        buf[1] = 0x30;
-        buf[2] = 0x01;
-        assertEquals(0x940042, bc.checkSum(buf));
-        assertEquals(0x310031, bc.checkSum(buf, 1, 1));
-        assertEquals(0x1, bc.checkSum(buf, 1, 0));
-        assertEquals(0x630032, bc.checkSum(buf, 1, 2));
-        buf = new byte[1024];
-        for (int i = 0; i < buf.length; i++) {
-            buf[i] = (byte)(i*i);
-        }
-        assertEquals(0x3574a610, bc.checkSum(buf));
-        bc.close();
-    }
-
-    private static final int HEADER_SIZE = 32;
-    private static final int DATA_HEADER_SIZE = 4;
-    private static final int BLOB_HEADER_SIZE = 20;
-
-    private static final String TEST_FILE_NAME = "/sdcard/btest";
-    private static final int MAX_ENTRIES = 100;
-    private static final int MAX_BYTES = 1000;
-    private static final int INDEX_SIZE = HEADER_SIZE + MAX_ENTRIES * 12 * 2;
-    private static final long KEY_0 = 0x1122334455667788L;
-    private static final long KEY_1 = 0x1122334455667789L;
-    private static final long KEY_2 = 0x112233445566778AL;
-    private static byte[] DATA_0 = new byte[10];
-    private static byte[] DATA_1 = new byte[10];
-
-    @MediumTest
-    public void testBasic() throws IOException {
-        String name = TEST_FILE_NAME;
-        BlobCache bc;
-        File idxFile = new File(name + ".idx");
-        File data0File = new File(name + ".0");
-        File data1File = new File(name + ".1");
-
-        // Create a brand new cache.
-        bc = new BlobCache(name, MAX_ENTRIES, MAX_BYTES, true);
-        bc.close();
-
-        // Make sure the initial state is correct.
-        assertTrue(idxFile.exists());
-        assertTrue(data0File.exists());
-        assertTrue(data1File.exists());
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE, data0File.length());
-        assertEquals(DATA_HEADER_SIZE, data1File.length());
-        assertEquals(0, bc.getActiveCount());
-
-        // Re-open it.
-        bc = new BlobCache(name, MAX_ENTRIES, MAX_BYTES, false);
-        assertNull(bc.lookup(KEY_0));
-
-        // insert one blob
-        genData(DATA_0, 1);
-        bc.insert(KEY_0, DATA_0);
-        assertSameData(DATA_0, bc.lookup(KEY_0));
-        assertEquals(1, bc.getActiveCount());
-        bc.close();
-
-        // Make sure the file size is right.
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + BLOB_HEADER_SIZE + DATA_0.length,
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE, data1File.length());
-
-        // Re-open it and make sure we can get the old data
-        bc = new BlobCache(name, MAX_ENTRIES, MAX_BYTES, false);
-        assertSameData(DATA_0, bc.lookup(KEY_0));
-
-        // insert with the same key (but using a different blob)
-        genData(DATA_0, 2);
-        bc.insert(KEY_0, DATA_0);
-        assertSameData(DATA_0, bc.lookup(KEY_0));
-        assertEquals(1, bc.getActiveCount());
-        bc.close();
-
-        // Make sure the file size is right.
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + 2 * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE, data1File.length());
-
-        // Re-open it and make sure we can get the old data
-        bc = new BlobCache(name, MAX_ENTRIES, MAX_BYTES, false);
-        assertSameData(DATA_0, bc.lookup(KEY_0));
-
-        // insert another key and make sure we can get both key.
-        assertNull(bc.lookup(KEY_1));
-        genData(DATA_1, 3);
-        bc.insert(KEY_1, DATA_1);
-        assertSameData(DATA_0, bc.lookup(KEY_0));
-        assertSameData(DATA_1, bc.lookup(KEY_1));
-        assertEquals(2, bc.getActiveCount());
-        bc.close();
-
-        // Make sure the file size is right.
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + 3 * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE, data1File.length());
-
-        // Re-open it and make sure we can get the old data
-        bc = new BlobCache(name, 100, 1000, false);
-        assertSameData(DATA_0, bc.lookup(KEY_0));
-        assertSameData(DATA_1, bc.lookup(KEY_1));
-        assertEquals(2, bc.getActiveCount());
-        bc.close();
-    }
-
-    @MediumTest
-    public void testNegativeKey() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, MAX_BYTES, true);
-
-        // insert one blob
-        genData(DATA_0, 1);
-        bc.insert(-123, DATA_0);
-        assertSameData(DATA_0, bc.lookup(-123));
-        bc.close();
-    }
-
-    @MediumTest
-    public void testEmptyBlob() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, MAX_BYTES, true);
-
-        byte[] data = new byte[0];
-        bc.insert(123, data);
-        assertSameData(data, bc.lookup(123));
-        bc.close();
-    }
-
-    @MediumTest
-    public void testLookupRequest() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, MAX_BYTES, true);
-
-        // insert one blob
-        genData(DATA_0, 1);
-        bc.insert(1, DATA_0);
-        assertSameData(DATA_0, bc.lookup(1));
-
-        // the same size buffer
-        byte[] buf = new byte[DATA_0.length];
-        BlobCache.LookupRequest req = new BlobCache.LookupRequest();
-        req.key = 1;
-        req.buffer = buf;
-        assertTrue(bc.lookup(req));
-        assertEquals(1, req.key);
-        assertSame(buf, req.buffer);
-        assertEquals(DATA_0.length, req.length);
-
-        // larger buffer
-        buf = new byte[DATA_0.length + 22];
-        req = new BlobCache.LookupRequest();
-        req.key = 1;
-        req.buffer = buf;
-        assertTrue(bc.lookup(req));
-        assertEquals(1, req.key);
-        assertSame(buf, req.buffer);
-        assertEquals(DATA_0.length, req.length);
-
-        // smaller buffer
-        buf = new byte[DATA_0.length - 1];
-        req = new BlobCache.LookupRequest();
-        req.key = 1;
-        req.buffer = buf;
-        assertTrue(bc.lookup(req));
-        assertEquals(1, req.key);
-        assertNotSame(buf, req.buffer);
-        assertEquals(DATA_0.length, req.length);
-        assertSameData(DATA_0, req.buffer, DATA_0.length);
-
-        // null buffer
-        req = new BlobCache.LookupRequest();
-        req.key = 1;
-        req.buffer = null;
-        assertTrue(bc.lookup(req));
-        assertEquals(1, req.key);
-        assertNotNull(req.buffer);
-        assertEquals(DATA_0.length, req.length);
-        assertSameData(DATA_0, req.buffer, DATA_0.length);
-
-        bc.close();
-    }
-
-    @MediumTest
-    public void testKeyCollision() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, MAX_BYTES, true);
-
-        for (int i = 0; i < MAX_ENTRIES / 2; i++) {
-            genData(DATA_0, i);
-            long key = KEY_1 + i * MAX_ENTRIES;
-            bc.insert(key, DATA_0);
-        }
-
-        for (int i = 0; i < MAX_ENTRIES / 2; i++) {
-            genData(DATA_0, i);
-            long key = KEY_1 + i * MAX_ENTRIES;
-            assertSameData(DATA_0, bc.lookup(key));
-        }
-        bc.close();
-    }
-
-    @MediumTest
-    public void testRegionFlip() throws IOException {
-        String name = TEST_FILE_NAME;
-        BlobCache bc;
-        File idxFile = new File(name + ".idx");
-        File data0File = new File(name + ".0");
-        File data1File = new File(name + ".1");
-
-        // Create a brand new cache.
-        bc = new BlobCache(name, MAX_ENTRIES, MAX_BYTES, true);
-
-        // This is the number of blobs fits into a region.
-        int maxFit = (MAX_BYTES - DATA_HEADER_SIZE) /
-                (BLOB_HEADER_SIZE + DATA_0.length);
-
-        for (int k = 0; k < maxFit; k++) {
-            genData(DATA_0, k);
-            bc.insert(k, DATA_0);
-        }
-        assertEquals(maxFit, bc.getActiveCount());
-
-        // Make sure the file size is right.
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE, data1File.length());
-
-        // Now insert another one and let it flip.
-        genData(DATA_0, 777);
-        bc.insert(KEY_1, DATA_0);
-        assertEquals(1, bc.getActiveCount());
-
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE + 1 * (BLOB_HEADER_SIZE + DATA_0.length),
-                data1File.length());
-
-        // Make sure we can find the new data
-        assertSameData(DATA_0, bc.lookup(KEY_1));
-
-        // Now find an old blob
-        int old = maxFit / 2;
-        genData(DATA_0, old);
-        assertSameData(DATA_0, bc.lookup(old));
-        assertEquals(2, bc.getActiveCount());
-
-        // Observed data is copied.
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE + 2 * (BLOB_HEADER_SIZE + DATA_0.length),
-                data1File.length());
-
-        // Now copy everything over (except we should have no space for the last one)
-        assertTrue(old < maxFit - 1);
-        for (int k = 0; k < maxFit; k++) {
-            genData(DATA_0, k);
-            assertSameData(DATA_0, bc.lookup(k));
-        }
-        assertEquals(maxFit, bc.getActiveCount());
-
-        // Now both file should be full.
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data1File.length());
-
-        // Now insert one to make it flip.
-        genData(DATA_0, 888);
-        bc.insert(KEY_2, DATA_0);
-        assertEquals(1, bc.getActiveCount());
-
-        // Check the size after the second flip.
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + 1 * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data1File.length());
-
-        // Now the last key should be gone.
-        assertNull(bc.lookup(maxFit - 1));
-
-        // But others should remain
-        for (int k = 0; k < maxFit - 1; k++) {
-            genData(DATA_0, k);
-            assertSameData(DATA_0, bc.lookup(k));
-        }
-
-        assertEquals(maxFit, bc.getActiveCount());
-        genData(DATA_0, 777);
-        assertSameData(DATA_0, bc.lookup(KEY_1));
-        genData(DATA_0, 888);
-        assertSameData(DATA_0, bc.lookup(KEY_2));
-        assertEquals(maxFit, bc.getActiveCount());
-
-        // Now two files should be full.
-        assertEquals(INDEX_SIZE, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data1File.length());
-
-        bc.close();
-    }
-
-    @MediumTest
-    public void testEntryLimit() throws IOException {
-        String name = TEST_FILE_NAME;
-        BlobCache bc;
-        File idxFile = new File(name + ".idx");
-        File data0File = new File(name + ".0");
-        File data1File = new File(name + ".1");
-        int maxEntries = 10;
-        int maxFit = maxEntries / 2;
-        int indexSize = HEADER_SIZE + maxEntries * 12 * 2;
-
-        // Create a brand new cache with a small entry limit.
-        bc = new BlobCache(name, maxEntries, MAX_BYTES, true);
-
-        // Fill to just before flipping
-        for (int i = 0; i < maxFit; i++) {
-            genData(DATA_0, i);
-            bc.insert(i, DATA_0);
-        }
-        assertEquals(maxFit, bc.getActiveCount());
-
-        // Check the file size.
-        assertEquals(indexSize, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE, data1File.length());
-
-        // Insert one and make it flip
-        genData(DATA_0, 777);
-        bc.insert(777, DATA_0);
-        assertEquals(1, bc.getActiveCount());
-
-        // Check the file size.
-        assertEquals(indexSize, idxFile.length());
-        assertEquals(DATA_HEADER_SIZE + maxFit * (BLOB_HEADER_SIZE + DATA_0.length),
-                data0File.length());
-        assertEquals(DATA_HEADER_SIZE + 1 * (BLOB_HEADER_SIZE + DATA_0.length),
-                data1File.length());
-        bc.close();
-    }
-
-    @LargeTest
-    public void testDataIntegrity() throws IOException {
-        String name = TEST_FILE_NAME;
-        File idxFile = new File(name + ".idx");
-        File data0File = new File(name + ".0");
-        File data1File = new File(name + ".1");
-        RandomAccessFile f;
-
-        Log.v(TAG, "It should be readable if the content is not changed.");
-        prepareNewCache();
-        f = new RandomAccessFile(data0File, "rw");
-        f.seek(1);
-        byte b = f.readByte();
-        f.seek(1);
-        f.write(b);
-        f.close();
-        assertReadable();
-
-        Log.v(TAG, "Change the data file magic field");
-        prepareNewCache();
-        f = new RandomAccessFile(data0File, "rw");
-        f.seek(1);
-        f.write(0xFF);
-        f.close();
-        assertUnreadable();
-
-        prepareNewCache();
-        f = new RandomAccessFile(data1File, "rw");
-        f.write(0xFF);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the blob key");
-        prepareNewCache();
-        f = new RandomAccessFile(data0File, "rw");
-        f.seek(4);
-        f.write(0x00);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the blob checksum");
-        prepareNewCache();
-        f = new RandomAccessFile(data0File, "rw");
-        f.seek(4 + 8);
-        f.write(0x00);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the blob offset");
-        prepareNewCache();
-        f = new RandomAccessFile(data0File, "rw");
-        f.seek(4 + 12);
-        f.write(0x20);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the blob length: some other value");
-        prepareNewCache();
-        f = new RandomAccessFile(data0File, "rw");
-        f.seek(4 + 16);
-        f.write(0x20);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the blob length: -1");
-        prepareNewCache();
-        f = new RandomAccessFile(data0File, "rw");
-        f.seek(4 + 16);
-        f.writeInt(0xFFFFFFFF);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the blob length: big value");
-        prepareNewCache();
-        f = new RandomAccessFile(data0File, "rw");
-        f.seek(4 + 16);
-        f.writeInt(0xFFFFFF00);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the blob content");
-        prepareNewCache();
-        f = new RandomAccessFile(data0File, "rw");
-        f.seek(4 + 20);
-        f.write(0x01);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the index magic");
-        prepareNewCache();
-        f = new RandomAccessFile(idxFile, "rw");
-        f.seek(1);
-        f.write(0x00);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the active region");
-        prepareNewCache();
-        f = new RandomAccessFile(idxFile, "rw");
-        f.seek(12);
-        f.write(0x01);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the reserved data");
-        prepareNewCache();
-        f = new RandomAccessFile(idxFile, "rw");
-        f.seek(24);
-        f.write(0x01);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the checksum");
-        prepareNewCache();
-        f = new RandomAccessFile(idxFile, "rw");
-        f.seek(29);
-        f.write(0x00);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the key");
-        prepareNewCache();
-        f = new RandomAccessFile(idxFile, "rw");
-        f.seek(32 + 12 * (KEY_1 % MAX_ENTRIES));
-        f.write(0x00);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the offset");
-        prepareNewCache();
-        f = new RandomAccessFile(idxFile, "rw");
-        f.seek(32 + 12 * (KEY_1 % MAX_ENTRIES) + 8);
-        f.write(0x05);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Change the offset");
-        prepareNewCache();
-        f = new RandomAccessFile(idxFile, "rw");
-        f.seek(32 + 12 * (KEY_1 % MAX_ENTRIES) + 8 + 3);
-        f.write(0xFF);
-        f.close();
-        assertUnreadable();
-
-        Log.v(TAG, "Garbage index");
-        prepareNewCache();
-        f = new RandomAccessFile(idxFile, "rw");
-        int n = (int) idxFile.length();
-        f.seek(32);
-        byte[] garbage = new byte[1024];
-        for (int i = 0; i < garbage.length; i++) {
-            garbage[i] = (byte) 0x80;
-        }
-        int i = 32;
-        while (i < n) {
-            int todo = Math.min(garbage.length, n - i);
-            f.write(garbage, 0, todo);
-            i += todo;
-        }
-        f.close();
-        assertUnreadable();
-    }
-
-    // Create a brand new cache and put one entry into it.
-    private void prepareNewCache() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, MAX_BYTES, true);
-        genData(DATA_0, 777);
-        bc.insert(KEY_1, DATA_0);
-        bc.close();
-    }
-
-    private void assertReadable() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, MAX_BYTES, false);
-        genData(DATA_0, 777);
-        assertSameData(DATA_0, bc.lookup(KEY_1));
-        bc.close();
-    }
-
-    private void assertUnreadable() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, MAX_BYTES, false);
-        genData(DATA_0, 777);
-        assertNull(bc.lookup(KEY_1));
-        bc.close();
-    }
-
-    @LargeTest
-    public void testRandomSize() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, MAX_BYTES, true);
-
-        // Random size test
-        Random rand = new Random(0);
-        for (int i = 0; i < 100; i++) {
-            byte[] data = new byte[rand.nextInt(MAX_BYTES*12/10)];
-            try {
-                bc.insert(rand.nextLong(), data);
-                if (data.length > MAX_BYTES - 4 - 20) fail();
-            } catch (RuntimeException ex) {
-                if (data.length <= MAX_BYTES - 4 - 20) fail();
-            }
-        }
-
-        bc.close();
-    }
-
-    @LargeTest
-    public void testBandwidth() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, 1000, 10000000, true);
-
-        // Write
-        int count = 0;
-        byte[] data = new byte[20000];
-        long t0 = System.nanoTime();
-        for (int i = 0; i < 1000; i++) {
-            bc.insert(i, data);
-            count += data.length;
-        }
-        bc.syncAll();
-        float delta = (System.nanoTime() - t0) * 1e-3f;
-        Log.v(TAG, "write bandwidth = " + (count / delta) + " M/s");
-
-        // Copy over
-        BlobCache.LookupRequest req = new BlobCache.LookupRequest();
-        count = 0;
-        t0 = System.nanoTime();
-        for (int i = 0; i < 1000; i++) {
-            req.key = i;
-            req.buffer = data;
-            if (bc.lookup(req)) {
-                count += req.length;
-            }
-        }
-        bc.syncAll();
-        delta = (System.nanoTime() - t0) * 1e-3f;
-        Log.v(TAG, "copy over bandwidth = " + (count / delta) + " M/s");
-
-        // Read
-        count = 0;
-        t0 = System.nanoTime();
-        for (int i = 0; i < 1000; i++) {
-            req.key = i;
-            req.buffer = data;
-            if (bc.lookup(req)) {
-                count += req.length;
-            }
-        }
-        bc.syncAll();
-        delta = (System.nanoTime() - t0) * 1e-3f;
-        Log.v(TAG, "read bandwidth = " + (count / delta) + " M/s");
-
-        bc.close();
-    }
-
-    @LargeTest
-    public void testSmallSize() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, MAX_ENTRIES, 40, true);
-
-        // Small size test
-        Random rand = new Random(0);
-        for (int i = 0; i < 100; i++) {
-            byte[] data = new byte[rand.nextInt(3)];
-            bc.insert(rand.nextLong(), data);
-        }
-
-        bc.close();
-    }
-
-    @LargeTest
-    public void testManyEntries() throws IOException {
-        BlobCache bc = new BlobCache(TEST_FILE_NAME, 1, MAX_BYTES, true);
-
-        // Many entries test
-        Random rand = new Random(0);
-        for (int i = 0; i < 100; i++) {
-            byte[] data = new byte[rand.nextInt(10)];
-        }
-
-        bc.close();
-    }
-
-    private void genData(byte[] data, int seed) {
-        for(int i = 0; i < data.length; i++) {
-            data[i] = (byte) (seed * i);
-        }
-    }
-
-    private void assertSameData(byte[] data1, byte[] data2) {
-        if (data1 == null && data2 == null) return;
-        if (data1 == null || data2 == null) fail();
-        if (data1.length != data2.length) fail();
-        for (int i = 0; i < data1.length; i++) {
-            if (data1[i] != data2[i]) fail();
-        }
-    }
-
-    private void assertSameData(byte[] data1, byte[] data2, int n) {
-        if (data1 == null || data2 == null) fail();
-        for (int i = 0; i < n; i++) {
-            if (data1[i] != data2[i]) fail();
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/common/UtilsTest.java b/tests/src/com/android/gallery3d/common/UtilsTest.java
deleted file mode 100644
index a20ebeb..0000000
--- a/tests/src/com/android/gallery3d/common/UtilsTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.common;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
-
-public class UtilsTest extends AndroidTestCase {
-    private static final String TAG = "UtilsTest";
-
-    private static final int [] testData = new int [] {
-        /* outWidth, outHeight, minSideLength, maxNumOfPixels, sample size */
-        1, 1, BitmapUtils.UNCONSTRAINED, BitmapUtils.UNCONSTRAINED, 1,
-        1, 1, 1, 1, 1,
-        100, 100, 100, 10000, 1,
-        100, 100, 100, 2500, 2,
-        99, 66, 33, 10000, 2,
-        66, 99, 33, 10000, 2,
-        99, 66, 34, 10000, 1,
-        99, 66, 22, 10000, 4,
-        99, 66, 16, 10000, 4,
-
-        10000, 10000, 20000, 1000000, 16,
-
-        100, 100, 100, 10000, 1, // 1
-        100, 100, 50, 10000, 2,  // 2
-        100, 100, 30, 10000, 4,  // 3->4
-        100, 100, 22, 10000, 4,  // 4
-        100, 100, 20, 10000, 8,  // 5->8
-        100, 100, 11, 10000, 16, // 9->16
-        100, 100, 5,  10000, 24, // 20->24
-        100, 100, 2,  10000, 56, // 50->56
-
-        100, 100, 100, 10000 - 1, 2,                  // a bit less than 1
-        100, 100, 100, 10000 / (2 * 2) - 1, 4,        // a bit less than 2
-        100, 100, 100, 10000 / (3 * 3) - 1, 4,        // a bit less than 3
-        100, 100, 100, 10000 / (4 * 4) - 1, 8,        // a bit less than 4
-        100, 100, 100, 10000 / (8 * 8) - 1, 16,       // a bit less than 8
-        100, 100, 100, 10000 / (16 * 16) - 1, 24,     // a bit less than 16
-        100, 100, 100, 10000 / (24 * 24) - 1, 32,     // a bit less than 24
-        100, 100, 100, 10000 / (32 * 32) - 1, 40,     // a bit less than 32
-
-        640, 480, 480, BitmapUtils.UNCONSTRAINED, 1,  // 1
-        640, 480, 240, BitmapUtils.UNCONSTRAINED, 2,  // 2
-        640, 480, 160, BitmapUtils.UNCONSTRAINED, 4,  // 3->4
-        640, 480, 120, BitmapUtils.UNCONSTRAINED, 4,  // 4
-        640, 480, 96, BitmapUtils.UNCONSTRAINED,  8,  // 5->8
-        640, 480, 80, BitmapUtils.UNCONSTRAINED,  8,  // 6->8
-        640, 480, 60, BitmapUtils.UNCONSTRAINED,  8,  // 8
-        640, 480, 48, BitmapUtils.UNCONSTRAINED, 16,  // 10->16
-        640, 480, 40, BitmapUtils.UNCONSTRAINED, 16,  // 12->16
-        640, 480, 30, BitmapUtils.UNCONSTRAINED, 16,  // 16
-        640, 480, 24, BitmapUtils.UNCONSTRAINED, 24,  // 20->24
-        640, 480, 20, BitmapUtils.UNCONSTRAINED, 24,  // 24
-        640, 480, 16, BitmapUtils.UNCONSTRAINED, 32,  // 30->32
-        640, 480, 12, BitmapUtils.UNCONSTRAINED, 40,  // 40
-        640, 480, 10, BitmapUtils.UNCONSTRAINED, 48,  // 48
-        640, 480, 8, BitmapUtils.UNCONSTRAINED,  64,  // 60->64
-        640, 480, 6, BitmapUtils.UNCONSTRAINED,  80,  // 80
-        640, 480, 4, BitmapUtils.UNCONSTRAINED, 120,  // 120
-        640, 480, 3, BitmapUtils.UNCONSTRAINED, 160,  // 160
-        640, 480, 2, BitmapUtils.UNCONSTRAINED, 240,  // 240
-        640, 480, 1, BitmapUtils.UNCONSTRAINED, 480,  // 480
-
-        640, 480, BitmapUtils.UNCONSTRAINED, BitmapUtils.UNCONSTRAINED, 1,
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480, 1,                  // 1
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 - 1, 2,              // a bit less than 1
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 4, 2,              // 2
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 4 - 1, 4,          // a bit less than 2
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 9, 4,              // 3
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 9 - 1, 4,          // a bit less than 3
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 16, 4,             // 4
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 16 - 1, 8,         // a bit less than 4
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 64, 8,             // 8
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 64 - 1, 16,        // a bit less than 8
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 256, 16,           // 16
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / 256 - 1, 24,       // a bit less than 16
-        640, 480, BitmapUtils.UNCONSTRAINED, 640 * 480 / (24 * 24) - 1, 32, // a bit less than 24
-    };
-
-    @SmallTest
-    public void testComputeSampleSize() {
-
-        for (int i = 0; i < testData.length; i += 5) {
-            int w = testData[i];
-            int h = testData[i + 1];
-            int minSide = testData[i + 2];
-            int maxPixels = testData[i + 3];
-            int sampleSize = testData[i + 4];
-            int result = BitmapUtils.computeSampleSize(w, h, minSide, maxPixels);
-            if (result != sampleSize) {
-                Log.v(TAG, w + "x" + h + ", minSide = " + minSide + ", maxPixels = "
-                        + maxPixels + ", sampleSize = " + sampleSize + ", result = "
-                        + result);
-            }
-            assertTrue(sampleSize == result);
-        }
-    }
-
-    public void testAssert() {
-        // This should not throw an exception.
-        Utils.assertTrue(true);
-
-        // This should throw an exception.
-        try {
-            Utils.assertTrue(false);
-            fail();
-        } catch (AssertionError ex) {
-            // expected.
-        }
-    }
-
-    public void testCheckNotNull() {
-        // These should not throw an expection.
-        Utils.checkNotNull(new Object());
-        Utils.checkNotNull(0);
-        Utils.checkNotNull("");
-
-        // This should throw an expection.
-        try {
-            Utils.checkNotNull(null);
-            fail();
-        } catch (NullPointerException ex) {
-            // expected.
-        }
-    }
-
-    public void testEquals() {
-        Object a = new Object();
-        Object b = new Object();
-
-        assertTrue(Utils.equals(null, null));
-        assertTrue(Utils.equals(a, a));
-        assertFalse(Utils.equals(null, a));
-        assertFalse(Utils.equals(a, null));
-        assertFalse(Utils.equals(a, b));
-    }
-
-    public void testNextPowerOf2() {
-        int[] q = new int[] {1, 2, 3, 4, 5, 6, 10, 65535, (1 << 30) - 1, (1 << 30)};
-        int[] a = new int[] {1, 2, 4, 4, 8, 8, 16, 65536, (1 << 30)    , (1 << 30)};
-
-        for (int i = 0; i < q.length; i++) {
-            assertEquals(a[i], Utils.nextPowerOf2(q[i]));
-        }
-
-        int[] e = new int[] {0, -1, -2, -4, -65536, (1 << 30) + 1, Integer.MAX_VALUE};
-
-        for (int v : e) {
-            try {
-                Utils.nextPowerOf2(v);
-                fail();
-            } catch (IllegalArgumentException ex) {
-                // expected.
-            }
-        }
-    }
-
-    public void testClamp() {
-        assertEquals(1000, Utils.clamp(300, 1000, 2000));
-        assertEquals(1300, Utils.clamp(1300, 1000, 2000));
-        assertEquals(2000, Utils.clamp(2300, 1000, 2000));
-
-        assertEquals(0.125f, Utils.clamp(0.1f, 0.125f, 0.5f));
-        assertEquals(0.25f, Utils.clamp(0.25f, 0.125f, 0.5f));
-        assertEquals(0.5f, Utils.clamp(0.9f, 0.125f, 0.5f));
-    }
-
-    public void testIsOpaque() {
-        assertTrue(Utils.isOpaque(0xFF000000));
-        assertTrue(Utils.isOpaque(0xFFFFFFFF));
-        assertTrue(Utils.isOpaque(0xFF123456));
-
-        assertFalse(Utils.isOpaque(0xFEFFFFFF));
-        assertFalse(Utils.isOpaque(0x8FFFFFFF));
-        assertFalse(Utils.isOpaque(0x00FF0000));
-        assertFalse(Utils.isOpaque(0x5500FF00));
-        assertFalse(Utils.isOpaque(0xAA0000FF));
-    }
-
-    public static void assertFloatEq(float expected, float actual) {
-        if (Math.abs(actual - expected) > 1e-6) {
-            Log.v(TAG, "expected: " + expected + ", actual: " + actual);
-            fail();
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/data/GalleryAppMock.java b/tests/src/com/android/gallery3d/data/GalleryAppMock.java
deleted file mode 100644
index bbc5692..0000000
--- a/tests/src/com/android/gallery3d/data/GalleryAppMock.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.data;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Looper;
-
-import com.android.gallery3d.ui.GLRoot;
-import com.android.gallery3d.ui.GLRootStub;
-
-class GalleryAppMock extends GalleryAppStub {
-    GLRoot mGLRoot = new GLRootStub();
-    DataManager mDataManager = new DataManager(this);
-    ContentResolver mResolver;
-    Context mContext;
-    Looper mMainLooper;
-
-    GalleryAppMock(Context context,
-            ContentResolver resolver, Looper mainLooper) {
-        mContext = context;
-        mResolver = resolver;
-        mMainLooper = mainLooper;
-    }
-
-    @Override
-    public GLRoot getGLRoot() { return mGLRoot; }
-    @Override
-    public DataManager getDataManager() { return mDataManager; }
-    @Override
-    public Context getAndroidContext() { return mContext; }
-    @Override
-    public ContentResolver getContentResolver() { return mResolver; }
-    @Override
-    public Looper getMainLooper() { return mMainLooper; }
-}
diff --git a/tests/src/com/android/gallery3d/data/GalleryAppStub.java b/tests/src/com/android/gallery3d/data/GalleryAppStub.java
deleted file mode 100644
index 47693d2..0000000
--- a/tests/src/com/android/gallery3d/data/GalleryAppStub.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.data;
-
-import com.android.gallery3d.app.GalleryApp;
-import com.android.gallery3d.app.StateManager;
-import com.android.gallery3d.ui.GLRoot;
-import com.android.gallery3d.util.ThreadPool;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Looper;
-
-class GalleryAppStub implements GalleryApp {
-    public ImageCacheService getImageCacheService() { return null; }
-    public StateManager getStateManager() { return null; }
-    public DataManager getDataManager() { return null; }
-    public DownloadUtils getDownloadService() { return null; }
-    public DecodeUtils getDecodeService() { return null; }
-
-    public GLRoot getGLRoot() { return null; }
-
-    public Context getAndroidContext() { return null; }
-
-    public Looper getMainLooper() { return null; }
-    public Resources getResources() { return null; }
-    public ContentResolver getContentResolver() { return null; }
-    public ThreadPool getThreadPool() { return null; }
-    public DownloadCache getDownloadCache() { return null; }
-}
diff --git a/tests/src/com/android/gallery3d/data/LocalDataTest.java b/tests/src/com/android/gallery3d/data/LocalDataTest.java
deleted file mode 100644
index 8f6a46b..0000000
--- a/tests/src/com/android/gallery3d/data/LocalDataTest.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.data;
-
-import android.content.ContentProvider;
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQueryBuilder;
-import android.net.Uri;
-import android.os.Looper;
-import android.test.AndroidTestCase;
-import android.test.mock.MockContentProvider;
-import android.test.mock.MockContentResolver;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.util.Log;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class LocalDataTest extends AndroidTestCase {
-    @SuppressWarnings("unused")
-    private static final String TAG = "LocalDataTest";
-    private static final long DEFAULT_TIMEOUT = 1000; // one second
-
-    @MediumTest
-    public void testLocalAlbum() throws Exception {
-        new TestZeroImage().run();
-        new TestOneImage().run();
-        new TestMoreImages().run();
-        new TestZeroVideo().run();
-        new TestOneVideo().run();
-        new TestMoreVideos().run();
-        new TestDeleteOneImage().run();
-        new TestDeleteOneAlbum().run();
-    }
-
-    abstract class TestLocalAlbumBase {
-        private boolean mIsImage;
-        protected GalleryAppStub mApp;
-        protected LocalAlbumSet mAlbumSet;
-
-        TestLocalAlbumBase(boolean isImage) {
-            mIsImage = isImage;
-        }
-
-        public void run() throws Exception {
-            SQLiteDatabase db = SQLiteDatabase.create(null);
-            prepareData(db);
-            mApp = newGalleryContext(db, Looper.getMainLooper());
-            Path.clearAll();
-            Path path = Path.fromString(
-                    mIsImage ? "/local/image" : "/local/video");
-            mAlbumSet = new LocalAlbumSet(path, mApp);
-            mAlbumSet.reload();
-            verifyResult();
-        }
-
-        abstract void prepareData(SQLiteDatabase db);
-        abstract void verifyResult() throws Exception;
-    }
-
-    abstract class TestLocalImageAlbum extends TestLocalAlbumBase {
-        TestLocalImageAlbum() {
-            super(true);
-        }
-    }
-
-    abstract class TestLocalVideoAlbum extends TestLocalAlbumBase {
-        TestLocalVideoAlbum() {
-            super(false);
-        }
-    }
-
-    class TestZeroImage extends TestLocalImageAlbum {
-        @Override
-        public void prepareData(SQLiteDatabase db) {
-            createImageTable(db);
-        }
-
-        @Override
-        public void verifyResult() {
-            assertEquals(0, mAlbumSet.getMediaItemCount());
-            assertEquals(0, mAlbumSet.getSubMediaSetCount());
-            assertEquals(0, mAlbumSet.getTotalMediaItemCount());
-         }
-    }
-
-    class TestOneImage extends TestLocalImageAlbum {
-        @Override
-        public void prepareData(SQLiteDatabase db) {
-            createImageTable(db);
-            insertImageData(db);
-        }
-
-        @Override
-        public void verifyResult() {
-            assertEquals(0, mAlbumSet.getMediaItemCount());
-            assertEquals(1, mAlbumSet.getSubMediaSetCount());
-            assertEquals(1, mAlbumSet.getTotalMediaItemCount());
-            MediaSet sub = mAlbumSet.getSubMediaSet(0);
-            assertEquals(1, sub.getMediaItemCount());
-            assertEquals(0, sub.getSubMediaSetCount());
-            LocalMediaItem item = (LocalMediaItem) sub.getMediaItem(0, 1).get(0);
-            assertEquals(1, item.id);
-            assertEquals("IMG_0072", item.caption);
-            assertEquals("image/jpeg", item.mimeType);
-            assertEquals(12.0, item.latitude);
-            assertEquals(34.0, item.longitude);
-            assertEquals(0xD000, item.dateTakenInMs);
-            assertEquals(1280395646L, item.dateAddedInSec);
-            assertEquals(1275934796L, item.dateModifiedInSec);
-            assertEquals("/mnt/sdcard/DCIM/100CANON/IMG_0072.JPG", item.filePath);
-        }
-    }
-
-    class TestMoreImages extends TestLocalImageAlbum {
-        @Override
-        public void prepareData(SQLiteDatabase db) {
-            // Albums are sorted by names, and items are sorted by
-            // dateTimeTaken (descending)
-            createImageTable(db);
-            // bucket 0xB000
-            insertImageData(db, 1000, 0xB000, "second");  // id 1
-            insertImageData(db, 2000, 0xB000, "second");  // id 2
-            // bucket 0xB001
-            insertImageData(db, 3000, 0xB001, "first");   // id 3
-        }
-
-        @Override
-        public void verifyResult() {
-            assertEquals(0, mAlbumSet.getMediaItemCount());
-            assertEquals(2, mAlbumSet.getSubMediaSetCount());
-            assertEquals(3, mAlbumSet.getTotalMediaItemCount());
-
-            MediaSet first = mAlbumSet.getSubMediaSet(0);
-            assertEquals(1, first.getMediaItemCount());
-            LocalMediaItem item = (LocalMediaItem) first.getMediaItem(0, 1).get(0);
-            assertEquals(3, item.id);
-            assertEquals(3000L, item.dateTakenInMs);
-
-            MediaSet second = mAlbumSet.getSubMediaSet(1);
-            assertEquals(2, second.getMediaItemCount());
-            item = (LocalMediaItem) second.getMediaItem(0, 1).get(0);
-            assertEquals(2, item.id);
-            assertEquals(2000L, item.dateTakenInMs);
-            item = (LocalMediaItem) second.getMediaItem(1, 1).get(0);
-            assertEquals(1, item.id);
-            assertEquals(1000L, item.dateTakenInMs);
-        }
-    }
-
-    class OnContentDirtyLatch implements ContentListener {
-        private CountDownLatch mLatch = new CountDownLatch(1);
-
-        public void onContentDirty() {
-            mLatch.countDown();
-        }
-
-        public boolean isOnContentDirtyBeCalled(long timeout)
-                throws InterruptedException {
-            return mLatch.await(timeout, TimeUnit.MILLISECONDS);
-        }
-    }
-
-    class TestDeleteOneAlbum extends TestLocalImageAlbum {
-        @Override
-        public void prepareData(SQLiteDatabase db) {
-            // Albums are sorted by names, and items are sorted by
-            // dateTimeTaken (descending)
-            createImageTable(db);
-            // bucket 0xB000
-            insertImageData(db, 1000, 0xB000, "second");  // id 1
-            insertImageData(db, 2000, 0xB000, "second");  // id 2
-            // bucket 0xB001
-            insertImageData(db, 3000, 0xB001, "first");   // id 3
-        }
-
-        @Override
-        public void verifyResult() throws Exception {
-            MediaSet sub = mAlbumSet.getSubMediaSet(1);  // "second"
-            assertEquals(2, mAlbumSet.getSubMediaSetCount());
-            OnContentDirtyLatch latch = new OnContentDirtyLatch();
-            sub.addContentListener(latch);
-            assertTrue((sub.getSupportedOperations() & MediaSet.SUPPORT_DELETE) != 0);
-            sub.delete();
-            mAlbumSet.fakeChange();
-            latch.isOnContentDirtyBeCalled(DEFAULT_TIMEOUT);
-            mAlbumSet.reload();
-            assertEquals(1, mAlbumSet.getSubMediaSetCount());
-        }
-    }
-
-    class TestDeleteOneImage extends TestLocalImageAlbum {
-
-        @Override
-        public void prepareData(SQLiteDatabase db) {
-            createImageTable(db);
-            insertImageData(db);
-        }
-
-        @Override
-        public void verifyResult() {
-            MediaSet sub = mAlbumSet.getSubMediaSet(0);
-            LocalMediaItem item = (LocalMediaItem) sub.getMediaItem(0, 1).get(0);
-            assertEquals(1, sub.getMediaItemCount());
-            assertTrue((sub.getSupportedOperations() & MediaSet.SUPPORT_DELETE) != 0);
-            sub.delete();
-            sub.reload();
-            assertEquals(0, sub.getMediaItemCount());
-        }
-    }
-
-    static void createImageTable(SQLiteDatabase db) {
-        // This is copied from MediaProvider
-        db.execSQL("CREATE TABLE IF NOT EXISTS images (" +
-                "_id INTEGER PRIMARY KEY," +
-                "_data TEXT," +
-                "_size INTEGER," +
-                "_display_name TEXT," +
-                "mime_type TEXT," +
-                "title TEXT," +
-                "date_added INTEGER," +
-                "date_modified INTEGER," +
-                "description TEXT," +
-                "picasa_id TEXT," +
-                "isprivate INTEGER," +
-                "latitude DOUBLE," +
-                "longitude DOUBLE," +
-                "datetaken INTEGER," +
-                "orientation INTEGER," +
-                "mini_thumb_magic INTEGER," +
-                "bucket_id TEXT," +
-                "bucket_display_name TEXT" +
-               ");");
-    }
-
-    static void insertImageData(SQLiteDatabase db) {
-        insertImageData(db, 0xD000, 0xB000, "name");
-    }
-
-    static void insertImageData(SQLiteDatabase db, long dateTaken,
-            int bucketId, String bucketName) {
-        db.execSQL("INSERT INTO images (title, mime_type, latitude, longitude, "
-                + "datetaken, date_added, date_modified, bucket_id, "
-                + "bucket_display_name, _data, orientation) "
-                + "VALUES ('IMG_0072', 'image/jpeg', 12, 34, "
-                + dateTaken + ", 1280395646, 1275934796, '" + bucketId + "', "
-                + "'" + bucketName + "', "
-                + "'/mnt/sdcard/DCIM/100CANON/IMG_0072.JPG', 0)");
-    }
-
-    class TestZeroVideo extends TestLocalVideoAlbum {
-        @Override
-        public void prepareData(SQLiteDatabase db) {
-            createVideoTable(db);
-        }
-
-        @Override
-        public void verifyResult() {
-            assertEquals(0, mAlbumSet.getMediaItemCount());
-            assertEquals(0, mAlbumSet.getSubMediaSetCount());
-            assertEquals(0, mAlbumSet.getTotalMediaItemCount());
-        }
-    }
-
-    class TestOneVideo extends TestLocalVideoAlbum {
-        @Override
-        public void prepareData(SQLiteDatabase db) {
-            createVideoTable(db);
-            insertVideoData(db);
-        }
-
-        @Override
-        public void verifyResult() {
-            assertEquals(0, mAlbumSet.getMediaItemCount());
-            assertEquals(1, mAlbumSet.getSubMediaSetCount());
-            assertEquals(1, mAlbumSet.getTotalMediaItemCount());
-            MediaSet sub = mAlbumSet.getSubMediaSet(0);
-            assertEquals(1, sub.getMediaItemCount());
-            assertEquals(0, sub.getSubMediaSetCount());
-            LocalMediaItem item = (LocalMediaItem) sub.getMediaItem(0, 1).get(0);
-            assertEquals(1, item.id);
-            assertEquals("VID_20100811_051413", item.caption);
-            assertEquals("video/mp4", item.mimeType);
-            assertEquals(11.0, item.latitude);
-            assertEquals(22.0, item.longitude);
-            assertEquals(0xD000, item.dateTakenInMs);
-            assertEquals(1281503663L, item.dateAddedInSec);
-            assertEquals(1281503662L, item.dateModifiedInSec);
-            assertEquals("/mnt/sdcard/DCIM/Camera/VID_20100811_051413.3gp",
-                    item.filePath);
-        }
-    }
-
-    class TestMoreVideos extends TestLocalVideoAlbum {
-        @Override
-        public void prepareData(SQLiteDatabase db) {
-            // Albums are sorted by names, and items are sorted by
-            // dateTimeTaken (descending)
-            createVideoTable(db);
-            // bucket 0xB002
-            insertVideoData(db, 1000, 0xB000, "second");  // id 1
-            insertVideoData(db, 2000, 0xB000, "second");  // id 2
-            // bucket 0xB001
-            insertVideoData(db, 3000, 0xB001, "first");   // id 3
-        }
-
-        @Override
-        public void verifyResult() {
-            assertEquals(0, mAlbumSet.getMediaItemCount());
-            assertEquals(2, mAlbumSet.getSubMediaSetCount());
-            assertEquals(3, mAlbumSet.getTotalMediaItemCount());
-
-            MediaSet first = mAlbumSet.getSubMediaSet(0);
-            assertEquals(1, first.getMediaItemCount());
-            LocalMediaItem item = (LocalMediaItem) first.getMediaItem(0, 1).get(0);
-            assertEquals(3, item.id);
-            assertEquals(3000L, item.dateTakenInMs);
-
-            MediaSet second = mAlbumSet.getSubMediaSet(1);
-            assertEquals(2, second.getMediaItemCount());
-            item = (LocalMediaItem) second.getMediaItem(0, 1).get(0);
-            assertEquals(2, item.id);
-            assertEquals(2000L, item.dateTakenInMs);
-            item = (LocalMediaItem) second.getMediaItem(1, 1).get(0);
-            assertEquals(1, item.id);
-            assertEquals(1000L, item.dateTakenInMs);
-        }
-    }
-
-    static void createVideoTable(SQLiteDatabase db) {
-        db.execSQL("CREATE TABLE IF NOT EXISTS video (" +
-                   "_id INTEGER PRIMARY KEY," +
-                   "_data TEXT NOT NULL," +
-                   "_display_name TEXT," +
-                   "_size INTEGER," +
-                   "mime_type TEXT," +
-                   "date_added INTEGER," +
-                   "date_modified INTEGER," +
-                   "title TEXT," +
-                   "duration INTEGER," +
-                   "artist TEXT," +
-                   "album TEXT," +
-                   "resolution TEXT," +
-                   "description TEXT," +
-                   "isprivate INTEGER," +   // for YouTube videos
-                   "tags TEXT," +           // for YouTube videos
-                   "category TEXT," +       // for YouTube videos
-                   "language TEXT," +       // for YouTube videos
-                   "mini_thumb_data TEXT," +
-                   "latitude DOUBLE," +
-                   "longitude DOUBLE," +
-                   "datetaken INTEGER," +
-                   "mini_thumb_magic INTEGER" +
-                   ");");
-        db.execSQL("ALTER TABLE video ADD COLUMN bucket_id TEXT;");
-        db.execSQL("ALTER TABLE video ADD COLUMN bucket_display_name TEXT");
-    }
-
-    static void insertVideoData(SQLiteDatabase db) {
-        insertVideoData(db, 0xD000, 0xB000, "name");
-    }
-
-    static void insertVideoData(SQLiteDatabase db, long dateTaken,
-            int bucketId, String bucketName) {
-        db.execSQL("INSERT INTO video (title, mime_type, latitude, longitude, "
-                + "datetaken, date_added, date_modified, bucket_id, "
-                + "bucket_display_name, _data, duration) "
-                + "VALUES ('VID_20100811_051413', 'video/mp4', 11, 22, "
-                + dateTaken + ", 1281503663, 1281503662, '" + bucketId + "', "
-                + "'" + bucketName + "', "
-                + "'/mnt/sdcard/DCIM/Camera/VID_20100811_051413.3gp', 2964)");
-    }
-
-    static GalleryAppStub newGalleryContext(SQLiteDatabase db, Looper mainLooper) {
-        MockContentResolver cr = new MockContentResolver();
-        ContentProvider cp = new DbContentProvider(db, cr);
-        cr.addProvider("media", cp);
-        return new GalleryAppMock(null, cr, mainLooper);
-    }
-}
-
-class DbContentProvider extends MockContentProvider {
-    private static final String TAG = "DbContentProvider";
-    private SQLiteDatabase mDatabase;
-    private ContentResolver mContentResolver;
-
-    DbContentProvider(SQLiteDatabase db, ContentResolver cr) {
-        mDatabase = db;
-        mContentResolver = cr;
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection,
-            String selection, String[] selectionArgs, String sortOrder) {
-        // This is a simplified version extracted from MediaProvider.
-
-        String tableName = getTableName(uri);
-        if (tableName == null) return null;
-
-        SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
-        qb.setTables(tableName);
-
-        String groupBy = null;
-        String limit = uri.getQueryParameter("limit");
-
-        if (uri.getQueryParameter("distinct") != null) {
-            qb.setDistinct(true);
-        }
-
-        Log.v(TAG, "query = " + qb.buildQuery(projection, selection,
-                selectionArgs, groupBy, null, sortOrder, limit));
-
-        if (selectionArgs != null) {
-            for (String s : selectionArgs) {
-                Log.v(TAG, "  selectionArgs = " + s);
-            }
-        }
-
-        Cursor c = qb.query(mDatabase, projection, selection,
-                selectionArgs, groupBy, null, sortOrder, limit);
-
-        return c;
-    }
-
-    @Override
-    public int delete(Uri uri, String whereClause, String[] whereArgs) {
-        Log.v(TAG, "delete " + uri + "," + whereClause + "," + whereArgs[0]);
-        String tableName = getTableName(uri);
-        if (tableName == null) return 0;
-        int count = mDatabase.delete(tableName, whereClause, whereArgs);
-        mContentResolver.notifyChange(uri, null);
-        return count;
-    }
-
-    private String getTableName(Uri uri) {
-        String uriString = uri.toString();
-        if (uriString.startsWith("content://media/external/images/media")) {
-            return "images";
-        } else if (uriString.startsWith("content://media/external/video/media")) {
-            return "video";
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/data/MediaSetTest.java b/tests/src/com/android/gallery3d/data/MediaSetTest.java
deleted file mode 100644
index 33dfe96..0000000
--- a/tests/src/com/android/gallery3d/data/MediaSetTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.data;
-
-import com.android.gallery3d.app.GalleryApp;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-public class MediaSetTest extends AndroidTestCase {
-    @SuppressWarnings("unused")
-    private static final String TAG = "MediaSetTest";
-
-    @SmallTest
-    public void testComboAlbumSet() {
-        GalleryApp app = new GalleryAppMock(null, null, null);
-        Path.clearAll();
-        DataManager dataManager = app.getDataManager();
-
-        dataManager.addSource(new ComboSource(app));
-        dataManager.addSource(new MockSource(app));
-
-        MockSet set00 = new MockSet(Path.fromString("/mock/00"), dataManager, 0, 2000);
-        MockSet set01 = new MockSet(Path.fromString("/mock/01"), dataManager, 1, 3000);
-        MockSet set10 = new MockSet(Path.fromString("/mock/10"), dataManager, 2, 4000);
-        MockSet set11 = new MockSet(Path.fromString("/mock/11"), dataManager, 3, 5000);
-        MockSet set12 = new MockSet(Path.fromString("/mock/12"), dataManager, 4, 6000);
-
-        MockSet set0 = new MockSet(Path.fromString("/mock/0"), dataManager, 7, 7000);
-        set0.addMediaSet(set00);
-        set0.addMediaSet(set01);
-
-        MockSet set1 = new MockSet(Path.fromString("/mock/1"), dataManager, 8, 8000);
-        set1.addMediaSet(set10);
-        set1.addMediaSet(set11);
-        set1.addMediaSet(set12);
-
-        MediaSet combo = dataManager.getMediaSet("/combo/{/mock/0,/mock/1}");
-        assertEquals(5, combo.getSubMediaSetCount());
-        assertEquals(0, combo.getMediaItemCount());
-        assertEquals("/mock/00", combo.getSubMediaSet(0).getPath().toString());
-        assertEquals("/mock/01", combo.getSubMediaSet(1).getPath().toString());
-        assertEquals("/mock/10", combo.getSubMediaSet(2).getPath().toString());
-        assertEquals("/mock/11", combo.getSubMediaSet(3).getPath().toString());
-        assertEquals("/mock/12", combo.getSubMediaSet(4).getPath().toString());
-
-        assertEquals(10, combo.getTotalMediaItemCount());
-    }
-}
diff --git a/tests/src/com/android/gallery3d/data/MockItem.java b/tests/src/com/android/gallery3d/data/MockItem.java
deleted file mode 100644
index 2901979..0000000
--- a/tests/src/com/android/gallery3d/data/MockItem.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.data;
-
-import com.android.gallery3d.util.ThreadPool.Job;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapRegionDecoder;
-
-public class MockItem extends MediaItem {
-    public MockItem(Path path) {
-        super(path, nextVersionNumber());
-    }
-
-    @Override
-    public Job<Bitmap> requestImage(int type) {
-        return null;
-    }
-
-    @Override
-    public Job<BitmapRegionDecoder> requestLargeImage() {
-        return null;
-    }
-
-    @Override
-    public String getMimeType() {
-        return null;
-    }
-
-    @Override
-    public int getWidth() {
-        return 0;
-    }
-
-    @Override
-    public int getHeight() {
-        return 0;
-    }
-}
diff --git a/tests/src/com/android/gallery3d/data/MockSet.java b/tests/src/com/android/gallery3d/data/MockSet.java
deleted file mode 100644
index fa83c79..0000000
--- a/tests/src/com/android/gallery3d/data/MockSet.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.data;
-
-import java.util.ArrayList;
-
-public class MockSet extends MediaSet {
-    ArrayList<MediaItem> mItems = new ArrayList<MediaItem>();
-    ArrayList<MediaSet> mSets = new ArrayList<MediaSet>();
-    Path mItemPath;
-
-    public MockSet(Path path, DataManager dataManager) {
-        super(path, nextVersionNumber());
-        mItemPath = Path.fromString("/mock/item");
-    }
-
-    public MockSet(Path path, DataManager dataManager,
-            int items, int item_id_start) {
-        this(path, dataManager);
-        for (int i = 0; i < items; i++) {
-            Path childPath = mItemPath.getChild(item_id_start + i);
-            mItems.add(new MockItem(childPath));
-        }
-    }
-
-    public void addMediaSet(MediaSet sub) {
-        mSets.add(sub);
-    }
-
-    @Override
-    public int getMediaItemCount() {
-        return mItems.size();
-    }
-
-    @Override
-    public ArrayList<MediaItem> getMediaItem(int start, int count) {
-        ArrayList<MediaItem> result = new ArrayList<MediaItem>();
-        int end = Math.min(start + count, mItems.size());
-
-        for (int i = start; i < end; i++) {
-            result.add(mItems.get(i));
-        }
-        return result;
-    }
-
-    @Override
-    public int getSubMediaSetCount() {
-        return mSets.size();
-    }
-
-    @Override
-    public MediaSet getSubMediaSet(int index) {
-        return mSets.get(index);
-    }
-
-    @Override
-    public int getTotalMediaItemCount() {
-        int result = mItems.size();
-        for (MediaSet s : mSets) {
-            result += s.getTotalMediaItemCount();
-        }
-        return result;
-    }
-
-    @Override
-    public String getName() {
-        return "Set " + mPath;
-    }
-
-    @Override
-    public long reload() {
-        return 0;
-    }
-}
diff --git a/tests/src/com/android/gallery3d/data/MockSource.java b/tests/src/com/android/gallery3d/data/MockSource.java
deleted file mode 100644
index 27ed4d0..0000000
--- a/tests/src/com/android/gallery3d/data/MockSource.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.data;
-
-import com.android.gallery3d.app.GalleryApp;
-
-class MockSource extends MediaSource {
-    GalleryApp mApplication;
-    PathMatcher mMatcher;
-
-    private static final int MOCK_SET = 0;
-    private static final int MOCK_ITEM = 1;
-
-    public MockSource(GalleryApp context) {
-        super("mock");
-        mApplication = context;
-        mMatcher = new PathMatcher();
-        mMatcher.add("/mock/*", MOCK_SET);
-        mMatcher.add("/mock/item/*", MOCK_ITEM);
-    }
-
-    @Override
-    public MediaObject createMediaObject(Path path) {
-        MediaObject obj;
-        switch (mMatcher.match(path)) {
-            case MOCK_SET:
-                return new MockSet(path, mApplication.getDataManager());
-            case MOCK_ITEM:
-                return new MockItem(path);
-            default:
-                throw new RuntimeException("bad path: " + path);
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/data/PathTest.java b/tests/src/com/android/gallery3d/data/PathTest.java
deleted file mode 100644
index b43d109..0000000
--- a/tests/src/com/android/gallery3d/data/PathTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.data;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-public class PathTest extends AndroidTestCase {
-    @SuppressWarnings("unused")
-    private static final String TAG = "PathTest";
-
-    @SmallTest
-    public void testToString() {
-        Path p = Path.fromString("/hello/world");
-        assertEquals("/hello/world", p.toString());
-
-        p = Path.fromString("/a");
-        assertEquals("/a", p.toString());
-
-        p = Path.fromString("");
-        assertEquals("", p.toString());
-    }
-
-    @SmallTest
-    public void testSplit() {
-        Path p = Path.fromString("/hello/world");
-        String[] s = p.split();
-        assertEquals(2, s.length);
-        assertEquals("hello", s[0]);
-        assertEquals("world", s[1]);
-
-        p = Path.fromString("");
-        assertEquals(0, p.split().length);
-    }
-
-    @SmallTest
-    public void testPrefix() {
-        Path p = Path.fromString("/hello/world");
-        assertEquals("hello", p.getPrefix());
-
-        p = Path.fromString("");
-        assertEquals("", p.getPrefix());
-    }
-
-    @SmallTest
-    public void testGetChild() {
-        Path p = Path.fromString("/hello");
-        Path q = Path.fromString("/hello/world");
-        assertSame(q, p.getChild("world"));
-        Path r = q.getChild(17);
-        assertEquals("/hello/world/17", r.toString());
-    }
-
-    @SmallTest
-    public void testSplitSequence() {
-        String[] s = Path.splitSequence("{a,bb,ccc}");
-        assertEquals(3, s.length);
-        assertEquals("a", s[0]);
-        assertEquals("bb", s[1]);
-        assertEquals("ccc", s[2]);
-
-        s = Path.splitSequence("{a,{bb,ccc},d}");
-        assertEquals(3, s.length);
-        assertEquals("a", s[0]);
-        assertEquals("{bb,ccc}", s[1]);
-        assertEquals("d", s[2]);
-    }
-}
diff --git a/tests/src/com/android/gallery3d/data/RealDataTest.java b/tests/src/com/android/gallery3d/data/RealDataTest.java
deleted file mode 100644
index 526cfe3..0000000
--- a/tests/src/com/android/gallery3d/data/RealDataTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.data;
-
-import com.android.gallery3d.app.GalleryApp;
-import com.android.gallery3d.picasasource.PicasaSource;
-
-import android.os.Looper;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-// This test reads real data directly and dump information out in the log.
-public class RealDataTest extends AndroidTestCase {
-    private static final String TAG = "RealDataTest";
-
-    private HashSet<Path> mUsedId = new HashSet<Path>();
-    private GalleryApp mApplication;
-    private DataManager mDataManager;
-
-    @LargeTest
-    public void testRealData() {
-        mUsedId.clear();
-        mApplication = new GalleryAppMock(
-                mContext,
-                mContext.getContentResolver(),
-                Looper.myLooper());
-        mDataManager = mApplication.getDataManager();
-        mDataManager.addSource(new LocalSource(mApplication));
-        mDataManager.addSource(new PicasaSource(mApplication));
-        new TestLocalImage().run();
-        new TestLocalVideo().run();
-        new TestPicasa().run();
-    }
-
-    class TestLocalImage {
-        public void run() {
-            MediaSet set = mDataManager.getMediaSet("/local/image");
-            set.reload();
-            Log.v(TAG, "LocalAlbumSet (Image)");
-            dumpMediaSet(set, "");
-        }
-    }
-
-    class TestLocalVideo {
-        public void run() {
-            MediaSet set = mDataManager.getMediaSet("/local/video");
-            set.reload();
-            Log.v(TAG, "LocalAlbumSet (Video)");
-            dumpMediaSet(set, "");
-        }
-    }
-
-    class TestPicasa implements Runnable {
-        public void run() {
-            MediaSet set = mDataManager.getMediaSet("/picasa");
-            set.reload();
-            Log.v(TAG, "PicasaAlbumSet");
-            dumpMediaSet(set, "");
-        }
-    }
-
-    void dumpMediaSet(MediaSet set, String prefix) {
-        Log.v(TAG, "getName() = " + set.getName());
-        Log.v(TAG, "getPath() = " + set.getPath());
-        Log.v(TAG, "getMediaItemCount() = " + set.getMediaItemCount());
-        Log.v(TAG, "getSubMediaSetCount() = " + set.getSubMediaSetCount());
-        Log.v(TAG, "getTotalMediaItemCount() = " + set.getTotalMediaItemCount());
-        assertNewId(set.getPath());
-        for (int i = 0, n = set.getSubMediaSetCount(); i < n; i++) {
-            MediaSet sub = set.getSubMediaSet(i);
-            Log.v(TAG, prefix + "got set " + i);
-            dumpMediaSet(sub, prefix + "  ");
-        }
-        for (int i = 0, n = set.getMediaItemCount(); i < n; i += 10) {
-            ArrayList<MediaItem> list = set.getMediaItem(i, 10);
-            Log.v(TAG, prefix + "got item " + i + " (+" + list.size() + ")");
-            for (MediaItem item : list) {
-                dumpMediaItem(item, prefix + "..");
-            }
-        }
-    }
-
-    void dumpMediaItem(MediaItem item, String prefix) {
-        assertNewId(item.getPath());
-        Log.v(TAG, prefix + "getPath() = " + item.getPath());
-    }
-
-    void assertNewId(Path key) {
-        assertFalse(key + " has already appeared.", mUsedId.contains(key));
-        mUsedId.add(key);
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifDataTest.java b/tests/src/com/android/gallery3d/exif/ExifDataTest.java
deleted file mode 100644
index 142cc6b..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifDataTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import android.test.suitebuilder.annotation.SmallTest;
-import junit.framework.TestCase;
-import java.nio.ByteOrder;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ExifDataTest extends TestCase {
-    Map<Integer, ExifTag> mTestTags;
-    ExifInterface mInterface;
-    private ExifTag mVersionTag;
-    private ExifTag mGpsVersionTag;
-    private ExifTag mModelTag;
-    private ExifTag mDateTimeTag;
-    private ExifTag mCompressionTag;
-    private ExifTag mThumbnailFormatTag;
-    private ExifTag mLongitudeTag;
-    private ExifTag mShutterTag;
-    private ExifTag mInteropIndex;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        mInterface = new ExifInterface();
-
-        // TYPE_UNDEFINED with 4 components
-        mVersionTag = mInterface.buildTag(ExifInterface.TAG_EXIF_VERSION, new byte[] {
-                5, 4, 3, 2
-        });
-        // TYPE_UNSIGNED_BYTE with 4 components
-        mGpsVersionTag = mInterface.buildTag(ExifInterface.TAG_GPS_VERSION_ID, new byte[] {
-                6, 7, 8, 9
-        });
-        // TYPE ASCII with arbitrary length
-        mModelTag = mInterface.buildTag(ExifInterface.TAG_MODEL, "helloworld");
-        // TYPE_ASCII with 20 components
-        mDateTimeTag = mInterface.buildTag(ExifInterface.TAG_DATE_TIME, "2013:02:11 20:20:20");
-        // TYPE_UNSIGNED_SHORT with 1 components
-        mCompressionTag = mInterface.buildTag(ExifInterface.TAG_COMPRESSION, 100);
-        // TYPE_UNSIGNED_LONG with 1 components
-        mThumbnailFormatTag =
-                mInterface.buildTag(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, 100);
-        // TYPE_UNSIGNED_RATIONAL with 3 components
-        mLongitudeTag = mInterface.buildTag(ExifInterface.TAG_GPS_LONGITUDE, new Rational[] {
-                new Rational(2, 2), new Rational(11, 11),
-                new Rational(102, 102)
-        });
-        // TYPE_RATIONAL with 1 components
-        mShutterTag = mInterface
-                .buildTag(ExifInterface.TAG_SHUTTER_SPEED_VALUE, new Rational(4, 6));
-        // TYPE_ASCII with arbitrary length
-        mInteropIndex = mInterface.buildTag(ExifInterface.TAG_INTEROPERABILITY_INDEX, "foo");
-
-        mTestTags = new HashMap<Integer, ExifTag>();
-
-        mTestTags.put(ExifInterface.TAG_EXIF_VERSION, mVersionTag);
-        mTestTags.put(ExifInterface.TAG_GPS_VERSION_ID, mGpsVersionTag);
-        mTestTags.put(ExifInterface.TAG_MODEL, mModelTag);
-        mTestTags.put(ExifInterface.TAG_DATE_TIME, mDateTimeTag);
-        mTestTags.put(ExifInterface.TAG_COMPRESSION, mCompressionTag);
-        mTestTags.put(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, mThumbnailFormatTag);
-        mTestTags.put(ExifInterface.TAG_GPS_LONGITUDE, mLongitudeTag);
-        mTestTags.put(ExifInterface.TAG_SHUTTER_SPEED_VALUE, mShutterTag);
-        mTestTags.put(ExifInterface.TAG_INTEROPERABILITY_INDEX, mInteropIndex);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        mInterface = null;
-        mTestTags = null;
-    }
-
-    @SmallTest
-    public void testAddTag() {
-        ExifData exifData = new ExifData(ByteOrder.BIG_ENDIAN);
-
-        // Add all test tags
-        for (ExifTag t : mTestTags.values()) {
-            assertTrue(exifData.addTag(t) == null);
-        }
-
-        // Make sure no initial thumbnails
-        assertFalse(exifData.hasCompressedThumbnail());
-        assertFalse(exifData.hasUncompressedStrip());
-
-        // Check that we can set thumbnails
-        exifData.setStripBytes(3, new byte[] {
-                1, 2, 3, 4, 5
-        });
-        assertTrue(exifData.hasUncompressedStrip());
-        exifData.setCompressedThumbnail(new byte[] {
-            1
-        });
-        assertTrue(exifData.hasCompressedThumbnail());
-
-        // Check that we can clear thumbnails
-        exifData.clearThumbnailAndStrips();
-        assertFalse(exifData.hasCompressedThumbnail());
-        assertFalse(exifData.hasUncompressedStrip());
-
-        // Make sure ifds exist
-        for (int i : IfdData.getIfds()) {
-            assertTrue(exifData.getIfdData(i) != null);
-        }
-
-        // Get all test tags
-        List<ExifTag> allTags = exifData.getAllTags();
-        assertTrue(allTags != null);
-
-        // Make sure all test tags are in data
-        for (ExifTag t : mTestTags.values()) {
-            boolean check = false;
-            for (ExifTag i : allTags) {
-                if (t.equals(i)) {
-                    check = true;
-                    break;
-                }
-            }
-            assertTrue(check);
-        }
-
-        // Check if getting tags for a tid works
-        List<ExifTag> tidTags = exifData.getAllTagsForTagId(ExifInterface
-                .getTrueTagKey(ExifInterface.TAG_SHUTTER_SPEED_VALUE));
-        assertTrue(tidTags.size() == 1);
-        assertTrue(tidTags.get(0).equals(mShutterTag));
-
-        // Check if getting tags for an ifd works
-        List<ExifTag> ifdTags = exifData.getAllTagsForIfd(IfdId.TYPE_IFD_INTEROPERABILITY);
-        assertTrue(ifdTags.size() == 1);
-        assertTrue(ifdTags.get(0).equals(mInteropIndex));
-
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifInterfaceTest.java b/tests/src/com/android/gallery3d/exif/ExifInterfaceTest.java
deleted file mode 100644
index 01b2a32..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifInterfaceTest.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-
-package com.android.gallery3d.exif;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import java.io.ByteArrayInputStream;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ExifInterfaceTest extends ExifXmlDataTestCase {
-
-    private File mTmpFile;
-    private List<Map<Short, List<String>>> mGroundTruth;
-    private ExifInterface mInterface;
-    private ExifTag mVersionTag;
-    private ExifTag mGpsVersionTag;
-    private ExifTag mModelTag;
-    private ExifTag mDateTimeTag;
-    private ExifTag mCompressionTag;
-    private ExifTag mThumbnailFormatTag;
-    private ExifTag mLongitudeTag;
-    private ExifTag mShutterTag;
-    Map<Integer, ExifTag> mTestTags;
-    Map<Integer, Integer> mTagDefinitions;
-
-    public ExifInterfaceTest(int imageRes, int xmlRes) {
-        super(imageRes, xmlRes);
-    }
-
-    public ExifInterfaceTest(String imagePath, String xmlPath) {
-        super(imagePath, xmlPath);
-    }
-
-    @MediumTest
-    public void testInterface() throws Exception {
-
-        InputStream imageInputStream = null;
-        try {
-            // Basic checks
-
-            // Check if bitmap is valid
-            byte[] imgData = Util.readToByteArray(getImageInputStream());
-            imageInputStream = new ByteArrayInputStream(imgData);
-            checkBitmap(imageInputStream);
-
-            // Check defines
-            int tag = ExifInterface.defineTag(1, (short) 0x0100);
-            assertTrue(getImageTitle(), tag == 0x00010100);
-            int tagDef = mInterface.getTagDefinition((short) 0x0100, IfdId.TYPE_IFD_0);
-            assertTrue(getImageTitle(), tagDef == 0x03040001);
-            int[] allowed = ExifInterface.getAllowedIfdsFromInfo(mInterface.getTagInfo().get(
-                    ExifInterface.TAG_IMAGE_WIDTH));
-            assertTrue(getImageTitle(), allowed.length == 2 && allowed[0] == IfdId.TYPE_IFD_0
-                    && allowed[1] == IfdId.TYPE_IFD_1);
-
-            // Check if there are any initial tags
-            assertTrue(getImageTitle(), mInterface.getAllTags() == null);
-
-            // ///////// Basic read/write testing
-
-            // Make sure we can read
-            imageInputStream = new ByteArrayInputStream(imgData);
-            mInterface.readExif(imageInputStream);
-
-            // Check tags against ground truth
-            checkTagsAgainstXml(mInterface.getAllTags());
-
-            // Make sure clearing Exif works
-            mInterface.clearExif();
-            assertTrue(getImageTitle(), mInterface.getAllTags() == null);
-
-            // Make sure setting tags works
-            mInterface.setTags(mTestTags.values());
-            checkTagsAgainstHash(mInterface.getAllTags(), mTestTags);
-
-            // Try writing over bitmap exif
-            ByteArrayOutputStream imgModified = new ByteArrayOutputStream();
-            mInterface.writeExif(imgData, imgModified);
-
-            // Check if bitmap is valid
-            byte[] imgData2 = imgModified.toByteArray();
-            imageInputStream = new ByteArrayInputStream(imgData2);
-            checkBitmap(imageInputStream);
-
-            // Make sure we get the same tags out
-            imageInputStream = new ByteArrayInputStream(imgData2);
-            mInterface.readExif(imageInputStream);
-            checkTagsAgainstHash(mInterface.getAllTags(), mTestTags);
-
-            // Reread original image
-            imageInputStream = new ByteArrayInputStream(imgData);
-            mInterface.readExif(imageInputStream);
-
-            // Write out with original exif
-            imgModified = new ByteArrayOutputStream();
-            mInterface.writeExif(imgData2, imgModified);
-
-            // Read back in exif and check tags
-            imgData2 = imgModified.toByteArray();
-            imageInputStream = new ByteArrayInputStream(imgData2);
-            mInterface.readExif(imageInputStream);
-            checkTagsAgainstXml(mInterface.getAllTags());
-
-            // Check if bitmap is valid
-            imageInputStream = new ByteArrayInputStream(imgData2);
-            checkBitmap(imageInputStream);
-
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        } finally {
-            Util.closeSilently(imageInputStream);
-        }
-    }
-
-    @MediumTest
-    public void testInterfaceModify() throws Exception {
-
-        // TODO: This test is dependent on galaxy_nexus jpeg/xml file.
-        InputStream imageInputStream = null;
-        try {
-            // Check if bitmap is valid
-            byte[] imgData = Util.readToByteArray(getImageInputStream());
-            imageInputStream = new ByteArrayInputStream(imgData);
-            checkBitmap(imageInputStream);
-
-            // ///////// Exif modifier testing.
-
-            // Read exif and write to temp file
-            imageInputStream = new ByteArrayInputStream(imgData);
-            mInterface.readExif(imageInputStream);
-            mInterface.writeExif(imgData, mTmpFile.getPath());
-
-            // Check if bitmap is valid
-            imageInputStream = new FileInputStream(mTmpFile);
-            checkBitmap(imageInputStream);
-
-            // Create some tags to overwrite with
-            ArrayList<ExifTag> tags = new ArrayList<ExifTag>();
-            tags.add(mInterface.buildTag(ExifInterface.TAG_ORIENTATION,
-                    ExifInterface.Orientation.RIGHT_TOP));
-            tags.add(mInterface.buildTag(ExifInterface.TAG_USER_COMMENT, "goooooooooooooooooogle"));
-
-            // Attempt to rewrite tags
-            assertTrue(getImageTitle(), mInterface.rewriteExif(mTmpFile.getPath(), tags));
-
-            imageInputStream.close();
-            // Check if bitmap is valid
-            imageInputStream = new FileInputStream(mTmpFile);
-            checkBitmap(imageInputStream);
-
-            // Read tags and check against xml
-            mInterface.readExif(mTmpFile.getPath());
-            for (ExifTag t : mInterface.getAllTags()) {
-                short tid = t.getTagId();
-                if (tid != ExifInterface.getTrueTagKey(ExifInterface.TAG_ORIENTATION)
-                        && tid != ExifInterface.getTrueTagKey(ExifInterface.TAG_USER_COMMENT)) {
-                    checkTagAgainstXml(t);
-                }
-            }
-            assertTrue(getImageTitle(), mInterface.getTagIntValue(ExifInterface.TAG_ORIENTATION)
-                    .shortValue() == ExifInterface.Orientation.RIGHT_TOP);
-            String valString = mInterface.getTagStringValue(ExifInterface.TAG_USER_COMMENT);
-            assertTrue(getImageTitle(), valString.equals("goooooooooooooooooogle"));
-
-            // Test forced modify
-
-            // Create some tags to overwrite with
-            tags = new ArrayList<ExifTag>();
-            tags.add(mInterface.buildTag(ExifInterface.TAG_SOFTWARE, "magic super photomaker pro"));
-            tags.add(mInterface.buildTag(ExifInterface.TAG_USER_COMMENT, "noodles"));
-            tags.add(mInterface.buildTag(ExifInterface.TAG_ORIENTATION,
-                    ExifInterface.Orientation.TOP_LEFT));
-
-            // Force rewrite tags
-            mInterface.forceRewriteExif(mTmpFile.getPath(), tags);
-
-            imageInputStream.close();
-            // Check if bitmap is valid
-            imageInputStream = new FileInputStream(mTmpFile);
-            checkBitmap(imageInputStream);
-
-            // Read tags and check against xml
-            mInterface.readExif(mTmpFile.getPath());
-            for (ExifTag t : mInterface.getAllTags()) {
-                short tid = t.getTagId();
-                if (!ExifInterface.isOffsetTag(tid)
-                        && tid != ExifInterface.getTrueTagKey(ExifInterface.TAG_SOFTWARE)
-                        && tid != ExifInterface.getTrueTagKey(ExifInterface.TAG_USER_COMMENT)) {
-                    checkTagAgainstXml(t);
-                }
-            }
-            valString = mInterface.getTagStringValue(ExifInterface.TAG_SOFTWARE);
-            String compareString = "magic super photomaker pro\0";
-            assertTrue(getImageTitle(), valString.equals(compareString));
-            valString = mInterface.getTagStringValue(ExifInterface.TAG_USER_COMMENT);
-            assertTrue(getImageTitle(), valString.equals("noodles"));
-
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        } finally {
-            Util.closeSilently(imageInputStream);
-        }
-    }
-
-    @MediumTest
-    public void testInterfaceDefines() throws Exception {
-
-        InputStream imageInputStream = null;
-        try {
-            // Check if bitmap is valid
-            byte[] imgData = Util.readToByteArray(getImageInputStream());
-            imageInputStream = new ByteArrayInputStream(imgData);
-            checkBitmap(imageInputStream);
-
-            // Set some tags.
-            mInterface.setTags(mTestTags.values());
-
-            // Check tag definitions against default
-            for (Integer i : mTestTags.keySet()) {
-                int check = mTagDefinitions.get(i).intValue();
-                int actual = mInterface.getTagInfo().get(i);
-                assertTrue(check == actual);
-            }
-
-            // Check defines
-            int tag1 = ExifInterface.defineTag(IfdId.TYPE_IFD_1, (short) 42);
-            int tag2 = ExifInterface.defineTag(IfdId.TYPE_IFD_INTEROPERABILITY, (short) 43);
-            assertTrue(tag1 == 0x0001002a);
-            assertTrue(tag2 == 0x0003002b);
-
-            // Define some non-standard tags
-            assertTrue(mInterface.setTagDefinition((short) 42, IfdId.TYPE_IFD_1,
-                    ExifTag.TYPE_UNSIGNED_BYTE, (short) 16, new int[] {
-                        IfdId.TYPE_IFD_1
-                    }) == tag1);
-            assertTrue(mInterface.getTagInfo().get(tag1) == 0x02010010);
-            assertTrue(mInterface.setTagDefinition((short) 43, IfdId.TYPE_IFD_INTEROPERABILITY,
-                    ExifTag.TYPE_ASCII, (short) 5, new int[] {
-                            IfdId.TYPE_IFD_GPS, IfdId.TYPE_IFD_INTEROPERABILITY
-                    }) == tag2);
-            assertTrue(mInterface.getTagInfo().get(tag2) == 0x18020005);
-
-            // Make sure these don't work
-            assertTrue(mInterface.setTagDefinition((short) 42, IfdId.TYPE_IFD_1,
-                    ExifTag.TYPE_UNSIGNED_BYTE, (short) 16, new int[] {
-                        IfdId.TYPE_IFD_0
-                    }) == ExifInterface.TAG_NULL);
-            assertTrue(mInterface.setTagDefinition((short) 42, IfdId.TYPE_IFD_1, (short) 0,
-                    (short) 16, new int[] {
-                        IfdId.TYPE_IFD_1
-                    }) == ExifInterface.TAG_NULL);
-            assertTrue(mInterface.setTagDefinition((short) 42, 5, ExifTag.TYPE_UNSIGNED_BYTE,
-                    (short) 16, new int[] {
-                        5
-                    }) == ExifInterface.TAG_NULL);
-            assertTrue(mInterface.setTagDefinition((short) 42, IfdId.TYPE_IFD_1,
-                    ExifTag.TYPE_UNSIGNED_BYTE, (short) 16, new int[] {
-                        -1
-                    }) == ExifInterface.TAG_NULL);
-            assertTrue(mInterface.setTagDefinition((short) 43, IfdId.TYPE_IFD_GPS,
-                    ExifTag.TYPE_ASCII, (short) 5, new int[] {
-                        IfdId.TYPE_IFD_GPS
-                    }) == ExifInterface.TAG_NULL);
-            assertTrue(mInterface.setTagDefinition((short) 43, IfdId.TYPE_IFD_0,
-                    ExifTag.TYPE_ASCII, (short) 5, new int[] {
-                            IfdId.TYPE_IFD_0, IfdId.TYPE_IFD_GPS
-                    }) == ExifInterface.TAG_NULL);
-
-            // Set some tags
-            mInterface.setTags(mTestTags.values());
-            checkTagsAgainstHash(mInterface.getAllTags(), mTestTags);
-
-            // Make some tags using new defines
-            ExifTag defTag0 = mInterface.buildTag(tag1, new byte[] {
-                    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-            });
-            assertTrue(defTag0 != null);
-            ExifTag defTag1 = mInterface.buildTag(tag2, "hihi");
-            assertTrue(defTag1 != null);
-            ExifTag defTag2 = mInterface.buildTag(tag2, IfdId.TYPE_IFD_GPS, "byte");
-            assertTrue(defTag2 != null);
-
-            // Make sure these don't work
-            ExifTag badTag = mInterface.buildTag(tag1, new byte[] {
-                    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-            });
-            assertTrue(badTag == null);
-            badTag = mInterface.buildTag(tag1, IfdId.TYPE_IFD_0, new byte[] {
-                    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-            });
-            assertTrue(badTag == null);
-            badTag = mInterface.buildTag(0x0002002a, new byte[] {
-                    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-            });
-            assertTrue(badTag == null);
-            badTag = mInterface.buildTag(tag2, new byte[] {
-                    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-            });
-            assertTrue(badTag == null);
-
-            // Set the tags
-            assertTrue(mInterface.setTag(defTag0) == null);
-            assertTrue(mInterface.setTag(defTag1) == null);
-            assertTrue(mInterface.setTag(defTag2) == null);
-            assertTrue(mInterface.setTag(defTag0).equals(defTag0));
-            assertTrue(mInterface.setTag(null) == null);
-            assertTrue(mInterface.setTagValue(tag2, "yoyo") == true);
-            assertTrue(mInterface.setTagValue(tag2, "yaaarggg") == false);
-            assertTrue(mInterface.getTagStringValue(tag2).equals("yoyo\0"));
-
-            // Try writing over bitmap exif
-            ByteArrayOutputStream imgModified = new ByteArrayOutputStream();
-            mInterface.writeExif(imgData, imgModified);
-
-            // Check if bitmap is valid
-            byte[] imgData2 = imgModified.toByteArray();
-            imageInputStream = new ByteArrayInputStream(imgData2);
-            checkBitmap(imageInputStream);
-
-            // Read back in the tags
-            mInterface.readExif(imgData2);
-
-            // Check tags
-            for (ExifTag t : mInterface.getAllTags()) {
-                int tid = t.getTagId();
-                if (tid != ExifInterface.getTrueTagKey(tag1)
-                        && tid != ExifInterface.getTrueTagKey(tag2)) {
-                    checkTagAgainstHash(t, mTestTags);
-                }
-            }
-            assertTrue(Arrays.equals(mInterface.getTagByteValues(tag1), new byte[] {
-                    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-            }));
-            assertTrue(mInterface.getTagStringValue(tag2).equals("yoyo\0"));
-            assertTrue(mInterface.getTagStringValue(tag2, IfdId.TYPE_IFD_GPS).equals("byte\0"));
-
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        } finally {
-            Util.closeSilently(imageInputStream);
-        }
-    }
-
-    @MediumTest
-    public void testInterfaceThumbnails() throws Exception {
-
-        InputStream imageInputStream = null;
-        try {
-            // Check if bitmap is valid
-            byte[] imgData = Util.readToByteArray(getImageInputStream());
-            imageInputStream = new ByteArrayInputStream(imgData);
-            checkBitmap(imageInputStream);
-
-            // Check thumbnails
-            mInterface.readExif(imgData);
-            Bitmap bmap = mInterface.getThumbnailBitmap();
-            assertTrue(getImageTitle(), bmap != null);
-
-            // Make a new thumbnail and set it
-            BitmapFactory.Options opts = new BitmapFactory.Options();
-            opts.inSampleSize = 16;
-            Bitmap thumb = BitmapFactory.decodeByteArray(imgData, 0, imgData.length, opts);
-            assertTrue(getImageTitle(), thumb != null);
-            assertTrue(getImageTitle(), mInterface.setCompressedThumbnail(thumb) == true);
-
-            // Write out image
-            ByteArrayOutputStream outData = new ByteArrayOutputStream();
-            mInterface.writeExif(imgData, outData);
-
-            // Make sure bitmap is still valid
-            byte[] imgData2 = outData.toByteArray();
-            imageInputStream = new ByteArrayInputStream(imgData2);
-            checkBitmap(imageInputStream);
-
-            // Read in bitmap and make sure thumbnail is still valid
-            mInterface.readExif(imgData2);
-            bmap = mInterface.getThumbnailBitmap();
-            assertTrue(getImageTitle(), bmap != null);
-
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        } finally {
-            Util.closeSilently(imageInputStream);
-        }
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mTmpFile = File.createTempFile("exif_test", ".jpg");
-        mGroundTruth = ExifXmlReader.readXml(getXmlParser());
-
-        mInterface = new ExifInterface();
-
-        // TYPE_UNDEFINED with 4 components
-        mVersionTag = mInterface.buildTag(ExifInterface.TAG_EXIF_VERSION, new byte[] {
-                5, 4, 3, 2
-        });
-        // TYPE_UNSIGNED_BYTE with 4 components
-        mGpsVersionTag = mInterface.buildTag(ExifInterface.TAG_GPS_VERSION_ID, new byte[] {
-                6, 7, 8, 9
-        });
-        // TYPE ASCII with arbitary length
-        mModelTag = mInterface.buildTag(ExifInterface.TAG_MODEL, "helloworld");
-        // TYPE_ASCII with 20 components
-        mDateTimeTag = mInterface.buildTag(ExifInterface.TAG_DATE_TIME, "2013:02:11 20:20:20");
-        // TYPE_UNSIGNED_SHORT with 1 components
-        mCompressionTag = mInterface.buildTag(ExifInterface.TAG_COMPRESSION, 100);
-        // TYPE_UNSIGNED_LONG with 1 components
-        mThumbnailFormatTag =
-                mInterface.buildTag(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, 100);
-        // TYPE_UNSIGNED_RATIONAL with 3 components
-        mLongitudeTag = mInterface.buildTag(ExifInterface.TAG_GPS_LONGITUDE, new Rational[] {
-                new Rational(2, 2), new Rational(11, 11),
-                new Rational(102, 102)
-        });
-        // TYPE_RATIONAL with 1 components
-        mShutterTag = mInterface
-                .buildTag(ExifInterface.TAG_SHUTTER_SPEED_VALUE, new Rational(4, 6));
-
-        mTestTags = new HashMap<Integer, ExifTag>();
-
-        mTestTags.put(ExifInterface.TAG_EXIF_VERSION, mVersionTag);
-        mTestTags.put(ExifInterface.TAG_GPS_VERSION_ID, mGpsVersionTag);
-        mTestTags.put(ExifInterface.TAG_MODEL, mModelTag);
-        mTestTags.put(ExifInterface.TAG_DATE_TIME, mDateTimeTag);
-        mTestTags.put(ExifInterface.TAG_COMPRESSION, mCompressionTag);
-        mTestTags.put(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, mThumbnailFormatTag);
-        mTestTags.put(ExifInterface.TAG_GPS_LONGITUDE, mLongitudeTag);
-        mTestTags.put(ExifInterface.TAG_SHUTTER_SPEED_VALUE, mShutterTag);
-
-        mTagDefinitions = new HashMap<Integer, Integer>();
-        mTagDefinitions.put(ExifInterface.TAG_EXIF_VERSION, 0x04070004);
-        mTagDefinitions.put(ExifInterface.TAG_GPS_VERSION_ID, 0x10010004);
-        mTagDefinitions.put(ExifInterface.TAG_MODEL, 0x03020000);
-        mTagDefinitions.put(ExifInterface.TAG_DATE_TIME, 0x03020014);
-        mTagDefinitions.put(ExifInterface.TAG_COMPRESSION, 0x03030001);
-        mTagDefinitions.put(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, 0x02040001);
-        mTagDefinitions.put(ExifInterface.TAG_GPS_LONGITUDE, 0x100a0003);
-        mTagDefinitions.put(ExifInterface.TAG_SHUTTER_SPEED_VALUE, 0x040a0001);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        mTmpFile.delete();
-    }
-
-    // Helper functions
-
-    private void checkTagAgainstXml(ExifTag tag) {
-        List<String> truth = mGroundTruth.get(tag.getIfd()).get(tag.getTagId());
-
-        if (truth == null) {
-            fail(String.format("Unknown Tag %02x", tag.getTagId()) + ", " + getImageTitle());
-        }
-
-        // No value from exiftool.
-        if (truth.contains(null))
-            return;
-
-        String dataString = Util.tagValueToString(tag).trim();
-        assertTrue(String.format("Tag %02x", tag.getTagId()) + ", " + getImageTitle()
-                + ": " + dataString,
-                truth.contains(dataString));
-    }
-
-    private void checkTagsAgainstXml(List<ExifTag> tags) {
-        for (ExifTag t : tags) {
-            checkTagAgainstXml(t);
-        }
-    }
-
-    private void checkTagAgainstHash(ExifTag tag, Map<Integer, ExifTag> testTags) {
-        int tagdef = mInterface.getTagDefinitionForTag(tag);
-        assertTrue(getImageTitle(), tagdef != ExifInterface.TAG_NULL);
-        ExifTag t = testTags.get(tagdef);
-        // Ignore offset tags & other special tags
-        if (!ExifInterface.sBannedDefines.contains(tag.getTagId())) {
-            assertTrue(getImageTitle(), t != null);
-        } else {
-            return;
-        }
-        if (t == tag)
-            return;
-        assertTrue(getImageTitle(), tag.equals(t));
-        assertTrue(getImageTitle(), tag.getDataType() == t.getDataType());
-        assertTrue(getImageTitle(), tag.getTagId() == t.getTagId());
-        assertTrue(getImageTitle(), tag.getIfd() == t.getIfd());
-        assertTrue(getImageTitle(), tag.getComponentCount() == t.getComponentCount());
-    }
-
-    private void checkTagsAgainstHash(List<ExifTag> tags, Map<Integer, ExifTag> testTags) {
-        for (ExifTag t : tags) {
-            checkTagAgainstHash(t, testTags);
-        }
-    }
-
-    private void checkBitmap(InputStream inputStream) throws IOException {
-        Bitmap bmp = BitmapFactory.decodeStream(inputStream);
-        assertTrue(getImageTitle(), bmp != null);
-    }
-
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifModifierTest.java b/tests/src/com/android/gallery3d/exif/ExifModifierTest.java
deleted file mode 100644
index 96f405e..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifModifierTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import android.test.suitebuilder.annotation.MediumTest;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel.MapMode;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ExifModifierTest extends ExifXmlDataTestCase {
-
-    private File mTmpFile;
-    private List<Map<Short, List<String>>> mGroundTruth;
-    private ExifInterface mInterface;
-    private Map<Short, ExifTag> mTestTags;
-    ExifTag mVersionTag;
-    ExifTag mGpsVersionTag;
-    ExifTag mModelTag;
-    ExifTag mDateTimeTag;
-    ExifTag mCompressionTag;
-    ExifTag mThumbnailFormatTag;
-    ExifTag mLongitudeTag;
-    ExifTag mShutterTag;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mGroundTruth = ExifXmlReader.readXml(getXmlParser());
-        mTmpFile = File.createTempFile("exif_test", ".jpg");
-        FileOutputStream os = null;
-        InputStream is = getImageInputStream();
-        try {
-            os = new FileOutputStream(mTmpFile);
-            byte[] buf = new byte[1024];
-            int n;
-            while ((n = is.read(buf)) > 0) {
-                os.write(buf, 0, n);
-            }
-        } finally {
-            Util.closeSilently(os);
-        }
-
-        // TYPE_UNDEFINED with 4 components
-        mVersionTag = mInterface.buildTag(ExifInterface.TAG_EXIF_VERSION, new byte[] {
-                1, 2, 3, 4
-        });
-        // TYPE_UNSIGNED_BYTE with 4 components
-        mGpsVersionTag = mInterface.buildTag(ExifInterface.TAG_GPS_VERSION_ID, new byte[] {
-                4, 3, 2, 1
-        });
-        // TYPE ASCII with arbitary length
-        mModelTag = mInterface.buildTag(ExifInterface.TAG_MODEL, "end-of-the-world");
-        // TYPE_ASCII with 20 components
-        mDateTimeTag = mInterface.buildTag(ExifInterface.TAG_DATE_TIME, "2012:12:31 23:59:59");
-        // TYPE_UNSIGNED_SHORT with 1 components
-        mCompressionTag = mInterface.buildTag(ExifInterface.TAG_COMPRESSION, 100);
-        // TYPE_UNSIGNED_LONG with 1 components
-        mThumbnailFormatTag =
-                mInterface.buildTag(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, 100);
-        // TYPE_UNSIGNED_RATIONAL with 3 components
-        mLongitudeTag = mInterface.buildTag(ExifInterface.TAG_GPS_LONGITUDE, new Rational[] {
-                new Rational(1, 1), new Rational(10, 10),
-                new Rational(100, 100)
-        });
-        // TYPE_RATIONAL with 1 components
-        mShutterTag = mInterface
-                .buildTag(ExifInterface.TAG_SHUTTER_SPEED_VALUE, new Rational(1, 1));
-
-        mTestTags = new HashMap<Short, ExifTag>();
-
-        mTestTags.put(mVersionTag.getTagId(), mVersionTag);
-        mTestTags.put(mGpsVersionTag.getTagId(), mGpsVersionTag);
-        mTestTags.put(mModelTag.getTagId(), mModelTag);
-        mTestTags.put(mDateTimeTag.getTagId(), mDateTimeTag);
-        mTestTags.put(mCompressionTag.getTagId(), mCompressionTag);
-        mTestTags.put(mThumbnailFormatTag.getTagId(), mThumbnailFormatTag);
-        mTestTags.put(mLongitudeTag.getTagId(), mLongitudeTag);
-        mTestTags.put(mShutterTag.getTagId(), mShutterTag);
-    }
-
-    public ExifModifierTest(int imageRes, int xmlRes) {
-        super(imageRes, xmlRes);
-        mInterface = new ExifInterface();
-    }
-
-    public ExifModifierTest(String imagePath, String xmlPath) {
-        super(imagePath, xmlPath);
-        mInterface = new ExifInterface();
-    }
-
-    @MediumTest
-    public void testModify() throws Exception {
-        Map<Short, Boolean> results = new HashMap<Short, Boolean>();
-
-        RandomAccessFile file = null;
-        try {
-            file = new RandomAccessFile(mTmpFile, "rw");
-            MappedByteBuffer buf = file.getChannel().map(MapMode.READ_WRITE, 0, file.length());
-            for (ExifTag tag : mTestTags.values()) {
-                ExifModifier modifier = new ExifModifier(buf, mInterface);
-                modifier.modifyTag(tag);
-                boolean result = modifier.commit();
-                results.put(tag.getTagId(), result);
-                buf.force();
-                buf.position(0);
-
-                if (!result) {
-                    List<String> value = mGroundTruth.get(tag.getIfd()).get(tag.getTagId());
-                    assertTrue(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(),
-                            value == null || tag.getTagId() == ExifInterface.TAG_MODEL);
-                }
-            }
-        } finally {
-            Util.closeSilently(file);
-        }
-
-        // Parse the new file and check the result
-        InputStream is = null;
-        try {
-            is = new FileInputStream(mTmpFile);
-            ExifData data = new ExifReader(mInterface).read(is);
-            for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
-                checkIfd(data.getIfdData(i), mGroundTruth.get(i), results);
-            }
-        } finally {
-            Util.closeSilently(is);
-        }
-
-    }
-
-    private void checkIfd(IfdData ifd, Map<Short, List<String>> ifdValue,
-            Map<Short, Boolean> results) {
-        if (ifd == null) {
-            assertEquals(getImageTitle(), 0, ifdValue.size());
-            return;
-        }
-        ExifTag[] tags = ifd.getAllTags();
-        for (ExifTag tag : tags) {
-            List<String> truth = ifdValue.get(tag.getTagId());
-            assertNotNull(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(), truth);
-            if (truth.contains(null)) {
-                continue;
-            }
-
-            ExifTag newTag = mTestTags.get(tag.getTagId());
-            if (newTag != null
-                    && results.get(tag.getTagId())) {
-                assertEquals(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(),
-                        Util.tagValueToString(newTag), Util.tagValueToString(tag));
-            } else {
-                assertTrue(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(),
-                        truth.contains(Util.tagValueToString(tag).trim()));
-            }
-        }
-        assertEquals(getImageTitle(), ifdValue.size(), tags.length);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        mTmpFile.delete();
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java b/tests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
deleted file mode 100644
index 151bdbc..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.util.Log;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class ExifOutputStreamTest extends ExifXmlDataTestCase {
-
-    private File mTmpFile;
-
-    private ExifInterface mInterface;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mTmpFile = File.createTempFile("exif_test", ".jpg");
-    }
-
-    public ExifOutputStreamTest(int imgRes, int xmlRes) {
-        super(imgRes, xmlRes);
-        mInterface = new ExifInterface();
-    }
-
-    public ExifOutputStreamTest(String imgPath, String xmlPath) {
-        super(imgPath, xmlPath);
-        mInterface = new ExifInterface();
-    }
-
-    @MediumTest
-    public void testExifOutputStream() throws Exception {
-        InputStream imageInputStream = null;
-        InputStream exifInputStream = null;
-        FileInputStream reDecodeInputStream = null;
-        FileInputStream reParseInputStream = null;
-
-        InputStream dangerInputStream = null;
-        OutputStream dangerOutputStream = null;
-        try {
-            try {
-                byte[] imgData = Util.readToByteArray(getImageInputStream());
-                imageInputStream = new ByteArrayInputStream(imgData);
-                exifInputStream = new ByteArrayInputStream(imgData);
-
-                // Read the image data
-                Bitmap bmp = BitmapFactory.decodeStream(imageInputStream);
-                // The image is invalid
-                if (bmp == null) {
-                    return;
-                }
-
-                // Read exif data
-                ExifData exifData = new ExifReader(mInterface).read(exifInputStream);
-
-                // Encode the image with the exif data
-                FileOutputStream outputStream = new FileOutputStream(mTmpFile);
-                ExifOutputStream exifOutputStream = new ExifOutputStream(outputStream, mInterface);
-                exifOutputStream.setExifData(exifData);
-                bmp.compress(Bitmap.CompressFormat.JPEG, 90, exifOutputStream);
-                exifOutputStream.close();
-                exifOutputStream = null;
-
-                // Re-decode the temp file and check the data.
-                reDecodeInputStream = new FileInputStream(mTmpFile);
-                Bitmap decodedBmp = BitmapFactory.decodeStream(reDecodeInputStream);
-                assertNotNull(getImageTitle(), decodedBmp);
-                reDecodeInputStream.close();
-
-                // Re-parse the temp file the check EXIF tag
-                reParseInputStream = new FileInputStream(mTmpFile);
-                ExifData reExifData = new ExifReader(mInterface).read(reParseInputStream);
-                assertEquals(getImageTitle(), exifData, reExifData);
-                reParseInputStream.close();
-
-                // Try writing exif to file with existing exif.
-                dangerOutputStream = (OutputStream) new FileOutputStream(mTmpFile);
-                exifOutputStream = new ExifOutputStream(dangerOutputStream, mInterface);
-                exifOutputStream.setExifData(exifData);
-                exifOutputStream.write(imgData);
-                // exifOutputStream.write(strippedImgData);
-                exifOutputStream.close();
-                exifOutputStream = null;
-
-                // Make sure it still can be parsed into a bitmap.
-                dangerInputStream = (InputStream) new FileInputStream(mTmpFile);
-                decodedBmp = null;
-                decodedBmp = BitmapFactory.decodeStream(dangerInputStream);
-                assertNotNull(getImageTitle(), decodedBmp);
-                dangerInputStream.close();
-                dangerInputStream = null;
-
-                // Make sure exif is still well-formatted.
-                dangerInputStream = (InputStream) new FileInputStream(mTmpFile);
-                reExifData = null;
-                reExifData = new ExifReader(mInterface).read(dangerInputStream);
-                assertEquals(getImageTitle(), exifData, reExifData);
-                dangerInputStream.close();
-                dangerInputStream = null;
-
-            } finally {
-                Util.closeSilently(imageInputStream);
-                Util.closeSilently(exifInputStream);
-                Util.closeSilently(reDecodeInputStream);
-                Util.closeSilently(reParseInputStream);
-
-                Util.closeSilently(dangerInputStream);
-                Util.closeSilently(dangerOutputStream);
-            }
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-
-    @MediumTest
-    public void testOutputSpeed() throws Exception {
-        final String LOGTAG = "testOutputSpeed";
-        InputStream imageInputStream = null;
-        OutputStream imageOutputStream = null;
-        try {
-            try {
-                imageInputStream = getImageInputStream();
-                // Read the image data
-                Bitmap bmp = BitmapFactory.decodeStream(imageInputStream);
-                // The image is invalid
-                if (bmp == null) {
-                    return;
-                }
-                imageInputStream.close();
-                int nLoops = 20;
-                long totalReadDuration = 0;
-                long totalWriteDuration = 0;
-                for (int i = 0; i < nLoops; i++) {
-                    imageInputStream = reopenFileStream();
-                    // Read exif data
-                    long startTime = System.nanoTime();
-                    ExifData exifData = new ExifReader(mInterface).read(imageInputStream);
-                    long endTime = System.nanoTime();
-                    long duration = endTime - startTime;
-                    totalReadDuration += duration;
-                    Log.v(LOGTAG, " read time: " + duration);
-                    imageInputStream.close();
-
-                    // Encode the image with the exif data
-                    imageOutputStream = (OutputStream) new FileOutputStream(mTmpFile);
-                    ExifOutputStream exifOutputStream = new ExifOutputStream(imageOutputStream,
-                            mInterface);
-                    exifOutputStream.setExifData(exifData);
-                    startTime = System.nanoTime();
-                    bmp.compress(Bitmap.CompressFormat.JPEG, 90, exifOutputStream);
-                    endTime = System.nanoTime();
-                    duration = endTime - startTime;
-                    totalWriteDuration += duration;
-                    Log.v(LOGTAG, " write time: " + duration);
-                    exifOutputStream.close();
-                }
-                Log.v(LOGTAG, "======================= normal");
-                Log.v(LOGTAG, "avg read time: " + totalReadDuration / nLoops);
-                Log.v(LOGTAG, "avg write time: " + totalWriteDuration / nLoops);
-                Log.v(LOGTAG, "=======================");
-            } finally {
-                Util.closeSilently(imageInputStream);
-                Util.closeSilently(imageOutputStream);
-            }
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        mTmpFile.delete();
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifParserTest.java b/tests/src/com/android/gallery3d/exif/ExifParserTest.java
deleted file mode 100644
index 247ea02..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifParserTest.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-import java.util.List;
-import java.util.Map;
-
-public class ExifParserTest extends ExifXmlDataTestCase {
-    private static final String TAG = "ExifParserTest";
-
-    private ExifInterface mInterface;
-
-    public ExifParserTest(int imgRes, int xmlRes) {
-        super(imgRes, xmlRes);
-        mInterface = new ExifInterface();
-    }
-
-    public ExifParserTest(String imgPath, String xmlPath) {
-        super(imgPath, xmlPath);
-        mInterface = new ExifInterface();
-    }
-
-    private List<Map<Short, List<String>>> mGroundTruth;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mGroundTruth = ExifXmlReader.readXml(getXmlParser());
-    }
-
-    @MediumTest
-    public void testParse() throws Exception {
-        try {
-            ExifParser parser = ExifParser.parse(getImageInputStream(), mInterface);
-            int event = parser.next();
-            while (event != ExifParser.EVENT_END) {
-                switch (event) {
-                    case ExifParser.EVENT_START_OF_IFD:
-                        break;
-                    case ExifParser.EVENT_NEW_TAG:
-                        ExifTag tag = parser.getTag();
-                        if (!tag.hasValue()) {
-                            parser.registerForTagValue(tag);
-                        } else {
-                            checkTag(tag);
-                        }
-                        break;
-                    case ExifParser.EVENT_VALUE_OF_REGISTERED_TAG:
-                        tag = parser.getTag();
-                        if (tag.getDataType() == ExifTag.TYPE_UNDEFINED) {
-                            byte[] buf = new byte[tag.getComponentCount()];
-                            parser.read(buf);
-                            assertTrue(TAG, tag.setValue(buf));
-                        }
-                        checkTag(tag);
-                        break;
-                }
-                event = parser.next();
-            }
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-
-    private void checkTag(ExifTag tag) {
-        List<String> truth = mGroundTruth.get(tag.getIfd()).get(tag.getTagId());
-
-        if (truth == null) {
-            fail(String.format("Unknown Tag %02x", tag.getTagId()) + ", " + getImageTitle());
-        }
-
-        // No value from exiftool.
-        if (truth.contains(null)) {
-            return;
-        }
-
-        String dataString = Util.tagValueToString(tag).trim();
-        assertTrue(String.format("Tag %02x", tag.getTagId()) + ", " + getImageTitle()
-                + ": " + dataString,
-                truth.contains(dataString));
-    }
-
-    private void parseOneIfd(int ifd, int options) throws Exception {
-        try {
-            Map<Short, List<String>> expectedResult = mGroundTruth.get(ifd);
-            int numOfTag = 0;
-            ExifParser parser = ExifParser.parse(getImageInputStream(), options, mInterface);
-            int event = parser.next();
-            while (event != ExifParser.EVENT_END) {
-                switch (event) {
-                    case ExifParser.EVENT_START_OF_IFD:
-                        assertEquals(getImageTitle(), ifd, parser.getCurrentIfd());
-                        break;
-                    case ExifParser.EVENT_NEW_TAG:
-                        ExifTag tag = parser.getTag();
-                        numOfTag++;
-                        if (tag.hasValue()) {
-                            checkTag(tag);
-                        } else {
-                            parser.registerForTagValue(tag);
-                        }
-                        break;
-                    case ExifParser.EVENT_VALUE_OF_REGISTERED_TAG:
-                        tag = parser.getTag();
-                        if (tag.getDataType() == ExifTag.TYPE_UNDEFINED) {
-                            byte[] buf = new byte[tag.getComponentCount()];
-                            parser.read(buf);
-                            tag.setValue(buf);
-                        }
-                        checkTag(tag);
-                        break;
-                    case ExifParser.EVENT_COMPRESSED_IMAGE:
-                    case ExifParser.EVENT_UNCOMPRESSED_STRIP:
-                        fail("Invalid Event type: " + event + ", " + getImageTitle());
-                        break;
-                }
-                event = parser.next();
-            }
-            assertEquals(getImageTitle(), ExifXmlReader.getTrueTagNumber(expectedResult), numOfTag);
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-
-    @MediumTest
-    public void testOnlyExifIfd() throws Exception {
-        parseOneIfd(IfdId.TYPE_IFD_EXIF, ExifParser.OPTION_IFD_EXIF);
-    }
-
-    @MediumTest
-    public void testOnlyIfd0() throws Exception {
-        parseOneIfd(IfdId.TYPE_IFD_0, ExifParser.OPTION_IFD_0);
-    }
-
-    @MediumTest
-    public void testOnlyIfd1() throws Exception {
-        parseOneIfd(IfdId.TYPE_IFD_1, ExifParser.OPTION_IFD_1);
-    }
-
-    @MediumTest
-    public void testOnlyInteroperabilityIfd() throws Exception {
-        parseOneIfd(IfdId.TYPE_IFD_INTEROPERABILITY, ExifParser.OPTION_IFD_INTEROPERABILITY);
-    }
-
-    @MediumTest
-    public void testOnlyReadSomeTag() throws Exception {
-        // Do not do this test if there is no model tag.
-        if (mGroundTruth.get(IfdId.TYPE_IFD_0).get(ExifInterface.TAG_MODEL) == null) {
-            return;
-        }
-
-        try {
-            ExifParser parser = ExifParser.parse(getImageInputStream(), ExifParser.OPTION_IFD_0,
-                    mInterface);
-            int event = parser.next();
-            boolean isTagFound = false;
-            while (event != ExifParser.EVENT_END) {
-                switch (event) {
-                    case ExifParser.EVENT_START_OF_IFD:
-                        assertEquals(getImageTitle(), IfdId.TYPE_IFD_0, parser.getCurrentIfd());
-                        break;
-                    case ExifParser.EVENT_NEW_TAG:
-                        ExifTag tag = parser.getTag();
-                        if (tag.getTagId() == ExifInterface.TAG_MODEL) {
-                            if (tag.hasValue()) {
-                                isTagFound = true;
-                                checkTag(tag);
-                            } else {
-                                parser.registerForTagValue(tag);
-                            }
-                            parser.skipRemainingTagsInCurrentIfd();
-                        }
-                        break;
-                    case ExifParser.EVENT_VALUE_OF_REGISTERED_TAG:
-                        tag = parser.getTag();
-                        assertEquals(getImageTitle(), ExifInterface.TAG_MODEL, tag.getTagId());
-                        checkTag(tag);
-                        isTagFound = true;
-                        break;
-                }
-                event = parser.next();
-            }
-            assertTrue(getImageTitle(), isTagFound);
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-
-    @MediumTest
-    public void testReadThumbnail() throws Exception {
-        try {
-            ExifParser parser = ExifParser.parse(getImageInputStream(),
-                    ExifParser.OPTION_IFD_1 | ExifParser.OPTION_THUMBNAIL, mInterface);
-
-            int event = parser.next();
-            Bitmap bmp = null;
-            boolean mIsContainCompressedImage = false;
-            while (event != ExifParser.EVENT_END) {
-                switch (event) {
-                    case ExifParser.EVENT_NEW_TAG:
-                        ExifTag tag = parser.getTag();
-                        if (tag.getTagId() == ExifInterface.TAG_COMPRESSION) {
-                            if (tag.getValueAt(0) == ExifInterface.Compression.JPEG) {
-                                mIsContainCompressedImage = true;
-                            }
-                        }
-                        break;
-                    case ExifParser.EVENT_COMPRESSED_IMAGE:
-                        int imageSize = parser.getCompressedImageSize();
-                        byte buf[] = new byte[imageSize];
-                        parser.read(buf);
-                        bmp = BitmapFactory.decodeByteArray(buf, 0, imageSize);
-                        break;
-                }
-                event = parser.next();
-            }
-            if (mIsContainCompressedImage) {
-                assertNotNull(getImageTitle(), bmp);
-            }
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
deleted file mode 100644
index 4b5c029..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.graphics.BitmapFactory;
-
-import java.util.List;
-import java.util.Map;
-
-public class ExifReaderTest extends ExifXmlDataTestCase {
-    private static final String TAG = "ExifReaderTest";
-
-    private ExifInterface mInterface;
-    private List<Map<Short, List<String>>> mGroundTruth;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mGroundTruth = ExifXmlReader.readXml(getXmlParser());
-    }
-
-    public ExifReaderTest(int imgRes, int xmlRes) {
-        super(imgRes, xmlRes);
-        mInterface = new ExifInterface();
-    }
-
-    public ExifReaderTest(String imgPath, String xmlPath) {
-        super(imgPath, xmlPath);
-        mInterface = new ExifInterface();
-    }
-
-    @MediumTest
-    public void testRead() throws Exception {
-        try {
-            ExifReader reader = new ExifReader(mInterface);
-            ExifData exifData = reader.read(getImageInputStream());
-            for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
-                checkIfd(exifData.getIfdData(i), mGroundTruth.get(i));
-            }
-            checkThumbnail(exifData);
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-
-    private void checkThumbnail(ExifData exifData) {
-        Map<Short, List<String>> ifd1Truth = mGroundTruth.get(IfdId.TYPE_IFD_1);
-
-        List<String> typeTagValue = ifd1Truth.get(ExifInterface.TAG_COMPRESSION);
-        if (typeTagValue == null)
-            return;
-
-        IfdData ifd1 = exifData.getIfdData(IfdId.TYPE_IFD_1);
-        if (ifd1 == null)
-            fail(getImageTitle() + ": failed to find IFD1");
-
-        String typeTagTruth = typeTagValue.get(0);
-
-        int type = (int) ifd1.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_COMPRESSION))
-                .getValueAt(0);
-
-        if (String.valueOf(ExifInterface.Compression.JPEG).equals(typeTagTruth)) {
-            assertTrue(getImageTitle(), type == ExifInterface.Compression.JPEG);
-            assertTrue(getImageTitle(), exifData.hasCompressedThumbnail());
-            byte[] thumbnail = exifData.getCompressedThumbnail();
-            assertTrue(getImageTitle(),
-                    BitmapFactory.decodeByteArray(thumbnail, 0, thumbnail.length) != null);
-        } else if (String.valueOf(ExifInterface.Compression.UNCOMPRESSION).equals(typeTagTruth)) {
-            assertTrue(getImageTitle(), type == ExifInterface.Compression.UNCOMPRESSION);
-            // Try to check the strip count with the formula provided by EXIF spec.
-            int planarType = ExifInterface.PlanarConfiguration.CHUNKY;
-            ExifTag planarTag = ifd1.getTag(ExifInterface
-                    .getTrueTagKey(ExifInterface.TAG_PLANAR_CONFIGURATION));
-            if (planarTag != null) {
-                planarType = (int) planarTag.getValueAt(0);
-            }
-
-            if (!ifd1Truth.containsKey(ExifInterface.TAG_IMAGE_LENGTH) ||
-                    !ifd1Truth.containsKey(ExifInterface.TAG_ROWS_PER_STRIP)) {
-                return;
-            }
-
-            ExifTag heightTag = ifd1.getTag(ExifInterface
-                    .getTrueTagKey(ExifInterface.TAG_IMAGE_LENGTH));
-            ExifTag rowPerStripTag = ifd1.getTag(ExifInterface
-                    .getTrueTagKey(ExifInterface.TAG_ROWS_PER_STRIP));
-
-            // Fail the test if required tags are missing
-            if (heightTag == null || rowPerStripTag == null) {
-                fail(getImageTitle());
-            }
-
-            int imageLength = (int) heightTag.getValueAt(0);
-            int rowsPerStrip = (int) rowPerStripTag.getValueAt(0);
-            int stripCount = ifd1.getTag(
-                    ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS))
-                    .getComponentCount();
-
-            if (planarType == ExifInterface.PlanarConfiguration.CHUNKY) {
-                assertTrue(getImageTitle(),
-                        stripCount == (imageLength + rowsPerStrip - 1) / rowsPerStrip);
-            } else {
-                if (!ifd1Truth.containsKey(ExifInterface.TAG_SAMPLES_PER_PIXEL)) {
-                    return;
-                }
-                ExifTag samplePerPixelTag = ifd1.getTag(ExifInterface
-                        .getTrueTagKey(ExifInterface.TAG_SAMPLES_PER_PIXEL));
-                int samplePerPixel = (int) samplePerPixelTag.getValueAt(0);
-                assertTrue(getImageTitle(),
-                        stripCount ==
-                        (imageLength + rowsPerStrip - 1) / rowsPerStrip * samplePerPixel);
-            }
-
-            if (!ifd1Truth.containsKey(ExifInterface.TAG_STRIP_BYTE_COUNTS)) {
-                return;
-            }
-            ExifTag byteCountTag = ifd1.getTag(ExifInterface
-                    .getTrueTagKey(ExifInterface.TAG_STRIP_BYTE_COUNTS));
-            short byteCountDataType = byteCountTag.getDataType();
-            for (int i = 0; i < stripCount; i++) {
-                if (byteCountDataType == ExifTag.TYPE_UNSIGNED_SHORT) {
-                    assertEquals(getImageTitle(),
-                            byteCountTag.getValueAt(i), exifData.getStrip(i).length);
-                } else {
-                    assertEquals(getImageTitle(),
-                            byteCountTag.getValueAt(i), exifData.getStrip(i).length);
-                }
-            }
-        }
-    }
-
-    private void checkIfd(IfdData ifd, Map<Short, List<String>> ifdValue) {
-        if (ifd == null) {
-            assertEquals(getImageTitle(), 0, ifdValue.size());
-            return;
-        }
-        ExifTag[] tags = ifd.getAllTags();
-        for (ExifTag tag : tags) {
-            List<String> truth = ifdValue.get(tag.getTagId());
-            assertNotNull(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(), truth);
-            if (truth.contains(null)) {
-                continue;
-            }
-            assertTrue(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(),
-                    truth.contains(Util.tagValueToString(tag).trim()));
-        }
-        assertEquals(getImageTitle(), ifdValue.size(), tags.length);
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifTagTest.java b/tests/src/com/android/gallery3d/exif/ExifTagTest.java
deleted file mode 100644
index e6a41ec..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifTagTest.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import android.test.suitebuilder.annotation.SmallTest;
-
-import junit.framework.TestCase;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ExifTagTest extends TestCase {
-
-    private static long MAX_UNSIGNED_LONG = (1L << 32) - 1;
-    private static int MAX_LONG = Integer.MAX_VALUE;
-    private static int MIN_LONG = Integer.MIN_VALUE;
-
-    Map<Integer, ExifTag> mTestTags;
-    ExifInterface mInterface;
-    private ExifTag mVersionTag;
-    private ExifTag mGpsVersionTag;
-    private ExifTag mModelTag;
-    private ExifTag mDateTimeTag;
-    private ExifTag mCompressionTag;
-    private ExifTag mThumbnailFormatTag;
-    private ExifTag mLongitudeTag;
-    private ExifTag mShutterTag;
-    private ExifTag mInteropIndex;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mInterface = new ExifInterface();
-
-        // TYPE_UNDEFINED with 4 components
-        mVersionTag = mInterface.buildTag(ExifInterface.TAG_EXIF_VERSION, new byte[] {
-                5, 4, 3, 2
-        });
-        // TYPE_UNSIGNED_BYTE with 4 components
-        mGpsVersionTag = mInterface.buildTag(ExifInterface.TAG_GPS_VERSION_ID, new byte[] {
-                6, 7, 8, 9
-        });
-        // TYPE ASCII with arbitrary length
-        mModelTag = mInterface.buildTag(ExifInterface.TAG_MODEL, "helloworld");
-        // TYPE_ASCII with 20 components
-        mDateTimeTag = mInterface.buildTag(ExifInterface.TAG_DATE_TIME, "2013:02:11 20:20:20");
-        // TYPE_UNSIGNED_SHORT with 1 components
-        mCompressionTag = mInterface.buildTag(ExifInterface.TAG_COMPRESSION, 100);
-        // TYPE_UNSIGNED_LONG with 1 components
-        mThumbnailFormatTag =
-                mInterface.buildTag(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, 100);
-        // TYPE_UNSIGNED_RATIONAL with 3 components
-        mLongitudeTag = mInterface.buildTag(ExifInterface.TAG_GPS_LONGITUDE, new Rational[] {
-                new Rational(2, 2), new Rational(11, 11),
-                new Rational(102, 102)
-        });
-        // TYPE_RATIONAL with 1 components
-        mShutterTag = mInterface
-                .buildTag(ExifInterface.TAG_SHUTTER_SPEED_VALUE, new Rational(4, 6));
-        // TYPE_ASCII with arbitrary length
-        mInteropIndex = mInterface.buildTag(ExifInterface.TAG_INTEROPERABILITY_INDEX, "foo");
-
-        mTestTags = new HashMap<Integer, ExifTag>();
-
-        mTestTags.put(ExifInterface.TAG_EXIF_VERSION, mVersionTag);
-        mTestTags.put(ExifInterface.TAG_GPS_VERSION_ID, mGpsVersionTag);
-        mTestTags.put(ExifInterface.TAG_MODEL, mModelTag);
-        mTestTags.put(ExifInterface.TAG_DATE_TIME, mDateTimeTag);
-        mTestTags.put(ExifInterface.TAG_COMPRESSION, mCompressionTag);
-        mTestTags.put(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, mThumbnailFormatTag);
-        mTestTags.put(ExifInterface.TAG_GPS_LONGITUDE, mLongitudeTag);
-        mTestTags.put(ExifInterface.TAG_SHUTTER_SPEED_VALUE, mShutterTag);
-        mTestTags.put(ExifInterface.TAG_INTEROPERABILITY_INDEX, mInteropIndex);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        mInterface = null;
-        mTestTags = null;
-    }
-
-    @SmallTest
-    public void testValueType() {
-        for (ExifTag tag : mTestTags.values()) {
-            assertTrue(tag != null);
-            int count = tag.getComponentCount();
-            int intBuf[] = new int[count];
-            long longBuf[] = new long[count];
-            byte byteBuf[] = new byte[count];
-            Rational rationalBuf[] = new Rational[count];
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < count; i++) {
-                intBuf[i] = 0;
-                longBuf[i] = 0;
-                byteBuf[i] = 0;
-                rationalBuf[i] = new Rational(0, 0);
-                // The string size should equal to component count - 1
-                if (i != count - 1) {
-                    sb.append("*");
-                } else {
-                    sb.append("\0");
-                }
-            }
-            String strBuf = sb.toString();
-
-            checkTypeByte(tag, byteBuf);
-            checkTypeAscii(tag, strBuf);
-            checkTypeUnsignedShort(tag, intBuf);
-            checkTypeUnsignedLong(tag, intBuf, longBuf);
-            checkTypeLong(tag, intBuf);
-            checkTypeRational(tag, rationalBuf);
-            checkTypeUnsignedRational(tag, rationalBuf);
-        }
-    }
-
-    private void checkTypeByte(ExifTag tag, byte[] buf) {
-        short type = tag.getDataType();
-        assertFalse("\nTag: " + tag.toString(), tag.setValue(buf)
-                ^ (type == ExifTag.TYPE_UNDEFINED || type == ExifTag.TYPE_UNSIGNED_BYTE));
-    }
-
-    private void checkTypeAscii(ExifTag tag, String str) {
-        short type = tag.getDataType();
-        assertFalse("\nTag: " + tag.toString(), tag.setValue(str)
-                ^ (type == ExifTag.TYPE_ASCII || type == ExifTag.TYPE_UNDEFINED));
-    }
-
-    private void checkTypeUnsignedShort(ExifTag tag, int[] intBuf) {
-        short type = tag.getDataType();
-        assertFalse("\nTag: " + tag.toString(),
-                tag.setValue(intBuf)
-                        ^ (type == ExifTag.TYPE_UNSIGNED_SHORT
-                                || type == ExifTag.TYPE_UNSIGNED_LONG
-                                || type == ExifTag.TYPE_LONG));
-    }
-
-    private void checkTypeUnsignedLong(ExifTag tag, int[] intBuf, long[] longBuf) {
-
-        // Test value only for unsigned long.
-        int count = intBuf.length;
-        intBuf[count - 1] = MAX_LONG;
-        tag.setValue(intBuf);
-        longBuf[count - 1] = MAX_UNSIGNED_LONG;
-
-        assertFalse("\nTag: " + tag.toString(), tag.setValue(longBuf)
-                ^ (tag.getDataType() == ExifTag.TYPE_UNSIGNED_LONG));
-
-        intBuf[count - 1] = 0;
-        // Test invalid value for all type.
-        longBuf[count - 1] = MAX_UNSIGNED_LONG + 1;
-        assertFalse(tag.setValue(longBuf));
-        longBuf[count - 1] = 0;
-    }
-
-    private void checkTypeLong(ExifTag tag, int[] intBuf) {
-        int count = intBuf.length;
-        intBuf[count - 1] = MAX_LONG;
-        tag.setValue(intBuf);
-        intBuf[count - 1] = MIN_LONG;
-
-        assertFalse("\nTag: " + tag.toString(), tag.setValue(intBuf)
-                ^ (tag.getDataType() == ExifTag.TYPE_LONG));
-        intBuf[count - 1] = 0;
-    }
-
-    private void checkTypeRational(ExifTag tag, Rational rationalBuf[]) {
-        int count = rationalBuf.length;
-        Rational r = rationalBuf[count - 1];
-        rationalBuf[count - 1] = new Rational(MAX_LONG, MIN_LONG);
-
-        assertFalse("\nTag: " + tag.toString(), tag.setValue(rationalBuf)
-                ^ (tag.getDataType() == ExifTag.TYPE_RATIONAL));
-
-        if (tag.getDataType() == ExifTag.TYPE_RATIONAL) {
-            // check overflow
-
-            rationalBuf[count - 1] = new Rational(MAX_LONG + 1L, MIN_LONG);
-            assertFalse(tag.setValue(rationalBuf));
-
-            rationalBuf[count - 1] = new Rational(MAX_LONG, MIN_LONG - 1L);
-            assertFalse(tag.setValue(rationalBuf));
-        }
-        rationalBuf[count - 1] = r;
-    }
-
-    private void checkTypeUnsignedRational(ExifTag tag, Rational rationalBuf[]) {
-        int count = rationalBuf.length;
-        Rational r = rationalBuf[count - 1];
-        rationalBuf[count - 1] = new Rational(MAX_UNSIGNED_LONG, MAX_UNSIGNED_LONG);
-
-        assertFalse("\nTag: " + tag.toString(), tag.setValue(rationalBuf)
-                ^ (tag.getDataType() == ExifTag.TYPE_UNSIGNED_RATIONAL));
-
-        if (tag.getDataType() == ExifTag.TYPE_UNSIGNED_RATIONAL) {
-            // check overflow
-            rationalBuf[count - 1] = new Rational(MAX_UNSIGNED_LONG + 1, 0);
-            assertFalse(tag.setValue(rationalBuf));
-
-            rationalBuf[count - 1] = new Rational(MAX_UNSIGNED_LONG, -1);
-            assertFalse(tag.setValue(rationalBuf));
-        }
-        rationalBuf[count - 1] = r;
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifTestRunner.java b/tests/src/com/android/gallery3d/exif/ExifTestRunner.java
deleted file mode 100644
index 162baea..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifTestRunner.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import android.content.Context;
-import android.os.Environment;
-import android.test.InstrumentationTestRunner;
-import android.test.InstrumentationTestSuite;
-import android.util.Log;
-
-import com.android.gallery3d.tests.R;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ExifTestRunner extends InstrumentationTestRunner {
-    private static final String TAG = "ExifTestRunner";
-
-    private static final int[] IMG_RESOURCE = {
-            R.raw.galaxy_nexus
-    };
-
-    private static final int[] EXIF_DATA_RESOURCE = {
-            R.xml.galaxy_nexus
-    };
-
-    private static List<String> mTestImgPath = new ArrayList<String>();
-    private static List<String> mTestXmlPath = new ArrayList<String>();
-
-    @Override
-    public TestSuite getAllTests() {
-        getTestImagePath();
-        TestSuite suite = new InstrumentationTestSuite(this);
-        suite.addTestSuite(ExifDataTest.class);
-        suite.addTestSuite(ExifTagTest.class);
-        addAllTestsFromExifTestCase(ExifParserTest.class, suite);
-        addAllTestsFromExifTestCase(ExifReaderTest.class, suite);
-        addAllTestsFromExifTestCase(ExifOutputStreamTest.class, suite);
-        addAllTestsFromExifTestCase(ExifModifierTest.class, suite);
-        addAllTestsFromExifTestCase(ExifInterfaceTest.class, suite);
-        return suite;
-    }
-
-    private void getTestImagePath() {
-        Context context = getContext();
-        File imgDir = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES);
-        File xmlDir = new File(context.getExternalFilesDir(null).getPath(), "Xml");
-
-        if (imgDir != null && xmlDir != null) {
-            String[] imgs = imgDir.list();
-            if (imgs == null) {
-                return;
-            }
-            for (String imgName : imgs) {
-                String xmlName = imgName.substring(0, imgName.lastIndexOf('.')) + ".xml";
-                File xmlFile = new File(xmlDir, xmlName);
-                if (xmlFile.exists()) {
-                    mTestImgPath.add(new File(imgDir, imgName).getAbsolutePath());
-                    mTestXmlPath.add(xmlFile.getAbsolutePath());
-                }
-            }
-        }
-    }
-
-    private void addAllTestsFromExifTestCase(Class<? extends ExifXmlDataTestCase> testClass,
-            TestSuite suite) {
-        for (Method method : testClass.getDeclaredMethods()) {
-            if (method.getName().startsWith("test") && method.getParameterTypes().length == 0) {
-                for (int i = 0; i < IMG_RESOURCE.length; i++) {
-                    TestCase test;
-                    try {
-                        test = testClass.getDeclaredConstructor(int.class, int.class).
-                                newInstance(IMG_RESOURCE[i], EXIF_DATA_RESOURCE[i]);
-                        test.setName(method.getName());
-                        suite.addTest(test);
-                    } catch (IllegalArgumentException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (InstantiationException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (IllegalAccessException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (InvocationTargetException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (NoSuchMethodException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    }
-                }
-                for (int i = 0, n = mTestImgPath.size(); i < n; i++) {
-                    TestCase test;
-                    try {
-                        test = testClass.getDeclaredConstructor(String.class, String.class).
-                                newInstance(mTestImgPath.get(i), mTestXmlPath.get(i));
-                        test.setName(method.getName());
-                        suite.addTest(test);
-                    } catch (IllegalArgumentException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (InstantiationException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (IllegalAccessException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (InvocationTargetException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (NoSuchMethodException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public ClassLoader getLoader() {
-        return ExifTestRunner.class.getClassLoader();
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java b/tests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
deleted file mode 100644
index da86020..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import android.content.res.Resources;
-import android.test.InstrumentationTestCase;
-import android.util.Xml;
-
-import org.xmlpull.v1.XmlPullParser;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-public class ExifXmlDataTestCase extends InstrumentationTestCase {
-
-    private static final String RES_ID_TITLE = "Resource ID: %x";
-
-    private InputStream mImageInputStream;
-    private InputStream mXmlInputStream;
-    private XmlPullParser mXmlParser;
-    private final String mImagePath;
-    private final String mXmlPath;
-    private final int mImageResourceId;
-    private final int mXmlResourceId;
-
-    public ExifXmlDataTestCase(int imageRes, int xmlRes) {
-        mImagePath = null;
-        mXmlPath = null;
-        mImageResourceId = imageRes;
-        mXmlResourceId = xmlRes;
-    }
-
-    public ExifXmlDataTestCase(String imagePath, String xmlPath) {
-        mImagePath = imagePath;
-        mXmlPath = xmlPath;
-        mImageResourceId = 0;
-        mXmlResourceId = 0;
-    }
-
-    protected InputStream getImageInputStream() {
-        return mImageInputStream;
-    }
-
-    protected XmlPullParser getXmlParser() {
-        return mXmlParser;
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        try {
-            if (mImagePath != null) {
-                mImageInputStream = new FileInputStream(mImagePath);
-                mXmlInputStream = new FileInputStream(mXmlPath);
-                mXmlParser = Xml.newPullParser();
-                mXmlParser.setInput(new InputStreamReader(mXmlInputStream));
-            } else {
-                Resources res = getInstrumentation().getContext().getResources();
-                mImageInputStream = res.openRawResource(mImageResourceId);
-                mXmlParser = res.getXml(mXmlResourceId);
-            }
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        Util.closeSilently(mImageInputStream);
-        Util.closeSilently(mXmlInputStream);
-        mXmlParser = null;
-    }
-
-    protected String getImageTitle() {
-        if (mImagePath != null) {
-            return mImagePath;
-        } else {
-            return String.format(RES_ID_TITLE, mImageResourceId);
-        }
-    }
-
-    protected InputStream reopenFileStream() throws Exception {
-        try {
-            if (mImagePath != null) {
-                return new FileInputStream(mImagePath);
-            } else {
-                Resources res = getInstrumentation().getContext().getResources();
-                return res.openRawResource(mImageResourceId);
-            }
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/ExifXmlReader.java b/tests/src/com/android/gallery3d/exif/ExifXmlReader.java
deleted file mode 100644
index 12e9cf7..0000000
--- a/tests/src/com/android/gallery3d/exif/ExifXmlReader.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ExifXmlReader {
-    private static final String TAG_EXIF = "exif";
-    private static final String TAG_TAG = "tag";
-
-    private static final String IFD0 = "IFD0";
-    private static final String EXIF_IFD = "ExifIFD";
-    private static final String GPS_IFD = "GPS";
-    private static final String IFD1 = "IFD1";
-    private static final String INTEROP_IFD = "InteropIFD";
-
-    private static final String ATTR_ID = "id";
-    private static final String ATTR_IFD = "ifd";
-
-    private static final String NO_VALUE = "NO_VALUE";
-
-    /**
-     * This function read the ground truth XML.
-     *
-     * @throws XmlPullParserException
-     * @throws IOException
-     */
-    static public List<Map<Short, List<String>>> readXml(XmlPullParser parser)
-            throws XmlPullParserException, IOException {
-
-        List<Map<Short, List<String>>> exifData =
-                new ArrayList<Map<Short, List<String>>>(IfdId.TYPE_IFD_COUNT);
-        for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
-            exifData.add(new HashMap<Short, List<String>>());
-        }
-
-        while (parser.next() != XmlPullParser.END_DOCUMENT) {
-            if (parser.getEventType() == XmlPullParser.START_TAG) {
-                break;
-            }
-        }
-        parser.require(XmlPullParser.START_TAG, null, TAG_EXIF);
-
-        while (parser.next() != XmlPullParser.END_TAG) {
-            if (parser.getEventType() != XmlPullParser.START_TAG) {
-                continue;
-            }
-
-            parser.require(XmlPullParser.START_TAG, null, TAG_TAG);
-
-            int ifdId = getIfdIdFromString(parser.getAttributeValue(null, ATTR_IFD));
-            short id = Integer.decode(parser.getAttributeValue(null, ATTR_ID)).shortValue();
-
-            String value = "";
-            if (parser.next() == XmlPullParser.TEXT) {
-                value = parser.getText();
-                parser.next();
-            }
-
-            if (ifdId < 0) {
-                // TODO: the MarkerNote segment.
-            } else {
-                List<String> tagData = exifData.get(ifdId).get(id);
-                if (tagData == null) {
-                    tagData = new ArrayList<String>();
-                    exifData.get(ifdId).put(id, tagData);
-                }
-                if (NO_VALUE.equals(value)) {
-                    tagData.add(null);
-                } else {
-                    tagData.add(value.trim());
-                }
-            }
-
-            parser.require(XmlPullParser.END_TAG, null, null);
-        }
-        return exifData;
-    }
-
-    static private int getIfdIdFromString(String prefix) {
-        if (IFD0.equals(prefix)) {
-            return IfdId.TYPE_IFD_0;
-        } else if (EXIF_IFD.equals(prefix)) {
-            return IfdId.TYPE_IFD_EXIF;
-        } else if (GPS_IFD.equals(prefix)) {
-            return IfdId.TYPE_IFD_GPS;
-        } else if (IFD1.equals(prefix)) {
-            return IfdId.TYPE_IFD_1;
-        } else if (INTEROP_IFD.equals(prefix)) {
-            return IfdId.TYPE_IFD_INTEROPERABILITY;
-        } else {
-            assert (false);
-            return -1;
-        }
-    }
-
-    static public int getTrueTagNumber(Map<Short, List<String>> ifdData) {
-        int size = 0;
-        for (List<String> tag : ifdData.values()) {
-            size += tag.size();
-        }
-        return size;
-    }
-}
diff --git a/tests/src/com/android/gallery3d/exif/Util.java b/tests/src/com/android/gallery3d/exif/Util.java
deleted file mode 100644
index 15de007..0000000
--- a/tests/src/com/android/gallery3d/exif/Util.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.exif;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-
-class Util {
-    public static boolean equals(Object a, Object b) {
-        return (a == b) || (a == null ? false : a.equals(b));
-    }
-
-    public static void closeSilently(Closeable c) {
-        if (c == null)
-            return;
-        try {
-            c.close();
-        } catch (Throwable t) {
-            // do nothing
-        }
-    }
-
-    public static byte[] readToByteArray(InputStream is) throws IOException {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        int len;
-        byte[] buf = new byte[1024];
-        while ((len = is.read(buf)) > -1) {
-            bos.write(buf, 0, len);
-        }
-        bos.flush();
-        return bos.toByteArray();
-    }
-
-    /**
-     * Tags that are not defined in the spec.
-     */
-    static final short TAG_XP_TITLE = (short) 0x9c9b;
-    static final short TAG_XP_COMMENT = (short) 0x9c9c;
-    static final short TAG_XP_AUTHOR = (short) 0x9c9d;
-    static final short TAG_XP_KEYWORDS = (short) 0x9c9e;
-    static final short TAG_XP_SUBJECT = (short) 0x9c9f;
-
-    private static String tagUndefinedTypeValueToString(ExifTag tag) {
-        StringBuilder sbuilder = new StringBuilder();
-        byte[] buf = new byte[tag.getComponentCount()];
-        tag.getBytes(buf);
-        short tagId = tag.getTagId();
-        if (tagId == ExifInterface.getTrueTagKey(ExifInterface.TAG_COMPONENTS_CONFIGURATION)) {
-            for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                if (i != 0) {
-                    sbuilder.append(" ");
-                }
-                sbuilder.append(buf[i]);
-            }
-        } else {
-            if (buf.length == 1) {
-                sbuilder.append(buf[0]);
-            } else {
-                for (int i = 0, n = buf.length; i < n; i++) {
-                    byte code = buf[i];
-                    if (code == 0) {
-                        continue;
-                    }
-                    if (code > 31 && code < 127) {
-                        sbuilder.append((char) code);
-                    } else {
-                        sbuilder.append('.');
-                    }
-                }
-            }
-        }
-        return sbuilder.toString();
-    }
-
-    /**
-     * Returns a string representation of the value of this tag.
-     */
-    public static String tagValueToString(ExifTag tag) {
-        StringBuilder sbuilder = new StringBuilder();
-        short id = tag.getTagId();
-        switch (tag.getDataType()) {
-            case ExifTag.TYPE_UNDEFINED:
-                sbuilder.append(tagUndefinedTypeValueToString(tag));
-                break;
-            case ExifTag.TYPE_UNSIGNED_BYTE:
-                if (id == ExifInterface.TAG_MAKER_NOTE || id == TAG_XP_TITLE ||
-                        id == TAG_XP_COMMENT || id == TAG_XP_AUTHOR ||
-                        id == TAG_XP_KEYWORDS || id == TAG_XP_SUBJECT) {
-                    sbuilder.append(tagUndefinedTypeValueToString(tag));
-                } else {
-                    byte[] buf = new byte[tag.getComponentCount()];
-                    tag.getBytes(buf);
-                    for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                        if (i != 0)
-                            sbuilder.append(" ");
-                        sbuilder.append(buf[i]);
-                    }
-                }
-                break;
-            case ExifTag.TYPE_ASCII:
-                byte[] buf = tag.getStringByte();
-                for (int i = 0, n = buf.length; i < n; i++) {
-                    byte code = buf[i];
-                    if (code == 0) {
-                        // Treat some tag as undefined type data.
-                        if (id == ExifInterface.TAG_COPYRIGHT
-                                || id == ExifInterface.TAG_GPS_DATE_STAMP) {
-                            continue;
-                        } else {
-                            break;
-                        }
-                    }
-                    if (code > 31 && code < 127) {
-                        sbuilder.append((char) code);
-                    } else {
-                        sbuilder.append('.');
-                    }
-                }
-                break;
-            case ExifTag.TYPE_UNSIGNED_LONG:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    if (i != 0) {
-                        sbuilder.append(" ");
-                    }
-                    sbuilder.append(tag.getValueAt(i));
-                }
-                break;
-            case ExifTag.TYPE_RATIONAL:
-            case ExifTag.TYPE_UNSIGNED_RATIONAL:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    Rational r = tag.getRational(i);
-                    if (i != 0) {
-                        sbuilder.append(" ");
-                    }
-                    sbuilder.append(r.getNumerator()).append("/").append(r.getDenominator());
-                }
-                break;
-            case ExifTag.TYPE_UNSIGNED_SHORT:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    if (i != 0) {
-                        sbuilder.append(" ");
-                    }
-                    sbuilder.append((int) tag.getValueAt(i));
-                }
-                break;
-            case ExifTag.TYPE_LONG:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    if (i != 0) {
-                        sbuilder.append(" ");
-                    }
-                    sbuilder.append((int) tag.getValueAt(i));
-                }
-                break;
-        }
-        return sbuilder.toString();
-    }
-
-    public static String valueToString(Object obj) {
-        if (obj instanceof int[]) {
-            return Arrays.toString((int[]) obj);
-        } else if (obj instanceof Integer[]) {
-            return Arrays.toString((Integer[]) obj);
-        } else if (obj instanceof long[]) {
-            return Arrays.toString((long[]) obj);
-        } else if (obj instanceof Long[]) {
-            return Arrays.toString((Long[]) obj);
-        } else if (obj instanceof Rational) {
-            return ((Rational) obj).toString();
-        } else if (obj instanceof Rational[]) {
-            return Arrays.toString((Rational[]) obj);
-        } else if (obj instanceof byte[]) {
-            return Arrays.toString((byte[]) obj);
-        } else if (obj != null) {
-            return obj.toString();
-        }
-        return "";
-    }
-}
diff --git a/tests/src/com/android/gallery3d/glrenderer/GLCanvasMock.java b/tests/src/com/android/gallery3d/glrenderer/GLCanvasMock.java
deleted file mode 100644
index a57c188..0000000
--- a/tests/src/com/android/gallery3d/glrenderer/GLCanvasMock.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.glrenderer;
-
-import com.android.gallery3d.glrenderer.BasicTexture;
-import com.android.gallery3d.ui.GLCanvasStub;
-
-import javax.microedition.khronos.opengles.GL11;
-
-public class GLCanvasMock extends GLCanvasStub {
-    // fillRect
-    int mFillRectCalled;
-    float mFillRectWidth;
-    float mFillRectHeight;
-    int mFillRectColor;
-    // drawMixed
-    int mDrawMixedCalled;
-    float mDrawMixedRatio;
-    // drawTexture;
-    int mDrawTextureCalled;
-
-    private GL11 mGL;
-
-    public GLCanvasMock(GL11 gl) {
-        mGL = gl;
-    }
-
-    public GLCanvasMock() {
-        mGL = new GLStub();
-    }
-
-    @Override
-    public GL11 getGLInstance() {
-        return mGL;
-    }
-
-    @Override
-    public void fillRect(float x, float y, float width, float height, int color) {
-        mFillRectCalled++;
-        mFillRectWidth = width;
-        mFillRectHeight = height;
-        mFillRectColor = color;
-    }
-
-    @Override
-    public void drawTexture(
-                BasicTexture texture, int x, int y, int width, int height) {
-        mDrawTextureCalled++;
-    }
-
-    @Override
-    public void drawMixed(BasicTexture from, BasicTexture to,
-            float ratio, int x, int y, int w, int h) {
-        mDrawMixedCalled++;
-        mDrawMixedRatio = ratio;
-    }
-}
diff --git a/tests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java b/tests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
deleted file mode 100644
index 416c114..0000000
--- a/tests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.glrenderer;
-
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
-
-import junit.framework.TestCase;
-
-import java.util.Arrays;
-
-import javax.microedition.khronos.opengles.GL10;
-import javax.microedition.khronos.opengles.GL11;
-
-public class GLCanvasTest extends TestCase {
-    private static final String TAG = "GLCanvasTest";
-
-    private static GLPaint newColorPaint(int color) {
-        GLPaint paint = new GLPaint();
-        paint.setColor(color);
-        return paint;
-    }
-
-    @SmallTest
-    public void testSetSize() {
-        GL11 glStub = new GLStub();
-        GLCanvas canvas = new GLES11Canvas(glStub);
-        canvas.setSize(100, 200);
-        canvas.setSize(1000, 100);
-        try {
-            canvas.setSize(-1, 100);
-            fail();
-        } catch (Throwable ex) {
-            // expected.
-        }
-    }
-
-    @SmallTest
-    public void testClearBuffer() {
-        new ClearBufferTest().run();
-    }
-
-    private static class ClearBufferTest extends GLMock {
-        void run() {
-            GLCanvas canvas = new GLES11Canvas(this);
-            assertEquals(0, mGLClearCalled);
-            canvas.clearBuffer();
-            assertEquals(GL10.GL_COLOR_BUFFER_BIT, mGLClearMask);
-            assertEquals(1, mGLClearCalled);
-        }
-    }
-
-    @SmallTest
-    public void testSetColor() {
-        new SetColorTest().run();
-    }
-
-    // This test assumes we use pre-multipled alpha blending and should
-    // set the blending function and color correctly.
-    private static class SetColorTest extends GLMock {
-        void run() {
-            int[] testColors = new int[] {
-                0, 0xFFFFFFFF, 0xFF000000, 0x00FFFFFF, 0x80FF8001,
-                0x7F010101, 0xFEFEFDFC, 0x017F8081, 0x027F8081, 0x2ADE4C4D
-            };
-
-            GLCanvas canvas = new GLES11Canvas(this);
-            canvas.setSize(400, 300);
-            // Test one color to make sure blend function is set.
-            assertEquals(0, mGLColorCalled);
-            canvas.drawLine(0, 0, 1, 1, newColorPaint(0x7F804020));
-            assertEquals(1, mGLColorCalled);
-            assertEquals(0x7F402010, mGLColor);
-            assertPremultipliedBlending(this);
-
-            // Test other colors to make sure premultiplication is right
-            for (int c : testColors) {
-                float a = (c >>> 24) / 255f;
-                float r = ((c >> 16) & 0xff) / 255f;
-                float g = ((c >> 8) & 0xff) / 255f;
-                float b = (c & 0xff) / 255f;
-                int pre = makeColor4f(a * r, a * g, a * b, a);
-
-                mGLColorCalled = 0;
-                canvas.drawLine(0, 0, 1, 1, newColorPaint(c));
-                assertEquals(1, mGLColorCalled);
-                assertEquals(pre, mGLColor);
-            }
-        }
-    }
-
-    @SmallTest
-    public void testSetGetMultiplyAlpha() {
-        GL11 glStub = new GLStub();
-        GLCanvas canvas = new GLES11Canvas(glStub);
-
-        canvas.setAlpha(1f);
-        assertEquals(1f, canvas.getAlpha());
-
-        canvas.setAlpha(0f);
-        assertEquals(0f, canvas.getAlpha());
-
-        canvas.setAlpha(0.5f);
-        assertEquals(0.5f, canvas.getAlpha());
-
-        canvas.multiplyAlpha(0.5f);
-        assertEquals(0.25f, canvas.getAlpha());
-
-        canvas.multiplyAlpha(0f);
-        assertEquals(0f, canvas.getAlpha());
-
-        try {
-            canvas.setAlpha(-0.01f);
-            fail();
-        } catch (Throwable ex) {
-            // expected.
-        }
-
-        try {
-            canvas.setAlpha(1.01f);
-            fail();
-        } catch (Throwable ex) {
-            // expected.
-        }
-    }
-
-    @SmallTest
-    public void testAlpha() {
-        new AlphaTest().run();
-    }
-
-    private static class AlphaTest extends GLMock {
-        void run() {
-            GLCanvas canvas = new GLES11Canvas(this);
-            canvas.setSize(400, 300);
-
-            assertEquals(0, mGLColorCalled);
-            canvas.setAlpha(0.48f);
-            canvas.drawLine(0, 0, 1, 1, newColorPaint(0xFF804020));
-            assertPremultipliedBlending(this);
-            assertEquals(1, mGLColorCalled);
-            assertEquals(0x7A3D1F0F, mGLColor);
-        }
-    }
-
-    @SmallTest
-    public void testDrawLine() {
-        new DrawLineTest().run();
-    }
-
-    // This test assumes the drawLine() function use glDrawArrays() with
-    // GL_LINE_STRIP mode to draw the line and the input coordinates are used
-    // directly.
-    private static class DrawLineTest extends GLMock {
-        private int mDrawArrayCalled = 0;
-        private final int[] mResult = new int[4];
-
-        @Override
-        public void glDrawArrays(int mode, int first, int count) {
-            assertNotNull(mGLVertexPointer);
-            assertEquals(GL10.GL_LINE_STRIP, mode);
-            assertEquals(2, count);
-            mGLVertexPointer.bindByteBuffer();
-
-            double[] coord = new double[4];
-            mGLVertexPointer.getArrayElement(first, coord);
-            mResult[0] = (int) coord[0];
-            mResult[1] = (int) coord[1];
-            mGLVertexPointer.getArrayElement(first + 1, coord);
-            mResult[2] = (int) coord[0];
-            mResult[3] = (int) coord[1];
-            mDrawArrayCalled++;
-        }
-
-        void run() {
-            GLCanvas canvas = new GLES11Canvas(this);
-            canvas.setSize(400, 300);
-            canvas.drawLine(2, 7, 1, 8, newColorPaint(0) /* color */);
-            assertTrue(mGLVertexArrayEnabled);
-            assertEquals(1, mDrawArrayCalled);
-
-            Log.v(TAG, "result = " + Arrays.toString(mResult));
-            int[] answer = new int[] {2, 7, 1, 8};
-            for (int i = 0; i < answer.length; i++) {
-                assertEquals(answer[i], mResult[i]);
-            }
-        }
-    }
-
-    @SmallTest
-    public void testFillRect() {
-        new FillRectTest().run();
-    }
-
-    // This test assumes the drawLine() function use glDrawArrays() with
-    // GL_TRIANGLE_STRIP mode to draw the line and the input coordinates
-    // are used directly.
-    private static class FillRectTest extends GLMock {
-        private int mDrawArrayCalled = 0;
-        private final int[] mResult = new int[8];
-
-        @Override
-        public void glDrawArrays(int mode, int first, int count) {
-            assertNotNull(mGLVertexPointer);
-            assertEquals(GL10.GL_TRIANGLE_STRIP, mode);
-            assertEquals(4, count);
-            mGLVertexPointer.bindByteBuffer();
-
-            double[] coord = new double[4];
-            for (int i = 0; i < 4; i++) {
-                mGLVertexPointer.getArrayElement(first + i, coord);
-                mResult[i * 2 + 0] = (int) coord[0];
-                mResult[i * 2 + 1] = (int) coord[1];
-            }
-
-            mDrawArrayCalled++;
-        }
-
-        void run() {
-            GLCanvas canvas = new GLES11Canvas(this);
-            canvas.setSize(400, 300);
-            canvas.fillRect(2, 7, 1, 8, 0 /* color */);
-            assertTrue(mGLVertexArrayEnabled);
-            assertEquals(1, mDrawArrayCalled);
-            Log.v(TAG, "result = " + Arrays.toString(mResult));
-
-            // These are the four vertics that should be used.
-            int[] answer = new int[] {
-                2, 7,
-                3, 7,
-                3, 15,
-                2, 15};
-            int count[] = new int[4];
-
-            // Count the number of appearances for each vertex.
-            for (int i = 0; i < 4; i++) {
-                for (int j = 0; j < 4; j++) {
-                    if (answer[i * 2] == mResult[j * 2] &&
-                        answer[i * 2 + 1] == mResult[j * 2 + 1]) {
-                        count[i]++;
-                    }
-                }
-            }
-
-            // Each vertex should appear exactly once.
-            for (int i = 0; i < 4; i++) {
-                assertEquals(1, count[i]);
-            }
-        }
-    }
-
-    @SmallTest
-    public void testTransform() {
-        new TransformTest().run();
-    }
-
-    // This test assumes glLoadMatrixf is used to load the model view matrix,
-    // and glOrthof is used to load the projection matrix.
-    //
-    // The projection matrix is set to an orthogonal projection which is the
-    // inverse of viewport transform. So the model view matrix maps input
-    // directly to screen coordinates (default no scaling, and the y-axis is
-    // reversed).
-    //
-    // The matrix here are all listed in column major order.
-    //
-    private static class TransformTest extends GLMock {
-        private final float[] mModelViewMatrixUsed = new float[16];
-        private final float[] mProjectionMatrixUsed = new float[16];
-
-        @Override
-        public void glDrawArrays(int mode, int first, int count) {
-            copy(mModelViewMatrixUsed, mGLModelViewMatrix);
-            copy(mProjectionMatrixUsed, mGLProjectionMatrix);
-        }
-
-        private void copy(float[] dest, float[] src) {
-            System.arraycopy(src, 0, dest, 0, 16);
-        }
-
-        void run() {
-            GLCanvas canvas = new GLES11Canvas(this);
-            canvas.setSize(40, 50);
-            int color = 0;
-
-            // Initial matrix
-            canvas.drawLine(0, 0, 1, 1, newColorPaint(color));
-            assertMatrixEq(new float[] {
-                    1,  0, 0, 0,
-                    0, -1, 0, 0,
-                    0,  0, 1, 0,
-                    0, 50, 0, 1
-                    }, mModelViewMatrixUsed);
-
-            assertMatrixEq(new float[] {
-                    2f / 40,       0,  0, 0,
-                          0, 2f / 50,  0, 0,
-                          0,       0, -1, 0,
-                         -1,      -1,  0, 1
-                    }, mProjectionMatrixUsed);
-
-            // Translation
-            canvas.translate(3, 4, 5);
-            canvas.drawLine(0, 0, 1, 1, newColorPaint(color));
-            assertMatrixEq(new float[] {
-                    1,  0, 0, 0,
-                    0, -1, 0, 0,
-                    0,  0, 1, 0,
-                    3, 46, 5, 1
-                    }, mModelViewMatrixUsed);
-            canvas.save();
-
-            // Scaling
-            canvas.scale(0.7f, 0.6f, 0.5f);
-            canvas.drawLine(0, 0, 1, 1, newColorPaint(color));
-            assertMatrixEq(new float[] {
-                    0.7f,     0,    0, 0,
-                    0,    -0.6f,    0, 0,
-                    0,        0, 0.5f, 0,
-                    3,       46,    5, 1
-                    }, mModelViewMatrixUsed);
-
-            // Rotation
-            canvas.rotate(90, 0, 0, 1);
-            canvas.drawLine(0, 0, 1, 1, newColorPaint(color));
-            assertMatrixEq(new float[] {
-                        0, -0.6f,    0, 0,
-                    -0.7f,     0,    0, 0,
-                        0,     0, 0.5f, 0,
-                        3,    46,    5, 1
-                    }, mModelViewMatrixUsed);
-            canvas.restore();
-
-            // After restoring to the point just after translation,
-            // do rotation again.
-            canvas.rotate(180, 1, 0, 0);
-            canvas.drawLine(0, 0, 1, 1, newColorPaint(color));
-            assertMatrixEq(new float[] {
-                    1,  0,  0, 0,
-                    0,  1,  0, 0,
-                    0,  0, -1, 0,
-                    3, 46,  5, 1
-                    }, mModelViewMatrixUsed);
-        }
-    }
-
-    private static void assertPremultipliedBlending(GLMock mock) {
-        assertTrue(mock.mGLBlendFuncCalled > 0);
-        assertTrue(mock.mGLBlendEnabled);
-        assertEquals(GL11.GL_ONE, mock.mGLBlendFuncSFactor);
-        assertEquals(GL11.GL_ONE_MINUS_SRC_ALPHA, mock.mGLBlendFuncDFactor);
-    }
-
-    private static void assertMatrixEq(float[] expected, float[] actual) {
-        try {
-            for (int i = 0; i < 16; i++) {
-                assertFloatEq(expected[i], actual[i]);
-            }
-        } catch (Throwable t) {
-            Log.v(TAG, "expected = " + Arrays.toString(expected) +
-                    ", actual = " + Arrays.toString(actual));
-            fail();
-        }
-    }
-
-    public static void assertFloatEq(float expected, float actual) {
-        if (Math.abs(actual - expected) > 1e-6) {
-            Log.v(TAG, "expected: " + expected + ", actual: " + actual);
-            fail();
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/glrenderer/GLMock.java b/tests/src/com/android/gallery3d/glrenderer/GLMock.java
deleted file mode 100644
index b242217..0000000
--- a/tests/src/com/android/gallery3d/glrenderer/GLMock.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.glrenderer;
-
-import com.android.gallery3d.ui.PointerInfo;
-
-import java.nio.Buffer;
-import java.util.HashMap;
-import javax.microedition.khronos.opengles.GL10;
-import javax.microedition.khronos.opengles.GL11;
-
-public class GLMock extends GLStub {
-    @SuppressWarnings("unused")
-    private static final String TAG = "GLMock";
-
-    // glClear
-    int mGLClearCalled;
-    int mGLClearMask;
-    // glBlendFunc
-    int mGLBlendFuncCalled;
-    int mGLBlendFuncSFactor;
-    int mGLBlendFuncDFactor;
-    // glColor4[fx]
-    int mGLColorCalled;
-    int mGLColor;
-    // glEnable, glDisable
-    boolean mGLBlendEnabled;
-    boolean mGLStencilEnabled;
-    // glEnableClientState
-    boolean mGLVertexArrayEnabled;
-    // glVertexPointer
-    PointerInfo mGLVertexPointer;
-    // glMatrixMode
-    int mGLMatrixMode = GL10.GL_MODELVIEW;
-    // glLoadMatrixf
-    float[] mGLModelViewMatrix = new float[16];
-    float[] mGLProjectionMatrix = new float[16];
-    // glBindTexture
-    int mGLBindTextureId;
-    // glTexEnvf
-    HashMap<Integer, Float> mGLTexEnv0 = new HashMap<Integer, Float>();
-    HashMap<Integer, Float> mGLTexEnv1 = new HashMap<Integer, Float>();
-    // glActiveTexture
-    int mGLActiveTexture = GL11.GL_TEXTURE0;
-
-    @Override
-    public void glClear(int mask) {
-        mGLClearCalled++;
-        mGLClearMask = mask;
-    }
-
-    @Override
-    public void glBlendFunc(int sfactor, int dfactor) {
-        mGLBlendFuncSFactor = sfactor;
-        mGLBlendFuncDFactor = dfactor;
-        mGLBlendFuncCalled++;
-    }
-
-    @Override
-    public void glColor4f(float red, float green, float blue,
-        float alpha) {
-        mGLColorCalled++;
-        mGLColor = makeColor4f(red, green, blue, alpha);
-    }
-
-    @Override
-    public void glColor4x(int red, int green, int blue, int alpha) {
-        mGLColorCalled++;
-        mGLColor = makeColor4x(red, green, blue, alpha);
-    }
-
-    @Override
-    public void glEnable(int cap) {
-        if (cap == GL11.GL_BLEND) {
-            mGLBlendEnabled = true;
-        } else if (cap == GL11.GL_STENCIL_TEST) {
-            mGLStencilEnabled = true;
-        }
-    }
-
-    @Override
-    public void glDisable(int cap) {
-        if (cap == GL11.GL_BLEND) {
-            mGLBlendEnabled = false;
-        } else if (cap == GL11.GL_STENCIL_TEST) {
-            mGLStencilEnabled = false;
-        }
-    }
-
-    @Override
-    public void glEnableClientState(int array) {
-        if (array == GL10.GL_VERTEX_ARRAY) {
-           mGLVertexArrayEnabled = true;
-        }
-    }
-
-    @Override
-    public void glVertexPointer(int size, int type, int stride, Buffer pointer) {
-        mGLVertexPointer = new PointerInfo(size, type, stride, pointer);
-    }
-
-    @Override
-    public void glMatrixMode(int mode) {
-        mGLMatrixMode = mode;
-    }
-
-    @Override
-    public void glLoadMatrixf(float[] m, int offset) {
-        if (mGLMatrixMode == GL10.GL_MODELVIEW) {
-            System.arraycopy(m, offset, mGLModelViewMatrix, 0, 16);
-        } else if (mGLMatrixMode == GL10.GL_PROJECTION) {
-            System.arraycopy(m, offset, mGLProjectionMatrix, 0, 16);
-        }
-    }
-
-    @Override
-    public void glOrthof(
-        float left, float right, float bottom, float top,
-        float zNear, float zFar) {
-        float tx = -(right + left) / (right - left);
-        float ty = -(top + bottom) / (top - bottom);
-            float tz = - (zFar + zNear) / (zFar - zNear);
-            float[] m = new float[] {
-                    2 / (right - left), 0, 0,  0,
-                    0, 2 / (top - bottom), 0,  0,
-                    0, 0, -2 / (zFar - zNear), 0,
-                    tx, ty, tz, 1
-            };
-            glLoadMatrixf(m, 0);
-    }
-
-    @Override
-    public void glBindTexture(int target, int texture) {
-        if (target == GL11.GL_TEXTURE_2D) {
-            mGLBindTextureId = texture;
-        }
-    }
-
-    @Override
-    public void glTexEnvf(int target, int pname, float param) {
-        if (target == GL11.GL_TEXTURE_ENV) {
-            if (mGLActiveTexture == GL11.GL_TEXTURE0) {
-                mGLTexEnv0.put(pname, param);
-            } else if (mGLActiveTexture == GL11.GL_TEXTURE1) {
-                mGLTexEnv1.put(pname, param);
-            } else {
-                throw new AssertionError();
-            }
-        }
-    }
-
-    public int getTexEnvi(int pname) {
-        return getTexEnvi(mGLActiveTexture, pname);
-    }
-
-    public int getTexEnvi(int activeTexture, int pname) {
-        if (activeTexture == GL11.GL_TEXTURE0) {
-            return (int) mGLTexEnv0.get(pname).floatValue();
-        } else if (activeTexture == GL11.GL_TEXTURE1) {
-            return (int) mGLTexEnv1.get(pname).floatValue();
-        } else {
-            throw new AssertionError();
-        }
-    }
-
-    @Override
-    public void glActiveTexture(int texture) {
-        mGLActiveTexture = texture;
-    }
-
-    public static int makeColor4f(float red, float green, float blue,
-            float alpha) {
-        return (Math.round(alpha * 255) << 24) |
-                (Math.round(red * 255) << 16) |
-                (Math.round(green * 255) << 8) |
-                Math.round(blue * 255);
-    }
-
-    public static int makeColor4x(int red, int green, int blue, int alpha) {
-        final float X = 65536f;
-        return makeColor4f(red / X, green / X, blue / X, alpha / X);
-    }
-}
diff --git a/tests/src/com/android/gallery3d/glrenderer/GLStub.java b/tests/src/com/android/gallery3d/glrenderer/GLStub.java
deleted file mode 100644
index 4b66040..0000000
--- a/tests/src/com/android/gallery3d/glrenderer/GLStub.java
+++ /dev/null
@@ -1,1490 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.glrenderer;
-
-import javax.microedition.khronos.opengles.GL;
-import javax.microedition.khronos.opengles.GL10;
-import javax.microedition.khronos.opengles.GL10Ext;
-import javax.microedition.khronos.opengles.GL11;
-import javax.microedition.khronos.opengles.GL11Ext;
-
-public class GLStub implements GL, GL10, GL10Ext, GL11, GL11Ext {
-    @SuppressWarnings("unused")
-    private static final String TAG = "GLStub";
-
-    public void glActiveTexture(
-        int texture
-    ){}
-
-    public void glAlphaFunc(
-        int func,
-        float ref
-    ){}
-
-    public void glAlphaFuncx(
-        int func,
-        int ref
-    ){}
-
-    public void glBindTexture(
-        int target,
-        int texture
-    ){}
-
-    public void glBlendFunc(
-        int sfactor,
-        int dfactor
-    ){}
-
-    public void glClear(
-        int mask
-    ){}
-
-    public void glClearColor(
-        float red,
-        float green,
-        float blue,
-        float alpha
-    ){}
-
-    public void glClearColorx(
-        int red,
-        int green,
-        int blue,
-        int alpha
-    ){}
-
-    public void glClearDepthf(
-        float depth
-    ){}
-
-    public void glClearDepthx(
-        int depth
-    ){}
-
-    public void glClearStencil(
-        int s
-    ){}
-
-    public void glClientActiveTexture(
-        int texture
-    ){}
-
-    public void glColor4f(
-        float red,
-        float green,
-        float blue,
-        float alpha
-    ){}
-
-    public void glColor4x(
-        int red,
-        int green,
-        int blue,
-        int alpha
-    ){}
-
-    public void glColorMask(
-        boolean red,
-        boolean green,
-        boolean blue,
-        boolean alpha
-    ){}
-
-    public void glColorPointer(
-        int size,
-        int type,
-        int stride,
-        java.nio.Buffer pointer
-    ){}
-
-    public void glCompressedTexImage2D(
-        int target,
-        int level,
-        int internalformat,
-        int width,
-        int height,
-        int border,
-        int imageSize,
-        java.nio.Buffer data
-    ){}
-
-    public void glCompressedTexSubImage2D(
-        int target,
-        int level,
-        int xoffset,
-        int yoffset,
-        int width,
-        int height,
-        int format,
-        int imageSize,
-        java.nio.Buffer data
-    ){}
-
-    public void glCopyTexImage2D(
-        int target,
-        int level,
-        int internalformat,
-        int x,
-        int y,
-        int width,
-        int height,
-        int border
-    ){}
-
-    public void glCopyTexSubImage2D(
-        int target,
-        int level,
-        int xoffset,
-        int yoffset,
-        int x,
-        int y,
-        int width,
-        int height
-    ){}
-
-    public void glCullFace(
-        int mode
-    ){}
-
-    public void glDeleteTextures(
-        int n,
-        int[] textures,
-        int offset
-    ){}
-
-    public void glDeleteTextures(
-        int n,
-        java.nio.IntBuffer textures
-    ){}
-
-    public void glDepthFunc(
-        int func
-    ){}
-
-    public void glDepthMask(
-        boolean flag
-    ){}
-
-    public void glDepthRangef(
-        float zNear,
-        float zFar
-    ){}
-
-    public void glDepthRangex(
-        int zNear,
-        int zFar
-    ){}
-
-    public void glDisable(
-        int cap
-    ){}
-
-    public void glDisableClientState(
-        int array
-    ){}
-
-    public void glDrawArrays(
-        int mode,
-        int first,
-        int count
-    ){}
-
-    public void glDrawElements(
-        int mode,
-        int count,
-        int type,
-        java.nio.Buffer indices
-    ){}
-
-    public void glEnable(
-        int cap
-    ){}
-
-    public void glEnableClientState(
-        int array
-    ){}
-
-    public void glFinish(
-    ){}
-
-    public void glFlush(
-    ){}
-
-    public void glFogf(
-        int pname,
-        float param
-    ){}
-
-    public void glFogfv(
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glFogfv(
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glFogx(
-        int pname,
-        int param
-    ){}
-
-    public void glFogxv(
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glFogxv(
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glFrontFace(
-        int mode
-    ){}
-
-    public void glFrustumf(
-        float left,
-        float right,
-        float bottom,
-        float top,
-        float zNear,
-        float zFar
-    ){}
-
-    public void glFrustumx(
-        int left,
-        int right,
-        int bottom,
-        int top,
-        int zNear,
-        int zFar
-    ){}
-
-    public void glGenTextures(
-        int n,
-        int[] textures,
-        int offset
-    ){}
-
-    public void glGenTextures(
-        int n,
-        java.nio.IntBuffer textures
-    ){}
-
-    public int glGetError(
-    ){ throw new UnsupportedOperationException(); }
-
-    public void glGetIntegerv(
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetIntegerv(
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public String glGetString(
-        int name
-    ){ throw new UnsupportedOperationException(); }
-
-    public void glHint(
-        int target,
-        int mode
-    ){}
-
-    public void glLightModelf(
-        int pname,
-        float param
-    ){}
-
-    public void glLightModelfv(
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glLightModelfv(
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glLightModelx(
-        int pname,
-        int param
-    ){}
-
-    public void glLightModelxv(
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glLightModelxv(
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glLightf(
-        int light,
-        int pname,
-        float param
-    ){}
-
-    public void glLightfv(
-        int light,
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glLightfv(
-        int light,
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glLightx(
-        int light,
-        int pname,
-        int param
-    ){}
-
-    public void glLightxv(
-        int light,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glLightxv(
-        int light,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glLineWidth(
-        float width
-    ){}
-
-    public void glLineWidthx(
-        int width
-    ){}
-
-    public void glLoadIdentity(
-    ){}
-
-    public void glLoadMatrixf(
-        float[] m,
-        int offset
-    ){}
-
-    public void glLoadMatrixf(
-        java.nio.FloatBuffer m
-    ){}
-
-    public void glLoadMatrixx(
-        int[] m,
-        int offset
-    ){}
-
-    public void glLoadMatrixx(
-        java.nio.IntBuffer m
-    ){}
-
-    public void glLogicOp(
-        int opcode
-    ){}
-
-    public void glMaterialf(
-        int face,
-        int pname,
-        float param
-    ){}
-
-    public void glMaterialfv(
-        int face,
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glMaterialfv(
-        int face,
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glMaterialx(
-        int face,
-        int pname,
-        int param
-    ){}
-
-    public void glMaterialxv(
-        int face,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glMaterialxv(
-        int face,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glMatrixMode(
-        int mode
-    ){}
-
-    public void glMultMatrixf(
-        float[] m,
-        int offset
-    ){}
-
-    public void glMultMatrixf(
-        java.nio.FloatBuffer m
-    ){}
-
-    public void glMultMatrixx(
-        int[] m,
-        int offset
-    ){}
-
-    public void glMultMatrixx(
-        java.nio.IntBuffer m
-    ){}
-
-    public void glMultiTexCoord4f(
-        int target,
-        float s,
-        float t,
-        float r,
-        float q
-    ){}
-
-    public void glMultiTexCoord4x(
-        int target,
-        int s,
-        int t,
-        int r,
-        int q
-    ){}
-
-    public void glNormal3f(
-        float nx,
-        float ny,
-        float nz
-    ){}
-
-    public void glNormal3x(
-        int nx,
-        int ny,
-        int nz
-    ){}
-
-    public void glNormalPointer(
-        int type,
-        int stride,
-        java.nio.Buffer pointer
-    ){}
-
-    public void glOrthof(
-        float left,
-        float right,
-        float bottom,
-        float top,
-        float zNear,
-        float zFar
-    ){}
-
-    public void glOrthox(
-        int left,
-        int right,
-        int bottom,
-        int top,
-        int zNear,
-        int zFar
-    ){}
-
-    public void glPixelStorei(
-        int pname,
-        int param
-    ){}
-
-    public void glPointSize(
-        float size
-    ){}
-
-    public void glPointSizex(
-        int size
-    ){}
-
-    public void glPolygonOffset(
-        float factor,
-        float units
-    ){}
-
-    public void glPolygonOffsetx(
-        int factor,
-        int units
-    ){}
-
-    public void glPopMatrix(
-    ){}
-
-    public void glPushMatrix(
-    ){}
-
-    public void glReadPixels(
-        int x,
-        int y,
-        int width,
-        int height,
-        int format,
-        int type,
-        java.nio.Buffer pixels
-    ){}
-
-    public void glRotatef(
-        float angle,
-        float x,
-        float y,
-        float z
-    ){}
-
-    public void glRotatex(
-        int angle,
-        int x,
-        int y,
-        int z
-    ){}
-
-    public void glSampleCoverage(
-        float value,
-        boolean invert
-    ){}
-
-    public void glSampleCoveragex(
-        int value,
-        boolean invert
-    ){}
-
-    public void glScalef(
-        float x,
-        float y,
-        float z
-    ){}
-
-    public void glScalex(
-        int x,
-        int y,
-        int z
-    ){}
-
-    public void glScissor(
-        int x,
-        int y,
-        int width,
-        int height
-    ){}
-
-    public void glShadeModel(
-        int mode
-    ){}
-
-    public void glStencilFunc(
-        int func,
-        int ref,
-        int mask
-    ){}
-
-    public void glStencilMask(
-        int mask
-    ){}
-
-    public void glStencilOp(
-        int fail,
-        int zfail,
-        int zpass
-    ){}
-
-    public void glTexCoordPointer(
-        int size,
-        int type,
-        int stride,
-        java.nio.Buffer pointer
-    ){}
-
-    public void glTexEnvf(
-        int target,
-        int pname,
-        float param
-    ){}
-
-    public void glTexEnvfv(
-        int target,
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glTexEnvfv(
-        int target,
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glTexEnvx(
-        int target,
-        int pname,
-        int param
-    ){}
-
-    public void glTexEnvxv(
-        int target,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glTexEnvxv(
-        int target,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glTexImage2D(
-        int target,
-        int level,
-        int internalformat,
-        int width,
-        int height,
-        int border,
-        int format,
-        int type,
-        java.nio.Buffer pixels
-    ){}
-
-    public void glTexParameterf(
-        int target,
-        int pname,
-        float param
-    ){}
-
-    public void glTexParameterx(
-        int target,
-        int pname,
-        int param
-    ){}
-
-    public void glTexSubImage2D(
-        int target,
-        int level,
-        int xoffset,
-        int yoffset,
-        int width,
-        int height,
-        int format,
-        int type,
-        java.nio.Buffer pixels
-    ){}
-
-    public void glTranslatef(
-        float x,
-        float y,
-        float z
-    ){}
-
-    public void glTranslatex(
-        int x,
-        int y,
-        int z
-    ){}
-
-    public void glVertexPointer(
-        int size,
-        int type,
-        int stride,
-        java.nio.Buffer pointer
-    ){}
-
-    public void glViewport(
-        int x,
-        int y,
-        int width,
-        int height
-    ){}
-
-    public int glQueryMatrixxOES(
-        int[] mantissa,
-        int mantissaOffset,
-        int[] exponent,
-        int exponentOffset
-    ){ throw new UnsupportedOperationException(); }
-
-    public int glQueryMatrixxOES(
-        java.nio.IntBuffer mantissa,
-        java.nio.IntBuffer exponent
-    ){ throw new UnsupportedOperationException(); }
-
-    public void glGetPointerv(int pname, java.nio.Buffer[] params){}
-    public void glBindBuffer(
-        int target,
-        int buffer
-    ){}
-
-    public void glBufferData(
-        int target,
-        int size,
-        java.nio.Buffer data,
-        int usage
-    ){}
-
-    public void glBufferSubData(
-        int target,
-        int offset,
-        int size,
-        java.nio.Buffer data
-    ){}
-
-    public void glClipPlanef(
-        int plane,
-        float[] equation,
-        int offset
-    ){}
-
-    public void glClipPlanef(
-        int plane,
-        java.nio.FloatBuffer equation
-    ){}
-
-    public void glClipPlanex(
-        int plane,
-        int[] equation,
-        int offset
-    ){}
-
-    public void glClipPlanex(
-        int plane,
-        java.nio.IntBuffer equation
-    ){}
-
-    public void glColor4ub(
-        byte red,
-        byte green,
-        byte blue,
-        byte alpha
-    ){}
-
-    public void glColorPointer(
-        int size,
-        int type,
-        int stride,
-        int offset
-    ){}
-
-    public void glDeleteBuffers(
-        int n,
-        int[] buffers,
-        int offset
-    ){}
-
-    public void glDeleteBuffers(
-        int n,
-        java.nio.IntBuffer buffers
-    ){}
-
-    public void glDrawElements(
-        int mode,
-        int count,
-        int type,
-        int offset
-    ){}
-
-    public void glGenBuffers(
-        int n,
-        int[] buffers,
-        int offset
-    ){}
-
-    public void glGenBuffers(
-        int n,
-        java.nio.IntBuffer buffers
-    ){}
-
-    public void glGetBooleanv(
-        int pname,
-        boolean[] params,
-        int offset
-    ){}
-
-    public void glGetBooleanv(
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetBufferParameteriv(
-        int target,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetBufferParameteriv(
-        int target,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetClipPlanef(
-        int pname,
-        float[] eqn,
-        int offset
-    ){}
-
-    public void glGetClipPlanef(
-        int pname,
-        java.nio.FloatBuffer eqn
-    ){}
-
-    public void glGetClipPlanex(
-        int pname,
-        int[] eqn,
-        int offset
-    ){}
-
-    public void glGetClipPlanex(
-        int pname,
-        java.nio.IntBuffer eqn
-    ){}
-
-    public void glGetFixedv(
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetFixedv(
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetFloatv(
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glGetFloatv(
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glGetLightfv(
-        int light,
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glGetLightfv(
-        int light,
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glGetLightxv(
-        int light,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetLightxv(
-        int light,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetMaterialfv(
-        int face,
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glGetMaterialfv(
-        int face,
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glGetMaterialxv(
-        int face,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetMaterialxv(
-        int face,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetTexEnviv(
-        int env,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetTexEnviv(
-        int env,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetTexEnvxv(
-        int env,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetTexEnvxv(
-        int env,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetTexParameterfv(
-        int target,
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glGetTexParameterfv(
-        int target,
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glGetTexParameteriv(
-        int target,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetTexParameteriv(
-        int target,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetTexParameterxv(
-        int target,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetTexParameterxv(
-        int target,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public boolean glIsBuffer(
-        int buffer
-    ){ throw new UnsupportedOperationException(); }
-
-    public boolean glIsEnabled(
-        int cap
-    ){ throw new UnsupportedOperationException(); }
-
-    public boolean glIsTexture(
-        int texture
-    ){ throw new UnsupportedOperationException(); }
-
-    public void glNormalPointer(
-        int type,
-        int stride,
-        int offset
-    ){}
-
-    public void glPointParameterf(
-        int pname,
-        float param
-    ){}
-
-    public void glPointParameterfv(
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glPointParameterfv(
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glPointParameterx(
-        int pname,
-        int param
-    ){}
-
-    public void glPointParameterxv(
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glPointParameterxv(
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glPointSizePointerOES(
-        int type,
-        int stride,
-        java.nio.Buffer pointer
-    ){}
-
-    public void glTexCoordPointer(
-        int size,
-        int type,
-        int stride,
-        int offset
-    ){}
-
-    public void glTexEnvi(
-        int target,
-        int pname,
-        int param
-    ){}
-
-    public void glTexEnviv(
-        int target,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glTexEnviv(
-        int target,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glTexParameterfv(
-        int target,
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glTexParameterfv(
-        int target,
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glTexParameteri(
-        int target,
-        int pname,
-        int param
-    ){}
-
-    public void glTexParameteriv(
-        int target,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glTexParameteriv(
-        int target,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glTexParameterxv(
-        int target,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glTexParameterxv(
-        int target,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glVertexPointer(
-        int size,
-        int type,
-        int stride,
-        int offset
-    ){}
-
-    public void glCurrentPaletteMatrixOES(
-        int matrixpaletteindex
-    ){}
-
-    public void glDrawTexfOES(
-        float x,
-        float y,
-        float z,
-        float width,
-        float height
-    ){}
-
-    public void glDrawTexfvOES(
-        float[] coords,
-        int offset
-    ){}
-
-    public void glDrawTexfvOES(
-        java.nio.FloatBuffer coords
-    ){}
-
-    public void glDrawTexiOES(
-        int x,
-        int y,
-        int z,
-        int width,
-        int height
-    ){}
-
-    public void glDrawTexivOES(
-        int[] coords,
-        int offset
-    ){}
-
-    public void glDrawTexivOES(
-        java.nio.IntBuffer coords
-    ){}
-
-    public void glDrawTexsOES(
-        short x,
-        short y,
-        short z,
-        short width,
-        short height
-    ){}
-
-    public void glDrawTexsvOES(
-        short[] coords,
-        int offset
-    ){}
-
-    public void glDrawTexsvOES(
-        java.nio.ShortBuffer coords
-    ){}
-
-    public void glDrawTexxOES(
-        int x,
-        int y,
-        int z,
-        int width,
-        int height
-    ){}
-
-    public void glDrawTexxvOES(
-        int[] coords,
-        int offset
-    ){}
-
-    public void glDrawTexxvOES(
-        java.nio.IntBuffer coords
-    ){}
-
-    public void glLoadPaletteFromModelViewMatrixOES(
-    ){}
-
-    public void glMatrixIndexPointerOES(
-        int size,
-        int type,
-        int stride,
-        java.nio.Buffer pointer
-    ){}
-
-    public void glMatrixIndexPointerOES(
-        int size,
-        int type,
-        int stride,
-        int offset
-    ){}
-
-    public void glWeightPointerOES(
-        int size,
-        int type,
-        int stride,
-        java.nio.Buffer pointer
-    ){}
-
-    public void glWeightPointerOES(
-        int size,
-        int type,
-        int stride,
-        int offset
-    ){}
-
-    public void glBindFramebufferOES(
-        int target,
-        int framebuffer
-    ){}
-
-    public void glBindRenderbufferOES(
-        int target,
-        int renderbuffer
-    ){}
-
-    public void glBlendEquation(
-        int mode
-    ){}
-
-    public void glBlendEquationSeparate(
-        int modeRGB,
-        int modeAlpha
-    ){}
-
-    public void glBlendFuncSeparate(
-        int srcRGB,
-        int dstRGB,
-        int srcAlpha,
-        int dstAlpha
-    ){}
-
-    public int glCheckFramebufferStatusOES(
-        int target
-    ){ throw new UnsupportedOperationException(); }
-
-    public void glDeleteFramebuffersOES(
-        int n,
-        int[] framebuffers,
-        int offset
-    ){}
-
-    public void glDeleteFramebuffersOES(
-        int n,
-        java.nio.IntBuffer framebuffers
-    ){}
-
-    public void glDeleteRenderbuffersOES(
-        int n,
-        int[] renderbuffers,
-        int offset
-    ){}
-
-    public void glDeleteRenderbuffersOES(
-        int n,
-        java.nio.IntBuffer renderbuffers
-    ){}
-
-    public void glFramebufferRenderbufferOES(
-        int target,
-        int attachment,
-        int renderbuffertarget,
-        int renderbuffer
-    ){}
-
-    public void glFramebufferTexture2DOES(
-        int target,
-        int attachment,
-        int textarget,
-        int texture,
-        int level
-    ){}
-
-    public void glGenerateMipmapOES(
-        int target
-    ){}
-
-    public void glGenFramebuffersOES(
-        int n,
-        int[] framebuffers,
-        int offset
-    ){}
-
-    public void glGenFramebuffersOES(
-        int n,
-        java.nio.IntBuffer framebuffers
-    ){}
-
-    public void glGenRenderbuffersOES(
-        int n,
-        int[] renderbuffers,
-        int offset
-    ){}
-
-    public void glGenRenderbuffersOES(
-        int n,
-        java.nio.IntBuffer renderbuffers
-    ){}
-
-    public void glGetFramebufferAttachmentParameterivOES(
-        int target,
-        int attachment,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetFramebufferAttachmentParameterivOES(
-        int target,
-        int attachment,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetRenderbufferParameterivOES(
-        int target,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetRenderbufferParameterivOES(
-        int target,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetTexGenfv(
-        int coord,
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glGetTexGenfv(
-        int coord,
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glGetTexGeniv(
-        int coord,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetTexGeniv(
-        int coord,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glGetTexGenxv(
-        int coord,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glGetTexGenxv(
-        int coord,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public boolean glIsFramebufferOES(
-        int framebuffer
-    ){ throw new UnsupportedOperationException(); }
-
-    public boolean glIsRenderbufferOES(
-        int renderbuffer
-    ){ throw new UnsupportedOperationException(); }
-
-    public void glRenderbufferStorageOES(
-        int target,
-        int internalformat,
-        int width,
-        int height
-    ){}
-
-    public void glTexGenf(
-        int coord,
-        int pname,
-        float param
-    ){}
-
-    public void glTexGenfv(
-        int coord,
-        int pname,
-        float[] params,
-        int offset
-    ){}
-
-    public void glTexGenfv(
-        int coord,
-        int pname,
-        java.nio.FloatBuffer params
-    ){}
-
-    public void glTexGeni(
-        int coord,
-        int pname,
-        int param
-    ){}
-
-    public void glTexGeniv(
-        int coord,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glTexGeniv(
-        int coord,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-
-    public void glTexGenx(
-        int coord,
-        int pname,
-        int param
-    ){}
-
-    public void glTexGenxv(
-        int coord,
-        int pname,
-        int[] params,
-        int offset
-    ){}
-
-    public void glTexGenxv(
-        int coord,
-        int pname,
-        java.nio.IntBuffer params
-    ){}
-}
diff --git a/tests/src/com/android/gallery3d/glrenderer/TextureTest.java b/tests/src/com/android/gallery3d/glrenderer/TextureTest.java
deleted file mode 100644
index 9e79554..0000000
--- a/tests/src/com/android/gallery3d/glrenderer/TextureTest.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.glrenderer;
-
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.gallery3d.glrenderer.BasicTexture;
-import com.android.gallery3d.glrenderer.BitmapTexture;
-import com.android.gallery3d.glrenderer.ColorTexture;
-import com.android.gallery3d.glrenderer.GLCanvas;
-import com.android.gallery3d.glrenderer.GLES11Canvas;
-import com.android.gallery3d.glrenderer.UploadedTexture;
-
-import junit.framework.TestCase;
-
-import javax.microedition.khronos.opengles.GL11;
-
-public class TextureTest extends TestCase {
-    @SuppressWarnings("unused")
-    private static final String TAG = "TextureTest";
-
-    class MyBasicTexture extends BasicTexture {
-        int mOnBindCalled;
-        int mOpaqueCalled;
-
-        MyBasicTexture(GLCanvas canvas, int id) {
-            super(canvas, id, 0);
-        }
-
-        @Override
-        protected boolean onBind(GLCanvas canvas) {
-            mOnBindCalled++;
-            return true;
-        }
-
-        @Override
-        protected int getTarget() {
-            return GL11.GL_TEXTURE_2D;
-        }
-
-        @Override
-        public boolean isOpaque() {
-            mOpaqueCalled++;
-            return true;
-        }
-
-        void upload() {
-            mState = STATE_LOADED;
-        }
-    }
-
-    @SmallTest
-    public void testBasicTexture() {
-        GL11 glStub = new GLStub();
-        GLCanvas canvas = new GLES11Canvas(glStub);
-        MyBasicTexture texture = new MyBasicTexture(canvas, 47);
-
-        assertEquals(47, texture.getId());
-        texture.setSize(1, 1);
-        assertEquals(1, texture.getWidth());
-        assertEquals(1, texture.getHeight());
-        assertEquals(1, texture.getTextureWidth());
-        assertEquals(1, texture.getTextureHeight());
-        texture.setSize(3, 5);
-        assertEquals(3, texture.getWidth());
-        assertEquals(5, texture.getHeight());
-        assertEquals(4, texture.getTextureWidth());
-        assertEquals(8, texture.getTextureHeight());
-
-        assertFalse(texture.isLoaded());
-        texture.upload();
-        assertTrue(texture.isLoaded());
-
-        // For a different GL, it's not loaded.
-        GLCanvas canvas2 = new GLES11Canvas(glStub);
-        assertFalse(texture.isLoaded());
-
-        assertEquals(0, texture.mOnBindCalled);
-        assertEquals(0, texture.mOpaqueCalled);
-        texture.draw(canvas, 100, 200, 1, 1);
-        assertEquals(1, texture.mOnBindCalled);
-        assertEquals(1, texture.mOpaqueCalled);
-        texture.draw(canvas, 0, 0);
-        assertEquals(2, texture.mOnBindCalled);
-        assertEquals(2, texture.mOpaqueCalled);
-    }
-
-    @SmallTest
-    public void testColorTexture() {
-        GLCanvasMock canvas = new GLCanvasMock();
-        ColorTexture texture = new ColorTexture(0x12345678);
-
-        texture.setSize(42, 47);
-        assertEquals(texture.getWidth(), 42);
-        assertEquals(texture.getHeight(), 47);
-        assertEquals(0, canvas.mFillRectCalled);
-        texture.draw(canvas, 0, 0);
-        assertEquals(1, canvas.mFillRectCalled);
-        assertEquals(0x12345678, canvas.mFillRectColor);
-        assertEquals(42f, canvas.mFillRectWidth);
-        assertEquals(47f, canvas.mFillRectHeight);
-        assertFalse(texture.isOpaque());
-        assertTrue(new ColorTexture(0xFF000000).isOpaque());
-    }
-
-    private class MyUploadedTexture extends UploadedTexture {
-        int mGetCalled;
-        int mFreeCalled;
-        Bitmap mBitmap;
-        @Override
-        protected Bitmap onGetBitmap() {
-            mGetCalled++;
-            Config config = Config.ARGB_8888;
-            mBitmap = Bitmap.createBitmap(47, 42, config);
-            return mBitmap;
-        }
-        @Override
-        protected void onFreeBitmap(Bitmap bitmap) {
-            mFreeCalled++;
-            assertSame(mBitmap, bitmap);
-            mBitmap.recycle();
-            mBitmap = null;
-        }
-    }
-
-    @SmallTest
-    public void testUploadedTexture() {
-        GL11 glStub = new GLStub();
-        GLCanvas canvas = new GLES11Canvas(glStub);
-        MyUploadedTexture texture = new MyUploadedTexture();
-
-        // draw it and the bitmap should be fetched.
-        assertEquals(0, texture.mFreeCalled);
-        assertEquals(0, texture.mGetCalled);
-        texture.draw(canvas, 0, 0);
-        assertEquals(1, texture.mGetCalled);
-        assertTrue(texture.isLoaded());
-        assertTrue(texture.isContentValid());
-
-        // invalidate content and it should be freed.
-        texture.invalidateContent();
-        assertFalse(texture.isContentValid());
-        assertEquals(1, texture.mFreeCalled);
-        assertTrue(texture.isLoaded());  // But it's still loaded
-
-        // draw it again and the bitmap should be fetched again.
-        texture.draw(canvas, 0, 0);
-        assertEquals(2, texture.mGetCalled);
-        assertTrue(texture.isLoaded());
-        assertTrue(texture.isContentValid());
-
-        // recycle the texture and it should be freed again.
-        texture.recycle();
-        assertEquals(2, texture.mFreeCalled);
-        // TODO: these two are broken and waiting for fix.
-        //assertFalse(texture.isLoaded(canvas));
-        //assertFalse(texture.isContentValid(canvas));
-    }
-
-    class MyTextureForMixed extends BasicTexture {
-        MyTextureForMixed(GLCanvas canvas, int id) {
-            super(canvas, id, 0);
-        }
-
-        @Override
-        protected boolean onBind(GLCanvas canvas) {
-            return true;
-        }
-
-        @Override
-        protected int getTarget() {
-            return GL11.GL_TEXTURE_2D;
-        }
-
-        @Override
-        public boolean isOpaque() {
-            return true;
-        }
-    }
-
-    @SmallTest
-    public void testBitmapTexture() {
-        Config config = Config.ARGB_8888;
-        Bitmap bitmap = Bitmap.createBitmap(47, 42, config);
-        assertFalse(bitmap.isRecycled());
-        BitmapTexture texture = new BitmapTexture(bitmap);
-        texture.recycle();
-        assertFalse(bitmap.isRecycled());
-        bitmap.recycle();
-        assertTrue(bitmap.isRecycled());
-    }
-}
diff --git a/tests/src/com/android/gallery3d/jpegstream/JpegStreamReaderTest.java b/tests/src/com/android/gallery3d/jpegstream/JpegStreamReaderTest.java
deleted file mode 100644
index ae60a91..0000000
--- a/tests/src/com/android/gallery3d/jpegstream/JpegStreamReaderTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-
-package com.android.gallery3d.jpegstream;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Point;
-import android.os.Environment;
-import android.util.Log;
-
-import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.tests.R;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Arrays;
-
-public class JpegStreamReaderTest extends JpegStreamTestCase {
-    public static final String TAG = "JpegStreamReaderTest";
-    private JPEGInputStream mStream;
-    private Bitmap mBitmap;
-
-    public JpegStreamReaderTest(int imageRes) {
-        super(imageRes);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mBitmap = BitmapFactory.decodeStream(getImageInputStream());
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        Utils.closeSilently(mStream);
-        mStream = null;
-        if (mBitmap != null) {
-            mBitmap.recycle();
-            mBitmap = null;
-        }
-    }
-
-    @MediumTest
-    public void testBasicReads() throws Exception {
-
-        // Setup input stream.
-        mStream = new JPEGInputStream(reopenFileStream(), JpegConfig.FORMAT_RGBA);
-        Point dimens = mStream.getDimensions();
-
-        // Read whole stream into array.
-        byte[] bytes = new byte[dimens.x * StreamUtils.pixelSize(JpegConfig.FORMAT_RGBA) * dimens.y];
-        assertTrue(mStream.read(bytes, 0, bytes.length) == bytes.length);
-
-        // Set pixels in bitmap
-        Bitmap test = Bitmap.createBitmap(dimens.x, dimens.y, Bitmap.Config.ARGB_8888);
-        ByteBuffer buf = ByteBuffer.wrap(bytes);
-        test.copyPixelsFromBuffer(buf);
-        assertTrue(test.getWidth() == mBitmap.getWidth() && test.getHeight() == mBitmap.getHeight());
-        assertTrue(mStream.read(bytes, 0, bytes.length) == -1);
-    }
-
-    // TODO : more tests
-}
diff --git a/tests/src/com/android/gallery3d/jpegstream/JpegStreamTestCase.java b/tests/src/com/android/gallery3d/jpegstream/JpegStreamTestCase.java
deleted file mode 100644
index ed3b08a..0000000
--- a/tests/src/com/android/gallery3d/jpegstream/JpegStreamTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-package com.android.gallery3d.jpegstream;
-
-import android.content.res.Resources;
-import android.test.InstrumentationTestCase;
-import android.util.Log;
-
-import com.android.gallery3d.common.Utils;
-
-import java.io.InputStream;
-
-public class JpegStreamTestCase extends InstrumentationTestCase {
-    public static final String TAG = "JpegStreamTestCase";
-
-    private static final String RES_ID_TITLE = "Resource ID: %x";
-
-    private InputStream mImageInputStream;
-    private final int mImageResourceId;
-
-    public JpegStreamTestCase(int imageRes) {
-        mImageResourceId = imageRes;
-    }
-
-    protected InputStream getImageInputStream() {
-        return mImageInputStream;
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        Log.d(TAG, "doing setUp...");
-        mImageInputStream = reopenFileStream();
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        Log.d(TAG, "doing tearDown...");
-        Utils.closeSilently(mImageInputStream);
-        mImageInputStream = null;
-    }
-
-    protected String getImageTitle() {
-        return String.format(RES_ID_TITLE, mImageResourceId);
-    }
-
-    protected InputStream reopenFileStream() throws Exception {
-        return openResource(mImageResourceId);
-    }
-
-    protected InputStream openResource(int resourceID) throws Exception {
-        try {
-            Resources res = getInstrumentation().getContext().getResources();
-            return res.openRawResource(resourceID);
-        } catch (Exception e) {
-            throw new Exception(getImageTitle(), e);
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/jpegstream/JpegStreamTestRunner.java b/tests/src/com/android/gallery3d/jpegstream/JpegStreamTestRunner.java
deleted file mode 100644
index 2afaf39..0000000
--- a/tests/src/com/android/gallery3d/jpegstream/JpegStreamTestRunner.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-
-package com.android.gallery3d.jpegstream;
-
-import android.test.InstrumentationTestRunner;
-import android.test.InstrumentationTestSuite;
-import android.util.Log;
-
-import com.android.gallery3d.exif.ExifTestRunner;
-import com.android.gallery3d.tests.R;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class JpegStreamTestRunner extends InstrumentationTestRunner {
-    private static final String TAG = "JpegStreamTestRunner";
-
-    private static final int[] IMG_RESOURCE = {
-            R.raw.galaxy_nexus
-    };
-
-    @Override
-    public TestSuite getAllTests() {
-        TestSuite suite = new InstrumentationTestSuite(this);
-        addAllTestsFromTestCase(JpegStreamReaderTest.class, suite);
-        addAllTestsFromTestCase(JpegStreamWriterTest.class, suite);
-        return suite;
-    }
-
-    private void addAllTestsFromTestCase(Class<? extends JpegStreamTestCase> testClass,
-            TestSuite suite) {
-        for (Method method : testClass.getDeclaredMethods()) {
-            if (method.getName().startsWith("test") && method.getParameterTypes().length == 0) {
-                for (int i = 0; i < IMG_RESOURCE.length; i++) {
-                    TestCase test;
-                    try {
-                        test = testClass.getDeclaredConstructor(int.class).
-                                newInstance(IMG_RESOURCE[i]);
-                        test.setName(method.getName());
-                        suite.addTest(test);
-                    } catch (IllegalArgumentException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (InstantiationException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (IllegalAccessException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (InvocationTargetException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    } catch (NoSuchMethodException e) {
-                        Log.e(TAG, "Failed to create test case", e);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public ClassLoader getLoader() {
-        return ExifTestRunner.class.getClassLoader();
-    }
-}
diff --git a/tests/src/com/android/gallery3d/jpegstream/JpegStreamWriterTest.java b/tests/src/com/android/gallery3d/jpegstream/JpegStreamWriterTest.java
deleted file mode 100644
index befba4c..0000000
--- a/tests/src/com/android/gallery3d/jpegstream/JpegStreamWriterTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-
-package com.android.gallery3d.jpegstream;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Environment;
-import android.util.Log;
-
-import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.tests.R;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.nio.ByteBuffer;
-
-public class JpegStreamWriterTest extends JpegStreamTestCase {
-    public static final String TAG = "JpegStreamWriterTest";
-    private JPEGOutputStream mStream;
-    private ByteArrayOutputStream mWrappedStream;
-    private Bitmap mBitmap;
-    private Bitmap mControl;
-
-    // galaxy_nexus.jpg image compressed with q=20
-    private static final int CONTROL_RID = R.raw.jpeg_control;
-
-    public JpegStreamWriterTest(int imageRes) {
-        super(imageRes);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mBitmap = BitmapFactory.decodeStream(getImageInputStream());
-        mControl = BitmapFactory.decodeStream(openResource(CONTROL_RID));
-        mWrappedStream = new ByteArrayOutputStream();
-
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        Utils.closeSilently(mStream);
-        Utils.closeSilently(mWrappedStream);
-        mWrappedStream = null;
-        mStream = null;
-        if (mBitmap != null) {
-            mBitmap.recycle();
-            mBitmap = null;
-        }
-        if (mControl != null) {
-            mControl.recycle();
-            mControl = null;
-        }
-    }
-
-    public void testBasicWrites() throws Exception {
-        assertTrue(mBitmap != null);
-        int width = mBitmap.getWidth();
-        int height = mBitmap.getHeight();
-        mStream = new JPEGOutputStream(mWrappedStream, width,
-                height, 20, JpegConfig.FORMAT_RGBA);
-
-        // Put bitmap pixels into a byte array (format is RGBA).
-        int rowLength = width * StreamUtils.pixelSize(JpegConfig.FORMAT_RGBA);
-        int size = height * rowLength;
-        byte[] byteArray = new byte[size];
-        ByteBuffer buf = ByteBuffer.wrap(byteArray);
-        mBitmap.copyPixelsToBuffer(buf);
-
-        // Write out whole array
-        mStream.write(byteArray, 0, byteArray.length);
-        mStream.close();
-
-        // Get compressed jpeg output
-        byte[] compressed = mWrappedStream.toByteArray();
-
-        // Check jpeg
-        ByteArrayInputStream inStream = new ByteArrayInputStream(compressed);
-        Bitmap test = BitmapFactory.decodeStream(inStream);
-        assertTrue(test != null);
-        assertTrue(test.sameAs(mControl));
-    }
-
-    public void testStreamingWrites() throws Exception {
-        assertTrue(mBitmap != null);
-        int width = mBitmap.getWidth();
-        int height = mBitmap.getHeight();
-        mStream = new JPEGOutputStream(mWrappedStream, width,
-                height, 20, JpegConfig.FORMAT_RGBA);
-
-        // Put bitmap pixels into a byte array (format is RGBA).
-        int rowLength = width * StreamUtils.pixelSize(JpegConfig.FORMAT_RGBA);
-        int size = height * rowLength;
-        byte[] byteArray = new byte[size];
-        ByteBuffer buf = ByteBuffer.wrap(byteArray);
-        mBitmap.copyPixelsToBuffer(buf);
-
-        // Write array in chunks
-        int chunkSize = rowLength / 3;
-        int written = 0;
-        while (written < size) {
-            if (written + chunkSize > size) {
-                chunkSize = size - written;
-            }
-            mStream.write(byteArray, written, chunkSize);
-            written += chunkSize;
-        }
-        mStream.close();
-
-        // Get compressed jpeg output
-        byte[] compressed = mWrappedStream.toByteArray();
-
-        // Check jpeg
-        ByteArrayInputStream inStream = new ByteArrayInputStream(compressed);
-        Bitmap test = BitmapFactory.decodeStream(inStream);
-        assertTrue(test != null);
-        assertTrue(test.sameAs(mControl));
-    }
-
-    // TODO : more tests
-}
diff --git a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java b/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
deleted file mode 100644
index 01f0350..0000000
--- a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.ui;
-
-import android.graphics.Bitmap;
-import android.graphics.Rect;
-import android.graphics.RectF;
-
-import com.android.gallery3d.glrenderer.BasicTexture;
-import com.android.gallery3d.glrenderer.GLCanvas;
-import com.android.gallery3d.glrenderer.GLId;
-import com.android.gallery3d.glrenderer.GLPaint;
-import com.android.gallery3d.glrenderer.RawTexture;
-
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-
-import javax.microedition.khronos.opengles.GL11;
-
-public class GLCanvasStub implements GLCanvas {
-    @Override
-    public void setSize(int width, int height) {}
-    @Override
-    public void clearBuffer() {}
-    @Override
-    public void clearBuffer(float[] argb) {}
-    public void setCurrentAnimationTimeMillis(long time) {}
-    public long currentAnimationTimeMillis() {
-        throw new UnsupportedOperationException();
-    }
-    @Override
-    public void setAlpha(float alpha) {}
-    @Override
-    public float getAlpha() {
-        throw new UnsupportedOperationException();
-    }
-    @Override
-    public void multiplyAlpha(float alpha) {}
-    @Override
-    public void translate(float x, float y, float z) {}
-    @Override
-    public void translate(float x, float y) {}
-    @Override
-    public void scale(float sx, float sy, float sz) {}
-    @Override
-    public void rotate(float angle, float x, float y, float z) {}
-    public boolean clipRect(int left, int top, int right, int bottom) {
-        throw new UnsupportedOperationException();
-    }
-    @Override
-    public void save() {
-        throw new UnsupportedOperationException();
-    }
-    @Override
-    public void save(int saveFlags) {
-        throw new UnsupportedOperationException();
-    }
-    public void setBlendEnabled(boolean enabled) {}
-    @Override
-    public void restore() {}
-    @Override
-    public void drawLine(float x1, float y1, float x2, float y2, GLPaint paint) {}
-    @Override
-    public void drawRect(float x1, float y1, float x2, float y2, GLPaint paint) {}
-    @Override
-    public void fillRect(float x, float y, float width, float height, int color) {}
-    @Override
-    public void drawTexture(
-            BasicTexture texture, int x, int y, int width, int height) {}
-    @Override
-    public void drawMesh(BasicTexture tex, int x, int y, int xyBuffer,
-            int uvBuffer, int indexBuffer, int indexCount) {}
-    public void drawTexture(BasicTexture texture,
-            int x, int y, int width, int height, float alpha) {}
-    @Override
-    public void drawTexture(BasicTexture texture, RectF source, RectF target) {}
-    @Override
-    public void drawTexture(BasicTexture texture, float[] mTextureTransform,
-            int x, int y, int w, int h) {}
-    public void drawMixed(BasicTexture from, BasicTexture to,
-            float ratio, int x, int y, int w, int h) {}
-    @Override
-    public void drawMixed(BasicTexture from, int to,
-            float ratio, int x, int y, int w, int h) {}
-    public void drawMixed(BasicTexture from, BasicTexture to,
-            float ratio, int x, int y, int width, int height, float alpha) {}
-    public BasicTexture copyTexture(int x, int y, int width, int height) {
-        throw new UnsupportedOperationException();
-    }
-    public GL11 getGLInstance() {
-        throw new UnsupportedOperationException();
-    }
-    @Override
-    public boolean unloadTexture(BasicTexture texture) {
-        throw new UnsupportedOperationException();
-    }
-    @Override
-    public void deleteBuffer(int bufferId) {
-        throw new UnsupportedOperationException();
-    }
-    @Override
-    public void deleteRecycledResources() {}
-    @Override
-    public void multiplyMatrix(float[] mMatrix, int offset) {}
-    @Override
-    public void dumpStatisticsAndClear() {}
-    @Override
-    public void beginRenderTarget(RawTexture texture) {}
-    @Override
-    public void endRenderTarget() {}
-    @Override
-    public void drawMixed(BasicTexture from, int toColor,
-            float ratio, RectF src, RectF target) {}
-
-    @Override
-    public void setTextureParameters(BasicTexture texture) {
-    }
-    @Override
-    public void initializeTextureSize(BasicTexture texture, int format, int type) {
-    }
-    @Override
-    public void initializeTexture(BasicTexture texture, Bitmap bitmap) {
-    }
-    @Override
-    public void texSubImage2D(BasicTexture texture, int xOffset, int yOffset, Bitmap bitmap,
-            int format, int type) {
-    }
-    @Override
-    public int uploadBuffer(ByteBuffer buffer) {
-        return 0;
-    }
-    @Override
-    public int uploadBuffer(FloatBuffer buffer) {
-        return 0;
-    }
-    @Override
-    public void recoverFromLightCycle() {
-    }
-    @Override
-    public void getBounds(Rect bounds, int x, int y, int width, int height) {
-    }
-    @Override
-    public GLId getGLId() {
-        return null;
-    }
-}
diff --git a/tests/src/com/android/gallery3d/ui/GLRootMock.java b/tests/src/com/android/gallery3d/ui/GLRootMock.java
deleted file mode 100644
index da78e14..0000000
--- a/tests/src/com/android/gallery3d/ui/GLRootMock.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.ui;
-
-import android.content.Context;
-import android.graphics.Matrix;
-import com.android.gallery3d.anim.CanvasAnimation;
-
-public class GLRootMock implements GLRoot {
-    int mRequestRenderCalled;
-    int mRequestLayoutContentPaneCalled;
-
-    public void addOnGLIdleListener(OnGLIdleListener listener) {}
-    public void registerLaunchedAnimation(CanvasAnimation animation) {}
-    public void requestRenderForced() {
-        mRequestRenderCalled++;
-    }
-    public void requestRender() {
-        mRequestRenderCalled++;
-    }
-    public void requestLayoutContentPane() {
-        mRequestLayoutContentPaneCalled++;
-    }
-    public boolean hasStencil() { return true; }
-    public void lockRenderThread() {}
-    public void unlockRenderThread() {}
-    public void setContentPane(GLView content) {}
-    public void setOrientationSource(OrientationSource source) {}
-    public int getDisplayRotation() { return 0; }
-    public int getCompensation() { return 0; }
-    public Matrix getCompensationMatrix() { return null; }
-    public void freeze() {}
-    public void unfreeze() {}
-    public void setLightsOutMode(boolean enabled) {}
-    public Context getContext() { return null; }
-}
diff --git a/tests/src/com/android/gallery3d/ui/GLRootStub.java b/tests/src/com/android/gallery3d/ui/GLRootStub.java
deleted file mode 100644
index 25e7bca..0000000
--- a/tests/src/com/android/gallery3d/ui/GLRootStub.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.ui;
-
-import android.content.Context;
-import android.graphics.Matrix;
-import com.android.gallery3d.anim.CanvasAnimation;
-
-public class GLRootStub implements GLRoot {
-    public void addOnGLIdleListener(OnGLIdleListener listener) {}
-    public void registerLaunchedAnimation(CanvasAnimation animation) {}
-    public void requestRenderForced() {}
-    public void requestRender() {}
-    public void requestLayoutContentPane() {}
-    public boolean hasStencil() { return true; }
-    public void lockRenderThread() {}
-    public void unlockRenderThread() {}
-    public void setContentPane(GLView content) {}
-    public void setOrientationSource(OrientationSource source) {}
-    public int getDisplayRotation() { return 0; }
-    public int getCompensation() { return 0; }
-    public Matrix getCompensationMatrix() { return null; }
-    public void freeze() {}
-    public void unfreeze() {}
-    public void setLightsOutMode(boolean enabled) {}
-    public Context getContext() { return null; }
-}
diff --git a/tests/src/com/android/gallery3d/ui/GLViewMock.java b/tests/src/com/android/gallery3d/ui/GLViewMock.java
deleted file mode 100644
index 9b7488f..0000000
--- a/tests/src/com/android/gallery3d/ui/GLViewMock.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.ui;
-
-import com.android.gallery3d.glrenderer.GLCanvas;
-
-class GLViewMock extends GLView {
-    // onAttachToRoot
-    int mOnAttachCalled;
-    GLRoot mRoot;
-    // onDetachFromRoot
-    int mOnDetachCalled;
-    // onVisibilityChanged
-    int mOnVisibilityChangedCalled;
-    // onLayout
-    int mOnLayoutCalled;
-    boolean mOnLayoutChangeSize;
-    // renderBackground
-    int mRenderBackgroundCalled;
-    // onMeasure
-    int mOnMeasureCalled;
-    int mOnMeasureWidthSpec;
-    int mOnMeasureHeightSpec;
-
-    @Override
-    public void onAttachToRoot(GLRoot root) {
-        mRoot = root;
-        mOnAttachCalled++;
-        super.onAttachToRoot(root);
-    }
-
-    @Override
-    public void onDetachFromRoot() {
-        mRoot = null;
-        mOnDetachCalled++;
-        super.onDetachFromRoot();
-    }
-
-    @Override
-    protected void onVisibilityChanged(int visibility) {
-        mOnVisibilityChangedCalled++;
-    }
-
-    @Override
-    protected void onLayout(boolean changeSize, int left, int top,
-            int right, int bottom) {
-        mOnLayoutCalled++;
-        mOnLayoutChangeSize = changeSize;
-        // call children's layout.
-        for (int i = 0, n = getComponentCount(); i < n; ++i) {
-            GLView item = getComponent(i);
-            item.layout(left, top, right, bottom);
-        }
-    }
-
-    @Override
-    protected void onMeasure(int widthSpec, int heightSpec) {
-        mOnMeasureCalled++;
-        mOnMeasureWidthSpec = widthSpec;
-        mOnMeasureHeightSpec = heightSpec;
-        // call children's measure.
-        for (int i = 0, n = getComponentCount(); i < n; ++i) {
-            GLView item = getComponent(i);
-            item.measure(widthSpec, heightSpec);
-        }
-        setMeasuredSize(widthSpec, heightSpec);
-    }
-
-    @Override
-    protected void renderBackground(GLCanvas view) {
-        mRenderBackgroundCalled++;
-    }
-}
diff --git a/tests/src/com/android/gallery3d/ui/GLViewTest.java b/tests/src/com/android/gallery3d/ui/GLViewTest.java
deleted file mode 100644
index b17b254..0000000
--- a/tests/src/com/android/gallery3d/ui/GLViewTest.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.ui;
-
-import android.graphics.Rect;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.MotionEvent;
-
-import junit.framework.TestCase;
-
-@SmallTest
-public class GLViewTest extends TestCase {
-    @SuppressWarnings("unused")
-    private static final String TAG = "GLViewTest";
-
-    @SmallTest
-    public void testVisibility() {
-        GLViewMock a = new GLViewMock();
-        assertEquals(GLView.VISIBLE, a.getVisibility());
-        assertEquals(0, a.mOnVisibilityChangedCalled);
-        a.setVisibility(GLView.INVISIBLE);
-        assertEquals(GLView.INVISIBLE, a.getVisibility());
-        assertEquals(1, a.mOnVisibilityChangedCalled);
-        a.setVisibility(GLView.VISIBLE);
-        assertEquals(GLView.VISIBLE, a.getVisibility());
-        assertEquals(2, a.mOnVisibilityChangedCalled);
-    }
-
-    @SmallTest
-    public void testComponents() {
-        GLView view = new GLView();
-        assertEquals(0, view.getComponentCount());
-        try {
-            view.getComponent(0);
-            fail();
-        } catch (IndexOutOfBoundsException ex) {
-            // expected
-        }
-
-        GLView x = new GLView();
-        GLView y = new GLView();
-        view.addComponent(x);
-        view.addComponent(y);
-        assertEquals(2, view.getComponentCount());
-        assertSame(x, view.getComponent(0));
-        assertSame(y, view.getComponent(1));
-        view.removeComponent(x);
-        assertSame(y, view.getComponent(0));
-        try {
-            view.getComponent(1);
-            fail();
-        } catch (IndexOutOfBoundsException ex) {
-            // expected
-        }
-        try {
-            view.addComponent(y);
-            fail();
-        } catch (IllegalStateException ex) {
-            // expected
-        }
-        view.addComponent(x);
-        view.removeAllComponents();
-        assertEquals(0, view.getComponentCount());
-    }
-
-    @SmallTest
-    public void testBounds() {
-        GLView view = new GLView();
-
-        assertEquals(0, view.getWidth());
-        assertEquals(0, view.getHeight());
-
-        Rect b = view.bounds();
-        assertEquals(0, b.left);
-        assertEquals(0, b.top);
-        assertEquals(0, b.right);
-        assertEquals(0, b.bottom);
-
-        view.layout(10, 20, 30, 100);
-        assertEquals(20, view.getWidth());
-        assertEquals(80, view.getHeight());
-
-        b = view.bounds();
-        assertEquals(10, b.left);
-        assertEquals(20, b.top);
-        assertEquals(30, b.right);
-        assertEquals(100, b.bottom);
-    }
-
-    @SmallTest
-    public void testParent() {
-        GLView a = new GLView();
-        GLView b = new GLView();
-        assertNull(b.mParent);
-        a.addComponent(b);
-        assertSame(a, b.mParent);
-        a.removeComponent(b);
-        assertNull(b.mParent);
-    }
-
-    @SmallTest
-    public void testRoot() {
-        GLViewMock a = new GLViewMock();
-        GLViewMock b = new GLViewMock();
-        GLRoot r = new GLRootStub();
-        GLRoot r2 = new GLRootStub();
-        a.addComponent(b);
-
-        // Attach to root r
-        assertEquals(0, a.mOnAttachCalled);
-        assertEquals(0, b.mOnAttachCalled);
-        a.attachToRoot(r);
-        assertEquals(1, a.mOnAttachCalled);
-        assertEquals(1, b.mOnAttachCalled);
-        assertSame(r, a.getGLRoot());
-        assertSame(r, b.getGLRoot());
-
-        // Detach from r
-        assertEquals(0, a.mOnDetachCalled);
-        assertEquals(0, b.mOnDetachCalled);
-        a.detachFromRoot();
-        assertEquals(1, a.mOnDetachCalled);
-        assertEquals(1, b.mOnDetachCalled);
-
-        // Attach to another root r2
-        assertEquals(1, a.mOnAttachCalled);
-        assertEquals(1, b.mOnAttachCalled);
-        a.attachToRoot(r2);
-        assertEquals(2, a.mOnAttachCalled);
-        assertEquals(2, b.mOnAttachCalled);
-        assertSame(r2, a.getGLRoot());
-        assertSame(r2, b.getGLRoot());
-
-        // Detach from r2
-        assertEquals(1, a.mOnDetachCalled);
-        assertEquals(1, b.mOnDetachCalled);
-        a.detachFromRoot();
-        assertEquals(2, a.mOnDetachCalled);
-        assertEquals(2, b.mOnDetachCalled);
-    }
-
-    @SmallTest
-    public void testRoot2() {
-        GLView a = new GLViewMock();
-        GLViewMock b = new GLViewMock();
-        GLRoot r = new GLRootStub();
-
-        a.attachToRoot(r);
-
-        assertEquals(0, b.mOnAttachCalled);
-        a.addComponent(b);
-        assertEquals(1, b.mOnAttachCalled);
-
-        assertEquals(0, b.mOnDetachCalled);
-        a.removeComponent(b);
-        assertEquals(1, b.mOnDetachCalled);
-    }
-
-    @SmallTest
-    public void testInvalidate() {
-        GLView a = new GLView();
-        GLRootMock r = new GLRootMock();
-        a.attachToRoot(r);
-        assertEquals(0, r.mRequestRenderCalled);
-        a.invalidate();
-        assertEquals(1, r.mRequestRenderCalled);
-    }
-
-    @SmallTest
-    public void testRequestLayout() {
-        GLView a = new GLView();
-        GLView b = new GLView();
-        GLRootMock r = new GLRootMock();
-        a.attachToRoot(r);
-        a.addComponent(b);
-        assertEquals(0, r.mRequestLayoutContentPaneCalled);
-        b.requestLayout();
-        assertEquals(1, r.mRequestLayoutContentPaneCalled);
-    }
-
-    @SmallTest
-    public void testLayout() {
-        GLViewMock a = new GLViewMock();
-        GLViewMock b = new GLViewMock();
-        GLViewMock c = new GLViewMock();
-        GLRootMock r = new GLRootMock();
-
-        a.attachToRoot(r);
-        a.addComponent(b);
-        a.addComponent(c);
-
-        assertEquals(0, a.mOnLayoutCalled);
-        a.layout(10, 20, 60, 100);
-        assertEquals(1, a.mOnLayoutCalled);
-        assertEquals(1, b.mOnLayoutCalled);
-        assertEquals(1, c.mOnLayoutCalled);
-        assertTrue(a.mOnLayoutChangeSize);
-        assertTrue(b.mOnLayoutChangeSize);
-        assertTrue(c.mOnLayoutChangeSize);
-
-        // same size should not trigger onLayout
-        a.layout(10, 20, 60, 100);
-        assertEquals(1, a.mOnLayoutCalled);
-
-        // unless someone requested it, but only those on the path
-        // to the requester.
-        assertEquals(0, r.mRequestLayoutContentPaneCalled);
-        b.requestLayout();
-        a.layout(10, 20, 60, 100);
-        assertEquals(1, r.mRequestLayoutContentPaneCalled);
-        assertEquals(2, a.mOnLayoutCalled);
-        assertEquals(2, b.mOnLayoutCalled);
-        assertEquals(1, c.mOnLayoutCalled);
-    }
-
-    @SmallTest
-    public void testRender() {
-        GLViewMock a = new GLViewMock();
-        GLViewMock b = new GLViewMock();
-
-        a.addComponent(b);
-        GLCanvasStub canvas = new GLCanvasStub();
-        assertEquals(0, a.mRenderBackgroundCalled);
-        assertEquals(0, b.mRenderBackgroundCalled);
-        a.render(canvas);
-        assertEquals(1, a.mRenderBackgroundCalled);
-        assertEquals(1, b.mRenderBackgroundCalled);
-    }
-
-    @SmallTest
-    public void testMeasure() {
-        GLViewMock a = new GLViewMock();
-        GLViewMock b = new GLViewMock();
-        GLViewMock c = new GLViewMock();
-        GLRootMock r = new GLRootMock();
-
-        a.addComponent(b);
-        a.addComponent(c);
-        a.attachToRoot(r);
-
-        assertEquals(0, a.mOnMeasureCalled);
-        a.measure(100, 200);
-        assertEquals(1, a.mOnMeasureCalled);
-        assertEquals(1, b.mOnMeasureCalled);
-        assertEquals(100, a.mOnMeasureWidthSpec);
-        assertEquals(200, a.mOnMeasureHeightSpec);
-        assertEquals(100, b.mOnMeasureWidthSpec);
-        assertEquals(200, b.mOnMeasureHeightSpec);
-        assertEquals(100, a.getMeasuredWidth());
-        assertEquals(200, b.getMeasuredHeight());
-
-        // same spec should not trigger onMeasure
-        a.measure(100, 200);
-        assertEquals(1, a.mOnMeasureCalled);
-
-        // unless someone requested it, but only those on the path
-        // to the requester.
-        b.requestLayout();
-        a.measure(100, 200);
-        assertEquals(2, a.mOnMeasureCalled);
-        assertEquals(2, b.mOnMeasureCalled);
-        assertEquals(1, c.mOnMeasureCalled);
-    }
-
-    class MyGLView extends GLView {
-        private int mWidth;
-        int mOnTouchCalled;
-        int mOnTouchX;
-        int mOnTouchY;
-        int mOnTouchAction;
-
-        public MyGLView(int width) {
-            mWidth = width;
-        }
-
-        @Override
-        protected void onLayout(boolean changeSize, int left, int top,
-                int right, int bottom) {
-            // layout children from left to right
-            // call children's layout.
-            int x = 0;
-            for (int i = 0, n = getComponentCount(); i < n; ++i) {
-                GLView item = getComponent(i);
-                item.measure(0, 0);
-                int w = item.getMeasuredWidth();
-                int h = item.getMeasuredHeight();
-                item.layout(x, 0, x + w, h);
-                x += w;
-            }
-        }
-
-        @Override
-        protected void onMeasure(int widthSpec, int heightSpec) {
-            setMeasuredSize(mWidth, 100);
-        }
-
-        @Override
-        protected boolean onTouch(MotionEvent event) {
-            mOnTouchCalled++;
-            mOnTouchX = (int) event.getX();
-            mOnTouchY = (int) event.getY();
-            mOnTouchAction = event.getAction();
-            return true;
-        }
-    }
-
-    private MotionEvent NewMotionEvent(int action, int x, int y) {
-        return MotionEvent.obtain(0, 0, action, x, y, 0);
-    }
-
-    @SmallTest
-    public void testTouchEvent() {
-        // We construct a tree with four nodes. Only the x coordinate is used:
-        // A = [0..............................300)
-        // B = [0......100)
-        // C =             [100......200)
-        // D =             [100..150)
-
-        MyGLView a = new MyGLView(300);
-        MyGLView b = new MyGLView(100);
-        MyGLView c = new MyGLView(100);
-        MyGLView d = new MyGLView(50);
-        GLRoot r = new GLRootStub();
-
-        a.addComponent(b);
-        a.addComponent(c);
-        c.addComponent(d);
-        a.attachToRoot(r);
-        a.layout(0, 0, 300, 100);
-
-        int DOWN = MotionEvent.ACTION_DOWN;
-        int UP = MotionEvent.ACTION_UP;
-        int MOVE = MotionEvent.ACTION_MOVE;
-        int CANCEL = MotionEvent.ACTION_CANCEL;
-
-        // simple case
-        assertEquals(0, a.mOnTouchCalled);
-        a.dispatchTouchEvent(NewMotionEvent(DOWN, 250, 0));
-        assertEquals(DOWN, a.mOnTouchAction);
-        a.dispatchTouchEvent(NewMotionEvent(UP, 250, 0));
-        assertEquals(UP, a.mOnTouchAction);
-        assertEquals(2, a.mOnTouchCalled);
-
-        // pass to a child, check the location is offseted.
-        assertEquals(0, c.mOnTouchCalled);
-        a.dispatchTouchEvent(NewMotionEvent(DOWN, 175, 0));
-        a.dispatchTouchEvent(NewMotionEvent(UP, 175, 0));
-        assertEquals(75, c.mOnTouchX);
-        assertEquals(0, c.mOnTouchY);
-        assertEquals(2, c.mOnTouchCalled);
-        assertEquals(2, a.mOnTouchCalled);
-
-        // motion target cancel event
-        assertEquals(0, d.mOnTouchCalled);
-        a.dispatchTouchEvent(NewMotionEvent(DOWN, 125, 0));
-        assertEquals(1, d.mOnTouchCalled);
-        a.dispatchTouchEvent(NewMotionEvent(MOVE, 250, 0));
-        assertEquals(2, d.mOnTouchCalled);
-        a.dispatchTouchEvent(NewMotionEvent(MOVE, 50, 0));
-        assertEquals(3, d.mOnTouchCalled);
-        a.dispatchTouchEvent(NewMotionEvent(DOWN, 175, 0));
-        assertEquals(4, d.mOnTouchCalled);
-        assertEquals(CANCEL, d.mOnTouchAction);
-        assertEquals(3, c.mOnTouchCalled);
-        assertEquals(DOWN, c.mOnTouchAction);
-        a.dispatchTouchEvent(NewMotionEvent(UP, 175, 0));
-
-        // motion target is removed
-        assertEquals(4, d.mOnTouchCalled);
-        a.dispatchTouchEvent(NewMotionEvent(DOWN, 125, 0));
-        assertEquals(5, d.mOnTouchCalled);
-        a.removeComponent(c);
-        assertEquals(6, d.mOnTouchCalled);
-        assertEquals(CANCEL, d.mOnTouchAction);
-
-        // invisible component should not get events
-        assertEquals(2, a.mOnTouchCalled);
-        assertEquals(0, b.mOnTouchCalled);
-        b.setVisibility(GLView.INVISIBLE);
-        a.dispatchTouchEvent(NewMotionEvent(DOWN, 50, 0));
-        assertEquals(3, a.mOnTouchCalled);
-        assertEquals(0, b.mOnTouchCalled);
-    }
-}
diff --git a/tests/src/com/android/gallery3d/ui/PointerInfo.java b/tests/src/com/android/gallery3d/ui/PointerInfo.java
deleted file mode 100644
index 6c78556..0000000
--- a/tests/src/com/android/gallery3d/ui/PointerInfo.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.ui;
-
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.CharBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.LongBuffer;
-import java.nio.ShortBuffer;
-
-import javax.microedition.khronos.opengles.GL10;
-
-public class PointerInfo {
-
-    /**
-     * The number of coordinates per vertex. 1..4
-     */
-    public int mSize;
-
-    /**
-     * The type of each coordinate.
-     */
-    public int mType;
-
-    /**
-     * The byte offset between consecutive vertices. 0 means mSize *
-     * sizeof(mType)
-     */
-    public int mStride;
-    public Buffer mPointer;
-    public ByteBuffer mTempByteBuffer;
-
-    public PointerInfo(int size, int type, int stride, Buffer pointer) {
-        mSize = size;
-        mType = type;
-        mStride = stride;
-        mPointer = pointer;
-    }
-
-    private int getStride() {
-        return mStride > 0 ? mStride : sizeof(mType) * mSize;
-    }
-
-    public void bindByteBuffer() {
-        mTempByteBuffer = mPointer == null ? null : toByteBuffer(-1, mPointer);
-    }
-
-    public void unbindByteBuffer() {
-        mTempByteBuffer = null;
-    }
-
-    private static int sizeof(int type) {
-        switch (type) {
-        case GL10.GL_UNSIGNED_BYTE:
-            return 1;
-        case GL10.GL_BYTE:
-            return 1;
-        case GL10.GL_SHORT:
-            return 2;
-        case GL10.GL_FIXED:
-            return 4;
-        case GL10.GL_FLOAT:
-            return 4;
-        default:
-            return 0;
-        }
-    }
-
-    private static ByteBuffer toByteBuffer(int byteCount, Buffer input) {
-        ByteBuffer result = null;
-        boolean convertWholeBuffer = (byteCount < 0);
-        if (input instanceof ByteBuffer) {
-            ByteBuffer input2 = (ByteBuffer) input;
-            int position = input2.position();
-            if (convertWholeBuffer) {
-                byteCount = input2.limit() - position;
-            }
-            result = ByteBuffer.allocate(byteCount).order(input2.order());
-            for (int i = 0; i < byteCount; i++) {
-                result.put(input2.get());
-            }
-            input2.position(position);
-        } else if (input instanceof CharBuffer) {
-            CharBuffer input2 = (CharBuffer) input;
-            int position = input2.position();
-            if (convertWholeBuffer) {
-                byteCount = (input2.limit() - position) * 2;
-            }
-            result = ByteBuffer.allocate(byteCount).order(input2.order());
-            CharBuffer result2 = result.asCharBuffer();
-            for (int i = 0; i < byteCount / 2; i++) {
-                result2.put(input2.get());
-            }
-            input2.position(position);
-        } else if (input instanceof ShortBuffer) {
-            ShortBuffer input2 = (ShortBuffer) input;
-            int position = input2.position();
-            if (convertWholeBuffer) {
-                byteCount = (input2.limit() - position)* 2;
-            }
-            result = ByteBuffer.allocate(byteCount).order(input2.order());
-            ShortBuffer result2 = result.asShortBuffer();
-            for (int i = 0; i < byteCount / 2; i++) {
-                result2.put(input2.get());
-            }
-            input2.position(position);
-        } else if (input instanceof IntBuffer) {
-            IntBuffer input2 = (IntBuffer) input;
-            int position = input2.position();
-            if (convertWholeBuffer) {
-                byteCount = (input2.limit() - position) * 4;
-            }
-            result = ByteBuffer.allocate(byteCount).order(input2.order());
-            IntBuffer result2 = result.asIntBuffer();
-            for (int i = 0; i < byteCount / 4; i++) {
-                result2.put(input2.get());
-            }
-            input2.position(position);
-        } else if (input instanceof FloatBuffer) {
-            FloatBuffer input2 = (FloatBuffer) input;
-            int position = input2.position();
-            if (convertWholeBuffer) {
-                byteCount = (input2.limit() - position) * 4;
-            }
-            result = ByteBuffer.allocate(byteCount).order(input2.order());
-            FloatBuffer result2 = result.asFloatBuffer();
-            for (int i = 0; i < byteCount / 4; i++) {
-                result2.put(input2.get());
-            }
-            input2.position(position);
-        } else if (input instanceof DoubleBuffer) {
-            DoubleBuffer input2 = (DoubleBuffer) input;
-            int position = input2.position();
-            if (convertWholeBuffer) {
-                byteCount = (input2.limit() - position) * 8;
-            }
-            result = ByteBuffer.allocate(byteCount).order(input2.order());
-            DoubleBuffer result2 = result.asDoubleBuffer();
-            for (int i = 0; i < byteCount / 8; i++) {
-                result2.put(input2.get());
-            }
-            input2.position(position);
-        } else if (input instanceof LongBuffer) {
-            LongBuffer input2 = (LongBuffer) input;
-            int position = input2.position();
-            if (convertWholeBuffer) {
-                byteCount = (input2.limit() - position) * 8;
-            }
-            result = ByteBuffer.allocate(byteCount).order(input2.order());
-            LongBuffer result2 = result.asLongBuffer();
-            for (int i = 0; i < byteCount / 8; i++) {
-                result2.put(input2.get());
-            }
-            input2.position(position);
-        } else {
-            throw new RuntimeException("Unimplemented Buffer subclass.");
-        }
-        result.rewind();
-        // The OpenGL API will interpret the result in hardware byte order,
-        // so we better do that as well:
-        result.order(ByteOrder.nativeOrder());
-        return result;
-    }
-
-    public void getArrayElement(int index, double[] result) {
-        if (mTempByteBuffer == null) {
-            throw new IllegalArgumentException("undefined pointer");
-        }
-        if (mStride < 0) {
-            throw new IllegalArgumentException("invalid stride");
-        }
-
-        int stride = getStride();
-        ByteBuffer byteBuffer = mTempByteBuffer;
-        int size = mSize;
-        int type = mType;
-        int sizeofType = sizeof(type);
-        int byteOffset = stride * index;
-
-        for (int i = 0; i < size; i++) {
-            switch (type) {
-            case GL10.GL_BYTE:
-            case GL10.GL_UNSIGNED_BYTE:
-                result[i] = byteBuffer.get(byteOffset);
-                break;
-            case GL10.GL_SHORT:
-                ShortBuffer shortBuffer = byteBuffer.asShortBuffer();
-                result[i] = shortBuffer.get(byteOffset / 2);
-                break;
-            case GL10.GL_FIXED:
-                IntBuffer intBuffer = byteBuffer.asIntBuffer();
-                result[i] = intBuffer.get(byteOffset / 4);
-                break;
-            case GL10.GL_FLOAT:
-                FloatBuffer floatBuffer = byteBuffer.asFloatBuffer();
-                result[i] = floatBuffer.get(byteOffset / 4);
-                break;
-            default:
-                throw new UnsupportedOperationException("unknown type");
-            }
-            byteOffset += sizeofType;
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/util/IntArrayTest.java b/tests/src/com/android/gallery3d/util/IntArrayTest.java
deleted file mode 100644
index 83e6050..0000000
--- a/tests/src/com/android/gallery3d/util/IntArrayTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package com.android.gallery3d.util;
-
-import com.android.gallery3d.util.IntArray;
-
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
-
-import java.util.Arrays;
-import junit.framework.TestCase;
-
-@SmallTest
-public class IntArrayTest extends TestCase {
-    private static final String TAG = "IntArrayTest";
-
-    public void testIntArray() {
-        IntArray a = new IntArray();
-        assertEquals(0, a.size());
-        assertTrue(Arrays.equals(new int[] {}, a.toArray(null)));
-
-        a.add(0);
-        assertEquals(1, a.size());
-        assertTrue(Arrays.equals(new int[] {0}, a.toArray(null)));
-
-        a.add(1);
-        assertEquals(2, a.size());
-        assertTrue(Arrays.equals(new int[] {0, 1}, a.toArray(null)));
-
-        int[] buf = new int[2];
-        int[] result = a.toArray(buf);
-        assertSame(buf, result);
-
-        IntArray b = new IntArray();
-        for (int i = 0; i < 100; i++) {
-            b.add(i * i);
-        }
-
-        assertEquals(100, b.size());
-        result = b.toArray(buf);
-        assertEquals(100, result.length);
-        for (int i = 0; i < 100; i++) {
-            assertEquals(i * i, result[i]);
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/util/ProfileTest.java b/tests/src/com/android/gallery3d/util/ProfileTest.java
deleted file mode 100644
index 798b905..0000000
--- a/tests/src/com/android/gallery3d/util/ProfileTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.gallery3d.util;
-
-import com.android.gallery3d.util.Profile;
-
-import android.os.Environment;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
-
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-@SmallTest
-public class ProfileTest extends TestCase {
-    private static final String TAG = "ProfileTest";
-    private static final String TEST_FILE =
-            Environment.getExternalStorageDirectory().getPath() + "/test.dat";
-
-
-    public void testProfile() throws IOException {
-        ProfileData p = new ProfileData();
-        ParsedProfile q;
-        String[] A = {"A"};
-        String[] B = {"B"};
-        String[] AC = {"A", "C"};
-        String[] AD = {"A", "D"};
-
-        // Empty profile
-        p.dumpToFile(TEST_FILE);
-        q = new ParsedProfile(TEST_FILE);
-        assertTrue(q.mEntries.isEmpty());
-        assertTrue(q.mSymbols.isEmpty());
-
-        // Only one sample
-        p.addSample(A);
-        p.dumpToFile(TEST_FILE);
-        q = new ParsedProfile(TEST_FILE);
-        assertEquals(1, q.mEntries.size());
-        assertEquals(1, q.mSymbols.size());
-        assertEquals(1, q.mEntries.get(0).sampleCount);
-
-        // Two samples at the same place
-        p.addSample(A);
-        p.dumpToFile(TEST_FILE);
-        q = new ParsedProfile(TEST_FILE);
-        assertEquals(1, q.mEntries.size());
-        assertEquals(1, q.mSymbols.size());
-        assertEquals(2, q.mEntries.get(0).sampleCount);
-
-        // Two samples at the different places
-        p.reset();
-        p.addSample(A);
-        p.addSample(B);
-        p.dumpToFile(TEST_FILE);
-        q = new ParsedProfile(TEST_FILE);
-        assertEquals(2, q.mEntries.size());
-        assertEquals(2, q.mSymbols.size());
-        assertEquals(1, q.mEntries.get(0).sampleCount);
-        assertEquals(1, q.mEntries.get(1).sampleCount);
-
-        // depth > 1
-        p.reset();
-        p.addSample(AC);
-        p.dumpToFile(TEST_FILE);
-        q = new ParsedProfile(TEST_FILE);
-        assertEquals(1, q.mEntries.size());
-        assertEquals(2, q.mSymbols.size());
-        assertEquals(1, q.mEntries.get(0).sampleCount);
-
-        // two samples (AC and AD)
-        p.addSample(AD);
-        p.dumpToFile(TEST_FILE);
-        q = new ParsedProfile(TEST_FILE);
-        assertEquals(2, q.mEntries.size());
-        assertEquals(3, q.mSymbols.size());  // three symbols: A, C, D
-        assertEquals(1, q.mEntries.get(0).sampleCount);
-        assertEquals(1, q.mEntries.get(0).sampleCount);
-
-        // Remove the test file
-        new File(TEST_FILE).delete();
-    }
-}
-
-class ParsedProfile {
-    public class Entry {
-        int sampleCount;
-        int stackId[];
-    }
-
-    ArrayList<Entry> mEntries = new ArrayList<Entry>();
-    HashMap<Integer, String> mSymbols = new HashMap<Integer, String>();
-    private DataInputStream mIn;
-    private byte[] mScratch = new byte[4];  // scratch buffer for readInt
-
-    public ParsedProfile(String filename) throws IOException {
-        mIn = new DataInputStream(new FileInputStream(filename));
-
-        Entry entry = parseOneEntry();
-        checkIsFirstEntry(entry);
-
-        while (true) {
-            entry = parseOneEntry();
-            if (entry.sampleCount == 0) {
-                checkIsLastEntry(entry);
-                break;
-            }
-            mEntries.add(entry);
-        }
-
-        // Read symbol table
-        while (true) {
-            String line = mIn.readLine();
-            if (line == null) break;
-            String[] fields = line.split(" +");
-            checkIsValidSymbolLine(fields);
-            mSymbols.put(Integer.decode(fields[0]), fields[1]);
-        }
-    }
-
-    private void checkIsFirstEntry(Entry entry) {
-        Assert.assertEquals(0, entry.sampleCount);
-        Assert.assertEquals(3, entry.stackId.length);
-        Assert.assertEquals(1, entry.stackId[0]);
-        Assert.assertTrue(entry.stackId[1] > 0);  // sampling period
-        Assert.assertEquals(0, entry.stackId[2]);  // padding
-    }
-
-    private void checkIsLastEntry(Entry entry) {
-        Assert.assertEquals(0, entry.sampleCount);
-        Assert.assertEquals(1, entry.stackId.length);
-        Assert.assertEquals(0, entry.stackId[0]);
-    }
-
-    private void checkIsValidSymbolLine(String[] fields) {
-        Assert.assertEquals(2, fields.length);
-        Assert.assertTrue(fields[0].startsWith("0x"));
-    }
-
-    private Entry parseOneEntry() throws IOException {
-        int sampleCount = readInt();
-        int depth = readInt();
-        Entry e = new Entry();
-        e.sampleCount = sampleCount;
-        e.stackId = new int[depth];
-        for (int i = 0; i < depth; i++) {
-            e.stackId[i] = readInt();
-        }
-        return e;
-    }
-
-    private int readInt() throws IOException {
-        mIn.read(mScratch, 0, 4);
-        return (mScratch[0] & 0xff) |
-                ((mScratch[1] & 0xff) << 8) |
-                ((mScratch[2] & 0xff) << 16) |
-                ((mScratch[3] & 0xff) << 24);
-    }
-}
diff --git a/tests/src/com/android/photos/data/DataTestRunner.java b/tests/src/com/android/photos/data/DataTestRunner.java
deleted file mode 100644
index 4322585..0000000
--- a/tests/src/com/android/photos/data/DataTestRunner.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-package com.android.photos.data;
-
-import android.test.InstrumentationTestRunner;
-import android.test.InstrumentationTestSuite;
-
-import junit.framework.TestSuite;
-
-public class DataTestRunner extends InstrumentationTestRunner {
-    @Override
-    public TestSuite getAllTests() {
-        TestSuite suite = new InstrumentationTestSuite(this);
-        suite.addTestSuite(PhotoDatabaseTest.class);
-        suite.addTestSuite(PhotoProviderTest.class);
-        return suite;
-    }
-
-    @Override
-    public ClassLoader getLoader() {
-        return DataTestRunner.class.getClassLoader();
-    }
-}
diff --git a/tests/src/com/android/photos/data/PhotoDatabaseTest.java b/tests/src/com/android/photos/data/PhotoDatabaseTest.java
deleted file mode 100644
index 92381d9..0000000
--- a/tests/src/com/android/photos/data/PhotoDatabaseTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-package com.android.photos.data;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteDatabase;
-import android.test.InstrumentationTestCase;
-
-import com.android.photos.data.PhotoProvider.Accounts;
-import com.android.photos.data.PhotoProvider.Albums;
-import com.android.photos.data.PhotoProvider.Metadata;
-import com.android.photos.data.PhotoProvider.Photos;
-
-import java.io.File;
-import java.io.IOException;
-
-public class PhotoDatabaseTest extends InstrumentationTestCase {
-
-    private PhotoDatabase mDBHelper;
-    private static final String DB_NAME = "dummy.db";
-    private static final long PARENT_ID1 = 100;
-    private static final long PARENT_ID2 = 101;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        Context context = getInstrumentation().getTargetContext();
-        context.deleteDatabase(DB_NAME);
-        mDBHelper = new PhotoDatabase(context, DB_NAME);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDBHelper.close();
-        mDBHelper = null;
-        Context context = getInstrumentation().getTargetContext();
-        context.deleteDatabase(DB_NAME);
-        super.tearDown();
-    }
-
-    public void testCreateDatabase() throws IOException {
-        Context context = getInstrumentation().getTargetContext();
-        File dbFile = context.getDatabasePath(DB_NAME);
-        SQLiteDatabase db = getReadableDB();
-        db.beginTransaction();
-        db.endTransaction();
-        assertTrue(dbFile.exists());
-    }
-
-    public void testTables() {
-        validateTable(Metadata.TABLE, PhotoDatabaseUtils.PROJECTION_METADATA);
-        validateTable(Albums.TABLE, PhotoDatabaseUtils.PROJECTION_ALBUMS);
-        validateTable(Photos.TABLE, PhotoDatabaseUtils.PROJECTION_PHOTOS);
-    }
-
-    public void testAlbumsConstraints() {
-        SQLiteDatabase db = getWritableDB();
-        db.beginTransaction();
-        try {
-            long accountId = 100;
-            // Test NOT NULL constraint on name
-            assertFalse(PhotoDatabaseUtils.insertAlbum(db, null, null, Albums.VISIBILITY_PRIVATE,
-                    accountId));
-
-            // test NOT NULL constraint on privacy
-            assertFalse(PhotoDatabaseUtils.insertAlbum(db, null, "hello", null, accountId));
-
-            // test NOT NULL constraint on account_id
-            assertFalse(PhotoDatabaseUtils.insertAlbum(db, null, "hello",
-                    Albums.VISIBILITY_PRIVATE, null));
-
-            // Normal insert
-            assertTrue(PhotoDatabaseUtils.insertAlbum(db, PARENT_ID1, "hello",
-                    Albums.VISIBILITY_PRIVATE, accountId));
-
-            long albumId = PhotoDatabaseUtils.queryAlbumIdFromParentId(db, PARENT_ID1);
-
-            // Assign a valid child
-            assertTrue(PhotoDatabaseUtils.insertAlbum(db, PARENT_ID2, "hello",
-                    Albums.VISIBILITY_PRIVATE, accountId));
-
-            long otherAlbumId = PhotoDatabaseUtils.queryAlbumIdFromParentId(db, PARENT_ID2);
-            assertNotSame(albumId, otherAlbumId);
-
-            // This is a valid child of another album.
-            assertTrue(PhotoDatabaseUtils.insertAlbum(db, otherAlbumId, "hello",
-                    Albums.VISIBILITY_PRIVATE, accountId));
-
-            // This isn't allowed due to uniqueness constraint (parent_id/name)
-            assertFalse(PhotoDatabaseUtils.insertAlbum(db, otherAlbumId, "hello",
-                    Albums.VISIBILITY_PRIVATE, accountId));
-        } finally {
-            db.endTransaction();
-        }
-    }
-
-    public void testPhotosConstraints() {
-        SQLiteDatabase db = getWritableDB();
-        db.beginTransaction();
-        try {
-            int width = 100;
-            int height = 100;
-            long dateTaken = System.currentTimeMillis();
-            String mimeType = "test/test";
-            long accountId = 100;
-
-            // Test NOT NULL mime-type
-            assertFalse(PhotoDatabaseUtils.insertPhoto(db, width, height, dateTaken, null, null,
-                    accountId));
-
-            // Test NOT NULL width
-            assertFalse(PhotoDatabaseUtils.insertPhoto(db, null, height, dateTaken, null, mimeType,
-                    accountId));
-
-            // Test NOT NULL height
-            assertFalse(PhotoDatabaseUtils.insertPhoto(db, width, null, dateTaken, null, mimeType,
-                    accountId));
-
-            // Test NOT NULL dateTaken
-            assertFalse(PhotoDatabaseUtils.insertPhoto(db, width, height, null, null, mimeType,
-                    accountId));
-
-            // Test NOT NULL accountId
-            assertFalse(PhotoDatabaseUtils.insertPhoto(db, width, height, dateTaken, null,
-                    mimeType, null));
-
-            // Test normal insert
-            assertTrue(PhotoDatabaseUtils.insertPhoto(db, width, height, dateTaken, null, mimeType,
-                    accountId));
-        } finally {
-            db.endTransaction();
-        }
-    }
-
-    public void testMetadataConstraints() {
-        SQLiteDatabase db = getWritableDB();
-        db.beginTransaction();
-        try {
-            final String mimeType = "test/test";
-            PhotoDatabaseUtils.insertPhoto(db, 100, 100, 100L, PARENT_ID1, mimeType, 100L);
-            long photoId = PhotoDatabaseUtils.queryPhotoIdFromAlbumId(db, PARENT_ID1);
-
-            // Test NOT NULL PHOTO_ID constraint.
-            assertFalse(PhotoDatabaseUtils.insertMetadata(db, null, "foo", "bar"));
-
-            // Normal insert.
-            assertTrue(PhotoDatabaseUtils.insertMetadata(db, photoId, "foo", "bar"));
-
-            // Test uniqueness constraint.
-            assertFalse(PhotoDatabaseUtils.insertMetadata(db, photoId, "foo", "baz"));
-        } finally {
-            db.endTransaction();
-        }
-    }
-
-    public void testAccountsConstraints() {
-        SQLiteDatabase db = getWritableDB();
-        db.beginTransaction();
-        try {
-            assertFalse(PhotoDatabaseUtils.insertAccount(db, null));
-            assertTrue(PhotoDatabaseUtils.insertAccount(db, "hello"));
-            assertFalse(PhotoDatabaseUtils.insertAccount(db, "hello"));
-        } finally {
-            db.endTransaction();
-        }
-    }
-
-    public void testUpgrade() {
-        SQLiteDatabase db = getWritableDB();
-        db.beginTransaction();
-        try {
-            assertTrue(PhotoDatabaseUtils.insertAccount(db, "Hello"));
-            assertTrue(PhotoDatabaseUtils.insertAlbum(db, PARENT_ID1, "hello",
-                    Albums.VISIBILITY_PRIVATE, 100L));
-            final String mimeType = "test/test";
-            assertTrue(PhotoDatabaseUtils.insertPhoto(db, 100, 100, 100L, PARENT_ID1, mimeType,
-                    100L));
-            // Normal insert.
-            assertTrue(PhotoDatabaseUtils.insertMetadata(db, 100L, "foo", "bar"));
-            db.setTransactionSuccessful();
-        } finally {
-            db.endTransaction();
-        }
-        mDBHelper.close();
-        Context context = getInstrumentation().getTargetContext();
-        mDBHelper = new PhotoDatabase(context, DB_NAME, PhotoDatabase.DB_VERSION + 1);
-        db = getReadableDB();
-        assertEquals(0, DatabaseUtils.queryNumEntries(db, Accounts.TABLE));
-        assertEquals(0, DatabaseUtils.queryNumEntries(db, Photos.TABLE));
-        assertEquals(0, DatabaseUtils.queryNumEntries(db, Albums.TABLE));
-        assertEquals(0, DatabaseUtils.queryNumEntries(db, Metadata.TABLE));
-    }
-
-    private SQLiteDatabase getReadableDB() {
-        return mDBHelper.getReadableDatabase();
-    }
-
-    private SQLiteDatabase getWritableDB() {
-        return mDBHelper.getWritableDatabase();
-    }
-
-    private void validateTable(String table, String[] projection) {
-        SQLiteDatabase db = getReadableDB();
-        Cursor cursor = db.query(table, projection, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(cursor.getCount(), 0);
-        assertEquals(cursor.getColumnCount(), projection.length);
-        for (int i = 0; i < projection.length; i++) {
-            assertEquals(cursor.getColumnName(i), projection[i]);
-        }
-    }
-
-
-}
diff --git a/tests/src/com/android/photos/data/PhotoDatabaseUtils.java b/tests/src/com/android/photos/data/PhotoDatabaseUtils.java
deleted file mode 100644
index f7a46d4..0000000
--- a/tests/src/com/android/photos/data/PhotoDatabaseUtils.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-package com.android.photos.data;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.android.photos.data.PhotoProvider.Accounts;
-import com.android.photos.data.PhotoProvider.Albums;
-import com.android.photos.data.PhotoProvider.Metadata;
-import com.android.photos.data.PhotoProvider.Photos;
-
-import junit.framework.AssertionFailedError;
-
-public class PhotoDatabaseUtils {
-    public static String[] PROJECTION_ALBUMS = {
-        Albums._ID,
-        Albums.ACCOUNT_ID,
-        Albums.PARENT_ID,
-        Albums.VISIBILITY,
-        Albums.LOCATION_STRING,
-        Albums.TITLE,
-        Albums.SUMMARY,
-        Albums.DATE_PUBLISHED,
-        Albums.DATE_MODIFIED,
-    };
-
-    public static String[] PROJECTION_METADATA = {
-        Metadata.PHOTO_ID,
-        Metadata.KEY,
-        Metadata.VALUE,
-    };
-
-    public static String[] PROJECTION_PHOTOS = {
-        Photos._ID,
-        Photos.ACCOUNT_ID,
-        Photos.WIDTH,
-        Photos.HEIGHT,
-        Photos.DATE_TAKEN,
-        Photos.ALBUM_ID,
-        Photos.MIME_TYPE,
-        Photos.TITLE,
-        Photos.DATE_MODIFIED,
-        Photos.ROTATION,
-    };
-
-    public static String[] PROJECTION_ACCOUNTS = {
-        Accounts._ID,
-        Accounts.ACCOUNT_NAME,
-    };
-
-    private static String SELECTION_ALBUM_PARENT_ID = Albums.PARENT_ID + " = ?";
-    private static String SELECTION_PHOTO_ALBUM_ID = Photos.ALBUM_ID + " = ?";
-    private static String SELECTION_ACCOUNT_ID = Accounts.ACCOUNT_NAME + " = ?";
-
-    public static long queryAlbumIdFromParentId(SQLiteDatabase db, long parentId) {
-        return queryId(db, Albums.TABLE, PROJECTION_ALBUMS, SELECTION_ALBUM_PARENT_ID, parentId);
-    }
-
-    public static long queryPhotoIdFromAlbumId(SQLiteDatabase db, long albumId) {
-        return queryId(db, Photos.TABLE, PROJECTION_PHOTOS, SELECTION_PHOTO_ALBUM_ID, albumId);
-    }
-
-    public static long queryAccountIdFromName(SQLiteDatabase db, String accountName) {
-        return queryId(db, Accounts.TABLE, PROJECTION_ACCOUNTS, SELECTION_ACCOUNT_ID, accountName);
-    }
-
-    public static long queryId(SQLiteDatabase db, String table, String[] projection,
-            String selection, Object parameter) {
-        String paramString = parameter == null ? null : parameter.toString();
-        String[] selectionArgs = {
-            paramString,
-        };
-        Cursor cursor = db.query(table, projection, selection, selectionArgs, null, null, null);
-        try {
-            if (cursor.getCount() != 1 || !cursor.moveToNext()) {
-                throw new AssertionFailedError("Couldn't find item in table");
-            }
-            long id = cursor.getLong(0);
-            return id;
-        } finally {
-            cursor.close();
-        }
-    }
-
-    public static boolean insertPhoto(SQLiteDatabase db, Integer width, Integer height,
-            Long dateTaken, Long albumId, String mimeType, Long accountId) {
-        ContentValues values = new ContentValues();
-        values.put(Photos.WIDTH, width);
-        values.put(Photos.HEIGHT, height);
-        values.put(Photos.DATE_TAKEN, dateTaken);
-        values.put(Photos.ALBUM_ID, albumId);
-        values.put(Photos.MIME_TYPE, mimeType);
-        values.put(Photos.ACCOUNT_ID, accountId);
-        return db.insert(Photos.TABLE, null, values) != -1;
-    }
-
-    public static boolean insertAlbum(SQLiteDatabase db, Long parentId, String title,
-            Integer privacy, Long accountId) {
-        ContentValues values = new ContentValues();
-        values.put(Albums.PARENT_ID, parentId);
-        values.put(Albums.TITLE, title);
-        values.put(Albums.VISIBILITY, privacy);
-        values.put(Albums.ACCOUNT_ID, accountId);
-        return db.insert(Albums.TABLE, null, values) != -1;
-    }
-
-    public static boolean insertMetadata(SQLiteDatabase db, Long photosId, String key, String value) {
-        ContentValues values = new ContentValues();
-        values.put(Metadata.PHOTO_ID, photosId);
-        values.put(Metadata.KEY, key);
-        values.put(Metadata.VALUE, value);
-        return db.insert(Metadata.TABLE, null, values) != -1;
-    }
-
-    public static boolean insertAccount(SQLiteDatabase db, String name) {
-        ContentValues values = new ContentValues();
-        values.put(Accounts.ACCOUNT_NAME, name);
-        return db.insert(Accounts.TABLE, null, values) != -1;
-    }
-}
diff --git a/tests/src/com/android/photos/data/PhotoProviderTest.java b/tests/src/com/android/photos/data/PhotoProviderTest.java
deleted file mode 100644
index 685946e..0000000
--- a/tests/src/com/android/photos/data/PhotoProviderTest.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-package com.android.photos.data;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.OperationApplicationException;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.provider.BaseColumns;
-import android.test.ProviderTestCase2;
-
-import com.android.photos.data.PhotoProvider.Accounts;
-import com.android.photos.data.PhotoProvider.Albums;
-import com.android.photos.data.PhotoProvider.Metadata;
-import com.android.photos.data.PhotoProvider.Photos;
-
-import java.util.ArrayList;
-
-public class PhotoProviderTest extends ProviderTestCase2<PhotoProvider> {
-    @SuppressWarnings("unused")
-    private static final String TAG = PhotoProviderTest.class.getSimpleName();
-
-    private static final String MIME_TYPE = "test/test";
-    private static final String ALBUM_TITLE = "My Album";
-    private static final long ALBUM_PARENT_ID = 100;
-    private static final String META_KEY = "mykey";
-    private static final String META_VALUE = "myvalue";
-    private static final String ACCOUNT_NAME = "foo@bar.com";
-
-    private static final Uri NO_TABLE_URI = PhotoProvider.BASE_CONTENT_URI;
-    private static final Uri BAD_TABLE_URI = Uri.withAppendedPath(PhotoProvider.BASE_CONTENT_URI,
-            "bad_table");
-
-    private static final String WHERE_METADATA_PHOTOS_ID = Metadata.PHOTO_ID + " = ?";
-    private static final String WHERE_METADATA = Metadata.PHOTO_ID + " = ? AND " + Metadata.KEY
-            + " = ?";
-
-    private long mAlbumId;
-    private long mPhotoId;
-    private long mMetadataId;
-    private long mAccountId;
-
-    private SQLiteOpenHelper mDBHelper;
-    private ContentResolver mResolver;
-    private NotificationWatcher mNotifications = new NotificationWatcher();
-
-    public PhotoProviderTest() {
-        super(PhotoProvider.class, PhotoProvider.AUTHORITY);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getMockContentResolver();
-        PhotoProvider provider = (PhotoProvider) getProvider();
-        provider.setMockNotification(mNotifications);
-        mDBHelper = provider.getDatabaseHelper();
-        SQLiteDatabase db = mDBHelper.getWritableDatabase();
-        db.beginTransaction();
-        try {
-            PhotoDatabaseUtils.insertAccount(db, ACCOUNT_NAME);
-            mAccountId = PhotoDatabaseUtils.queryAccountIdFromName(db, ACCOUNT_NAME);
-            PhotoDatabaseUtils.insertAlbum(db, ALBUM_PARENT_ID, ALBUM_TITLE,
-                    Albums.VISIBILITY_PRIVATE, mAccountId);
-            mAlbumId = PhotoDatabaseUtils.queryAlbumIdFromParentId(db, ALBUM_PARENT_ID);
-            PhotoDatabaseUtils.insertPhoto(db, 100, 100, System.currentTimeMillis(), mAlbumId,
-                    MIME_TYPE, mAccountId);
-            mPhotoId = PhotoDatabaseUtils.queryPhotoIdFromAlbumId(db, mAlbumId);
-            PhotoDatabaseUtils.insertMetadata(db, mPhotoId, META_KEY, META_VALUE);
-            String[] projection = {
-                    BaseColumns._ID,
-            };
-            Cursor cursor = db.query(Metadata.TABLE, projection, null, null, null, null, null);
-            cursor.moveToNext();
-            mMetadataId = cursor.getLong(0);
-            cursor.close();
-            db.setTransactionSuccessful();
-            mNotifications.reset();
-        } finally {
-            db.endTransaction();
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDBHelper.close();
-        mDBHelper = null;
-        super.tearDown();
-        getMockContext().deleteDatabase(PhotoProvider.DB_NAME);
-    }
-
-    public void testDelete() {
-        try {
-            mResolver.delete(NO_TABLE_URI, null, null);
-            fail("Exeption should be thrown when no table given");
-        } catch (Exception e) {
-            // expected exception
-        }
-        try {
-            mResolver.delete(BAD_TABLE_URI, null, null);
-            fail("Exeption should be thrown when deleting from a table that doesn't exist");
-        } catch (Exception e) {
-            // expected exception
-        }
-
-        String[] selectionArgs = {
-            String.valueOf(mPhotoId)
-        };
-        // Delete some metadata
-        assertEquals(1,
-                mResolver.delete(Metadata.CONTENT_URI, WHERE_METADATA_PHOTOS_ID, selectionArgs));
-        Uri photoUri = ContentUris.withAppendedId(Photos.CONTENT_URI, mPhotoId);
-        assertEquals(1, mResolver.delete(photoUri, null, null));
-        Uri albumUri = ContentUris.withAppendedId(Albums.CONTENT_URI, mAlbumId);
-        assertEquals(1, mResolver.delete(albumUri, null, null));
-        // now delete something that isn't there
-        assertEquals(0, mResolver.delete(photoUri, null, null));
-    }
-
-    public void testDeleteMetadataId() {
-        Uri metadataUri = ContentUris.withAppendedId(Metadata.CONTENT_URI, mMetadataId);
-        assertEquals(1, mResolver.delete(metadataUri, null, null));
-        Cursor cursor = mResolver.query(Metadata.CONTENT_URI, null, null, null, null);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-    }
-
-    // Delete the album and ensure that the photos referring to the album are
-    // deleted.
-    public void testDeleteAlbumCascade() {
-        Uri albumUri = ContentUris.withAppendedId(Albums.CONTENT_URI, mAlbumId);
-        mResolver.delete(albumUri, null, null);
-        assertTrue(mNotifications.isNotified(Photos.CONTENT_URI));
-        assertTrue(mNotifications.isNotified(Metadata.CONTENT_URI));
-        assertTrue(mNotifications.isNotified(albumUri));
-        assertEquals(3, mNotifications.notificationCount());
-        Cursor cursor = mResolver.query(Photos.CONTENT_URI, PhotoDatabaseUtils.PROJECTION_PHOTOS,
-                null, null, null);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-    }
-
-    // Delete all albums and ensure that photos in any album are deleted.
-    public void testDeleteAlbumCascade2() {
-        mResolver.delete(Albums.CONTENT_URI, null, null);
-        assertTrue(mNotifications.isNotified(Photos.CONTENT_URI));
-        assertTrue(mNotifications.isNotified(Metadata.CONTENT_URI));
-        assertTrue(mNotifications.isNotified(Albums.CONTENT_URI));
-        assertEquals(3, mNotifications.notificationCount());
-        Cursor cursor = mResolver.query(Photos.CONTENT_URI, PhotoDatabaseUtils.PROJECTION_PHOTOS,
-                null, null, null);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-    }
-
-    // Delete a photo and ensure that the metadata for that photo are deleted.
-    public void testDeletePhotoCascade() {
-        Uri photoUri = ContentUris.withAppendedId(Photos.CONTENT_URI, mPhotoId);
-        mResolver.delete(photoUri, null, null);
-        assertTrue(mNotifications.isNotified(photoUri));
-        assertTrue(mNotifications.isNotified(Metadata.CONTENT_URI));
-        assertEquals(2, mNotifications.notificationCount());
-        Cursor cursor = mResolver.query(Metadata.CONTENT_URI,
-                PhotoDatabaseUtils.PROJECTION_METADATA, null, null, null);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-    }
-
-    public void testDeleteAccountCascade() {
-        Uri accountUri = ContentUris.withAppendedId(Accounts.CONTENT_URI, mAccountId);
-        SQLiteDatabase db = mDBHelper.getWritableDatabase();
-        db.beginTransaction();
-        PhotoDatabaseUtils.insertPhoto(db, 100, 100, System.currentTimeMillis(), null,
-                "image/jpeg", mAccountId);
-        PhotoDatabaseUtils.insertPhoto(db, 100, 100, System.currentTimeMillis(), null,
-                "image/jpeg", 0L);
-        PhotoDatabaseUtils.insertAlbum(db, null, "title", Albums.VISIBILITY_PRIVATE, 10630L);
-        db.setTransactionSuccessful();
-        db.endTransaction();
-        // ensure all pictures are there:
-        Cursor cursor = mResolver.query(Photos.CONTENT_URI, null, null, null, null);
-        assertEquals(3, cursor.getCount());
-        cursor.close();
-        // delete the account
-        assertEquals(1, mResolver.delete(accountUri, null, null));
-        // now ensure that all associated photos were deleted
-        cursor = mResolver.query(Photos.CONTENT_URI, null, null, null, null);
-        assertEquals(1, cursor.getCount());
-        cursor.close();
-        // now ensure all associated albums were deleted.
-        cursor = mResolver.query(Albums.CONTENT_URI, null, null, null, null);
-        assertEquals(1, cursor.getCount());
-        cursor.close();
-    }
-
-    public void testGetType() {
-        // We don't return types for albums
-        assertNull(mResolver.getType(Albums.CONTENT_URI));
-
-        Uri noImage = ContentUris.withAppendedId(Photos.CONTENT_URI, mPhotoId + 1);
-        assertNull(mResolver.getType(noImage));
-
-        Uri image = ContentUris.withAppendedId(Photos.CONTENT_URI, mPhotoId);
-        assertEquals(MIME_TYPE, mResolver.getType(image));
-    }
-
-    public void testInsert() {
-        ContentValues values = new ContentValues();
-        values.put(Albums.TITLE, "add me");
-        values.put(Albums.VISIBILITY, Albums.VISIBILITY_PRIVATE);
-        values.put(Albums.ACCOUNT_ID, 100L);
-        values.put(Albums.DATE_MODIFIED, 100L);
-        values.put(Albums.DATE_PUBLISHED, 100L);
-        values.put(Albums.LOCATION_STRING, "Home");
-        values.put(Albums.TITLE, "hello world");
-        values.putNull(Albums.PARENT_ID);
-        values.put(Albums.SUMMARY, "Nothing much to say about this");
-        Uri insertedUri = mResolver.insert(Albums.CONTENT_URI, values);
-        assertNotNull(insertedUri);
-        Cursor cursor = mResolver.query(insertedUri, PhotoDatabaseUtils.PROJECTION_ALBUMS, null,
-                null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.close();
-    }
-
-    public void testUpdate() {
-        ContentValues values = new ContentValues();
-        // Normal update -- use an album.
-        values.put(Albums.TITLE, "foo");
-        Uri albumUri = ContentUris.withAppendedId(Albums.CONTENT_URI, mAlbumId);
-        assertEquals(1, mResolver.update(albumUri, values, null, null));
-        String[] projection = {
-            Albums.TITLE,
-        };
-        Cursor cursor = mResolver.query(albumUri, projection, null, null, null);
-        assertEquals(1, cursor.getCount());
-        assertTrue(cursor.moveToNext());
-        assertEquals("foo", cursor.getString(0));
-        cursor.close();
-
-        // Update a row that doesn't exist.
-        Uri noAlbumUri = ContentUris.withAppendedId(Albums.CONTENT_URI, mAlbumId + 1);
-        values.put(Albums.TITLE, "bar");
-        assertEquals(0, mResolver.update(noAlbumUri, values, null, null));
-
-        // Update a metadata value that exists.
-        ContentValues metadata = new ContentValues();
-        metadata.put(Metadata.PHOTO_ID, mPhotoId);
-        metadata.put(Metadata.KEY, META_KEY);
-        metadata.put(Metadata.VALUE, "new value");
-        assertEquals(1, mResolver.update(Metadata.CONTENT_URI, metadata, null, null));
-
-        projection = new String[] {
-            Metadata.VALUE,
-        };
-
-        String[] selectionArgs = {
-                String.valueOf(mPhotoId), META_KEY,
-        };
-
-        cursor = mResolver.query(Metadata.CONTENT_URI, projection, WHERE_METADATA, selectionArgs,
-                null);
-        assertEquals(1, cursor.getCount());
-        assertTrue(cursor.moveToNext());
-        assertEquals("new value", cursor.getString(0));
-        cursor.close();
-
-        // Update a metadata value that doesn't exist.
-        metadata.put(Metadata.KEY, "other stuff");
-        assertEquals(1, mResolver.update(Metadata.CONTENT_URI, metadata, null, null));
-
-        selectionArgs[1] = "other stuff";
-        cursor = mResolver.query(Metadata.CONTENT_URI, projection, WHERE_METADATA, selectionArgs,
-                null);
-        assertEquals(1, cursor.getCount());
-        assertTrue(cursor.moveToNext());
-        assertEquals("new value", cursor.getString(0));
-        cursor.close();
-
-        // Remove a metadata value using update.
-        metadata.putNull(Metadata.VALUE);
-        assertEquals(1, mResolver.update(Metadata.CONTENT_URI, metadata, null, null));
-        cursor = mResolver.query(Metadata.CONTENT_URI, projection, WHERE_METADATA, selectionArgs,
-                null);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-    }
-
-    public void testQuery() {
-        // Query a photo that exists.
-        Cursor cursor = mResolver.query(Photos.CONTENT_URI, PhotoDatabaseUtils.PROJECTION_PHOTOS,
-                null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        assertTrue(cursor.moveToNext());
-        assertEquals(mPhotoId, cursor.getLong(0));
-        cursor.close();
-
-        // Query a photo that doesn't exist.
-        Uri noPhotoUri = ContentUris.withAppendedId(Photos.CONTENT_URI, mPhotoId + 1);
-        cursor = mResolver.query(noPhotoUri, PhotoDatabaseUtils.PROJECTION_PHOTOS, null, null,
-                null);
-        assertNotNull(cursor);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-
-        // Query a photo that exists using selection arguments.
-        String[] selectionArgs = {
-            String.valueOf(mPhotoId),
-        };
-
-        cursor = mResolver.query(Photos.CONTENT_URI, PhotoDatabaseUtils.PROJECTION_PHOTOS,
-                Photos._ID + " = ?", selectionArgs, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        assertTrue(cursor.moveToNext());
-        assertEquals(mPhotoId, cursor.getLong(0));
-        cursor.close();
-    }
-
-    public void testUpdatePhotoNotification() {
-        Uri photoUri = ContentUris.withAppendedId(Photos.CONTENT_URI, mPhotoId);
-        ContentValues values = new ContentValues();
-        values.put(Photos.MIME_TYPE, "not-a/mime-type");
-        mResolver.update(photoUri, values, null, null);
-        assertTrue(mNotifications.isNotified(photoUri));
-    }
-
-    public void testUpdateMetadataNotification() {
-        ContentValues values = new ContentValues();
-        values.put(Metadata.PHOTO_ID, mPhotoId);
-        values.put(Metadata.KEY, META_KEY);
-        values.put(Metadata.VALUE, "hello world");
-        mResolver.update(Metadata.CONTENT_URI, values, null, null);
-        assertTrue(mNotifications.isNotified(Metadata.CONTENT_URI));
-    }
-
-    public void testBatchTransaction() throws RemoteException, OperationApplicationException {
-        ArrayList<ContentProviderOperation> operations = new ArrayList<ContentProviderOperation>();
-        ContentProviderOperation.Builder insert = ContentProviderOperation
-                .newInsert(Photos.CONTENT_URI);
-        insert.withValue(Photos.WIDTH, 200L);
-        insert.withValue(Photos.HEIGHT, 100L);
-        insert.withValue(Photos.DATE_TAKEN, System.currentTimeMillis());
-        insert.withValue(Photos.ALBUM_ID, 1000L);
-        insert.withValue(Photos.MIME_TYPE, "image/jpg");
-        insert.withValue(Photos.ACCOUNT_ID, 1L);
-        operations.add(insert.build());
-        ContentProviderOperation.Builder update = ContentProviderOperation.newUpdate(Photos.CONTENT_URI);
-        update.withValue(Photos.DATE_MODIFIED, System.currentTimeMillis());
-        String[] whereArgs = {
-            "100",
-        };
-        String where = Photos.WIDTH + " = ?";
-        update.withSelection(where, whereArgs);
-        operations.add(update.build());
-        ContentProviderOperation.Builder delete = ContentProviderOperation
-                .newDelete(Photos.CONTENT_URI);
-        delete.withSelection(where, whereArgs);
-        operations.add(delete.build());
-        mResolver.applyBatch(PhotoProvider.AUTHORITY, operations);
-        assertEquals(3, mNotifications.notificationCount());
-        SQLiteDatabase db = mDBHelper.getReadableDatabase();
-        long id = PhotoDatabaseUtils.queryPhotoIdFromAlbumId(db, 1000L);
-        Uri uri = ContentUris.withAppendedId(Photos.CONTENT_URI, id);
-        assertTrue(mNotifications.isNotified(uri));
-        assertTrue(mNotifications.isNotified(Metadata.CONTENT_URI));
-        assertTrue(mNotifications.isNotified(Photos.CONTENT_URI));
-    }
-
-}
diff --git a/tests/src/com/android/photos/data/TestHelper.java b/tests/src/com/android/photos/data/TestHelper.java
deleted file mode 100644
index 338e160..0000000
--- a/tests/src/com/android/photos/data/TestHelper.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-package com.android.photos.data;
-
-import android.util.Log;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import java.lang.reflect.Method;
-
-public class TestHelper {
-    private static String TAG = TestHelper.class.getSimpleName();
-
-    public interface TestInitialization {
-        void initialize(TestCase testCase);
-    }
-
-    public static void addTests(Class<? extends TestCase> testClass, TestSuite suite,
-            TestInitialization initialization) {
-        for (Method method : testClass.getDeclaredMethods()) {
-            if (method.getName().startsWith("test") && method.getParameterTypes().length == 0) {
-                TestCase test;
-                try {
-                    test = testClass.newInstance();
-                    test.setName(method.getName());
-                    initialization.initialize(test);
-                    suite.addTest(test);
-                } catch (IllegalArgumentException e) {
-                    Log.e(TAG, "Failed to create test case", e);
-                } catch (InstantiationException e) {
-                    Log.e(TAG, "Failed to create test case", e);
-                } catch (IllegalAccessException e) {
-                    Log.e(TAG, "Failed to create test case", e);
-                }
-            }
-        }
-    }
-
-}