Gallery2: Remove CAF translations

Change-Id: I015238ca00115e76a4d25cbbd2f69a6420c58425

Gallery2: Remove more CAF Chinese translation modifications

Change-Id: I147526f6b0dd401f150821c00d0221c14390c418

9 files changed, 13 insertions, 344 deletions

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2c4ab5166..e639fd4c5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -436,9 +436,4 @@
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotos"</item>
   </plurals>
-
-    <string name="no_permission_for_drm">Los archivos DRM no pueden compartirse.</string>
-    <string name="drm_license_info">Información de licencia Drm</string>
-    <string name="mimetype_not_supported">No puede reproducirse este archivo.</string>
-    <string name="action_consumes_rights">Se agotarán los derechos para reproducir este multimedia.</string>
 </resources>
diff --git a/res/values-zh-rCN/codeaurora_strings.xml b/res/values-zh-rCN/codeaurora_strings.xml
deleted file mode 100644
index d046f3f1b..000000000
--- a/res/values-zh-rCN/codeaurora_strings.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-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">
-    <!-- Strings for step option settins -->
-    <string name="setp_option_name">步长</string>
-    <string name="step_option_desc">定制快进/快退步长</string>
-    <string name="setp_option_three_second">3秒</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="media_detail">"媒体详情"</string>
-    <string name="input_url">"输入 URL"</string>
-    <string name="streaming_settings">"流媒体设置"</string>
-    <string name="next">"下一个"</string>
-    <string name="previous">"上一个"</string>
-
-    <string name="rtp_rtcp">RTP/RTCP</string>
-    <string name="min_port">最小端口:</string>
-    <string name="max_port">最大端口:</string>
-    <string name="buffer_size">缓存大小</string>
-    <string name="apn">优先接入点</string>
-    <string name="rtp_min_port">RTP最小端口</string>
-    <string name="rtp_max_port">RTP最大端口</string>
-    <string name="set_rtp_min_port">设置RTP最小端口</string>
-    <string name="set_rtp_max_port">设置RTP最大端口</string>
-    <string name="set_buffer_size">设置缓冲大小</string>
-    <string name="set_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次重连..."</string>
-    <string name="media_controller_live">直播</string>
-    <string name="media_controller_playing">正在播放</string>
-    <string name="media_controller_connecting">正在连接...</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>
-</resources>
diff --git a/res/values-zh-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml
index 10925d717..f01dcc136 100755..100644
--- a/res/values-zh-rCN/filtershow_strings.xml
+++ b/res/values-zh-rCN/filtershow_strings.xml
@@ -38,10 +38,9 @@
     <string name="size" msgid="4639404642236356037">"大小"</string>
     <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"设置"</string>
-    <string name="unsaved" msgid="8704442449002374375">"是否放弃对当前图片的操作？"</string>
-    <string name="save_before_exit" msgid="2680660633675916712">"放弃更改？"</string>
+    <string name="unsaved" msgid="8704442449002374375">"此图片的更改尚未保存。"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"要在退出之前保存更改吗？"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"保存并退出"</string>
-    <string name="discard">"放弃"</string>
     <string name="save_and_processing" msgid="6371565035837463194">"正在处理完整分辨率图片…"</string>
     <string name="exit" msgid="242642957038770113">"退出"</string>
     <string name="history" msgid="455767361472692409">"历史记录"</string>
@@ -145,7 +144,7 @@
     <string name="filtershow_add_button_versions" msgid="7620107266685809612">"版本"</string>
     <string name="filtershow_version_original" msgid="1413894292200912828">"原图"</string>
     <string name="filtershow_version_current" msgid="6609334422797468952">"当前"</string>
-    <string name="filtershow_exif_model" msgid="3543206476046267466">"型号"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"机型"</string>
     <string name="filtershow_exif_aperture" msgid="5076571522763604380">"光圈"</string>
     <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"焦距"</string>
     <string name="filtershow_exif_iso" msgid="5822494416955625317">"感光度"</string>
@@ -154,89 +153,4 @@
     <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"光圈值"</string>
     <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"曝光时间"</string>
     <string name="filtershow_exif_copyright" msgid="8801875918803737581">"版权"</string>
