From 3cfbb81ba01f69d879b19a4a52d1e15014f109d9 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Thu, 26 Jul 2012 13:35:42 -0700 Subject: [PATCH 1/3] Build LatinIME with NDK r8 To remove incorrect __exidx_start and __exidx_end references newer platform libc.so no longer exports. Related CL & issue: http://b/issue?id=6794540 https://googleplex-android-review.googlesource.com/#/c/209741 https://googleplex-android-review.googlesource.com/#/c/211459 Change-Id: I30f49a1277c1f89dcc15973db8851c0002db4b66 --- native/jni/Android.mk | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 06ed5718e..e9ca91a59 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -69,14 +69,9 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime_common_static LOCAL_MODULE_TAGS := optional -# TODO: Remove this conditional block once we have no issues with building against NDK -ifndef TARGET_BUILD_APPS # A full system image build -include external/stlport/libstlport.mk -else # An unbundled build -LOCAL_NDK_VERSION := 7 +LOCAL_NDK_VERSION := 8 LOCAL_SDK_VERSION := 14 LOCAL_NDK_STL_VARIANT := stlport_static -endif include $(BUILD_STATIC_LIBRARY) ###################################### @@ -98,14 +93,9 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime LOCAL_MODULE_TAGS := optional -# TODO: Remove this conditional block once we have no issues with building against NDK -ifndef TARGET_BUILD_APPS # A full system image build -LOCAL_STATIC_LIBRARIES += libstlport_static -else # An unbundled build -LOCAL_NDK_VERSION := 7 +LOCAL_NDK_VERSION := 8 LOCAL_SDK_VERSION := 14 LOCAL_NDK_STL_VARIANT := stlport_static -endif include $(BUILD_SHARED_LIBRARY) From 69d8ad2f9771eb007fd23a8fe140ac7c6d508eb1 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 26 Jul 2012 15:46:48 -0700 Subject: [PATCH 2/3] Import translations. DO NOT MERGE Change-Id: I08e6215e35e127bf5e85c303e065759a1af8b323 Auto-generated-cl: translation import --- java/res/values-af/strings.xml | 3 +++ java/res/values-am/strings.xml | 6 ++++++ java/res/values-ar/strings.xml | 6 ++++++ java/res/values-be/strings.xml | 6 ++++++ java/res/values-bg/strings.xml | 6 ++++++ java/res/values-ca/strings.xml | 6 ++++++ java/res/values-cs/strings.xml | 6 ++++++ java/res/values-da/strings.xml | 3 +++ java/res/values-de/strings.xml | 3 +++ java/res/values-el/strings.xml | 6 ++++++ java/res/values-en-rGB/strings.xml | 3 +++ java/res/values-es-rUS/strings.xml | 6 ++++++ java/res/values-es/strings.xml | 3 +++ java/res/values-et/strings.xml | 6 ++++++ java/res/values-fa/strings.xml | 6 ++++++ java/res/values-fi/strings.xml | 3 +++ java/res/values-fr/strings.xml | 3 +++ java/res/values-hi/strings.xml | 6 ++++++ java/res/values-hr/strings.xml | 3 +++ java/res/values-hu/strings.xml | 3 +++ java/res/values-in/strings.xml | 6 ++++++ java/res/values-it/strings.xml | 3 +++ java/res/values-iw/strings.xml | 3 +++ java/res/values-ja/strings.xml | 6 ++++++ java/res/values-ko/strings.xml | 6 ++++++ java/res/values-lt/strings.xml | 6 ++++++ java/res/values-lv/strings.xml | 6 ++++++ java/res/values-ms/strings.xml | 6 ++++++ java/res/values-nb/strings.xml | 3 +++ java/res/values-nl/strings.xml | 3 +++ java/res/values-pl/strings.xml | 6 ++++++ java/res/values-pt-rPT/strings.xml | 3 +++ java/res/values-pt/strings.xml | 6 ++++++ java/res/values-rm/strings.xml | 6 ++++++ java/res/values-ro/strings.xml | 6 ++++++ java/res/values-ru/strings.xml | 6 ++++++ java/res/values-sk/strings.xml | 6 ++++++ java/res/values-sl/strings.xml | 6 ++++++ java/res/values-sr/strings.xml | 3 +++ java/res/values-sv/strings.xml | 6 ++++++ java/res/values-sw/strings.xml | 3 +++ java/res/values-th/strings.xml | 6 ++++++ java/res/values-tl/strings.xml | 6 ++++++ java/res/values-tr/strings.xml | 6 ++++++ java/res/values-uk/strings.xml | 3 +++ java/res/values-vi/strings.xml | 6 ++++++ java/res/values-zh-rCN/strings.xml | 6 ++++++ java/res/values-zh-rTW/strings.xml | 6 ++++++ java/res/values-zu/strings.xml | 3 +++ 49 files changed, 240 insertions(+) diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml index 0a5d048ef..4ceb4a6be 100644 --- a/java/res/values-af/strings.xml +++ b/java/res/values-af/strings.xml @@ -90,6 +90,9 @@ "Enter" "Soek" "Punt" + "Verander taal" + "Volgende" + "Vorige" "Shift geaktiveer" "Kasslot geaktiveer" "Shift gedeaktiveer" diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml index ab3b71c1c..ce7444b84 100644 --- a/java/res/values-am/strings.xml +++ b/java/res/values-am/strings.xml @@ -90,6 +90,12 @@ "ተመለስ" "ፍለጋ" "ነጥብ" + + + + + + "ቅያር ቁልፍ ነቅቷል" "አቢያት ማድረጊያ ነቅቷል" "ቅያር ተሰናክሏል" diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml index 8407f923e..f7440a251 100644 --- a/java/res/values-ar/strings.xml +++ b/java/res/values-ar/strings.xml @@ -90,6 +90,12 @@ "رجوع" "بحث" "نقطة" + + + + + + "تم تمكين Shift" "تم تمكين Caps lock" "تم تعطيل Shift" diff --git a/java/res/values-be/strings.xml b/java/res/values-be/strings.xml index 9301750e3..c09887080 100644 --- a/java/res/values-be/strings.xml +++ b/java/res/values-be/strings.xml @@ -90,6 +90,12 @@ "Увод" "Пошук" "Кропка" + + + + + + "Shift уключаны" "Caps Lock уключаны" "Shift адключаны" diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml index 6061e3c52..43aa94e9a 100644 --- a/java/res/values-bg/strings.xml +++ b/java/res/values-bg/strings.xml @@ -90,6 +90,12 @@ "Return" "Търсене" "Точка" + + + + + + "„Shift“ е активиран" "„Caps Lock“ е активиран" "„Shift“ е деактивиран" diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml index 865a391a0..b264cb19e 100644 --- a/java/res/values-ca/strings.xml +++ b/java/res/values-ca/strings.xml @@ -90,6 +90,12 @@ "Retorn" "Cerca" "Punt" + + + + + + "Maj activat" "Bloq Maj activat" "Maj desactivat" diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index 1d9c8e38c..2ed05fdd4 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -90,6 +90,12 @@ "Enter" "vyhledávací tlačítko" "Tečka" + + + + + + "Klávesa Shift je aktivní" "Klávesa Caps Lock je aktivní" "Klávesa Shift je neaktivní" diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index ca0938740..45588b2c9 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -90,6 +90,9 @@ "Tilbage" "Søg" "Punktum" + "Skift sprog" + "Næste" + "Forrige" "Skift er aktiveret" "Caps lock er aktiveret" "Skift er deaktiveret" diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index 437fc80f4..4722f19f1 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -90,6 +90,9 @@ "Eingabe" "Suchen" "Aufzählungspunkt" + "Sprache wechseln" + "Nächste" + "Vorherige" "Umschalttaste aktiviert" "Feststelltaste aktiviert" "Umschalttaste deaktiviert" diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index 4ecde7b7c..de940c99a 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -90,6 +90,12 @@ "Πλήκτρο Return" "Αναζήτηση" "Κουκκίδα" + + + + + + "Το Shift ενεργοποιημένο" "Το Caps lock είναι ενεργοποιημένο" "Το Shift είναι απενεργοποιημένο" diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml index e505f46d2..58fef4cfb 100644 --- a/java/res/values-en-rGB/strings.xml +++ b/java/res/values-en-rGB/strings.xml @@ -90,6 +90,9 @@ "Return" "Search" "Dot" + "Switch language" + "Next" + "Previous" "Shift enabled" "Caps lock enabled" "Shift disabled" diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index 4187b87b0..e96699846 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -90,6 +90,12 @@ "Volver" "Buscar" "Punto" + + + + + + "Se activó el modo Mayúscula." "Se activó el bloqueo de mayúsculas." "Se desactivó el modo Mayúscula" diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index 9de4fcf57..fa6736e76 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -90,6 +90,9 @@ "Tecla Intro" "Buscar" "Punto" + "Cambiar idioma" + "Siguiente" + "Anterior" "Mayúsculas habilitadas" "Bloqueo de mayúsculas habilitado" "Mayúsculas inhabilitadas" diff --git a/java/res/values-et/strings.xml b/java/res/values-et/strings.xml index cedbde055..455c292eb 100644 --- a/java/res/values-et/strings.xml +++ b/java/res/values-et/strings.xml @@ -90,6 +90,12 @@ "Tagasi" "Otsing" "Punkt" + + + + + + "Tõstuklahv on lubatud" "Suurtähelukk on lubatud" "Tõstuklahv on keelatud" diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml index f1bd870e2..a72c62703 100644 --- a/java/res/values-fa/strings.xml +++ b/java/res/values-fa/strings.xml @@ -94,6 +94,12 @@ "Return" "جستجو" "نقطه" + + + + + + "Shift فعال است" "Caps lock فعال شد" "Shift غیرفعال است" diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml index 898d522ba..aae249925 100644 --- a/java/res/values-fi/strings.xml +++ b/java/res/values-fi/strings.xml @@ -90,6 +90,9 @@ "Enter" "Haku" "Piste" + "Vaihda kieli" + "Seuraava" + "Edellinen" "Vaihto päällä" "Caps lock päällä" "Vaihto pois käytöstä" diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index 63c36af4c..6cf9a68ba 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -90,6 +90,9 @@ "Entrée" "Rechercher" "Point" + "Changer de langue" + "Touche suivante" + "Touche précédente" "Touche Maj activée" "Verrouillage des majuscules activé" "Touche Maj désactivée" diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml index 22c9efb1f..c734bac50 100644 --- a/java/res/values-hi/strings.xml +++ b/java/res/values-hi/strings.xml @@ -90,6 +90,12 @@ "रिटर्न" "खोजें" "बिंदु" + + + + + + "Shift सक्षम किया गया" "Caps lock सक्षम किया गया" "Shift अक्षम किया गया" diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml index e7c508d90..b1f0dce5c 100644 --- a/java/res/values-hr/strings.xml +++ b/java/res/values-hr/strings.xml @@ -90,6 +90,9 @@ "Enter" "Pretraživanje" "Točka" + "Promijeni jezik" + "Sljedeće" + "Prethodno" "Omogućena tipka Shift" "Omogućeno pisanje velikih slova" "Onemogućena tipka Shift" diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml index 637b5e482..63b2927b7 100644 --- a/java/res/values-hu/strings.xml +++ b/java/res/values-hu/strings.xml @@ -90,6 +90,9 @@ "Enter" "Keresés" "Pont" + "Nyelvek felcserélése" + "Következő" + "Előző" "Shift bekapcsolva" "Caps lock bekapcsolva" "Shift kikapcsolva" diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml index d5c6d48a4..f840f8ab2 100644 --- a/java/res/values-in/strings.xml +++ b/java/res/values-in/strings.xml @@ -90,6 +90,12 @@ "Kembali" "Telusuri" "Titik" + + + + + + "Shift diaktifkan" "Caps lock diaktifkan" "Shift dinonaktifkan" diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index efa02b23a..2d645883a 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -90,6 +90,9 @@ "Invio" "Cerca" "Pallino" + "Cambia lingua" + "Successivo" + "Precedente" "Maiuscolo attivo" "Blocco maiuscole attivo" "Maiuscolo disattivato" diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml index b182ffd32..731f47204 100644 --- a/java/res/values-iw/strings.xml +++ b/java/res/values-iw/strings.xml @@ -90,6 +90,9 @@ "חזור" "חיפוש" "נקודה" + "החלף שפה" + "הבא" + "הקודם" "Shift מופעל" "Caps Lock מופעל" "Shift מושבת" diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index 9d31d5cec..674dd1ecb 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -90,6 +90,12 @@ "Enter" "検索" "中点" + + + + + + "Shift有効" "Caps lock有効" "Shift解除" diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index 8b4a498d0..7aa845775 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -90,6 +90,12 @@ "리턴 키" "검색" "점" + + + + + + "Shift 사용" "Caps Lock 사용" "Shift 사용중지" diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml index e52452e30..621d58408 100644 --- a/java/res/values-lt/strings.xml +++ b/java/res/values-lt/strings.xml @@ -90,6 +90,12 @@ "Grįžti" "Ieškoti" "Taškas" + + + + + + "Įgalintas antrasis lygis" "Įgalintos didžiosios raidės" "Antrasis lygis išjungtas" diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml index 274dd2f27..f6adaba18 100644 --- a/java/res/values-lv/strings.xml +++ b/java/res/values-lv/strings.xml @@ -90,6 +90,12 @@ "Ievadīšanas taustiņš" "Meklēt" "Punkts" + + + + + + "Pārslēgšanas režīms iespējots" "Burtslēgs iespējots" "Pārslēgšanas režīms atspējots" diff --git a/java/res/values-ms/strings.xml b/java/res/values-ms/strings.xml index 5100bb901..3b3ee0581 100644 --- a/java/res/values-ms/strings.xml +++ b/java/res/values-ms/strings.xml @@ -90,6 +90,12 @@ "Return" "Carian" "Titik" + + + + + + "Kunci anjak didayakan" "Kunci huruf besar didayakan" "Kunci anjak dilumpuhkan" diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index be609226a..082fc050e 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -90,6 +90,9 @@ "Return" "Søk" "Prikk" + "Bytt språk" + "Neste" + "Forrige" "Shift er aktivert" "Caps Lock er aktivert" "Shift er deaktivert" diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index dd2608668..4f807a2c4 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -90,6 +90,9 @@ "Return" "Zoeken" "Stip" + "Taal wijzigen" + "Volgende" + "Vorige" "Shift ingeschakeld" "Caps Lock ingeschakeld" "Shift uitgeschakeld" diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index bc2e3ca1a..1b5b55be9 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -90,6 +90,12 @@ "Enter" "Szukaj" "Punkt" + + + + + + "Shift włączony" "Caps lock włączony" "Shift wyłączony" diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index 48a010a6a..324fdb947 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -90,6 +90,9 @@ "Enter" "Pesquisar" "Ponto" + "Mudar de idioma" + "Seguinte" + "Anterior" "Shift ativado" "Caps lock ativado" "Shift desativado" diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index fc5ccaa00..950940c82 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -90,6 +90,12 @@ "Voltar" "Pesquisar" "Ponto" + + + + + + "Shift ativado" "Caps lock ativado" "Shift desativado" diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml index dceeaf4a2..93d61213f 100644 --- a/java/res/values-rm/strings.xml +++ b/java/res/values-rm/strings.xml @@ -151,6 +151,12 @@ + + + + + + diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml index d0473464c..9cd84c192 100644 --- a/java/res/values-ro/strings.xml +++ b/java/res/values-ro/strings.xml @@ -90,6 +90,12 @@ "Enter" "Căutaţi" "Punct" + + + + + + "Tasta Shift a fost activată" "Tasta Caps Lock a fost activată" "Tasta Shift a fost dezactivată" diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index 7e12ddb22..c14cc491e 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -90,6 +90,12 @@ "Клавиша \"Ввод\"" "Поиск" "Точка" + + + + + + "Верхний регистр включен" "Caps Lock включен" "Верхний регистр отключен" diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml index 619f41fc5..5a2b69ece 100644 --- a/java/res/values-sk/strings.xml +++ b/java/res/values-sk/strings.xml @@ -90,6 +90,12 @@ "Enter" "Hľadať" "Bodka" + + + + + + "Kláves Shift je povolený" "Kláves Caps Lock je povolený" "Kláves Shift je zakázaný" diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml index 1df021d1f..8af22eae1 100644 --- a/java/res/values-sl/strings.xml +++ b/java/res/values-sl/strings.xml @@ -90,6 +90,12 @@ "Vračalka" "Iskanje" "Pika" + + + + + + "Način »Shift« je omogočen" "Način »Caps Lock« je omogočen" "Način »Shift« je onemogočen" diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml index 7febdf0dc..d818876cb 100644 --- a/java/res/values-sr/strings.xml +++ b/java/res/values-sr/strings.xml @@ -90,6 +90,9 @@ "Return" "Претражи" "Тачка" + "Пребаци језик" + "Следеће" + "Претходно" "Shift је омогућен" "Caps lock је омогућен" "Shift је онемогућен" diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 301b35813..3aabc304f 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -90,6 +90,12 @@ "Retur" "Sök" "Punkt" + + + + + + "Skift är aktiverat" "Caps Lock är aktiverat" "Skift är inaktiverat" diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml index eed8e994f..7bcc4e365 100644 --- a/java/res/values-sw/strings.xml +++ b/java/res/values-sw/strings.xml @@ -90,6 +90,9 @@ "Rudi" "Tafuta" "Nukta" + "Badili lugha" + "Ifuatayo" + "Iliyotangulia" "Shift imewezeshwa" "Caps lock imewezeshwa" "Shift imelemazwa" diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml index cad003f55..abed92a39 100644 --- a/java/res/values-th/strings.xml +++ b/java/res/values-th/strings.xml @@ -90,6 +90,12 @@ "Return" "ค้นหา" "เครื่องหมายจุด" + + + + + + "เปิดใช้งาน Shift แล้ว" "เปิดใช้งาน Caps Lock แล้ว" "ปิดใช้งาน Shift แล้ว" diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml index 8ebd9c742..b07449779 100644 --- a/java/res/values-tl/strings.xml +++ b/java/res/values-tl/strings.xml @@ -90,6 +90,12 @@ "Bumalik" "Paghahanap" "Tuldok" + + + + + + "Pinagana ang shift" "Pinagana ang caps lock" "Hindi pinagana ang shift" diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index 32d8d9882..395a3f4fe 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -90,6 +90,12 @@ "Enter" "Ara" "Nokta" + + + + + + "Üst karakter etkin" "Büyük harf kilidi etkin" "Üst karakter devre dışı" diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml index d0b3b46c5..fe77dc83c 100644 --- a/java/res/values-uk/strings.xml +++ b/java/res/values-uk/strings.xml @@ -90,6 +90,9 @@ "Клавіша Return" "Пошук" "Крапка" + "Змінити мову" + "Далі" + "Назад" "Shift увімкнено" "Caps Lock увімкнено" "Shift вимкнено" diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index e4ffa913c..a2e0d428e 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -90,6 +90,12 @@ "Quay lại" "Tìm kiếm" "Dấu chấm" + + + + + + "Đã bật Shift" "Đã bật Caps lock" "Đã tắt Shift" diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index 3b70b6030..354e1bc70 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -90,6 +90,12 @@ "返回" "搜索" "点" + + + + + + "Shift 模式已启用" "大写锁定已启用" "Shift 模式已停用" diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 848411fc8..337dedddf 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -90,6 +90,12 @@ "返回" "搜尋" "點" + + + + + + "Shift 鍵已啟用" "大寫鎖定已啟用" "Shift 鍵已停用" diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml index 58fc37c56..36941ff22 100644 --- a/java/res/values-zu/strings.xml +++ b/java/res/values-zu/strings.xml @@ -90,6 +90,9 @@ "Buyisela" "Sesha" "Icashazi" + "Shintsha ulimi" + "Okulandelayo" + "Okwangaphambilini" "U-Shift uvunyelwe" "Ofeleba bavunyelwe" "U-Shift uvimbelwe" From 238caec7d6f797166ba3c4f2f01e95c51ab157c4 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 27 Jul 2012 13:05:35 -0700 Subject: [PATCH 3/3] Import translations. DO NOT MERGE Change-Id: I90998ed5c6728b6fec52d6ef35c1a895ec9e8675 Auto-generated-cl: translation import --- java/res/values-am/strings.xml | 9 +++------ java/res/values-ar/strings.xml | 9 +++------ java/res/values-be/strings.xml | 9 +++------ java/res/values-bg/strings.xml | 9 +++------ java/res/values-ca/strings.xml | 9 +++------ java/res/values-cs/strings.xml | 9 +++------ java/res/values-el/strings.xml | 9 +++------ java/res/values-es-rUS/strings.xml | 9 +++------ java/res/values-et/strings.xml | 9 +++------ java/res/values-fa/strings.xml | 9 +++------ java/res/values-hi/strings.xml | 9 +++------ java/res/values-in/strings.xml | 9 +++------ java/res/values-ja/strings.xml | 9 +++------ java/res/values-ko/strings.xml | 11 ++++------- java/res/values-lt/strings.xml | 9 +++------ java/res/values-lv/strings.xml | 9 +++------ java/res/values-pl/strings.xml | 9 +++------ java/res/values-ro/strings.xml | 9 +++------ java/res/values-ru/strings.xml | 9 +++------ java/res/values-sk/strings.xml | 9 +++------ java/res/values-sl/strings.xml | 11 ++++------- java/res/values-sv/strings.xml | 9 +++------ java/res/values-th/strings.xml | 9 +++------ java/res/values-tl/strings.xml | 9 +++------ java/res/values-tr/strings.xml | 9 +++------ java/res/values-vi/strings.xml | 9 +++------ java/res/values-zh-rTW/strings.xml | 11 ++++------- 27 files changed, 84 insertions(+), 165 deletions(-) diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml index ce7444b84..ca52cfc59 100644 --- a/java/res/values-am/strings.xml +++ b/java/res/values-am/strings.xml @@ -90,12 +90,9 @@ "ተመለስ" "ፍለጋ" "ነጥብ" - - - - - - + "ቋንቋ ቀይር" + "ቀጣይ" + "ቀዳሚ" "ቅያር ቁልፍ ነቅቷል" "አቢያት ማድረጊያ ነቅቷል" "ቅያር ተሰናክሏል" diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml index f7440a251..14eb8144c 100644 --- a/java/res/values-ar/strings.xml +++ b/java/res/values-ar/strings.xml @@ -90,12 +90,9 @@ "رجوع" "بحث" "نقطة" - - - - - - + "تبديل اللغة" + "التالي" + "السابق" "تم تمكين Shift" "تم تمكين Caps lock" "تم تعطيل Shift" diff --git a/java/res/values-be/strings.xml b/java/res/values-be/strings.xml index c09887080..ddd1774fe 100644 --- a/java/res/values-be/strings.xml +++ b/java/res/values-be/strings.xml @@ -90,12 +90,9 @@ "Увод" "Пошук" "Кропка" - - - - - - + "Пераключыць мову" + "Далей" + "Назад" "Shift уключаны" "Caps Lock уключаны" "Shift адключаны" diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml index 43aa94e9a..954f8dbba 100644 --- a/java/res/values-bg/strings.xml +++ b/java/res/values-bg/strings.xml @@ -90,12 +90,9 @@ "Return" "Търсене" "Точка" - - - - - - + "Смяна на езика" + "Следващ" + "Предишен" "„Shift“ е активиран" "„Caps Lock“ е активиран" "„Shift“ е деактивиран" diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml index b264cb19e..a0c551342 100644 --- a/java/res/values-ca/strings.xml +++ b/java/res/values-ca/strings.xml @@ -90,12 +90,9 @@ "Retorn" "Cerca" "Punt" - - - - - - + "Canvia l\'idioma" + "Següent" + "Anterior" "Maj activat" "Bloq Maj activat" "Maj desactivat" diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index 2ed05fdd4..233df2da1 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -90,12 +90,9 @@ "Enter" "vyhledávací tlačítko" "Tečka" - - - - - - + "Přepnout jazyk" + "Další" + "Předchozí" "Klávesa Shift je aktivní" "Klávesa Caps Lock je aktivní" "Klávesa Shift je neaktivní" diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index de940c99a..e8e783049 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -90,12 +90,9 @@ "Πλήκτρο Return" "Αναζήτηση" "Κουκκίδα" - - - - - - + "Αλλαγή γλώσσας" + "Επόμενο" + "Προηγούμενο" "Το Shift ενεργοποιημένο" "Το Caps lock είναι ενεργοποιημένο" "Το Shift είναι απενεργοποιημένο" diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index e96699846..8fc838c2f 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -90,12 +90,9 @@ "Volver" "Buscar" "Punto" - - - - - - + "Cambiar idioma" + "Siguiente" + "Anterior" "Se activó el modo Mayúscula." "Se activó el bloqueo de mayúsculas." "Se desactivó el modo Mayúscula" diff --git a/java/res/values-et/strings.xml b/java/res/values-et/strings.xml index 455c292eb..c282a953a 100644 --- a/java/res/values-et/strings.xml +++ b/java/res/values-et/strings.xml @@ -90,12 +90,9 @@ "Tagasi" "Otsing" "Punkt" - - - - - - + "Keele vahetamine" + "Järgmine" + "Eelmine" "Tõstuklahv on lubatud" "Suurtähelukk on lubatud" "Tõstuklahv on keelatud" diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml index a72c62703..3909bb75a 100644 --- a/java/res/values-fa/strings.xml +++ b/java/res/values-fa/strings.xml @@ -94,12 +94,9 @@ "Return" "جستجو" "نقطه" - - - - - - + "تغییر زبان" + "بعدی" + "قبلی" "Shift فعال است" "Caps lock فعال شد" "Shift غیرفعال است" diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml index c734bac50..b77bbc42f 100644 --- a/java/res/values-hi/strings.xml +++ b/java/res/values-hi/strings.xml @@ -90,12 +90,9 @@ "रिटर्न" "खोजें" "बिंदु" - - - - - - + "भाषा स्विच करें" + "अगला" + "पिछला" "Shift सक्षम किया गया" "Caps lock सक्षम किया गया" "Shift अक्षम किया गया" diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml index f840f8ab2..74ed0a97f 100644 --- a/java/res/values-in/strings.xml +++ b/java/res/values-in/strings.xml @@ -90,12 +90,9 @@ "Kembali" "Telusuri" "Titik" - - - - - - + "Ganti bahasa" + "Berikutnya" + "Sebelumnya" "Shift diaktifkan" "Caps lock diaktifkan" "Shift dinonaktifkan" diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index 674dd1ecb..f53a2334c 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -90,12 +90,9 @@ "Enter" "検索" "中点" - - - - - - + "言語を切り替え" + "次へ" + "前へ" "Shift有効" "Caps lock有効" "Shift解除" diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index 7aa845775..9c7c79906 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -59,7 +59,7 @@ "다음 검색어 추천" "이전 단어에 기반한 추천" "동작 입력" - "단어를 구성하는 문자를 따라감으로써 단어를 입력" + "한번에 문자를 그려서 단어 입력" "%s: 저장됨" "이동" "다음" @@ -90,12 +90,9 @@ "리턴 키" "검색" "점" - - - - - - + "언어 전환" + "다음" + "이전" "Shift 사용" "Caps Lock 사용" "Shift 사용중지" diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml index 621d58408..dbb478a18 100644 --- a/java/res/values-lt/strings.xml +++ b/java/res/values-lt/strings.xml @@ -90,12 +90,9 @@ "Grįžti" "Ieškoti" "Taškas" - - - - - - + "Keisti kalbą" + "Kitas" + "Ankstesnis" "Įgalintas antrasis lygis" "Įgalintos didžiosios raidės" "Antrasis lygis išjungtas" diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml index f6adaba18..baf941b25 100644 --- a/java/res/values-lv/strings.xml +++ b/java/res/values-lv/strings.xml @@ -90,12 +90,9 @@ "Ievadīšanas taustiņš" "Meklēt" "Punkts" - - - - - - + "Mainīt valodu" + "Nākamā" + "Iepriekšējā" "Pārslēgšanas režīms iespējots" "Burtslēgs iespējots" "Pārslēgšanas režīms atspējots" diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index 1b5b55be9..84426b59f 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -90,12 +90,9 @@ "Enter" "Szukaj" "Punkt" - - - - - - + "Przełącz język" + "Dalej" + "Wstecz" "Shift włączony" "Caps lock włączony" "Shift wyłączony" diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml index 9cd84c192..a0be364b6 100644 --- a/java/res/values-ro/strings.xml +++ b/java/res/values-ro/strings.xml @@ -90,12 +90,9 @@ "Enter" "Căutaţi" "Punct" - - - - - - + "Schimbaţi limba" + "Înainte" + "Înapoi" "Tasta Shift a fost activată" "Tasta Caps Lock a fost activată" "Tasta Shift a fost dezactivată" diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index c14cc491e..db4fda4a4 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -90,12 +90,9 @@ "Клавиша \"Ввод\"" "Поиск" "Точка" - - - - - - + "Сменить язык" + "Далее" + "Назад" "Верхний регистр включен" "Caps Lock включен" "Верхний регистр отключен" diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml index 5a2b69ece..6b58b9585 100644 --- a/java/res/values-sk/strings.xml +++ b/java/res/values-sk/strings.xml @@ -90,12 +90,9 @@ "Enter" "Hľadať" "Bodka" - - - - - - + "Prepnúť jazyk" + "Ďalšie" + "Predchádzajúce" "Kláves Shift je povolený" "Kláves Caps Lock je povolený" "Kláves Shift je zakázaný" diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml index 8af22eae1..66e139ec6 100644 --- a/java/res/values-sl/strings.xml +++ b/java/res/values-sl/strings.xml @@ -59,7 +59,7 @@ "Predlogi za naslednjo besedo" "Na podlagi prejšnje besede" "Vnos s potezo" - "Vnašanje besede z izsleditvijo črk" + "Vnašanje besede z drsenjem po zaslonu od črke do črke" "%s: shranjeno" "Pojdi" "Naprej" @@ -90,12 +90,9 @@ "Vračalka" "Iskanje" "Pika" - - - - - - + "Preklop jezika" + "Naprej" + "Nazaj" "Način »Shift« je omogočen" "Način »Caps Lock« je omogočen" "Način »Shift« je onemogočen" diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 3aabc304f..5205c45fa 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -90,12 +90,9 @@ "Retur" "Sök" "Punkt" - - - - - - + "Byt språk" + "Nästa" + "Föregående" "Skift är aktiverat" "Caps Lock är aktiverat" "Skift är inaktiverat" diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml index abed92a39..0e7ba6c3c 100644 --- a/java/res/values-th/strings.xml +++ b/java/res/values-th/strings.xml @@ -90,12 +90,9 @@ "Return" "ค้นหา" "เครื่องหมายจุด" - - - - - - + "เปลี่ยนภาษา" + "ถัดไป" + "ก่อนหน้า" "เปิดใช้งาน Shift แล้ว" "เปิดใช้งาน Caps Lock แล้ว" "ปิดใช้งาน Shift แล้ว" diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml index b07449779..f8c65a287 100644 --- a/java/res/values-tl/strings.xml +++ b/java/res/values-tl/strings.xml @@ -90,12 +90,9 @@ "Bumalik" "Paghahanap" "Tuldok" - - - - - - + "Magpalit ng wika" + "Susunod" + "Nakaraan" "Pinagana ang shift" "Pinagana ang caps lock" "Hindi pinagana ang shift" diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index 395a3f4fe..072b962f9 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -90,12 +90,9 @@ "Enter" "Ara" "Nokta" - - - - - - + "Dili değiştir" + "Sonraki" + "Önceki" "Üst karakter etkin" "Büyük harf kilidi etkin" "Üst karakter devre dışı" diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index a2e0d428e..31839f627 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -90,12 +90,9 @@ "Quay lại" "Tìm kiếm" "Dấu chấm" - - - - - - + "Chuyển ngôn ngữ" + "Tiếp theo" + "Trước đó" "Đã bật Shift" "Đã bật Caps lock" "Đã tắt Shift" diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 337dedddf..4b57deb25 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -59,7 +59,7 @@ "下一個字詞建議" "根據上一個字詞產生" "手勢輸入" - "透過追蹤字詞中的字母來輸入字詞" + "以手指寫出字詞中字母的方式來輸入字詞" "%s:已儲存" "開始" "繼續" @@ -90,12 +90,9 @@ "返回" "搜尋" "點" - - - - - - + "切換語言" + "下一步" + "上一步" "Shift 鍵已啟用" "大寫鎖定已啟用" "Shift 鍵已停用"