commit febddd200ec05d7d66325835cc4c3ffa76d4f83d
author Geoff Mendal <mendal@google.com> Mon Mar 17 16:34:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 17 16:34:26 2014 +0000
tree cd345754c55b49a5c445de72a3ba42206f0adbe8
parent 79dc65d08ea5c7729b2dc63e57e8123e7cc9c2c3
parent d027b6ac9583f1546daa0ac286f29ff9d0ad9073

Merge "Import translations. DO NOT MERGE"

packages/Keyguard/res/values-am/strings.xml

diff --git a/packages/Keyguard/res/values-am/strings.xml b/packages/Keyguard/res/values-am/strings.xml
index ebe678e..933ef9c 100644
--- a/packages/Keyguard/res/values-am/strings.xml
+++ b/packages/Keyguard/res/values-am/strings.xml
@@ -82,7 +82,7 @@
     <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
     <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string>
     <string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string>
-    <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"ተወው"</string>
+    <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"ይቅር"</string>
     <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"ሰርዝ"</string>
     <string name="keyboardview_keycode_done" msgid="1992571118466679775">"ተከናውኗል"</string>
     <string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"ሞድ ለውጥ"</string>