commit 41e761a5bf585082ac24b8988d4b9353887c8e20
author The Android Automerger <android-build@android.com> Wed Feb 13 05:56:12 2013 -0800
committer The Android Automerger <android-build@android.com> Wed Feb 13 05:56:12 2013 -0800
tree c2ed18c41cf0f6ab6c6904bb1f9a022cae410d87
parent 2d5bc4c5256cec49286a1718bc31b6aeb1861d56
parent 750529a54e1bb41d73e147649777985a1e4cd2db

merge in jb-mr2-release history after reset to master

res/values-sw/strings.xml

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 848a294..9fab97e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -61,7 +61,7 @@
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
     <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Hali ya kulenga"</string>
-    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Atomatiki"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Otomatiki"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Pasipo mwisho"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Hali ya mweka"</string>