Gallery2: Move & improve CAF strings

Change-Id: I3861ed5094307034fcec830fd1ff0595a75e84e1

3 files changed, 99 insertions, 104 deletions

diff --git a/res/values/codeaurora_strings.xml b/res/values/codeaurora_strings.xml
index 941365252..b05aaf45c 100644
--- a/res/values/codeaurora_strings.xml
+++ b/res/values/codeaurora_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+Copyright (C) 2014-2016 The CyanogenMod Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -31,7 +32,7 @@ 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">Step</string>
-    <string name="step_option_desc">Customize fast forward/backward step</string>
+    <string name="step_option_desc">Customize fast forward/rewind step</string>
     <string name="setp_option_three_second">3 seconds</string>
     <string name="setp_option_six_second">6 seconds</string>
 
@@ -40,42 +41,120 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <string name="stereo">"Stereo"</string>
     <string name="speaker_on">Speaker ON</string>
     <string name="speaker_off">Speaker OFF</string>
-    <string name="speaker_need_headset">Please plug in headset first!</string>
+    <string name="speaker_need_headset">Plug in headphones to use this feature.</string>
     <string name="single_track">"Single track"</string>
-    <string name="media_detail">"Media details"</string>
-    <string name="input_url">"Input URL"</string>
-    <string name="streaming_settings">"Streaming Settings"</string>
+    <string name="input_url">"Enter URL"</string>
+    <string name="streaming_settings">"Streaming settings"</string>
     <string name="next">"Next"</string>
     <string name="previous">"Previous"</string>
 
-    <string name="rtp_rtcp">RTP/RTCP</string>
-    <string name="min_port">min port:</string>
-    <string name="max_port">max port:</string>
-    <string name="buffer_size">Buffer Size</string>
-    <string name="apn">Prefered APN</string>
+    <string name="rtp_rtcp" translatable="false">RTP/RTCP</string>
+    <string name="buffer_size">Buffer size</string>
+    <string name="apn">Preferred APN</string>
     <string name="rtp_min_port">Min port</string>
     <string name="rtp_max_port">Max port</string>
     <string name="set_rtp_min_port">Set min port</string>
     <string name="set_rtp_max_port">Set max port</string>
     <string name="set_buffer_size">Set buffer size</string>
-    <string name="set_apn">Select prefered apn</string>
+    <string name="set_apn">Select preferred APN</string>
     <string name="setting">Settings</string>
 
-    <string name="server_timeout_title">"Server Timeout"</string>
-    <string name="server_timeout_message">"Reconnect the server to play the video or not?"</string>
-    <string name="videoview_error_text_cannot_connect_retry">"Connection failed, try to reconnect %1$d..."</string>
+    <string name="server_timeout_title">"Server timeout"</string>
+    <string name="server_timeout_message">"Reconnect to the server to play the video?"</string>
+    <string name="videoview_error_text_cannot_connect_retry">"Connection failed, trying to reconnect to %1$d\u2026"</string>
     <string name="media_controller_live">Live</string>
     <string name="media_controller_playing">Playing</string>
-    <string name="media_controller_connecting">Connecting...</string>
+    <string name="media_controller_connecting">Connecting\u2026</string>
 
     <string name="bookmark_add">"Add bookmark"</string>
     <string name="bookmark_display">"Show bookmarks"</string>
     <string name="bookmark_empty">"No bookmarks"</string>
-    <string name="bookmark_exist">"Same bookmark in history"</string>
-    <string name="bookmark_add_success">"Add bookmark success"</string>
+    <string name="bookmark_exist">"Bookmark already exists"</string>
+    <string name="bookmark_add_success">"Bookmark added"</string>
     <string name="bookmark_list">"Bookmarks"</string>
     <string name="bookmark_title">"Title"</string>
     <string name="bookmark_location">"Location"</string>
     <string name="delete_all">"Delete all"</string>
     <string name="default_title">"Default title"</string>
