Merge branch 'cm-12.1' of git://github.com/CyanogenMod/android_packages_apps_Gallery2 into cm-13.0

Change-Id: Ib8caa024d2e6feca332e3645038f226fd5a910a2

2 files changed, 81 insertions, 0 deletions

diff --git a/res/values-zh-rHK/codeaurora_strings.xml b/res/values-zh-rHK/codeaurora_strings.xml
new file mode 100644
index 000000000..800ffa5bd
--- /dev/null
+++ b/res/values-zh-rHK/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.
+Copyright (C) 2014-2015 The CyanogenMod Project
+
+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="setp_option_name">步驟</string>
+  <string name="step_option_desc">自訂快進/後退步驟</string>
+  <string name="setp_option_six_second">6 秒</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="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="more_image">更多圖像</string>
+  <string name="mute_nosupport">無法靜音：影片不支援</string>
+  <string name="map_activity_not_found_err">沒有安裝地圖應用程式供顯示位置。</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="fail_trim">抱歉，此影片檔無法被修剪</string>
+</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 68317d582..434190b43 100644..100755
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -105,6 +105,7 @@
     <string name="group_by_size" msgid="153766174950394155">"依大小分類"</string>
     <string name="untagged" msgid="7281481064509590402">"無標記"</string>
     <string name="no_location" msgid="4043624857489331676">"無地點資訊"</string>
+    <string name="no_faces">"無人物資訊"</string>
     <string name="no_connectivity" msgid="7164037617297293668">"網絡發生問題，因此部分位置無法辨別。"</string>
     <string name="sync_album_error" msgid="1020688062900977530">"無法下載這本相簿中的相片，請稍後再試。"</string>
     <string name="show_images_only" msgid="7263218480867672653">"僅顯示相片"</string>