Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	res/values-de/codeaurora_strings.xml
	res/values-fr/codeaurora_strings.xml
	res/values-lt/codeaurora_strings.xml

Change-Id: I0e79eeb4bd48a9ba9d36f8fe4fa17651822d442b

44 files changed, 1715 insertions, 51 deletions

diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java b/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java
index a1cf0fc85..4310c6ba8 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java
@@ -318,6 +318,13 @@ public class ExifInterface {
     public static final int TAG_INTEROPERABILITY_INDEX =
         defineTag(IfdId.TYPE_IFD_INTEROPERABILITY, (short) 1);
 
+    private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd";
+    private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss";
+    public static final DateFormat DATETIME_FORMAT = new SimpleDateFormat(DATETIME_FORMAT_STR);
+    private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR);
+    private final Calendar mGPSTimeStampCalendar = Calendar
+            .getInstance(TimeZone.getTimeZone("UTC"));
+
     /**
      * Tags that contain offset markers. These are included in the banned
      * defines.
@@ -1944,13 +1951,6 @@ public class ExifInterface {
         return latLon;
     }
 
-    private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd";
-    private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss";
-    private final DateFormat mDateTimeStampFormat = new SimpleDateFormat(DATETIME_FORMAT_STR);
-    private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR);
-    private final Calendar mGPSTimeStampCalendar = Calendar
-            .getInstance(TimeZone.getTimeZone("UTC"));
-
     /**
      * Creates, formats, and sets the DateTimeStamp tag for one of:
      * {@link #TAG_DATE_TIME}, {@link #TAG_DATE_TIME_DIGITIZED},
@@ -1964,8 +1964,8 @@ public class ExifInterface {
     public boolean addDateTimeStampTag(int tagId, long timestamp, TimeZone timezone) {
         if (tagId == TAG_DATE_TIME || tagId == TAG_DATE_TIME_DIGITIZED
                 || tagId == TAG_DATE_TIME_ORIGINAL) {
-            mDateTimeStampFormat.setTimeZone(timezone);
-            ExifTag t = buildTag(tagId, mDateTimeStampFormat.format(timestamp));
+            DATETIME_FORMAT.setTimeZone(timezone);
+            ExifTag t = buildTag(tagId, DATETIME_FORMAT.format(timestamp));
             if (t == null) {
                 return false;
             }
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
index c30a97143..186cb81cf 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
@@ -17,7 +17,6 @@
 package com.android.gallery3d.exif;
 
 import java.nio.charset.Charset;
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 
@@ -102,8 +101,6 @@ public class ExifTag {
     // Value offset in exif header.
     private int mOffset;
 
-    private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("yyyy:MM:dd kk:mm:ss");
-
     /**
      * Returns true if the given IFD is a valid IFD.
      */
