Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0

4 files changed, 76 insertions, 0 deletions

diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 017719d..2fba83f 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -16,7 +16,9 @@
      limitations under the License.
  -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_description">PhotoPhasen Live-Hannergrondbild</string>
   <string name="no_pictures_oops_msg">Keng Biller fonnt</string>
+  <string name="mnu_restore">Erëmhierstellen</string>
   <string name="mnu_delete">Läschen</string>
   <string name="mnu_settings">Astellungen</string>
   <string name="mnu_select_all">All auswielen</string>
@@ -34,22 +36,67 @@
   <string name="pref_general">Allgemeng</string>
   <string name="pref_general_summary">Allgemeng Astellungen, Effekter an Iwwergäng</string>
   <string name="pref_general_settings">Astellungen</string>
+  <string name="pref_general_settings_wallpaper_dim">Hannergrondbild ofblenden</string>
   <string name="pref_general_settings_background_color">Hannergrondfaarf</string>
+  <string name="pref_general_settings_background_color_summary">Hannergrondfaarf festleeën</string>
+  <string name="pref_general_touch_action">Beréierungsaktioun</string>
+  <string name="pref_general_touch_action_summary_format"><xliff:g id="action_summary">%1$s</xliff:g> wann eng Rumm beréiert gëtt</string>
+  <string name="pref_general_aspect_ratio_correction">Säiteverhältnës</string>
+  <string name="pref_general_aspect_ratio_correction_summary">Probéier d\'Dimensioune vum Bild ze korrigéieren andeem s de et schneits fir dass et an d\'Rumm passt</string>
+  <string name="pref_general_transitions">Transitiounen</string>
   <string name="pref_general_transitions_types">Typen</string>
+  <string name="pref_general_transitions_types_summary_format"><xliff:g id="selected">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> Typen ausgewielt</string>
   <string name="pref_general_transitions_interval">Intervall</string>
   <string name="pref_general_effects">Effekter</string>
   <string name="pref_general_effects_types">Typen</string>
+  <string name="pref_general_effects_types_summary_format"><xliff:g id="selected">%1$d</xliff:g> vu(n) <xliff:g id="total">%2$d</xliff:g> Billereffekter ausgewielt</string>
+  <string name="pref_media">Medien</string>
+  <string name="pref_media_summary">Alben déi sollen ugewise ginn, Aktualiséierungsintervall an aner Medienastellungen</string>
+  <string name="pref_media_settings">Astellungen</string>
+  <string name="pref_media_settings_refresh_interval">Intervall fir nei ze lueden</string>
+  <string name="pref_media_settings_refresh_interval_disable">D\'Sich no neie Biller ass deaktivéiert</string>
+  <string name="pref_media_settings_refresh_interval_summary">All <xliff:g id="interval">%1$s</xliff:g> nei Biller sichen</string>
+  <string name="pref_media_settings_refresh_now">Elo nei lueden</string>
+  <string name="pref_media_settings_refresh_now_summary">Billerdatebank manuell aktualiséieren</string>
+  <string name="pref_media_pictures">Biller</string>
+  <string name="pref_media_albums">Alben</string>
+  <string name="pref_media_albums_summary">Alben a Biller, déi als Hannergrond ugewise solle ginn</string>
+  <string name="pref_media_auto_select_new">Alben autoamtesch auswielen</string>
+  <string name="pref_media_auto_select_new_summary">Nei Alben automatesch auswielen, wann en neit Medium erkannt gëtt</string>
+  <string name="pref_layout">Layout</string>
+  <string name="pref_layout_summary">Platzéierung vu Biller um Schierm</string>
+  <string name="pref_layout_disposition">Unuerdnung</string>
+  <string name="pref_random_dispositions">Zoufälleg</string>
+  <string name="pref_random_dispositions_summary">D\'Biller am ausgewielten Zäitofstand zoufälleg mëschen</string>
+  <string name="pref_random_dispositions_interval">Intervall</string>
+  <string name="pref_disposition_portrait">Héichformat</string>
+  <string name="pref_disposition_landscape">Breetformat</string>
+  <plurals name="pref_disposition_summary_format">
+    <item quantity="one">Ee Bild gëtt am <xliff:g id="orientation">%2$s</xliff:g> ugewisen</item>
+    <item quantity="other"><xliff:g id="count">%1$d</xliff:g> Biller ginn am <xliff:g id="orientation">%2$s</xliff:g> ugewisen</item>
+  </plurals>
+  <string name="disposition_orientation_portrait">Héichformat</string>
+  <string name="disposition_orientation_landscape">Breetformat</string>
+  <string name="pref_disposition_description">Rumm laang drécken an d\'Ränner verréckelen fir d\'Gréisst ze änneren. No lénks a riets wësche fir virdefinéiert Virlagen ze benotzen</string>
+  <string name="pref_disposition_template">Virlag <xliff:g id="number_of_template">%1$s</xliff:g> / <xliff:g id="total_of_templates">%2$s</xliff:g></string>
+  <string name="pref_disposition_unable_delete_advise">Konnt déi ausgewielte Rumm net läschen</string>
+  <string name="pref_about">Iwwer</string>
+  <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2014 The CyanogenMod Project</string>
   <string name="refresh_intervals_disabled">Desaktivéiert</string>
   <string name="refresh_intervals_1h">1 Stonn</string>
   <string name="refresh_intervals_4h">4 Stonnen</string>
   <string name="refresh_intervals_1d">1 Dag</string>
   <string name="refresh_intervals_2d">2 Deeg</string>
   <string name="refresh_intervals_1w">1 Woch</string>
