diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-10-21 14:44:41 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-10-21 14:44:41 -0700 |
commit | 5cde4d72c6a0b0d01eeb139e75a4a97e7439b6a8 (patch) | |
tree | 048e33db9593f661d68c438e80eba1ee26497e12 | |
parent | 56e87f3354ab1da61c7d005755d770f68de694a3 (diff) | |
parent | f4d1c30ba47c486585e049a77df499ce2a944326 (diff) | |
download | GoogleSearch-5cde4d72c6a0b0d01eeb139e75a4a97e7439b6a8.tar.gz |
Merge branch 'donut' into donut-releaseHEADandroid-sdk-1.6_r2android-1.6_r2mastermaindonut-releasedonut
-rw-r--r-- | res/values-da/strings.xml | 18 | ||||
-rw-r--r-- | res/values-el/strings.xml | 18 | ||||
-rw-r--r-- | res/values-es-rUS/strings.xml | 18 | ||||
-rw-r--r-- | res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | res/values-ko/strings.xml | 18 | ||||
-rw-r--r-- | res/values-mcc204/strings.xml | 2 | ||||
-rw-r--r-- | res/values-mcc230/strings.xml | 2 | ||||
-rw-r--r-- | res/values-mcc232/strings.xml | 2 | ||||
-rw-r--r-- | res/values-mcc260/strings.xml | 2 | ||||
-rw-r--r-- | res/values-mcc262/strings.xml | 2 | ||||
-rw-r--r-- | res/values-nb/strings.xml | 18 | ||||
-rw-r--r-- | res/values-pt-rPT/strings.xml | 18 | ||||
-rw-r--r-- | res/values-pt/strings.xml | 18 | ||||
-rw-r--r-- | res/values-ru/strings.xml | 18 | ||||
-rw-r--r-- | res/values-sv/strings.xml | 20 | ||||
-rw-r--r-- | res/values-tr/strings.xml | 18 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 18 |
17 files changed, 73 insertions, 139 deletions
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 300c3bc..cff5224 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Google-søgning"</string> <string name="search_hint" msgid="6440085784357793548">"Google-søgning"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Google-søgeindstillinger"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"Vis webforslag"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Vis forslag fra Google, mens du indtaster"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"Vis ikke forslag fra Google, mens du indtaster"</string> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 7fdbbf9..ce78e16 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Αναζήτηση Google"</string> <string name="search_hint" msgid="6440085784357793548">"Αναζήτηση Google"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Ρυθμίσεις αναζήτησης Google"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"Εμφάνιση προτάσεων ιστού"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Εμφάνιση προτάσεων από το Google κατά την πληκτρολόγηση"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"Χωρίς εμφάνιση προτάσεων από το Google κατά την πληκτρολόγηση"</string> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 629448b..90979c0 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Búsqueda de Google"</string> <string name="search_hint" msgid="6440085784357793548">"Búsqueda de Google"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Configuración de búsqueda de Google"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"Mostrar suger. web"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Mostrar sugerencias de Google mientras escribes"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"No mostrar sugerencias de Google mientras escribes"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index da0cf71..0fe356b 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -20,6 +20,6 @@ <string name="search_hint" msgid="6440085784357793548">"Ricerca Google"</string> <string name="google_search_settings" msgid="365464319956526869">"Impostazioni ricerca Google"</string> <string name="show_web_suggestions" msgid="1388747783064440982">"Mostra suggerimenti web"</string> - <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Mostra suggerimenti da Google durante la digitazione"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Mostra suggerimenti Google durante la digitazione"</string> <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"Non mostrare suggerimenti da Google durante la digitazione"</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index dd1ef2f..5de78f1 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Google 검색"</string> <string name="search_hint" msgid="6440085784357793548">"Google 검색"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Google 검색 설정"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"웹 추천 검색어 표시"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"입력하는 동안 Google에서 추천 검색어 표시"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"입력하는 동안 Google에서 추천 검색어 표시 안함"</string> </resources> diff --git a/res/values-mcc204/strings.xml b/res/values-mcc204/strings.xml index 0415345..14c1b7c 100644 --- a/res/values-mcc204/strings.xml +++ b/res/values-mcc204/strings.xml @@ -24,6 +24,6 @@ <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) --> <!-- should be mirrored by changes in apps/Browser. --> <!-- Do not translate. This string is an internal URI, not seen in the UI. --> - <string name="google_search_base" translatable="false"> + <string name="google_suggest_base" translatable="false"> http://www.google.com/complete/search?hl=%1$s&gl=nl&</string> </resources> diff --git a/res/values-mcc230/strings.xml b/res/values-mcc230/strings.xml index bd19cdc..faa7784 100644 --- a/res/values-mcc230/strings.xml +++ b/res/values-mcc230/strings.xml @@ -23,6 +23,6 @@ <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) --> <!-- should be mirrored by changes in apps/Browser. --> <!-- Do not translate. This string is an internal URI, not seen in the UI. --> - <string name="google_search_base" translatable="false"> + <string name="google_suggest_base" translatable="false"> http://www.google.com/complete/search?hl=%1$s&gl=cz&</string> </resources> diff --git a/res/values-mcc232/strings.xml b/res/values-mcc232/strings.xml index ca884a0..c1fb564 100644 --- a/res/values-mcc232/strings.xml +++ b/res/values-mcc232/strings.xml @@ -23,6 +23,6 @@ <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) --> <!-- should be mirrored by changes in apps/Browser. --> <!-- Do not translate. This string is an internal URI, not seen in the UI. --> - <string name="google_search_base" translatable="false"> + <string name="google_suggest_base" translatable="false"> http://www.google.com/complete/search?hl=%1$s&gl=at&</string> </resources> diff --git a/res/values-mcc260/strings.xml b/res/values-mcc260/strings.xml index 9ed2d40..6eb1ad6 100644 --- a/res/values-mcc260/strings.xml +++ b/res/values-mcc260/strings.xml @@ -23,5 +23,5 @@ <!-- don't support this countries locale. --> <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) --> <!-- should be mirrored by changes in apps/Browser. --> - <string translatable="false" name="google_search_base">http://www.google.com/complete/search?hl=%1$s&gl=pl&</string> + <string translatable="false" name="google_suggest_base">http://www.google.com/complete/search?hl=%1$s&gl=pl&</string> </resources> diff --git a/res/values-mcc262/strings.xml b/res/values-mcc262/strings.xml index 1dfd68a..1d191a9 100644 --- a/res/values-mcc262/strings.xml +++ b/res/values-mcc262/strings.xml @@ -23,6 +23,6 @@ <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) --> <!-- should be mirrored by changes in apps/Browser. --> <!-- Do not translate. This string is an internal URI, not seen in the UI. --> - <string name="google_search_base" translatable="false"> + <string name="google_suggest_base" translatable="false"> http://www.google.com/complete/search?hl=%1$s&gl=de&</string> </resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 2164d51..068495e 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Google-søk"</string> <string name="search_hint" msgid="6440085784357793548">"Google-søk"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Innst. for Google-søk"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"Vis søkeforslag"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Vis forslag fra Google mens du skriver"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"Ikke vis forslag fra Google mens du skriver"</string> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 4be91e7..4f6d462 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Pesquisa do Google"</string> <string name="search_hint" msgid="6440085784357793548">"Pesquisa do Google"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Definições de pesquisa do Google"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"Mostrar sugestões da Web"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Mostrar sugestões do Google enquanto escreve"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"Não mostrar sugestões do Google enquanto escreve"</string> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 4be91e7..cd42cd8 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Pesquisa do Google"</string> <string name="search_hint" msgid="6440085784357793548">"Pesquisa do Google"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Configurações de pesquisa do Google"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"Sugestões da web"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Mostrar sugestões do Google enquanto você digita"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"Não mostrar sugestões do Google enquanto você digita"</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index a5dfe26..84e11fe 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Поиск Google"</string> <string name="search_hint" msgid="6440085784357793548">"Поиск Google"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Настройки поиска Google"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"Показывать подсказки веб-поиска"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Показывать подсказки Google при вводе слов"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"Не показывать подсказки Google при вводе"</string> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 37a97ff..a40b2e8 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> - <string name="search_hint" msgid="6440085784357793548">"Google-sökning"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Google Sökning"</string> + <string name="search_hint" msgid="6440085784357793548">"Sök på Google"</string> + <string name="google_search_settings" msgid="365464319956526869">"Inställningar för Google Sökning"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"Visa webbförslag"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Visa förslag från Google medan du skriver"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"Visa inte förslag från Google medan du skriver"</string> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index a649fe5..0254610 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Google Arama"</string> <string name="search_hint" msgid="6440085784357793548">"Google Arama"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Google arama ayarları"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"Web önerilerini göster"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"Yazarken Google önerilerini göster"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"Yazarken Google önerilerini gösterme"</string> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index dc0688d..3ed947c 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -15,17 +15,11 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- no translation found for search_label (2069543354985658833) --> - <skip /> - <!-- no translation found for app_label (3580048106450818944) --> - <skip /> + <string name="search_label" msgid="2069543354985658833">"Google"</string> + <string name="app_label" msgid="3580048106450818944">"Google 搜索"</string> <string name="search_hint" msgid="6440085784357793548">"Google 搜索"</string> - <!-- no translation found for google_search_settings (365464319956526869) --> - <skip /> - <!-- no translation found for show_web_suggestions (1388747783064440982) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_enabled (8167203294868314435) --> - <skip /> - <!-- no translation found for show_web_suggestions_summary_disabled (8530099720012658503) --> - <skip /> + <string name="google_search_settings" msgid="365464319956526869">"Google 搜索设置"</string> + <string name="show_web_suggestions" msgid="1388747783064440982">"显示网络建议"</string> + <string name="show_web_suggestions_summary_enabled" msgid="8167203294868314435">"输入时显示 Google 提供的建议"</string> + <string name="show_web_suggestions_summary_disabled" msgid="8530099720012658503">"输入时不显示 Google 提供的建议"</string> </resources> |