+
+    <!-- A label describing to link website [CHAR LIMIT=30] -->
+    <string name="more_image">More images</string>
+    <string name="website_for_more_image" translatable="false"></string>
+
+    <!-- Toast if the muted video is not supported. [CHAR LIMIT=80] -->
+    <string name="mute_nosupport">Can not mute : video not supported</string>
+
+    <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
+    <string name="map_activity_not_found_err">There is no maps app installed to show the location.</string>
+
+    <plurals name="number_of_videos">
+        <item quantity="one">%1$d video</item>
+        <item quantity="other">%1$d videos</item>
+    </plurals>
+
+    <!-- The label for the bass boost knob of the audio effects dialog. -->
+    <string name="bass_boost_strength">Bass boost</string>
+
+    <!-- The label for the 3d effect knob of the audio effects dialog. -->
+    <string name="virtualizer_strength">3D effect</string>
+
+    <!-- The label for the audio effects menu. -->
+    <string name="audio_effects">Audio effects</string>
+
+    <!-- Toast if user attempts to control audio effects without headphones plugged in. -->
+    <string name="headset_plug">Plug in headphones for these effects.</string>
+
+    <!-- The title of the audio effects dialog. -->
+    <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+
+    <!-- Toast message for share items -->
+    <string name="cannot_share_items">Max selected items for share is 300</string>
+
+    <string name="share_dialogue_title">Share via</string>
+
+    <!-- When grouping photos by peoples, the label used for photos that don't
+         have people information in them [CHAR LIMIT=20]-->
+    <string name="no_faces">No faces</string>
+
+    <!-- The tips of trimming video -->
+    <string name="fail_trim">Sorry, this video file can not be trimmed</string>
+    <string name="can_not_trim">Only mp4 and 3gp files can be trimmed</string>
+
+    <string name="drm_license_info">DRM license info</string>
+
+    <string-array name="title_array_nav_items">
+        <item>Timeline</item>
+        <item>Albums</item>
+        <item>Videos</item>
+    </string-array>
+
+    <string name="navigation_drawer_title" translatable="false">@string/app_name</string>
+    <!-- Timeline screen title -->
+    <string name="timeline_title">Timeline</string>
+    <!-- Albums screen title -->
+    <string name="albums_title" translatable="false">@string/tab_albums</string>
+    <!-- Videos screen title -->
+    <string name="videos_title">Videos</string>
+    <string name="action_viewtype_list">List view</string>
+    <string name="action_viewtype_grid" translatable="false">@string/switch_photo_grid</string>
+    <string name="tvEmptyAlbum">No photos found</string>
+    <string name="tvEmptyVideos">No videos found</string>
+
+    <string name="text_makeup_whiten">Whiten</string>
+    <string name="text_makeup_Soften">Soften</string>
+    <string name="text_makeup_trimface">Trimface</string>
+    <string name="text_makeup_bigeye">Bigeye</string>
+    <string name="drawer_desc" translatable="false">drawer</string>
+    <string name="truescanner_normal">Normal</string>
+    <string name="truescanner_white">Whiteboard</string>
+    <string name="truescanner">TrueScanner</string>
+    <string name="truescanner_remove_glare">Remove Glare</string>
+    <string name="hazebuster_acts">Haze Buster</string>
+    <string name="seestraight_acts">See Straight</string>
+    <string name="seestraight_input_image_is_small">Input image is too small to process.</string>
+    <string name="seestraight_process_fail">Couldn\'t process the image.</string>
+
+    <string name="trim_video_exit_title">Discard changes?</string>
+    <string name="trim_video_exit_msg">Discard the changes made to this video?</string>
+    <string name="trim_video_exit_discard">DISCARD</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c4b53fe32..570014e3e 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved.
-     Not a Contribution.
-
-     Copyright (C) 2007 The Android Open Source Project
+<!-- Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -106,8 +103,6 @@
     <!-- Toast/alert after saving wallpaper -->
     <string name="wallpaper">Setting wallpaper\u2026</string>
     <string name="camera_setas_wallpaper">Wallpaper</string>
-    <!-- Toast message for share items -->
-    <string name="cannot_share_items">Max selected items for share is 300</string>
 
     <!-- Details dialog "OK" button. Dismisses dialog. -->
     <string name="delete">Delete</string>
@@ -119,7 +114,6 @@
     <string name="confirm">Confirm</string>
     <string name="cancel">Cancel</string>
     <string name="share">Share</string>
-    <string name="share_dialogue_title">Share via</string>
     <string name="share_panorama">Share panorama</string>
     <string name="share_as_photo">Share as photo</string>
 
@@ -239,10 +233,6 @@
          have location information in them [CHAR LIMIT=20]-->
     <string name="no_location">No location</string>
 
-    <!-- When grouping photos by peoples, the label used for photos that don't
-        have people information in them [CHAR LIMIT=20]-->
-    <string name="no_faces">No faces</string>
-
     <!-- This toast message is shown when network connection is lost while doing clustering -->
     <string name="no_connectivity">Some locations couldn\'t be identified due to network problems.</string>
 
@@ -288,10 +278,6 @@
          some albums to be viewable offline [CHAR LIMIT=30] -->
     <string name="make_available_offline">Make available offline</string>
 
-    <!-- A label describing to link website [CHAR LIMIT=30] -->
-    <string name="more_image">More Images</string>
-    <string name="website_for_more_image"></string>
-
     <!-- A label of a menu item for user to sync the content [CHAR LIMIT=30] -->
     <string name="sync_picasa_albums">Refresh</string>
 
@@ -536,9 +522,6 @@
     <!-- Toast if the trimmed video is too short to trim. [CHAR LIMIT=80] -->
     <string name="trim_too_short">Can not trim : target video is too short</string>
 
