diff options
| author | James Lemieux <jplemieux@google.com> | 2016-05-09 15:32:42 -0700 |
|---|---|---|
| committer | James Lemieux <jplemieux@google.com> | 2016-05-09 15:32:42 -0700 |
| commit | 711a2f98554adbb1c9715328231725727d16a54f (patch) | |
| tree | e02dd6e755b9f043903225ea93c0f4375da801a9 /res/values-hi/strings.xml | |
| parent | 6cc56334da882eebfae4b19a3b1071179d633c0d (diff) | |
| parent | 432b07cdbafb9733fea76e9511b6b5f6c15aa8c8 (diff) | |
| download | android_packages_apps_DeskClock-711a2f98554adbb1c9715328231725727d16a54f.tar.gz android_packages_apps_DeskClock-711a2f98554adbb1c9715328231725727d16a54f.tar.bz2 android_packages_apps_DeskClock-711a2f98554adbb1c9715328231725727d16a54f.zip | |
resolve merge conflicts of 432b07c to ub-deskclock-fantasy
Change-Id: Ib0082731d6f2d90c538cd9fbd2f5e8242362fda6
Diffstat (limited to 'res/values-hi/strings.xml')
| -rw-r--r-- | res/values-hi/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 23e738c82..9a166a982 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -79,7 +79,6 @@ <string name="loading_widget" msgid="5306242862476796500">"लोड हो रहा है…"</string> <string name="analog_gadget" msgid="1670505720837152766">"ऐनालॉग घड़ी"</string> <string name="digital_gadget" msgid="2326954556720571358">"डिजिटल घड़ी"</string> - <string name="city_gadget" msgid="4887290995955830876">"विश्व घड़ी"</string> <string name="settings" msgid="5849739030579520686">"सेटिंग"</string> <string name="snooze_duration_title" msgid="1097309861110780483">"इतनी देर के बाद याद दिलाएं"</string> <plurals name="snooze_duration" formatted="false" msgid="3112918131095248271"> |