-    <!--  Label for the "refocus" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="focus">对焦</string>
-    <!--  Label for the "fusion" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="fusion">背景切换</string>
-    <!--  Label for the "sketch" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="sketch">素描</string>
-    <!--  Label for the "halo" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="halo">光环</string>
-    <!--  Label for the "zoom" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="zoom">缩放模糊</string>
-    <!--  Label for the "motion" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="motion">动态模糊</string>
-    <!--  Label for the "bw" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="bw">去色</string>
-    <!--  Label for the "blackboard" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="blackboard">黑板</string>
-    <!--  Label for the "whiteboard" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="whiteboard">白板</string>
-    <!--  Label for the "posterize" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="posterize">色块化</string>
-    <!--  Label for the "negative" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="dc_negative">负片</string>
-
-    <string name="blur">"虚化"</string>
-    <string name="motion_blur">"动态虚化"</string>
-    <string name="color">滤镜</string>
-    <string name="frames">相框</string>
-
-    <string name="dual_camera_effects">双摄像头效果</string>
-    <string name="dual_camera_effects_intro">此功能可将双摄像头效果应用到背景上，如动态模糊和素描。.你可以将两张照片合并到一起来创建一个有趣的效果。这个功能在你的摄像头和照片的主体有一个短距离时效果最好。</string>
-    <string name="trueportrait_intro">此功能用于增强人像照。你可以将效果应用于照片背景，例如“模糊”和“速写”。你也可以将两张照片拼在一起来给你的人像照创建一个有趣的背景。</string>
-    <string name="watermark_location">位置</string>
-    <string name="watermark_time">时间</string>
-    <string name="watermark_weather">天气</string>
-    <string name="watermark_emotions">表情</string>
-    <string name="watermark_food">食物</string>
-    <!--  True Effect button -->
-    <string name="truescanner">镜头校正</string>
-    <string name="trueScanner">"镜头校正"</string>
-    <string name="truescanner_normal">"标准"</string>
-    <string name="truescanner_white">"白板"</string>
-    <string name="truescanner_remove_glare">"去除眩光"</string>
-    <!--  HazeBuster button -->
-    <string name="hazebuster_acts">去雾霾</string>
-    <string name="hazeBuster">"去雾霾"</string>
-    <!--  SeeStraight button -->
-    <string name="seestraight_acts">正视</string>
-    <string name="seeStraight">"正视"</string>
-    <string name="trueportrait">真实肖像</string>
-    <string name="fusion_pick_point">"选择段"</string>
-    <string name="fusion_pick_underlay">"选择垫层"</string>
-    <string name="dualcam_no_segment_toast">"在此处未找到任何段"</string>
-    <string name="dualcam_filter_not_supported">"此图片不支持双相机滤镜"</string>
-    <string name="trueportrait_no_face">"无法对此照片应用真实肖像效果。未检测到面部。"</string>
-    <string name="trueportrait_edit_intro">"使用润色工具，可以编辑前景和背景。您可以使用手指在任何遗漏的前景或背景区域中涂色。"</string>
-    <string name="trueportrait_edit_foreground_toast">"您可以使用手指在任何遗漏的前景区域中涂色。"</string>
-    <string name="trueportrait_edit_background_toast">"您可以使用手指在任何遗漏的背景区域中涂色。"</string>
-    <string name="trueportrait_edit_help">"要进行缩放，请使用双指张合触摸手势。您还可以使用双指拖动图像以重新定位图像。这样可以更轻松地修复任何问题区域。"</string>
-    <string name="trueportrait_fusion_intro">"您的前景肖像可以复制并粘贴到图库中的任意照片上。您可以尝试使用不同的背景照片创建有趣的新肖像照片。"</string>
-    <string name="dualcam_fusion_intro">"可以将您的前景复制并粘贴到图库中的任意照片上。\n\n您可以尝试使用不同的背景照片创建有趣的新肖像照片。"</string>
-    <string name="trueportrait_touch_up">"润色"</string>
-    <string name="fusion_pick_background">"选择背景照片"</string>
-    <string name="ok_continue">"继续"</string>
-    <string name="beautify">"美化"</string>
-    <string name="dualcam">"双摄像头"</string>
-    <string name="foreground">"前景"</string>
-    <string name="background">"背景"</string>
-    <string name="brush_size">"画笔大小"</string>
-    <string name="filtershow_dialog_title">"自定义滤镜"</string>
-    <string name="filtershow_dialog_content">"您可以创建照片滤镜。\n\n选择一张您喜欢的照片，然后将其用作其他照片的滤镜"</string>
-    <string name="filtershow_dialog_original_photo">"原始照片"</string>
-    <string name="filtershow_dialog_apply_photo">"要应用的色彩"</string>
-    <string name="filtershow_dialog_checkbox">"不再显示"</string>
-    <string name="filtershow_preset_title">"自定义"</string>
-    <string name="filtershow_preset_rename">"重命名"</string>
-    <string name="delete_before_exit">"删除滤镜?"</string>
-    <string name="rename_before_exit">"重命名滤镜"</string>
-    <string name="filter_name">"滤镜名称"</string>
-    <string name="filter_name_notification">"名称不能为空。"</string>
-    <string name="filter_name_duplicate">"该名称已存在，请输入其他名称。"</string>
-
-    <!--Filtershow Toast -->
-    <string name="no_faces_found">未能检测到人脸</string>
-    <string name="image_size_too_small">图片尺寸太小</string>
-    <string name="not_support_gif">不支持gif格式的图片，请重新选择</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 199d1ce55..91a6358c2 100755..100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="1928079047368929634">"骁龙图库"</string>
+    <string name="app_name" msgid="1928079047368929634">"图库"</string>
     <string name="gadget_title" msgid="259405922673466798">"相框"</string>
     <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>
     <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>
