From 19faa24cf3f5d645f15d3f19bb86720acf245719 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 22 Mar 2007 18:19:49 +0000 Subject: Clarify some English messages as suggested by Nagy Gabor. I even did the hard work of fixing these in the translation files, and I removed a few fuzzys while doing so. If any more patches for translations come, try to do it against these files. --- lib/libalpm/be_files.c | 4 +--- lib/libalpm/po/de.po | 41 ++++++++++++++++++++--------------------- lib/libalpm/po/en_GB.po | 32 ++++++++++++++++---------------- lib/libalpm/po/fr.po | 36 +++++++++++++++++------------------- lib/libalpm/po/hu.po | 26 +++++++++++++------------- lib/libalpm/po/it.po | 26 +++++++++++++------------- lib/libalpm/po/pt_BR.po | 30 +++++++++++++++--------------- lib/libalpm/po/ru_RU.po | 28 ++++++++++++++-------------- 8 files changed, 109 insertions(+), 114 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index a24ad293..f3619277 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -183,9 +183,7 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target) return(NULL); } if(_alpm_pkg_splitname(ent->d_name, pkg->name, pkg->version, 0) == -1) { - /* TODO wow, string freeze so correct the below later: dabatase -> database */ - /*_alpm_log(PM_LOG_ERROR, _("invalid name for database entry '%s'"), ent->d_name);*/ - _alpm_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), ent->d_name); + _alpm_log(PM_LOG_ERROR, _("invalid name for database entry '%s'"), ent->d_name); return(NULL); } diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 5ac6ed45..f0f387de 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-22 10:16-0400\n" +"POT-Creation-Date: 2007-03-22 14:15-0400\n" "PO-Revision-Date: 2007-03-07 09:12+0100\n" "Last-Translator: Pierre Schmitz \n" "Language-Team: Deutsch \n" @@ -250,12 +250,12 @@ msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "'%s' wird nicht mehr von %s bereitgestellt (%s => %s)" #: lib/libalpm/add.c:781 -#, fuzzy, c-format +#, c-format msgid "updating '%s' due to provision change (%s)" msgstr "aktualisiere '%s' aufgrund einer Bereitstellungsänderung (%s)" #: lib/libalpm/add.c:785 lib/libalpm/add.c:786 -#, fuzzy, c-format +#, c-format msgid "could not update provision '%s' from '%s'" msgstr "konnte Bereitstellung '%s' von '%s' nicht aktualisieren" @@ -496,51 +496,51 @@ msgstr "Öffne Datenbank aus Pfad '%s'" msgid "db scan could not find package: %s" msgstr "Konnte Paket nicht in Datenbank finden: %s" -#: lib/libalpm/be_files.c:188 +#: lib/libalpm/be_files.c:186 #, c-format -msgid "invalid name for dabatase entry '%s'" +msgid "invalid name for database entry '%s'" msgstr "Falscher Name für Datenbankeintrag '%s'" -#: lib/libalpm/be_files.c:223 +#: lib/libalpm/be_files.c:221 msgid "invalid package entry provided to _alpm_db_read, skipping" msgstr "Überspringe ungültigen an _alpm_db_read übergebenen Paket-Eintrag" -#: lib/libalpm/be_files.c:228 +#: lib/libalpm/be_files.c:226 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." msgstr "" "Überspringe das Lesen der Datenbank für ein Datei-basiertes Paket '%s'..." -#: lib/libalpm/be_files.c:241 +#: lib/libalpm/be_files.c:239 #, c-format msgid "loading package data for %s : level=%d" msgstr "Lade Paket-Daten für %s : level=%d" -#: lib/libalpm/be_files.c:249 +#: lib/libalpm/be_files.c:247 #, c-format msgid "cannot find '%s-%s' in db '%s'" msgstr "Kann %s-%s nicht in der Datenbank '%s' finden" -#: lib/libalpm/be_files.c:257 lib/libalpm/be_files.c:403 -#: lib/libalpm/be_files.c:426 lib/libalpm/be_files.c:517 -#: lib/libalpm/be_files.c:607 lib/libalpm/be_files.c:634 +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 #: lib/libalpm/package.c:206 #, c-format msgid "could not open file %s: %s" msgstr "Konnte Datei %s nicht öffnen: %s" -#: lib/libalpm/be_files.c:514 +#: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "schreibe %s-%s Beschreibungsinformationen zurück in die Datenbank" -#: lib/libalpm/be_files.c:604 +#: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "schreibe %s-%s Dateiinformationen zurück in die Datenbank" -#: lib/libalpm/be_files.c:631 +#: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "schreibe %s-%s Abhängigkeitsinformationen zurück in die Datenbank" @@ -601,7 +601,7 @@ msgid " found conflict '%s' : package '%s' provides '%s'" msgstr " Konflikt gefunden '%s' : Paket '%s' stellt '%s' bereit" #: lib/libalpm/conflict.c:101 lib/libalpm/conflict.c:143 -#, fuzzy, c-format +#, c-format msgid "package '%s' conflicts with itself - packaging error" msgstr "Paket '%s' steht im Konflikt mit sich selbst - Verpackungsfehler" @@ -661,7 +661,7 @@ msgid "registering database '%s'" msgstr "Registriere Datenbank '%s'" #: lib/libalpm/db.c:186 -#, fuzzy, c-format +#, c-format msgid "database directory '%s' does not exist, creating it" msgstr "" "Datenbankverzeichnis '%s' ist nicht vorhanden, versuche es zu erstellen" @@ -982,7 +982,7 @@ msgid "unexpected error" msgstr "Unerwarteter Fehler" #: lib/libalpm/handle.c:163 -#, fuzzy, c-format +#, c-format msgid "cannot canonicalize specified root path '%s'" msgstr "kann das spezifizierte Wurzelverzeichnis nicht anerkennen '%s'" @@ -1372,7 +1372,6 @@ msgid "could not prepare transaction" msgstr "Konnte die Transaktion nicht vorbereiten" #: lib/libalpm/sync.c:993 -#, fuzzy msgid "updating database for replaced packages' dependencies" msgstr "Aktualisiere Datenbank für ersetzte Paketabhängigkeiten" @@ -1387,12 +1386,12 @@ msgid "could not update new database entry %s-%s" msgstr "Konnte neuen Datenbankeintrag %s-%s nicht aktualisieren" #: lib/libalpm/sync.c:1071 -#, fuzzy, c-format +#, c-format msgid "found package '%s-%s' in sync" msgstr "Paket '%s-%s' gefunden" #: lib/libalpm/sync.c:1077 -#, fuzzy, c-format +#, c-format msgid "package '%s' not found in sync" msgstr "Paket '%s' nicht gefunden" diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index 976a13c3..b7b8203b 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: 2007-03-22 10:16-0400\n" +"POT-Creation-Date: 2007-03-22 14:15-0400\n" "PO-Revision-Date: 2007-03-07 21:05+1100\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" @@ -491,51 +491,51 @@ msgstr "opening database from path '%s'" msgid "db scan could not find package: %s" msgstr "db scan could not find package: %s" -#: lib/libalpm/be_files.c:188 +#: lib/libalpm/be_files.c:186 #, c-format -msgid "invalid name for dabatase entry '%s'" -msgstr "invalid name for dabatase entry '%s'" +msgid "invalid name for database entry '%s'" +msgstr "invalid name for database entry '%s'" -#: lib/libalpm/be_files.c:223 +#: lib/libalpm/be_files.c:221 msgid "invalid package entry provided to _alpm_db_read, skipping" msgstr "invalid package entry provided to _alpm_db_read, skipping" -#: lib/libalpm/be_files.c:228 +#: lib/libalpm/be_files.c:226 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." msgstr "" "request to read database info for a file-based package '%s', skipping..." -#: lib/libalpm/be_files.c:241 +#: lib/libalpm/be_files.c:239 #, c-format msgid "loading package data for %s : level=%d" msgstr "loading package data for %s : level=%d" -#: lib/libalpm/be_files.c:249 +#: lib/libalpm/be_files.c:247 #, c-format msgid "cannot find '%s-%s' in db '%s'" msgstr "cannot find '%s-%s' in db '%s'" -#: lib/libalpm/be_files.c:257 lib/libalpm/be_files.c:403 -#: lib/libalpm/be_files.c:426 lib/libalpm/be_files.c:517 -#: lib/libalpm/be_files.c:607 lib/libalpm/be_files.c:634 +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 #: lib/libalpm/package.c:206 #, c-format msgid "could not open file %s: %s" msgstr "could not open file %s: %s" -#: lib/libalpm/be_files.c:514 +#: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "writing %s-%s DESC information back to db" -#: lib/libalpm/be_files.c:604 +#: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "writing %s-%s FILES information back to db" -#: lib/libalpm/be_files.c:631 +#: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "writing %s-%s DEPENDS information back to db" @@ -654,9 +654,9 @@ msgid "registering database '%s'" msgstr "registering database '%s'" #: lib/libalpm/db.c:186 -#, fuzzy, c-format +#, c-format msgid "database directory '%s' does not exist, creating it" -msgstr "database directory '%s' does not exist, try creating it" +msgstr "database directory '%s' does not exist, creating it" #: lib/libalpm/db.c:197 #, c-format diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index cba9c22e..c2b3abf8 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.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: 2007-03-22 10:16-0400\n" +"POT-Creation-Date: 2007-03-22 14:15-0400\n" "PO-Revision-Date: 2007-03-22 12:20+0100\n" "Last-Translator: solsTiCe d'hiver \n" "Language-Team: solsTiCe d'Hiver \n" @@ -244,9 +244,9 @@ msgid "installing" msgstr "installation" #: lib/libalpm/add.c:769 -#, fuzzy, c-format +#, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" -msgstr "supposant que '%s' a t supprim du paquet %s (% => %s)" +msgstr "supposant que '%s' a t supprim du paquet %s (%s => %s)" #: lib/libalpm/add.c:781 #, c-format @@ -488,7 +488,7 @@ msgid "unpacking database '%s'" msgstr "dballe la base de donnes '%s'" #: lib/libalpm/be_files.c:78 -#, fuzzy, c-format +#, c-format msgid "opening database from path '%s'" msgstr "ouvre la base de donnes '%s'" @@ -497,16 +497,16 @@ msgstr "ouvre la base de donn msgid "db scan could not find package: %s" msgstr "la db ne peut trouver le paquet: %s" -#: lib/libalpm/be_files.c:188 +#: lib/libalpm/be_files.c:186 #, c-format -msgid "invalid name for dabatase entry '%s'" +msgid "invalid name for database entry '%s'" msgstr "nom invalide pour l'entre de base de donnes '%s'" -#: lib/libalpm/be_files.c:223 +#: lib/libalpm/be_files.c:221 msgid "invalid package entry provided to _alpm_db_read, skipping" msgstr "paquet invalide fournit _alpm_db_read, et ignor" -#: lib/libalpm/be_files.c:228 +#: lib/libalpm/be_files.c:226 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." @@ -514,35 +514,35 @@ msgstr "" "requte pour lire information de la db pour un paquet bas\" sur un fichier '%" "s', ignor..." -#: lib/libalpm/be_files.c:241 +#: lib/libalpm/be_files.c:239 #, c-format msgid "loading package data for %s : level=%d" msgstr "chargement des donnes du paquet %s: niveau=%d" -#: lib/libalpm/be_files.c:249 +#: lib/libalpm/be_files.c:247 #, c-format msgid "cannot find '%s-%s' in db '%s'" msgstr "ne peut trouver %s-%s dans la base de donnes '%s'" -#: lib/libalpm/be_files.c:257 lib/libalpm/be_files.c:403 -#: lib/libalpm/be_files.c:426 lib/libalpm/be_files.c:517 -#: lib/libalpm/be_files.c:607 lib/libalpm/be_files.c:634 +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 #: lib/libalpm/package.c:206 #, c-format msgid "could not open file %s: %s" msgstr "ne peut ouvrir le fichier %s: %s" -#: lib/libalpm/be_files.c:514 +#: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "criture des informations DESC pour %s-%s dans la db" -#: lib/libalpm/be_files.c:604 +#: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "criture des informations FILES pour %s-%s dans la db" -#: lib/libalpm/be_files.c:631 +#: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "criture des informations DEPENDS pour %s-%s dans la db" @@ -624,7 +624,7 @@ msgid "checkconflicts: db vs target '%s'" msgstr "analyse des conflits: base de donnes compare a la cible '%s'" #: lib/libalpm/conflict.c:201 -#, fuzzy, c-format +#, c-format msgid "target '%s' is also in target list, using NEW conflicts" msgstr "'%s' est dans la la liste de cibles -- using NEW conflicts" @@ -734,7 +734,6 @@ msgid "adding '%s' to the targets" msgstr "ajoute '%s' aux cibles" #: lib/libalpm/deps.c:583 -#, fuzzy msgid "started resolving dependencies" msgstr "dbut du tri des dpendances" @@ -952,7 +951,6 @@ msgid "not confirmed" msgstr "non confirm" #: lib/libalpm/error.c:145 -#, fuzzy msgid "bad configuration section name" msgstr "mauvaise configuration du nom de la section" diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index ef9c0dd8..debbf423 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: 2007-03-22 10:16-0400\n" +"POT-Creation-Date: 2007-03-22 14:15-0400\n" "PO-Revision-Date: 2007-03-14 13:45+0100\n" "Last-Translator: Nagy Gabor \n" "Language-Team: \n" @@ -496,50 +496,50 @@ msgstr "" msgid "db scan could not find package: %s" msgstr "" -#: lib/libalpm/be_files.c:188 +#: lib/libalpm/be_files.c:186 #, c-format -msgid "invalid name for dabatase entry '%s'" +msgid "invalid name for database entry '%s'" msgstr "rvnytelen nv a '%s' adatbzis-bejegyzs szmra" -#: lib/libalpm/be_files.c:223 +#: lib/libalpm/be_files.c:221 msgid "invalid package entry provided to _alpm_db_read, skipping" msgstr "az _alpm_db_read nem rvnyes csomag bejegyzst kapott, kihagys" -#: lib/libalpm/be_files.c:228 +#: lib/libalpm/be_files.c:226 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." msgstr "" -#: lib/libalpm/be_files.c:241 +#: lib/libalpm/be_files.c:239 #, c-format msgid "loading package data for %s : level=%d" msgstr "" -#: lib/libalpm/be_files.c:249 +#: lib/libalpm/be_files.c:247 #, c-format msgid "cannot find '%s-%s' in db '%s'" msgstr "nem tallhat '%s-%s' a(z) '%s' adatbzisban" -#: lib/libalpm/be_files.c:257 lib/libalpm/be_files.c:403 -#: lib/libalpm/be_files.c:426 lib/libalpm/be_files.c:517 -#: lib/libalpm/be_files.c:607 lib/libalpm/be_files.c:634 +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 #: lib/libalpm/package.c:206 #, c-format msgid "could not open file %s: %s" msgstr "nem sikerlt megnyitni a %s fjlt: %s" -#: lib/libalpm/be_files.c:514 +#: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "" -#: lib/libalpm/be_files.c:604 +#: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "" -#: lib/libalpm/be_files.c:631 +#: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "" diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index b4c39a82..d501d294 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-22 10:16-0400\n" +"POT-Creation-Date: 2007-03-22 14:15-0400\n" "PO-Revision-Date: 2007-03-22 12:30+0100\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -498,17 +498,17 @@ msgstr "apertura in corso del database dal path '%s'" msgid "db scan could not find package: %s" msgstr "impossibile trovare il pacchetto: %s" -#: lib/libalpm/be_files.c:188 +#: lib/libalpm/be_files.c:186 #, c-format -msgid "invalid name for dabatase entry '%s'" +msgid "invalid name for database entry '%s'" msgstr "nome non valido per la voce del database '%s'" -#: lib/libalpm/be_files.c:223 +#: lib/libalpm/be_files.c:221 msgid "invalid package entry provided to _alpm_db_read, skipping" msgstr "" "nome non valido per il pacchetto fornito a _alpm_db_read, sarà ignorato" -#: lib/libalpm/be_files.c:228 +#: lib/libalpm/be_files.c:226 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." @@ -516,35 +516,35 @@ msgstr "" "richiesta di lettura del database per un pacchetto file-based '%s', sarà " "ignorata..." -#: lib/libalpm/be_files.c:241 +#: lib/libalpm/be_files.c:239 #, c-format msgid "loading package data for %s : level=%d" msgstr "caricamento in corso dei dati del pacchetto %s : livello=%d" -#: lib/libalpm/be_files.c:249 +#: lib/libalpm/be_files.c:247 #, c-format msgid "cannot find '%s-%s' in db '%s'" msgstr "impossibile trovare '%s-%s' nel database '%s'" -#: lib/libalpm/be_files.c:257 lib/libalpm/be_files.c:403 -#: lib/libalpm/be_files.c:426 lib/libalpm/be_files.c:517 -#: lib/libalpm/be_files.c:607 lib/libalpm/be_files.c:634 +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 #: lib/libalpm/package.c:206 #, c-format msgid "could not open file %s: %s" msgstr "impossibile aprire il file %s: %s" -#: lib/libalpm/be_files.c:514 +#: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "scrittura in corso del campo DESC di %s-%s nel database" -#: lib/libalpm/be_files.c:604 +#: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "scrittura in corso del campo FILES di %s-%s nel database" -#: lib/libalpm/be_files.c:631 +#: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "scrittura in corso del campo DEPENDS di %s-%s nel database" diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index e4ecc2db..4e014f6b 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: 2007-03-22 10:16-0400\n" +"POT-Creation-Date: 2007-03-22 14:15-0400\n" "PO-Revision-Date: 2007-03-07 01:18-0300\n" "Last-Translator: Douglas Soares de Andrade \n" "Language-Team: Português do Brasil \n" @@ -491,7 +491,7 @@ msgid "unpacking database '%s'" msgstr "descompactando base de dados '%s'" #: lib/libalpm/be_files.c:78 -#, fuzzy, c-format +#, c-format msgid "opening database from path '%s'" msgstr "abrindo base de dados '%s'" @@ -500,50 +500,50 @@ msgstr "abrindo base de dados '%s'" msgid "db scan could not find package: %s" msgstr "não foi possível encontrar a base de dados" -#: lib/libalpm/be_files.c:188 +#: lib/libalpm/be_files.c:186 #, c-format -msgid "invalid name for dabatase entry '%s'" +msgid "invalid name for database entry '%s'" msgstr "nome inválido para a entrada na base de dados '%s'" -#: lib/libalpm/be_files.c:223 +#: lib/libalpm/be_files.c:221 msgid "invalid package entry provided to _alpm_db_read, skipping" msgstr "" -#: lib/libalpm/be_files.c:228 +#: lib/libalpm/be_files.c:226 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." msgstr "" -#: lib/libalpm/be_files.c:241 +#: lib/libalpm/be_files.c:239 #, c-format msgid "loading package data for %s : level=%d" msgstr "" -#: lib/libalpm/be_files.c:249 +#: lib/libalpm/be_files.c:247 #, c-format msgid "cannot find '%s-%s' in db '%s'" msgstr "" -#: lib/libalpm/be_files.c:257 lib/libalpm/be_files.c:403 -#: lib/libalpm/be_files.c:426 lib/libalpm/be_files.c:517 -#: lib/libalpm/be_files.c:607 lib/libalpm/be_files.c:634 +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 #: lib/libalpm/package.c:206 #, c-format msgid "could not open file %s: %s" msgstr "não foi possível abrir o arquivo %s: %s" -#: lib/libalpm/be_files.c:514 +#: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "" -#: lib/libalpm/be_files.c:604 +#: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "" -#: lib/libalpm/be_files.c:631 +#: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "" @@ -1235,7 +1235,7 @@ msgid "looking for unresolvable dependencies" msgstr "" #: lib/libalpm/sync.c:486 -#, fuzzy, c-format +#, c-format msgid "package '%s' conflicts with '%s'" msgstr "pacote '%s' conflita com '%s'" diff --git a/lib/libalpm/po/ru_RU.po b/lib/libalpm/po/ru_RU.po index 744fd721..8635f943 100644 --- a/lib/libalpm/po/ru_RU.po +++ b/lib/libalpm/po/ru_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: 2007-03-22 10:16-0400\n" +"POT-Creation-Date: 2007-03-22 14:15-0400\n" "PO-Revision-Date: 2007-03-16 02:52+1000\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n" "MIME-Version: 1.0\n" @@ -490,54 +490,54 @@ msgid "opening database from path '%s'" msgstr "открываю базу данных расположенную в '%s'" #: lib/libalpm/be_files.c:182 -#, fuzzy, c-format +#, c-format msgid "db scan could not find package: %s" msgstr "в БД не удалось найти пакет: %s" -#: lib/libalpm/be_files.c:188 +#: lib/libalpm/be_files.c:186 #, c-format -msgid "invalid name for dabatase entry '%s'" +msgid "invalid name for database entry '%s'" msgstr "" -#: lib/libalpm/be_files.c:223 +#: lib/libalpm/be_files.c:221 msgid "invalid package entry provided to _alpm_db_read, skipping" msgstr "" -#: lib/libalpm/be_files.c:228 +#: lib/libalpm/be_files.c:226 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." msgstr "" -#: lib/libalpm/be_files.c:241 +#: lib/libalpm/be_files.c:239 #, c-format msgid "loading package data for %s : level=%d" msgstr "загружаю данные пакета %s : уровень=%d" -#: lib/libalpm/be_files.c:249 +#: lib/libalpm/be_files.c:247 #, c-format msgid "cannot find '%s-%s' in db '%s'" msgstr "" -#: lib/libalpm/be_files.c:257 lib/libalpm/be_files.c:403 -#: lib/libalpm/be_files.c:426 lib/libalpm/be_files.c:517 -#: lib/libalpm/be_files.c:607 lib/libalpm/be_files.c:634 +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 #: lib/libalpm/package.c:206 #, c-format msgid "could not open file %s: %s" msgstr "" -#: lib/libalpm/be_files.c:514 +#: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "" -#: lib/libalpm/be_files.c:604 +#: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "" -#: lib/libalpm/be_files.c:631 +#: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "" -- cgit v1.2.3-70-g09d2