From b5a76dd1fb39c2896a9a6160b379d2fb76ef5ac4 Mon Sep 17 00:00:00 2001
From: Vladislav Koldobskiy <admin@nevergone.ru>
Date: Sun, 4 Jan 2015 02:32:41 +0300
Subject: Gallery2: move CAF strings to codeaurora_strings

Change-Id: I3861ed5094307034fcec830fd1ff0595a75e84e1
---
 res/values/codeaurora_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values/strings.xml            | 33 +--------------------------------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/res/values/codeaurora_strings.xml b/res/values/codeaurora_strings.xml
index 941365252..f70076b6e 100644
--- a/res/values/codeaurora_strings.xml
+++ b/res/values/codeaurora_strings.xml
@@ -78,4 +78,32 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <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"></string>
+
+    <!-- Toast if the muted video is not supported. [CHAR LIMIT=80] -->
+    <string name="mute_nosupport">Can not mute : not supported video</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>
+
+    <!-- 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>
+
+    <!-- The tips of trimming video -->
+    <string name="fail_trim">Sorry, this video file can not be trimmed</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7f347a1d6..570014e3e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, 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.
@@ -281,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>
 
@@ -529,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>
 
@@ -1104,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] -->
@@ -1128,22 +1115,4 @@ CHAR LIMIT = NONE] -->
         <item quantity="one">%1$d photo</item>
         <item quantity="other">%1$d photos</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>
-
-    <!-- The tips of trimming video -->
-    <string name="fail_trim">Sorry, this video file can not be trimmed</string>
 </resources>
-- 
cgit v1.2.3