@@ -48,9 +48,7 @@
     <string name="set_image" msgid="2331476809308010401">"将照片设置为"</string>
     <string name="set_wallpaper" msgid="8491121226190175017">"设置壁纸"</string>
     <string name="wallpaper" msgid="140165383777262070">"正在设置壁纸..."</string>
-    <string name="share_dialogue_title">分享选择</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"壁纸"</string>
-    <string name="cannot_share_items">分享选择条目最大值为300</string>
     <string name="delete" msgid="2839695998251824487">"删除"</string>
   <plurals name="delete_selection">
     <item quantity="one" msgid="6453379735401083732">"要删除所选内容吗？"</item>
@@ -71,19 +69,19 @@
     <string name="close" msgid="5585646033158453043">"关闭"</string>
     <string name="switch_to_camera" msgid="7280111806675169992">"切换到相机"</string>
   <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="2142579311530586258">"已选中 %1$d 项"</item>
-    <item quantity="one" msgid="2478365152745637768">"已选中 %1$d 项"</item>
-    <item quantity="other" msgid="754722656147810487">"已选中 %1$d 项"</item>
+    <item quantity="zero" msgid="2142579311530586258">"选中了 %1$d 项"</item>
+    <item quantity="one" msgid="2478365152745637768">"选中了 %1$d 项"</item>
+    <item quantity="other" msgid="754722656147810487">"选中了 %1$d 项"</item>
   </plurals>
   <plurals name="number_of_albums_selected">
-    <item quantity="zero" msgid="749292746814788132">"已选中 %1$d 本相册"</item>
-    <item quantity="one" msgid="6184377003099987825">"已选中 %1$d 本相册"</item>
-    <item quantity="other" msgid="53105607141906130">"已选中 %1$d 本相册"</item>
+    <item quantity="zero" msgid="749292746814788132">"选中了 %1$d 本相册"</item>
+    <item quantity="one" msgid="6184377003099987825">"选中了 %1$d 本相册"</item>
+    <item quantity="other" msgid="53105607141906130">"选中了 %1$d 本相册"</item>
   </plurals>
   <plurals name="number_of_groups_selected">
-    <item quantity="zero" msgid="3466388370310869238">"已选中 %1$d 组"</item>
-    <item quantity="one" msgid="5030162638216034260">"已选中 %1$d 组"</item>
-    <item quantity="other" msgid="3512041363942842738">"已选中 %1$d 组"</item>
+    <item quantity="zero" msgid="3466388370310869238">"选中了 %1$d 组"</item>
+    <item quantity="one" msgid="5030162638216034260">"选中了 %1$d 组"</item>
+    <item quantity="other" msgid="3512041363942842738">"选中了 %1$d 组"</item>
   </plurals>
     <string name="show_on_map" msgid="6157544221201750980">"显示在地图上"</string>
     <string name="rotate_left" msgid="5888273317282539839">"向左旋转"</string>
@@ -96,7 +94,6 @@
     <string name="crop_action" msgid="3427470284074377001">"剪裁"</string>
     <string name="trim_action" msgid="703098114452883524">"修剪"</string>
     <string name="mute_action" msgid="5296241754753306251">"静音"</string>
-    <string name="mute_nosupport">静音失败 : 视频格式不支持</string>
     <string name="set_as" msgid="3636764710790507868">"设置为"</string>
     <string name="video_mute_err" msgid="6392457611270600908">"无法将视频静音。"</string>
     <string name="video_err" msgid="7003051631792271009">"无法播放视频。"</string>
