From 3eee86b8d7bc175e1e83269afc5c2c5441681a50 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 3 Aug 2012 13:41:54 -0700
Subject: [PATCH] Import translations. DO NOT MERGE

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

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2283a5eaf30..dbb15c1911e 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1478,21 +1478,21 @@
     <string name="sync_failed" msgid="1696499856374109647">"አመሳስል አልተሳካም"</string>
     <string name="sync_active" msgid="8476943765960863040">"አመሳስል የነቃ"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"አመሳስል"</string>
-    <string name="sync_is_failing" msgid="1591561768344128377">"አሳምር በአሁኑጊዜ ችግር እየገጠመው ነው። ከአፍታ ቆይታ በኋላ ይመለሳል።"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"አስምር በአሁኑጊዜ ችግር እየገጠመው ነው። ከአፍታ ቆይታ በኋላ ይመለሳል።"</string>
     <string name="add_account_label" msgid="7811707265834013767">"መለያ አክል"</string>
     <string name="background_data" msgid="5779592891375473817">"ዳራ ውሂብ"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"መተግበሪያዎች በማንኛውም ሰዓት ማመሳሰል፣ መላክ፣ እና ውሂብ መቀበል ትችላለህ።"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"የዳራ ውሂብን አሰናክል?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"የዳራ ውሂብ አለማስቻል የባትሪን ዕድሜ አርዝሞ የውሂብ ጥቅምን ይቀንሳል። አንዳንድ መተግበሪያዎች የዳራ ውሂብ ተያያዥነትን ሊጠቀሙ ይችላሉ።"</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"የመተግበሪያ ውሂብ በራስ-አሳምር"</string>
-    <string name="sync_enabled" msgid="4551148952179416813">"አሳምር በርቷል"</string>
-    <string name="sync_disabled" msgid="8511659877596511991">"አሳምር ጠፍቷል"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"የመተግበሪያ ውሂብ በራስ-አስምር"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"አስምር በርቷል"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"አስምር ጠፍቷል"</string>
     <string name="sync_error" msgid="5060969083117872149">"የአሳምር ስህተት"</string>
     <string name="last_synced" msgid="4242919465367022234">"ለመጨረሻ ጊዜ የተመሳሰለው <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"አሁን በማመሳሰል ላይ…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"ቅንብሮች  ተተኪ አኑር"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"ቅንብሮቼን ተተኪ አኑር"</string>
-    <string name="sync_menu_sync_now" msgid="6154608350395805683">"አሁን አሳምር"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"አሁን አስምር"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ሥምሪያ ይቅር"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g> አሁን ለማስመር ንካ"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d2acc828e70..db5d9cd637b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -562,7 +562,7 @@
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Ошибка аутентификации"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Недоступна"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Поддерживает WPS"</string>
-    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" )"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (доступно WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Нет"</string>