diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-26 12:15:06 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-26 20:41:55 +0100 |
| commit | 3dff810fe0cc4962a5fa554318e9bf8bc45f5274 (patch) | |
| tree | a9fffa9ab7d061ab00538c18beb77403547378d0 /webkit | |
| parent | 67d814a5d5c8d7df4740db4d2d74d0a41f94bece (diff) | |
| download | external_chromium-3dff810fe0cc4962a5fa554318e9bf8bc45f5274.zip external_chromium-3dff810fe0cc4962a5fa554318e9bf8bc45f5274.tar.gz external_chromium-3dff810fe0cc4962a5fa554318e9bf8bc45f5274.tar.bz2 | |
Merge Chromium at 12.0.742.130: Initial merge by git
Fix for bug 5080607 Update external/chromium to latest revision
Change-Id: I5c98b0d2845fccca4cbcdcea506e8f1759ba5416
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/resources/webkit_strings_ca.xtb | 2 | ||||
| -rw-r--r-- | webkit/glue/resources/webkit_strings_de.xtb | 2 | ||||
| -rw-r--r-- | webkit/glue/resources/webkit_strings_id.xtb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/resources/webkit_strings_ca.xtb b/webkit/glue/resources/webkit_strings_ca.xtb index baaa04e..b2bf734 100644 --- a/webkit/glue/resources/webkit_strings_ca.xtb +++ b/webkit/glue/resources/webkit_strings_ca.xtb @@ -11,7 +11,7 @@ <translation id="4202807286478387388">salta</translation> <translation id="4611115858363067980"><ph name="FILENAME"/><ph name="WIDTH"/>×<ph name="HEIGHT"/></translation> <translation id="7658239707568436148">Cancel·la</translation> -<translation id="795667975304826397">No heu seleccionat cap fitxer.</translation> +<translation id="795667975304826397">Cap fitxer seleccionat.</translation> <translation id="1416462845279468967">S'ha produït un error en instal·lar el connector </translation> <translation id="8141602879876242471">És un índex on es poden realitzar cerques. Introdueix els termes de cerca:</translation> <translation id="5650795167354946011">Després d'instal·lar el connector, feu clic aquí per actualitzar</translation> diff --git a/webkit/glue/resources/webkit_strings_de.xtb b/webkit/glue/resources/webkit_strings_de.xtb index 26ce85a..63ebeb4 100644 --- a/webkit/glue/resources/webkit_strings_de.xtb +++ b/webkit/glue/resources/webkit_strings_de.xtb @@ -44,7 +44,7 @@ <translation id="5466621249238537318">Wählen Sie eine oder mehrere Dateien aus.</translation> <translation id="8750798805984357768">Wählen Sie eine dieser Optionen aus.</translation> <translation id="7740050170769002709">HTML-Inhalte</translation> -<translation id="2226276347425096477">Kürzen Sie diesen Text auf max. <ph name="MAX_CHARACTERS"/> Zeichen. Derzeit verwenden Sie <ph name="CURRENT_LENGTH"/> Zeichen.</translation> +<translation id="2226276347425096477">Kürzen Sie diesen Text auf max. <ph name="MAX_CHARACTERS"/> Zeichen. Zurzeit verwenden Sie <ph name="CURRENT_LENGTH"/> Zeichen.</translation> <translation id="1639239467298939599">Wird geladen...</translation> <translation id="2908441821576996758">Geben Sie eine durch Kommas getrennte Liste der E-Mail-Adressen ein.</translation> <translation id="5939518447894949180">Zurücksetzen</translation> diff --git a/webkit/glue/resources/webkit_strings_id.xtb b/webkit/glue/resources/webkit_strings_id.xtb index daa6799..b455b86 100644 --- a/webkit/glue/resources/webkit_strings_id.xtb +++ b/webkit/glue/resources/webkit_strings_id.xtb @@ -11,7 +11,7 @@ <translation id="4202807286478387388">lompati</translation> <translation id="4611115858363067980"><ph name="FILENAME"/> - <ph name="WIDTH"/>×<ph name="HEIGHT"/></translation> <translation id="7658239707568436148">Batal</translation> -<translation id="795667975304826397">Tidak ada file yang dipilih</translation> +<translation id="795667975304826397">Tidak ada berkas yang dipiliah</translation> <translation id="1416462845279468967">Pemasangan pengaya gagal</translation> <translation id="8141602879876242471">Terdapat indeks yang dapat dicari. Masukkan kata kunci penelusuran:</translation> <translation id="5650795167354946011">Setelah memasang pengaya, klik di sini untuk menyegarkan</translation> @@ -35,7 +35,7 @@ <translation id="838869780401515933">centangi</translation> <translation id="2846343701378493991">1024 (Tingkat Menengah)</translation> <translation id="5476505524087279545">batalkan centang</translation> -<translation id="3789841737615482174">Instal</translation> +<translation id="3789841737615482174">Pasang</translation> <translation id="2507943997699731163">Harap isi bidang ini.</translation> <translation id="5253117816378681419">Konfirmasikan bahwa Anda ingin memasang pengaya <ph name="PLUGIN"/>. Anda harus memasang pengaya yang Anda percayai saja.</translation> <translation id="6663448176199120256">Penelusuran Barusan</translation> |