| commit | f20931bc564774bbcae5f1f5f7c9aa35f612dad3 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Sep 30 15:48:14 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 30 15:48:14 2010 -0700 |
| tree | 077fbf806dfeb281699aebb3e289dc3f594ac73b | |
| parent | 2d6c0b0d7750237caf5e4b679ed14786fe81fde1 [diff] | |
| parent | 3388aac10aa6c0ab2863a44e7ef9e897893df62b [diff] |
Merge "Import revised translations. DO NOT MERGE" into gingerbread
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_off.png b/res/drawable-hdpi/ic_appwidget_settings_gps_off.png index ec6bcde..bb037bc 100644 --- a/res/drawable-hdpi/ic_appwidget_settings_gps_off.png +++ b/res/drawable-hdpi/ic_appwidget_settings_gps_off.png Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_on.png b/res/drawable-hdpi/ic_appwidget_settings_gps_on.png index e52caa4..75ae817 100644 --- a/res/drawable-hdpi/ic_appwidget_settings_gps_on.png +++ b/res/drawable-hdpi/ic_appwidget_settings_gps_on.png Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_off.png b/res/drawable-hdpi/ic_appwidget_settings_sync_off.png index a0a46a5..636f0cc 100644 --- a/res/drawable-hdpi/ic_appwidget_settings_sync_off.png +++ b/res/drawable-hdpi/ic_appwidget_settings_sync_off.png Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_on.png b/res/drawable-hdpi/ic_appwidget_settings_sync_on.png index 1342751..8ecf159 100644 --- a/res/drawable-hdpi/ic_appwidget_settings_sync_on.png +++ b/res/drawable-hdpi/ic_appwidget_settings_sync_on.png Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6d9e294..f1d25e3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml
@@ -1993,9 +1993,9 @@ <!-- Summary for on-screen keyboard settings --> <string name="onscreen_keyboard_settings_summary">Onscreen keyboard settings</string> <!-- Title for built-in keyboard settings --> - <string name="builtin_keyboard_settings_title">Device keyboard</string> + <string name="builtin_keyboard_settings_title">Built-in keyboard</string> <!-- Summary for built-in keyboard settings --> - <string name="builtin_keyboard_settings_summary">Built-in keyboard settings</string> + <string name="builtin_keyboard_settings_summary">Built-in, physical keyboard settings</string> <!-- Development Settings. the title for the item to take the user to Development settings. Development settings are settings meant for application developers. --> <string name="development_settings_title">Development</string>
