commit c85a79a1ce58352ae5d5cf37297a41cad8d7ec96
author Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:10:01 2015 +0530
committer Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:10:01 2015 +0530
tree d5006f64f76a9b03ac225ee3bae3b63e651a81e6
parent 76556a1ba5cd0e36d610eaa3e88922e4ad654c98
parent c9e9d41b38d92b567df94a1cd87517de1e57e4d4

Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ifdc71605dac6141095a04105ea01c5fe1640becc

res/values-hi/strings.xml

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6c46b1a..0015e10 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -22,9 +22,9 @@
     <string name="posts_album_name" msgid="5628151551239729515">"पोस्ट से फ़ोटो"</string>
     <string name="unknown_album_name" msgid="2135521368192091267">"अनाम एल्बम"</string>
     <string name="stock_photo_album_name" msgid="3150527596227525460">"स्टॉक फ़ोटो"</string>
-    <string name="local_source_name" msgid="6487253091085518505">"डिवाइस पर फ़ोटो"</string>
+    <string name="local_source_name" msgid="6487253091085518505">"उपकरण पर फ़ोटो"</string>
     <string name="need_to_configure" msgid="1269102638159389032">"कोई फ़ोटो नहीं चुना गया."</string>
     <string name="photodream_select_all" msgid="6364858563337927827">"सभी को चुनें"</string>
     <string name="photodream_select_none" msgid="8816452124894525861">"सभी अचयनित करें"</string>
-    <string name="no_photos" msgid="4262083523147564199">"डिवाइस पर कोई फ़ोटो नहीं है."</string>
+    <string name="no_photos" msgid="4262083523147564199">"उपकरण पर कोई फ़ोटो नहीं है."</string>
 </resources>

res/values-kn-rIN/strings.xml

diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index d8802b7..9d06f48 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_name" msgid="6441943862284988546">"ಫೋಟೋ ಸ್ಕ್ರೀನ್‌ಸೇವರ್ಸ್"</string>
     <string name="table_screensaver_name" msgid="1150228032617397055">"ಫೋಟೋ ಕೋಷ್ಠಕ"</string>
     <string name="flipper_screensaver_name" msgid="6988572107391523141">"ಫೋಟೋ ಫ್ರೇಮ್"</string>
-    <string name="posts_album_name" msgid="5628151551239729515">"ಪೋಸ್ಟ್‌ಗಳಿಂದ ಫೋಟೋಗಳು"</string>
+    <string name="posts_album_name" msgid="5628151551239729515">"ಪೋಸ್ಟ್‌ಗಳಿಂದ ಫೋಟೊಗಳು"</string>
     <string name="unknown_album_name" msgid="2135521368192091267">"ಹೆಸರಿಸಿಲ್ಲದ ಆಲ್ಬಮ್"</string>
     <string name="stock_photo_album_name" msgid="3150527596227525460">"ಸ್ಟಾಕ್ ಫೋಟೋಗಳು"</string>
     <string name="local_source_name" msgid="6487253091085518505">"ಸಾಧನದಲ್ಲಿ ಫೋಟೋಗಳು"</string>