From c4d66cf035e138222abf18e3b76775904e1a41f2 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Tue, 22 Apr 2014 18:16:05 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I4aecd9a7109c59e394c9cc7b5e3c57ba36d2533f
Auto-generated-cl: translation import
---
 res/values-am/strings.xml | 2 +-
 res/values-de/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ea64f6f3d..ce9fb9b39 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -35,7 +35,7 @@
     <string name="rename_folder_label" msgid="3727762225964550653">"አቃፊ ስም"</string>
     <string name="rename_folder_title" msgid="3771389277707820891">"አቃፊ ዳግም ሰይም"</string>
     <string name="rename_action" msgid="5559600076028658757">"እሺ"</string>
-    <string name="cancel_action" msgid="7009134900002915310">"ተው"</string>
+    <string name="cancel_action" msgid="7009134900002915310">"ይቅር"</string>
     <string name="menu_item_add_item" msgid="1264911265836810421">"ወደ መነሻ ማያ ገጽ ያክሉ"</string>
     <string name="group_applications" msgid="3797214114206693605">"መተግበሪያዎች"</string>
     <string name="group_shortcuts" msgid="6012256992764410535">"አቋራጮች"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c11a65172..ff6d11429 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -84,7 +84,7 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startbildschirm %1$d von %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-Seite %1$d von %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-Seite %1$d von %2$d"</string>
-    <string name="first_run_cling_title" msgid="2459738000155917941">"Willkommen"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Hallo!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Gerät personalisieren"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
-- 
cgit v1.2.3