@@ -108,7 +105,6 @@
     <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>
@@ -215,12 +211,6 @@
     <item quantity="one" msgid="4340019444460561648">"已扫描%1$d项"</item>
     <item quantity="other" msgid="3138021473860555499">"已扫描%1$d项"</item>
   </plurals>
-    <!-- String indicating how many media items from the camera have been selected -->
-    <plurals name="ingest_number_of_items_selected">
-        <item quantity="zero">"已选择 %1$d 个项目"</item>
-        <item quantity="one">"已选择 %1$d 个项目"</item>
-        <item quantity="other">"已选择 %1$d 个项目"</item>
-    </plurals>
     <string name="ingest_sorting" msgid="1028652103472581918">"正在排序..."</string>
     <string name="ingest_scanning_done" msgid="8911916277034483430">"扫描已完成"</string>
     <string name="ingest_importing" msgid="7456633398378527611">"正在导入..."</string>
@@ -436,9 +426,6 @@
     <string name="remember_location_prompt" msgid="724592331305808098">"为您的照片和视频标明拍摄地点。\n\n其他应用在查看您保存的照片和视频时将可以使用这些信息。"</string>
     <string name="remember_location_no" msgid="7541394381714894896">"不用了"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"好"</string>
-    <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
-    <string name="map_activity_not_found_err">没有地图应用显示地理位置信息</string>
-
     <string name="menu_camera" msgid="3476709832879398998">"相机"</string>
     <string name="menu_search" msgid="7580008232297437190">"搜索"</string>
     <string name="tab_photos" msgid="9110813680630313419">"照片"</string>
@@ -449,46 +436,4 @@
     <item quantity="one" msgid="6949174783125614798">"%1$d张照片"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d张照片"</item>
   </plurals>
-
-    <plurals name="number_of_videos">
-      <item quantity="one">%1$d个视频</item>
-      <item quantity="other">%1$d个视频</item>
-    </plurals>
-
-    <string name="bass_boost_strength" msgid="882301530007752270">"低音增强"</string>
-    <string name="virtualizer_strength" msgid="5035111173763913313">"环绕声"</string>
-    <string name="audio_effects" msgid="612896145300512593">"音效"</string>
-    <string name="headset_plug">“插入耳机体验音效”</string>
-    <string name="text_makeup_whiten">美白</string>
-    <string name="text_makeup_Soften">磨皮</string>
-    <string name="text_makeup_trimface">瘦脸</string>
-    <string name="text_makeup_bigeye">大眼</string>
-    <!-- The tips of trimming video -->
-    <string name="fail_trim">抱歉，不能修剪该视频文件</string>
-    <string name="can_not_trim">只有MP4和3GP文件才能修剪</string>
-
-    <string name="no_permission_for_drm">"抱歉，无法共享 DRM 文件"</string>
-    <string name="drm_license_info">"DRM 许可证信息"</string>
-    <string name="mimetype_not_supported">"无法播放此文件"</string>
-    <string name="action_consumes_rights">"播放此媒体需要使用相应权限"</string>
-    <string-array name="title_array_nav_items">
-        <item>@string/timeline_title</item>
-        <item>@string/albums_title</item>
-        <item>@string/videos_title</item>
-    </string-array>
-
-    <!-- Timeline screen title -->
-    <string name="timeline_title">时间轴</string>
-    <!-- Videos screen title -->
-    <string name="videos_title">视频</string>
-    <string name="action_viewtype_list">列表视图</string>
-    <string name="tvEmptyAlbum">没有图片</string>
-    <string name="tvEmptyVideos">没有视频</string>
-
-    <string name="trim_video_exit_title">放弃更改？</string>
-    <string name="trim_video_exit_msg">是否放弃对当前影片的操作？</string>
-    <string name="trim_video_exit_discard">放弃</string>
-    <string name="do_not_show_again">不再显示</string>
-    <string name="seestraight_input_image_is_small">图片太小无法处理</string>
-    <string name="seestraight_process_fail">无法处理图片</string>
 </resources>
diff --git a/res/values-zh-rHK/filtershow_strings.xml b/res/values-zh-rHK/filtershow_strings.xml
index 5712e0c26..aa07bc5e0 100755..100644
--- a/res/values-zh-rHK/filtershow_strings.xml
+++ b/res/values-zh-rHK/filtershow_strings.xml
@@ -153,5 +153,4 @@
     <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"光圈孔徑"</string>
     <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"曝光時間"</string>
     <string name="filtershow_exif_copyright" msgid="8801875918803737581">"版權"</string>
