From b0b5dabf1bbf5f3a6ba8476651356fed103f8781 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 23 Aug 2008 11:21:28 -0500 Subject: Update translation files for pending 3.2.1 release Signed-off-by: Dan McGee --- lib/libalpm/po/cs.po | 21 ++++++++++++--------- lib/libalpm/po/de.po | 21 ++++++++++++--------- lib/libalpm/po/en_GB.po | 21 ++++++++++++--------- lib/libalpm/po/es.po | 21 ++++++++++++--------- lib/libalpm/po/fr.po | 21 ++++++++++++--------- lib/libalpm/po/hu.po | 21 ++++++++++++--------- lib/libalpm/po/it.po | 23 +++++++++++++---------- lib/libalpm/po/libalpm.pot | 18 +++++++++--------- lib/libalpm/po/pl.po | 21 ++++++++++++--------- lib/libalpm/po/pt_BR.po | 21 ++++++++++++--------- lib/libalpm/po/ru.po | 21 ++++++++++++--------- lib/libalpm/po/tr.po | 21 ++++++++++++--------- lib/libalpm/po/zh_CN.po | 21 ++++++++++++--------- 13 files changed, 154 insertions(+), 118 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po index 4420ac29..afd411f5 100644 --- a/lib/libalpm/po/cs.po +++ b/lib/libalpm/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-19 08:45+0200\n" "Last-Translator: Vojtěch Gondžala \n" "Language-Team: Čeština\n" @@ -404,14 +404,6 @@ msgstr "chyba volání externího programu pro stahování souborů" msgid "unexpected error" msgstr "neočekávaná chyba" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: vynucená aktualizace na verzi %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: lokální (%s) je novější než %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "nelze nalézt %s v databázi -- přeskakuji\n" @@ -432,6 +424,10 @@ msgstr "nelze odstranit položku '%s' z cache\n" msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "%s-%s: ignoruji aktualizaci balíčku (bude nahrazen %s-%s)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: lokální (%s) je novější než %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n" @@ -448,6 +444,10 @@ msgstr "%s-%s je aktuální -- přeskakuji\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s je aktuální -- přeinstalovávám\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "zjištěn konflikt nerozlišitelných balíčků\n" @@ -555,3 +555,6 @@ msgstr "neexistuje cache %s, vytvářím...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "nelze vytvořit cache balíčků, používám /tmp\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: vynucená aktualizace na verzi %s\n" diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 9b433a8c..c086f3ac 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-16 13:30+0100\n" "Last-Translator: Matthias Gorissen \n" "Language-Team: German \n" @@ -415,14 +415,6 @@ msgstr "Fehler beim Aufruf eines externen Downloaders" msgid "unexpected error" msgstr "Unerwarteter Fehler" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: Erzwungene Aktualisierung auf Version %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n" @@ -443,6 +435,10 @@ msgstr "Konnte Eintrag '%s' nicht aus dem Puffer entfernen\n" msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "%s-%s: Ignoriere zu aktualisierendes Paket (zu ersetzen durch %s-%s)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: Ignoriere Paket-Aktualisierung (%s => %s)\n" @@ -459,6 +455,10 @@ msgstr "%s-%s ist aktuell -- Überspringe\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s ist aktuell -- Reinstalliere\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: Ignoriere Paket-Aktualisierung (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "Nicht lösbare Paketkonflikte gefunden\n" @@ -566,3 +566,6 @@ msgstr "Es existiert kein %s-Puffer. Erstelle... \n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: Erzwungene Aktualisierung auf Version %s\n" diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index 62222bc1..934d16b5 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-19 17:31+0200\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" @@ -404,14 +404,6 @@ msgstr "error invoking external downloader" msgid "unexpected error" msgstr "unexpected error" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: forcing upgrade to version %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: local (%s) is newer than %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "could not find %s in database -- skipping\n" @@ -432,6 +424,10 @@ msgstr "could not remove entry '%s' from cache\n" msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: local (%s) is newer than %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: ignoring package upgrade (%s => %s)\n" @@ -448,6 +444,10 @@ msgstr "%s-%s is up to date -- skipping\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s is up to date -- reinstalling\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: ignoring package upgrade (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "unresolvable package conflicts detected\n" @@ -555,3 +555,6 @@ msgstr "no %s cache exists, creating...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "couldn't create package cache, using /tmp instead\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: forcing upgrade to version %s\n" diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index 54e17c88..19daea60 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-16 09:26-0400\n" "Last-Translator: Juan Pablo Gonzalez \n" "Language-Team: \n" @@ -412,14 +412,6 @@ msgstr "error invocando el descargador externo" msgid "unexpected error" msgstr "error inesperado" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: forzando la actualización a la versión %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: local (%s) es más nuevo que %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "no se pudo encontrar %s en la base de datos -- saltando\n" @@ -442,6 +434,10 @@ msgstr "" "%s-%s: ignorando la actualización del paquete (para ser reemplazado por %s-%" "s)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: local (%s) es más nuevo que %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: ignorando la actualización del paquete (%s => %s)\n" @@ -458,6 +454,10 @@ msgstr "%s-%s esta al día -- saltando\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s esta al día -- re-instalando\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: ignorando la actualización del paquete (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "se han detectado paquetes con conflictos no resueltos\n" @@ -567,3 +567,6 @@ msgstr "no existe la cache %s, creando...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: forzando la actualización a la versión %s\n" diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index 38129188..7cccd964 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-16 22:50+0200\n" "Last-Translator: Xavier \n" "Language-Team: solsTiCe d'Hiver \n" @@ -408,14 +408,6 @@ msgstr "erreur en invoquant le client externe de téléchargement" msgid "unexpected error" msgstr "erreur non prévue" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: force la mise à jour à la version %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: la version locale (%s) est plus récente que %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "trouver %s dans la base de données a échoué -- ignoré\n" @@ -436,6 +428,10 @@ msgstr "la suppression du cache de l'entrée '%s' a échoué\n" msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: la version locale (%s) est plus récente que %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: ignore la mise à jour du paquet (%s => %s)\n" @@ -452,6 +448,10 @@ msgstr "%s-%s est à jour -- ignoré\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s est à jour -- réinstalle\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: ignore la mise à jour du paquet (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "un conflit de paquets impossible à résoudre a été détecté\n" @@ -560,3 +560,6 @@ msgstr "le cache %s n'existe pas, création...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: force la mise à jour à la version %s\n" diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index bff4c63b..85be6808 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2007-03-14 13:45+0100\n" "Last-Translator: Nagy Gabor \n" "Language-Team: \n" @@ -405,14 +405,6 @@ msgstr "hiba a külső letöltő meghívásakor" msgid "unexpected error" msgstr "nemvárt hiba" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: erőltetett frissítés a %s verzióra\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n" @@ -433,6 +425,10 @@ msgstr "nem sikerült eltávolítani a(z) '%s' bejegyzést a gyorsítótárból\ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "%s-%s: csomagfrissítés kihagyása (a(z) %s-%s le fogja cserélni)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: csomagfrissítés kihagyása (%s => %s)\n" @@ -449,6 +445,10 @@ msgstr "a(z) %s-%s naprakész -- kihagyás\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "a(z) %s-%s naprakész -- újratelepítés\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: csomagfrissítés kihagyása (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "feloldhatatlan csomagütközéseket találtam\n" @@ -556,3 +556,6 @@ msgstr "nem létezik a(z) %s gyorsítótár. létrehozás...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "nem sikerült létrehozni a csomaggyorsítótárat, a /tmp használata\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: erőltetett frissítés a %s verzióra\n" diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index 99158e99..c745c5dc 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-19 17:26+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -407,15 +407,6 @@ msgstr "errore nell'inizializzare il download" msgid "unexpected error" msgstr "errore inaspettato" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: aggiornamento forzato alla versione %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "" -"%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "impossibile trovare %s nel database, sarà ignorato\n" @@ -438,6 +429,11 @@ msgstr "" "%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%" "s)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "" +"%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\n" @@ -454,6 +450,10 @@ msgstr "%s-%s è aggiornato, sarà ignorato\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s è aggiornato, sarà reinstallato\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "sono stati rilevati dei conflitti irrisolvibili\n" @@ -562,3 +562,6 @@ msgstr "la cache di %s non esiste, creazione in corso...\n" msgid "couldn't create package cache, using /tmp instead\n" msgstr "" "impossibile creare la cache del pacchetto, al suo posto sarà usata /tmp\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: aggiornamento forzato alla versione %s\n" diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index 8a9882ea..f2360710 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -402,14 +402,6 @@ msgstr "" msgid "unexpected error" msgstr "" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "" @@ -430,6 +422,10 @@ msgstr "" msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "" @@ -446,6 +442,10 @@ msgstr "" msgid "%s-%s is up to date -- reinstalling\n" msgstr "" +#, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "" diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po index e810b208..2a1bbc26 100644 --- a/lib/libalpm/po/pl.po +++ b/lib/libalpm/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-19 20:58+0200\n" "Last-Translator: Mateusz Herych \n" "Language-Team: Polish \n" @@ -412,14 +412,6 @@ msgstr "" msgid "unexpected error" msgstr "niespodziewany błąd" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: wymuszanie aktualizacji do wersji %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: local (%s) jest nowsze niż %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie\n" @@ -441,6 +433,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "" "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: local (%s) jest nowsze niż %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: ignorowanie aktualizacji pakietu (%s => %s)\n" @@ -457,6 +453,10 @@ msgstr "%s-%s jest w najnowszej wersji -- pomijanie\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s jest w najnowszej wersji -- ponowne instalowanie\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: ignorowanie aktualizacji pakietu (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "odkryto nierozwiązywalne konflikty pakietów\n" @@ -565,3 +565,6 @@ msgstr "brak pamięci podręcznej dla %s, tworzenie...\n" msgid "couldn't create package cache, using /tmp instead\n" msgstr "" "nie udało się stworzyć pamięci podręcznej pakietu, używanie /tmp w zamian\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: wymuszanie aktualizacji do wersji %s\n" diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index 9f81dc98..26b7a8c6 100644 --- a/lib/libalpm/po/pt_BR.po +++ b/lib/libalpm/po/pt_BR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-20 15:00-0300\n" "Last-Translator: Hugo Doria \n" "Language-Team: Português do Brasil \n" @@ -416,14 +416,6 @@ msgstr "erro invocando programa de download externo" msgid "unexpected error" msgstr "erro inesperado" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: forçando upgrade para a versão %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: local (%s) é mais novo que %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "não foi possível encontrar %s na base de dados - pulando\n" @@ -444,6 +436,10 @@ msgstr "não foi possível remover a entrada '%s' da cache\n" msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "%s-%s: ignorando atualização do pacote (a ser substituido por %s-%s)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: local (%s) é mais novo que %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: ignorando atualização do pacote (%s => %s)\n" @@ -460,6 +456,10 @@ msgstr "%s-%s está atualizado -- pulando\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s está atualizado -- reinstalando\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: ignorando atualização do pacote (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "conflito de pacotes não solucionável detectado\n" @@ -567,3 +567,6 @@ msgstr "cache %s não existe, criando...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "não foi possível criar cache de pacotes, usando /tmp\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: forçando upgrade para a versão %s\n" diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po index 0dd6fc36..ec65a889 100644 --- a/lib/libalpm/po/ru.po +++ b/lib/libalpm/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-19 19:52+0300\n" "Last-Translator: Sergey Tereschenko \n" "Language-Team: Russian\n" @@ -407,14 +407,6 @@ msgstr "ошибка вызова внешнего менеджера загру msgid "unexpected error" msgstr "непредвиденная ошибка" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: принудительно обновляю до версии %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: установленная версия (%s) новее, чем в %s (%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "не могу найти %s в базе данных -- пропускаю\n" @@ -435,6 +427,10 @@ msgstr "не могу удалить запись '%s' из кеша\n" msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "%s-%s: игнорирую обновление пакета (он будет заменен на %s-%s)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: установленная версия (%s) новее, чем в %s (%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: игнорирую обновление пакета (%s => %s)\n" @@ -451,6 +447,10 @@ msgstr "%s-%s не устарел -- пропускаю\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s не устарел -- переустанавливаю\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: игнорирую обновление пакета (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "обнаружен неразрешимый конфликт пакетов\n" @@ -558,3 +558,6 @@ msgstr "кэш %s не существует, создаю...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "не могу создать кэш пакетов, будет использован /tmp\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: принудительно обновляю до версии %s\n" diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po index 302c41c5..90324bed 100644 --- a/lib/libalpm/po/tr.po +++ b/lib/libalpm/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 3.1.4-1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-17 23:14+0200\n" "Last-Translator: Samed BEYRİBEY \n" "Language-Team: Turkish Arch Linux Users \n" @@ -403,14 +403,6 @@ msgstr "harici indiriciyi çağırırken hata oluştu" msgid "unexpected error" msgstr "beklenmedik hata" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: %s sürümüne güncelleniyor\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: yereldeki paket (%s) %s (%s) paketinden daha güncel\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "%s veritabanında bulunamadı -- atlanıyor\n" @@ -432,6 +424,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "" "%s-%s: paket güncellemesi göz ardı ediliyor (%s-%s ile değiştirilecek)\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: yereldeki paket (%s) %s (%s) paketinden daha güncel\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: paket güncellemesi göz ardı ediliyor (%s => %s)\n" @@ -448,6 +444,10 @@ msgstr "%s-%s güncel -- atlanıyor\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s güncel -- yeniden kuruluyor\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s: paket güncellemesi göz ardı ediliyor (%s => %s)\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "çözülemeyen paket çakışmaları bulundu\n" @@ -555,3 +555,6 @@ msgstr "%s tamponu bulunmuyor, oluşturuluyor...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "paket tamponu oluşturulamadı, /tmp kullanılacak\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: %s sürümüne güncelleniyor\n" diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po index 3b3af526..43642811 100644 --- a/lib/libalpm/po/zh_CN.po +++ b/lib/libalpm/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.1.2\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" "PO-Revision-Date: 2008-07-17 23:01+0200\n" "Last-Translator: 甘露(Lu Gan) \n" "Language-Team: Chinese/Simplified \n" @@ -405,14 +405,6 @@ msgstr "激活外部下载程序时出现错误" msgid "unexpected error" msgstr "未预期的错误" -#, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s：强制更新至版本 %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s：本地（%s）比 %s 的版本更新(%s)\n" - #, c-format msgid "could not find %s in database -- skipping\n" msgstr "无法在数据库中找到 %s -- 跳过\n" @@ -433,6 +425,10 @@ msgstr "无法从缓存中删除记录 '%s'\n" msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" msgstr "%s-%s：忽略软件包更新（由%s-%s替代）\n" +#, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s：本地（%s）比 %s 的版本更新(%s)\n" + #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s：忽略软件包更新（%s => %s）\n" @@ -449,6 +445,10 @@ msgstr "%s-%s 已经为最新 -- 跳过\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s 已经为最新 -- 重新安装\n" +#, fuzzy, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "%s：忽略软件包更新（%s => %s）\n" + #, c-format msgid "unresolvable package conflicts detected\n" msgstr "探测到无法解决的软件包冲突\n" @@ -556,3 +556,6 @@ msgstr "没有 %s 缓存存在，正在创建...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "无法创建软件包缓存，正在使用 /tmp 代替\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s：强制更新至版本 %s\n" -- cgit v1.2.3-24-g4f1b From 4b4ad18348f59393024a8a702e97983a2c692e42 Mon Sep 17 00:00:00 2001 From: Giovanni Scafora Date: Sat, 23 Aug 2008 23:13:12 +0200 Subject: Update Italian translation --- lib/libalpm/po/it.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index c745c5dc..ed4dd3b9 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2008-08-23 10:54-0500\n" -"PO-Revision-Date: 2008-07-19 17:26+0200\n" +"PO-Revision-Date: 2008-08-23 19:30+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" "MIME-Version: 1.0\n" @@ -353,7 +353,7 @@ msgstr "nessun repository corrispondente" #, c-format msgid "invalid or corrupted delta" -msgstr "pacchetto non valido o corrotto" +msgstr "delta non valido o corrotto" #, c-format msgid "delta patch failed" @@ -397,7 +397,7 @@ msgstr "errore di libarchive" #, c-format msgid "download library error" -msgstr "errore nel scaricare la libreria" +msgstr "si è verificato un errore della libreria durante il download" #, c-format msgid "error invoking external downloader" @@ -450,9 +450,11 @@ msgstr "%s-%s è aggiornato, sarà ignorato\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s è aggiornato, sarà reinstallato\n" -#, fuzzy, c-format +#, c-format msgid "downgrading package %s (%s => %s)\n" -msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\n" +msgstr "" +"installazione in corso di una versione meno recente del pacchetto %s (%s => %" +"s)\n" #, c-format msgid "unresolvable package conflicts detected\n" @@ -460,7 +462,7 @@ msgstr "sono stati rilevati dei conflitti irrisolvibili\n" #, c-format msgid "removing '%s' from target list because it conflicts with '%s'\n" -msgstr "rimuovo '%s' dalla lista perché va in conflitto con '%s'\n" +msgstr "rimozione di '%s' dalla lista perché va in conflitto con '%s'\n" #, c-format msgid "command: %s\n" @@ -562,6 +564,3 @@ msgstr "la cache di %s non esiste, creazione in corso...\n" msgid "couldn't create package cache, using /tmp instead\n" msgstr "" "impossibile creare la cache del pacchetto, al suo posto sarà usata /tmp\n" - -#~ msgid "%s: forcing upgrade to version %s\n" -#~ msgstr "%s: aggiornamento forzato alla versione %s\n" -- cgit v1.2.3-24-g4f1b From 8f99f75e6edb409cd048019a464fc8fd139e0dc9 Mon Sep 17 00:00:00 2001 From: Mateusz Herych Date: Sat, 23 Aug 2008 23:15:55 +0200 Subject: Update Polish translation --- lib/libalpm/po/pl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po index 2a1bbc26..6cd0460c 100644 --- a/lib/libalpm/po/pl.po +++ b/lib/libalpm/po/pl.po @@ -453,9 +453,9 @@ msgstr "%s-%s jest w najnowszej wersji -- pomijanie\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s jest w najnowszej wersji -- ponowne instalowanie\n" -#, fuzzy, c-format +#, c-format msgid "downgrading package %s (%s => %s)\n" -msgstr "%s: ignorowanie aktualizacji pakietu (%s => %s)\n" +msgstr "dezaktualizowanie pakietu %s (%s => %s)\n" #, c-format msgid "unresolvable package conflicts detected\n" -- cgit v1.2.3-24-g4f1b From f56d7635473d207c2fe734718fe406ffb2a56abc Mon Sep 17 00:00:00 2001 From: Juan Pablo González Tognarelli Date: Sat, 23 Aug 2008 23:23:39 +0200 Subject: Update Spanish translation Xav : one minor fix (a missing %s in the downgrading message). --- lib/libalpm/po/es.po | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index 19daea60..2838b55d 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -1,21 +1,20 @@ -# translation of libalpm.po to -# Juan Pablo Gonzalez , 2008. -# translation of es.po to +# Juan Pablo González Tognarelli , 2008. msgid "" msgstr "" "Project-Id-Version: libalpm\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2008-08-23 10:54-0500\n" -"PO-Revision-Date: 2008-07-16 09:26-0400\n" -"Last-Translator: Juan Pablo Gonzalez \n" -"Language-Team: \n" +"PO-Revision-Date: 2008-08-23 23:35+0200\n" +"Last-Translator: Juan Pablo González Tognarelli \n" +"Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: CHILE\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 0.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #, c-format msgid "replacing older version %s-%s by %s in target list\n" @@ -38,7 +37,7 @@ msgstr "" #, c-format msgid "replacing packages with -U is not supported yet\n" -msgstr "reemplazar paquetes con -U aún no esta soportado\n" +msgstr "reemplazar paquetes con -U aún no esta soportado\n" #, c-format msgid "you can replace packages manually using -Rd and -U\n" @@ -142,7 +141,7 @@ msgstr "nombre de paquete ausente en %s\n" #, c-format msgid "missing package version in %s\n" -msgstr "forzando la versión del paquete en %s\n" +msgstr "versión del paquete ausente en %s\n" #, c-format msgid "error while reading package %s: %s\n" @@ -202,11 +201,11 @@ msgstr "no se puede resumir la descarga, empezando de nuevo\n" #, c-format msgid "cannot write to file '%s'\n" -msgstr "no se pudo escribir al archivo '%s'\n" +msgstr "no se puede escribir en el archivo '%s'\n" #, c-format msgid "error downloading '%s': %s\n" -msgstr "error descargando %s: %s\n" +msgstr "error descargando '%s': %s\n" #, c-format msgid "error writing to file '%s': %s\n" @@ -226,7 +225,7 @@ msgstr "no se pudo descargar %s\n" #, c-format msgid "out of memory!" -msgstr "no hay memoria!" +msgstr "memoria insuficiente!" #, c-format msgid "unexpected system error" @@ -250,11 +249,11 @@ msgstr "argumento erroneo o NULO" #, c-format msgid "library not initialized" -msgstr "librería no inicializada" +msgstr "biblioteca no inicializada" #, c-format msgid "library already initialized" -msgstr "la librería ya fue inicializada" +msgstr "la biblioteca ya fue inicializada" #, c-format msgid "unable to lock database" @@ -350,7 +349,7 @@ msgstr "no se pudo quitar todos los archivos del paquete" #, c-format msgid "package filename is not valid" -msgstr "nombre de archivo del paquete no es válido" +msgstr "el nombre de archivo del paquete no es válido" #, c-format msgid "no such repository" @@ -402,7 +401,7 @@ msgstr "error de libarchive" #, c-format msgid "download library error" -msgstr "error de descarga de librería" +msgstr "error de descarga de biblioteca" #, c-format msgid "error invoking external downloader" @@ -454,9 +453,9 @@ msgstr "%s-%s esta al día -- saltando\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s esta al día -- re-instalando\n" -#, fuzzy, c-format +#, c-format msgid "downgrading package %s (%s => %s)\n" -msgstr "%s: ignorando la actualización del paquete (%s => %s)\n" +msgstr "decrementando la versión del paquete %s (%s => %s)\n" #, c-format msgid "unresolvable package conflicts detected\n" -- cgit v1.2.3-24-g4f1b From 05d23059fd960fdab23a3aa99b79591fda250a6f Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Sat, 23 Aug 2008 23:25:56 +0200 Subject: Update Hungarian translation --- lib/libalpm/po/hu.po | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index 85be6808..69029d6f 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -445,9 +445,9 @@ msgstr "a(z) %s-%s naprakész -- kihagyás\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "a(z) %s-%s naprakész -- újratelepítés\n" -#, fuzzy, c-format +#, c-format msgid "downgrading package %s (%s => %s)\n" -msgstr "%s: csomagfrissítés kihagyása (%s => %s)\n" +msgstr "visszatérés egy régebbi %s verzióhoz (%s => %s)\n" #, c-format msgid "unresolvable package conflicts detected\n" @@ -556,6 +556,3 @@ msgstr "nem létezik a(z) %s gyorsítótár. létrehozás...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "nem sikerült létrehozni a csomaggyorsítótárat, a /tmp használata\n" - -#~ msgid "%s: forcing upgrade to version %s\n" -#~ msgstr "%s: erőltetett frissítés a %s verzióra\n" -- cgit v1.2.3-24-g4f1b From 91eeee08de706f4f1ab42eeb6996997691cd4255 Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Sat, 23 Aug 2008 23:28:07 +0200 Subject: Update French translation Signed-off-by: Xavier Chantry --- lib/libalpm/po/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index 7cccd964..933682dd 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2008-08-23 10:54-0500\n" -"PO-Revision-Date: 2008-07-16 22:50+0200\n" +"PO-Revision-Date: 2008-08-23 22:51+0200\n" "Last-Translator: Xavier \n" "Language-Team: solsTiCe d'Hiver \n" "MIME-Version: 1.0\n" @@ -448,9 +448,9 @@ msgstr "%s-%s est à jour -- ignoré\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s est à jour -- réinstalle\n" -#, fuzzy, c-format +#, c-format msgid "downgrading package %s (%s => %s)\n" -msgstr "%s: ignore la mise à jour du paquet (%s => %s)\n" +msgstr "retourne à la version antérieure du paquet %s (%s => %s)\n" #, c-format msgid "unresolvable package conflicts detected\n" -- cgit v1.2.3-24-g4f1b From 68e59ecbaf5ab4b0ba8684ea8ce29ef90df84d7a Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Sat, 23 Aug 2008 23:38:40 +0200 Subject: Update British English translation Signed-off-by: Xavier Chantry --- lib/libalpm/po/en_GB.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index 934d16b5..71990fed 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" "POT-Creation-Date: 2008-08-23 10:54-0500\n" -"PO-Revision-Date: 2008-07-19 17:31+0200\n" +"PO-Revision-Date: 2008-08-23 23:38+0200\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" "MIME-Version: 1.0\n" @@ -444,9 +444,9 @@ msgstr "%s-%s is up to date -- skipping\n" msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s is up to date -- reinstalling\n" -#, fuzzy, c-format +#, c-format msgid "downgrading package %s (%s => %s)\n" -msgstr "%s: ignoring package upgrade (%s => %s)\n" +msgstr "downgrading package %s (%s => %s)\n" #, c-format msgid "unresolvable package conflicts detected\n" -- cgit v1.2.3-24-g4f1b