summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-10-18 16:27:42 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-18 16:27:42 -0700
commitefce7a43668be367b0846fe894bd1bf69711b5ec (patch)
tree330580335f8b909b59bf7c949fe5d1b6e630b568
parent90295eed0672d4b1d778cabf8c6a34ce66cc4907 (diff)
parentd70048310bedd675245a8cf55908a5089084b28f (diff)
downloadandroid_frameworks_ex-efce7a43668be367b0846fe894bd1bf69711b5ec.tar.gz
android_frameworks_ex-efce7a43668be367b0846fe894bd1bf69711b5ec.tar.bz2
android_frameworks_ex-efce7a43668be367b0846fe894bd1bf69711b5ec.zip
Merge "Import revised translations."
-rw-r--r--carousel/test/res/values-hi/strings.xml28
-rw-r--r--chips/res/values-hi/strings.xml22
-rw-r--r--chips/res/values-ru/strings.xml2
3 files changed, 51 insertions, 1 deletions
diff --git a/carousel/test/res/values-hi/strings.xml b/carousel/test/res/values-hi/strings.xml
new file mode 100644
index 0000000..b931761
--- /dev/null
+++ b/carousel/test/res/values-hi/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* Copyright (C) 2009 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.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="music_demo_activity_label" msgid="4382090808250495841">"MusicCarousel"</string>
+ <string name="carousel_test_activity_label" msgid="6014624482213318747">"CarouselTest"</string>
+ <string name="carousel_test_activity_description" msgid="1632693812604375483">"Carousel का उपयोग बताने के लिए एप्‍लि‍केशन"</string>
+ <string name="task_switcher_activity_label" msgid="714620143340933546">"TaskSwitcher"</string>
+ <string name="recent_tasks_title" msgid="1030287226205477117">"हाल ही के एप्‍लि‍केशन"</string>
+ <string name="no_recent_tasks" msgid="6884096266670555780">"कोई हाल ही के कार्य नहीं"</string>
+</resources>
diff --git a/chips/res/values-hi/strings.xml b/chips/res/values-hi/strings.xml
new file mode 100644
index 0000000..2c74574
--- /dev/null
+++ b/chips/res/values-hi/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2011 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="more_string" msgid="8971577924280885648">"<xliff:g id="COUNT">%1$s</xliff:g> अधिक..."</string>
+ <string name="chips_waiting_for_directory_result" msgid="4210117336820180232">"अधिक संपर्कों के लिए प्रतीक्षा कर रहा है"</string>
+ <string name="copy" msgid="7946975650226308595">"ईमेल पते की प्रतिलिपि बनाएं"</string>
+</resources>
diff --git a/chips/res/values-ru/strings.xml b/chips/res/values-ru/strings.xml
index 0ed137a..7ae9c3d 100644
--- a/chips/res/values-ru/strings.xml
+++ b/chips/res/values-ru/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="more_string" msgid="8971577924280885648">"еще <xliff:g id="COUNT">%1$s</xliff:g>..."</string>
<string name="chips_waiting_for_directory_result" msgid="4210117336820180232">"Ожидание ответов"</string>
- <string name="copy" msgid="7946975650226308595">"Скопировать адрес электронной почты"</string>
+ <string name="copy" msgid="7946975650226308595">"Скопировать адрес эл. почты"</string>
</resources>