-    <string name="trueportrait_intro">此功能用於增強人像照。你可以將效果應用於照片背景，例如“模糊”和“速寫”。你也可以將兩張照片拼在一起來給你的人像照創建一個有趣的背景。</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 5330be458..68317d582 100755..100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -105,7 +105,6 @@
     <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>
@@ -437,5 +436,4 @@
     <item quantity="one" msgid="6949174783125614798">"%1$d 張相片"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d 張相片"</item>
   </plurals>
-  <string name="do_not_show_again">不再顯示</string>
 </resources>
diff --git a/res/values-zh-rTW/codeaurora_strings.xml b/res/values-zh-rTW/codeaurora_strings.xml
deleted file mode 100644
index 45317df19..000000000
--- a/res/values-zh-rTW/codeaurora_strings.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2013, 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">
-    <!-- Strings for step option settins -->
-    <string name="setp_option_name">步長</string>
-    <string name="step_option_desc">定制快進/快退步長</string>
-    <string name="setp_option_three_second">3秒</string>
-    <string name="setp_option_six_second">>6秒</string>
-
-    <string name="loop">"循環"</string>
-    <string name="single">"單次"</string>
-    <string name="stereo">"立體聲"</string>
-    <string name="single_track">"單聲道"</string>
-    <string name="media_detail">"媒體詳情"</string>
-    <string name="input_url">"輸入 URL"</string>
-    <string name="streaming_settings">"串流設定"</string>
-    <string name="next">"下一個"</string>
-    <string name="previous">"上一個"</string>
-
-    <string name="rtp_rtcp">RTP/RTCP</string>
-    <string name="min_port">最小端口:</string>
-    <string name="max_port">最大端口:</string>
-    <string name="buffer_size">緩存大小</string>
-    <string name="apn">優先接入點</string>
-    <string name="rtp_min_port">RTP最小端口</string>
-    <string name="rtp_max_port">RTP最大端口</string>
-    <string name="set_rtp_min_port">設置RTP最小端口</string>
-    <string name="set_rtp_max_port">設置RTP最大端口</string>
-    <string name="set_buffer_size">設置緩衝大小</string>
-    <string name="set_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..."</string>
-    <string name="media_controller_live">直播</string>
-    <string name="media_controller_playing">正在播放</string>
-    <string name="media_controller_connecting">正在連線...</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>
-</resources>
diff --git a/res/values-zh-rTW/filtershow_strings.xml b/res/values-zh-rTW/filtershow_strings.xml
index 887f4fda1..f689a0fe6 100755..100644
--- a/res/values-zh-rTW/filtershow_strings.xml
+++ b/res/values-zh-rTW/filtershow_strings.xml
@@ -153,8 +153,4 @@
     <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"光圈孔徑"</string>
     <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"曝光時間"</string>
     <string name="filtershow_exif_copyright" msgid="8801875918803737581">"版權"</string>
-
-    <string name="color">濾鏡</string>
-    <string name="frames">相框</string>
-    <string name="trueportrait_intro">此功能用於增強人像照。你可以將效果應用於照片背景，例如“模糊”和“速寫”。你也可以將兩張照片拼在一起來給你的人像照創建一個有趣的背景。</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b5e67c14e..88fa970d9 100755..100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -105,7 +105,6 @@
     <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>
@@ -437,22 +436,4 @@
     <item quantity="one" msgid="6949174783125614798">"%1$d 張相片"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d 張相片"</item>
   </plurals>
-
-    <plurals name="number_of_videos">
-        <item quantity="one">%1$d个影片</item>
-        <item quantity="other">%1$d个影片</item>
-    </plurals>
-
-    <string name="bass_boost_strength">"低音加強"</string>
-    <string name="virtualizer_strength">"3D 效果"</string>
-    <string name="audio_effects">"音效"</string>
-
-    <!-- Timeline screen title -->
-    <string name="timeline_title">時間軸</string>
-    <!-- Videos screen title -->
-    <string name="videos_title">影片</string>
-    <string name="action_viewtype_list">列表视图</string>
-    <string name="tvEmptyAlbum">O 個可用的圖片</string>
-    <string name="tvEmptyVideos">O 個可用的影片</string>
-    <string name="do_not_show_again">不再顯示</string>
 </resources>