summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-09-20 19:06:09 (GMT)
committerMichael Bestas <mikeioannina@gmail.com>2015-09-20 19:06:09 (GMT)
commit40a304ac8387ae022a2185c029ab18f4b9496dd1 (patch)
tree6b0f5c6599572936e76a27be5234a5134d9b73aa
parent704bff736bda2bc5f6c5aa2956879f55101191f5 (diff)
downloadandroid_packages_apps_Gallery2-40a304ac8387ae022a2185c029ab18f4b9496dd1.zip
android_packages_apps_Gallery2-40a304ac8387ae022a2185c029ab18f4b9496dd1.tar.gz
android_packages_apps_Gallery2-40a304ac8387ae022a2185c029ab18f4b9496dd1.tar.bz2
Move & improve CAF strings
* Also remove unused ones Change-Id: I33fdb6845b0a79c7eb6994c4ac658d4dd73d708f
-rw-r--r--res/values-es-rUS/strings.xml5
-rw-r--r--res/values/codeaurora_strings.xml3
-rwxr-xr-xres/values/strings.xml5
3 files changed, 3 insertions, 10 deletions
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2c4ab51..e639fd4 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/codeaurora_strings.xml b/res/values/codeaurora_strings.xml
index 1353ace..9bc0ff4 100644
--- a/res/values/codeaurora_strings.xml
+++ b/res/values/codeaurora_strings.xml
@@ -104,4 +104,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<!-- The tips of trimming video -->
<string name="fail_trim">Sorry, this video file can not be trimmed</string>
+
+ <string name="no_permission_for_drm">Sorry, DRM protected files cannot be shared</string>
+ <string name="drm_license_info">DRM license info</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b67c6a3..167ac89 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1127,9 +1127,4 @@ CHAR LIMIT = NONE] -->
<string name="text_makeup_trimface">Trimface</string>
<string name="text_makeup_bigeye">Bigeye</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>
</resources>