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-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-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-iw/filtershow_strings.xml b/res/values-iw/filtershow_strings.xml
index 3c5ebcd..0fcf953 100644
--- a/res/values-iw/filtershow_strings.xml
+++ b/res/values-iw/filtershow_strings.xml
@@ -147,7 +147,7 @@
     <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_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>
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/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-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-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/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-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-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/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);
-                }
-            }
-        }
-    }
-
-}