summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-10-14 16:14:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-14 16:14:24 +0000
commit5c364f3c1eba4f0c816cd88942ab5336aed1195d (patch)
tree8e1de138c9551e7689bef3bea22c57d6979f0ac9 /packages
parenta0aa64ac1b5652c3763c6cd58fa6d948dabc8f29 (diff)
parent831fa04f5a39558d9f0bfa7fc8e67f01e572de9b (diff)
downloadframeworks_base-5c364f3c1eba4f0c816cd88942ab5336aed1195d.zip
frameworks_base-5c364f3c1eba4f0c816cd88942ab5336aed1195d.tar.gz
frameworks_base-5c364f3c1eba4f0c816cd88942ab5336aed1195d.tar.bz2
Merge "Import translations. DO NOT MERGE" into klp-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/FusedLocation/res/values-am/strings.xml2
-rw-r--r--packages/FusedLocation/res/values-fr/strings.xml2
-rw-r--r--packages/FusedLocation/res/values-lt/strings.xml2
-rw-r--r--packages/FusedLocation/res/values-zh-rCN/strings.xml2
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/FusedLocation/res/values-am/strings.xml b/packages/FusedLocation/res/values-am/strings.xml
index 9c4d9d5..0d2cccc 100644
--- a/packages/FusedLocation/res/values-am/strings.xml
+++ b/packages/FusedLocation/res/values-am/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="5379477904423203699">"ፍዩዥን አካባቢ"</string>
+ <string name="app_label" msgid="5379477904423203699">"Fused Location"</string>
</resources>
diff --git a/packages/FusedLocation/res/values-fr/strings.xml b/packages/FusedLocation/res/values-fr/strings.xml
index 8604c39..0d2cccc 100644
--- a/packages/FusedLocation/res/values-fr/strings.xml
+++ b/packages/FusedLocation/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="5379477904423203699">"Localisation via les tables de fusion"</string>
+ <string name="app_label" msgid="5379477904423203699">"Fused Location"</string>
</resources>
diff --git a/packages/FusedLocation/res/values-lt/strings.xml b/packages/FusedLocation/res/values-lt/strings.xml
index 245c0b0..0d2cccc 100644
--- a/packages/FusedLocation/res/values-lt/strings.xml
+++ b/packages/FusedLocation/res/values-lt/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="5379477904423203699">"Suderinta vietovė"</string>
+ <string name="app_label" msgid="5379477904423203699">"Fused Location"</string>
</resources>
diff --git a/packages/FusedLocation/res/values-zh-rCN/strings.xml b/packages/FusedLocation/res/values-zh-rCN/strings.xml
index 0d2cccc..e6d7bc1 100644
--- a/packages/FusedLocation/res/values-zh-rCN/strings.xml
+++ b/packages/FusedLocation/res/values-zh-rCN/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="5379477904423203699">"Fused Location"</string>
+ <string name="app_label" msgid="5379477904423203699">"一体化位置信息"</string>
</resources>