+  <string name="touch_actions_none">Keng</string>
+  <string name="touch_actions_transition">Transitioun virhuelen</string>
   <string name="touch_actions_open">Opmaachen</string>
   <string name="touch_actions_share">Deelen</string>
   <string name="touch_actions_none_summary">Näischt maachen</string>
+  <string name="touch_actions_transition_summary">Biller-Transitioun virhuelen</string>
   <string name="touch_actions_open_summary">D\'Bild opmaachen</string>
   <string name="touch_actions_share_summary">D\'Bild deelen</string>
+  <string name="transitions_cube">Cube</string>
   <string name="transitions_fade">Ausblenden</string>
   <string name="transitions_flip">Ëmdréinen</string>
   <string name="transitions_swap">Austauschen</string>
@@ -59,13 +106,30 @@
   <string name="effects_autofix">Autokorrektur</string>
   <string name="effects_blur">Verwëschen</string>
   <string name="effects_crossprocess">Kräizbeaarbechtung</string>
+  <string name="effects_documentary">Dokumentarfilm</string>
+  <string name="effects_duotone">Zweetéineg</string>
+  <string name="effects_emboss">Prägung</string>
+  <string name="effects_fisheye">Fëscha</string>
   <string name="effects_glow">Liichten</string>
   <string name="effects_grain">Kären</string>
+  <string name="effects_grayscale">Grotéin</string>
   <string name="effects_halftone">Halleftéineg</string>
+  <string name="effects_lomoish">Lomo-ähnlech</string>
+  <string name="effects_mirror">Spigelen</string>
   <string name="effects_negative">Negativ</string>
+  <string name="effects_outline">Kontur</string>
   <string name="effects_pixelate">Verpixelen</string>
+  <string name="effects_popart">Pop-Art</string>
+  <string name="effects_posterize">Posteriséieren</string>
+  <string name="effects_saturate">Sättegen</string>
+  <string name="effects_scanlines">Rasterzeilen</string>
   <string name="effects_sepia">Sepia</string>
+  <string name="effects_temperature">Faarftemperatur</string>
+  <string name="effects_tint">Faarftoun</string>
+  <string name="effects_vignette">Vignettéierung</string>
+  <string name="color_picker_alpha_slider_text">Deckkraaft</string>
   <string name="color_picker_current_text">Momentan:</string>
   <string name="color_picker_new_text">Nei:</string>
   <string name="color_picker_color">Faarf:</string>
+  <string name="changelog_title">Ännerungshiwäiser</string>
 </resources>
diff --git a/res/values-tr/plurals.xml b/res/values-tr/plurals.xml
index 74f854d..8ab46ed 100644
--- a/res/values-tr/plurals.xml
+++ b/res/values-tr/plurals.xml
@@ -17,9 +17,11 @@
  -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="album_number_of_pictures">
+    <item quantity="one"><xliff:g id="pictures" example="7">%d</xliff:g> resim</item>
     <item quantity="other"><xliff:g id="pictures" example="7">%d</xliff:g> resim</item>
   </plurals>
   <plurals name="msg_media_reload_complete">
+    <item quantity="one">Medya ortamı yeniden yüklendi. <xliff:g id="pictures" example="7">%d</xliff:g> resim bulundu.</item>
     <item quantity="other">Medya ortamı yeniden yüklendi. <xliff:g id="pictures" example="7">%d</xliff:g> resim bulundu.</item>
   </plurals>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c04570f..f4312dd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -72,6 +72,7 @@
   <string name="pref_disposition_portrait">Portre düzenlemesi</string>
   <string name="pref_disposition_landscape">Manzara düzenlemesi</string>
   <plurals name="pref_disposition_summary_format">
+    <item quantity="one"><xliff:g id="orientation">%2$s</xliff:g> \'de <xliff:g id="count">%1$d</xliff:g> resim gösterilir.</item>
     <item quantity="other"><xliff:g id="orientation">%2$s</xliff:g> \'de <xliff:g id="count">%1$d</xliff:g> resim gösterilir.</item>
   </plurals>
   <string name="disposition_orientation_portrait">Dikey yerleşim</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9e1d6d7..0510900 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -33,21 +33,30 @@
   <string name="pref_general_settings">設定</string>
   <string name="pref_general_settings_background_color">背景顏色</string>
   <string name="pref_general_settings_background_color_summary">設定背景顏色</string>
+  <string name="pref_general_touch_action">觸碰行為</string>
   <string name="pref_general_transitions">轉場特效</string>
   <string name="pref_general_transitions_types">類型</string>
   <string name="pref_general_effects">效果</string>
   <string name="pref_general_effects_types">類型</string>
   <string name="pref_media">媒體</string>
   <string name="pref_media_settings">設定</string>
+  <string name="pref_media_pictures">圖片</string>
   <string name="pref_media_albums">相簿</string>
+  <string name="pref_media_auto_select_new">自動選擇相簿</string>
+  <string name="pref_layout_disposition">排序</string>
   <string name="pref_about">關於</string>
+  <string name="refresh_intervals_disabled">已停用</string>
   <string name="refresh_intervals_1h">1 小時</string>
   <string name="refresh_intervals_4h">4 小時</string>
   <string name="refresh_intervals_1d">1 天</string>
   <string name="refresh_intervals_2d">2 天</string>
   <string name="refresh_intervals_1w">1 週</string>
+  <string name="touch_actions_none">無</string>
+  <string name="touch_actions_open">開啟</string>
   <string name="touch_actions_share">分享</string>
+  <string name="touch_actions_open_summary">開啟圖片</string>
   <string name="transitions_flip">翻轉</string>
+  <string name="effects_autofix">自動修正</string>
   <string name="effects_blur">模糊</string>
   <string name="color_picker_alpha_slider_text">透明度</string>
   <string name="color_picker_current_text">目前：</string>