diff options
| author | Ed Heyl <ed@google.com> | 2011-10-31 05:54:47 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-10-31 05:54:47 -0700 |
| commit | d72323ff28229ec53fee12b62c65a141eae7ebb4 (patch) | |
| tree | 1ecea39b1941f4b9679e5e570586c7dee7b28506 | |
| parent | a042207945719bc0d93ecf26435bdd61a7ee7fdd (diff) | |
| parent | 0cd1bf54deea069adf6f575ef11e3bf8e11d3959 (diff) | |
| download | android_packages_apps_Snap-d72323ff28229ec53fee12b62c65a141eae7ebb4.tar.gz android_packages_apps_Snap-d72323ff28229ec53fee12b62c65a141eae7ebb4.tar.bz2 android_packages_apps_Snap-d72323ff28229ec53fee12b62c65a141eae7ebb4.zip | |
Merge remote branch 'goog/ics-mr1' into ics-aah
| -rw-r--r-- | res/values-ja/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-uk/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index bb42db9bc..9f607ed67 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -117,7 +117,7 @@ <string name="duration" msgid="8160058911218541616">"長さ"</string> <string name="mimetype" msgid="8024168704337990470">"MIMEタイプ"</string> <string name="file_size" msgid="8486169301588318915">"ファイルサイズ"</string> - <string name="maker" msgid="7921835498034236197">"作成者"</string> + <string name="maker" msgid="7921835498034236197">"メーカー"</string> <string name="model" msgid="8240207064064337366">"モデル"</string> <string name="flash" msgid="2816779031261147723">"フラッシュ"</string> <string name="aperture" msgid="5920657630303915195">"絞り"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 0027de1c8..d60e708cf 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -102,7 +102,7 @@ <string name="no_albums_alert" msgid="4111744447491690896">"Немає доступних альбомів."</string> <string name="empty_album" msgid="4542880442593595494">"Немає доступних зображень або відео."</string> <string name="picasa_posts" msgid="1497721615718760613">"Публікації"</string> - <string name="make_available_offline" msgid="5157950985488297112">"Зробити доступн. в реж. офлайн"</string> + <string name="make_available_offline" msgid="5157950985488297112">"Завантажити для доступу офлайн"</string> <string name="sync_picasa_albums" msgid="8522572542111169872">"Оновити"</string> <string name="done" msgid="217672440064436595">"Готово"</string> <string name="sequence_in_set" msgid="7235465319919457488">"%1$d з %2$d елем.:"</string> |