@@ -537,9 +534,10 @@ public class ExifTag {
      * @return true on success
      */
     public boolean setTimeValue(long time) {
-        // synchronized on TIME_FORMAT as SimpleDateFormat is not thread safe
-        synchronized (TIME_FORMAT) {
-            return setValue(TIME_FORMAT.format(new Date(time)));
+        // synchronized on DATETIME_FORMAT as SimpleDateFormat is not thread
+        // safe
+        synchronized (ExifInterface.DATETIME_FORMAT) {
+            return setValue(ExifInterface.DATETIME_FORMAT.format(new Date(time)));
         }
     }
 
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
new file mode 100644
index 000000000..020572020
--- /dev/null
+++ b/res/values-ca/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Temps de gravació</string>
+</resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
new file mode 100644
index 000000000..92563d08a
--- /dev/null
+++ b/res/values-cs/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Čas nahrávky</string>
+</resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
new file mode 100644
index 000000000..ec7e3b558
--- /dev/null
+++ b/res/values-da/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Optagelsestidspunkt</string>
+</resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
new file mode 100644
index 000000000..7c20ceb88
--- /dev/null
+++ b/res/values-de/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Aufnahmezeit</string>
+</resources>
diff --git a/res/values-de/codeaurora_strings.xml b/res/values-de/codeaurora_strings.xml
index ee657111f..9362ab820 100644
--- a/res/values-de/codeaurora_strings.xml
+++ b/res/values-de/codeaurora_strings.xml
@@ -36,13 +36,23 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <string name="speaker_on">Lautsprecher an</string>
   <string name="speaker_off">Lautsprecher aus</string>
   <string name="speaker_need_headset">Für diese Funktionen müssen Sie Kopfhörer verwenden.</string>
+  <string name="single_track">"Einzelner Titel"</string>
   <string name="input_url">"Geben Sie eine URL ein"</string>
   <string name="streaming_settings">"Streaming-Einstellungen"</string>
+  <string name="next">"Weiter"</string>
+  <string name="previous">"Zurück"</string>
   <string name="buffer_size">Puffergröße</string>
   <string name="apn">Bevorzugter APN</string>
+  <string name="rtp_min_port">Min. Port</string>
+  <string name="rtp_max_port">Max. Port</string>
+  <string name="set_rtp_min_port">Min. Port festlegen</string>
+  <string name="set_rtp_max_port">Max. Port festlegen</string>
+  <string name="set_buffer_size">Puffergröße einstellen</string>
   <string name="set_apn">Bevorzugten APN wählen</string>
   <string name="setting">Einstellungen</string>
   <string name="server_timeout_title">"Zeitüberschreitung beim Server"</string>
+  <string name="server_timeout_message">"Erneut zum Server verbinden, um das Video abzuspielen?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Verbindung fehlgeschlagen, neuer Verbindungsversuch zu %1$d\u2026"</string>
   <string name="media_controller_live">Live</string>
   <string name="media_controller_connecting">Verbinde\u2026</string>
   <string name="bookmark_add">"Lesezeichen hinzufügen"</string>
@@ -55,9 +65,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <string name="bookmark_location">"Ort"</string>
   <string name="delete_all">"Alle löschen"</string>
   <string name="default_title">"Standardtitel"</string>
+  <string name="mute_nosupport">Stummschalten nicht möglich – das Video wird nicht unterstützt</string>
   <string name="fail_trim">Diese Videodatei kann nicht gekürzt werden</string>
+  <string name="bass_boost_strength">Bassverstärkung</string>
   <string name="virtualizer_strength">3D-Effekt</string>
   <string name="audio_effects">Audioeffekte</string>
+  <string name="headset_plug">Schließen Sie Kopfhörer für diese Effekte an.</string>
   <string name="audio_effects_dialog_title">Snapdragon-Audio+</string>
   <string name="can_not_trim">Es können nur MP4- und 3GP-Dateien gekürzt werden</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
new file mode 100644
index 000000000..65597787d
--- /dev/null
+++ b/res/values-el/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Ημερομηνία καταγραφής</string>
+</resources>
diff --git a/res/values-es-rXA/cm_strings.xml b/res/values-es-rXA/cm_strings.xml
new file mode 100644
index 000000000..696c00955
--- /dev/null
+++ b/res/values-es-rXA/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Hora de grabación</string>
+</resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
new file mode 100644
index 000000000..696c00955
--- /dev/null
+++ b/res/values-es/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Hora de grabación</string>
+</resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
new file mode 100644
index 000000000..f79a983bc
--- /dev/null
+++ b/res/values-fi/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tallennusaika</string>
+</resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
new file mode 100644
index 000000000..0b30b6043
--- /dev/null
+++ b/res/values-fr/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Temps d\'enregistrement</string>
+</resources>
diff --git a/res/values-fr/codeaurora_strings.xml b/res/values-fr/codeaurora_strings.xml
index e13a34550..7ac10c956 100644
--- a/res/values-fr/codeaurora_strings.xml
+++ b/res/values-fr/codeaurora_strings.xml
@@ -30,27 +30,51 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="step_option_name">Étape</string>
+  <string name="step_option_desc">Personnaliser le pas de l\'avance/retour rapide</string>
   <string name="step_option_alternate">5 secondes</string>
   <string name="step_option_default">10 secondes</string>
+  <string name="loop">"Boucle"</string>
   <string name="single">"Simple"</string>
   <string name="stereo">"Stéréo"</string>
+  <string name="speaker_on">Haut-parleur activé</string>
+  <string name="speaker_off">Haut-parleur désactivé</string>
+  <string name="speaker_need_headset">Brancher un casque pour utiliser cette fonctionnalité.</string>
+  <string name="single_track">"Piste simple"</string>
   <string name="input_url">"Saisir l'URL"</string>
   <string name="streaming_settings">"Paramètres de transmission"</string>
   <string name="next">"Suivant"</string>
   <string name="previous">"Précédent"</string>
+  <string name="buffer_size">Taille du tampon</string>
   <string name="apn">APN préféré</string>
+  <string name="rtp_min_port">Port minimum</string>
+  <string name="rtp_max_port">Port maximum</string>
+  <string name="set_rtp_min_port">Paramétrer le port minimal</string>
+  <string name="set_rtp_max_port">Paramétrer le port maximal</string>
+  <string name="set_buffer_size">Paramétrer la taille du tampon</string>
   <string name="set_apn">Sélectionner l\'APN préféré</string>
   <string name="setting">Paramètres</string>
+  <string name="server_timeout_title">"Délai du serveur"</string>
+  <string name="server_timeout_message">"Se reconnecter au serveur pour lire la vidéo ?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Connexion échouée, tentative de reconnexion à %1$d\u2026"</string>
   <string name="media_controller_live">En direct</string>
   <string name="media_controller_playing">Lecture</string>
   <string name="media_controller_connecting">Connexion\u2026</string>
+  <string name="bookmark_add">"Ajouter un favori"</string>
+  <string name="bookmark_display">"Afficher les favoris"</string>
+  <string name="bookmark_empty">"Aucun favori"</string>
+  <string name="bookmark_exist">"Le favori existe déja"</string>
+  <string name="bookmark_add_success">"Favori ajouté"</string>
+  <string name="bookmark_list">"Favoris"</string>
   <string name="bookmark_title">"Titre"</string>
   <string name="bookmark_location">"Localisation"</string>
   <string name="delete_all">"Tout supprimer"</string>
   <string name="default_title">"Titre par défaut"</string>
+  <string name="mute_nosupport">Coupure du son impossible : vidéo non pris en charge</string>
+  <string name="fail_trim">Désolé, cette vidéo ne peut pas être coupé</string>
   <string name="bass_boost_strength">Amplification des basses</string>
   <string name="virtualizer_strength">Effet 3D</string>
   <string name="audio_effects">Effets audio</string>
   <string name="headset_plug">Brancher un casque pour ces effets.</string>
   <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="can_not_trim">Seuls les fichiers mp4 et 3gp peuvent être coupés</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
new file mode 100644
index 000000000..f4cd037d1
--- /dev/null
+++ b/res/values-hu/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Felvétel ideje</string>
+</resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
new file mode 100644
index 000000000..6353d049e
--- /dev/null
+++ b/res/values-in/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Catatan waktu</string>
+</resources>
diff --git a/res/values-in/codeaurora_strings.xml b/res/values-in/codeaurora_strings.xml
index ddb314f07..5125a3e4c 100644
--- a/res/values-in/codeaurora_strings.xml
+++ b/res/values-in/codeaurora_strings.xml
@@ -52,4 +52,29 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <string name="set_rtp_max_port">Atur port maks</string>
   <string name="set_buffer_size">Atur ukuran buffer</string>
   <string name="set_apn">Pilih pilihan APN</string>
+  <string name="setting">Pengaturan</string>
+  <string name="server_timeout_title">"Batas waktu server"</string>
+  <string name="server_timeout_message">"Menyambung ulang ke server untuk memutar video?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Koneksi gagal, mencoba untuk menyambung ulang ke %1$d\u2026"</string>
+  <string name="media_controller_live">Langsung</string>
+  <string name="media_controller_playing">Memutar</string>
+  <string name="media_controller_connecting">Menyambungkan\u2026</string>
+  <string name="bookmark_add">"Tambah ke bookmark"</string>
+  <string name="bookmark_display">"Tampilkan bookmark"</string>
+  <string name="bookmark_empty">"Tidak ada bookmark"</string>
+  <string name="bookmark_exist">"Bookmark sudah ada"</string>
+  <string name="bookmark_add_success">"Bookmark ditambahkan"</string>
+  <string name="bookmark_list">"Bookmark"</string>
+  <string name="bookmark_title">"Judul"</string>
+  <string name="bookmark_location">"Lokasi"</string>
+  <string name="delete_all">"Hapus semua"</string>
+  <string name="default_title">"Judul standar"</string>
+  <string name="mute_nosupport">Tidak bisa mendiamkan : video tidak didukung</string>
+  <string name="fail_trim">Maaf, berkas video ini tidak dapat dipotong</string>
+  <string name="bass_boost_strength">Peningkatan bass</string>
+  <string name="virtualizer_strength">Efek 3D</string>
+  <string name="audio_effects">Efek audio</string>
+  <string name="headset_plug">Pasang headphone untuk efek ini.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="can_not_trim">Hanya berkas mp4 dan 3gp yang dapat dipotong</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
new file mode 100644
index 000000000..107d60a8b
--- /dev/null
+++ b/res/values-it/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tempo di ripresa</string>
+</resources>
diff --git a/res/values-iw/codeaurora_strings.xml b/res/values-iw/codeaurora_strings.xml
new file mode 100644
index 000000000..12de53f00
--- /dev/null
+++ b/res/values-iw/codeaurora_strings.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="step_option_name">צעד</string>
+  <string name="step_option_desc">התאמה אישית מהירה לצעד קדימה/אחורה</string>
+  <string name="step_option_alternate">5 שניות</string>
+  <string name="step_option_default">10 שניות</string>
+  <string name="loop">"לופ"</string>
+  <string name="single">"יחיד"</string>
+  <string name="stereo">"סטריאו"</string>
+  <string name="speaker_on">רמקול פעיל</string>
+  <string name="speaker_off">רמקול כבוי</string>
+  <string name="speaker_need_headset">חבר אוזניות כדי להשתמש בתכונה זו.</string>
+  <string name="single_track">"מסלול יחיד"</string>
+  <string name="input_url">"הזן כתובת URL"</string>
+  <string name="streaming_settings">"הגדרות זרימה"</string>
+  <string name="next">"הבא"</string>
+  <string name="previous">"הקודם"</string>
+  <string name="buffer_size">גודל המאגר</string>
+  <string name="apn">APN מועדף</string>
+  <string name="rtp_min_port">פורט מינימאלי</string>
+  <string name="rtp_max_port">פורט מקסימלי</string>
+  <string name="set_rtp_min_port">הגדר פורט מינימלי</string>
+  <string name="set_rtp_max_port">נגדר פורט מקסימלי</string>
+  <string name="set_buffer_size">הגדר גודל המאגר</string>
+  <string name="set_apn">בחר APN מועדף</string>
+  <string name="setting">הגדרות</string>
+  <string name="server_timeout_title">"זמן חכייה לשרת"</string>
+  <string name="server_timeout_message">"להתחבר מחדש לשרת כדי להפעיל את הווידאו?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"החיבור נכשל, מנסה להתחבר מחדש ל- %1$d\u2026"</string>
+  <string name="media_controller_live">זמן אמת</string>
+  <string name="media_controller_playing">מנגן</string>
+  <string name="media_controller_connecting">מתחבר\u2026</string>
+  <string name="bookmark_add">"הוסף סימניה"</string>
+  <string name="bookmark_display">"הצג סימניות"</string>
+  <string name="bookmark_empty">"אין סימניות"</string>
+  <string name="bookmark_exist">"סימניה כבר קיימת"</string>
+  <string name="bookmark_add_success">"סימניה נוספה"</string>
+  <string name="bookmark_list">"סימניות"</string>
+  <string name="bookmark_title">"כותרת"</string>
+  <string name="bookmark_location">"מיקום"</string>
+  <string name="delete_all">"מחק הכל"</string>
+  <string name="default_title">"כותרת ברירת המחדל"</string>
+  <string name="mute_nosupport">לא ניתן להשתיק: וידאו לא נתמך</string>
+  <string name="fail_trim">סליחה, קובץ וידאו זה לא יכול להיגזר</string>
+  <string name="bass_boost_strength">הגברת בס</string>
+  <string name="virtualizer_strength">אפקט 3D</string>
+  <string name="audio_effects">אפקטי שמע</string>
+  <string name="headset_plug">חבר אוזניות לאפקטים אלה.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="can_not_trim">אפשר לחתוך רק קבצי mp4 ו-3gp</string>
+</resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
new file mode 100644
index 000000000..a87524670
--- /dev/null
+++ b/res/values-ja/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">録画時間</string>
+</resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
new file mode 100644
index 000000000..9b096dcd8
--- /dev/null
+++ b/res/values-ko/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">녹화 시간</string>
+</resources>
diff --git a/res/values-lb/codeaurora_strings.xml b/res/values-lb/codeaurora_strings.xml
new file mode 100644
index 000000000..3164cfa2e
--- /dev/null
+++ b/res/values-lb/codeaurora_strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="step_option_alternate">5 Sekonnen</string>
+  <string name="step_option_default">10 Sekonnen</string>
+</resources>
diff --git a/res/values-lb/filtershow_strings.xml b/res/values-lb/filtershow_strings.xml
index f16fc69a6..59ee9bb95 100644
--- a/res/values-lb/filtershow_strings.xml
+++ b/res/values-lb/filtershow_strings.xml
@@ -19,21 +19,36 @@
   <string name="cannot_edit_original">Original kann net geännert ginn</string>
   <string name="original_picture_text">@string/original</string>
   <string name="setting_wallpaper">Als Hannergrondbild setzen</string>
+  <string name="download_failure">Konnt d\'Foto net eroflueden. D\'Netzwierk ass net disponibel.</string>
   <string name="original">Original</string>
   <string name="borders" msgid="4461692156695893616">Borden</string>
   <string name="custom_border">Personaliséiert</string>
+  <string name="filtershow_undo">Réckgängeg maachen</string>
   <string name="filtershow_redo">Widderhuelen</string>
+  <string name="show_imagestate_panel">Applizéiert Effekter uweisen</string>
+  <string name="hide_imagestate_panel">Applizéiert Effekter verstoppen</string>
   <string name="export_image">Exportéieren</string>
   <string name="print_image">Drécken</string>
+  <string name="export_flattened">Plattgemaacht Bild exportéieren</string>
+  <string name="select_output_settings">Das exportéiert Bild gëtt als Kopie gespäichert, ouni Historique.</string>
   <string name="quality">Qualitéit</string>
   <string name="size">Gréisst</string>
   <string name="x">x</string>
   <string name="menu_settings">Astellungen</string>
+  <string name="unsaved">Et ginn ongespäichert Ännerungen un dësem Bild.</string>
+  <string name="save_before_exit">Wëlls du d\'Bild virum Zoumaache späicheren?</string>
   <string name="save_and_exit">Späicheren an zoumaachen</string>
+  <string name="save_and_processing">Bild mat voller Opléisung gëtt beaarbecht...</string>
+  <string name="exit">Verloossen</string>
   <string name="history">Historique</string>
   <string name="reset">Zrécksetzen</string>
   <string name="history_original">@string/original</string>
+  <string name="imageState">Applizéiert Effekter</string>
+  <string name="compare_original">Vergläichen</string>
+  <string name="apply_effect">Applizéieren</string>
   <string name="reset_effect">Zrécksetzen</string>
+  <string name="aspect">Aspekt</string>
+  <string name="aspect1to1_effect">1:1</string>
   <string name="aspect4to3_effect">4:3</string>
   <string name="aspect3to4_effect">3:4</string>
   <string name="aspect4to6_effect">4:6</string>
@@ -42,24 +57,78 @@
   <string name="aspect9to16_effect">16:9</string>
   <string name="aspectNone_effect">Keen</string>
   <string name="aspectOriginal_effect">@string/original</string>
+  <string name="Fixed">Fixéiert</string>
+  <string name="tinyplanet">Klenge Planéit</string>
   <string name="exposure" msgid="1229093066434614811">Beliichtung</string>
+  <string name="sharpness">Schäerft</string>
+  <string name="contrast">Kontrast</string>
+  <string name="vibrance">Intensitéit</string>
+  <string name="bwfilter">SW-Filter</string>
+  <string name="wbalance">Automatesch Faarwen</string>
+  <string name="hue">Faarftoun</string>
+  <string name="shadow_recovery">Déiften</string>
+  <string name="curvesRGB">Kurven</string>
+  <string name="vignette">Vignettéierung</string>
+  <string name="vignette_main">Vignettéierung</string>
   <string name="vignette_exposure">Beliichtung</string>
+  <string name="vignette_contrast">Kontrast</string>
+  <string name="vignette_falloff">Luuchtoffall</string>
+  <string name="redeye">Rout Aen</string>
+  <string name="imageDraw">Zeechnen</string>
+  <string name="straighten" msgid="5217801513491493491">Ausriichten</string>
   <string name="crop" msgid="5584000454518174632">Schneiden</string>
   <string name="rotate" msgid="460017689320955494">Rotéieren</string>
+  <string name="mirror">Spiggelen</string>
+  <string name="negative">Negativ</string>
   <string name="none" msgid="3601545724573307541">Keen</string>
+  <string name="edge">Kanten</string>
+  <string name="kmeans">Posteriséiert</string>
+  <string name="downsample">Verklengeren</string>
   <string name="editor_grad_brightness">Hellegkeet</string>
+  <string name="editor_grad_contrast">Kontrast</string>
   <string name="editor_chan_sat_main">Haapt</string>
+  <string name="editor_chan_sat_blue">Blo</string>
   <string name="editor_grad_style">Stil</string>
+  <string name="editor_grad_new">nei</string>
+  <string name="curves_channel_rgb">RGB</string>
+  <string name="curves_channel_blue">Blo</string>
   <string name="draw_style">Stil</string>
   <string name="draw_size">Gréisst</string>
+  <string name="draw_hue">Faarftoun</string>
   <string name="draw_value">Hellegkeet</string>
   <string name="draw_color">Faarf</string>
+  <string name="draw_style_line">Linnen</string>
   <string name="draw_clear">Eidel maachen</string>
+  <string name="color_border_corner_size">Eckegréisst</string>
   <string name="color_border_color">Faarf</string>
   <string name="color_border_clear">Eidel maachen</string>
+  <string name="color_pick_select">Eege Faarf auswielen</string>
+  <string name="color_pick_title">Faarf auswielen</string>
+  <string name="draw_size_title">Gréisst auswielen</string>
   <string name="draw_size_accept">OK</string>
+  <string name="state_panel_original">Original</string>
+  <string name="state_panel_result">Resultat</string>
+  <string name="filtershow_notification_label">Bild gëtt gespäichert</string>
+  <string name="filtershow_notification_message">Gëtt beaarbecht...</string>
+  <string name="filtershow_save_preset">Aktuell Virastellung späicheren</string>
+  <string name="filtershow_manage_preset">Benotzervirastellungen</string>
+  <string name="filtershow_new_preset">Nei Virastellung</string>
+  <string name="filtershow_preset_name">Virastellungsnumm</string>
+  <string name="filtershow_show_info_panel">Informatioun</string>
+  <string name="filtershow_show_info_panel_name">Bildnumm</string>
+  <string name="filtershow_show_info_panel_size">Bildgréisst</string>
+  <string name="filtershow_show_info_panel_histogram">Histogramm</string>
+  <string name="filtershow_show_info_panel_exif">EXIF-Daten</string>
+  <string name="filtershow_add_button_looks">Virastellung</string>
+  <string name="filtershow_add_button_versions">Versioun</string>
+  <string name="filtershow_version_original">Original</string>
+  <string name="filtershow_version_current">Aktuell</string>
   <string name="filtershow_exif_model">Modell</string>
   <string name="filtershow_exif_aperture">Blend</string>
   <string name="filtershow_exif_focal_length">Brennwäit</string>
   <string name="filtershow_exif_iso">ISO</string>
+  <string name="filtershow_exif_subject_distance">Distanz zum Sujet</string>
+  <string name="filtershow_exif_date">Ophueldatum</string>
+  <string name="filtershow_exif_f_stop">Blendenzuel</string>
+  <string name="filtershow_exif_exposure_time">Beliichtungszäit</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index cb84728f9..a4944beb7 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -19,29 +19,54 @@
   <string name="gadget_title">Billerrumm</string>
   <string name="details_ms">%1$02d:%2$02d</string>
   <string name="details_hms">%1$d:%2$02d:%3$02d</string>
+  <string name="movie_view_label">Videofspiller</string>
   <string name="loading_video">Video gëtt gelueden\u2026</string>
+  <string name="loading_image">Bild gëtt gelueden\u2026</string>
+  <string name="loading_account">Kont gëtt gelueden\u2026</string>
+  <string name="resume_playing_title">Video weiderspillen</string>
+  <string name="resume_playing_message">Bei %s weider ofspillen?</string>
+  <string name="resume_playing_resume">Weider ofspillen</string>
   <string name="loading">Gëtt gelueden\u2026</string>
+  <string name="fail_to_load">Konnt net lueden</string>
+  <string name="fail_to_load_image">D\'Bild konnt net geluede ginn</string>
+  <string name="no_thumbnail">Kee Virschaubild</string>
   <string name="resume_playing_restart">Vu vir ufänken</string>
   <string name="crop_save_text">OK</string>
   <string name="ok">OK</string>
   <string name="multiface_crop_help">E Gesiicht drécke fir unzefänken.</string>
+  <string name="saving_image">Bild gëtt gespäichert\u2026</string>
+  <string name="filtershow_saving_image">D\'Bild gëtt an den Album <xliff:g id="album_name">%1$s</xliff:g> gespäichert\u2026</string>
+  <string name="save_error">Konnt dat geschniddent Bild net späicheren.</string>
+  <string name="crop_label">Bild schneiden</string>
+  <string name="trim_label">Video kierzen</string>
   <string name="select_image">Foto auswielen</string>
+  <string name="select_video">Video auswielen</string>
+  <string name="select_item">Element auswielen</string>
+  <string name="select_album">Album auswielen</string>
   <string name="select_group">Grupp auswielen</string>
   <string name="set_image">Bild setzen als</string>
   <string name="set_wallpaper">Hannergrondbild setzen</string>
+  <string name="wallpaper">Hannergrondbild gëtt gesat\u2026</string>
   <string name="camera_setas_wallpaper">Hannergrondbild</string>
   <string name="delete">Läschen</string>
   <plurals name="delete_selection">
     <item quantity="one">Ausgewielt Element läschen?</item>
     <item quantity="other">Ausgewielt Elementer läschen?</item>
   </plurals>
+  <string name="confirm">Bestätegen</string>
+  <string name="cancel">Ofbriechen</string>
+  <string name="share">Deelen</string>
   <string name="share_panorama">Panorama deelen</string>
   <string name="share_as_photo">Als Foto deelen</string>
   <string name="deleted">Geläscht</string>
   <string name="undo">RÉCKGÄNGEG</string>
+  <string name="select_all">All auswielen</string>
+  <string name="deselect_all">Auswiel ophiewen</string>
+  <string name="slideshow">Diashow</string>
   <string name="details">Detailer</string>
   <string name="details_title">%1$d / %2$d Elementer:</string>
   <string name="close">Zoumaachen</string>
+  <string name="switch_to_camera">Op d\'Kamera wiesselen</string>
   <plurals name="number_of_items_selected">
     <item quantity="one">%1$d ausgewielt</item>
     <item quantity="other">%1$d ausgewielt</item>
@@ -57,20 +82,44 @@
   <string name="show_on_map">Op der Kaart weisen</string>
   <string name="rotate_left">Lénks rotéieren</string>
   <string name="rotate_right">Riets rotéieren</string>
+  <string name="no_such_item">Konnt d\'Element net fannen.</string>
+  <string name="edit">Beaarbechten</string>
+  <string name="simple_edit">Einfach Beaarbechtung</string>
+  <string name="process_caching_requests">Tëschespäicherungsufroe gi veraarbecht</string>
+  <string name="caching_label">Tëschespäicherung leeft\u2026</string>
   <string name="crop_action">Schneiden</string>
   <string name="trim_action">Trimmen</string>
   <string name="mute_action">Stomm</string>
   <string name="set_as">Setzen als</string>
+  <string name="video_mute_err">Kann de Video net stommschalten.</string>
   <string name="video_err">Video kann net ofgespillt ginn.</string>
+  <string name="group_by_location">No Plaz</string>
+  <string name="group_by_time">No Zäit</string>
+  <string name="group_by_tags">No Etiketten</string>
+  <string name="group_by_faces">No Leit</string>
+  <string name="group_by_album">No Album</string>
   <string name="group_by_size">No Gréisst</string>
+  <string name="untagged">Ouni Etikett</string>
+  <string name="no_location">Keng Plaz</string>
+  <string name="no_connectivity">E puer Plaze konnte wéinst Netzwierkproblemer net identifizéiert ginn.</string>
+  <string name="sync_album_error">Konnt d\'Fotoen aus dësem Album net eroflueden. Probéier méi spéit nees.</string>
+  <string name="show_images_only">Just Biller</string>
+  <string name="show_videos_only">Just Videoen</string>
+  <string name="show_all">Biller a Videoen</string>
+  <string name="appwidget_title">Fotogalerie</string>
+  <string name="appwidget_empty_text">Keng Fotoen.</string>
   <string name="crop_saved">
         Geschniddent Bild gespäichert ënner <xliff:g id="folder_name">%s</xliff:g>.</string>
+  <string name="no_albums_alert">Keng Alben disponibel.</string>
+  <string name="empty_album">O Biller/Videoen disponibel.</string>
+  <string name="make_available_offline">Offline disponibel maachen</string>
+  <string name="sync_picasa_albums">Nei lueden</string>
   <string name="done">Fäerdeg</string>
   <string name="sequence_in_set">%1$d / %2$d Elementer:</string>
   <string name="title">Titel</string>
   <string name="description">Beschreiwung</string>
   <string name="time">Zäit</string>
-  <string name="location">Lokaliséierung</string>
+  <string name="location">Standuert</string>
   <string name="path">Pad</string>
   <string name="width">Breet</string>
   <string name="height">Héicht</string>
@@ -92,24 +141,85 @@
   <string name="flash_on">Blëtz ausgeléist</string>
   <string name="flash_off">Kee Blëtz</string>
   <string name="unknown">Onbekannt</string>
+  <string name="ffx_original">Original</string>
+  <string name="ffx_vintage">Almoudesch</string>
+  <string name="ffx_instant">Direktbild</string>
+  <string name="ffx_bleach">Verbleecht</string>
+  <string name="ffx_blue_crush">Blo</string>
+  <string name="ffx_bw_contrast">S/W</string>
+  <string name="ffx_punch">Punch</string>
+  <string name="ffx_x_process">X Process</string>
+  <string name="ffx_washout">Latte</string>
+  <string name="ffx_washout_color">Litho</string>
   <string name="try_to_set_local_album_available_offline">Dëst Element ass lokal gespäichert an och offiline disponibel.</string>
+  <string name="set_label_all_albums">All d\'Alben</string>
+  <string name="set_label_local_albums">Lokal Alben</string>
+  <string name="set_label_mtp_devices">MTP-Apparater</string>
+  <string name="set_label_picasa_albums">Picasa-Alben</string>
+  <string name="free_space_format"><xliff:g id="bytes">%s</xliff:g> fräi</string>
+  <string name="size_below"><xliff:g id="size">%1$s</xliff:g> oder drënner</string>
+  <string name="size_above"><xliff:g id="size">%1$s</xliff:g> oder driwwer</string>
+  <string name="size_between"><xliff:g id="min_size">%1$s</xliff:g> bis <xliff:g id="max_size">%2$s</xliff:g></string>
+  <string name="Import">Importéieren</string>
+  <string name="import_complete">Import ofgeschloss</string>
+  <string name="import_fail">Import feelgeschloen</string>
+  <string name="camera_connected">Kamera connectéiert.</string>
+  <string name="camera_disconnected">Kamera deconnectéiert.</string>
+  <string name="click_import">Hei drécke fir z\'importéieren</string>
+  <string name="widget_type_album">En Album auswielen</string>
+  <string name="widget_type_shuffle">All d\'Biller mëschen</string>
+  <string name="widget_type_photo">E Bild auswielen</string>
+  <string name="widget_type">Biller auswielen</string>
+  <string name="slideshow_dream_name">Diashow</string>
+  <string name="albums">Alben</string>
+  <string name="times">Zäiten</string>
+  <string name="locations">Plazen</string>
   <string name="people">Leit</string>
+  <string name="tags">Etiquetten</string>
+  <string name="group_by">Gruppéieren no</string>
   <string name="settings">Astellungen</string>
+  <string name="add_account">Kont dobäisetzen</string>
   <string name="folder_camera">Fotoapparat</string>
+  <string name="folder_download">Erofgelueden</string>
+  <string name="folder_edited_online_photos">Beaarbecht Online-Fotoen</string>
+  <string name="folder_imported">Importéiert</string>
+  <string name="folder_screenshot">Schiermfoto</string>
   <string name="help">Hëllef</string>
+  <string name="no_external_storage_title">Kee Späicher</string>
+  <string name="no_external_storage">Keen externe Späicher disponibel</string>
   <string name="switch_photo_filmstrip">Als Filmsträif uweisen</string>
   <string name="switch_photo_grid">Gitterusiicht</string>
+  <string name="switch_photo_fullscreen">Vollschierm-Usiicht</string>
+  <string name="trimming">Gëtt geschnidden</string>
+  <string name="muting">Toun gëtt ausgeschalt</string>
   <string name="please_wait">W.e.g. waarden</string>
+  <string name="save_into">De Video gëtt an den Album <xliff:g id="album_name">%1$s</xliff:g> gespäichert\u2026</string>
+  <string name="trim_too_short">Kann net kierzen: den Zilvideo ass ze kuerz</string>
   <string name="pano_progress_text">Panorama gëtt gerendert</string>
   <string name="save" msgid="8140440041190264400">Späicheren</string>
+  <string name="ingest_scanning" msgid="2048262851775139720">Inhalt gëtt gescannt...</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="one">%1$d Element gescannt</item>
+    <item quantity="other">%1$d Elementer gescannt</item>
+  </plurals>
+  <string name="ingest_sorting" msgid="624687230903648118">Gëtt zortéiert...</string>
+  <string name="ingest_scanning_done">Scannen ofgeschloss</string>
+  <string name="ingest_importing">Gëtt importéiert...</string>
+  <string name="ingest_empty_device">Et ass keen Inhalt op dësem Apparat disponibel deen importéiert ka ginn.</string>
+  <string name="ingest_no_device">Et si keng MTP-Apparater connectéiert</string>
   <string name="camera_error_title">Kamerafeeler</string>
   <string name="cannot_connect_camera">Keng Connectioun zur Kamera méiglech.</string>
-  <string name="camera_disabled">D\'Kamera gouf wéinst Sécherheetsriichtlinnen deaktivéiert.</string>
+  <string name="camera_disabled">D\'Kamera gouf wéinst Sécherheetsriichtlinnen desaktivéiert.</string>
   <string name="camera_label">Fotoapparat</string>
   <string name="wait">Waart w.e.g.\u2026</string>
+  <string name="no_storage" product="nosdcard">Bann den USB-Späicher an ier s de d\'Kamera benotz.</string>
   <string name="no_storage" product="default">Maach eng SD-Kaart dran ier s du d\'Kamera benotzt.</string>
+  <string name="preparing_sd" product="nosdcard">USB-Späicher gëtt preparéiert\u2026</string>
   <string name="preparing_sd" product="default">SD-Kaart gëtt preparéiert\u2026</string>
+  <string name="access_sd_fail" product="nosdcard">Kann net op den USB-Späicher zougräifen.</string>
   <string name="access_sd_fail" product="default">Keen Zougrëff op USB-Späicher méiglech.</string>
+  <string name="review_cancel">OFBRIECHEN</string>
+  <string name="review_ok">FÄERDEG</string>
   <string name="time_lapse_title">Zäitrafferopnam</string>
   <string name="pref_camera_id_title">Kamera wielen</string>
   <string name="pref_camera_id_entry_back">Zréck</string>
@@ -123,6 +233,7 @@
   </plurals>
   <string name="pref_camera_timer_sound_default">@string/setting_on_value</string>
   <string name="pref_camera_timer_sound_title">Piipse während dem Countdown</string>
+  <string name="setting_off">Aus</string>
   <string name="setting_on">Un</string>
   <string name="pref_video_quality_title">Videoqualitéit</string>
   <string name="pref_video_quality_entry_high">Héich</string>
@@ -153,6 +264,7 @@
   <string name="pref_camera_flashmode_label">BLËTZMODUS</string>
   <string name="pref_camera_flashmode_entry_auto">Automatesch</string>
   <string name="pref_camera_flashmode_entry_on">Un</string>
+  <string name="pref_camera_flashmode_entry_off">Aus</string>
   <string name="pref_camera_flashmode_label_auto">BLËTZ AUTO</string>
   <string name="pref_camera_flashmode_label_on">BLËTZ UN</string>
   <string name="pref_camera_flashmode_label_off">BLËTZ AUS</string>
@@ -180,6 +292,7 @@
   <string name="pref_camera_scenemode_label_night">NUECHT</string>
   <string name="pref_camera_scenemode_label_sunset">SONNENËNNERGANK</string>
   <string name="pref_camera_scenemode_label_party">PARTY</string>
+  <string name="pref_camera_countdown_label">SANDAUER</string>
   <string name="pref_camera_countdown_label_off">TIMER AUS</string>
   <string name="pref_camera_countdown_label_one">1 SEKONN</string>
   <string name="pref_camera_countdown_label_three">3 SEKONNEN</string>
@@ -193,6 +306,7 @@
   <string name="pref_camera_id_label_back">VIISCHT KAMERA</string>
   <string name="pref_camera_id_label_front">HËNNESCHT KAMERA</string>
   <string name="dialog_ok">OK</string>
+  <string name="spaceIsLow_content" product="nosdcard">Däin USB-Späicher huet geschwë keng Plaz méi. Änner d\'Qualitéitsastellungen oder läsch e puer Fotoen oder aner Fichieren.</string>
   <string name="spaceIsLow_content" product="default">Deng SD-Kaart huet geschwë keng Plaz méi. Änner d\'Qualitéitsastellungen oder läsch e puer Fotoen oder Fichieren.</string>
   <string name="video_reach_size_limit">Limittgréisst ass erreecht.</string>
   <string name="pano_too_fast_prompt">Ze séier</string>
@@ -201,6 +315,7 @@
   <string name="pano_dialog_title">Panorama</string>
   <string name="pano_capture_indication">Panorama gëtt opgeholl</string>
   <string name="pano_dialog_waiting_previous">Waarden op dee Panorama virdrun</string>
+  <string name="pano_review_saving_indication_str">Gëtt gespäichert\u2026</string>
   <string name="pano_review_rendering">Panorama gëtt gerendert</string>
   <string name="tap_to_focus">Drécke fir schaarf ze stellen.</string>
   <string name="pref_video_effect_title">Effekter</string>
@@ -220,16 +335,30 @@
   <string name="clear_effects">Effekter ewechhuelen</string>
   <string name="effect_silly_faces">LËSCHTEG GESIICHTER</string>
   <string name="effect_background">HANNERGROND</string>
+  <string name="accessibility_shutter_button">Ausléisknäppchen</string>
   <string name="accessibility_menu_button">Menü-Knäppchen</string>
+  <string name="accessibility_review_thumbnail">Rezentst Foto</string>
+  <string name="accessibility_camera_picker">Tëscht de Kamerae vir an hanne wiesselen</string>
   <string name="accessibility_mode_picker">Auswiel fir Fotoapparat, Video oder Panorama</string>
+  <string name="accessibility_second_level_indicators">Weider Astellungen</string>
+  <string name="accessibility_back_to_first_level">Astellungen zoumaachen</string>
+  <string name="accessibility_decrement">%1$s erofsetzen</string>
+  <string name="accessibility_increment">%1$s eropsetzen</string>
   <string name="accessibility_check_box">%1$s Ukräizfeld</string>
   <string name="accessibility_switch_to_camera">Op de Foto-Modus wiesselen</string>
   <string name="accessibility_switch_to_video">Op de Video-Modus wiesselen</string>
   <string name="accessibility_switch_to_panorama">Op de Panorama-Modus wiesselen</string>
+  <string name="accessibility_switch_to_new_panorama">Bei den neie Panorama wiesselen</string>
+  <string name="accessibility_switch_to_refocus">Bei d\'Auswiel vun engem neie Fokus wiesselen</string>
   <string name="accessibility_review_cancel">Iwwerpréiwung ofbriechen</string>
   <string name="accessibility_review_ok">Iwwerpréiwung ofgeschloss</string>
   <string name="accessibility_review_retake">Iwwerpréiwung - Nei Ophuelen</string>
+  <string name="accessibility_play_video">Video ofspillen</string>
+  <string name="accessibility_pause_video">Video pauséieren</string>
+  <string name="accessibility_reload_video">Video nei lueden</string>
   <string name="capital_on">UN</string>
+  <string name="capital_off">AUS</string>
+  <string name="pref_video_time_lapse_frame_interval_off">Aus</string>
   <string name="pref_video_time_lapse_frame_interval_500">0,5 Sekonnen</string>
   <string name="pref_video_time_lapse_frame_interval_1500">1,5 Sekonnen</string>
   <string name="pref_video_time_lapse_frame_interval_2000">2 Sekonnen</string>
@@ -280,6 +409,12 @@
   <string name="remember_location_yes">Jo</string>
   <string name="menu_camera">Fotoapparat</string>
   <string name="menu_search">Sichen</string>
+  <string name="tab_photos">Fotoen</string>
+  <string name="tab_albums">Alben</string>
   <string name="camera_menu_more_label">MÉI OPTIOUNEN</string>
   <string name="camera_menu_settings_label">ASTELLUNGEN</string>
+  <plurals name="number_of_photos">
+    <item quantity="one">%1$d Foto</item>
+    <item quantity="other">%1$d Fotoen</item>
+  </plurals>
 </resources>
diff --git a/res/values-lt/codeaurora_strings.xml b/res/values-lt/codeaurora_strings.xml
index e32b38516..7642e1b7e 100644
--- a/res/values-lt/codeaurora_strings.xml
+++ b/res/values-lt/codeaurora_strings.xml
@@ -30,10 +30,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="step_option_name">Žingsnis</string>
-  <string name="step_option_desc">Keisti spartaus pasukimo/atsukimas žingsnius</string>
-  <string name="step_option_alternate">5 sekundės</string>
-  <string name="step_option_default">10 sekundžių</string>
-  <string name="loop">"Kartoti"</string>
+  <string name="step_option_desc">Tinkinti greito prasukimo / atsukimo žingsnį</string>
+  <string name="step_option_alternate">5 sek.</string>
+  <string name="step_option_default">10 sek.</string>
+  <string name="loop">"Ciklas"</string>
   <string name="single">"Vientisas"</string>
   <string name="stereo">"Stereo"</string>
   <string name="speaker_on">Garsiakalbis įjungtas</string>
@@ -45,31 +45,31 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <string name="next">"Kitas"</string>
   <string name="previous">"Ankstesnis"</string>
   <string name="buffer_size">Buferio dydis</string>
-  <string name="apn">Pageidaujama APN</string>
-  <string name="rtp_min_port">Mažiausia jungtis</string>
-  <string name="rtp_max_port">Didžiausia jungtis</string>
-  <string name="set_rtp_min_port">Nustatyti mažiausią jungtį</string>
-  <string name="set_rtp_max_port">Nustatyti didžiausią jungtį</string>
+  <string name="apn">Pageidautinas APN</string>
+  <string name="rtp_min_port">Mažiausias prievadas</string>
+  <string name="rtp_max_port">Didžiausias prievadas</string>
+  <string name="set_rtp_min_port">Nustatyti mažiausią prievadą</string>
+  <string name="set_rtp_max_port">Nustatyti didžiausią prievadą</string>
   <string name="set_buffer_size">Nustatyti buferio dydį</string>
-  <string name="set_apn">Pasirinkite pageidaujamą APN</string>
+  <string name="set_apn">Pasirinkti pageidaujamą APN</string>
   <string name="setting">Nustatymai</string>
-  <string name="server_timeout_title">"Serveriui skirtas laikas"</string>
-  <string name="server_timeout_message">"Iš naujo prisijungti prie serverio, kad paleisti vaizdo įrašą?"</string>
-  <string name="videoview_error_text_cannot_connect_retry">"Prisijungimas nepavyko, bandyti vėl prisijungti prie %1$d\u2026"</string>
+  <string name="server_timeout_title">"Serveriui skirtasis laikas"</string>
+  <string name="server_timeout_message">"Prisijungti prie serverio, kad paleisti vaizdo įrašą?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Prisijungimas nepavyko, bandoma prisijungti prie %1$d\u2026"</string>
   <string name="media_controller_live">Tiesiogiai</string>
   <string name="media_controller_playing">Leidžiama</string>
   <string name="media_controller_connecting">Jungiamasi\u2026</string>
-  <string name="bookmark_add">"Pridėti į adresyną"</string>
-  <string name="bookmark_display">"Rodyti adresyną"</string>
-  <string name="bookmark_empty">"Nėra adresyno žymių"</string>
-  <string name="bookmark_exist">"Adresyno žyme jau yra"</string>
-  <string name="bookmark_add_success">"Pridėti adresyno žymę"</string>
-  <string name="bookmark_list">"Adresynas"</string>
+  <string name="bookmark_add">"Pridėti žymę"</string>
+  <string name="bookmark_display">"Rodyti žymes"</string>
+  <string name="bookmark_empty">"Žymių nėra"</string>
+  <string name="bookmark_exist">"Žymė jau egzistuoja"</string>
+  <string name="bookmark_add_success">"Žymė pridėta"</string>
+  <string name="bookmark_list">"Žymės"</string>
   <string name="bookmark_title">"Pavadinimas"</string>
   <string name="bookmark_location">"Vietovė"</string>
-  <string name="delete_all">"Šalinti visas"</string>
+  <string name="delete_all">"Ištrinti visas"</string>
   <string name="default_title">"Numatytasis pavadinimas"</string>
-  <string name="mute_nosupport">Negalima nutildyti: video nepalaikomas</string>
+  <string name="mute_nosupport">Negalima nutildyti: vaizdo įrašas nepalaikomas</string>
   <string name="fail_trim">Atsiprašome, šis vaizdo įrašas negali būti apkarpytas</string>
   <string name="bass_boost_strength">Žemų dažnių stiprintuvas</string>
   <string name="virtualizer_strength">3D efektas</string>
diff --git a/res/values-lv/codeaurora_strings.xml b/res/values-lv/codeaurora_strings.xml
new file mode 100644
index 000000000..0cc5024fa
--- /dev/null
+++ b/res/values-lv/codeaurora_strings.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="step_option_name">Solis</string>
+  <string name="step_option_desc">Pielāgot ātro pārtīšanu turp/atpakaļ</string>
+  <string name="step_option_alternate">5 sekundes</string>
+  <string name="step_option_default">10 sekundes</string>
+  <string name="loop">"Cilpa"</string>
+  <string name="single">"Viens"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Skaļrunis ieslēgts</string>
+  <string name="speaker_off">Skaļrunis izslēgts</string>
+  <string name="speaker_need_headset">Lai lietotu šo iespēju, pievienojiet austiņas.</string>
+  <string name="single_track">"Viens kanāls"</string>
+  <string name="input_url">"Ievadiet URL"</string>
+  <string name="streaming_settings">"Straumēšanas iestatījumi"</string>
+  <string name="next">"Nākamais"</string>
+  <string name="previous">"Iepriekšējais"</string>
+  <string name="buffer_size">Bufera lielums</string>
+  <string name="apn">Vēlamais APN</string>
+  <string name="rtp_min_port">Min. ports</string>
+  <string name="rtp_max_port">Maks. ports</string>
+  <string name="set_rtp_min_port">Iestatīt min. portu</string>
+  <string name="set_rtp_max_port">Iestatīt maks. portu</string>
+  <string name="set_buffer_size">Iestatīt bufera lielumu</string>
+  <string name="set_apn">Izvēlieties vēlamo APN</string>
+  <string name="setting">Iestatījumi</string>
+  <string name="server_timeout_title">"Servera noildze"</string>
+  <string name="server_timeout_message">"Pārsavienoties ar serveri, lai atskaņotu video?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Savienojus neizdevās, mēģinot pieslēgties %1$d\u2026"</string>
+  <string name="media_controller_live">Dzīvajā</string>
+  <string name="media_controller_playing">Spēlē</string>
+  <string name="media_controller_connecting">Savienojas\u2026</string>
+  <string name="bookmark_add">"Pievienot grāmatzīmi"</string>
+  <string name="bookmark_display">"Rādīt grāmatzīmes"</string>
+  <string name="bookmark_empty">"Nav grāmatzīmju"</string>
+  <string name="bookmark_exist">"Grāmatzīme jau pastāv"</string>
+  <string name="bookmark_add_success">"Grāmatzīme pievienota"</string>
+  <string name="bookmark_list">"Grāmatzīmes"</string>
+  <string name="bookmark_title">"Virsraksts"</string>
+  <string name="bookmark_location">"Atrašanās vieta"</string>
+  <string name="delete_all">"Dzēst visu"</string>
+  <string name="default_title">"Noklusētais virsraksts"</string>
+  <string name="mute_nosupport">Nevar atslēgt skaņu: video nav atbalstīts</string>
+  <string name="fail_trim">Atvainojiet, šo video failu nevar apgriezt</string>
+  <string name="bass_boost_strength">Basu pastiprināšana</string>
+  <string name="virtualizer_strength">3D efekts</string>
+  <string name="audio_effects">Audio efekti</string>
+  <string name="headset_plug">Šo efekte lietošanai jāpievieno austiņas.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="can_not_trim">Var apgriezt tikai mp4 un 3gb formātu failus</string>
+</resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
new file mode 100644
index 000000000..5c7e5c7db
--- /dev/null
+++ b/res/values-nb/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Opptakstid</string>
+</resources>
diff --git a/res/values-pl/codeaurora_strings.xml b/res/values-pl/codeaurora_strings.xml
new file mode 100644
index 000000000..5ff6a9fb7
--- /dev/null
+++ b/res/values-pl/codeaurora_strings.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="step_option_name">Stopień</string>
+  <string name="step_option_desc">Dostosuj stopnie przewijania/cofania</string>
+  <string name="step_option_alternate">5 sekund</string>
+  <string name="step_option_default">10 sekund</string>
+  <string name="loop">"Pętla"</string>
+  <string name="single">"Pojedynczy"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Głośnik włączony</string>
+  <string name="speaker_off">Głośnik wyłączony</string>
+  <string name="speaker_need_headset">Podłącz słuchawki, aby skorzystać z tej funkcji.</string>
+  <string name="single_track">"Pojedynczy utwór"</string>
+  <string name="input_url">"Wprowadź adres URL"</string>
+  <string name="streaming_settings">"Ustawienia strumieniowania"</string>
+  <string name="next">"Następny"</string>
+  <string name="previous">"Poprzedni"</string>
+  <string name="buffer_size">Rozmiar bufora</string>
+  <string name="apn">Preferowany APN</string>
+  <string name="rtp_min_port">Min port</string>
+  <string name="rtp_max_port">Max port</string>
+  <string name="set_rtp_min_port">Ustaw min port</string>
+  <string name="set_rtp_max_port">Ustaw max port</string>
+  <string name="set_buffer_size">Ustaw rozmiar bufora</string>
+  <string name="set_apn">Wybierz preferowany APN</string>
+  <string name="setting">Ustawienia</string>
+  <string name="server_timeout_title">"Limit czasu serwera"</string>
+  <string name="server_timeout_message">"Połączyć ponownie się z serwerem, aby odtworzyć wideo?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Połączenie nie powiodło się, próba odnowienia połączenia do %1$d\u2026"</string>
+  <string name="media_controller_live">Na żywo</string>
+  <string name="media_controller_playing">Odtwarzanie</string>
+  <string name="media_controller_connecting">Łączenie\u2026</string>
+  <string name="bookmark_add">"Dodaj zakładkę"</string>
+  <string name="bookmark_display">"Pokaż zakładki"</string>
+  <string name="bookmark_empty">"Brak zakładek"</string>
+  <string name="bookmark_exist">"Zakładka już istnieje"</string>
+  <string name="bookmark_add_success">"Dodano zakładkę"</string>
+  <string name="bookmark_list">"Zakładki"</string>
+  <string name="bookmark_title">"Tytuł"</string>
+  <string name="bookmark_location">"Lokalizacja"</string>
+  <string name="delete_all">"Usuń wszystkie"</string>
+  <string name="default_title">"Domyślny tytuł"</string>
+  <string name="mute_nosupport">Nie można wyciszyć: film nieobsługiwany</string>
+  <string name="fail_trim">Niestety, ten plik wideo nie może zostać przycięty</string>
+  <string name="bass_boost_strength">Podbicie basu</string>
+  <string name="virtualizer_strength">Efekt 3D</string>
+  <string name="audio_effects">Efekty dźwiękowe</string>
+  <string name="headset_plug">Podłącz słuchawki dla tych efektów.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="can_not_trim">Tylko pliki mp4 i 3gp mogą zostać przycięte</string>
+</resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
new file mode 100644
index 000000000..6c991bbe9
--- /dev/null
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tempo de gravação</string>
+</resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
new file mode 100644
index 000000000..6c991bbe9
--- /dev/null
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tempo de gravação</string>
+</resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
new file mode 100644
index 000000000..a9cec0a27
--- /dev/null
+++ b/res/values-ru/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Время записи</string>
+</resources>
diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml
new file mode 100644
index 000000000..43a849ca0
--- /dev/null
+++ b/res/values-si/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">රෙකෝඩිත වේලාව</string>
+</resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
new file mode 100644
index 000000000..b13455c1a
--- /dev/null
+++ b/res/values-sk/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Čas nahrania</string>
+</resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
new file mode 100644
index 000000000..0f8bd1a56
--- /dev/null
+++ b/res/values-sr/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Време снимања</string>
+</resources>
diff --git a/res/values-sv/codeaurora_strings.xml b/res/values-sv/codeaurora_strings.xml
new file mode 100644
index 000000000..230adb16d
--- /dev/null
+++ b/res/values-sv/codeaurora_strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="step_option_name">Steg</string>
+  <string name="bookmark_add">"Lägg till bokmärke"</string>
+  <string name="bookmark_display">"Visa bokmärken"</string>
+</resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
new file mode 100644
index 000000000..482b0573d
--- /dev/null
+++ b/res/values-th/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">เวลาบันทึก</string>
+</resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
new file mode 100644
index 000000000..e75ceedde
--- /dev/null
+++ b/res/values-tr/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Kayıt zamanı</string>
+</resources>
diff --git a/res/values-ug/filtershow_strings.xml b/res/values-ug/filtershow_strings.xml
index 27f0b4540..103e3906c 100644
--- a/res/values-ug/filtershow_strings.xml
+++ b/res/values-ug/filtershow_strings.xml
@@ -15,6 +15,138 @@
      limitations under the License.
 -->
 <resources>
+  <string name="title_activity_filter_show">سۈرەت تەھرىرلىگۈچ</string>
+  <string name="cannot_load_image">بۇ سۈرەتنى يۈكلىيەلمەيدۇ!</string>
+  <string name="cannot_edit_original">دەسلەپكى نۇسخىنى تەھرىرلىيەلمەيدۇ</string>
   <string name="original_picture_text">@string/original</string>
+  <string name="setting_wallpaper">تام قەغەزنى تەڭشەۋاتىدۇ</string>
+  <string name="download_failure">سۈرەتنى چۈشۈرەلمەيدۇ. تورنى ئىشلەتكىلى بولمايدۇ.</string>
+  <string name="original">ئەسلى</string>
+  <string name="borders" msgid="4461692156695893616">گىرۋەك</string>
+  <string name="custom_border">ئىختىيارىي</string>
+  <string name="filtershow_undo">يېنىۋال</string>
+  <string name="filtershow_redo">قايتىلا</string>
+  <string name="show_imagestate_panel">قوللانغان ئۈنۈملەرنى كۆرسەت</string>
+  <string name="hide_imagestate_panel">قوللانغان ئۈنۈملەرنى يوشۇر</string>
+  <string name="export_image">چىقار</string>
+  <string name="print_image">باس</string>
+  <string name="export_flattened">جىپىسلىغان سۈرەتنى چىقار</string>
+  <string name="select_output_settings">چىقىرىلغان سۈرەت كۆچۈرۈلمە نۇسخا، ھېچقانداق تەھرىرلەش خاتىرىسىنى ئۆز ئىچىگە ئالمايدۇ.</string>
+  <string name="quality">سۈپەت</string>
+  <string name="size">چوڭلۇقى</string>
+  <string name="x">x</string>
+  <string name="menu_settings">تەڭشەكلەر</string>
+  <string name="unsaved">بۇ سۈرەتنىڭ ساقلانمىغان ئۆزگەرتىشلىرى بار.</string>
+  <string name="save_before_exit">چېكىنىش ئاۋۋال ساقلامسىز؟</string>
+  <string name="save_and_exit">ساقلاپ چېكىن</string>
+  <string name="save_and_processing">ئەسلى ئېنىقلىقتىكى سۈرەتنى بىر تەرەپ قىلىۋاتىدۇ…</string>
+  <string name="exit">چېكىن</string>
+  <string name="history">تارىخ</string>
+  <string name="reset">ئەسلىگە قايتۇر</string>
+  <string name="history_original">@string/original</string>
+  <string name="imageState">قوللانغان ئۈنۈملەر</string>
+  <string name="compare_original">سېلىشتۇر</string>
+  <string name="apply_effect">قوللان</string>
+  <string name="reset_effect">ئەسلىگە قايتۇر</string>
+  <string name="aspect">ئېگىز-كەڭلىك</string>
+  <string name="aspect1to1_effect">1, 1</string>
+  <string name="aspect4to3_effect">4:3</string>
+  <string name="aspect3to4_effect">3:4</string>
+  <string name="aspect4to6_effect">4:6</string>
+  <string name="aspect5to7_effect">5:7</string>
+  <string name="aspect7to5_effect">7:5</string>
+  <string name="aspect9to16_effect">16:9</string>
+  <string name="aspectNone_effect">يوق</string>
   <string name="aspectOriginal_effect">@string/original</string>
+  <string name="Fixed">مۇقىم</string>
+  <string name="tinyplanet">كىچىك پىلانىت</string>
+  <string name="exposure" msgid="1229093066434614811">نۇر ئۆتۈش</string>
+  <string name="sharpness">ئېنىقلىقى</string>
+  <string name="contrast">ئاق-قارىلىقى</string>
+  <string name="vibrance">تەبىئى تويۇنۇش</string>
+  <string name="saturation">تويۇنۇش</string>
+  <string name="bwfilter">BW سۈزگۈچ</string>
+  <string name="wbalance">ئاپتوماتىك رەڭ</string>
+  <string name="hue">رەڭگى</string>
+  <string name="shadow_recovery">سايە</string>
+  <string name="highlight_recovery">يورۇت</string>
+  <string name="curvesRGB">ئەگرى سىزىقلار</string>
+  <string name="vignette">سايە</string>
+  <string name="vignette_main">سايە</string>
+  <string name="vignette_exposure">نۇر ئۆتۈش</string>
+  <string name="vignette_saturation">تويۇنۇش</string>
+  <string name="vignette_contrast">ئاق-قارىلىقى</string>
+  <string name="vignette_falloff">ئاجىزلىشىشى</string>
+  <string name="redeye">قىزىل كۆز</string>
+  <string name="imageDraw">سىز</string>
+  <string name="straighten" msgid="5217801513491493491">تۈزلە</string>
+  <string name="crop" msgid="5584000454518174632">كەس</string>
+  <string name="rotate" msgid="460017689320955494">ئايلاندۇر</string>
+  <string name="mirror">ئەينەك</string>
+  <string name="negative">تەتۈر رەڭ</string>
+  <string name="none" msgid="3601545724573307541">يوق</string>
+  <string name="edge">گىرۋەكلەر</string>
+  <string name="kmeans">رەڭ تۈسى ئايرىش</string>
+  <string name="downsample">ئاستى مىسال</string>
+  <string name="grad">تەدرىجىي ئۆزگىرىش</string>
+  <string name="editor_grad_brightness">يورۇقلۇق</string>
+  <string name="editor_grad_contrast">ئاق-قارىلىقى</string>
+  <string name="editor_grad_saturation">تويۇنۇش</string>
+  <string name="editor_chan_sat_main">ئاساسىي تىزىملىك</string>
+  <string name="editor_chan_sat_red">قىزىل</string>
+  <string name="editor_chan_sat_yellow">سېرىق</string>
+  <string name="editor_chan_sat_green">يېشىل</string>
+  <string name="editor_chan_sat_cyan">توق يېشىل</string>
+  <string name="editor_chan_sat_blue">كۆك</string>
+  <string name="editor_chan_sat_magenta">ئاچ قىزىل</string>
+  <string name="editor_grad_style">ئۇسلۇب</string>
+  <string name="editor_grad_new">يېڭى</string>
+  <string name="curves_channel_rgb">RGB</string>
+  <string name="curves_channel_red">قىزىل</string>
+  <string name="curves_channel_green">يېشىل</string>
+  <string name="curves_channel_blue">كۆك</string>
+  <string name="draw_style">ئۇسلۇب</string>
+  <string name="draw_size">چوڭلۇقى</string>
+  <string name="draw_hue">رەڭگى</string>
+  <string name="draw_saturation">تويۇنۇش</string>
+  <string name="draw_value">يورۇقلۇق</string>
+  <string name="draw_color">رەڭ</string>
+  <string name="draw_style_line">سىزىقلار</string>
+  <string name="draw_style_brush_spatter">بەلگە قەلىمى</string>
+  <string name="draw_style_brush_marker">چاچقۇن</string>
+  <string name="draw_clear">تازىلا</string>
+  <string name="color_border_size">قېلىنلىقى</string>
+  <string name="color_border_corner_size">بۇلۇڭ چوڭلۇقى</string>
+  <string name="color_border_color">رەڭ</string>
+  <string name="color_border_clear">تازىلا</string>
+  <string name="color_pick_select">ئىختىيارىي رەڭ تاللاڭ</string>
+  <string name="color_pick_title">رەڭ تاللاڭ</string>
+  <string name="draw_size_title">چوڭلۇقىنى تاللاڭ</string>
+  <string name="draw_size_accept">جەزملە</string>
+  <string name="state_panel_original">ئەسلى</string>
+  <string name="state_panel_result">نەتىجە</string>
+  <string name="filtershow_notification_label">سۈرەتنى ساقلاۋاتىدۇ</string>
+  <string name="filtershow_notification_message">بىر تەرەپ قىلىۋاتىدۇ…</string>
+  <string name="filtershow_save_preset">نۆۋەتتى ئالدىن تەڭشەكنى ساقلا</string>
+  <string name="filtershow_manage_preset">ئىشلەتكۈچى ئالدىن تەڭشەكنى باشقۇر</string>
+  <string name="filtershow_new_preset">يېڭى ئالدىن تەڭشەك</string>
+  <string name="filtershow_preset_name">ئالدىن تەڭشەك ئىسمى</string>
+  <string name="filtershow_show_info_panel">ئۇچۇر</string>
+  <string name="filtershow_show_info_panel_name">سۈرەت ئاتى</string>
+  <string name="filtershow_show_info_panel_size">سۈرەت چوڭلۇقى</string>
+  <string name="filtershow_show_info_panel_histogram">چاسا دىئاگرامما</string>
+  <string name="filtershow_show_info_panel_exif">EXIF سانلىق مەلۇمات</string>
+  <string name="filtershow_add_button_looks">ئالدىن تەڭشەك</string>
+  <string name="filtershow_add_button_versions">نەشرى</string>
+  <string name="filtershow_version_original">ئەسلى</string>
+  <string name="filtershow_version_current">نۆۋەتتىكى</string>
+  <string name="filtershow_exif_model">ئەندىزە</string>
+  <string name="filtershow_exif_aperture">نۇر گەردىشى</string>
+  <string name="filtershow_exif_focal_length">فوكۇس ئارىلىقى</string>
+  <string name="filtershow_exif_iso">ISO</string>
+  <string name="filtershow_exif_subject_distance">جىسىم ئارىلىقى</string>
+  <string name="filtershow_exif_date">تارتىلغان چېسلا</string>
+  <string name="filtershow_exif_f_stop">يورۇقلۇق چەمبەر قىممىتى</string>
+  <string name="filtershow_exif_exposure_time">نۇرلاندۇرۇش ۋاقتى</string>
+  <string name="filtershow_exif_copyright">نەشر ھوقوقى</string>
 </resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 6fbd999ee..d6ae66ed7 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -15,6 +15,410 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">سۈرەت يىغقۇچ</string>
+  <string name="gadget_title">رەسىم كاندۇك</string>
+  <string name="details_ms">%1$02d:%2$02d</string>
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
+  <string name="movie_view_label">سىن  قويغۇچ</string>
+  <string name="loading_video">سىن يۈكلەۋاتىدۇ…</string>
+  <string name="loading_image">سۈرەت يۈكلەۋاتىدۇ…</string>
+  <string name="loading_account">ھېسابات يۈكلەۋاتىدۇ…</string>
+  <string name="resume_playing_title">سىننى داۋاملاشتۇر</string>
+  <string name="resume_playing_message">%s دىن قويۇشنى داۋاملاشتۇرامدۇ؟</string>
+  <string name="resume_playing_resume">قويۇشنى داۋاملاشتۇر</string>
+  <string name="loading">يۈكلەۋاتىدۇ…</string>
+  <string name="fail_to_load">يۈكلىيەلمىدى</string>
+  <string name="fail_to_load_image">بۇ سۈرەتنى يۈكلىيەلمەيدۇ</string>
+  <string name="no_thumbnail">كىچىك سۈرەت يوق</string>
+  <string name="resume_playing_restart">قايتا باشلا</string>
+  <string name="crop_save_text">جەزملە</string>
+  <string name="ok">جەزملە</string>
+  <string name="multiface_crop_help">چىرايدىن بىرسى چېكىلسە باشلايدۇ.</string>
+  <string name="saving_image">رەسىم ساقلاۋاتىدۇ…</string>
+  <string name="filtershow_saving_image">رەسىمنى <xliff:g id="ALBUM_NAME">%1$s</xliff:g> غا ساقلاۋاتىدۇ…</string>
+  <string name="save_error">كېسىلگەن سۈرەتنى ساقلىيالمايدۇ.</string>
+  <string name="crop_label">رەسىم كەس</string>
+  <string name="trim_label">سىن كەس</string>
+  <string name="select_image">سۈرەت تاللاڭ</string>
+  <string name="select_video">سىن تاللاش</string>
+  <string name="select_item">تۈر تاللاڭ</string>
+  <string name="select_album">ئالبۇم تاللاڭ</string>
+  <string name="select_group">گۇرۇپپا تاللاڭ</string>
+  <string name="set_image">رەسىم تەڭشىكى</string>
+  <string name="set_wallpaper">تام قەغەز تەڭشىكى</string>
+  <string name="wallpaper">تام قەغەز تەڭشەۋاتىدۇ\u2026</string>
+  <string name="camera_setas_wallpaper">تام قەغىزى</string>
+  <string name="delete">ئۆچۈر</string>
+  <plurals name="delete_selection">
+    <item quantity="other">تاللىغان تۈرنى ئۆچۈرەمدۇ؟</item>
+  </plurals>
+  <string name="confirm">جەزملە</string>
+  <string name="cancel">ۋاز كەچ</string>
+  <string name="share">ھەمبەھىر</string>
+  <string name="share_panorama">پۈتۈن مەنزىرە ھەمبەھىر</string>
+  <string name="share_as_photo">سۈرەت سۈپىتىدە ھەمبەھىر</string>
+  <string name="deleted">ئۆچۈرۈلدى</string>
+  <string name="undo">يېنىۋال</string>
+  <string name="select_all">ھەممىنى تاللا</string>
+  <string name="deselect_all">ھەممىنى تاللىما</string>
+  <string name="slideshow">تام تەسۋىر كۆرسەت</string>
+  <string name="details">تەپسىلاتى</string>
+  <string name="details_title">%2$d دىن %1$d تۈر:</string>
+  <string name="close">ياپ</string>
+  <string name="switch_to_camera">كامېراغا ئالماشتۇر</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="other">%1$d تاللاندى</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="other">%1$d تاللاندى</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="other">%1$d تاللاندى</item>
+  </plurals>
+  <string name="show_on_map">خەرىتىدە كۆرسەت</string>
+  <string name="rotate_left">سولغا ئايلاندۇر</string>
+  <string name="rotate_right">ئوڭغا ئايلاندۇر</string>
+  <string name="no_such_item">تۈرنى تاپالمىدى.</string>
+  <string name="edit">تەھرىر</string>
+  <string name="simple_edit">ئاددىي تەھرىر</string>
+  <string name="process_caching_requests">غەملەش ئىلتىماسىنى بىر تەرەپ قىلىۋاتىدۇ</string>
+  <string name="caching_label">غەملەۋاتىدۇ…</string>
+  <string name="crop_action">كەس</string>
+  <string name="trim_action">كەس</string>
+  <string name="mute_action">ئۈنسىز</string>
+  <string name="set_as">تەڭشىكى</string>
+  <string name="video_mute_err">سىننى ئۈنسىز قىلالمايدۇ.</string>
+  <string name="video_err">سىننى قويالمايدۇ</string>
+  <string name="group_by_location">ئورنى بويىچە</string>
+  <string name="group_by_time">ۋاقىت بويىچە</string>
+  <string name="group_by_tags">بەلگە بويىچە</string>
+  <string name="group_by_faces">كىشى بويىچە</string>
+  <string name="group_by_album">ئالبۇم بويىچە</string>
+  <string name="group_by_size">چوڭلۇقى بويىچە</string>
+  <string name="untagged">بەلگە قويۇلمىغان</string>
+  <string name="no_location">ئورنى يوق</string>
+  <string name="no_connectivity">بەزى ئورۇنلارنى تور كاشىلىسى سەۋەبىدىن ئېنىقلىيالمىدى.</string>
+  <string name="sync_album_error">بۇ ئالبۇمدىكى سۈرەتلەرنى چۈشۈرەلمىدى. سەل تۇرۇپ قايتا سىناڭ.</string>
+  <string name="show_images_only">سۈرەتلەرلا</string>
+  <string name="show_videos_only">سىنلارلا</string>
+  <string name="show_all">سۈرەت ۋە سىنلار</string>
+  <string name="appwidget_title">سۈرەت يىغقۇچ</string>
+  <string name="appwidget_empty_text">سۈرەت يوق.</string>
+  <string name="crop_saved">كېسىلگەن سۈرەت <xliff:g id="FOLDER_NAME">%s</xliff:g> غا ساقلاندى.</string>
+  <string name="no_albums_alert">ئىشلەتكىلى بولىدىغان ئالبۇم يوق.</string>
+  <string name="empty_album">سۈرەت/سىننى ئىشلەتكىلى بولىدۇ.</string>
+  <string name="picasa_posts">يازمىلار</string>
+  <string name="make_available_offline">تورسىز ئىشلەتكىلى بولىدۇ</string>
+  <string name="sync_picasa_albums">يېڭىلا</string>
+  <string name="done">تامام</string>
+  <string name="sequence_in_set">%2$d دىن %1$d تۈر:</string>
+  <string name="title">ماۋزۇ</string>
+  <string name="description">چۈشەندۈرۈش</string>
+  <string name="time">ۋاقىت</string>
+  <string name="location">ئورنى</string>
+  <string name="path">يول</string>
+  <string name="width">كەڭلىك</string>
+  <string name="height">ئېگىزلىك</string>
+  <string name="orientation">يۆنىلىش</string>
+  <string name="duration">داۋاملىشىش ۋاقتى</string>
+  <string name="mimetype">MIME تىپى</string>
+  <string name="file_size">ھۆججەت چوڭلۇقى</string>
+  <string name="maker">ياسىغۇچ</string>
+  <string name="model">ئەندىزە</string>
+  <string name="flash">چاقماق لامپا</string>
+  <string name="aperture">نۇر گەردىشى</string>
+  <string name="focal_length">فوكۇس ئارىلىقى</string>
+  <string name="white_balance">ئاق تەڭپۇڭلۇق</string>
+  <string name="exposure_time">ئاشكارىلانغان ۋاقتى</string>
+  <string name="iso">ISO</string>
+  <string name="unit_mm">mm</string>
+  <string name="manual">قولدا</string>
+  <string name="auto">ئاپتوماتىك</string>
+  <string name="flash_on">چاقماق لامپا</string>
+  <string name="flash_off">چاقماق لامپا يوق</string>
+  <string name="unknown">يوچۇن</string>
+  <string name="ffx_original">ئەسلى</string>
+  <string name="ffx_vintage">قەدىمىي</string>
+  <string name="ffx_instant">شۇئان</string>
+  <string name="ffx_bleach">ئاقارتىش</string>
+  <string name="ffx_blue_crush">كۆك</string>
+  <string name="ffx_bw_contrast">B/W</string>
+  <string name="ffx_punch">يۇيۇپ چىڭداش</string>
+  <string name="ffx_x_process">ئەكسى يۇيۇش</string>
+  <string name="ffx_washout">لاتتې قەھۋە</string>
+  <string name="ffx_washout_color">تاش باسما</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="other">ئالبۇمنى تورسىز ئىشلەتكىلى بولىدۇ.</item>
+  </plurals>
+  <string name="try_to_set_local_album_available_offline">بۇ تۈر يەرلىك ئورۇنغا ساقلاندى، تورسىز ئىشلەتكىلى بولىدۇ.</string>
+  <string name="set_label_all_albums">ھەممە ئالبۇم</string>
+  <string name="set_label_local_albums">يەرلىك ئالبۇم</string>
+  <string name="set_label_mtp_devices">MTP ئۈسكۈنىلىرى</string>
+  <string name="set_label_picasa_albums">Picasa ئالبۇمى</string>
+  <string name="free_space_format"><xliff:g id="BYTES">%s</xliff:g> بوش</string>
+  <string name="size_below"><xliff:g id="SIZE">%s</xliff:g> ياكى تۆۋەن</string>
+  <string name="size_above"><xliff:g id="SIZE">%s</xliff:g> ياكى يۇقىرى</string>
+  <string name="size_between"><xliff:g id="MIN_SIZE">%1$s</xliff:g> دىن <xliff:g id="MAX_SIZE">%2$s</xliff:g> غا</string>
+  <string name="Import">ئەكىر</string>
+  <string name="import_complete">ئەكىرىش تامام</string>
+  <string name="import_fail">ئەكىرەلمىدى</string>
+  <string name="camera_connected">كامېرا باغلاندى</string>
+  <string name="camera_disconnected">كامېرا ئۈزۈلدى</string>
+  <string name="click_import">بۇ جاي چېكىلسە ئەكىرىدۇ</string>
+  <string name="widget_type_album">بىر ئالبۇم تاللاڭ</string>
+  <string name="widget_type_shuffle">ھەممە سۈرەتنى سۆرەڭ</string>
+  <string name="widget_type_photo">بىر سۈرەت تاللاڭ:</string>
+  <string name="widget_type">سۈرەت تاللاڭ</string>
+  <string name="slideshow_dream_name">تام تەسۋىر كۆرسەت</string>
+  <string name="albums">سۈرەت توپلىمى</string>
+  <string name="times">ۋاقىت</string>
+  <string name="locations">ئورنى</string>
+  <string name="people">كىشى</string>
+  <string name="tags">خەتكۈچلەر</string>
+  <string name="group_by">گۇرۇپپا ئاساسى</string>
+  <string name="settings">تەڭشەكلەر</string>
+  <string name="add_account">ھېسابات قوش</string>
+  <string name="folder_camera">كامېرا</string>
+  <string name="folder_download">چۈشۈر</string>
+  <string name="folder_edited_online_photos">تەھرىرلەنگەن توردىكى سۈرەتلەر</string>
+  <string name="folder_imported">ئەكىردى</string>
+  <string name="folder_screenshot">ئېكراندىن تۇتۇلغان سۈرەت</string>
+  <string name="help">ياردەم</string>
+  <string name="no_external_storage_title">ساقلىغۇچ يوق</string>
+  <string name="no_external_storage">ھېچقانداق سىرتقى ساقلىغۇچ يوق</string>
+  <string name="switch_photo_filmstrip">تام تەسۋىر كۆرۈنۈش</string>
+  <string name="switch_photo_grid">سېتكا كۆرۈنۈش</string>
+  <string name="switch_photo_fullscreen">پۈتۈن ئېكران كۆرۈنۈش</string>
+  <string name="trimming">كېسىۋاتىدۇ</string>
+  <string name="muting">ئۈنسىز قىلىۋاتىدۇ</string>
+  <string name="please_wait">سەل كۈتۈڭ</string>
+  <string name="save_into">سىننى <xliff:g id="ALBUM_NAME">%1$s</xliff:g> غا ساقلاۋاتىدۇ…</string>
+  <string name="trim_too_short">كېسەلمەيدۇ: نىشان سىن بەك قىسقا\"</string>
+  <string name="pano_progress_text">پۈتۈن مەنزىرە سۈرەتنى رەڭلەۋاتىدۇ</string>
+  <string name="save" msgid="8140440041190264400">ساقلا</string>
+  <string name="ingest_scanning" msgid="2048262851775139720">مەزمۇننى تەكشۈرۈۋاتىدۇ…</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="other">%1$d تۈر تارالدى</item>
+  </plurals>
+  <string name="ingest_sorting" msgid="624687230903648118">تەرتىپلەۋاتىدۇ…</string>
+  <string name="ingest_scanning_done">تەكشۈرۈش تامام</string>
+  <string name="ingest_importing">ئەكىرىۋاتىدۇ…</string>
+  <string name="ingest_empty_device">بۇ ئۈسكۈنىدە ئەكىرگىلى بولىدىغان ھېچقانداق مەزمۇن يوق.</string>
+  <string name="ingest_no_device">ھېچقانداق MTP ئۈسكۈنە باغلانمىدى</string>
+  <string name="camera_error_title">كامېرا خاتالىقى</string>
+  <string name="cannot_connect_camera">كامېراغا باغلىنالمىدى</string>
+  <string name="camera_disabled">بىخەتەرلىك تەدبىرى سەۋەبىدىن كامېرا چەكلەندى.</string>
+  <string name="camera_label">كامېرا</string>
+  <string name="wait">سەل كۈتۈڭ…</string>
+  <string name="no_storage" product="nosdcard">كامېرانى ئىشلىتىشتىن ئىلگىرى USB ساقلىغۇچنى ئېگەرلەڭ.</string>
+  <string name="no_storage" product="default">كامېرا ئىشلىتىشتىن ئىلگىرى SD كارتا قىستۇرۇڭ.</string>
+  <string name="preparing_sd" product="nosdcard">USB ساقلىغۇچنى تەييارلاۋاتىدۇ…</string>
+  <string name="preparing_sd" product="default">SD كارتا تەييارلاۋاتىدۇ…</string>
+  <string name="access_sd_fail" product="nosdcard">USB ساقلىغۇچنى زىيارەت قىلالمايدۇ.</string>
+  <string name="access_sd_fail" product="default">SD كارتىنى زىيارەت قىلالمايدۇ.</string>
+  <string name="review_cancel">ۋاز كەچ</string>
+  <string name="review_ok">تامام</string>
+  <string name="time_lapse_title">ۋاقىت بەلگىلەپ خاتىرىلەش</string>
+  <string name="pref_camera_id_title">كامېرا تاللاڭ</string>
+  <string name="pref_camera_id_entry_back">قايت</string>
+  <string name="pref_camera_id_entry_front">ئالدى</string>
+  <string name="pref_camera_recordlocation_title">ساقلاش ئورنى</string>
+  <string name="pref_camera_location_label">ئورنى</string>
+  <string name="pref_camera_timer_title">تەتۈر سانىغۇچ ۋاقىت خاتىرىلىگۈچ</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="other">1 سېكۇنت</item>
+  </plurals>
+  <string name="pref_camera_timer_sound_default">@string/setting_on_value</string>
+  <string name="pref_camera_timer_sound_title">تەتۈر ساناۋاتقاندا ئەسكەرتىش ئاۋازى چىقار</string>
+  <string name="setting_off">تاقاق</string>
+  <string name="setting_on">ئوچۇق</string>
+  <string name="pref_video_quality_title">سىن سۈپىتى</string>
+  <string name="pref_video_quality_entry_high">يۇقىرى</string>
+  <string name="pref_video_quality_entry_low">تۆۋەن</string>
+  <string name="pref_video_time_lapse_frame_interval_title">ۋاقىت بەلگىلەپ سۈرەت تارتىش</string>
+  <string name="pref_camera_settings_category">كامېرا تەڭشەك</string>
+  <string name="pref_camcorder_settings_category">سىنئالغۇ تەڭشەك</string>
+  <string name="pref_camera_picturesize_title">رەسىم چوڭلۇقى</string>
+  <string name="pref_camera_picturesize_entry_13mp">13 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_8mp">8 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_5mp">5 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_4mp">4 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_3mp">3 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_2mp">2 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_2mp_wide">2 مىليون پىكسېل (16:9)</string>
+  <string name="pref_camera_picturesize_entry_1_3mp">1،3 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_1mp">1 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_vga">VGA</string>
+  <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
+  <string name="pref_camera_focusmode_title">فوكۇس مودېلى</string>
+  <string name="pref_camera_focusmode_entry_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_focusmode_entry_infinity">چەكسىز</string>
+  <string name="pref_camera_focusmode_entry_macro">ماكرو</string>
+  <string name="pref_camera_focusmode_label_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_focusmode_label_infinity">چەكسىز</string>
+  <string name="pref_camera_focusmode_label_macro">ماكرو</string>
+  <string name="pref_camera_flashmode_title">قول چىراغ ھالىتى</string>
+  <string name="pref_camera_flashmode_label">چاقماق چىراغ ھالىتى</string>
+  <string name="pref_camera_flashmode_entry_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_flashmode_entry_on">ئوچۇق</string>
+  <string name="pref_camera_flashmode_entry_off">تاقاق</string>
+  <string name="pref_camera_flashmode_label_auto">چاقماق چىراغ ئاپتوماتىل</string>
+  <string name="pref_camera_flashmode_label_on">چاقماق چىراغ ئوچۇق</string>
+  <string name="pref_camera_flashmode_label_off">چاقماق چىراغ تاقاق</string>
+  <string name="pref_camera_whitebalance_title">ئاق تەڭپۇڭلۇق</string>
+  <string name="pref_camera_whitebalance_label">ئاق تەڭپۇڭلۇق</string>
+  <string name="pref_camera_whitebalance_entry_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">چوغلانما لامپا</string>
+  <string name="pref_camera_whitebalance_entry_daylight">كۈن نۇرى</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">يالتىراق لامپا</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">بۇلۇتلۇق</string>
+  <string name="pref_camera_whitebalance_label_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_whitebalance_label_incandescent">چوغلانما لامپا</string>
+  <string name="pref_camera_whitebalance_label_daylight">كۈن نۇرى</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">يالتىراق لامپا</string>
+  <string name="pref_camera_whitebalance_label_cloudy">بۇلۇتلۇق</string>
+  <string name="pref_camera_scenemode_title">مەنزىرە ھالىتى</string>
+  <string name="pref_camera_scenemode_entry_auto">ئاپتوماتىك</string>
   <string name="pref_camera_scenemode_entry_hdr">HDR</string>
+  <string name="pref_camera_scenemode_entry_action">مەشغۇلات</string>
+  <string name="pref_camera_scenemode_entry_night">كېچە</string>
+  <string name="pref_camera_scenemode_entry_sunset">كۈن پېتىش</string>
+  <string name="pref_camera_scenemode_entry_party">يىغىلىش</string>
+  <string name="pref_camera_scenemode_label_auto">يوق</string>
+  <string name="pref_camera_scenemode_label_action">مەشغۇلات</string>
+  <string name="pref_camera_scenemode_label_night">كېچە</string>
+  <string name="pref_camera_scenemode_label_sunset">كۈن پېتىش</string>
+  <string name="pref_camera_scenemode_label_party">يىغىلىش</string>
+  <string name="pref_camera_countdown_label">تەتۈر سانىغۇچ ۋاقىت خاتىرىلىگۈچ</string>
+  <string name="pref_camera_countdown_label_off">ۋاقىت خاتىرىلىگۈچ تاقاق</string>
+  <string name="pref_camera_countdown_label_one">1 سېكۇنت</string>
+  <string name="pref_camera_countdown_label_three">3 سېكۇنت</string>
+  <string name="pref_camera_countdown_label_ten">10 سېكۇنت</string>
+  <string name="pref_camera_countdown_label_fifteen">15 سېكۇنت</string>
+  <string name="not_selectable_in_scene_mode">تەڭشەكنى مەنزىرە ھالىتىدە تاللىغىلى بولمايدۇ.</string>
+  <string name="pref_exposure_title">نۇر ئۆتۈش</string>
+  <string name="pref_exposure_label">نۇر ئۆتۈش</string>
+  <string name="pref_camera_hdr_default">@string/setting_off_value</string>
   <string name="pref_camera_hdr_label">HDR</string>
+  <string name="pref_camera_id_label_back">ئالدى كامېرا</string>
+  <string name="pref_camera_id_label_front">كەينى كامېرا</string>
+  <string name="dialog_ok">جەزملە</string>
+  <string name="spaceIsLow_content" product="nosdcard">USB ساقلىغۇچ بوشلۇقىڭىز توشاي دېدى. سۈپەت تەڭشەكنى ئۆزگەرتىڭ ياكى بەزى سۈرەتلەرنى ياكى باشقا ھۆججەتلەرنى ئۆچۈرۈڭ.</string>
+  <string name="spaceIsLow_content" product="default">SD كارتا بوشلۇقىڭىز توشاي دېدى. سۈپەت تەڭشەكنى ئۆزگەرتىڭ ياكى بەزى سۈرەتلەرنى ياكى باشقا ھۆججەتلەرنى ئۆچۈرۈڭ.</string>
+  <string name="video_reach_size_limit">چوڭلۇق چېكىگە يەتتى.</string>
+  <string name="pano_too_fast_prompt">بەك تېز</string>
+  <string name="pano_dialog_prepare_preview">پۈتۈن مەنزىرە تەييارلاۋاتىدۇ</string>
+  <string name="pano_dialog_panorama_failed">پۈتۈن مەنزىرە ساقلىيالمايدۇ.</string>
+  <string name="pano_dialog_title">پۈتۈن مەنزىرە</string>
+  <string name="pano_capture_indication">پۈتۈن مەنزىرە سۈرەت تارتىۋاتىدۇ</string>
+  <string name="pano_dialog_waiting_previous">ئالدىنقى پۈتۈن مەنزىرە سۈرەتنىڭ بىر تەرەپ قىلىنىشىنى كۈتۈۋاتىدۇ</string>
+  <string name="pano_review_saving_indication_str">ساقلاۋاتىدۇ…</string>
+  <string name="pano_review_rendering">پۈتۈن مەنزىرە سۈرەتنى رەڭلەۋاتىدۇ</string>
+  <string name="tap_to_focus">چېكىسلە فوكۇس توغرىلايدۇ.</string>
+  <string name="pref_video_effect_title">ئالاھىدە ئۈنۈم</string>
+  <string name="effect_none">يوق</string>
+  <string name="effect_goofy_face_squeeze">شەيتان ئەينەك</string>
+  <string name="effect_goofy_face_big_eyes">چوڭ كۆز</string>
+  <string name="effect_goofy_face_big_mouth">چوڭ ئېغىز</string>
+  <string name="effect_goofy_face_small_mouth">كىچىك ئېغىز</string>
+  <string name="effect_goofy_face_big_nose">چوڭ بۇرۇن</string>
+  <string name="effect_goofy_face_small_eyes">كىچىك كۆز</string>
+  <string name="effect_backdropper_space">ئالەم تەگلىكى</string>
+  <string name="effect_backdropper_sunset">كۈن پېتىش</string>
+  <string name="effect_backdropper_gallery">سىنلىرىڭىز</string>
+  <string name="bg_replacement_message">ئۈسكۈنىنى پەسكە قويۇڭ.\"\n\"كۆرۈنۈش ئالدىدىن بىر دەم ئايرىلىڭ.</string>
+  <string name="video_snapshot_hint">سىنغا ئېلىۋاتقاندا چېكىلسە بىر پارچە سۈرەت تارتىدۇ.</string>
+  <string name="video_recording_started">سىنغا ئېلىش باشلاندى.</string>
+  <string name="video_recording_stopped">سىنغا ئېلىش توختىدى.</string>
+  <string name="disable_video_snapshot_hint">ئالاھىدە ئۈنۈمنى قوزغاتقاندا سىندىن سۈرەت تۇتۇش چەكلىنىدۇ.</string>
+  <string name="clear_effects">ئۈنۈمنى تازىلا</string>
+  <string name="effect_silly_faces">كۈلكىلىك چىرايلار</string>
+  <string name="effect_background">تەگلىك</string>
+  <string name="accessibility_shutter_button">Shutter توپچا</string>
+  <string name="accessibility_menu_button">تىزىملىك توپچا</string>
+  <string name="accessibility_review_thumbnail">يېقىنقى سۈرەت</string>
+  <string name="accessibility_camera_picker">ئالدى كەينى كامېرا ئالماشتۇرغۇچ</string>
+  <string name="accessibility_mode_picker">كامېرا، سىن ياكى پۈتۈن مەنزىرە تاللىغۇچ</string>
+  <string name="accessibility_second_level_indicators">تېخىمۇ كۆپ تەڭشەك تىزگىنلىرى</string>
+  <string name="accessibility_back_to_first_level">تەڭشەك تىزگىنىنى ياپ</string>
+  <string name="accessibility_zoom_control">يىراق يېقىن  تىزگىنى</string>
+  <string name="accessibility_decrement">%1$s نى يىراقلات</string>
+  <string name="accessibility_increment">%1$s نى يېقىنلات</string>
+  <string name="accessibility_check_box">%1$s كۆپ تاللاش رامكىسى</string>
+  <string name="accessibility_switch_to_camera">سۈرەتكە ئالماشتۇر</string>
+  <string name="accessibility_switch_to_video">سىنغا ئالماشتۇر</string>
+  <string name="accessibility_switch_to_panorama">پۈتۈن مەنزىرىگە ئالماشتۇر</string>
+  <string name="accessibility_switch_to_new_panorama">يېڭى پۈتۈن مەنزىرىگە ئالماشتۇر</string>
+  <string name="accessibility_switch_to_refocus">قايتا فوكۇسلاشقا ئالماشتۇر</string>
+  <string name="accessibility_review_cancel">ئالدىن كۆزىتىشتىن ۋاز كەچ</string>
+  <string name="accessibility_review_ok">ئالدىن كۆزىتىش تامام</string>
+  <string name="accessibility_review_retake">ئالدىن كۆزىتىشنى قايتا تارت</string>
+  <string name="accessibility_play_video">سىن چال</string>
+  <string name="accessibility_pause_video">سىننى ۋاقىتلىق توختات</string>
+  <string name="accessibility_reload_video">سىننى قايتا يۈكلە</string>
+  <string name="accessibility_time_bar">سىن چالغۇچ ۋاقىت بالداق</string>
+  <string name="capital_on">ئوچۇق</string>
+  <string name="capital_off">تاقاق</string>
+  <string name="pref_video_time_lapse_frame_interval_off">تاقاق</string>
+  <string name="pref_video_time_lapse_frame_interval_500">0.5 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_1000">1 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_1500">1.5 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_2000">2 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_2500">2.5 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_3000">3 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_4000">4 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_5000">5 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_6000">6 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_10000">10 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_12000">12 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_15000">15 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_24000">24 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_30000">0-5 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_60000">1 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_120000">2 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_180000">3 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_240000">4 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_300000">5 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_360000">6 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_600000">10 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_720000">12 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_900000">15 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_1800000">0.5 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 سائەت</string>
+  <string name="time_lapse_seconds">سېكۇنت</string>
+  <string name="time_lapse_minutes">مىنۇت</string>
+  <string name="time_lapse_hours">سائەت</string>
+  <string name="time_lapse_interval_set">تامام</string>
+  <string name="set_time_interval">\"ۋاقىت ئارىلىق تەڭشىكى\"</string>
+  <string name="set_time_interval_help">ۋاقىت كېچىكتۈرۈپ سۈرەت تارتىش ئىقتىدارى تاقالدى. ۋاقىت ئارىلىقى تەڭشىمەكچى بولغاندا، ئالدى بىلەن شۇ ئىقتىدارنى ئېچىڭ.</string>
+  <string name="set_timer_help">تەتۈر ساناق ۋاقىت خاتىرىلىغۇچ تاقاق. سۈرەت تارتىشتىن ئىلگىرى تەتۈر ساناق ئۈچۈن، ئالدى بىلەن شۇ ئىقتىدارنى ئېچىڭ.</string>
+  <string name="set_duration">داۋاملىشىش ۋاقىت تەڭشىكى سېكۇنت</string>
+  <string name="count_down_title_text">سۈرەت تارتىش تەتۈر ساناق ساناۋاتىدۇ</string>
+  <string name="remember_location_title">سۈرەت تارتقان ئورۇننى ئەستە تۇتامدۇ؟</string>
+  <string name="remember_location_prompt">سىز تارتقان سىن ۋە سۈرەتلىرىڭىزگە تارتقان ئورۇن بەلگىسىنى سالىدۇ.\"\n\n\"باشقا ئەپلەر سىز ساقلىغان سۈرەتلەرنى كۆرگەندە بۇ ئۇچۇرلارنى زىيارەت قىلالايدۇ.</string>
+  <string name="remember_location_no">ياق، رەھمەت</string>
+  <string name="remember_location_yes">ھەئە</string>
+  <string name="menu_camera">كامېرا</string>
+  <string name="menu_search">ئىزدە</string>
+  <string name="tab_photos">سۈرەتلەر</string>
+  <string name="tab_albums">سۈرەت توپلىمى</string>
+  <string name="camera_menu_more_label">تېخىمۇ كۆپ تاللانما</string>
+  <string name="camera_menu_settings_label">تەڭشەكلەر</string>
+  <plurals name="number_of_photos">
+    <item quantity="other">%d سۈرەت</item>
+  </plurals>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
new file mode 100644
index 000000000..7ba93d85a
--- /dev/null
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">已记录时间</string>
+</resources>
diff --git a/res/values-zh-rTW/codeaurora_strings.xml b/res/values-zh-rTW/codeaurora_strings.xml
new file mode 100644
index 000000000..b929b94d6
--- /dev/null
+++ b/res/values-zh-rTW/codeaurora_strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="step_option_alternate">5 秒</string>
+  <string name="step_option_default">10 秒</string>
+</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
new file mode 100644
index 000000000..d6da3b19d
--- /dev/null
+++ b/res/values/cm_strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Text indicating the time a media item was recorded in details window [CHAR LIMIT=14] -->
+    <string name="record_time">Record time</string>
+</resources>
\ No newline at end of file
diff --git a/src/com/android/gallery3d/data/MediaDetails.java b/src/com/android/gallery3d/data/MediaDetails.java
index cac524b88..225266029 100644
--- a/src/com/android/gallery3d/data/MediaDetails.java
+++ b/src/com/android/gallery3d/data/MediaDetails.java
@@ -17,15 +17,11 @@
 package com.android.gallery3d.data;
 
 import com.android.gallery3d.R;
-import com.android.gallery3d.common.Utils;
 import com.android.gallery3d.exif.ExifInterface;
 import com.android.gallery3d.exif.ExifTag;
-import com.android.gallery3d.exif.Rational;
 
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map.Entry;
@@ -50,15 +46,16 @@ public class MediaDetails implements Iterable<Entry<Integer, Object>> {
     public static final int INDEX_SIZE = 10;
 
     // for EXIF
-    public static final int INDEX_MAKE = 100;
-    public static final int INDEX_MODEL = 101;
-    public static final int INDEX_FLASH = 102;
-    public static final int INDEX_FOCAL_LENGTH = 103;
-    public static final int INDEX_WHITE_BALANCE = 104;
-    public static final int INDEX_APERTURE = 105;
-    public static final int INDEX_SHUTTER_SPEED = 106;
-    public static final int INDEX_EXPOSURE_TIME = 107;
-    public static final int INDEX_ISO = 108;
+    public static final int INDEX_DATETIME_ORIGINAL = 100;
+    public static final int INDEX_MAKE = 101;
+    public static final int INDEX_MODEL = 102;
+    public static final int INDEX_FLASH = 103;
+    public static final int INDEX_FOCAL_LENGTH = 104;
+    public static final int INDEX_WHITE_BALANCE = 105;
+    public static final int INDEX_APERTURE = 106;
+    public static final int INDEX_SHUTTER_SPEED = 107;
+    public static final int INDEX_EXPOSURE_TIME = 108;
+    public static final int INDEX_ISO = 109;
 
     // Put this last because it may be long.
     public static final int INDEX_PATH = 200;
@@ -148,6 +145,12 @@ public class MediaDetails implements Iterable<Entry<Integer, Object>> {
                 MediaDetails.INDEX_WIDTH);
         setExifData(details, exif.getTag(ExifInterface.TAG_IMAGE_LENGTH),
                 MediaDetails.INDEX_HEIGHT);
+        ExifTag recordTag = exif.getTag(ExifInterface.TAG_DATE_TIME_ORIGINAL);
+        if (recordTag == null)
+            recordTag = exif.getTag(ExifInterface.TAG_DATE_TIME_DIGITIZED);
+        if (recordTag == null)
+            recordTag = exif.getTag(ExifInterface.TAG_DATE_TIME);
+        setExifData(details, recordTag, MediaDetails.INDEX_DATETIME_ORIGINAL);
         setExifData(details, exif.getTag(ExifInterface.TAG_MAKE),
                 MediaDetails.INDEX_MAKE);
         setExifData(details, exif.getTag(ExifInterface.TAG_MODEL),
diff --git a/src/com/android/gallery3d/ui/DetailsHelper.java b/src/com/android/gallery3d/ui/DetailsHelper.java
index 47296f655..4f610407f 100644
--- a/src/com/android/gallery3d/ui/DetailsHelper.java
+++ b/src/com/android/gallery3d/ui/DetailsHelper.java
@@ -139,6 +139,8 @@ public class DetailsHelper {
                 return context.getString(R.string.exposure_time);
             case MediaDetails.INDEX_ISO:
                 return context.getString(R.string.iso);
+            case MediaDetails.INDEX_DATETIME_ORIGINAL:
+                return context.getString(R.string.record_time);
             default:
                 return "Unknown key" + key;
         }
diff --git a/src/com/android/gallery3d/ui/DialogDetailsView.java b/src/com/android/gallery3d/ui/DialogDetailsView.java
index 30fd1e18f..4a35e101f 100644
--- a/src/com/android/gallery3d/ui/DialogDetailsView.java
+++ b/src/com/android/gallery3d/ui/DialogDetailsView.java
@@ -33,14 +33,18 @@ import com.android.gallery3d.R;
 import com.android.gallery3d.app.AbstractGalleryActivity;
 import com.android.gallery3d.common.Utils;
 import com.android.gallery3d.data.MediaDetails;
+import com.android.gallery3d.exif.ExifInterface;
 import com.android.gallery3d.ui.DetailsAddressResolver.AddressResolvingListener;
 import com.android.gallery3d.ui.DetailsHelper.CloseListener;
 import com.android.gallery3d.ui.DetailsHelper.DetailsSource;
 import com.android.gallery3d.ui.DetailsHelper.DetailsViewContainer;
 import com.android.gallery3d.ui.DetailsHelper.ResolutionResolvingListener;
 
+import java.text.DateFormat;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Locale;
 import java.util.Map.Entry;
 
@@ -131,6 +135,15 @@ public class DialogDetailsView implements DetailsViewContainer {
             setDetails(context, details);
         }
 
+        private String exifDateToFormatedDate(String exifDt) {
+            try {
+                Date date = ExifInterface.DATETIME_FORMAT.parse(exifDt);
+                return DateFormat.getDateTimeInstance().format(date);
+            } catch (ParseException e) {
+                return exifDt;
+            }
+        }
+
         private void setDetails(Context context, MediaDetails details) {
             boolean resolutionIsValid = true;
             String path = null;
@@ -221,6 +234,9 @@ public class DialogDetailsView implements DetailsViewContainer {
                     case MediaDetails.INDEX_ORIENTATION:
                         value = toLocalInteger(detail.getValue());
                         break;
+                    case MediaDetails.INDEX_DATETIME_ORIGINAL:
+                        value = exifDateToFormatedDate(detail.getValue().toString());
+                        break;
                     default: {
                         Object valueObj = detail.getValue();
                         // This shouldn't happen, log its key to help us diagnose the problem.