From 314cd6db6a496985942d11fbc5174967afd93416 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Mon, 30 Mar 2009 15:52:27 -0700 Subject: AI 143547: Import revised translations. BUG=1738388 Automated import of CL 143547 --- res/values-cs/strings.xml | 21 ++++++++++++++------- res/values-de/strings.xml | 21 ++++++++++++++------- res/values-es/strings.xml | 21 ++++++++++++++------- res/values-fr/strings.xml | 21 ++++++++++++++------- res/values-it/strings.xml | 21 ++++++++++++++------- res/values-ko/strings.xml | 21 ++++++++++++++------- res/values-nb/strings.xml | 21 ++++++++++++++------- res/values-nl/strings.xml | 21 ++++++++++++++------- res/values-pl/strings.xml | 21 ++++++++++++++------- res/values-ru/strings.xml | 21 ++++++++++++++------- res/values-zh-rCN/strings.xml | 21 ++++++++++++++------- res/values-zh-rTW/strings.xml | 21 ++++++++++++++------- 12 files changed, 168 insertions(+), 84 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index ecf67928a..f0cc369e8 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -26,20 +26,27 @@ "OK" "Zrušit" "Přidat na plochu" - "Aplikace" - "Zástupce" + + + + "Hledat" - "Složka" - "Složka Live" - "Miniaplikace" - "Tapeta" + + + + + + + + "Složka" "Hodiny" "Rámeček fotografie" "Vyhledávání" "Na této ploše již není místo." "Vyberte zástupce" - "Vyberte složku Live" + + "Přidat" "Tapeta" "Hledat" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index ca07fc6bc..40f3cabc8 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -26,20 +26,27 @@ "OK" "Abbrechen" "Zur Startseite hinzufügen" - "Anwendung" - "Verknüpfung" + + + + "Suchen" - "Ordner" - "Live-Ordner" - "Widget" - "Hintergrund" + + + + + + + + "Ordner" "Uhr" "Bildrahmen" "Suchen" "Auf der Startseite ist kein Platz mehr vorhanden." "Tastenkürzel auswählen" - "Live-Ordner auswählen" + + "Hinzufügen" "Hintergrund" "Suchen" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index ecfdd98b6..b6e0cd842 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -26,20 +26,27 @@ "Aceptar" "Cancelar" "Añadir a pantalla de página principal" - "Aplicación" - "Acceso directo" + + + + "Búsqueda" - "Carpeta" - "Carpeta activa" - "Widget" - "Fondo de pantalla" + + + + + + + + "Carpeta" "Reloj" "Picture frame" "Búsqueda de Google" "No queda espacio en esta pantalla de página principal." "Seleccionar acceso directo" - "Seleccionar carpeta activa" + + "Añadir" "Fondo de pantalla" "Buscar con Google" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 203c37b51..a1b5e0e15 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -26,20 +26,27 @@ "OK" "Annuler" "Ajouter à l\'écran d\'accueil" - "Application" - "Raccourci" + + + + "Recherche" - "Dossier" - "Dossier actif" - "Widget" - "Arrière-plan" + + + + + + + + "Dossier" "Horloge" "Cadre d\'image" "Rechercher" "Plus d\'espace libre sur l\'écran d\'accueil." "Sélectionner un raccourci" - "Sélectionner dossier actif" + + "Ajouter" "Arrière-plan" "Rechercher" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index c061ce7da..346481d52 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -26,20 +26,27 @@ "OK" "Annulla" "Aggiungi a schermata Home" - "Applicazione" - "Scorciatoia" + + + + "Ricerca" - "Cartella" - "Cartella dinamica" - "Widget" - "Sfondo" + + + + + + + + "Cartella" "Orologio" "Cornice immagini" "Ricerca" "Spazio nella schermata Home esaurito." "Seleziona collegamento" - "Seleziona cartella dinamica" + + "Aggiungi" "Sfondo" "Cerca" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 52c7df5e5..495a7cfb6 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -26,20 +26,27 @@ "확인" "취소" "홈 화면에 추가" - "응용프로그램" - "바로가기" + + + + "검색" - "폴더" - "라이브 폴더" - "위젯" - "배경화면" + + + + + + + + "폴더" "시계" "사진 프레임" "검색" "홈 화면에 더 이상 공간이 없습니다." "바로가기 선택" - "라이브 폴더 선택" + + "추가" "배경화면" "검색" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 8fdb3428f..954b5d784 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -26,20 +26,27 @@ "OK" "Avbryt" "Legg til skrivebord" - "Applikasjon" - "Snarvei" + + + + "Søk" - "Mappe" - "Aktiv mappe" - "Skrivebordselement" - "Bakgrunnsbilde" + + + + + + + + "Mappe" "Klokke" "Bilderamme" "Søk" "Ikke nok plass på skrivebordet." "Velg snarvei" - "Velg aktiv mappe" + + "Legg til" "Bakgrunnsbilde" "Søk" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 1a07fa6ec..c646850a7 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -26,20 +26,27 @@ "OK" "Annuleren" "Toevoegen aan startpagina" - "Toepassing" - "Snelkoppeling" + + + + "Zoeken" - "Map" - "Live map" - "Widget" - "Achtergrond" + + + + + + + + "Map" "Klok" "Fotolijstje" "Zoeken" "Er is geen ruimte meer op dit startscherm." "Snelkoppeling selecteren" - "Live map selecteren" + + "Toevoegen" "Achtergrond" "Zoeken" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index e26d72308..24347dd90 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -26,20 +26,27 @@ "OK" "Anuluj" "Dodaj do strony głównej" - "Aplikacja" - "Skrót" + + + + "Wyszukiwarka" - "Folder" - "Folder aktywny" - "Widget" - "Tapeta" + + + + + + + + "Folder" "Zegar" "Ramka obrazu" "Wyszukiwarka" "Brak miejsca na tej stronie głównej" "Wybierz skrót" - "Wybierz folder aktywny" + + "Dodaj" "Tapeta" "Szukaj" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 2546503bc..5dea21322 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -26,20 +26,27 @@ "ОК" "Отмена" "Добавление на главный экран" - "Приложение" - "Ярлык" + + + + "Поиск" - "Папка" - "Динамическая папка" - "Виджет" - "Фоновый рисунок" + + + + + + + + "Папка" "Часы" "Рамка для картинки" "Поиск" "На главном экране больше нет места." "Выберите ярлык" - "Выберите активную папку" + + "Добавить" "Фоновый рисунок" "Искать" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index a71bb3a6f..7e359d6bd 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -26,20 +26,27 @@ "确定" "取消" "添加到“主页”屏幕" - "应用程序" - "快捷键" + + + + "搜索" - "文件夹" - "活动的文件夹" - "小工具" - "壁纸" + + + + + + + + "文件夹" "时钟" "相框" "搜索" "该“主页”屏幕上没有多余空间。" "选择快捷键" - "选择活动文件夹" + + "添加" "壁纸" "搜索" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 217444e57..775eb2053 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -26,20 +26,27 @@ "確定" "取消" "新增至首頁畫面" - "應用程式" - "捷徑" + + + + "搜尋" - "資料夾" - "使用中的資料夾" - "Widget" - "桌布" + + + + + + + + "資料夾" "時鐘" "相框" "搜尋" "首頁已無空間" "選取捷徑" - "選取作用中資料夾" + + "新增" "桌布" "搜尋" -- cgit v1.2.3 From e5b142656c8afcba1c9d045b588c7717b3a22107 Mon Sep 17 00:00:00 2001 From: Jeffrey Sharkey <> Date: Tue, 31 Mar 2009 10:12:20 -0700 Subject: AI 143622: Correctly startListening() for widget updates when first boot completes. During the first boot upgrade, LauncherProvider will deleteHost() to clear out any old appWidgetId bindings. During the first boot, Launcher calls AppWidgetHost.startListening() to watch for widget updates. It also calls loadUserItems(), which loads data from LauncherProvider, triggering the database creation and deleteHost() call. Because deleteHost() removes any existing callbacks, any future widget updates are dropped on the floor. (This can currently be solved by rebooting, because there isn't an upgrade on subsequent boots.) This bug was particularly evident on vfpioneer-userdebug builds, as there aren't any configuration changes that cause Launcher to be destroyed and recreated. (When destroyed and recreated, we startListening() again, and LauncherProvider doesn't call deleteHost().) To handle this special case, Launcher creates a ContentObserver pointing at a specific URI, which the LauncherProvider notifies when the AppWidgetHost is reset through deleteHost(), allowing Launcher to correctly startListening() again. BUG=1746104 Automated import of CL 143622 --- src/com/android/launcher/Launcher.java | 28 ++++++++++++++++++++++++++ src/com/android/launcher/LauncherProvider.java | 20 ++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java index 7b7802e1f..7dd341819 100644 --- a/src/com/android/launcher/Launcher.java +++ b/src/com/android/launcher/Launcher.java @@ -168,6 +168,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On private final BroadcastReceiver mApplicationsReceiver = new ApplicationsIntentReceiver(); private final ContentObserver mObserver = new FavoritesChangeObserver(); + private final ContentObserver mAppWidgetResetObserver = new AppWidgetResetObserver(); private LayoutInflater mInflater; @@ -826,6 +827,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On sModel.abortLoaders(); getContentResolver().unregisterContentObserver(mObserver); + getContentResolver().unregisterContentObserver(mAppWidgetResetObserver); unregisterReceiver(mApplicationsReceiver); } @@ -1156,6 +1158,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On private void registerContentObservers() { ContentResolver resolver = getContentResolver(); resolver.registerContentObserver(LauncherSettings.Favorites.CONTENT_URI, true, mObserver); + resolver.registerContentObserver(LauncherProvider.CONTENT_APPWIDGET_RESET_URI, true, mAppWidgetResetObserver); } @Override @@ -1221,6 +1224,16 @@ public final class Launcher extends Activity implements View.OnClickListener, On sModel.loadUserItems(false, this, false, false); } + /** + * When reset, we handle by calling {@link AppWidgetHost#startListening()} + * to make sure our callbacks are set correctly. + */ + private void onAppWidgetReset() { + if (mAppWidgetHost != null) { + mAppWidgetHost.startListening(); + } + } + void onDesktopItemsLoaded() { if (mDestroyed) return; bindDesktopItems(); @@ -1877,6 +1890,21 @@ public final class Launcher extends Activity implements View.OnClickListener, On } } + /** + * Receives notifications when the {@link AppWidgetHost} has been reset, + * usually only when the {@link LauncherProvider} database is first created. + */ + private class AppWidgetResetObserver extends ContentObserver { + public AppWidgetResetObserver() { + super(new Handler()); + } + + @Override + public void onChange(boolean selfChange) { + onAppWidgetReset(); + } + } + /** * Receives intents from other applications to change the wallpaper. */ diff --git a/src/com/android/launcher/LauncherProvider.java b/src/com/android/launcher/LauncherProvider.java index e63ef3084..a27b74667 100644 --- a/src/com/android/launcher/LauncherProvider.java +++ b/src/com/android/launcher/LauncherProvider.java @@ -65,6 +65,14 @@ public class LauncherProvider extends ContentProvider { static final String TABLE_FAVORITES = "favorites"; static final String PARAMETER_NOTIFY = "notify"; + /** + * {@link Uri} triggered at any registered {@link ContentObserver} when + * {@link AppWidgetHost#deleteHost()} is called during database creation. + * Use this to recall {@link AppWidgetHost#startListening()} if needed. + */ + static final Uri CONTENT_APPWIDGET_RESET_URI = + Uri.parse("content://" + AUTHORITY + "/appWidgetReset"); + private SQLiteOpenHelper mOpenHelper; @Override @@ -176,6 +184,17 @@ public class LauncherProvider extends ContentProvider { mAppWidgetHost = new AppWidgetHost(context, Launcher.APPWIDGET_HOST_ID); } + /** + * Send notification that we've deleted the {@link AppWidgetHost}, + * probably as part of the initial database creation. The receiver may + * want to re-call {@link AppWidgetHost#startListening()} to ensure + * callbacks are correctly set. + */ + private void sendAppWidgetResetNotify() { + final ContentResolver resolver = mContext.getContentResolver(); + resolver.notifyChange(CONTENT_APPWIDGET_RESET_URI, null); + } + @Override public void onCreate(SQLiteDatabase db) { if (LOGD) Log.d(LOG_TAG, "creating new launcher database"); @@ -204,6 +223,7 @@ public class LauncherProvider extends ContentProvider { // Database was just created, so wipe any previous widgets if (mAppWidgetHost != null) { mAppWidgetHost.deleteHost(); + sendAppWidgetResetNotify(); } if (!convertDatabase(db)) { -- cgit v1.2.3 From cde747088852dbe353e09ced011e139c121c9999 Mon Sep 17 00:00:00 2001 From: Jeffrey Sharkey <> Date: Tue, 31 Mar 2009 12:09:02 -0700 Subject: AI 143746: Fix search widget assets to not overlap in landscape mode. Done by using small button framework assets, but with manual padding adjustments to bring back to original button size. BUG=1749120 Automated import of CL 143746 --- res/layout/widget_search.xml | 6 ++++-- res/values/styles.xml | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml index b4c455cea..f87d30f16 100644 --- a/res/layout/widget_search.xml +++ b/res/layout/widget_search.xml @@ -45,17 +45,19 @@ /> diff --git a/res/values/styles.xml b/res/values/styles.xml index a3d3e22c7..9b06d2620 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -53,4 +53,11 @@ 10dip 10dip + + -- cgit v1.2.3 From 1796c48dd777b44a808944f60ca2cab601c55bd1 Mon Sep 17 00:00:00 2001 From: Jeffrey Sharkey <> Date: Tue, 31 Mar 2009 18:24:45 -0700 Subject: AI 143907: Make search widget drop-down wider. BUG=1749373 Automated import of CL 143907 --- .../spinner_dropdown_background_down.9.png | Bin 0 -> 456 bytes .../spinner_dropdown_background_up.9.png | Bin 0 -> 415 bytes res/drawable/spinner_dropdown_background.xml | 22 +++++++++++++++++ .../spinner_dropdown_background_down.9.png | Bin 0 -> 446 bytes res/drawable/spinner_dropdown_background_up.9.png | Bin 0 -> 421 bytes res/layout/widget_search.xml | 2 ++ res/values/dimens.xml | 19 +++++++++++++++ src/com/android/launcher/Search.java | 27 +++++++++++++++++++++ 8 files changed, 70 insertions(+) create mode 100644 res/drawable-land/spinner_dropdown_background_down.9.png create mode 100644 res/drawable-land/spinner_dropdown_background_up.9.png create mode 100644 res/drawable/spinner_dropdown_background.xml create mode 100644 res/drawable/spinner_dropdown_background_down.9.png create mode 100644 res/drawable/spinner_dropdown_background_up.9.png create mode 100644 res/values/dimens.xml diff --git a/res/drawable-land/spinner_dropdown_background_down.9.png b/res/drawable-land/spinner_dropdown_background_down.9.png new file mode 100644 index 000000000..bb64b7817 Binary files /dev/null and b/res/drawable-land/spinner_dropdown_background_down.9.png differ diff --git a/res/drawable-land/spinner_dropdown_background_up.9.png b/res/drawable-land/spinner_dropdown_background_up.9.png new file mode 100644 index 000000000..c0e2a6653 Binary files /dev/null and b/res/drawable-land/spinner_dropdown_background_up.9.png differ diff --git a/res/drawable/spinner_dropdown_background.xml b/res/drawable/spinner_dropdown_background.xml new file mode 100644 index 000000000..9c37286a2 --- /dev/null +++ b/res/drawable/spinner_dropdown_background.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/res/drawable/spinner_dropdown_background_down.9.png b/res/drawable/spinner_dropdown_background_down.9.png new file mode 100644 index 000000000..9cb555685 Binary files /dev/null and b/res/drawable/spinner_dropdown_background_down.9.png differ diff --git a/res/drawable/spinner_dropdown_background_up.9.png b/res/drawable/spinner_dropdown_background_up.9.png new file mode 100644 index 000000000..5c93f78ff Binary files /dev/null and b/res/drawable/spinner_dropdown_background_up.9.png differ diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml index f87d30f16..1db8488a9 100644 --- a/res/layout/widget_search.xml +++ b/res/layout/widget_search.xml @@ -42,6 +42,8 @@ android:inputType="textAutoComplete" android:imeOptions="actionSearch" android:lines="1" + android:dropDownWidth="fill_parent" + android:popupBackground="@drawable/spinner_dropdown_background" /> + + + + 19dip + diff --git a/src/com/android/launcher/Search.java b/src/com/android/launcher/Search.java index 97dcd980b..71ab7ef44 100644 --- a/src/com/android/launcher/Search.java +++ b/src/com/android/launcher/Search.java @@ -328,6 +328,33 @@ public class Search extends LinearLayout implements OnClickListener, OnKeyListen configureVoiceSearchButton(); } + /** + * Cache of popup padding value after read from {@link Resources}. + */ + private static float mPaddingInset = -1; + + /** + * When our size is changed, pass down adjusted width and offset values to + * correctly center the {@link AutoCompleteTextView} popup and include our + * padding. + */ + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + super.onLayout(changed, left, top, right, bottom); + if (changed) { + if (mPaddingInset == -1) { + mPaddingInset = getResources().getDimension(R.dimen.search_widget_inset); + } + + // Fill entire width of widget, minus padding inset + float paddedWidth = getWidth() - (mPaddingInset * 2); + float paddedOffset = -(mSearchText.getLeft() - mPaddingInset); + + mSearchText.setDropDownWidth((int) paddedWidth); + mSearchText.setDropDownHorizontalOffset((int) paddedOffset); + } + } + /** * Read the searchable info from the search manager */ -- cgit v1.2.3 From bbc362434dffd488d9a11fa112c15ae91faca874 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Thu, 2 Apr 2009 16:39:22 -0700 Subject: AI 144335: Import US Spanish translations, and a few Japanese changes. Automated import of CL 144335 --- res/values-es-rUS/strings.xml | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 res/values-es-rUS/strings.xml diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml new file mode 100644 index 000000000..1901fcc36 --- /dev/null +++ b/res/values-es-rUS/strings.xml @@ -0,0 +1,65 @@ + + + + "Página principal" + "Carpeta" + "Seleccionar papel tapiz desde" + "Definir papel tapiz" + "Galería de papel tapiz" + "La aplicación no está instalada en tu computadora." + "Nombre de carpeta" + "Cambiar nombre de carpeta" + "Aceptar" + "Cancelar" + "Agregar a la pantalla Página principal" + + + + + "Buscar" + + + + + + + + + "Carpeta" + "Reloj" + "Marco de imagen" + "Buscar" + "No hay más espacio en esta pantalla de la página principal" + "Seleccionar acceso directo" + + + "Agregar" + "Papel tapiz" + "Buscar" + "Notificaciones" + "Configuración" + "instalar accesos directos" + "Permite a una aplicación agregar accesos directos sin intervención del usuario." + "desinstalar papel tapiz" + "Permite a una aplicación suprimir accesos directos sin intervención del usuario." + "leer configuración y accesos directos de la página principal" + "Permite a una aplicación leer la configuración y los accesos directos de la página principal." + "escribir configuración y accesos directos de la página principal" + "Permite a una aplicación cambiar la configuración y los accesos directos de la página principal." + "Búsqueda de Google" + "Problema al cargar el widget" + -- cgit v1.2.3 From e344e10525024ad6b39ea94bc8a03dbb4db91088 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Thu, 2 Apr 2009 21:42:06 -0700 Subject: AI 144355: Automated g4 rollback of changelist 144335. *** Reason for rollback *** Roll back US Spanish import because it made the build too big. *** Original change description *** Import US Spanish translations, and a few Japanese changes. Automated import of CL 144355 --- res/values-es-rUS/strings.xml | 65 ------------------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 res/values-es-rUS/strings.xml diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml deleted file mode 100644 index 1901fcc36..000000000 --- a/res/values-es-rUS/strings.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - "Página principal" - "Carpeta" - "Seleccionar papel tapiz desde" - "Definir papel tapiz" - "Galería de papel tapiz" - "La aplicación no está instalada en tu computadora." - "Nombre de carpeta" - "Cambiar nombre de carpeta" - "Aceptar" - "Cancelar" - "Agregar a la pantalla Página principal" - - - - - "Buscar" - - - - - - - - - "Carpeta" - "Reloj" - "Marco de imagen" - "Buscar" - "No hay más espacio en esta pantalla de la página principal" - "Seleccionar acceso directo" - - - "Agregar" - "Papel tapiz" - "Buscar" - "Notificaciones" - "Configuración" - "instalar accesos directos" - "Permite a una aplicación agregar accesos directos sin intervención del usuario." - "desinstalar papel tapiz" - "Permite a una aplicación suprimir accesos directos sin intervención del usuario." - "leer configuración y accesos directos de la página principal" - "Permite a una aplicación leer la configuración y los accesos directos de la página principal." - "escribir configuración y accesos directos de la página principal" - "Permite a una aplicación cambiar la configuración y los accesos directos de la página principal." - "Búsqueda de Google" - "Problema al cargar el widget" - -- cgit v1.2.3 From 35aec0abd9a4abb2e810ad70ae89242108b93d3c Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Fri, 3 Apr 2009 17:19:55 -0700 Subject: AI 144556: Pick up today's modified translations. Automated import of CL 144556 --- res/values-es/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index b6e0cd842..6865af51c 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -19,7 +19,7 @@ "Carpeta" "Seleccionar fondo de pantalla de" "Establecer fondo de pantalla" - "Galería de fondo de pantalla" + "Galería de fondos de pantalla" "La aplicación no está instalada en el teléfono." "Nombre de carpeta" "Cambiar nombre de carpeta" -- cgit v1.2.3 From 76055a62b9e59fd875f69ad7c8206745ec96136c Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Tue, 7 Apr 2009 11:48:29 -0700 Subject: AI 144891: Import a bunch of revised translations. Automated import of CL 144891 --- res/values-es/strings.xml | 21 +++++++-------------- res/values-fr/strings.xml | 21 +++++++-------------- res/values-it/strings.xml | 21 +++++++-------------- res/values-ja/strings.xml | 21 +++++++-------------- res/values-ko/strings.xml | 21 +++++++-------------- res/values-nl/strings.xml | 21 +++++++-------------- res/values-pl/strings.xml | 21 +++++++-------------- res/values-ru/strings.xml | 21 +++++++-------------- 8 files changed, 56 insertions(+), 112 deletions(-) diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 6865af51c..2c73c885a 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -26,27 +26,20 @@ "Aceptar" "Cancelar" "Añadir a pantalla de página principal" - - - - + "Aplicaciones" + "Accesos directos" "Búsqueda" - - - - - - - - + "Nueva carpeta" + "Carpetas" + "Widgets" + "Fondos de pantalla" "Carpeta" "Reloj" "Picture frame" "Búsqueda de Google" "No queda espacio en esta pantalla de página principal." "Seleccionar acceso directo" - - + "Seleccionar carpeta" "Añadir" "Fondo de pantalla" "Buscar con Google" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index a1b5e0e15..755856571 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -26,27 +26,20 @@ "OK" "Annuler" "Ajouter à l\'écran d\'accueil" - - - - + "Applications" + "Raccourcis" "Recherche" - - - - - - - - + "Nouveau dossier" + "Dossiers" + "Widgets" + "Fonds d\'écran" "Dossier" "Horloge" "Cadre d\'image" "Rechercher" "Plus d\'espace libre sur l\'écran d\'accueil." "Sélectionner un raccourci" - - + "Sélectionner le dossier" "Ajouter" "Arrière-plan" "Rechercher" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 346481d52..135df4c89 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -26,27 +26,20 @@ "OK" "Annulla" "Aggiungi a schermata Home" - - - - + "Applicazioni" + "Collegamenti" "Ricerca" - - - - - - - - + "Nuova cartella" + "Cartelle" + "Widget" + "Sfondi" "Cartella" "Orologio" "Cornice immagini" "Ricerca" "Spazio nella schermata Home esaurito." "Seleziona collegamento" - - + "Seleziona cartella" "Aggiungi" "Sfondo" "Cerca" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index ccde597e1..8c43e5291 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -26,27 +26,20 @@ "OK" "キャンセル" "ホーム画面に追加" - - - - + "アプリケーション" + "ショートカット" "検索" - - - - - - - - + "新しいフォルダ" + "フォルダ" + "ウィジェット" + "壁紙" "フォルダ" "時計" "写真フレーム" "検索" "ホーム画面に空きスペースがありません。" "ショートカットを選択" - - + "フォルダの選択" "追加" "壁紙" "検索" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 495a7cfb6..37ba73c99 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -26,27 +26,20 @@ "확인" "취소" "홈 화면에 추가" - - - - + "응용프로그램" + "바로가기" "검색" - - - - - - - - + "새 폴더" + "폴더" + "위젯" + "배경화면" "폴더" "시계" "사진 프레임" "검색" "홈 화면에 더 이상 공간이 없습니다." "바로가기 선택" - - + "폴더 선택" "추가" "배경화면" "검색" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index c646850a7..9a37fedeb 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -26,27 +26,20 @@ "OK" "Annuleren" "Toevoegen aan startpagina" - - - - + "Toepassingen" + "Sneltoetsen" "Zoeken" - - - - - - - - + "Nieuwe map" + "Mappen" + "Widgets" + "Achtergronden" "Map" "Klok" "Fotolijstje" "Zoeken" "Er is geen ruimte meer op dit startscherm." "Snelkoppeling selecteren" - - + "Map selecteren" "Toevoegen" "Achtergrond" "Zoeken" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 24347dd90..d5b26a911 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -26,27 +26,20 @@ "OK" "Anuluj" "Dodaj do strony głównej" - - - - + "Aplikacje" + "Skróty" "Wyszukiwarka" - - - - - - - - + "Nowy folder" + "Foldery" + "Widżety" + "Tapety" "Folder" "Zegar" "Ramka obrazu" "Wyszukiwarka" "Brak miejsca na tej stronie głównej" "Wybierz skrót" - - + "Wybierz folder" "Dodaj" "Tapeta" "Szukaj" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 5dea21322..317e9ba7e 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -26,27 +26,20 @@ "ОК" "Отмена" "Добавление на главный экран" - - - - + "Программы" + "Ярлыки" "Поиск" - - - - - - - - + "Новая папка" + "Папки" + "Виджеты" + "Обои" "Папка" "Часы" "Рамка для картинки" "Поиск" "На главном экране больше нет места." "Выберите ярлык" - - + "Выбор папки" "Добавить" "Фоновый рисунок" "Искать" -- cgit v1.2.3 From 48a5c895172c88cbe20cc0ed7ec6624a9a3ca387 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Tue, 7 Apr 2009 18:15:15 -0700 Subject: AI 144977: Import revised translations. DO NOT MERGE Automated import of CL 144977 --- res/values-cs/strings.xml | 21 +++++++-------------- res/values-de/strings.xml | 21 +++++++-------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index f0cc369e8..7832cebfe 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -26,27 +26,20 @@ "OK" "Zrušit" "Přidat na plochu" - - - - + "Aplikace" + "Klávesové zkratky" "Hledat" - - - - - - - - + "Nová složka" + "Složky" + "Widgety" + "Tapety" "Složka" "Hodiny" "Rámeček fotografie" "Vyhledávání" "Na této ploše již není místo." "Vyberte zástupce" - - + "Vybrat složku" "Přidat" "Tapeta" "Hledat" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 40f3cabc8..33f823138 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -26,27 +26,20 @@ "OK" "Abbrechen" "Zur Startseite hinzufügen" - - - - + "Anwendungen" + "Verknüpfungen" "Suchen" - - - - - - - - + "Neuer Ordner" + "Ordner" + "Widgets" + "Hintergrundbilder" "Ordner" "Uhr" "Bildrahmen" "Suchen" "Auf der Startseite ist kein Platz mehr vorhanden." "Tastenkürzel auswählen" - - + "Ordner auswählen" "Hinzufügen" "Hintergrund" "Suchen" -- cgit v1.2.3 From 6164fdd8da31ae3485e17c54875a816c69b22a01 Mon Sep 17 00:00:00 2001 From: Romain Guy <> Date: Wed, 8 Apr 2009 12:48:14 -0700 Subject: AI 145085: Fixes #1777943. Get rid of the Clock widget on the default Home configuration and bring the Search widget to the center screen. BUG=1777943 Automated import of CL 145085 --- res/xml/default_workspace.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index fd7adf761..9197c304c 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -16,13 +16,8 @@ - - -- cgit v1.2.3 From da19c1677fbab3001c60d7381f08c84492ab89a3 Mon Sep 17 00:00:00 2001 From: Romain Guy <> Date: Wed, 8 Apr 2009 14:01:29 -0700 Subject: AI 145182: Fixes #1777943. Put the Clock back... BUG=1777943 Automated import of CL 145182 --- res/xml/default_workspace.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index 9197c304c..ae2e2a6e0 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -16,6 +16,11 @@ + + Date: Wed, 8 Apr 2009 18:43:30 -0700 Subject: AI 145225: Import more revised translations into cupcake. Automated import of CL 145225 --- res/values-de/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 33f823138..9b39946b8 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -25,7 +25,7 @@ "Ordner umbenennen" "OK" "Abbrechen" - "Zur Startseite hinzufügen" + "Zum Startbildschirm hinzufügen" "Anwendungen" "Verknüpfungen" "Suchen" @@ -37,7 +37,7 @@ "Uhr" "Bildrahmen" "Suchen" - "Auf der Startseite ist kein Platz mehr vorhanden." + "Auf dem Startbildschirm ist kein Platz mehr vorhanden." "Tastenkürzel auswählen" "Ordner auswählen" "Hinzufügen" -- cgit v1.2.3 From d05430a6cb3ce5c1c12e8f5099099770d0b5b111 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Tue, 14 Apr 2009 12:10:43 -0700 Subject: AI 146175: Import updated translations. Automated import of CL 146175 --- res/values-fr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 755856571..0aa07162a 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -41,7 +41,7 @@ "Sélectionner un raccourci" "Sélectionner le dossier" "Ajouter" - "Arrière-plan" + "Fond d\'écran" "Rechercher" "Notifications" "Paramètres" -- cgit v1.2.3 From 062be27886eb812f79cc3269ddf8f0c784177ea4 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Wed, 15 Apr 2009 13:30:20 -0700 Subject: AI 146365: Import revised translations. DO NOT MERGE Automated import of CL 146365 --- res/values-fr/strings.xml | 2 +- res/values-nb/strings.xml | 21 +++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 0aa07162a..e0f01bec7 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -36,7 +36,7 @@ "Dossier" "Horloge" "Cadre d\'image" - "Rechercher" + "Recherche" "Plus d\'espace libre sur l\'écran d\'accueil." "Sélectionner un raccourci" "Sélectionner le dossier" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 954b5d784..e6815dd83 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -26,27 +26,20 @@ "OK" "Avbryt" "Legg til skrivebord" - - - - + "Applikasjoner" + "Snarveier" "Søk" - - - - - - - - + "Ny mappe" + "Mapper" + "Skrivebordselementer" + "Bakgrunner" "Mappe" "Klokke" "Bilderamme" "Søk" "Ikke nok plass på skrivebordet." "Velg snarvei" - - + "Velg mappe" "Legg til" "Bakgrunnsbilde" "Søk" -- cgit v1.2.3