-    <!-- Toast if the muted video is not supported. [CHAR LIMIT=80] -->
-    <string name="mute_nosupport">Can not mute : not supported video</string>
-
     <!-- Text to show with progress bar while stitching in Gallery -->
     <string name="pano_progress_text">Rendering panorama</string>
 
@@ -1111,9 +1094,6 @@ CHAR LIMIT = NONE] -->
     <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
     <string name="remember_location_yes">Yes</string>
 
-    <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
-    <string name="map_activity_not_found_err">There is no map app for show location.</string>
-
     <!-- Menu item to launch the camera app [CHAR LIMIT=25] -->
     <string name="menu_camera">Camera</string>
     <!-- Menu item to search for photos [CHAR LIMIT=25] -->
@@ -1135,68 +1115,4 @@ CHAR LIMIT = NONE] -->
         <item quantity="one">%1$d photo</item>
         <item quantity="other">%1$d photos</item>
     </plurals>
-
-    <plurals name="number_of_videos">
-        <item quantity="one">%1$d video</item>
-        <item quantity="other">%1$d videos</item>
-    </plurals>
-
-    <!-- The label for the bass boost knob of the audio effects dialog. -->
-    <string name="bass_boost_strength">Bass boost</string>
-
-    <!-- The label for the 3d effect knob of the audio effects dialog. -->
-    <string name="virtualizer_strength">Surround sound</string>
-
-    <!-- The label for the audio effects menu. -->
-    <string name="audio_effects">Audio effects</string>
-
-    <!-- Toast if user attempts to control audio effects without headphones plugged in. -->
-    <string name="headset_plug">Plug in headphones for these effects.</string>
-
-    <!-- The title of the audio effects dialog. -->
-    <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
-
-    <!-- The tips of trimming video -->
-    <string name="fail_trim">Sorry, this video file can not be trimmed</string>
-    <string name="can_not_trim">Only mp4 and 3gp file can be trimmed</string>
-
-    <string name="no_permission_for_drm">"Sorry, Drm file can not be shared"</string>
-    <string name="drm_license_info">Drm license info</string>
-    <string name="mimetype_not_supported">This file can not be played</string>
-    <string name="action_consumes_rights">Rights will be consumed for playing this media</string>
-    <string name="text_makeup_whiten">Whiten</string>
-    <string name="text_makeup_Soften">Soften</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>
-
-    <string name="navigation_drawer_title" translatable="false">@string/app_name</string>
-    <!-- Timeline screen title -->
-    <string name="timeline_title">Timeline</string>
-    <!-- Albums screen title -->
-    <string name="albums_title" translatable="false">@string/tab_albums</string>
-    <!-- Videos screen title -->
-    <string name="videos_title">Videos</string>
-    <string name="action_viewtype_list">List view</string>
-    <string name="action_viewtype_grid" translatable="false">@string/switch_photo_grid</string>
-    <string name="tvEmptyAlbum">No photos found</string>
-    <string name="tvEmptyVideos">No videos found</string>
-    <string name="text_makeup_trimface">Trimface</string>
-    <string name="text_makeup_bigeye">Bigeye</string>
-    <string name="drawer_desc" translatable="false">drawer</string>
-    <string name="truescanner_normal">Normal</string>
-    <string name="truescanner_white">WhiteBoard</string>
-    <string name="truescanner">TrueScanner</string>
-    <string name="truescanner_remove_glare">Remove Glare</string>
-    <string name="hazebuster_acts">Haze Buster</string>
-    <string name="seestraight_acts">See Straight</string>
-    <string name="seestraight_input_image_is_small">Input image is too small to process.</string>
-    <string name="seestraight_process_fail">Couldn\'t process the image.</string>
-
-    <string name="trim_video_exit_title">Discard changes?</string>
-    <string name="trim_video_exit_msg">Discard the changes made to this video?</string>
-    <string name="trim_video_exit_discard">DISCARD</string>
 </resources>
diff --git a/res/xml/rtsp_settings_preferences.xml b/res/xml/rtsp_settings_preferences.xml
index 13842d34e..895fb7d55 100755
--- a/res/xml/rtsp_settings_preferences.xml
+++ b/res/xml/rtsp_settings_preferences.xml
@@ -11,7 +11,7 @@
             android:summary=""
             android:title="@string/rtp_min_port" />
         <EditTextPreference
-            android:dialogTitle="@string/rtp_max_port"
+            android:dialogTitle="@string/set_rtp_max_port"
             android:inputType="number"
             android:key="rtp_max_port"
             android:maxLength="5"
@@ -33,7 +33,7 @@
         android:key="apn_category">
         <PreferenceScreen
             android:key="apn"
-            android:title="@string/apn" >
+            android:title="@string/set_apn" >
         </PreferenceScreen>
     </PreferenceCategory>