From 06cd68c9e7769e331b019e23e334912ff67017c3 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 18 Aug 2007 04:29:49 +0300 Subject: [PATCH] Regenerate .pot files and merge .po files with them. --- dselect/po/ChangeLog | 4 + dselect/po/et.po | 4 +- dselect/po/fr.po | 16 +- dselect/po/pt.po | 21 +- dselect/po/ro.po | 7 +- dselect/po/sv.po | 3 +- man/ChangeLog | 5 + man/po/de.po | 255 +++--- man/po/dpkg-man.pot | 243 ++--- man/po/es.po | 259 +++--- man/po/fr.po | 261 +++--- man/po/hu.po | 251 +++--- man/po/ja.po | 254 +++--- man/po/pl.po | 2 +- man/po/pt_BR.po | 247 +++--- man/po/ru.po | 252 +++--- man/po/sv.po | 254 +++--- po/ChangeLog | 5 + po/bs.po | 1123 ++++++++++++----------- po/ca.po | 1184 +++++++++++++------------ po/cs.po | 1179 ++++++++++++------------ po/da.po | 1180 ++++++++++++------------ po/de.po | 1180 ++++++++++++------------ po/dpkg.pot | 1110 ++++++++++++----------- po/dz.po | 1180 ++++++++++++------------ po/el.po | 1183 +++++++++++++------------ po/es.po | 1183 +++++++++++++------------ po/et.po | 1156 ++++++++++++------------ po/eu.po | 1179 ++++++++++++------------ po/fr.po | 1182 +++++++++++++------------ po/gl.po | 1180 ++++++++++++------------ po/hu.po | 1168 ++++++++++++------------ po/id.po | 1181 +++++++++++++------------ po/it.po | 1184 +++++++++++++------------ po/ja.po | 1180 ++++++++++++------------ po/km.po | 1179 ++++++++++++------------ po/ko.po | 1180 ++++++++++++------------ po/ku.po | 1130 ++++++++++++----------- po/mr.po | 1180 ++++++++++++------------ po/nb.po | 1180 ++++++++++++------------ po/ne.po | 1180 ++++++++++++------------ po/nl.po | 1182 +++++++++++++------------ po/nn.po | 1183 +++++++++++++------------ po/pa.po | 1140 +++++++++++++----------- po/pl.po | 1188 +++++++++++++------------ po/pt.po | 1198 +++++++++++++------------ po/pt_BR.po | 1184 +++++++++++++------------ po/ro.po | 1361 +++++++++++++++------------- po/ru.po | 1183 +++++++++++++------------ po/sk.po | 1180 ++++++++++++------------ po/sv.po | 1186 +++++++++++++------------ po/tl.po | 1185 +++++++++++++------------ po/vi.po | 1869 +++++++++++++++++++++------------------ po/zh_CN.po | 1183 +++++++++++++------------ po/zh_TW.po | 1179 ++++++++++++------------ scripts/po/ChangeLog | 5 + scripts/po/ca.po | 918 +++++++++---------- scripts/po/dpkg-dev.pot | 918 +++++++++---------- scripts/po/fr.po | 987 +++++++++++---------- 59 files changed, 26424 insertions(+), 23089 deletions(-) diff --git a/dselect/po/ChangeLog b/dselect/po/ChangeLog index 8e4d60f5..7a826096 100644 --- a/dselect/po/ChangeLog +++ b/dselect/po/ChangeLog @@ -1,3 +1,7 @@ +2007-08-18 Guillem Jover + + * *.po: Merged with dselect.pot. + 2007-08-06 Yuri Kozlov * ru.po: Updated to 285t. diff --git a/dselect/po/et.po b/dselect/po/et.po index e8475c8f..5eaff7e6 100644 --- a/dselect/po/et.po +++ b/dselect/po/et.po @@ -564,8 +564,8 @@ msgid "" " / search (just return to cancel)\n" " \\ repeat last search\n" msgstr "" -"Liikumisklahvid: Eelmine/Järgmine, Algusesse/Lõppu, Üles/Alla, " -"Edasi/Tagasi:\n" +"Liikumisklahvid: Eelmine/Järgmine, Algusesse/Lõppu, Üles/Alla, Edasi/" +"Tagasi:\n" " j, Nool alla k, Nool üles valiku liigutamine\n" " N, Page-down, Tühik P, Page-up, Backspace nimekirja kerimine lehe " "võrra\n" diff --git a/dselect/po/fr.po b/dselect/po/fr.po index 76c081fa..7a9c565f 100644 --- a/dselect/po/fr.po +++ b/dselect/po/fr.po @@ -673,7 +673,8 @@ msgstr "" #: dselect/helpmsgs.cc:147 msgid "Display, part 2: list highlight; information display" -msgstr "Affichage, 2e partie : surlignage de la liste ; affichage d'informations" +msgstr "" +"Affichage, 2e partie : surlignage de la liste ; affichage d'informations" #: dselect/helpmsgs.cc:147 msgid "" @@ -1241,7 +1242,8 @@ msgstr "script de requ #: dselect/methparse.cc:53 #, c-format msgid "syntax error in method options file `%.250s' -- %s" -msgstr "erreur de syntaxe dans le fichier des options de méthode « %.250s » -- %s" +msgstr "" +"erreur de syntaxe dans le fichier des options de méthode « %.250s » -- %s" #: dselect/methparse.cc:58 #, c-format @@ -1251,7 +1253,8 @@ msgstr "erreur de lecture sur le fichier des options #: dselect/methparse.cc:86 #, c-format msgid "unable to read `%.250s' directory for reading methods" -msgstr "impossible de lire le répertoire « %.250s » pour récupérer les méthodes" +msgstr "" +"impossible de lire le répertoire « %.250s » pour récupérer les méthodes" #: dselect/methparse.cc:100 #, c-format @@ -1270,7 +1273,8 @@ msgstr "impossible de lire le fichier des options de m #: dselect/methparse.cc:140 msgid "non-digit where digit wanted" -msgstr "caractère non numérique rencontré alors qu'un caractère numérique est attendu" +msgstr "" +"caractère non numérique rencontré alors qu'un caractère numérique est attendu" #: dselect/methparse.cc:143 msgid "EOF in index string" @@ -1322,7 +1326,8 @@ msgstr "impossible d'ouvrir le fichier de description d'option #: dselect/methparse.cc:187 #, c-format msgid "unable to stat option description file `%.250s'" -msgstr "impossible d'analyser le nouveau fichier de description d'option « %.250s »" +msgstr "" +"impossible d'analyser le nouveau fichier de description d'option « %.250s »" #: dselect/methparse.cc:191 #, c-format @@ -1806,4 +1811,3 @@ msgstr "Vers. inst" #: dselect/pkgtop.cc:295 msgid "Avail.ver" msgstr "Vers. dispo." - diff --git a/dselect/po/pt.po b/dselect/po/pt.po index 64c9f75b..f2a9835e 100644 --- a/dselect/po/pt.po +++ b/dselect/po/pt.po @@ -331,7 +331,8 @@ msgstr "" " j, Seta-baixo k, Seta-cima mover destaque\n" " N, Page-down, Espaço P, Page-up, Backspace rolar lista em 1 página\n" " ^n ^p rolar lista em 1 linha\n" -" t, Home e, End saltar p/ topo/final da lista\n" +" t, Home e, End saltar p/ topo/final da " +"lista\n" " u d rolar info. em 1 página\n" " ^u ^d rolar info. em 1 linha\n" " B, Seta-esquerda F, Seta-direita mover ecrã em 1/3\n" @@ -339,14 +340,18 @@ msgstr "" "\n" "Marcar pacotes para processamento posterior:\n" " +, Insert instalar ou actualizar =, H manter no estado actual\n" -" -, Delete remover :, G largar: actualizar ou deixar desinstalado\n" +" -, Delete remover :, G largar: actualizar ou deixar " +"desinstalado\n" " _ remover & purgar configuração\n" " Miscelânea:\n" -"Quit, exit, sobrescrever (note maiúsc.!) ?, F1 pedir ajuda (também Ajuda)\n" +"Quit, exit, sobrescrever (note maiúsc.!) ?, F1 pedir ajuda (também " +"Ajuda)\n" " Return Confirm, sair (verificar depend.) i, I muda/circula por telas de " "opções.\n" -" Q Confirma, deixa (ignora depend.) o, O circ. por opc. de classif.\n" -" X, Esc, eXit, abandonar alterações v, V mudar opções de mostrar estado\n" +" Q Confirma, deixa (ignora depend.) o, O circ. por opc. de " +"classif.\n" +" X, Esc, eXit, abandonar alterações v, V mudar opções de mostrar " +"estado\n" " R Reverte ao estado antes desta lista ^l redesenhar ecrã\n" " U colocar tudo no estado sUgerido / procurar (Enter p/" "cancelar)\n" @@ -715,11 +720,13 @@ msgid "" " / search (just return to cancel)\n" " \\ repeat last search\n" msgstr "" -"Teclas de movimentação: Próx./Anterior, Topo/Final, Cima/Baixo, Trás/Frente:\n" +"Teclas de movimentação: Próx./Anterior, Topo/Final, Cima/Baixo, Trás/" +"Frente:\n" " j, Seta-baixo k, Seta-cima mover destaque\n" " N, Page-down, Espaço P, Page-up, Backspace rolar lista em 1 página\n" " ^n ^p rolar lista em 1 linha\n" -" t, Home e, End saltar p/topo/final da lista\n" +" t, Home e, End saltar p/topo/final da " +"lista\n" " u d rolar info. em 1 página\n" " ^u ^d rolar info. em 1 linha\n" " B, Seta-esquerda F, Seta-direita rolar 1/3 da tela p/o lado\n" diff --git a/dselect/po/ro.po b/dselect/po/ro.po index e72b7362..a67035df 100644 --- a/dselect/po/ro.po +++ b/dselect/po/ro.po @@ -25,7 +25,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" "X-Generator: KBabel 1.11.4\n" # spațiile sunt necesare!! @@ -1133,7 +1134,8 @@ msgstr "nu pot aștepta după %.250s" #: dselect/method.cc:175 #, c-format msgid "got wrong child's status - asked for %ld, got %ld" -msgstr "am recepționat o stare greșită a procesului-fiu - cerut %ld, recepționat %ld" +msgstr "" +"am recepționat o stare greșită a procesului-fiu - cerut %ld, recepționat %ld" #: dselect/method.cc:186 #, c-format @@ -1761,4 +1763,3 @@ msgstr "Ver.disp" #~ msgid "available version of control info for " #~ msgstr "versiune disponibilă a informației de control pentru" - diff --git a/dselect/po/sv.po b/dselect/po/sv.po index 99710986..efd17a83 100644 --- a/dselect/po/sv.po +++ b/dselect/po/sv.po @@ -509,8 +509,7 @@ msgstr "" "mellan dem, paketbeskrivningarna och den interna kontrollinformationen.\n" "\n" "En samling \"föreslagna\" paket har beräknats, och de ursprungliga\n" -"inställningarna i underlistan har satts till att matcha dessa, så att " -"du\n" +"inställningarna i underlistan har satts till att matcha dessa, så att du\n" "helt enkelt kan trycka Enter för att acceptera valen om du vill. Du kan\n" "avbryta ändringarna som orsakade problemen och gå tillbaka till huvudlistan\n" "genom att trycka ett versalt \"X\".\n" diff --git a/man/ChangeLog b/man/ChangeLog index c2d711a9..8a3ca542 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2007-08-18 Guillem Jover + + * po/dpkg-man.pot: Regenerated. + * po/*.po: Merged with dpkg-man.pot. + 2007-08-14 Robert Luberda * po/pl.po: Update to 1002t14f269u. diff --git a/man/po/de.po b/man/po/de.po index 2fb47ce8..841cf233 100644 --- a/man/po/de.po +++ b/man/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg man pages\n" -"POT-Creation-Date: 2007-07-21 16:13+0300\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: 2007-08-05 10:07+0200\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: German \n" @@ -173,7 +173,7 @@ msgstr "B<822-date> nimmt keine Argumente oder Optionen an." # type: SH #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 -#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 +#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:618 #: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 #: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427 @@ -189,13 +189,13 @@ msgstr "Diese Anlage sollte wirklich ein Teil von B(1) sein." # type: SH #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 -#: ../../man/deb-control.5:206 ../../man/deb-old.5:51 +#: ../../man/deb-control.5:214 ../../man/deb-old.5:51 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 -#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 +#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 #: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 #: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 -#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 +#: ../../man/dpkg-query.1:159 ../../man/dpkg-scanpackages.1:95 #: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 #: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 #: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 @@ -215,7 +215,7 @@ msgstr "I (RFC2822), B(1)." #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 -#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 +#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:150 #: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 #: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 #: ../../man/install-info.8:291 ../../man/update-alternatives.8:392 @@ -384,7 +384,7 @@ msgstr "Gebe die Version aus und beende sich." # type: SH #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 -#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 +#: ../../man/dpkg.1:505 ../../man/dpkg.cfg.5:12 #: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 #: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 #: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 @@ -430,7 +430,7 @@ msgstr "Copyright (C) 1996 Kim-Minh Kaplan" #: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 #: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 #: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 -#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 +#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:158 #: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 #: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 #: ../../man/install-info.8:295 ../../man/update-alternatives.8:397 @@ -949,12 +949,33 @@ msgstr "" # type: TP #: ../../man/deb-control.5:138 +#, fuzzy, no-wrap +msgid "B Epackage listE" +msgstr "B EPaketlisteE" + +# type: Plain text +#: ../../man/deb-control.5:146 +#, fuzzy +msgid "" +"Lists packages that this one breaks, for example by exposing bugs when the " +"named packages rely on this one. The package maintenance software will not " +"allow broken packages to be configured; generally the resolution is to " +"upgrade the packages named in a B field." +msgstr "" +"Liste an Paketen, die mit diesem in Konflikt stehen, beispielsweise indem " +"beide Dateien mit dem gleichen Namen enthalten. Die Paketverwaltungssoftware " +"wird es nicht erlauben, Pakete, die in Konflikt stehen, gleichzeitig zu " +"installieren. Zwei in Konflikt-stehende Pakete sollten jeweils eine " +"B-Zeile enthalten, die das andere Paket erwähnen." + +# type: TP +#: ../../man/deb-control.5:146 #, no-wrap msgid "B Epackage listE" msgstr "B EPaketlisteE" # type: Plain text -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 msgid "" "Lists packages that conflict with this one, for example by containing files " "with the same names. The package maintenance software will not allow " @@ -968,13 +989,13 @@ msgstr "" "B-Zeile enthalten, die das andere Paket erwähnen." # type: TP -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, no-wrap msgid "B Epackage listE" msgstr "B EPaketlisteE" # type: Plain text -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 msgid "" "List of packages files from which this one replaces. This is used for " "allowing this package to overwrite the files of another package and is " @@ -988,13 +1009,13 @@ msgstr "" "im Konflikt-stehende Paket hat." # type: TP -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, no-wrap msgid "B Epackage listE" msgstr "B EPaketlisteE" # type: Plain text -#: ../../man/deb-control.5:164 +#: ../../man/deb-control.5:172 msgid "" "This is a list of virtual packages that this one provides. Usually this is " "used in the case of several packages all providing the same service. For " @@ -1016,7 +1037,7 @@ msgstr "" "verwenden müssen." # type: Plain text -#: ../../man/deb-control.5:179 +#: ../../man/deb-control.5:187 msgid "" "The syntax of B, B and B is a list of package " "names, separated by commas (and optional whitespace). In the B " @@ -1031,13 +1052,13 @@ msgstr "" "B-Felder angegeben werden." # type: SH -#: ../../man/deb-control.5:180 +#: ../../man/deb-control.5:188 #, no-wrap msgid "EXAMPLE" msgstr "BEISPIEL" # type: Plain text -#: ../../man/deb-control.5:203 +#: ../../man/deb-control.5:211 #, no-wrap msgid "" "# Comment\n" @@ -1084,7 +1105,7 @@ msgstr "" " langsamer laufen.)\n" # type: Plain text -#: ../../man/deb-control.5:209 +#: ../../man/deb-control.5:217 msgid "B(5), B(1), B(1)." msgstr "B(5), B(1), B(1)." @@ -2682,7 +2703,12 @@ msgstr "" "B: Ignoriere Versionen bei der Prüfung von Abhängigkeiten." # type: Plain text -#: ../../man/dpkg.1:378 +#: ../../man/dpkg.1:377 +msgid "B: Install, even if this would break another package." +msgstr "" + +# type: Plain text +#: ../../man/dpkg.1:381 msgid "" "B: Install, even if it conflicts with another package. This is " "dangerous, for it will usually cause overwriting of some files." @@ -2692,7 +2718,7 @@ msgstr "" "einige Dateien überschrieben werden." # type: Plain text -#: ../../man/dpkg.1:383 +#: ../../man/dpkg.1:386 msgid "" "B: Always install a missing configuration file. This is dangerous, " "since it means not preserving a change (removing) made to the file." @@ -2702,7 +2728,7 @@ msgstr "" "nicht erhalten wird." # type: Plain text -#: ../../man/dpkg.1:388 +#: ../../man/dpkg.1:391 msgid "" "B: If a conffile has been modified always install the new version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2713,7 +2739,7 @@ msgstr "" "angegeben, in welchem Falle die Standardaktion bevorzugt wird." # type: Plain text -#: ../../man/dpkg.1:393 +#: ../../man/dpkg.1:396 msgid "" "B: If a conffile has been modified always keep the old version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2724,7 +2750,7 @@ msgstr "" "angegeben, in welchem Falle die Standardaktion bevorzugt wird." # type: Plain text -#: ../../man/dpkg.1:399 +#: ../../man/dpkg.1:402 msgid "" "B: If a conffile has been modified always choose the default " "action. If there is no default action it will stop to ask the user unless " @@ -2738,21 +2764,21 @@ msgstr "" "Aktion zu bestimmen." # type: Plain text -#: ../../man/dpkg.1:402 +#: ../../man/dpkg.1:405 msgid "B: Overwrite one package's file with another's file." msgstr "" "B: Überschreibe die Datei aus einem Paket mit einer Datei aus " "einem anderen Paket." # type: Plain text -#: ../../man/dpkg.1:405 +#: ../../man/dpkg.1:408 msgid "B Overwrite one package's directory with another's file." msgstr "" "B Überschreibe das Verzeichnis aus einem Paket mit einer " "Datei aus einem anderen Paket." # type: Plain text -#: ../../man/dpkg.1:408 +#: ../../man/dpkg.1:411 msgid "" "B: Overwrite a diverted file with an undiverted version." msgstr "" @@ -2760,12 +2786,12 @@ msgstr "" "einer nicht-umgelenkten." # type: Plain text -#: ../../man/dpkg.1:411 +#: ../../man/dpkg.1:414 msgid "B: Process even packages with the wrong architecture." msgstr "B: Verarbeite sogar Pakete mit der falschen Architektur." # type: Plain text -#: ../../man/dpkg.1:414 +#: ../../man/dpkg.1:417 msgid "" "B: B is missing important programs, so problems are likely." msgstr "" @@ -2773,26 +2799,26 @@ msgstr "" "wahrscheinlich." # type: Plain text -#: ../../man/dpkg.1:417 +#: ../../man/dpkg.1:420 msgid "B: Try to (de)install things even when not root." msgstr "" "B: Versuche Sachen zu (de)installieren, selbst falls nicht root." # type: Plain text -#: ../../man/dpkg.1:420 +#: ../../man/dpkg.1:423 msgid "B: Install a package even if it fails authenticity check." msgstr "" "B: Installiere ein Paket selbst wenn die Authentizitätsprüfung " "fehlschlägt." # type: TP -#: ../../man/dpkg.1:421 +#: ../../man/dpkg.1:424 #, no-wrap msgid "B<--ignore-depends>=I,..." msgstr "B<--ignore-depends>=I,..." # type: Plain text -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 msgid "" "Ignore dependency-checking for specified packages (actually, checking is " "performed, but only warnings about conflicts are given, nothing else)." @@ -2802,13 +2828,13 @@ msgstr "" "angezeigt, sonst nichts)." # type: TP -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, no-wrap msgid "B<--new>, B<--old>" msgstr "B<--new>, B<--old>" # type: Plain text -#: ../../man/dpkg.1:429 +#: ../../man/dpkg.1:432 msgid "" "Select new or old binary package format. This is a B(1) option." msgstr "" @@ -2816,13 +2842,13 @@ msgstr "" "Option." # type: TP -#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211 +#: ../../man/dpkg.1:432 ../../man/dpkg-deb.1:211 #, no-wrap msgid "B<--nocheck>" msgstr "B<--nocheck>" # type: Plain text -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 msgid "" "Don't read or check contents of control file while building a package. This " "is a B(1) option." @@ -2831,13 +2857,13 @@ msgstr "" "eine B(1)-Option." # type: TP -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, no-wrap msgid "B<--no-act>, B<--dry-run>, B<--simulate>" msgstr "B<--no-act>, B<--dry-run>, B<--simulate>" # type: Plain text -#: ../../man/dpkg.1:438 +#: ../../man/dpkg.1:441 msgid "" "Do everything which is supposed to be done, but don't write any changes. " "This is used to see what would happen with the specified action, without " @@ -2848,7 +2874,7 @@ msgstr "" "passieren würde ohne tatsächlich etwas zu modifizieren." # type: Plain text -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 msgid "" "Be sure to give B<--no-act> before the action-parameter, or you might end up " "with undesirable results. (e.g. B will first " @@ -2862,13 +2888,13 @@ msgstr "" "dass tatsächlich gar nichts passieren sollte)" # type: TP -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, no-wrap msgid "B<-R>, B<--recursive>" msgstr "B<-R>, B<--recursive>" # type: Plain text -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 msgid "" "Recursively handle all regular files matching pattern B<*.deb> found at " "specified directories and all of its subdirectories. This can be used with " @@ -2880,13 +2906,13 @@ msgstr "" "verwendet werden." # type: TP -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, no-wrap msgid "B<-G>" msgstr "B<-G>" # type: Plain text -#: ../../man/dpkg.1:453 +#: ../../man/dpkg.1:456 msgid "" "Don't install a package if a newer version of the same package is already " "installed. This is an alias of B<--refuse-downgrade>." @@ -2895,7 +2921,7 @@ msgstr "" "Paketes installiert ist. Dies ist ein Alias für B<--refuse-downgrade>." # type: TP -#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 +#: ../../man/dpkg.1:456 ../../man/dpkg-buildpackage.1:168 #: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 #: ../../man/dpkg-shlibdeps.1:105 #, no-wrap @@ -2903,7 +2929,7 @@ msgid "B<--admindir=>I" msgstr "B<--admindir=>I" # type: Plain text -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 msgid "" "Change default administrative directory, which contains many files that give " "information about status of installed or uninstalled packages, etc. " @@ -2914,13 +2940,13 @@ msgstr "" "von installierten und deinstallierten Pakete usw. liegen." # type: TP -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 #, no-wrap msgid "B<--instdir=>I" msgstr "B<--instdir=>I" # type: Plain text -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 msgid "" "Change default installation directory which refers to the directory where " "packages are to be installed. B is also the directory passed to " @@ -2934,13 +2960,13 @@ msgstr "" "ein Wurzelverzeichnis sehen." # type: TP -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, no-wrap msgid "B<--root=>I" msgstr "B<-root=>I" # type: Plain text -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 msgid "" "Changing B changes B to I and B to IB." @@ -2949,13 +2975,13 @@ msgstr "" "IB geändert." # type: TP -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 #, no-wrap msgid "B<-O>, B<--selected-only>" msgstr "B<-O>, B<--selected-only>" # type: Plain text -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 msgid "" "Only process the packages that are selected for installation. The actual " "marking is done with B or by B, when it handles packages. For " @@ -2968,13 +2994,13 @@ msgstr "" "die Deinstallation-ausgewählt markiert." # type: TP -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, no-wrap msgid "B<-E>, B<--skip-same-version>" msgstr "B<-E>, B<--skip-same-version>" # type: Plain text -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 msgid "" "Don't install the package if the same version of the package is already " "installed." @@ -2983,13 +3009,13 @@ msgstr "" "installiert ist." # type: TP -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, no-wrap msgid "B<--status-fd >InE>" msgstr "B<--status-fd >InE>" # type: Plain text -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 msgid "" "Send package status info to file descriptor InE>. This can be " "given multiple times. Status updates are of the form `status: EpkgE: " @@ -3007,13 +3033,13 @@ msgstr "" "useredited distedited« berichtet." # type: TP -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, no-wrap msgid "B<--log=>I" msgstr "B<--log=>I" # type: Plain text -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 msgid "" "Log status change updates and actions to I, instead of the default " "I. If this option is given multiple times, the last " @@ -3038,42 +3064,42 @@ msgstr "" "IEntscheidungE> entweder install oder keep ist." # type: TP -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, no-wrap msgid "B<--no-debsig>" msgstr "B<--no-debsig>" # type: Plain text -#: ../../man/dpkg.1:501 +#: ../../man/dpkg.1:504 msgid "Do not try to verify package signatures." msgstr "Versuche nicht, Paketsignaturen zu überprüfen." # type: TP -#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14 +#: ../../man/dpkg.1:506 ../../man/dpkg.cfg.5:14 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 msgid "Configuration file with default options." msgstr "Konfigurationsdatei mit Standardeinstellungen der Optionen." # type: TP -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:510 +#: ../../man/dpkg.1:513 msgid "Default log file (see I(5) and option B<--log>)." msgstr "" "Standard-Protokolldatei (lesen Sie I(5) und die Option " "B<--log>)." # type: Plain text -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 msgid "" "The other files listed below are in their default directories, see option " "B<--admindir> to see how to change locations of these files." @@ -3083,24 +3109,24 @@ msgstr "" "dieser Dateien ändern können." # type: TP -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 msgid "List of available packages." msgstr "Liste der verfügbaren Pakete." # type: TP -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:522 +#: ../../man/dpkg.1:525 msgid "" "Statuses of available packages. This file contains information about whether " "a package is marked for removing or not, whether it is installed or not, " @@ -3112,7 +3138,7 @@ msgstr "" "weitere Informationen." # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 msgid "" "The following files are components of a binary package. See B(5) for " "more information about them:" @@ -3121,55 +3147,55 @@ msgstr "" "für weitere Informationen über sie:" # type: TP -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:527 +#: ../../man/dpkg.1:530 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:529 +#: ../../man/dpkg.1:532 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:531 +#: ../../man/dpkg.1:534 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:533 +#: ../../man/dpkg.1:536 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:535 +#: ../../man/dpkg.1:538 #, no-wrap msgid "I" msgstr "I" # type: SH -#: ../../man/dpkg.1:538 +#: ../../man/dpkg.1:541 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "UMGEBUNGSVARIABLEN" # type: TP -#: ../../man/dpkg.1:539 +#: ../../man/dpkg.1:542 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 msgid "" "Define this to something if you prefer B starting a new shell rather " "than suspending itself, while doing a shell escape." @@ -3179,25 +3205,25 @@ msgstr "" "»Shell-Escape« durchführt." # type: TP -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:546 +#: ../../man/dpkg.1:549 msgid "The program B will execute when starting a new shell." msgstr "" "Das Programm, das B ausführen wird, wenn es eine neue Shell startet." # type: TP -#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144 +#: ../../man/dpkg.1:549 ../../man/dpkg-query.1:145 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:550 +#: ../../man/dpkg.1:553 msgid "" "Sets the number of columns B should use when displaying formatted " "text. Currently only used by -l." @@ -3206,7 +3232,7 @@ msgstr "" "formatierten Text anzeigt. Derzeit nur von -l verwendet." # type: SH -#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 +#: ../../man/dpkg.1:554 ../../man/dpkg-architecture.1:246 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 #: ../../man/update-alternatives.8:356 #, no-wrap @@ -3214,52 +3240,52 @@ msgid "EXAMPLES" msgstr "BEISPIELE" # type: Plain text -#: ../../man/dpkg.1:553 +#: ../../man/dpkg.1:556 msgid "To list packages related to the editor B(1):" msgstr "Um Pakete mit Bezug zum B(1)-Editor aufzulisten:" # type: Plain text -#: ../../man/dpkg.1:555 +#: ../../man/dpkg.1:558 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:558 +#: ../../man/dpkg.1:561 msgid "To see the entries in I of two packages:" msgstr "" "Um die Einträge von zwei Pakete in I zu sehen:" # type: Plain text -#: ../../man/dpkg.1:560 +#: ../../man/dpkg.1:563 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:563 +#: ../../man/dpkg.1:566 msgid "To search the listing of packages yourself:" msgstr "Wenn Sie die Liste der Pakete selbst durchsuchen wollen:" # type: Plain text -#: ../../man/dpkg.1:565 +#: ../../man/dpkg.1:568 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:568 +#: ../../man/dpkg.1:571 msgid "To remove an installed elvis package:" msgstr "Um ein installiertes Elvis-Paket zu entfernen:" # type: Plain text -#: ../../man/dpkg.1:570 +#: ../../man/dpkg.1:573 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:575 +#: ../../man/dpkg.1:578 msgid "" "To install a package, you first need to find it in an archive or CDROM. The " "\"available\" file shows that the vim package is in section \"editors\":" @@ -3269,7 +3295,7 @@ msgstr "" "Bereich »editors« ist:" # type: Plain text -#: ../../man/dpkg.1:578 +#: ../../man/dpkg.1:581 #, no-wrap msgid "" " B\n" @@ -3279,18 +3305,18 @@ msgstr "" " B\n" # type: Plain text -#: ../../man/dpkg.1:581 +#: ../../man/dpkg.1:584 msgid "To make a local copy of the package selection states:" msgstr "Um eine lokale Kopie der Paketauswahl-Zustände zu erstellen:" # type: Plain text -#: ../../man/dpkg.1:583 +#: ../../man/dpkg.1:586 #, no-wrap msgid " Bmyselections>\n" msgstr " Bmeine_auswahl>\n" # type: Plain text -#: ../../man/dpkg.1:587 +#: ../../man/dpkg.1:590 msgid "" "You might transfer this file to another computer, and install it there with:" msgstr "" @@ -3298,7 +3324,7 @@ msgstr "" "folgenden Befehlen installieren:" # type: Plain text -#: ../../man/dpkg.1:590 +#: ../../man/dpkg.1:593 #, no-wrap msgid "" " B\n" @@ -3308,7 +3334,7 @@ msgstr "" " Bmyselections>\n" # type: Plain text -#: ../../man/dpkg.1:596 +#: ../../man/dpkg.1:599 #, fuzzy msgid "" "Note that this will not actually install or remove anything, but just set " @@ -3323,7 +3349,7 @@ msgstr "" "und wählen Sie »Installieren«." # type: Plain text -#: ../../man/dpkg.1:599 +#: ../../man/dpkg.1:602 msgid "" "Ordinarily, you will find that B(1) provides a more convenient way " "to modify the package selection states." @@ -3332,13 +3358,13 @@ msgstr "" "ist, den Paketauswahlzustand zu ändern." # type: SH -#: ../../man/dpkg.1:601 +#: ../../man/dpkg.1:604 #, no-wrap msgid "ADDITIONAL FUNCTIONALITY" msgstr "ZUSÄTZLICHE FUNKTIONALITÄT" # type: Plain text -#: ../../man/dpkg.1:604 +#: ../../man/dpkg.1:607 msgid "" "Additional functionality can be gained by installing any of the following " "packages: B, B and B." @@ -3347,7 +3373,7 @@ msgstr "" "Pakete erhalten werden: B, B und B." # type: Plain text -#: ../../man/dpkg.1:614 +#: ../../man/dpkg.1:617 msgid "" "B(1), B(1), B(1), B(5), B" "(5), B(5), and B(8)." @@ -3356,13 +3382,13 @@ msgstr "" "(5), B(5) und B(8)." # type: Plain text -#: ../../man/dpkg.1:617 +#: ../../man/dpkg.1:620 msgid "B<--no-act> usually gives less information than might be helpful." msgstr "" "B<--no-act> gibt gewöhnlich weniger Informationen als hilfreich sein könnten." # type: SH -#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 +#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:191 #: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 #: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 @@ -3372,7 +3398,7 @@ msgid "AUTHORS" msgstr "AUTOREN" # type: Plain text -#: ../../man/dpkg.1:622 +#: ../../man/dpkg.1:625 #, no-wrap msgid "" "See I for the list of people who have\n" @@ -4229,7 +4255,7 @@ msgstr "" # type: Plain text #: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 -#: ../../man/dpkg-query.1:160 ../../man/dpkg-statoverride.8:80 +#: ../../man/dpkg-query.1:161 ../../man/dpkg-statoverride.8:80 msgid "B(1)." msgstr "B(1)." @@ -6427,14 +6453,15 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:129 -#, no-wrap +#: ../../man/dpkg-query.1:130 +#, fuzzy, no-wrap msgid "" " B\n" " B\n" " B\n" " B\n" " B\n" +" B\n" " B\n" " B\n" " B\n" @@ -6489,7 +6516,7 @@ msgstr "" " B\n" # type: Plain text -#: ../../man/dpkg-query.1:137 +#: ../../man/dpkg-query.1:138 msgid "" "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq. " "Actually, all other fields found in the status file (i.e. user defined " @@ -6499,19 +6526,19 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:141 +#: ../../man/dpkg-query.1:142 #, no-wrap msgid " B\n" msgstr "" # type: SH -#: ../../man/dpkg-query.1:143 +#: ../../man/dpkg-query.1:144 #, no-wrap msgid "ENVIRONMENT" msgstr "UMGEBUNG" # type: Plain text -#: ../../man/dpkg-query.1:148 +#: ../../man/dpkg-query.1:149 msgid "" "This setting influences the output of the B<--list> option by changing the " "width of its output." @@ -6520,18 +6547,18 @@ msgstr "" "Verändern der Breite ihrer Ausgabe." # type: Plain text -#: ../../man/dpkg-query.1:151 +#: ../../man/dpkg-query.1:152 msgid "Copyright (C) 2001 Wichert Akkerman" msgstr "Copyright (C) 2001 Wichert Akkerman" # type: UR -#: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83 +#: ../../man/dpkg-query.1:152 ../../man/dpkg-statoverride.8:83 #, no-wrap msgid "mailto:wakkerma@debian.org" msgstr "mailto:wakkerma@debian.org" # type: Plain text -#: ../../man/dpkg-query.1:153 ../../man/dpkg-statoverride.8:85 +#: ../../man/dpkg-query.1:154 ../../man/dpkg-statoverride.8:85 msgid "Ewakkerma@debian.orgE" msgstr "Ewakkerma@debian.orgE" diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot index 2f0f43a6..1c21e31b 100644 --- a/man/po/dpkg-man.pot +++ b/man/po/dpkg-man.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-07-21 16:13+0300\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -92,7 +92,7 @@ msgid "B<822-date> does not take any arguments or options." msgstr "" # type: SH -#: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 ../../man/dpkg-split.1:200 ../../man/dselect.1:427 ../../man/update-alternatives.8:383 +#: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 ../../man/deb-substvars.5:125 ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 ../../man/dpkg-split.1:200 ../../man/dselect.1:427 ../../man/update-alternatives.8:383 #, no-wrap msgid "BUGS" msgstr "" @@ -103,7 +103,7 @@ msgid "This facility really ought to be part of B(1)." msgstr "" # type: SH -#: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 ../../man/deb-control.5:206 ../../man/deb-old.5:51 ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 ../../man/dselect.cfg.5:21 ../../man/install-info.8:287 ../../man/update-alternatives.8:403 +#: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 ../../man/deb-control.5:214 ../../man/deb-old.5:51 ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129 ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 ../../man/dpkg-query.1:159 ../../man/dpkg-scanpackages.1:95 ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 ../../man/dselect.cfg.5:21 ../../man/install-info.8:287 ../../man/update-alternatives.8:403 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -114,7 +114,7 @@ msgid "I (RFC2822), B(1)." msgstr "" # type: SH -#: ../../man/822-date.1:33 ../../man/cleanup-info.8:54 ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 ../../man/install-info.8:291 ../../man/update-alternatives.8:392 +#: ../../man/822-date.1:33 ../../man/cleanup-info.8:54 ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:150 ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 ../../man/install-info.8:291 ../../man/update-alternatives.8:392 #, no-wrap msgid "AUTHOR" msgstr "" @@ -222,7 +222,7 @@ msgid "Show the version and exit." msgstr "" # type: SH -#: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325 +#: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 ../../man/dpkg.1:505 ../../man/dpkg.cfg.5:12 ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 ../../man/dpkg-split.1:215 ../../man/dpkg-statoverride.8:68 ../../man/dselect.cfg.5:12 ../../man/update-alternatives.8:325 #, no-wrap msgid "FILES" msgstr "" @@ -256,7 +256,7 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan" msgstr "" # type: Plain text -#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38 ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 ../../man/install-info.8:295 ../../man/update-alternatives.8:397 +#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:197 ../../man/dpkg-checkbuilddeps.1:38 ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:158 ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 ../../man/install-info.8:295 ../../man/update-alternatives.8:397 msgid "" "This is free software; see the GNU General Public Licence version 2 or later " "for copying conditions. There is NO WARRANTY." @@ -652,12 +652,27 @@ msgstr "" # type: TP #: ../../man/deb-control.5:138 #, no-wrap -msgid "B Epackage listE" +msgid "B Epackage listE" msgstr "" # type: Plain text #: ../../man/deb-control.5:146 msgid "" +"Lists packages that this one breaks, for example by exposing bugs when the " +"named packages rely on this one. The package maintenance software will not " +"allow broken packages to be configured; generally the resolution is to " +"upgrade the packages named in a B field." +msgstr "" + +# type: TP +#: ../../man/deb-control.5:146 +#, no-wrap +msgid "B Epackage listE" +msgstr "" + +# type: Plain text +#: ../../man/deb-control.5:154 +msgid "" "Lists packages that conflict with this one, for example by containing files " "with the same names. The package maintenance software will not allow " "conflicting packages to be installed at the same time. Two conflicting " @@ -665,13 +680,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, no-wrap msgid "B Epackage listE" msgstr "" # type: Plain text -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 msgid "" "List of packages files from which this one replaces. This is used for " "allowing this package to overwrite the files of another package and is " @@ -680,13 +695,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, no-wrap msgid "B Epackage listE" msgstr "" # type: Plain text -#: ../../man/deb-control.5:164 +#: ../../man/deb-control.5:172 msgid "" "This is a list of virtual packages that this one provides. Usually this is " "used in the case of several packages all providing the same service. For " @@ -699,7 +714,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/deb-control.5:179 +#: ../../man/deb-control.5:187 msgid "" "The syntax of B, B and B is a list of package " "names, separated by commas (and optional whitespace). In the B " @@ -709,13 +724,13 @@ msgid "" msgstr "" # type: SH -#: ../../man/deb-control.5:180 +#: ../../man/deb-control.5:188 #, no-wrap msgid "EXAMPLE" msgstr "" # type: Plain text -#: ../../man/deb-control.5:203 +#: ../../man/deb-control.5:211 #, no-wrap msgid "" "# Comment\n" @@ -741,7 +756,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/deb-control.5:209 +#: ../../man/deb-control.5:217 msgid "B(5), B(1), B(1)." msgstr "" @@ -2026,21 +2041,26 @@ msgid "B: Don't care about versions when checking dependencies. msgstr "" # type: Plain text -#: ../../man/dpkg.1:378 +#: ../../man/dpkg.1:377 +msgid "B: Install, even if this would break another package." +msgstr "" + +# type: Plain text +#: ../../man/dpkg.1:381 msgid "" "B: Install, even if it conflicts with another package. This is " "dangerous, for it will usually cause overwriting of some files." msgstr "" # type: Plain text -#: ../../man/dpkg.1:383 +#: ../../man/dpkg.1:386 msgid "" "B: Always install a missing configuration file. This is dangerous, " "since it means not preserving a change (removing) made to the file." msgstr "" # type: Plain text -#: ../../man/dpkg.1:388 +#: ../../man/dpkg.1:391 msgid "" "B: If a conffile has been modified always install the new version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2048,7 +2068,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:393 +#: ../../man/dpkg.1:396 msgid "" "B: If a conffile has been modified always keep the old version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2056,7 +2076,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:399 +#: ../../man/dpkg.1:402 msgid "" "B: If a conffile has been modified always choose the default " "action. If there is no default action it will stop to ask the user unless " @@ -2065,85 +2085,85 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:402 +#: ../../man/dpkg.1:405 msgid "B: Overwrite one package's file with another's file." msgstr "" # type: Plain text -#: ../../man/dpkg.1:405 +#: ../../man/dpkg.1:408 msgid "B Overwrite one package's directory with another's file." msgstr "" # type: Plain text -#: ../../man/dpkg.1:408 +#: ../../man/dpkg.1:411 msgid "B: Overwrite a diverted file with an undiverted version." msgstr "" # type: Plain text -#: ../../man/dpkg.1:411 +#: ../../man/dpkg.1:414 msgid "B: Process even packages with the wrong architecture." msgstr "" # type: Plain text -#: ../../man/dpkg.1:414 +#: ../../man/dpkg.1:417 msgid "B: B is missing important programs, so problems are likely." msgstr "" # type: Plain text -#: ../../man/dpkg.1:417 +#: ../../man/dpkg.1:420 msgid "B: Try to (de)install things even when not root." msgstr "" # type: Plain text -#: ../../man/dpkg.1:420 +#: ../../man/dpkg.1:423 msgid "B: Install a package even if it fails authenticity check." msgstr "" # type: TP -#: ../../man/dpkg.1:421 +#: ../../man/dpkg.1:424 #, no-wrap msgid "B<--ignore-depends>=I,..." msgstr "" # type: Plain text -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 msgid "" "Ignore dependency-checking for specified packages (actually, checking is " "performed, but only warnings about conflicts are given, nothing else)." msgstr "" # type: TP -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, no-wrap msgid "B<--new>, B<--old>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:429 +#: ../../man/dpkg.1:432 msgid "Select new or old binary package format. This is a B(1) option." msgstr "" # type: TP -#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211 +#: ../../man/dpkg.1:432 ../../man/dpkg-deb.1:211 #, no-wrap msgid "B<--nocheck>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 msgid "" "Don't read or check contents of control file while building a package. This " "is a B(1) option." msgstr "" # type: TP -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, no-wrap msgid "B<--no-act>, B<--dry-run>, B<--simulate>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:438 +#: ../../man/dpkg.1:441 msgid "" "Do everything which is supposed to be done, but don't write any " "changes. This is used to see what would happen with the specified action, " @@ -2151,7 +2171,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 msgid "" "Be sure to give B<--no-act> before the action-parameter, or you might end up " "with undesirable results. (e.g. B will first " @@ -2160,13 +2180,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, no-wrap msgid "B<-R>, B<--recursive>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 msgid "" "Recursively handle all regular files matching pattern B<*.deb> found at " "specified directories and all of its subdirectories. This can be used with " @@ -2174,26 +2194,26 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, no-wrap msgid "B<-G>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:453 +#: ../../man/dpkg.1:456 msgid "" "Don't install a package if a newer version of the same package is already " "installed. This is an alias of B<--refuse-downgrade>." msgstr "" # type: TP -#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105 +#: ../../man/dpkg.1:456 ../../man/dpkg-buildpackage.1:168 ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 ../../man/dpkg-shlibdeps.1:105 #, no-wrap msgid "B<--admindir=>I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 msgid "" "Change default administrative directory, which contains many files that give " "information about status of installed or uninstalled packages, etc. " @@ -2201,13 +2221,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 #, no-wrap msgid "B<--instdir=>I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 msgid "" "Change default installation directory which refers to the directory where " "packages are to be installed. B is also the directory passed to " @@ -2216,26 +2236,26 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, no-wrap msgid "B<--root=>I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 msgid "" "Changing B changes B to I and B to " "IB." msgstr "" # type: TP -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 #, no-wrap msgid "B<-O>, B<--selected-only>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 msgid "" "Only process the packages that are selected for installation. The actual " "marking is done with B or by B, when it handles packages. For " @@ -2244,26 +2264,26 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, no-wrap msgid "B<-E>, B<--skip-same-version>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 msgid "" "Don't install the package if the same version of the package is already " "installed." msgstr "" # type: TP -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, no-wrap msgid "B<--status-fd >InE>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 msgid "" "Send package status info to file descriptor InE>. This can be " "given multiple times. Status updates are of the form `status: EpkgE: " @@ -2274,13 +2294,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, no-wrap msgid "B<--log=>I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 msgid "" "Log status change updates and actions to I, instead of the default " "I. If this option is given multiple times, the last " @@ -2294,64 +2314,64 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, no-wrap msgid "B<--no-debsig>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:501 +#: ../../man/dpkg.1:504 msgid "Do not try to verify package signatures." msgstr "" # type: Plain text -#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14 +#: ../../man/dpkg.1:506 ../../man/dpkg.cfg.5:14 #, no-wrap msgid "I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 msgid "Configuration file with default options." msgstr "" # type: TP -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, no-wrap msgid "I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:510 +#: ../../man/dpkg.1:513 msgid "Default log file (see I(5) and option B<--log>)." msgstr "" # type: Plain text -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 msgid "" "The other files listed below are in their default directories, see option " "B<--admindir> to see how to change locations of these files." msgstr "" # type: TP -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, no-wrap msgid "I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 msgid "List of available packages." msgstr "" # type: TP -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, no-wrap msgid "I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:522 +#: ../../man/dpkg.1:525 msgid "" "Statuses of available packages. This file contains information about whether " "a package is marked for removing or not, whether it is installed or not, " @@ -2359,150 +2379,150 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 msgid "" "The following files are components of a binary package. See B(5) for " "more information about them:" msgstr "" # type: TP -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, no-wrap msgid "I" msgstr "" # type: TP -#: ../../man/dpkg.1:527 +#: ../../man/dpkg.1:530 #, no-wrap msgid "I" msgstr "" # type: TP -#: ../../man/dpkg.1:529 +#: ../../man/dpkg.1:532 #, no-wrap msgid "I" msgstr "" # type: TP -#: ../../man/dpkg.1:531 +#: ../../man/dpkg.1:534 #, no-wrap msgid "I" msgstr "" # type: TP -#: ../../man/dpkg.1:533 +#: ../../man/dpkg.1:536 #, no-wrap msgid "I" msgstr "" # type: TP -#: ../../man/dpkg.1:535 +#: ../../man/dpkg.1:538 #, no-wrap msgid "I" msgstr "" # type: SH -#: ../../man/dpkg.1:538 +#: ../../man/dpkg.1:541 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" # type: TP -#: ../../man/dpkg.1:539 +#: ../../man/dpkg.1:542 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 msgid "" "Define this to something if you prefer B starting a new shell rather " "than suspending itself, while doing a shell escape." msgstr "" # type: TP -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../../man/dpkg.1:546 +#: ../../man/dpkg.1:549 msgid "The program B will execute when starting a new shell." msgstr "" # type: TP -#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144 +#: ../../man/dpkg.1:549 ../../man/dpkg-query.1:145 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../../man/dpkg.1:550 +#: ../../man/dpkg.1:553 msgid "" "Sets the number of columns B should use when displaying formatted " "text. Currently only used by -l." msgstr "" # type: SH -#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 ../../man/update-alternatives.8:356 +#: ../../man/dpkg.1:554 ../../man/dpkg-architecture.1:246 ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 ../../man/update-alternatives.8:356 #, no-wrap msgid "EXAMPLES" msgstr "" # type: Plain text -#: ../../man/dpkg.1:553 +#: ../../man/dpkg.1:556 msgid "To list packages related to the editor B(1):" msgstr "" # type: Plain text -#: ../../man/dpkg.1:555 +#: ../../man/dpkg.1:558 #, no-wrap msgid " B\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:558 +#: ../../man/dpkg.1:561 msgid "To see the entries in I of two packages:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:560 +#: ../../man/dpkg.1:563 #, no-wrap msgid " B\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:563 +#: ../../man/dpkg.1:566 msgid "To search the listing of packages yourself:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:565 +#: ../../man/dpkg.1:568 #, no-wrap msgid " B\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:568 +#: ../../man/dpkg.1:571 msgid "To remove an installed elvis package:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:570 +#: ../../man/dpkg.1:573 #, no-wrap msgid " B\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:575 +#: ../../man/dpkg.1:578 msgid "" "To install a package, you first need to find it in an archive or CDROM. The " "\"available\" file shows that the vim package is in section \"editors\":" msgstr "" # type: Plain text -#: ../../man/dpkg.1:578 +#: ../../man/dpkg.1:581 #, no-wrap msgid "" " B\n" @@ -2510,23 +2530,23 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:581 +#: ../../man/dpkg.1:584 msgid "To make a local copy of the package selection states:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:583 +#: ../../man/dpkg.1:586 #, no-wrap msgid " Bmyselections>\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:587 +#: ../../man/dpkg.1:590 msgid "You might transfer this file to another computer, and install it there with:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:590 +#: ../../man/dpkg.1:593 #, no-wrap msgid "" " B\n" @@ -2534,7 +2554,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:596 +#: ../../man/dpkg.1:599 msgid "" "Note that this will not actually install or remove anything, but just set " "the selection state on the requested packages. You will need some other " @@ -2543,45 +2563,45 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:599 +#: ../../man/dpkg.1:602 msgid "" "Ordinarily, you will find that B(1) provides a more convenient way " "to modify the package selection states." msgstr "" # type: SH -#: ../../man/dpkg.1:601 +#: ../../man/dpkg.1:604 #, no-wrap msgid "ADDITIONAL FUNCTIONALITY" msgstr "" # type: Plain text -#: ../../man/dpkg.1:604 +#: ../../man/dpkg.1:607 msgid "" "Additional functionality can be gained by installing any of the following " "packages: B, B and B." msgstr "" # type: Plain text -#: ../../man/dpkg.1:614 +#: ../../man/dpkg.1:617 msgid "" "B(1), B(1), B(1), B(5), " "B(5), B(5), and B(8)." msgstr "" # type: Plain text -#: ../../man/dpkg.1:617 +#: ../../man/dpkg.1:620 msgid "B<--no-act> usually gives less information than might be helpful." msgstr "" # type: SH -#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242 +#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:191 ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242 #, no-wrap msgid "AUTHORS" msgstr "" # type: Plain text -#: ../../man/dpkg.1:622 +#: ../../man/dpkg.1:625 #, no-wrap msgid "" "See I for the list of people who have\n" @@ -3306,7 +3326,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 ../../man/dpkg-query.1:160 ../../man/dpkg-statoverride.8:80 +#: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 ../../man/dpkg-query.1:161 ../../man/dpkg-statoverride.8:80 msgid "B(1)." msgstr "" @@ -5159,7 +5179,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:129 +#: ../../man/dpkg-query.1:130 #, no-wrap msgid "" " B\n" @@ -5167,6 +5187,7 @@ msgid "" " B\n" " B\n" " B\n" +" B\n" " B\n" " B\n" " B\n" @@ -5193,7 +5214,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:137 +#: ../../man/dpkg-query.1:138 msgid "" "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq. " "Actually, all other fields found in the status file (i.e. user defined " @@ -5203,37 +5224,37 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:141 +#: ../../man/dpkg-query.1:142 #, no-wrap msgid " B\n" msgstr "" # type: SH -#: ../../man/dpkg-query.1:143 +#: ../../man/dpkg-query.1:144 #, no-wrap msgid "ENVIRONMENT" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:148 +#: ../../man/dpkg-query.1:149 msgid "" "This setting influences the output of the B<--list> option by changing the " "width of its output." msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:151 +#: ../../man/dpkg-query.1:152 msgid "Copyright (C) 2001 Wichert Akkerman" msgstr "" # type: UR -#: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83 +#: ../../man/dpkg-query.1:152 ../../man/dpkg-statoverride.8:83 #, no-wrap msgid "mailto:wakkerma@debian.org" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:153 ../../man/dpkg-statoverride.8:85 +#: ../../man/dpkg-query.1:154 ../../man/dpkg-statoverride.8:85 msgid "Ewakkerma@debian.orgE" msgstr "" diff --git a/man/po/es.po b/man/po/es.po index b40ac35d..6528c516 100644 --- a/man/po/es.po +++ b/man/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg man pages\n" -"POT-Creation-Date: 2007-07-21 16:13+0300\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: 2005-07-03 15:04+0200\n" "Last-Translator: Unknown translator\n" "Language-Team: Spanish \n" @@ -184,7 +184,7 @@ msgstr "B<822-date> no lleva ning # type: SH #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 -#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 +#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:618 #: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 #: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427 @@ -211,13 +211,13 @@ msgstr "Esta funcionalidad en realidad deber # type: SH #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 -#: ../../man/deb-control.5:206 ../../man/deb-old.5:51 +#: ../../man/deb-control.5:214 ../../man/deb-old.5:51 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 -#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 +#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 #: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 #: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 -#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 +#: ../../man/dpkg-query.1:159 ../../man/dpkg-scanpackages.1:95 #: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 #: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 #: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 @@ -245,7 +245,7 @@ msgstr "" #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 -#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 +#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:150 #: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 #: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 #: ../../man/install-info.8:291 ../../man/update-alternatives.8:392 @@ -418,7 +418,7 @@ msgstr "Muestra la versi # type: SH #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 -#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 +#: ../../man/dpkg.1:505 ../../man/dpkg.cfg.5:12 #: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 #: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 #: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 @@ -471,7 +471,7 @@ msgstr "Copyright (C) 1996 Kim-Minh Kaplan." #: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 #: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 #: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 -#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 +#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:158 #: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 #: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 #: ../../man/install-info.8:295 ../../man/update-alternatives.8:397 @@ -1026,11 +1026,32 @@ msgstr "" # type: TP #: ../../man/deb-control.5:138 #, fuzzy, no-wrap +msgid "B Epackage listE" +msgstr "BElista de paquetesE" + +# type: Plain text +#: ../../man/deb-control.5:146 +#, fuzzy +msgid "" +"Lists packages that this one breaks, for example by exposing bugs when the " +"named packages rely on this one. The package maintenance software will not " +"allow broken packages to be configured; generally the resolution is to " +"upgrade the packages named in a B field." +msgstr "" +"Lista de paquetes que entran en conflicto con éste, por ejemplo, por que " +"contienen ficheros con el mismo nombre. El programa de mantenimiento de " +"paquetes no permitirá que dos paquetes en conflicto estén instalado a la " +"vez. Dos paquetes con conflictos entre ellos deben de incluir al otro en su " +"campo Conflicts B" + +# type: TP +#: ../../man/deb-control.5:146 +#, fuzzy, no-wrap msgid "B Epackage listE" msgstr "BElista de paquetesE" # type: Plain text -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, fuzzy msgid "" "Lists packages that conflict with this one, for example by containing files " @@ -1045,13 +1066,13 @@ msgstr "" "campo Conflicts B" # type: TP -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, fuzzy, no-wrap msgid "B Epackage listE" msgstr "BElista de paquetesE" # type: Plain text -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, fuzzy msgid "" "List of packages files from which this one replaces. This is used for " @@ -1065,13 +1086,13 @@ msgstr "" "que ambos paquetes tengan ficheros con el mismo nombre." # type: TP -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, fuzzy, no-wrap msgid "B Epackage listE" msgstr "BElista de paquetesE" # type: Plain text -#: ../../man/deb-control.5:164 +#: ../../man/deb-control.5:172 #, fuzzy msgid "" "This is a list of virtual packages that this one provides. Usually this is " @@ -1094,7 +1115,7 @@ msgstr "" "separarlos." # type: Plain text -#: ../../man/deb-control.5:179 +#: ../../man/deb-control.5:187 #, fuzzy msgid "" "The syntax of B, B and B is a list of package " @@ -1110,13 +1131,13 @@ msgstr "" "campos B y B" # type: SH -#: ../../man/deb-control.5:180 +#: ../../man/deb-control.5:188 #, fuzzy, no-wrap msgid "EXAMPLE" msgstr "EJEMPLO" # type: Plain text -#: ../../man/deb-control.5:203 +#: ../../man/deb-control.5:211 #, fuzzy, no-wrap msgid "" "# Comment\n" @@ -1161,7 +1182,7 @@ msgstr "" " will run more slowly, however.)\n" # type: Plain text -#: ../../man/deb-control.5:209 +#: ../../man/deb-control.5:217 msgid "B(5), B(1), B(1)." msgstr "B(5), B(1), B(1)." @@ -2840,7 +2861,12 @@ msgstr "" "dependencias." # type: Plain text -#: ../../man/dpkg.1:378 +#: ../../man/dpkg.1:377 +msgid "B: Install, even if this would break another package." +msgstr "" + +# type: Plain text +#: ../../man/dpkg.1:381 #, fuzzy msgid "" "B: Install, even if it conflicts with another package. This is " @@ -2850,7 +2876,7 @@ msgstr "" "opción es peligrosa, dado que generalmente sobreescribirá algunos ficheros." # type: Plain text -#: ../../man/dpkg.1:383 +#: ../../man/dpkg.1:386 #, fuzzy msgid "" "B: Always install a missing configuration file. This is dangerous, " @@ -2860,7 +2886,7 @@ msgstr "" "peligroso porque no guarda los cambios (el borrado) hechos al fichero." # type: Plain text -#: ../../man/dpkg.1:388 +#: ../../man/dpkg.1:391 #, fuzzy msgid "" "B: If a conffile has been modified always install the new version " @@ -2872,7 +2898,7 @@ msgstr "" "la opción --force-confdef, en cuyo caso se toma la acción por omisión." # type: Plain text -#: ../../man/dpkg.1:393 +#: ../../man/dpkg.1:396 #, fuzzy msgid "" "B: If a conffile has been modified always keep the old version " @@ -2885,7 +2911,7 @@ msgstr "" "omisión." # type: Plain text -#: ../../man/dpkg.1:399 +#: ../../man/dpkg.1:402 #, fuzzy msgid "" "B: If a conffile has been modified always choose the default " @@ -2899,20 +2925,20 @@ msgstr "" "cuyo caso se usará esta opción para tomar la decisión final." # type: Plain text -#: ../../man/dpkg.1:402 +#: ../../man/dpkg.1:405 #, fuzzy msgid "B: Overwrite one package's file with another's file." msgstr "B: Sobreescribe un fichero de un paquete con otro fichero." # type: Plain text -#: ../../man/dpkg.1:405 +#: ../../man/dpkg.1:408 #, fuzzy msgid "B Overwrite one package's directory with another's file." msgstr "" "B: Sobreescribe un directorio de un paquete con otro fichero." # type: Plain text -#: ../../man/dpkg.1:408 +#: ../../man/dpkg.1:411 #, fuzzy msgid "" "B: Overwrite a diverted file with an undiverted version." @@ -2921,7 +2947,7 @@ msgstr "" "una no desviada." # type: Plain text -#: ../../man/dpkg.1:411 +#: ../../man/dpkg.1:414 #, fuzzy msgid "B: Process even packages with the wrong architecture." msgstr "" @@ -2929,7 +2955,7 @@ msgstr "" "adecuada." # type: Plain text -#: ../../man/dpkg.1:414 +#: ../../man/dpkg.1:417 #, fuzzy msgid "" "B: B is missing important programs, so problems are likely." @@ -2938,13 +2964,13 @@ msgstr "" "bastante posible que haya problemas." # type: Plain text -#: ../../man/dpkg.1:417 +#: ../../man/dpkg.1:420 #, fuzzy msgid "B: Try to (de)install things even when not root." msgstr "B: Intentar la (des)instalación incluso si no se es root." # type: Plain text -#: ../../man/dpkg.1:420 +#: ../../man/dpkg.1:423 #, fuzzy msgid "B: Install a package even if it fails authenticity check." msgstr "" @@ -2952,13 +2978,13 @@ msgstr "" "autenticidad." # type: TP -#: ../../man/dpkg.1:421 +#: ../../man/dpkg.1:424 #, fuzzy, no-wrap msgid "B<--ignore-depends>=I,..." msgstr "B<--ignore-depends>=I,..." # type: Plain text -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, fuzzy msgid "" "Ignore dependency-checking for specified packages (actually, checking is " @@ -2969,13 +2995,13 @@ msgstr "" "abortar el proceso)." # type: TP -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, fuzzy, no-wrap msgid "B<--new>, B<--old>" msgstr "B<--new> | B<--old>" # type: Plain text -#: ../../man/dpkg.1:429 +#: ../../man/dpkg.1:432 #, fuzzy msgid "" "Select new or old binary package format. This is a B(1) option." @@ -2984,13 +3010,13 @@ msgstr "" "(1)." # type: TP -#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211 +#: ../../man/dpkg.1:432 ../../man/dpkg-deb.1:211 #, fuzzy, no-wrap msgid "B<--nocheck>" msgstr "B<--nocheck>" # type: Plain text -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, fuzzy msgid "" "Don't read or check contents of control file while building a package. This " @@ -3000,13 +3026,13 @@ msgstr "" "construye el paquete. Es una opción de B(1)." # type: TP -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, fuzzy, no-wrap msgid "B<--no-act>, B<--dry-run>, B<--simulate>" msgstr "B<--no-act> | B<--dry-run> | B<--simulate>" # type: Plain text -#: ../../man/dpkg.1:438 +#: ../../man/dpkg.1:441 #, fuzzy msgid "" "Do everything which is supposed to be done, but don't write any changes. " @@ -3018,7 +3044,7 @@ msgstr "" "cambiar nada." # type: Plain text -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, fuzzy msgid "" "Be sure to give B<--no-act> before the action-parameter, or you might end up " @@ -3032,13 +3058,13 @@ msgstr "" "act, ¡aunque probablemente usted esperara que no hiciera nada!)." # type: TP -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, fuzzy, no-wrap msgid "B<-R>, B<--recursive>" msgstr "B<-R> | B<--recursive>" # type: Plain text -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, fuzzy msgid "" "Recursively handle all regular files matching pattern B<*.deb> found at " @@ -3051,13 +3077,13 @@ msgstr "" "B<--unpack> y B<--avail>." # type: TP -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, fuzzy, no-wrap msgid "B<-G>" msgstr "B<-G>" # type: Plain text -#: ../../man/dpkg.1:453 +#: ../../man/dpkg.1:456 #, fuzzy msgid "" "Don't install a package if a newer version of the same package is already " @@ -3067,7 +3093,7 @@ msgstr "" "mismo que B<--refuse-downgrade>." # type: TP -#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 +#: ../../man/dpkg.1:456 ../../man/dpkg-buildpackage.1:168 #: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 #: ../../man/dpkg-shlibdeps.1:105 #, fuzzy, no-wrap @@ -3075,7 +3101,7 @@ msgid "B<--admindir=>I" msgstr "B<--admindir> I" # type: Plain text -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 msgid "" "Change default administrative directory, which contains many files that give " "information about status of installed or uninstalled packages, etc. " @@ -3083,13 +3109,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 #, fuzzy, no-wrap msgid "B<--instdir=>I" msgstr "B<--admindir> I" # type: Plain text -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy msgid "" "Change default installation directory which refers to the directory where " @@ -3107,26 +3133,26 @@ msgstr "" "cambia a su vez B a I y B a IB." # type: TP -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy, no-wrap msgid "B<--root=>I" msgstr "B<--admindir> I" # type: Plain text -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 msgid "" "Changing B changes B to I and B to IB." msgstr "" # type: TP -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 #, fuzzy, no-wrap msgid "B<-O>, B<--selected-only>" msgstr "B<-O> | B<--selected-only>" # type: Plain text -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, fuzzy msgid "" "Only process the packages that are selected for installation. The actual " @@ -3139,13 +3165,13 @@ msgstr "" "Por ejemplo, si se borra uno, se marcará como elegido para desinstalar." # type: TP -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, fuzzy, no-wrap msgid "B<-E>, B<--skip-same-version>" msgstr "B<-E> | B<--skip-same-version>" # type: Plain text -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, fuzzy msgid "" "Don't install the package if the same version of the package is already " @@ -3155,13 +3181,13 @@ msgstr "" "instalada." # type: TP -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, fuzzy, no-wrap msgid "B<--status-fd >InE>" msgstr "B<--status-fd >InE>" # type: Plain text -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, fuzzy msgid "" "Send package status info to file descriptor InE>. This can be " @@ -3176,13 +3202,13 @@ msgstr "" "EpkgE: Epkg qstateE»." # type: TP -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, fuzzy, no-wrap msgid "B<--log=>I" msgstr "B<--log=>I" # type: Plain text -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 msgid "" "Log status change updates and actions to I, instead of the default " "I. If this option is given multiple times, the last " @@ -3196,41 +3222,41 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, no-wrap msgid "B<--no-debsig>" msgstr "B<--no-debsig>" # type: Plain text -#: ../../man/dpkg.1:501 +#: ../../man/dpkg.1:504 msgid "Do not try to verify package signatures." msgstr "" # type: TP -#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14 +#: ../../man/dpkg.1:506 ../../man/dpkg.cfg.5:14 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, fuzzy msgid "Configuration file with default options." msgstr "Fichero de configuración con las opciones por omisión." # type: TP -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:510 +#: ../../man/dpkg.1:513 msgid "Default log file (see I(5) and option B<--log>)." msgstr "" # type: Plain text -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, fuzzy msgid "" "The other files listed below are in their default directories, see option " @@ -3241,25 +3267,25 @@ msgstr "" "ficheros." # type: TP -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, fuzzy msgid "List of available packages." msgstr "Lista de paquetes disponibles." # type: TP -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:522 +#: ../../man/dpkg.1:525 #, fuzzy msgid "" "Statuses of available packages. This file contains information about whether " @@ -3271,7 +3297,7 @@ msgstr "" "Véase el apartado B para más información." # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, fuzzy msgid "" "The following files are components of a binary package. See B(5) for " @@ -3281,55 +3307,55 @@ msgstr "" "(5) para más información sobre éstos:" # type: TP -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:527 +#: ../../man/dpkg.1:530 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:529 +#: ../../man/dpkg.1:532 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:531 +#: ../../man/dpkg.1:534 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:533 +#: ../../man/dpkg.1:536 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:535 +#: ../../man/dpkg.1:538 #, no-wrap msgid "I" msgstr "I" # type: SH -#: ../../man/dpkg.1:538 +#: ../../man/dpkg.1:541 #, fuzzy, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "VARIABLES DE ENTORNO" # type: TP -#: ../../man/dpkg.1:539 +#: ../../man/dpkg.1:542 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, fuzzy msgid "" "Define this to something if you prefer B starting a new shell rather " @@ -3340,25 +3366,25 @@ msgstr "" "intérprete de órdenes." # type: TP -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:546 +#: ../../man/dpkg.1:549 #, fuzzy msgid "The program B will execute when starting a new shell." msgstr "El programa que ejecutará B cuando arranque el nuevo intérprete." # type: TP -#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144 +#: ../../man/dpkg.1:549 ../../man/dpkg-query.1:145 #, fuzzy, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:550 +#: ../../man/dpkg.1:553 #, fuzzy msgid "" "Sets the number of columns B should use when displaying formatted " @@ -3368,7 +3394,7 @@ msgstr "" "información. Por ahora sólo la usa la opción -l." # type: SH -#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 +#: ../../man/dpkg.1:554 ../../man/dpkg-architecture.1:246 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 #: ../../man/update-alternatives.8:356 #, fuzzy, no-wrap @@ -3376,55 +3402,55 @@ msgid "EXAMPLES" msgstr "EJEMPLOS" # type: Plain text -#: ../../man/dpkg.1:553 +#: ../../man/dpkg.1:556 #, fuzzy msgid "To list packages related to the editor B(1):" msgstr "Para listar los paquetes con «vi» en su nombre:" # type: Plain text -#: ../../man/dpkg.1:555 +#: ../../man/dpkg.1:558 #, fuzzy, no-wrap msgid " B\n" msgstr "B< dpkg -l '*vi*'>" # type: Plain text -#: ../../man/dpkg.1:558 +#: ../../man/dpkg.1:561 #, fuzzy msgid "To see the entries in I of two packages:" msgstr "" "Para ver las entradas en I de varios paquetes:" # type: Plain text -#: ../../man/dpkg.1:560 +#: ../../man/dpkg.1:563 #, fuzzy, no-wrap msgid " B\n" msgstr "B< dpkg --print-avail elvis vim | less>" # type: Plain text -#: ../../man/dpkg.1:563 +#: ../../man/dpkg.1:566 msgid "To search the listing of packages yourself:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:565 +#: ../../man/dpkg.1:568 #, fuzzy, no-wrap msgid " B\n" msgstr "B< less /var/lib/dpkg/available>" # type: Plain text -#: ../../man/dpkg.1:568 +#: ../../man/dpkg.1:571 #, fuzzy msgid "To remove an installed elvis package:" msgstr "Para borrar un paquete instalado llamado «elvis»:" # type: Plain text -#: ../../man/dpkg.1:570 +#: ../../man/dpkg.1:573 #, fuzzy, no-wrap msgid " B\n" msgstr "B< dpkg -r elvis>" # type: Plain text -#: ../../man/dpkg.1:575 +#: ../../man/dpkg.1:578 #, fuzzy msgid "" "To install a package, you first need to find it in an archive or CDROM. The " @@ -3435,7 +3461,7 @@ msgstr "" "está en el apartado «editors»:" # type: Plain text -#: ../../man/dpkg.1:578 +#: ../../man/dpkg.1:581 #, fuzzy, no-wrap msgid "" " B\n" @@ -3443,26 +3469,26 @@ msgid "" msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>" # type: Plain text -#: ../../man/dpkg.1:581 +#: ../../man/dpkg.1:584 #, fuzzy msgid "To make a local copy of the package selection states:" msgstr "Para hacer una copia local de los estados de la selección de paquetes:" # type: Plain text -#: ../../man/dpkg.1:583 +#: ../../man/dpkg.1:586 #, fuzzy, no-wrap msgid " Bmyselections>\n" msgstr "B< dpkg --get-selections Emis_selecciones>" # type: Plain text -#: ../../man/dpkg.1:587 +#: ../../man/dpkg.1:590 #, fuzzy msgid "" "You might transfer this file to another computer, and install it there with:" msgstr "Se podría copiar este fichero a otra máquina e instalarlo allí con:" # type: Plain text -#: ../../man/dpkg.1:590 +#: ../../man/dpkg.1:593 #, fuzzy, no-wrap msgid "" " B\n" @@ -3470,7 +3496,7 @@ msgid "" msgstr "B< dpkg --set-selections Emis_selecciones>" # type: Plain text -#: ../../man/dpkg.1:596 +#: ../../man/dpkg.1:599 #, fuzzy msgid "" "Note that this will not actually install or remove anything, but just set " @@ -3484,7 +3510,7 @@ msgstr "" "B y elija «Instalar»." # type: Plain text -#: ../../man/dpkg.1:599 +#: ../../man/dpkg.1:602 #, fuzzy msgid "" "Ordinarily, you will find that B(1) provides a more convenient way " @@ -3494,13 +3520,13 @@ msgstr "" "modificar los estados de selección de los paquetes." # type: SH -#: ../../man/dpkg.1:601 +#: ../../man/dpkg.1:604 #, fuzzy, no-wrap msgid "ADDITIONAL FUNCTIONALITY" msgstr "FUNCIONALIDAD ADICIONAL" # type: Plain text -#: ../../man/dpkg.1:604 +#: ../../man/dpkg.1:607 #, fuzzy msgid "" "Additional functionality can be gained by installing any of the following " @@ -3510,7 +3536,7 @@ msgstr "" "paquetes: I, I and I." # type: Plain text -#: ../../man/dpkg.1:614 +#: ../../man/dpkg.1:617 msgid "" "B(1), B(1), B(1), B(5), B" "(5), B(5), and B(8)." @@ -3519,14 +3545,14 @@ msgstr "" "(5), B(5), and B(8)." # type: Plain text -#: ../../man/dpkg.1:617 +#: ../../man/dpkg.1:620 #, fuzzy msgid "B<--no-act> usually gives less information than might be helpful." msgstr "" "Normalmente, la opción B<--no-act> da menos información de la que necesita." # type: SH -#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 +#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:191 #: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 #: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 @@ -3536,7 +3562,7 @@ msgid "AUTHORS" msgstr "AUTORES" # type: Plain text -#: ../../man/dpkg.1:622 +#: ../../man/dpkg.1:625 #, fuzzy, no-wrap msgid "" "See I for the list of people who have\n" @@ -4269,7 +4295,7 @@ msgstr "" # type: Plain text #: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 -#: ../../man/dpkg-query.1:160 ../../man/dpkg-statoverride.8:80 +#: ../../man/dpkg-query.1:161 ../../man/dpkg-statoverride.8:80 msgid "B(1)." msgstr "B(1)." @@ -6580,7 +6606,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:129 +#: ../../man/dpkg-query.1:130 #, no-wrap msgid "" " B\n" @@ -6588,6 +6614,7 @@ msgid "" " B\n" " B\n" " B\n" +" B\n" " B\n" " B\n" " B\n" @@ -6614,7 +6641,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:137 +#: ../../man/dpkg-query.1:138 msgid "" "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq. " "Actually, all other fields found in the status file (i.e. user defined " @@ -6624,38 +6651,38 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:141 +#: ../../man/dpkg-query.1:142 #, no-wrap msgid " B\n" msgstr "" # type: SH -#: ../../man/dpkg-query.1:143 +#: ../../man/dpkg-query.1:144 #, fuzzy, no-wrap msgid "ENVIRONMENT" msgstr "VARIABLES DE ENTORNO" # type: Plain text -#: ../../man/dpkg-query.1:148 +#: ../../man/dpkg-query.1:149 msgid "" "This setting influences the output of the B<--list> option by changing the " "width of its output." msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:151 +#: ../../man/dpkg-query.1:152 #, fuzzy msgid "Copyright (C) 2001 Wichert Akkerman" msgstr "Copyright (C) 2000 Wichert Akkerman" # type: UR -#: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83 +#: ../../man/dpkg-query.1:152 ../../man/dpkg-statoverride.8:83 #, fuzzy, no-wrap msgid "mailto:wakkerma@debian.org" msgstr "mailto:wakkerma@debian.org" # type: Plain text -#: ../../man/dpkg-query.1:153 ../../man/dpkg-statoverride.8:85 +#: ../../man/dpkg-query.1:154 ../../man/dpkg-statoverride.8:85 #, fuzzy msgid "Ewakkerma@debian.orgE" msgstr "Ewakkerma@debian.orgE" @@ -11510,8 +11537,10 @@ msgstr "B(1), FHS, el est # type: TP #, fuzzy -#~ msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>" -#~ msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> con B<-b>" +#~ msgid "" +#~ "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>" +#~ msgstr "" +#~ "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> con B<-b>" # type: TP #, fuzzy diff --git a/man/po/fr.po b/man/po/fr.po index 0e267f44..82f8ee47 100644 --- a/man/po/fr.po +++ b/man/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg man pages\n" -"POT-Creation-Date: 2007-07-21 16:13+0300\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: 2007-05-17 03:10+0200\n" "Last-Translator: Nicolas François \n" "Language-Team: French \n" @@ -175,7 +175,7 @@ msgstr "B<822-date> ne prend aucun param # type: SH #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 -#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 +#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:618 #: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 #: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427 @@ -191,13 +191,13 @@ msgstr "Cette fonctionnalit # type: SH #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 -#: ../../man/deb-control.5:206 ../../man/deb-old.5:51 +#: ../../man/deb-control.5:214 ../../man/deb-old.5:51 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 -#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 +#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 #: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 #: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 -#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 +#: ../../man/dpkg-query.1:159 ../../man/dpkg-scanpackages.1:95 #: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 #: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 #: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 @@ -219,7 +219,7 @@ msgstr "" #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 -#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 +#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:150 #: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 #: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 #: ../../man/install-info.8:291 ../../man/update-alternatives.8:392 @@ -389,7 +389,7 @@ msgstr "Affiche le num # type: SH #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 -#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 +#: ../../man/dpkg.1:505 ../../man/dpkg.cfg.5:12 #: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 #: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 #: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 @@ -436,7 +436,7 @@ msgstr "Copyright (C) 1996 Kim-Minh Kaplan." #: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 #: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 #: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 -#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 +#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:158 #: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 #: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 #: ../../man/install-info.8:295 ../../man/update-alternatives.8:397 @@ -960,12 +960,33 @@ msgstr "" # type: TP #: ../../man/deb-control.5:138 +#, fuzzy, no-wrap +msgid "B Epackage listE" +msgstr "B Eliste de paquetsE" + +# type: Plain text +#: ../../man/deb-control.5:146 +#, fuzzy +msgid "" +"Lists packages that this one breaks, for example by exposing bugs when the " +"named packages rely on this one. The package maintenance software will not " +"allow broken packages to be configured; generally the resolution is to " +"upgrade the packages named in a B field." +msgstr "" +"C'est une liste de paquets qui sont en conflit avec ce paquet\\ ; ils " +"contiennent par exemple des fichiers qui ont le même nom. Le programme de " +"maintenance des paquets interdit l'installation simultanée de paquets en " +"conflit. Deux paquets en conflit renseigneront une ligne B avec " +"le nom de l'autre paquet." + +# type: TP +#: ../../man/deb-control.5:146 #, no-wrap msgid "B Epackage listE" msgstr "B Eliste de paquetsE" # type: Plain text -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 msgid "" "Lists packages that conflict with this one, for example by containing files " "with the same names. The package maintenance software will not allow " @@ -979,13 +1000,13 @@ msgstr "" "le nom de l'autre paquet." # type: TP -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, no-wrap msgid "B Epackage listE" msgstr "B Eliste de paquetsE" # type: Plain text -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 msgid "" "List of packages files from which this one replaces. This is used for " "allowing this package to overwrite the files of another package and is " @@ -998,13 +1019,13 @@ msgstr "" "possède aussi les mêmes fichiers que le paquet en conflit." # type: TP -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, no-wrap msgid "B Epackage listE" msgstr "B Eliste de paquetsE" # type: Plain text -#: ../../man/deb-control.5:164 +#: ../../man/deb-control.5:172 msgid "" "This is a list of virtual packages that this one provides. Usually this is " "used in the case of several packages all providing the same service. For " @@ -1025,7 +1046,7 @@ msgstr "" "à utiliser « | » comme séparateur de liste." # type: Plain text -#: ../../man/deb-control.5:179 +#: ../../man/deb-control.5:187 msgid "" "The syntax of B, B and B is a list of package " "names, separated by commas (and optional whitespace). In the B " @@ -1040,13 +1061,13 @@ msgstr "" "champs B et B." # type: SH -#: ../../man/deb-control.5:180 +#: ../../man/deb-control.5:188 #, no-wrap msgid "EXAMPLE" msgstr "EXEMPLE" # type: Plain text -#: ../../man/deb-control.5:203 +#: ../../man/deb-control.5:211 #, no-wrap msgid "" "# Comment\n" @@ -1095,7 +1116,7 @@ msgstr "" " ralentissent cependant le programme.)\n" # type: Plain text -#: ../../man/deb-control.5:209 +#: ../../man/deb-control.5:217 msgid "B(5), B(1), B(1)." msgstr "B(5), B(1), B(1)." @@ -2699,7 +2720,12 @@ msgstr "" "B\\ : Ignore les versions dans les questions de dépendance." # type: Plain text -#: ../../man/dpkg.1:378 +#: ../../man/dpkg.1:377 +msgid "B: Install, even if this would break another package." +msgstr "" + +# type: Plain text +#: ../../man/dpkg.1:381 msgid "" "B: Install, even if it conflicts with another package. This is " "dangerous, for it will usually cause overwriting of some files." @@ -2709,7 +2735,7 @@ msgstr "" "certains fichiers." # type: Plain text -#: ../../man/dpkg.1:383 +#: ../../man/dpkg.1:386 msgid "" "B: Always install a missing configuration file. This is dangerous, " "since it means not preserving a change (removing) made to the file." @@ -2719,7 +2745,7 @@ msgstr "" "seront pas préservés (suppression)." # type: Plain text -#: ../../man/dpkg.1:388 +#: ../../man/dpkg.1:391 msgid "" "B: If a conffile has been modified always install the new version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2730,7 +2756,7 @@ msgstr "" "est aussi présente, auquel cas l'action par défaut est choisie." # type: Plain text -#: ../../man/dpkg.1:393 +#: ../../man/dpkg.1:396 msgid "" "B: If a conffile has been modified always keep the old version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2741,7 +2767,7 @@ msgstr "" "présente, auquel cas l'action par défaut est choisie." # type: Plain text -#: ../../man/dpkg.1:399 +#: ../../man/dpkg.1:402 msgid "" "B: If a conffile has been modified always choose the default " "action. If there is no default action it will stop to ask the user unless " @@ -2755,19 +2781,19 @@ msgstr "" "ces options pour déterminer ce qu'il faut faire." # type: Plain text -#: ../../man/dpkg.1:402 +#: ../../man/dpkg.1:405 msgid "B: Overwrite one package's file with another's file." msgstr "B\\ : Remplace un fichier par un fichier d'un autre paquet." # type: Plain text -#: ../../man/dpkg.1:405 +#: ../../man/dpkg.1:408 msgid "B Overwrite one package's directory with another's file." msgstr "" "B\\ : Remplace un répertoire par un répertoire d'un autre " "paquet." # type: Plain text -#: ../../man/dpkg.1:408 +#: ../../man/dpkg.1:411 msgid "" "B: Overwrite a diverted file with an undiverted version." msgstr "" @@ -2775,12 +2801,12 @@ msgstr "" "détournée." # type: Plain text -#: ../../man/dpkg.1:411 +#: ../../man/dpkg.1:414 msgid "B: Process even packages with the wrong architecture." msgstr "B\\ : Traite même les paquets d'une autre architecture" # type: Plain text -#: ../../man/dpkg.1:414 +#: ../../man/dpkg.1:417 msgid "" "B: B is missing important programs, so problems are likely." msgstr "" @@ -2788,25 +2814,25 @@ msgstr "" "ce qui va poser des problèmes." # type: Plain text -#: ../../man/dpkg.1:417 +#: ../../man/dpkg.1:420 msgid "B: Try to (de)install things even when not root." msgstr "B\\ : Tente de (dés)installer même sans être root." # type: Plain text -#: ../../man/dpkg.1:420 +#: ../../man/dpkg.1:423 msgid "B: Install a package even if it fails authenticity check." msgstr "" "B\\ : Installe un paquet même si la vérification de son " "authenticité a échoué." # type: TP -#: ../../man/dpkg.1:421 +#: ../../man/dpkg.1:424 #, no-wrap msgid "B<--ignore-depends>=I,..." msgstr "B<--ignore-depends>=I,..." # type: Plain text -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 msgid "" "Ignore dependency-checking for specified packages (actually, checking is " "performed, but only warnings about conflicts are given, nothing else)." @@ -2816,13 +2842,13 @@ msgstr "" "que des avertissements)." # type: TP -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, fuzzy, no-wrap msgid "B<--new>, B<--old>" msgstr "B<--new> | B<--old>" # type: Plain text -#: ../../man/dpkg.1:429 +#: ../../man/dpkg.1:432 msgid "" "Select new or old binary package format. This is a B(1) option." msgstr "" @@ -2830,13 +2856,13 @@ msgstr "" "une option de B(1)." # type: TP -#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211 +#: ../../man/dpkg.1:432 ../../man/dpkg-deb.1:211 #, no-wrap msgid "B<--nocheck>" msgstr "B<--nocheck>" # type: Plain text -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 msgid "" "Don't read or check contents of control file while building a package. This " "is a B(1) option." @@ -2845,13 +2871,13 @@ msgstr "" "construction d'un paquet. C'est une option de B(1)." # type: TP -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, fuzzy, no-wrap msgid "B<--no-act>, B<--dry-run>, B<--simulate>" msgstr "B<--no-act> | B<--dry-run> | B<--simulate>" # type: Plain text -#: ../../man/dpkg.1:438 +#: ../../man/dpkg.1:441 msgid "" "Do everything which is supposed to be done, but don't write any changes. " "This is used to see what would happen with the specified action, without " @@ -2862,7 +2888,7 @@ msgstr "" "soit." # type: Plain text -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 msgid "" "Be sure to give B<--no-act> before the action-parameter, or you might end up " "with undesirable results. (e.g. B will first " @@ -2875,13 +2901,13 @@ msgstr "" "le paquet --no-act, même si vous comptiez qu'elle ne ferait rien du tout." # type: TP -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, fuzzy, no-wrap msgid "B<-R>, B<--recursive>" msgstr "B<-R> | B<--recursive>" # type: Plain text -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 msgid "" "Recursively handle all regular files matching pattern B<*.deb> found at " "specified directories and all of its subdirectories. This can be used with " @@ -2893,13 +2919,13 @@ msgstr "" "install>, B<--unpack> et B<--avail>." # type: TP -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, no-wrap msgid "B<-G>" msgstr "B<-G>" # type: Plain text -#: ../../man/dpkg.1:453 +#: ../../man/dpkg.1:456 msgid "" "Don't install a package if a newer version of the same package is already " "installed. This is an alias of B<--refuse-downgrade>." @@ -2908,7 +2934,7 @@ msgstr "" "installée. C'est un alias pour B<--refuse-downgrade>." # type: TP -#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 +#: ../../man/dpkg.1:456 ../../man/dpkg-buildpackage.1:168 #: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 #: ../../man/dpkg-shlibdeps.1:105 #, no-wrap @@ -2916,7 +2942,7 @@ msgid "B<--admindir=>I" msgstr "B<--admindir>=I" # type: Plain text -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 msgid "" "Change default administrative directory, which contains many files that give " "information about status of installed or uninstalled packages, etc. " @@ -2924,13 +2950,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 #, fuzzy, no-wrap msgid "B<--instdir=>I" msgstr "B<--admindir>=I" # type: Plain text -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy msgid "" "Change default installation directory which refers to the directory where " @@ -2948,26 +2974,26 @@ msgstr "" "B change B en I et B en IB." # type: TP -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy, no-wrap msgid "B<--root=>I" msgstr "B<--admindir>=I" # type: Plain text -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 msgid "" "Changing B changes B to I and B to IB." msgstr "" # type: TP -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 #, fuzzy, no-wrap msgid "B<-O>, B<--selected-only>" msgstr "B<-O> | B<--selected-only>" # type: Plain text -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 msgid "" "Only process the packages that are selected for installation. The actual " "marking is done with B or by B, when it handles packages. For " @@ -2980,13 +3006,13 @@ msgstr "" "marqué comme ayant été sélectionné pour une désinstallation." # type: TP -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, fuzzy, no-wrap msgid "B<-E>, B<--skip-same-version>" msgstr "B<-E> | B<--skip-same-version>" # type: Plain text -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 msgid "" "Don't install the package if the same version of the package is already " "installed." @@ -2994,13 +3020,13 @@ msgstr "" "Ne pas installer le paquet si la même version du paquet est déjà installée." # type: TP -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, no-wrap msgid "B<--status-fd >InE>" msgstr "B<--status-fd >InE>" # type: Plain text -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 msgid "" "Send package status info to file descriptor InE>. This can be " "given multiple times. Status updates are of the form `status: EpkgE: " @@ -3018,13 +3044,13 @@ msgstr "" "conffile : 'current-conffile' 'new-conffile' useredited distedited" # type: TP -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, no-wrap msgid "B<--log=>I" msgstr "B<--log=>I" # type: Plain text -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 msgid "" "Log status change updates and actions to I, instead of the default " "I. If this option is given multiple times, the last " @@ -3050,42 +3076,42 @@ msgstr "" "soit keep." # type: TP -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, no-wrap msgid "B<--no-debsig>" msgstr "B<--no-debsig>" # type: Plain text -#: ../../man/dpkg.1:501 +#: ../../man/dpkg.1:504 msgid "Do not try to verify package signatures." msgstr "Ne pas tenter de vérifier la signature des paquets." # type: TP -#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14 +#: ../../man/dpkg.1:506 ../../man/dpkg.cfg.5:14 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 msgid "Configuration file with default options." msgstr "Fichier de configuration contenant les options par défaut." # type: TP -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:510 +#: ../../man/dpkg.1:513 msgid "Default log file (see I(5) and option B<--log>)." msgstr "" "Fichier journal standard. Voyez I(5) et l'option B<--" "log>." # type: Plain text -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 msgid "" "The other files listed below are in their default directories, see option " "B<--admindir> to see how to change locations of these files." @@ -3095,24 +3121,24 @@ msgstr "" "fichiers." # type: TP -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 msgid "List of available packages." msgstr "Liste des paquets disponibles." # type: TP -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:522 +#: ../../man/dpkg.1:525 msgid "" "Statuses of available packages. This file contains information about whether " "a package is marked for removing or not, whether it is installed or not, " @@ -3124,7 +3150,7 @@ msgstr "" "LES PAQUETS> pour des informations supplémentaires." # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 msgid "" "The following files are components of a binary package. See B(5) for " "more information about them:" @@ -3133,55 +3159,55 @@ msgstr "" "des informations supplémentaires :" # type: TP -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:527 +#: ../../man/dpkg.1:530 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:529 +#: ../../man/dpkg.1:532 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:531 +#: ../../man/dpkg.1:534 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:533 +#: ../../man/dpkg.1:536 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:535 +#: ../../man/dpkg.1:538 #, no-wrap msgid "I" msgstr "I" # type: SH -#: ../../man/dpkg.1:538 +#: ../../man/dpkg.1:541 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "VARIABLES D'ENVIRONNEMENT" # type: TP -#: ../../man/dpkg.1:539 +#: ../../man/dpkg.1:542 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 msgid "" "Define this to something if you prefer B starting a new shell rather " "than suspending itself, while doing a shell escape." @@ -3191,26 +3217,26 @@ msgstr "" "l'interpréteur de commandes." # type: TP -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:546 +#: ../../man/dpkg.1:549 msgid "The program B will execute when starting a new shell." msgstr "" "Le programme exécuté par B quand il lance un nouvel interpréteur de " "commandes." # type: TP -#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144 +#: ../../man/dpkg.1:549 ../../man/dpkg-query.1:145 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:550 +#: ../../man/dpkg.1:553 msgid "" "Sets the number of columns B should use when displaying formatted " "text. Currently only used by -l." @@ -3219,7 +3245,7 @@ msgstr "" "formaté. Seule l'action B<-l> se sert actuellement de cette variable." # type: SH -#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 +#: ../../man/dpkg.1:554 ../../man/dpkg-architecture.1:246 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 #: ../../man/update-alternatives.8:356 #, no-wrap @@ -3227,53 +3253,53 @@ msgid "EXAMPLES" msgstr "EXEMPLES" # type: Plain text -#: ../../man/dpkg.1:553 +#: ../../man/dpkg.1:556 msgid "To list packages related to the editor B(1):" msgstr "Pour afficher les paquets liés au programme B(1) :" # type: Plain text -#: ../../man/dpkg.1:555 +#: ../../man/dpkg.1:558 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:558 +#: ../../man/dpkg.1:561 msgid "To see the entries in I of two packages:" msgstr "" "Pour voir les entrées de I concernant deux paquets" "\\ :" # type: Plain text -#: ../../man/dpkg.1:560 +#: ../../man/dpkg.1:563 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:563 +#: ../../man/dpkg.1:566 msgid "To search the listing of packages yourself:" msgstr "Pour rechercher vous-même dans la liste des paquets\\ :" # type: Plain text -#: ../../man/dpkg.1:565 +#: ../../man/dpkg.1:568 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:568 +#: ../../man/dpkg.1:571 msgid "To remove an installed elvis package:" msgstr "Pour supprimer le paquet installé elvis\\ :" # type: Plain text -#: ../../man/dpkg.1:570 +#: ../../man/dpkg.1:573 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:575 +#: ../../man/dpkg.1:578 msgid "" "To install a package, you first need to find it in an archive or CDROM. The " "\"available\" file shows that the vim package is in section \"editors\":" @@ -3283,7 +3309,7 @@ msgstr "" "trouve dans la section «\\ editors\\ » :" # type: Plain text -#: ../../man/dpkg.1:578 +#: ../../man/dpkg.1:581 #, no-wrap msgid "" " B\n" @@ -3293,18 +3319,18 @@ msgstr "" " B< dpkg -i vim_4.5-3.deb>\n" # type: Plain text -#: ../../man/dpkg.1:581 +#: ../../man/dpkg.1:584 msgid "To make a local copy of the package selection states:" msgstr "Pour faire une copie locale des états de sélection des paquets :" # type: Plain text -#: ../../man/dpkg.1:583 +#: ../../man/dpkg.1:586 #, no-wrap msgid " Bmyselections>\n" msgstr " Bmyselections>\n" # type: Plain text -#: ../../man/dpkg.1:587 +#: ../../man/dpkg.1:590 msgid "" "You might transfer this file to another computer, and install it there with:" msgstr "" @@ -3312,7 +3338,7 @@ msgstr "" "de cette manière :" # type: Plain text -#: ../../man/dpkg.1:590 +#: ../../man/dpkg.1:593 #, no-wrap msgid "" " B\n" @@ -3322,7 +3348,7 @@ msgstr "" " Bmyselections>\n" # type: Plain text -#: ../../man/dpkg.1:596 +#: ../../man/dpkg.1:599 #, fuzzy msgid "" "Note that this will not actually install or remove anything, but just set " @@ -3336,7 +3362,7 @@ msgstr "" "requis. Par exemple, exécutez B et choisissez Install." # type: Plain text -#: ../../man/dpkg.1:599 +#: ../../man/dpkg.1:602 msgid "" "Ordinarily, you will find that B(1) provides a more convenient way " "to modify the package selection states." @@ -3345,13 +3371,13 @@ msgstr "" "aisée de modifier les états de sélection des paquets." # type: SH -#: ../../man/dpkg.1:601 +#: ../../man/dpkg.1:604 #, no-wrap msgid "ADDITIONAL FUNCTIONALITY" msgstr "FONCTIONNALITÉS SUPPLÉMENTAIRES" # type: Plain text -#: ../../man/dpkg.1:604 +#: ../../man/dpkg.1:607 #, fuzzy msgid "" "Additional functionality can be gained by installing any of the following " @@ -3361,7 +3387,7 @@ msgstr "" "I, I et I." # type: Plain text -#: ../../man/dpkg.1:614 +#: ../../man/dpkg.1:617 msgid "" "B(1), B(1), B(1), B(5), B" "(5), B(5), and B(8)." @@ -3370,12 +3396,12 @@ msgstr "" "(5), B(5) et B(8)" # type: Plain text -#: ../../man/dpkg.1:617 +#: ../../man/dpkg.1:620 msgid "B<--no-act> usually gives less information than might be helpful." msgstr "L'option B<--no-act> ne donne pas assez d'informations utiles." # type: SH -#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 +#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:191 #: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 #: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 @@ -3385,7 +3411,7 @@ msgid "AUTHORS" msgstr "AUTEURS" # type: Plain text -#: ../../man/dpkg.1:622 +#: ../../man/dpkg.1:625 #, no-wrap msgid "" "See I for the list of people who have\n" @@ -4242,7 +4268,7 @@ msgstr "" # type: Plain text #: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 -#: ../../man/dpkg-query.1:160 ../../man/dpkg-statoverride.8:80 +#: ../../man/dpkg-query.1:161 ../../man/dpkg-statoverride.8:80 msgid "B(1)." msgstr "B(1)." @@ -6523,14 +6549,15 @@ msgstr "" "suivants sont reconnus\\ :" # type: Plain text -#: ../../man/dpkg-query.1:129 -#, no-wrap +#: ../../man/dpkg-query.1:130 +#, fuzzy, no-wrap msgid "" " B\n" " B\n" " B\n" " B\n" " B\n" +" B\n" " B\n" " B\n" " B\n" @@ -6585,7 +6612,7 @@ msgstr "" " B\n" # type: Plain text -#: ../../man/dpkg-query.1:137 +#: ../../man/dpkg-query.1:138 msgid "" "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq. " "Actually, all other fields found in the status file (i.e. user defined " @@ -6600,19 +6627,19 @@ msgstr "" "le nom du responsable de dpkg et la version installée, exécutez par exemple :" # type: Plain text -#: ../../man/dpkg-query.1:141 +#: ../../man/dpkg-query.1:142 #, no-wrap msgid " B\n" msgstr "B\n" # type: SH -#: ../../man/dpkg-query.1:143 +#: ../../man/dpkg-query.1:144 #, no-wrap msgid "ENVIRONMENT" msgstr "ENVIRONNEMENT" # type: Plain text -#: ../../man/dpkg-query.1:148 +#: ../../man/dpkg-query.1:149 msgid "" "This setting influences the output of the B<--list> option by changing the " "width of its output." @@ -6621,19 +6648,19 @@ msgstr "" "modifiant la largeur d'affichage." # type: Plain text -#: ../../man/dpkg-query.1:151 +#: ../../man/dpkg-query.1:152 #, fuzzy msgid "Copyright (C) 2001 Wichert Akkerman" msgstr "Copyright (C) 2000 Wichert Akkerman" # type: UR -#: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83 +#: ../../man/dpkg-query.1:152 ../../man/dpkg-statoverride.8:83 #, no-wrap msgid "mailto:wakkerma@debian.org" msgstr "mailto:wakkerma@debian.org" # type: Plain text -#: ../../man/dpkg-query.1:153 ../../man/dpkg-statoverride.8:85 +#: ../../man/dpkg-query.1:154 ../../man/dpkg-statoverride.8:85 msgid "Ewakkerma@debian.orgE" msgstr "Ewakkerma@debian.orgE" @@ -11398,8 +11425,10 @@ msgstr "" #~ msgstr "Copyright 2001 Wichert Akkerman" # type: TP -#~ msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>" -#~ msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> avec B<-b>" +#~ msgid "" +#~ "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>" +#~ msgstr "" +#~ "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> avec B<-b>" # type: TP #~ msgid "B<-sp>,B<-su>,B<-sn> with B<-x>" diff --git a/man/po/hu.po b/man/po/hu.po index 142eaf02..b697adef 100644 --- a/man/po/hu.po +++ b/man/po/hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2007-07-21 16:13+0300\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: 2006-10-05 21:27+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian\n" @@ -167,7 +167,7 @@ msgstr "" # type: SH #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 -#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 +#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:618 #: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 #: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427 @@ -183,13 +183,13 @@ msgstr "" # type: SH #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 -#: ../../man/deb-control.5:206 ../../man/deb-old.5:51 +#: ../../man/deb-control.5:214 ../../man/deb-old.5:51 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 -#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 +#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 #: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 #: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 -#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 +#: ../../man/dpkg-query.1:159 ../../man/dpkg-scanpackages.1:95 #: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 #: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 #: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 @@ -209,7 +209,7 @@ msgstr "" #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 -#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 +#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:150 #: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 #: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 #: ../../man/install-info.8:291 ../../man/update-alternatives.8:392 @@ -358,7 +358,7 @@ msgstr "Kiírja a B verziószámát." # type: SH #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 -#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 +#: ../../man/dpkg.1:505 ../../man/dpkg.cfg.5:12 #: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 #: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 #: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 @@ -402,7 +402,7 @@ msgstr "" #: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 #: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 #: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 -#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 +#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:158 #: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 #: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 #: ../../man/install-info.8:295 ../../man/update-alternatives.8:397 @@ -867,12 +867,31 @@ msgstr "" # type: TP #: ../../man/deb-control.5:138 +#, fuzzy, no-wrap +msgid "B Epackage listE" +msgstr "B Ecsomag listaE" + +# type: Plain text +#: ../../man/deb-control.5:146 +#, fuzzy +msgid "" +"Lists packages that this one breaks, for example by exposing bugs when the " +"named packages rely on this one. The package maintenance software will not " +"allow broken packages to be configured; generally the resolution is to " +"upgrade the packages named in a B field." +msgstr "" +"Ütköző csomagok, például azonos nevű fájlokat tartalmazók. A " +"csomagkarbantartó szoftver nem engedi ezek egyidejű telepítését. 2 ütköző " +"csomag 1-1 B mezőben hivatkozik egymásra." + +# type: TP +#: ../../man/deb-control.5:146 #, no-wrap msgid "B Epackage listE" msgstr "B Ecsomag listaE" # type: Plain text -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 msgid "" "Lists packages that conflict with this one, for example by containing files " "with the same names. The package maintenance software will not allow " @@ -884,13 +903,13 @@ msgstr "" "csomag 1-1 B mezőben hivatkozik egymásra." # type: TP -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, no-wrap msgid "B Epackage listE" msgstr "B Ecsomag listaE" # type: Plain text -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 msgid "" "List of packages files from which this one replaces. This is used for " "allowing this package to overwrite the files of another package and is " @@ -903,13 +922,13 @@ msgstr "" "tartalmaz, mint az ütköző csomag." # type: TP -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, no-wrap msgid "B Epackage listE" msgstr "B Ecsomag listaE" # type: Plain text -#: ../../man/deb-control.5:164 +#: ../../man/deb-control.5:172 msgid "" "This is a list of virtual packages that this one provides. Usually this is " "used in the case of several packages all providing the same service. For " @@ -928,7 +947,7 @@ msgstr "" "levelező-kiszolgálót egy `|'-kkal elválasztott listában." # type: Plain text -#: ../../man/deb-control.5:179 +#: ../../man/deb-control.5:187 msgid "" "The syntax of B, B and B is a list of package " "names, separated by commas (and optional whitespace). In the B " @@ -941,13 +960,13 @@ msgstr "" "mezőben, a vessző `VAGY'. A verzió szintén megadható a már ismert módon." # type: SH -#: ../../man/deb-control.5:180 +#: ../../man/deb-control.5:188 #, no-wrap msgid "EXAMPLE" msgstr "PÉLDA" # type: Plain text -#: ../../man/deb-control.5:203 +#: ../../man/deb-control.5:211 #, fuzzy, no-wrap msgid "" "# Comment\n" @@ -992,7 +1011,7 @@ msgstr "" " will run more slowly, however.)\n" # type: Plain text -#: ../../man/deb-control.5:209 +#: ../../man/deb-control.5:217 msgid "B(5), B(1), B(1)." msgstr "B(5), B(1), B(1)." @@ -2298,21 +2317,26 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:378 +#: ../../man/dpkg.1:377 +msgid "B: Install, even if this would break another package." +msgstr "" + +# type: Plain text +#: ../../man/dpkg.1:381 msgid "" "B: Install, even if it conflicts with another package. This is " "dangerous, for it will usually cause overwriting of some files." msgstr "" # type: Plain text -#: ../../man/dpkg.1:383 +#: ../../man/dpkg.1:386 msgid "" "B: Always install a missing configuration file. This is dangerous, " "since it means not preserving a change (removing) made to the file." msgstr "" # type: Plain text -#: ../../man/dpkg.1:388 +#: ../../man/dpkg.1:391 msgid "" "B: If a conffile has been modified always install the new version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2320,7 +2344,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:393 +#: ../../man/dpkg.1:396 msgid "" "B: If a conffile has been modified always keep the old version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2328,7 +2352,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:399 +#: ../../man/dpkg.1:402 msgid "" "B: If a conffile has been modified always choose the default " "action. If there is no default action it will stop to ask the user unless " @@ -2337,88 +2361,88 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:402 +#: ../../man/dpkg.1:405 msgid "B: Overwrite one package's file with another's file." msgstr "" # type: Plain text -#: ../../man/dpkg.1:405 +#: ../../man/dpkg.1:408 msgid "B Overwrite one package's directory with another's file." msgstr "" # type: Plain text -#: ../../man/dpkg.1:408 +#: ../../man/dpkg.1:411 msgid "" "B: Overwrite a diverted file with an undiverted version." msgstr "" # type: Plain text -#: ../../man/dpkg.1:411 +#: ../../man/dpkg.1:414 msgid "B: Process even packages with the wrong architecture." msgstr "" # type: Plain text -#: ../../man/dpkg.1:414 +#: ../../man/dpkg.1:417 msgid "" "B: B is missing important programs, so problems are likely." msgstr "" # type: Plain text -#: ../../man/dpkg.1:417 +#: ../../man/dpkg.1:420 msgid "B: Try to (de)install things even when not root." msgstr "" # type: Plain text -#: ../../man/dpkg.1:420 +#: ../../man/dpkg.1:423 msgid "B: Install a package even if it fails authenticity check." msgstr "" # type: TP -#: ../../man/dpkg.1:421 +#: ../../man/dpkg.1:424 #, no-wrap msgid "B<--ignore-depends>=I,..." msgstr "" # type: Plain text -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 msgid "" "Ignore dependency-checking for specified packages (actually, checking is " "performed, but only warnings about conflicts are given, nothing else)." msgstr "" # type: TP -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, fuzzy, no-wrap msgid "B<--new>, B<--old>" msgstr "B<--info>, B<-I>" # type: Plain text -#: ../../man/dpkg.1:429 +#: ../../man/dpkg.1:432 msgid "" "Select new or old binary package format. This is a B(1) option." msgstr "" # type: TP -#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211 +#: ../../man/dpkg.1:432 ../../man/dpkg-deb.1:211 #, no-wrap msgid "B<--nocheck>" msgstr "B<--nocheck>" # type: Plain text -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 msgid "" "Don't read or check contents of control file while building a package. This " "is a B(1) option." msgstr "" # type: TP -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, no-wrap msgid "B<--no-act>, B<--dry-run>, B<--simulate>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:438 +#: ../../man/dpkg.1:441 msgid "" "Do everything which is supposed to be done, but don't write any changes. " "This is used to see what would happen with the specified action, without " @@ -2426,7 +2450,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 msgid "" "Be sure to give B<--no-act> before the action-parameter, or you might end up " "with undesirable results. (e.g. B will first " @@ -2435,13 +2459,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, fuzzy, no-wrap msgid "B<-R>, B<--recursive>" msgstr "B<--version>" # type: Plain text -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 msgid "" "Recursively handle all regular files matching pattern B<*.deb> found at " "specified directories and all of its subdirectories. This can be used with " @@ -2449,20 +2473,20 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, fuzzy, no-wrap msgid "B<-G>" msgstr "B<--new>" # type: Plain text -#: ../../man/dpkg.1:453 +#: ../../man/dpkg.1:456 msgid "" "Don't install a package if a newer version of the same package is already " "installed. This is an alias of B<--refuse-downgrade>." msgstr "" # type: TP -#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 +#: ../../man/dpkg.1:456 ../../man/dpkg-buildpackage.1:168 #: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 #: ../../man/dpkg-shlibdeps.1:105 #, no-wrap @@ -2470,7 +2494,7 @@ msgid "B<--admindir=>I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 msgid "" "Change default administrative directory, which contains many files that give " "information about status of installed or uninstalled packages, etc. " @@ -2478,13 +2502,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 #, fuzzy, no-wrap msgid "B<--instdir=>I" msgstr "B<--showformat=>I" # type: Plain text -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 msgid "" "Change default installation directory which refers to the directory where " "packages are to be installed. B is also the directory passed to " @@ -2493,26 +2517,26 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy, no-wrap msgid "B<--root=>I" msgstr "B<--field>, B<-f>" # type: Plain text -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 msgid "" "Changing B changes B to I and B to IB." msgstr "" # type: TP -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 #, fuzzy, no-wrap msgid "B<-O>, B<--selected-only>" msgstr "B<--info>, B<-I>" # type: Plain text -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 msgid "" "Only process the packages that are selected for installation. The actual " "marking is done with B or by B, when it handles packages. For " @@ -2521,26 +2545,26 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, fuzzy, no-wrap msgid "B<-E>, B<--skip-same-version>" msgstr "B<--version>" # type: Plain text -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 msgid "" "Don't install the package if the same version of the package is already " "installed." msgstr "" # type: TP -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, no-wrap msgid "B<--status-fd >InE>" msgstr "" # type: Plain text -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 msgid "" "Send package status info to file descriptor InE>. This can be " "given multiple times. Status updates are of the form `status: EpkgE: " @@ -2551,13 +2575,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, fuzzy, no-wrap msgid "B<--log=>I" msgstr "B<--licence>" # type: Plain text -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 msgid "" "Log status change updates and actions to I, instead of the default " "I. If this option is given multiple times, the last " @@ -2571,64 +2595,64 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, fuzzy, no-wrap msgid "B<--no-debsig>" msgstr "B<--new>" # type: Plain text -#: ../../man/dpkg.1:501 +#: ../../man/dpkg.1:504 msgid "Do not try to verify package signatures." msgstr "" # type: Plain text -#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14 +#: ../../man/dpkg.1:506 ../../man/dpkg.cfg.5:14 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 msgid "Configuration file with default options." msgstr "" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, fuzzy, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:510 +#: ../../man/dpkg.1:513 msgid "Default log file (see I(5) and option B<--log>)." msgstr "" # type: Plain text -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 msgid "" "The other files listed below are in their default directories, see option " "B<--admindir> to see how to change locations of these files." msgstr "" # type: TP -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, no-wrap msgid "I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 msgid "List of available packages." msgstr "" # type: TP -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, no-wrap msgid "I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:522 +#: ../../man/dpkg.1:525 msgid "" "Statuses of available packages. This file contains information about whether " "a package is marked for removing or not, whether it is installed or not, " @@ -2636,93 +2660,93 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 msgid "" "The following files are components of a binary package. See B(5) for " "more information about them:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, fuzzy, no-wrap msgid "I" msgstr "kontroll" # type: TP -#: ../../man/dpkg.1:527 +#: ../../man/dpkg.1:530 #, no-wrap msgid "I" msgstr "" # type: TP -#: ../../man/dpkg.1:529 +#: ../../man/dpkg.1:532 #, no-wrap msgid "I" msgstr "" # type: TP -#: ../../man/dpkg.1:531 +#: ../../man/dpkg.1:534 #, no-wrap msgid "I" msgstr "" # type: TP -#: ../../man/dpkg.1:533 +#: ../../man/dpkg.1:536 #, no-wrap msgid "I" msgstr "" # type: TP -#: ../../man/dpkg.1:535 +#: ../../man/dpkg.1:538 #, no-wrap msgid "I" msgstr "" # type: SH -#: ../../man/dpkg.1:538 +#: ../../man/dpkg.1:541 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" # type: TP -#: ../../man/dpkg.1:539 +#: ../../man/dpkg.1:542 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 msgid "" "Define this to something if you prefer B starting a new shell rather " "than suspending itself, while doing a shell escape." msgstr "" # type: TP -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../../man/dpkg.1:546 +#: ../../man/dpkg.1:549 msgid "The program B will execute when starting a new shell." msgstr "" # type: TP -#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144 +#: ../../man/dpkg.1:549 ../../man/dpkg-query.1:145 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../../man/dpkg.1:550 +#: ../../man/dpkg.1:553 msgid "" "Sets the number of columns B should use when displaying formatted " "text. Currently only used by -l." msgstr "" # type: SH -#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 +#: ../../man/dpkg.1:554 ../../man/dpkg-architecture.1:246 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 #: ../../man/update-alternatives.8:356 #, fuzzy, no-wrap @@ -2730,58 +2754,58 @@ msgid "EXAMPLES" msgstr "PÉLDA" # type: Plain text -#: ../../man/dpkg.1:553 +#: ../../man/dpkg.1:556 msgid "To list packages related to the editor B(1):" msgstr "" # type: Plain text -#: ../../man/dpkg.1:555 +#: ../../man/dpkg.1:558 #, no-wrap msgid " B\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:558 +#: ../../man/dpkg.1:561 msgid "To see the entries in I of two packages:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:560 +#: ../../man/dpkg.1:563 #, no-wrap msgid " B\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:563 +#: ../../man/dpkg.1:566 msgid "To search the listing of packages yourself:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:565 +#: ../../man/dpkg.1:568 #, no-wrap msgid " B\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:568 +#: ../../man/dpkg.1:571 msgid "To remove an installed elvis package:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:570 +#: ../../man/dpkg.1:573 #, no-wrap msgid " B\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:575 +#: ../../man/dpkg.1:578 msgid "" "To install a package, you first need to find it in an archive or CDROM. The " "\"available\" file shows that the vim package is in section \"editors\":" msgstr "" # type: Plain text -#: ../../man/dpkg.1:578 +#: ../../man/dpkg.1:581 #, no-wrap msgid "" " B\n" @@ -2789,24 +2813,24 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:581 +#: ../../man/dpkg.1:584 msgid "To make a local copy of the package selection states:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:583 +#: ../../man/dpkg.1:586 #, no-wrap msgid " Bmyselections>\n" msgstr "" # type: Plain text -#: ../../man/dpkg.1:587 +#: ../../man/dpkg.1:590 msgid "" "You might transfer this file to another computer, and install it there with:" msgstr "" # type: Plain text -#: ../../man/dpkg.1:590 +#: ../../man/dpkg.1:593 #, no-wrap msgid "" " B\n" @@ -2814,7 +2838,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:596 +#: ../../man/dpkg.1:599 msgid "" "Note that this will not actually install or remove anything, but just set " "the selection state on the requested packages. You will need some other " @@ -2823,39 +2847,39 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg.1:599 +#: ../../man/dpkg.1:602 msgid "" "Ordinarily, you will find that B(1) provides a more convenient way " "to modify the package selection states." msgstr "" # type: SH -#: ../../man/dpkg.1:601 +#: ../../man/dpkg.1:604 #, no-wrap msgid "ADDITIONAL FUNCTIONALITY" msgstr "" # type: Plain text -#: ../../man/dpkg.1:604 +#: ../../man/dpkg.1:607 msgid "" "Additional functionality can be gained by installing any of the following " "packages: B, B and B." msgstr "" # type: Plain text -#: ../../man/dpkg.1:614 +#: ../../man/dpkg.1:617 msgid "" "B(1), B(1), B(1), B(5), B" "(5), B(5), and B(8)." msgstr "" # type: Plain text -#: ../../man/dpkg.1:617 +#: ../../man/dpkg.1:620 msgid "B<--no-act> usually gives less information than might be helpful." msgstr "" # type: SH -#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 +#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:191 #: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 #: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 @@ -2865,7 +2889,7 @@ msgid "AUTHORS" msgstr "SZERZŐ" # type: Plain text -#: ../../man/dpkg.1:622 +#: ../../man/dpkg.1:625 #, fuzzy, no-wrap msgid "" "See I for the list of people who have\n" @@ -3594,7 +3618,7 @@ msgstr "" # type: Plain text #: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 -#: ../../man/dpkg-query.1:160 ../../man/dpkg-statoverride.8:80 +#: ../../man/dpkg-query.1:161 ../../man/dpkg-statoverride.8:80 msgid "B(1)." msgstr "B(1)." @@ -5552,7 +5576,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:129 +#: ../../man/dpkg-query.1:130 #, no-wrap msgid "" " B\n" @@ -5560,6 +5584,7 @@ msgid "" " B\n" " B\n" " B\n" +" B\n" " B\n" " B\n" " B\n" @@ -5586,7 +5611,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:137 +#: ../../man/dpkg-query.1:138 msgid "" "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq. " "Actually, all other fields found in the status file (i.e. user defined " @@ -5596,37 +5621,37 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:141 +#: ../../man/dpkg-query.1:142 #, no-wrap msgid " B\n" msgstr "" # type: SH -#: ../../man/dpkg-query.1:143 +#: ../../man/dpkg-query.1:144 #, no-wrap msgid "ENVIRONMENT" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:148 +#: ../../man/dpkg-query.1:149 msgid "" "This setting influences the output of the B<--list> option by changing the " "width of its output." msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:151 +#: ../../man/dpkg-query.1:152 msgid "Copyright (C) 2001 Wichert Akkerman" msgstr "" # type: UR -#: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83 +#: ../../man/dpkg-query.1:152 ../../man/dpkg-statoverride.8:83 #, no-wrap msgid "mailto:wakkerma@debian.org" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:153 ../../man/dpkg-statoverride.8:85 +#: ../../man/dpkg-query.1:154 ../../man/dpkg-statoverride.8:85 msgid "Ewakkerma@debian.orgE" msgstr "" diff --git a/man/po/ja.po b/man/po/ja.po index 7f991788..f76590f3 100644 --- a/man/po/ja.po +++ b/man/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg man pages\n" -"POT-Creation-Date: 2007-07-21 16:13+0300\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: 2006-09-19 20:31+0900\n" "Last-Translator: KISE Hiroshi \n" "Language-Team: Debian Japanese List \n" @@ -177,7 +177,7 @@ msgstr "B<822-date> には引数やオプションはない。" # type: SH #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 -#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 +#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:618 #: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 #: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427 @@ -193,13 +193,13 @@ msgstr "この機能は実際には B(1) の一部であるべきである # type: SH #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 -#: ../../man/deb-control.5:206 ../../man/deb-old.5:51 +#: ../../man/deb-control.5:214 ../../man/deb-old.5:51 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 -#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 +#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 #: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 #: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 -#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 +#: ../../man/dpkg-query.1:159 ../../man/dpkg-scanpackages.1:95 #: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 #: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 #: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 @@ -219,7 +219,7 @@ msgstr "" #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 -#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 +#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:150 #: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 #: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 #: ../../man/install-info.8:291 ../../man/update-alternatives.8:392 @@ -385,7 +385,7 @@ msgstr "バージョン情報を出力して終了する。" # type: SH #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 -#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 +#: ../../man/dpkg.1:505 ../../man/dpkg.cfg.5:12 #: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 #: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 #: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 @@ -432,7 +432,7 @@ msgstr "Copyright (C) 1996 Kim-Minh Kaplan." #: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 #: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 #: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 -#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 +#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:158 #: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 #: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 #: ../../man/install-info.8:295 ../../man/update-alternatives.8:397 @@ -937,12 +937,32 @@ msgstr "" # type: TP #: ../../man/deb-control.5:138 +#, fuzzy, no-wrap +msgid "B Epackage listE" +msgstr "B EパッケージリストE" + +# type: Plain text +#: ../../man/deb-control.5:146 +#, fuzzy +msgid "" +"Lists packages that this one breaks, for example by exposing bugs when the " +"named packages rely on this one. The package maintenance software will not " +"allow broken packages to be configured; generally the resolution is to " +"upgrade the packages named in a B field." +msgstr "" +"このパッケージと衝突するパッケージのリスト。例えば同じファイル名をもっている" +"場合など。パッケージ管理ソフトウェアは衝突しているパッケージ同士を同時にイン" +"ストールできないようにしている。二つの衝突しているパッケージがそれぞれがお互" +"いを B に書いておくべきである。" + +# type: TP +#: ../../man/deb-control.5:146 #, no-wrap msgid "B Epackage listE" msgstr "B EパッケージリストE" # type: Plain text -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 msgid "" "Lists packages that conflict with this one, for example by containing files " "with the same names. The package maintenance software will not allow " @@ -955,13 +975,13 @@ msgstr "" "いを B に書いておくべきである。" # type: TP -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, no-wrap msgid "B Epackage listE" msgstr "B EパッケージリストE" # type: Plain text -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 msgid "" "List of packages files from which this one replaces. This is used for " "allowing this package to overwrite the files of another package and is " @@ -974,13 +994,13 @@ msgstr "" "とで他のパッケージを強制的に削除することを指示するために使われる。" # type: TP -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, no-wrap msgid "B Epackage listE" msgstr "B EパッケージリストE" # type: Plain text -#: ../../man/deb-control.5:164 +#: ../../man/deb-control.5:172 msgid "" "This is a list of virtual packages that this one provides. Usually this is " "used in the case of several packages all providing the same service. For " @@ -1001,7 +1021,7 @@ msgstr "" "を使って列挙する必要もなくなる。" # type: Plain text -#: ../../man/deb-control.5:179 +#: ../../man/deb-control.5:187 msgid "" "The syntax of B, B and B is a list of package " "names, separated by commas (and optional whitespace). In the B " @@ -1015,13 +1035,13 @@ msgstr "" "ルドと同じ表記でバージョンも指定することができる。" # type: SH -#: ../../man/deb-control.5:180 +#: ../../man/deb-control.5:188 #, no-wrap msgid "EXAMPLE" msgstr "例" # type: Plain text -#: ../../man/deb-control.5:203 +#: ../../man/deb-control.5:211 #, fuzzy, no-wrap msgid "" "# Comment\n" @@ -1066,7 +1086,7 @@ msgstr "" " will run more slowly, however).\n" # type: Plain text -#: ../../man/deb-control.5:209 +#: ../../man/deb-control.5:217 msgid "B(5), B(1), B(1)." msgstr "B(5), B(1), B(1)." @@ -2585,7 +2605,12 @@ msgid "" msgstr "B: 依存関係の確認をするとき、バージョンを無視する。" # type: Plain text -#: ../../man/dpkg.1:378 +#: ../../man/dpkg.1:377 +msgid "B: Install, even if this would break another package." +msgstr "" + +# type: Plain text +#: ../../man/dpkg.1:381 msgid "" "B: Install, even if it conflicts with another package. This is " "dangerous, for it will usually cause overwriting of some files." @@ -2594,7 +2619,7 @@ msgstr "" "ファイルを上書きすることになるため、危険である。" # type: Plain text -#: ../../man/dpkg.1:383 +#: ../../man/dpkg.1:386 msgid "" "B: Always install a missing configuration file. This is dangerous, " "since it means not preserving a change (removing) made to the file." @@ -2603,7 +2628,7 @@ msgstr "" "は、変更(ファイルを削除したこと)を保存しないため、危険である。" # type: Plain text -#: ../../man/dpkg.1:388 +#: ../../man/dpkg.1:391 msgid "" "B: If a conffile has been modified always install the new version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2614,7 +2639,7 @@ msgstr "" "た場合は、デフォルトの動作が優先される。" # type: Plain text -#: ../../man/dpkg.1:393 +#: ../../man/dpkg.1:396 msgid "" "B: If a conffile has been modified always keep the old version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2625,7 +2650,7 @@ msgstr "" "デフォルトの動作が優先される。" # type: Plain text -#: ../../man/dpkg.1:399 +#: ../../man/dpkg.1:402 msgid "" "B: If a conffile has been modified always choose the default " "action. If there is no default action it will stop to ask the user unless " @@ -2638,21 +2663,21 @@ msgstr "" "されたオプションによって最終的な動作が決まる。" # type: Plain text -#: ../../man/dpkg.1:402 +#: ../../man/dpkg.1:405 msgid "B: Overwrite one package's file with another's file." msgstr "" "B: あるパッケージで提供されているファイルを、インストールするパッ" "ケージのファイルで上書きする。" # type: Plain text -#: ../../man/dpkg.1:405 +#: ../../man/dpkg.1:408 msgid "B Overwrite one package's directory with another's file." msgstr "" "B: あるパッケージで提供されているディレクトリを、インストール" "するパッケージのファイルで上書きする。" # type: Plain text -#: ../../man/dpkg.1:408 +#: ../../man/dpkg.1:411 msgid "" "B: Overwrite a diverted file with an undiverted version." msgstr "" @@ -2660,13 +2685,13 @@ msgstr "" "い)版のファイルで上書きする。" # type: Plain text -#: ../../man/dpkg.1:411 +#: ../../man/dpkg.1:414 msgid "B: Process even packages with the wrong architecture." msgstr "" "B: パッケージが間違ったアーキテクチャ用であっても処理をする。" # type: Plain text -#: ../../man/dpkg.1:414 +#: ../../man/dpkg.1:417 msgid "" "B: B is missing important programs, so problems are likely." msgstr "" @@ -2674,25 +2699,25 @@ msgstr "" "起きる可能性は高い。" # type: Plain text -#: ../../man/dpkg.1:417 +#: ../../man/dpkg.1:420 msgid "B: Try to (de)install things even when not root." msgstr "" "B: root でないときでも、それをインストール(または削除)しようと試み" "る。" # type: Plain text -#: ../../man/dpkg.1:420 +#: ../../man/dpkg.1:423 msgid "B: Install a package even if it fails authenticity check." msgstr "B: 信頼性チェックに失敗してもインストールする。" # type: TP -#: ../../man/dpkg.1:421 +#: ../../man/dpkg.1:424 #, no-wrap msgid "B<--ignore-depends>=I,..." msgstr "B<--ignore-depends>=I,..." # type: Plain text -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 msgid "" "Ignore dependency-checking for specified packages (actually, checking is " "performed, but only warnings about conflicts are given, nothing else)." @@ -2701,13 +2726,13 @@ msgstr "" "競合に対して警告メッセージを出して、アクションを実行する)。" # type: TP -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, fuzzy, no-wrap msgid "B<--new>, B<--old>" msgstr "B<--new> | B<--old>" # type: Plain text -#: ../../man/dpkg.1:429 +#: ../../man/dpkg.1:432 msgid "" "Select new or old binary package format. This is a B(1) option." msgstr "" @@ -2715,13 +2740,13 @@ msgstr "" "オプションである。" # type: TP -#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211 +#: ../../man/dpkg.1:432 ../../man/dpkg-deb.1:211 #, no-wrap msgid "B<--nocheck>" msgstr "B<--nocheck>" # type: Plain text -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 msgid "" "Don't read or check contents of control file while building a package. This " "is a B(1) option." @@ -2730,13 +2755,13 @@ msgstr "" "B(1) のオプションである。" # type: TP -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, fuzzy, no-wrap msgid "B<--no-act>, B<--dry-run>, B<--simulate>" msgstr "B<--no-act> | B<--dry-run> | B<--simulate>" # type: Plain text -#: ../../man/dpkg.1:438 +#: ../../man/dpkg.1:441 msgid "" "Do everything which is supposed to be done, but don't write any changes. " "This is used to see what would happen with the specified action, without " @@ -2747,7 +2772,7 @@ msgstr "" "るためのものである。" # type: Plain text -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 msgid "" "Be sure to give B<--no-act> before the action-parameter, or you might end up " "with undesirable results. (e.g. B will first " @@ -2761,13 +2786,13 @@ msgstr "" "うことになる)。" # type: TP -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, fuzzy, no-wrap msgid "B<-R>, B<--recursive>" msgstr "B<-R> | B<--recursive>" # type: Plain text -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 msgid "" "Recursively handle all regular files matching pattern B<*.deb> found at " "specified directories and all of its subdirectories. This can be used with " @@ -2778,13 +2803,13 @@ msgstr "" "そして B<--avail> アクションとともに使うことができる。" # type: TP -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, no-wrap msgid "B<-G>" msgstr "B<-G>" # type: Plain text -#: ../../man/dpkg.1:453 +#: ../../man/dpkg.1:456 msgid "" "Don't install a package if a newer version of the same package is already " "installed. This is an alias of B<--refuse-downgrade>." @@ -2793,7 +2818,7 @@ msgstr "" "い。これは B<--refuse-downgrade> の別名である。" # type: TP -#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 +#: ../../man/dpkg.1:456 ../../man/dpkg-buildpackage.1:168 #: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 #: ../../man/dpkg-shlibdeps.1:105 #, no-wrap @@ -2801,7 +2826,7 @@ msgid "B<--admindir=>I" msgstr "B<--admindir=>I" # type: Plain text -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 msgid "" "Change default administrative directory, which contains many files that give " "information about status of installed or uninstalled packages, etc. " @@ -2809,13 +2834,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 #, fuzzy, no-wrap msgid "B<--instdir=>I" msgstr "B<--admindir=>I" # type: Plain text -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy msgid "" "Change default installation directory which refers to the directory where " @@ -2833,26 +2858,26 @@ msgstr "" "B を I に、B を IB に変更する。" # type: TP -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy, no-wrap msgid "B<--root=>I" msgstr "B<--admindir=>I" # type: Plain text -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 msgid "" "Changing B changes B to I and B to IB." msgstr "" # type: TP -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 #, fuzzy, no-wrap msgid "B<-O>, B<--selected-only>" msgstr "B<-O> | B<--selected-only>" # type: Plain text -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 msgid "" "Only process the packages that are selected for installation. The actual " "marking is done with B or by B, when it handles packages. For " @@ -2864,13 +2889,13 @@ msgstr "" "除されるのは、そのパッケージが削除されるよう選択されているということである。" # type: TP -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, fuzzy, no-wrap msgid "B<-E>, B<--skip-same-version>" msgstr "B<-E> | B<--skip-same-version>" # type: Plain text -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 msgid "" "Don't install the package if the same version of the package is already " "installed." @@ -2879,13 +2904,13 @@ msgstr "" "い。" # type: TP -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, no-wrap msgid "B<--status-fd >InE>" msgstr "B<--status-fd >InE>" # type: Plain text -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 msgid "" "Send package status info to file descriptor InE>. This can be " "given multiple times. Status updates are of the form `status: EpkgE: " @@ -2901,13 +2926,13 @@ msgstr "" "'current-conffile' 'new-conffile' useredited distedited' として報告される。" # type: TP -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, no-wrap msgid "B<--log=>I" msgstr "B<--log=>I" # type: Plain text -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 msgid "" "Log status change updates and actions to I, instead of the default " "I. If this option is given multiple times, the last " @@ -2930,42 +2955,42 @@ msgstr "" "変更で、IdecisionE> は install か keep のどちらかである。" # type: TP -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, no-wrap msgid "B<--no-debsig>" msgstr "B<--no-debsig>" # type: Plain text -#: ../../man/dpkg.1:501 +#: ../../man/dpkg.1:504 msgid "Do not try to verify package signatures." msgstr "パッケージの署名を確認しない。" # type: TP -#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14 +#: ../../man/dpkg.1:506 ../../man/dpkg.cfg.5:14 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 msgid "Configuration file with default options." msgstr "オプションのデフォルト値を記述する設定ファイル。" # type: TP -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:510 +#: ../../man/dpkg.1:513 msgid "Default log file (see I(5) and option B<--log>)." msgstr "" "デフォルトのログファイル(I(5) と B<--log> オプションも参" "照)。" # type: Plain text -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 msgid "" "The other files listed below are in their default directories, see option " "B<--admindir> to see how to change locations of these files." @@ -2974,24 +2999,24 @@ msgstr "" "するかについては、B<--admindir> オプションの項を参照すること。" # type: TP -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 msgid "List of available packages." msgstr "使用できるパッケージの一覧。" # type: TP -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:522 +#: ../../man/dpkg.1:525 msgid "" "Statuses of available packages. This file contains information about whether " "a package is marked for removing or not, whether it is installed or not, " @@ -3002,7 +3027,7 @@ msgstr "" "パッケージに関する情報>の項を参照すること。" # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 msgid "" "The following files are components of a binary package. See B(5) for " "more information about them:" @@ -3011,55 +3036,55 @@ msgstr "" "に関するくわしい情報は、B(5) を参照すること。" # type: TP -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:527 +#: ../../man/dpkg.1:530 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:529 +#: ../../man/dpkg.1:532 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:531 +#: ../../man/dpkg.1:534 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:533 +#: ../../man/dpkg.1:536 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:535 +#: ../../man/dpkg.1:538 #, no-wrap msgid "I" msgstr "I" # type: SH -#: ../../man/dpkg.1:538 +#: ../../man/dpkg.1:541 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "環境変数" # type: TP -#: ../../man/dpkg.1:539 +#: ../../man/dpkg.1:542 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 msgid "" "Define this to something if you prefer B starting a new shell rather " "than suspending itself, while doing a shell escape." @@ -3068,24 +3093,24 @@ msgstr "" "(suspend)するのではなく、新しいシェルを起動する。" # type: TP -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:546 +#: ../../man/dpkg.1:549 msgid "The program B will execute when starting a new shell." msgstr "B が新しいシェルを起動するときに、実際に起動するプログラム。" # type: TP -#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144 +#: ../../man/dpkg.1:549 ../../man/dpkg-query.1:145 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:550 +#: ../../man/dpkg.1:553 msgid "" "Sets the number of columns B should use when displaying formatted " "text. Currently only used by -l." @@ -3094,7 +3119,7 @@ msgstr "" "のみ参照されている。" # type: SH -#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 +#: ../../man/dpkg.1:554 ../../man/dpkg-architecture.1:246 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 #: ../../man/update-alternatives.8:356 #, no-wrap @@ -3102,51 +3127,51 @@ msgid "EXAMPLES" msgstr "例" # type: Plain text -#: ../../man/dpkg.1:553 +#: ../../man/dpkg.1:556 msgid "To list packages related to the editor B(1):" msgstr "B(1) エディタに関連のあるパッケージの一覧を表示する。" # type: Plain text -#: ../../man/dpkg.1:555 +#: ../../man/dpkg.1:558 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:558 +#: ../../man/dpkg.1:561 msgid "To see the entries in I of two packages:" msgstr "2 つのパッケージの I にある項目を表示する。" # type: Plain text -#: ../../man/dpkg.1:560 +#: ../../man/dpkg.1:563 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:563 +#: ../../man/dpkg.1:566 msgid "To search the listing of packages yourself:" msgstr "自分でパッケージのリストから検索する。" # type: Plain text -#: ../../man/dpkg.1:565 +#: ../../man/dpkg.1:568 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:568 +#: ../../man/dpkg.1:571 msgid "To remove an installed elvis package:" msgstr "elvis パッケージを削除する。" # type: Plain text -#: ../../man/dpkg.1:570 +#: ../../man/dpkg.1:573 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:575 +#: ../../man/dpkg.1:578 msgid "" "To install a package, you first need to find it in an archive or CDROM. The " "\"available\" file shows that the vim package is in section \"editors\":" @@ -3156,7 +3181,7 @@ msgstr "" "セクションに属している。" # type: Plain text -#: ../../man/dpkg.1:578 +#: ../../man/dpkg.1:581 #, no-wrap msgid "" " B\n" @@ -3166,24 +3191,24 @@ msgstr "" " B\n" # type: Plain text -#: ../../man/dpkg.1:581 +#: ../../man/dpkg.1:584 msgid "To make a local copy of the package selection states:" msgstr "パッケージ選択状況のコピーを作成する。" # type: Plain text -#: ../../man/dpkg.1:583 +#: ../../man/dpkg.1:586 #, no-wrap msgid " Bmyselections>\n" msgstr " Bmyselections>\n" # type: Plain text -#: ../../man/dpkg.1:587 +#: ../../man/dpkg.1:590 msgid "" "You might transfer this file to another computer, and install it there with:" msgstr "このファイルをほかのコンピュータに転送して、インストールする。" # type: Plain text -#: ../../man/dpkg.1:590 +#: ../../man/dpkg.1:593 #, no-wrap msgid "" " B\n" @@ -3193,7 +3218,7 @@ msgstr "" " Bmyselections>\n" # type: Plain text -#: ../../man/dpkg.1:596 +#: ../../man/dpkg.1:599 #, fuzzy msgid "" "Note that this will not actually install or remove anything, but just set " @@ -3207,7 +3232,7 @@ msgstr "" "B を起動して、\"導入(Install)\" を選べばよい。" # type: Plain text -#: ../../man/dpkg.1:599 +#: ../../man/dpkg.1:602 msgid "" "Ordinarily, you will find that B(1) provides a more convenient way " "to modify the package selection states." @@ -3216,13 +3241,13 @@ msgstr "" "ある。" # type: SH -#: ../../man/dpkg.1:601 +#: ../../man/dpkg.1:604 #, no-wrap msgid "ADDITIONAL FUNCTIONALITY" msgstr "機能の追加" # type: Plain text -#: ../../man/dpkg.1:604 +#: ../../man/dpkg.1:607 #, fuzzy msgid "" "Additional functionality can be gained by installing any of the following " @@ -3232,7 +3257,7 @@ msgstr "" "加できる。" # type: Plain text -#: ../../man/dpkg.1:614 +#: ../../man/dpkg.1:617 msgid "" "B(1), B(1), B(1), B(5), B" "(5), B(5), and B(8)." @@ -3241,12 +3266,12 @@ msgstr "" "(5), B(5), B(8)." # type: Plain text -#: ../../man/dpkg.1:617 +#: ../../man/dpkg.1:620 msgid "B<--no-act> usually gives less information than might be helpful." msgstr "B<--no-act> の提供する情報はたいていの場合、不充分である。" # type: SH -#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 +#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:191 #: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 #: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 @@ -3256,7 +3281,7 @@ msgid "AUTHORS" msgstr "著者" # type: Plain text -#: ../../man/dpkg.1:622 +#: ../../man/dpkg.1:625 #, no-wrap msgid "" "See I for the list of people who have\n" @@ -3986,7 +4011,7 @@ msgstr "" # type: Plain text #: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 -#: ../../man/dpkg-query.1:160 ../../man/dpkg-statoverride.8:80 +#: ../../man/dpkg-query.1:161 ../../man/dpkg-statoverride.8:80 msgid "B(1)." msgstr "B(1)." @@ -6103,14 +6128,15 @@ msgstr "" "以下の I は認識される:" # type: Plain text -#: ../../man/dpkg-query.1:129 -#, no-wrap +#: ../../man/dpkg-query.1:130 +#, fuzzy, no-wrap msgid "" " B\n" " B\n" " B\n" " B\n" " B\n" +" B\n" " B\n" " B\n" " B\n" @@ -6165,7 +6191,7 @@ msgstr "" " B\n" # type: Plain text -#: ../../man/dpkg-query.1:137 +#: ../../man/dpkg-query.1:138 msgid "" "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq. " "Actually, all other fields found in the status file (i.e. user defined " @@ -6180,38 +6206,38 @@ msgstr "" "を得るには、これを実行する:" # type: Plain text -#: ../../man/dpkg-query.1:141 +#: ../../man/dpkg-query.1:142 #, no-wrap msgid " B\n" msgstr " B\n" # type: SH -#: ../../man/dpkg-query.1:143 +#: ../../man/dpkg-query.1:144 #, no-wrap msgid "ENVIRONMENT" msgstr "環境変数" # type: Plain text -#: ../../man/dpkg-query.1:148 +#: ../../man/dpkg-query.1:149 msgid "" "This setting influences the output of the B<--list> option by changing the " "width of its output." msgstr "設定すると、B<--list> オプションによる出力の横幅を変更する。" # type: Plain text -#: ../../man/dpkg-query.1:151 +#: ../../man/dpkg-query.1:152 #, fuzzy msgid "Copyright (C) 2001 Wichert Akkerman" msgstr "Copyright 2000 Wichert Akkerman" # type: UR -#: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83 +#: ../../man/dpkg-query.1:152 ../../man/dpkg-statoverride.8:83 #, no-wrap msgid "mailto:wakkerma@debian.org" msgstr "mailto:wakkerma@debian.org" # type: Plain text -#: ../../man/dpkg-query.1:153 ../../man/dpkg-statoverride.8:85 +#: ../../man/dpkg-query.1:154 ../../man/dpkg-statoverride.8:85 msgid "Ewakkerma@debian.orgE" msgstr "Ewakkerma@debian.orgE" diff --git a/man/po/pl.po b/man/po/pl.po index 3b9041c6..aea376ea 100644 --- a/man/po/pl.po +++ b/man/po/pl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.14.6\n" -"POT-Creation-Date: 2007-08-14 00:45+0200\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: 2007-08-14 00:00+0100\n" "Last-Translator: Robert Luberda \n" "Language-Team: Polish \n" diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po index 6071ba8c..cbb3189f 100644 --- a/man/po/pt_BR.po +++ b/man/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg man pages\n" -"POT-Creation-Date: 2007-07-21 16:13+0300\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: 2005-07-03 15:04+0200\n" "Last-Translator: Unknown translator\n" "Language-Team: Portuguese \n" @@ -170,7 +170,7 @@ msgstr "" # type: SH #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 -#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 +#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:618 #: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 #: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427 @@ -186,13 +186,13 @@ msgstr "" # type: SH #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 -#: ../../man/deb-control.5:206 ../../man/deb-old.5:51 +#: ../../man/deb-control.5:214 ../../man/deb-old.5:51 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 -#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 +#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 #: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 #: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 -#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 +#: ../../man/dpkg-query.1:159 ../../man/dpkg-scanpackages.1:95 #: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 #: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 #: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 @@ -212,7 +212,7 @@ msgstr "" #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 -#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 +#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:150 #: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 #: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 #: ../../man/install-info.8:291 ../../man/update-alternatives.8:392 @@ -361,7 +361,7 @@ msgstr "" # type: SH #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 -#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 +#: ../../man/dpkg.1:505 ../../man/dpkg.cfg.5:12 #: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 #: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 #: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 @@ -405,7 +405,7 @@ msgstr "" #: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 #: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 #: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 -#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 +#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:158 #: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 #: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 #: ../../man/install-info.8:295 ../../man/update-alternatives.8:397 @@ -811,12 +811,27 @@ msgstr "" # type: TP #: ../../man/deb-control.5:138 #, no-wrap -msgid "B Epackage listE" +msgid "B Epackage listE" msgstr "" # type: Plain text #: ../../man/deb-control.5:146 msgid "" +"Lists packages that this one breaks, for example by exposing bugs when the " +"named packages rely on this one. The package maintenance software will not " +"allow broken packages to be configured; generally the resolution is to " +"upgrade the packages named in a B field." +msgstr "" + +# type: TP +#: ../../man/deb-control.5:146 +#, no-wrap +msgid "B Epackage listE" +msgstr "" + +# type: Plain text +#: ../../man/deb-control.5:154 +msgid "" "Lists packages that conflict with this one, for example by containing files " "with the same names. The package maintenance software will not allow " "conflicting packages to be installed at the same time. Two conflicting " @@ -824,13 +839,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, no-wrap msgid "B Epackage listE" msgstr "" # type: Plain text -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 msgid "" "List of packages files from which this one replaces. This is used for " "allowing this package to overwrite the files of another package and is " @@ -839,13 +854,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, no-wrap msgid "B Epackage listE" msgstr "" # type: Plain text -#: ../../man/deb-control.5:164 +#: ../../man/deb-control.5:172 msgid "" "This is a list of virtual packages that this one provides. Usually this is " "used in the case of several packages all providing the same service. For " @@ -858,7 +873,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/deb-control.5:179 +#: ../../man/deb-control.5:187 msgid "" "The syntax of B, B and B is a list of package " "names, separated by commas (and optional whitespace). In the B " @@ -868,13 +883,13 @@ msgid "" msgstr "" # type: SH -#: ../../man/deb-control.5:180 +#: ../../man/deb-control.5:188 #, fuzzy, no-wrap msgid "EXAMPLE" msgstr "EXEMPLOS" # type: Plain text -#: ../../man/deb-control.5:203 +#: ../../man/deb-control.5:211 #, no-wrap msgid "" "# Comment\n" @@ -900,7 +915,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/deb-control.5:209 +#: ../../man/deb-control.5:217 msgid "B(5), B(1), B(1)." msgstr "" @@ -2419,7 +2434,12 @@ msgstr "" "B: Não verifica versões quando verificando dependências." # type: Plain text -#: ../../man/dpkg.1:378 +#: ../../man/dpkg.1:377 +msgid "B: Install, even if this would break another package." +msgstr "" + +# type: Plain text +#: ../../man/dpkg.1:381 msgid "" "B: Install, even if it conflicts with another package. This is " "dangerous, for it will usually cause overwriting of some files." @@ -2428,7 +2448,7 @@ msgstr "" "pois geralmente causará a regravação de alguns arquivos." # type: Plain text -#: ../../man/dpkg.1:383 +#: ../../man/dpkg.1:386 #, fuzzy msgid "" "B: Always install a missing configuration file. This is dangerous, " @@ -2439,7 +2459,7 @@ msgstr "" "será preservada." # type: Plain text -#: ../../man/dpkg.1:388 +#: ../../man/dpkg.1:391 #, fuzzy msgid "" "B: If a conffile has been modified always install the new version " @@ -2451,7 +2471,7 @@ msgstr "" "especificada, quando a ação padrão é então preferida." # type: Plain text -#: ../../man/dpkg.1:393 +#: ../../man/dpkg.1:396 #, fuzzy msgid "" "B: If a conffile has been modified always keep the old version " @@ -2463,7 +2483,7 @@ msgstr "" "especificada, quando a ação padrão é então preferida." # type: Plain text -#: ../../man/dpkg.1:399 +#: ../../man/dpkg.1:402 #, fuzzy msgid "" "B: If a conffile has been modified always choose the default " @@ -2477,18 +2497,18 @@ msgstr "" "sido dadas, quando será então usado isso para decidir a ação final." # type: Plain text -#: ../../man/dpkg.1:402 +#: ../../man/dpkg.1:405 msgid "B: Overwrite one package's file with another's file." msgstr "B: Sobrescreve um arquivo do pacote com arquivo de outro." # type: Plain text -#: ../../man/dpkg.1:405 +#: ../../man/dpkg.1:408 msgid "B Overwrite one package's directory with another's file." msgstr "" "B Sobrescreve um diretório do pacote com arquivo de outro." # type: Plain text -#: ../../man/dpkg.1:408 +#: ../../man/dpkg.1:411 #, fuzzy msgid "" "B: Overwrite a diverted file with an undiverted version." @@ -2497,12 +2517,12 @@ msgstr "" "desviada." # type: Plain text -#: ../../man/dpkg.1:411 +#: ../../man/dpkg.1:414 msgid "B: Process even packages with the wrong architecture." msgstr "B: Processa até pacotes com a arquitetura errada." # type: Plain text -#: ../../man/dpkg.1:414 +#: ../../man/dpkg.1:417 msgid "" "B: B is missing important programs, so problems are likely." msgstr "" @@ -2510,23 +2530,23 @@ msgstr "" "problemas." # type: Plain text -#: ../../man/dpkg.1:417 +#: ../../man/dpkg.1:420 msgid "B: Try to (de)install things even when not root." msgstr "B: Tenta (des)instalar coisas mesmo não sendo root." # type: Plain text -#: ../../man/dpkg.1:420 +#: ../../man/dpkg.1:423 msgid "B: Install a package even if it fails authenticity check." msgstr "" # type: TP -#: ../../man/dpkg.1:421 +#: ../../man/dpkg.1:424 #, no-wrap msgid "B<--ignore-depends>=I,..." msgstr "B<--ignore-depends>=I,..." # type: Plain text -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, fuzzy msgid "" "Ignore dependency-checking for specified packages (actually, checking is " @@ -2537,13 +2557,13 @@ msgstr "" "mais)." # type: TP -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, fuzzy, no-wrap msgid "B<--new>, B<--old>" msgstr "B<--new> | B<--old>" # type: Plain text -#: ../../man/dpkg.1:429 +#: ../../man/dpkg.1:432 #, fuzzy msgid "" "Select new or old binary package format. This is a B(1) option." @@ -2552,13 +2572,13 @@ msgstr "" "B(1)." # type: TP -#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211 +#: ../../man/dpkg.1:432 ../../man/dpkg-deb.1:211 #, no-wrap msgid "B<--nocheck>" msgstr "B<--nocheck>" # type: Plain text -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, fuzzy msgid "" "Don't read or check contents of control file while building a package. This " @@ -2568,13 +2588,13 @@ msgstr "" "pacote. Isto é uma opção do B(1)." # type: TP -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, fuzzy, no-wrap msgid "B<--no-act>, B<--dry-run>, B<--simulate>" msgstr "B<--no-act>" # type: Plain text -#: ../../man/dpkg.1:438 +#: ../../man/dpkg.1:441 #, fuzzy msgid "" "Do everything which is supposed to be done, but don't write any changes. " @@ -2585,7 +2605,7 @@ msgstr "" "é usado para ver o que acontece com a ação especificada, sem modificar nada." # type: Plain text -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, fuzzy msgid "" "Be sure to give B<--no-act> before the action-parameter, or you might end up " @@ -2599,13 +2619,13 @@ msgstr "" "no-act, apesar de que você esperava que nada fosse feito)" # type: TP -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, fuzzy, no-wrap msgid "B<-R>, B<--recursive>" msgstr "B<-R> | B<--recursive>" # type: Plain text -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, fuzzy msgid "" "Recursively handle all regular files matching pattern B<*.deb> found at " @@ -2618,13 +2638,13 @@ msgstr "" "B<--unpack> e B<--avail>." # type: TP -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, no-wrap msgid "B<-G>" msgstr "B<-G>" # type: Plain text -#: ../../man/dpkg.1:453 +#: ../../man/dpkg.1:456 #, fuzzy msgid "" "Don't install a package if a newer version of the same package is already " @@ -2634,7 +2654,7 @@ msgstr "" "instalada. Isso é um apelido de B<--refuse-downgrade.>" # type: TP -#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 +#: ../../man/dpkg.1:456 ../../man/dpkg-buildpackage.1:168 #: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 #: ../../man/dpkg-shlibdeps.1:105 #, fuzzy, no-wrap @@ -2642,7 +2662,7 @@ msgid "B<--admindir=>I" msgstr "B<--admindir> I" # type: Plain text -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 msgid "" "Change default administrative directory, which contains many files that give " "information about status of installed or uninstalled packages, etc. " @@ -2650,13 +2670,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 #, fuzzy, no-wrap msgid "B<--instdir=>I" msgstr "B<--admindir> I" # type: Plain text -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy msgid "" "Change default installation directory which refers to the directory where " @@ -2674,26 +2694,26 @@ msgstr "" "B para IB." # type: TP -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy, no-wrap msgid "B<--root=>I" msgstr "B<--admindir> I" # type: Plain text -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 msgid "" "Changing B changes B to I and B to IB." msgstr "" # type: TP -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 #, fuzzy, no-wrap msgid "B<-O>, B<--selected-only>" msgstr "B<-O> | B<--selected-only>" # type: Plain text -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, fuzzy msgid "" "Only process the packages that are selected for installation. The actual " @@ -2707,13 +2727,13 @@ msgstr "" "instalação." # type: TP -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, fuzzy, no-wrap msgid "B<-E>, B<--skip-same-version>" msgstr "B<-E> | B<--skip-same-version>" # type: Plain text -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, fuzzy msgid "" "Don't install the package if the same version of the package is already " @@ -2721,13 +2741,13 @@ msgid "" msgstr "Não instala o pacote se a mesma versão dele já estiver instalada." # type: TP -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, no-wrap msgid "B<--status-fd >InE>" msgstr "B<--status-fd >InE>" # type: Plain text -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, fuzzy msgid "" "Send package status info to file descriptor InE>. This can be " @@ -2742,13 +2762,13 @@ msgstr "" "estado são da forma `status: EpkgE: Epkg qstateE'." # type: TP -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, fuzzy, no-wrap msgid "B<--log=>I" msgstr "B<--log=>I" # type: Plain text -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 msgid "" "Log status change updates and actions to I, instead of the default " "I. If this option is given multiple times, the last " @@ -2762,40 +2782,40 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, fuzzy, no-wrap msgid "B<--no-debsig>" msgstr "B<--nocheck>" # type: Plain text -#: ../../man/dpkg.1:501 +#: ../../man/dpkg.1:504 msgid "Do not try to verify package signatures." msgstr "" # type: TP -#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14 +#: ../../man/dpkg.1:506 ../../man/dpkg.cfg.5:14 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 msgid "Configuration file with default options." msgstr "Arquivo de configuração com as opções padrões." # type: TP -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, fuzzy, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:510 +#: ../../man/dpkg.1:513 msgid "Default log file (see I(5) and option B<--log>)." msgstr "" # type: Plain text -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, fuzzy msgid "" "The other files listed below are in their default directories, see option " @@ -2805,24 +2825,24 @@ msgstr "" "opção B<--admindir> para ver como alterar a localização desses arquivos." # type: TP -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 msgid "List of available packages." msgstr "Lista dos pacotes disponíveis." # type: TP -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:522 +#: ../../man/dpkg.1:525 #, fuzzy msgid "" "Statuses of available packages. This file contains information about whether " @@ -2834,7 +2854,7 @@ msgstr "" "Veja a seção B para maiores informações." # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, fuzzy msgid "" "The following files are components of a binary package. See B(5) for " @@ -2844,55 +2864,55 @@ msgstr "" "para mais informações sobre eles:" # type: TP -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:527 +#: ../../man/dpkg.1:530 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:529 +#: ../../man/dpkg.1:532 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:531 +#: ../../man/dpkg.1:534 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:533 +#: ../../man/dpkg.1:536 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:535 +#: ../../man/dpkg.1:538 #, no-wrap msgid "I" msgstr "I" # type: SH -#: ../../man/dpkg.1:538 +#: ../../man/dpkg.1:541 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "VARIÁVEIS DE AMBIENTE" # type: TP -#: ../../man/dpkg.1:539 +#: ../../man/dpkg.1:542 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, fuzzy msgid "" "Define this to something if you prefer B starting a new shell rather " @@ -2902,26 +2922,26 @@ msgstr "" "shell ao invés de suspender a si próprio, quando fazendo um escape de shell." # type: TP -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:546 +#: ../../man/dpkg.1:549 #, fuzzy msgid "The program B will execute when starting a new shell." msgstr "" "O programa que o B executará quando estiver iniciando um novo shell." # type: TP -#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144 +#: ../../man/dpkg.1:549 ../../man/dpkg-query.1:145 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:550 +#: ../../man/dpkg.1:553 #, fuzzy msgid "" "Sets the number of columns B should use when displaying formatted " @@ -2931,7 +2951,7 @@ msgstr "" "texto formatado. Atualmente só usado por -l." # type: SH -#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 +#: ../../man/dpkg.1:554 ../../man/dpkg-architecture.1:246 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 #: ../../man/update-alternatives.8:356 #, no-wrap @@ -2939,53 +2959,53 @@ msgid "EXAMPLES" msgstr "EXEMPLOS" # type: Plain text -#: ../../man/dpkg.1:553 +#: ../../man/dpkg.1:556 #, fuzzy msgid "To list packages related to the editor B(1):" msgstr "Para listar os pacotes relacionados com o editor vi:" # type: Plain text -#: ../../man/dpkg.1:555 +#: ../../man/dpkg.1:558 #, fuzzy, no-wrap msgid " B\n" msgstr "B< dpkg -l '*vi*'>" # type: Plain text -#: ../../man/dpkg.1:558 +#: ../../man/dpkg.1:561 #, fuzzy msgid "To see the entries in I of two packages:" msgstr "Para ver as entradas em I em dois pacotes:" # type: Plain text -#: ../../man/dpkg.1:560 +#: ../../man/dpkg.1:563 #, fuzzy, no-wrap msgid " B\n" msgstr "B< dpkg --print-avail elvis vim | less>" # type: Plain text -#: ../../man/dpkg.1:563 +#: ../../man/dpkg.1:566 msgid "To search the listing of packages yourself:" msgstr "Para procurar na lista de pacotes você mesmo:" # type: Plain text -#: ../../man/dpkg.1:565 +#: ../../man/dpkg.1:568 #, fuzzy, no-wrap msgid " B\n" msgstr "B< less /var/lib/dpkg/available>" # type: Plain text -#: ../../man/dpkg.1:568 +#: ../../man/dpkg.1:571 msgid "To remove an installed elvis package:" msgstr "Para remover um pacote instalado elvis:" # type: Plain text -#: ../../man/dpkg.1:570 +#: ../../man/dpkg.1:573 #, fuzzy, no-wrap msgid " B\n" msgstr "B< dpkg -r elvis>" # type: Plain text -#: ../../man/dpkg.1:575 +#: ../../man/dpkg.1:578 #, fuzzy msgid "" "To install a package, you first need to find it in an archive or CDROM. The " @@ -2996,7 +3016,7 @@ msgstr "" "\"editors\":" # type: Plain text -#: ../../man/dpkg.1:578 +#: ../../man/dpkg.1:581 #, fuzzy, no-wrap msgid "" " B\n" @@ -3004,25 +3024,25 @@ msgid "" msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>" # type: Plain text -#: ../../man/dpkg.1:581 +#: ../../man/dpkg.1:584 msgid "To make a local copy of the package selection states:" msgstr "Para fazer uma cópia local dos estados de seleção dos pacotes:" # type: Plain text -#: ../../man/dpkg.1:583 +#: ../../man/dpkg.1:586 #, fuzzy, no-wrap msgid " Bmyselections>\n" msgstr "B< dpkg --get-selections Emyselections>" # type: Plain text -#: ../../man/dpkg.1:587 +#: ../../man/dpkg.1:590 msgid "" "You might transfer this file to another computer, and install it there with:" msgstr "" "Você pode transferir esse arquivo para outro computador e instalá-lo com:" # type: Plain text -#: ../../man/dpkg.1:590 +#: ../../man/dpkg.1:593 #, fuzzy, no-wrap msgid "" " B\n" @@ -3030,7 +3050,7 @@ msgid "" msgstr "B< dpkg --set-selections Emyselections>" # type: Plain text -#: ../../man/dpkg.1:596 +#: ../../man/dpkg.1:599 #, fuzzy msgid "" "Note that this will not actually install or remove anything, but just set " @@ -3043,7 +3063,7 @@ msgstr "" "aplicação para baixar e instalar os pacotes requisitados." # type: Plain text -#: ../../man/dpkg.1:599 +#: ../../man/dpkg.1:602 #, fuzzy msgid "" "Ordinarily, you will find that B(1) provides a more convenient way " @@ -3053,20 +3073,20 @@ msgstr "" "conveniente de modificar o estado de seleção dos pacotes." # type: SH -#: ../../man/dpkg.1:601 +#: ../../man/dpkg.1:604 #, no-wrap msgid "ADDITIONAL FUNCTIONALITY" msgstr "" # type: Plain text -#: ../../man/dpkg.1:604 +#: ../../man/dpkg.1:607 msgid "" "Additional functionality can be gained by installing any of the following " "packages: B, B and B." msgstr "" # type: Plain text -#: ../../man/dpkg.1:614 +#: ../../man/dpkg.1:617 #, fuzzy msgid "" "B(1), B(1), B(1), B(5), B" @@ -3076,12 +3096,12 @@ msgstr "" "reconfigure>(8)" # type: Plain text -#: ../../man/dpkg.1:617 +#: ../../man/dpkg.1:620 msgid "B<--no-act> usually gives less information than might be helpful." msgstr "B<--no-act> normalmente dá menos informação do que seria útil." # type: SH -#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 +#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:191 #: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 #: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 @@ -3091,7 +3111,7 @@ msgid "AUTHORS" msgstr "AUTORES" # type: Plain text -#: ../../man/dpkg.1:622 +#: ../../man/dpkg.1:625 #, no-wrap msgid "" "See I for the list of people who have\n" @@ -3820,7 +3840,7 @@ msgstr "" # type: Plain text #: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 -#: ../../man/dpkg-query.1:160 ../../man/dpkg-statoverride.8:80 +#: ../../man/dpkg-query.1:161 ../../man/dpkg-statoverride.8:80 msgid "B(1)." msgstr "" @@ -5716,7 +5736,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:129 +#: ../../man/dpkg-query.1:130 #, no-wrap msgid "" " B\n" @@ -5724,6 +5744,7 @@ msgid "" " B\n" " B\n" " B\n" +" B\n" " B\n" " B\n" " B\n" @@ -5750,7 +5771,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:137 +#: ../../man/dpkg-query.1:138 msgid "" "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq. " "Actually, all other fields found in the status file (i.e. user defined " @@ -5760,37 +5781,37 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:141 +#: ../../man/dpkg-query.1:142 #, no-wrap msgid " B\n" msgstr "" # type: SH -#: ../../man/dpkg-query.1:143 +#: ../../man/dpkg-query.1:144 #, fuzzy, no-wrap msgid "ENVIRONMENT" msgstr "VARIÁVEIS DE AMBIENTE" # type: Plain text -#: ../../man/dpkg-query.1:148 +#: ../../man/dpkg-query.1:149 msgid "" "This setting influences the output of the B<--list> option by changing the " "width of its output." msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:151 +#: ../../man/dpkg-query.1:152 msgid "Copyright (C) 2001 Wichert Akkerman" msgstr "" # type: UR -#: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83 +#: ../../man/dpkg-query.1:152 ../../man/dpkg-statoverride.8:83 #, no-wrap msgid "mailto:wakkerma@debian.org" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:153 ../../man/dpkg-statoverride.8:85 +#: ../../man/dpkg-query.1:154 ../../man/dpkg-statoverride.8:85 msgid "Ewakkerma@debian.orgE" msgstr "" diff --git a/man/po/ru.po b/man/po/ru.po index 4adcd3ac..98795e07 100644 --- a/man/po/ru.po +++ b/man/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg man pages\n" -"POT-Creation-Date: 2007-07-21 16:13+0300\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: 2006-04-08 13:50+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -175,7 +175,7 @@ msgstr "B<822-date> не использует аргументов или пар # type: SH #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 -#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 +#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:618 #: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 #: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427 @@ -191,13 +191,13 @@ msgstr "На самом деле эту задачу должна выполня # type: SH #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 -#: ../../man/deb-control.5:206 ../../man/deb-old.5:51 +#: ../../man/deb-control.5:214 ../../man/deb-old.5:51 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 -#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 +#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 #: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 #: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 -#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 +#: ../../man/dpkg-query.1:159 ../../man/dpkg-scanpackages.1:95 #: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 #: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 #: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 @@ -221,7 +221,7 @@ msgstr "" #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 -#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 +#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:150 #: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 #: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 #: ../../man/install-info.8:291 ../../man/update-alternatives.8:392 @@ -371,7 +371,7 @@ msgstr "Выдать информацию о версии и завершить # type: SH #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 -#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 +#: ../../man/dpkg.1:505 ../../man/dpkg.cfg.5:12 #: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 #: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 #: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 @@ -415,7 +415,7 @@ msgstr "" #: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 #: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 #: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 -#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 +#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:158 #: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 #: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 #: ../../man/install-info.8:295 ../../man/update-alternatives.8:397 @@ -895,12 +895,32 @@ msgstr "" # type: TP #: ../../man/deb-control.5:138 +#, fuzzy, no-wrap +msgid "B Epackage listE" +msgstr "B Eсписок пакетовE" + +# type: Plain text +#: ../../man/deb-control.5:146 +#, fuzzy +msgid "" +"Lists packages that this one breaks, for example by exposing bugs when the " +"named packages rely on this one. The package maintenance software will not " +"allow broken packages to be configured; generally the resolution is to " +"upgrade the packages named in a B field." +msgstr "" +"Список пакетов, которые конфликтуют с пакетом; например, если в них " +"содержатся файлы с теми же именами. Программа установки не позволит " +"установить в систему два конфликтующих пакета. Каждый из двух конфликтующих " +"пакетов должен указать в строке B имя другого." + +# type: TP +#: ../../man/deb-control.5:146 #, no-wrap msgid "B Epackage listE" msgstr "B Eсписок пакетовE" # type: Plain text -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 msgid "" "Lists packages that conflict with this one, for example by containing files " "with the same names. The package maintenance software will not allow " @@ -913,13 +933,13 @@ msgstr "" "пакетов должен указать в строке B имя другого." # type: TP -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, no-wrap msgid "B Epackage listE" msgstr "B Eсписок пакетовE" # type: Plain text -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 msgid "" "List of packages files from which this one replaces. This is used for " "allowing this package to overwrite the files of another package and is " @@ -933,13 +953,13 @@ msgstr "" "устанавливаемый." # type: TP -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, no-wrap msgid "B Epackage listE" msgstr "B Eсписок пакетовE" # type: Plain text -#: ../../man/deb-control.5:164 +#: ../../man/deb-control.5:172 #, fuzzy msgid "" "This is a list of virtual packages that this one provides. Usually this is " @@ -961,7 +981,7 @@ msgstr "" "сервера, список через `|' всех пакетов почтовых серверов." # type: Plain text -#: ../../man/deb-control.5:179 +#: ../../man/deb-control.5:187 msgid "" "The syntax of B, B and B is a list of package " "names, separated by commas (and optional whitespace). In the B " @@ -975,13 +995,13 @@ msgstr "" "указывать номер версии пакета (используя вышеописанный синтаксис)." # type: SH -#: ../../man/deb-control.5:180 +#: ../../man/deb-control.5:188 #, no-wrap msgid "EXAMPLE" msgstr "ПРИМЕР" # type: Plain text -#: ../../man/deb-control.5:203 +#: ../../man/deb-control.5:211 #, fuzzy, no-wrap msgid "" "# Comment\n" @@ -1026,7 +1046,7 @@ msgstr "" " will run more slowly, however).\n" # type: Plain text -#: ../../man/deb-control.5:209 +#: ../../man/deb-control.5:217 msgid "B(5), B(1), B(1)." msgstr "B(5), B(1), B(1)." @@ -2521,7 +2541,12 @@ msgstr "" "B: Не обращать внимание на версии при проверке зависимостей." # type: Plain text -#: ../../man/dpkg.1:378 +#: ../../man/dpkg.1:377 +msgid "B: Install, even if this would break another package." +msgstr "" + +# type: Plain text +#: ../../man/dpkg.1:381 msgid "" "B: Install, even if it conflicts with another package. This is " "dangerous, for it will usually cause overwriting of some files." @@ -2530,7 +2555,7 @@ msgstr "" "опасно, так как обычно приводит к перезаписи некоторых файлов." # type: Plain text -#: ../../man/dpkg.1:383 +#: ../../man/dpkg.1:386 msgid "" "B: Always install a missing configuration file. This is dangerous, " "since it means not preserving a change (removing) made to the file." @@ -2539,7 +2564,7 @@ msgstr "" "опасно, так как не будут сохранены изменения (удаление) файла." # type: Plain text -#: ../../man/dpkg.1:388 +#: ../../man/dpkg.1:391 msgid "" "B: If a conffile has been modified always install the new version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2550,7 +2575,7 @@ msgstr "" "force-confdef>, при котором предпочтение отдаётся действию по умолчанию." # type: Plain text -#: ../../man/dpkg.1:393 +#: ../../man/dpkg.1:396 msgid "" "B: If a conffile has been modified always keep the old version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2561,7 +2586,7 @@ msgstr "" "confdef>, при котором предпочтение отдаётся действию по умолчанию." # type: Plain text -#: ../../man/dpkg.1:399 +#: ../../man/dpkg.1:402 msgid "" "B: If a conffile has been modified always choose the default " "action. If there is no default action it will stop to ask the user unless " @@ -2575,19 +2600,19 @@ msgstr "" "делать)." # type: Plain text -#: ../../man/dpkg.1:402 +#: ../../man/dpkg.1:405 msgid "B: Overwrite one package's file with another's file." msgstr "" "B: Перезаписать файл из одного пакета файлом из другого пакета." # type: Plain text -#: ../../man/dpkg.1:405 +#: ../../man/dpkg.1:408 msgid "B Overwrite one package's directory with another's file." msgstr "" "B: Перезаписать каталог из одного пакета файлом из другого." # type: Plain text -#: ../../man/dpkg.1:408 +#: ../../man/dpkg.1:411 msgid "" "B: Overwrite a diverted file with an undiverted version." msgstr "" @@ -2595,12 +2620,12 @@ msgstr "" "(diverted) его неизменённой версией." # type: Plain text -#: ../../man/dpkg.1:411 +#: ../../man/dpkg.1:414 msgid "B: Process even packages with the wrong architecture." msgstr "B: Обрабатывать даже пакеты с неправильной архитектурой." # type: Plain text -#: ../../man/dpkg.1:414 +#: ../../man/dpkg.1:417 msgid "" "B: B is missing important programs, so problems are likely." msgstr "" @@ -2608,27 +2633,27 @@ msgstr "" "возникнуть проблемы." # type: Plain text -#: ../../man/dpkg.1:417 +#: ../../man/dpkg.1:420 msgid "B: Try to (de)install things even when not root." msgstr "" "B: Попытаться установить или удалить пакет, даже если не нет прав " "суперпользователя." # type: Plain text -#: ../../man/dpkg.1:420 +#: ../../man/dpkg.1:423 msgid "B: Install a package even if it fails authenticity check." msgstr "" "B: Устанавливать пакет, даже если он не прошёл проверку " "подлинности." # type: TP -#: ../../man/dpkg.1:421 +#: ../../man/dpkg.1:424 #, no-wrap msgid "B<--ignore-depends>=I,..." msgstr "B<--ignore-depends>=I<пакет>,..." # type: Plain text -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 msgid "" "Ignore dependency-checking for specified packages (actually, checking is " "performed, but only warnings about conflicts are given, nothing else)." @@ -2638,13 +2663,13 @@ msgstr "" "ничего более)." # type: TP -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, fuzzy, no-wrap msgid "B<--new>, B<--old>" msgstr "B<--new> | B<--old>" # type: Plain text -#: ../../man/dpkg.1:429 +#: ../../man/dpkg.1:432 msgid "" "Select new or old binary package format. This is a B(1) option." msgstr "" @@ -2652,13 +2677,13 @@ msgstr "" "программы B(1)." # type: TP -#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211 +#: ../../man/dpkg.1:432 ../../man/dpkg-deb.1:211 #, no-wrap msgid "B<--nocheck>" msgstr "B<--nocheck>" # type: Plain text -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 msgid "" "Don't read or check contents of control file while building a package. This " "is a B(1) option." @@ -2667,13 +2692,13 @@ msgstr "" "параметр программы B(1)." # type: TP -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, fuzzy, no-wrap msgid "B<--no-act>, B<--dry-run>, B<--simulate>" msgstr "B<--no-act> | B<--dry-run> | B<--simulate>" # type: Plain text -#: ../../man/dpkg.1:438 +#: ../../man/dpkg.1:441 msgid "" "Do everything which is supposed to be done, but don't write any changes. " "This is used to see what would happen with the specified action, without " @@ -2684,7 +2709,7 @@ msgstr "" "указанного действия, но при этом ничего не меняется." # type: Plain text -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 msgid "" "Be sure to give B<--no-act> before the action-parameter, or you might end up " "with undesirable results. (e.g. B will first " @@ -2697,13 +2722,13 @@ msgstr "" "удалить пакет --no-act, хотя вы ожидали, что ничего выполнено не будет)" # type: TP -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, fuzzy, no-wrap msgid "B<-R>, B<--recursive>" msgstr "B<-R> | B<--recursive>" # type: Plain text -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 msgid "" "Recursively handle all regular files matching pattern B<*.deb> found at " "specified directories and all of its subdirectories. This can be used with " @@ -2715,13 +2740,13 @@ msgstr "" "B<--avail>." # type: TP -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, no-wrap msgid "B<-G>" msgstr "B<-G>" # type: Plain text -#: ../../man/dpkg.1:453 +#: ../../man/dpkg.1:456 #, fuzzy msgid "" "Don't install a package if a newer version of the same package is already " @@ -2731,7 +2756,7 @@ msgstr "" "Это синоним параметра B<--refuse-downgrade>." # type: TP -#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 +#: ../../man/dpkg.1:456 ../../man/dpkg-buildpackage.1:168 #: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 #: ../../man/dpkg-shlibdeps.1:105 #, no-wrap @@ -2739,7 +2764,7 @@ msgid "B<--admindir=>I" msgstr "" # type: Plain text -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 msgid "" "Change default administrative directory, which contains many files that give " "information about status of installed or uninstalled packages, etc. " @@ -2747,13 +2772,13 @@ msgid "" msgstr "" # type: TP -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 #, fuzzy, no-wrap msgid "B<--instdir=>I" msgstr "B<--status-fd >InE>" # type: Plain text -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy msgid "" "Change default installation directory which refers to the directory where " @@ -2772,26 +2797,26 @@ msgstr "" "-- в значение IB." # type: TP -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, fuzzy, no-wrap msgid "B<--root=>I" msgstr "B<--log=>I<имя файла>" # type: Plain text -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 msgid "" "Changing B changes B to I and B to IB." msgstr "" # type: TP -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 #, fuzzy, no-wrap msgid "B<-O>, B<--selected-only>" msgstr "B<-O> | B<--selected-only>" # type: Plain text -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 msgid "" "Only process the packages that are selected for installation. The actual " "marking is done with B or by B, when it handles packages. For " @@ -2803,13 +2828,13 @@ msgstr "" "Например, когда пакет удаляется, он будет помечен для удаления." # type: TP -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, fuzzy, no-wrap msgid "B<-E>, B<--skip-same-version>" msgstr "B<-E> | B<--skip-same-version>" # type: Plain text -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 msgid "" "Don't install the package if the same version of the package is already " "installed." @@ -2817,13 +2842,13 @@ msgstr "" "Не устанавливать пакет, если та же версия этого пакета уже установлена." # type: TP -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, no-wrap msgid "B<--status-fd >InE>" msgstr "B<--status-fd >InE>" # type: Plain text -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, fuzzy msgid "" "Send package status info to file descriptor InE>. This can be " @@ -2841,13 +2866,13 @@ msgstr "" "conffile : 'current-conffile' 'new-conffile' useredited distedited'" # type: TP -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, no-wrap msgid "B<--log=>I" msgstr "B<--log=>I<имя файла>" # type: Plain text -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, fuzzy msgid "" "Log status change updates and actions to I, instead of the default " @@ -2873,42 +2898,42 @@ msgstr "" "где Idecision> может быть install или keep." # type: TP -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, no-wrap msgid "B<--no-debsig>" msgstr "B<--no-debsig>" # type: Plain text -#: ../../man/dpkg.1:501 +#: ../../man/dpkg.1:504 msgid "Do not try to verify package signatures." msgstr "Не пытаться проверять подпись пакета." # type: TP -#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14 +#: ../../man/dpkg.1:506 ../../man/dpkg.cfg.5:14 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 msgid "Configuration file with default options." msgstr "Файл конфигурации с параметрами по умолчанию." # type: TP -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:510 +#: ../../man/dpkg.1:513 msgid "Default log file (see I(5) and option B<--log>)." msgstr "" "Файл журнала по умолчанию (смотрите I(5) и параметр B<--" "log>)." # type: Plain text -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 msgid "" "The other files listed below are in their default directories, see option " "B<--admindir> to see how to change locations of these files." @@ -2917,24 +2942,24 @@ msgstr "" "параметр B, чтобы узнать, как изменить местоположение этих файлов." # type: TP -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 msgid "List of available packages." msgstr "Список доступных пакетов." # type: TP -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:522 +#: ../../man/dpkg.1:525 msgid "" "Statuses of available packages. This file contains information about whether " "a package is marked for removing or not, whether it is installed or not, " @@ -2945,7 +2970,7 @@ msgstr "" "B<ИНФОРМАЦИЯ О ПАКЕТАХ>, где приведена подробная информация." # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 msgid "" "The following files are components of a binary package. See B(5) for " "more information about them:" @@ -2954,55 +2979,55 @@ msgstr "" "(5), где приведена подробная информация:" # type: TP -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:527 +#: ../../man/dpkg.1:530 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:529 +#: ../../man/dpkg.1:532 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:531 +#: ../../man/dpkg.1:534 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:533 +#: ../../man/dpkg.1:536 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:535 +#: ../../man/dpkg.1:538 #, no-wrap msgid "I" msgstr "I" # type: SH -#: ../../man/dpkg.1:538 +#: ../../man/dpkg.1:541 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ" # type: TP -#: ../../man/dpkg.1:539 +#: ../../man/dpkg.1:542 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 msgid "" "Define this to something if you prefer B starting a new shell rather " "than suspending itself, while doing a shell escape." @@ -3011,25 +3036,25 @@ msgstr "" "себя, а создаёт новый процесс." # type: TP -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:546 +#: ../../man/dpkg.1:549 #, fuzzy msgid "The program B will execute when starting a new shell." msgstr "Программа, которую запустит B при старте новой оболочки." # type: TP -#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144 +#: ../../man/dpkg.1:549 ../../man/dpkg-query.1:145 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:550 +#: ../../man/dpkg.1:553 msgid "" "Sets the number of columns B should use when displaying formatted " "text. Currently only used by -l." @@ -3039,7 +3064,7 @@ msgstr "" "B<-l>." # type: SH -#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 +#: ../../man/dpkg.1:554 ../../man/dpkg-architecture.1:246 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 #: ../../man/update-alternatives.8:356 #, no-wrap @@ -3047,53 +3072,53 @@ msgid "EXAMPLES" msgstr "ПРИМЕРЫ" # type: Plain text -#: ../../man/dpkg.1:553 +#: ../../man/dpkg.1:556 #, fuzzy msgid "To list packages related to the editor B(1):" msgstr "Показать список пакетов, относящихся к редактору vi:" # type: Plain text -#: ../../man/dpkg.1:555 +#: ../../man/dpkg.1:558 #, fuzzy, no-wrap msgid " B\n" msgstr "B< dpkg -l \\(aq*vi*\\(aq>" # type: Plain text -#: ../../man/dpkg.1:558 +#: ../../man/dpkg.1:561 #, fuzzy msgid "To see the entries in I of two packages:" msgstr "Посмотреть записи о двух пакетах в файле B:" # type: Plain text -#: ../../man/dpkg.1:560 +#: ../../man/dpkg.1:563 #, fuzzy, no-wrap msgid " B\n" msgstr "B< dpkg --print-avail elvis vim | less>" # type: Plain text -#: ../../man/dpkg.1:563 +#: ../../man/dpkg.1:566 msgid "To search the listing of packages yourself:" msgstr "Вручную просмотреть список пакетов:" # type: Plain text -#: ../../man/dpkg.1:565 +#: ../../man/dpkg.1:568 #, fuzzy, no-wrap msgid " B\n" msgstr "B< less /var/lib/dpkg/available>" # type: Plain text -#: ../../man/dpkg.1:568 +#: ../../man/dpkg.1:571 msgid "To remove an installed elvis package:" msgstr "Удалить установленный пакет elvis:" # type: Plain text -#: ../../man/dpkg.1:570 +#: ../../man/dpkg.1:573 #, fuzzy, no-wrap msgid " B\n" msgstr "B< dpkg -r elvis>" # type: Plain text -#: ../../man/dpkg.1:575 +#: ../../man/dpkg.1:578 msgid "" "To install a package, you first need to find it in an archive or CDROM. The " "\"available\" file shows that the vim package is in section \"editors\":" @@ -3103,7 +3128,7 @@ msgstr "" "\" (\"редакторы\"):" # type: Plain text -#: ../../man/dpkg.1:578 +#: ../../man/dpkg.1:581 #, fuzzy, no-wrap msgid "" " B\n" @@ -3111,18 +3136,18 @@ msgid "" msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>" # type: Plain text -#: ../../man/dpkg.1:581 +#: ../../man/dpkg.1:584 msgid "To make a local copy of the package selection states:" msgstr "Получить локальную копию состояний выбранных пакетов:" # type: Plain text -#: ../../man/dpkg.1:583 +#: ../../man/dpkg.1:586 #, fuzzy, no-wrap msgid " Bmyselections>\n" msgstr "B< dpkg --get-selections Emyselections>" # type: Plain text -#: ../../man/dpkg.1:587 +#: ../../man/dpkg.1:590 msgid "" "You might transfer this file to another computer, and install it there with:" msgstr "" @@ -3130,7 +3155,7 @@ msgstr "" "помощью:" # type: Plain text -#: ../../man/dpkg.1:590 +#: ../../man/dpkg.1:593 #, fuzzy, no-wrap msgid "" " B\n" @@ -3138,7 +3163,7 @@ msgid "" msgstr "B< dpkg --set-selections Emyselections>" # type: Plain text -#: ../../man/dpkg.1:596 +#: ../../man/dpkg.1:599 #, fuzzy msgid "" "Note that this will not actually install or remove anything, but just set " @@ -3152,7 +3177,7 @@ msgstr "" "Например, запустите B и выберите \"Установить\"." # type: Plain text -#: ../../man/dpkg.1:599 +#: ../../man/dpkg.1:602 msgid "" "Ordinarily, you will find that B(1) provides a more convenient way " "to modify the package selection states." @@ -3161,13 +3186,13 @@ msgstr "" "выбранных пакетов." # type: SH -#: ../../man/dpkg.1:601 +#: ../../man/dpkg.1:604 #, no-wrap msgid "ADDITIONAL FUNCTIONALITY" msgstr "ДОПОЛНИТЕЛЬНАЯ ФУНКЦИОНАЛЬНОСТЬ" # type: Plain text -#: ../../man/dpkg.1:604 +#: ../../man/dpkg.1:607 #, fuzzy msgid "" "Additional functionality can be gained by installing any of the following " @@ -3177,7 +3202,7 @@ msgstr "" "следующих пакетов: I, I и I." # type: Plain text -#: ../../man/dpkg.1:614 +#: ../../man/dpkg.1:617 msgid "" "B(1), B(1), B(1), B(5), B" "(5), B(5), and B(8)." @@ -3186,12 +3211,12 @@ msgstr "" "(5), B(5) и B(8)." # type: Plain text -#: ../../man/dpkg.1:617 +#: ../../man/dpkg.1:620 msgid "B<--no-act> usually gives less information than might be helpful." msgstr "B<--no-act> обычно дает меньше информации, чем могло бы быть полезным." # type: SH -#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 +#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:191 #: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 #: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 @@ -3201,7 +3226,7 @@ msgid "AUTHORS" msgstr "АВТОРЫ" # type: Plain text -#: ../../man/dpkg.1:622 +#: ../../man/dpkg.1:625 #, no-wrap msgid "" "See I for the list of people who have\n" @@ -3929,7 +3954,7 @@ msgstr "" # type: Plain text #: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 -#: ../../man/dpkg-query.1:160 ../../man/dpkg-statoverride.8:80 +#: ../../man/dpkg-query.1:161 ../../man/dpkg-statoverride.8:80 #, fuzzy msgid "B(1)." msgstr "B(1)." @@ -5840,7 +5865,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:129 +#: ../../man/dpkg-query.1:130 #, no-wrap msgid "" " B\n" @@ -5848,6 +5873,7 @@ msgid "" " B\n" " B\n" " B\n" +" B\n" " B\n" " B\n" " B\n" @@ -5874,7 +5900,7 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:137 +#: ../../man/dpkg-query.1:138 msgid "" "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq. " "Actually, all other fields found in the status file (i.e. user defined " @@ -5884,38 +5910,38 @@ msgid "" msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:141 +#: ../../man/dpkg-query.1:142 #, no-wrap msgid " B\n" msgstr "" # type: SH -#: ../../man/dpkg-query.1:143 +#: ../../man/dpkg-query.1:144 #, fuzzy, no-wrap msgid "ENVIRONMENT" msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ" # type: Plain text -#: ../../man/dpkg-query.1:148 +#: ../../man/dpkg-query.1:149 msgid "" "This setting influences the output of the B<--list> option by changing the " "width of its output." msgstr "" # type: Plain text -#: ../../man/dpkg-query.1:151 +#: ../../man/dpkg-query.1:152 #, fuzzy msgid "Copyright (C) 2001 Wichert Akkerman" msgstr "Copyright 2001 Joey Hess" # type: UR -#: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83 +#: ../../man/dpkg-query.1:152 ../../man/dpkg-statoverride.8:83 #, fuzzy, no-wrap msgid "mailto:wakkerma@debian.org" msgstr "mailto:joeyh@debian.org" # type: Plain text -#: ../../man/dpkg-query.1:153 ../../man/dpkg-statoverride.8:85 +#: ../../man/dpkg-query.1:154 ../../man/dpkg-statoverride.8:85 #, fuzzy msgid "Ewakkerma@debian.orgE" msgstr "Ejoeyh@debian.orgE." diff --git a/man/po/sv.po b/man/po/sv.po index ad9f4c1d..e819a02a 100644 --- a/man/po/sv.po +++ b/man/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg man pages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-21 16:13+0300\n" +"POT-Creation-Date: 2007-08-18 04:22+0300\n" "PO-Revision-Date: 2007-08-05 21:52+0100\n" "Last-Translator: Peter Karlsson \n" "Language-Team: Swedish \n" @@ -173,7 +173,7 @@ msgstr "B<822-date> tar inga argument eller flaggor." # type: SH #: ../../man/822-date.1:24 ../../man/cleanup-info.8:48 -#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:615 +#: ../../man/deb-substvars.5:125 ../../man/dpkg.1:618 #: ../../man/dpkg-buildpackage.1:179 ../../man/dpkg-deb.1:221 #: ../../man/dpkg-name.1:87 ../../man/dpkg-source.1:231 #: ../../man/dpkg-split.1:200 ../../man/dselect.1:427 @@ -189,13 +189,13 @@ msgstr "Funktionen borde ing # type: SH #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67 -#: ../../man/deb-control.5:206 ../../man/deb-old.5:51 +#: ../../man/deb-control.5:214 ../../man/deb-old.5:51 #: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29 -#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:605 +#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608 #: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21 #: ../../man/dpkg-buildpackage.1:184 ../../man/dpkg-deb.1:238 #: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:97 -#: ../../man/dpkg-query.1:158 ../../man/dpkg-scanpackages.1:95 +#: ../../man/dpkg-query.1:159 ../../man/dpkg-scanpackages.1:95 #: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:127 #: ../../man/dpkg-source.1:242 ../../man/dpkg-split.1:226 #: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443 @@ -215,7 +215,7 @@ msgstr "I (RFC2822), B(1)." #: ../../man/deb-substvars.5:136 ../../man/dpkg-architecture.1:272 #: ../../man/dpkg.cfg.5:17 ../../man/dpkg-checkbuilddeps.1:31 #: ../../man/dpkg-deb.1:244 ../../man/dpkg-divert.8:121 -#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:149 +#: ../../man/dpkg-name.1:105 ../../man/dpkg-query.1:150 #: ../../man/dpkg-scansources.1:69 ../../man/dpkg-split.1:232 #: ../../man/dpkg-statoverride.8:81 ../../man/dselect.cfg.5:17 #: ../../man/install-info.8:291 ../../man/update-alternatives.8:392 @@ -381,7 +381,7 @@ msgstr "Visar version och avslutar." # type: SH #: ../../man/cleanup-info.8:43 ../../man/deb-substvars.5:120 -#: ../../man/dpkg.1:502 ../../man/dpkg.cfg.5:12 +#: ../../man/dpkg.1:505 ../../man/dpkg.cfg.5:12 #: ../../man/dpkg-distaddfile.1:39 ../../man/dpkg-divert.8:108 #: ../../man/dpkg-genchanges.1:134 ../../man/dpkg-gencontrol.1:105 #: ../../man/dpkg-parsechangelog.1:40 ../../man/dpkg-shlibdeps.1:116 @@ -425,7 +425,7 @@ msgstr "Upphovsr #: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248 #: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150 #: ../../man/dpkg-gencontrol.1:125 ../../man/dpkg-name.1:109 -#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:157 +#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:158 #: ../../man/dpkg-shlibdeps.1:136 ../../man/dpkg-source.1:253 #: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:88 #: ../../man/install-info.8:295 ../../man/update-alternatives.8:397 @@ -928,12 +928,32 @@ msgstr "" # type: TP #: ../../man/deb-control.5:138 +#, fuzzy, no-wrap +msgid "B Epackage listE" +msgstr "B EpaketlistaE" + +# type: Plain text +#: ../../man/deb-control.5:146 +#, fuzzy +msgid "" +"Lists packages that this one breaks, for example by exposing bugs when the " +"named packages rely on this one. The package maintenance software will not " +"allow broken packages to be configured; generally the resolution is to " +"upgrade the packages named in a B field." +msgstr "" +"Listar paket som är i konflikt (krockar) med detta, till exempel genom att " +"innehålla filer med samma namn. Pakethanteringsprogramvaran tillåter inte " +"två sådana paket att vara installerade samtidigt. Två paket med inbördes " +"konflikt bör innehålla en B-rad med varandras namn." + +# type: TP +#: ../../man/deb-control.5:146 #, no-wrap msgid "B Epackage listE" msgstr "B EpaketlistaE" # type: Plain text -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 msgid "" "Lists packages that conflict with this one, for example by containing files " "with the same names. The package maintenance software will not allow " @@ -946,13 +966,13 @@ msgstr "" "konflikt bör innehålla en B-rad med varandras namn." # type: TP -#: ../../man/deb-control.5:146 +#: ../../man/deb-control.5:154 #, no-wrap msgid "B Epackage listE" msgstr "B EpaketlistaE" # type: Plain text -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 msgid "" "List of packages files from which this one replaces. This is used for " "allowing this package to overwrite the files of another package and is " @@ -966,13 +986,13 @@ msgstr "" "paketet det står i konflikt med." # type: TP -#: ../../man/deb-control.5:154 +#: ../../man/deb-control.5:162 #, no-wrap msgid "B Epackage listE" msgstr "B EpaketlistaE" # type: Plain text -#: ../../man/deb-control.5:164 +#: ../../man/deb-control.5:172 msgid "" "This is a list of virtual packages that this one provides. Usually this is " "used in the case of several packages all providing the same service. For " @@ -993,7 +1013,7 @@ msgstr "" "och använda \"|\" för att dela av listan." # type: Plain text -#: ../../man/deb-control.5:179 +#: ../../man/deb-control.5:187 msgid "" "The syntax of B, B and B is a list of package " "names, separated by commas (and optional whitespace). In the B " @@ -1008,13 +1028,13 @@ msgstr "" "fälten." # type: SH -#: ../../man/deb-control.5:180 +#: ../../man/deb-control.5:188 #, no-wrap msgid "EXAMPLE" msgstr "EXEMPEL" # type: Plain text -#: ../../man/deb-control.5:203 +#: ../../man/deb-control.5:211 #, no-wrap msgid "" "# Comment\n" @@ -1060,7 +1080,7 @@ msgstr "" " will run more slowly, however.)\n" # type: Plain text -#: ../../man/deb-control.5:209 +#: ../../man/deb-control.5:217 msgid "B(5), B(1), B(1)." msgstr "B(5), B(8), B(1)." @@ -2615,7 +2635,12 @@ msgstr "" "B: Ignorera versionsnummer när beroenden kontrolleras." # type: Plain text -#: ../../man/dpkg.1:378 +#: ../../man/dpkg.1:377 +msgid "B: Install, even if this would break another package." +msgstr "" + +# type: Plain text +#: ../../man/dpkg.1:381 msgid "" "B: Install, even if it conflicts with another package. This is " "dangerous, for it will usually cause overwriting of some files." @@ -2625,7 +2650,7 @@ msgstr "" "filer skrivs över." # type: Plain text -#: ../../man/dpkg.1:383 +#: ../../man/dpkg.1:386 msgid "" "B: Always install a missing configuration file. This is dangerous, " "since it means not preserving a change (removing) made to the file." @@ -2634,7 +2659,7 @@ msgstr "" "farligt, eftersom det inte bibehåller ändringar (raderingar) av filer." # type: Plain text -#: ../../man/dpkg.1:388 +#: ../../man/dpkg.1:391 msgid "" "B: If a conffile has been modified always install the new version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2645,7 +2670,7 @@ msgstr "" "det förvalda alternativet kommer att utföras." # type: Plain text -#: ../../man/dpkg.1:393 +#: ../../man/dpkg.1:396 msgid "" "B: If a conffile has been modified always keep the old version " "without prompting, unless the B<--force-confdef> is also specified, in which " @@ -2656,7 +2681,7 @@ msgstr "" "det förvalda alternativet kommer att utföras." # type: Plain text -#: ../../man/dpkg.1:399 +#: ../../man/dpkg.1:402 msgid "" "B: If a conffile has been modified always choose the default " "action. If there is no default action it will stop to ask the user unless " @@ -2669,17 +2694,17 @@ msgstr "" "också angetts, i så fall används den för att bestämma vad som skall utföras." # type: Plain text -#: ../../man/dpkg.1:402 +#: ../../man/dpkg.1:405 msgid "B: Overwrite one package's file with another's file." msgstr "B: Skriv över ett pakets filer med ett annats." # type: Plain text -#: ../../man/dpkg.1:405 +#: ../../man/dpkg.1:408 msgid "B Overwrite one package's directory with another's file." msgstr "B Skriv över ett pakets kataloger med ett annats filer." # type: Plain text -#: ../../man/dpkg.1:408 +#: ../../man/dpkg.1:411 msgid "" "B: Overwrite a diverted file with an undiverted version." msgstr "" @@ -2687,12 +2712,12 @@ msgstr "" "version." # type: Plain text -#: ../../man/dpkg.1:411 +#: ../../man/dpkg.1:414 msgid "B: Process even packages with the wrong architecture." msgstr "B: Hantera även paket med fel maskinvaruarkitektur." # type: Plain text -#: ../../man/dpkg.1:414 +#: ../../man/dpkg.1:417 msgid "" "B: B is missing important programs, so problems are likely." msgstr "" @@ -2700,25 +2725,25 @@ msgstr "" "troliga." # type: Plain text -#: ../../man/dpkg.1:417 +#: ../../man/dpkg.1:420 msgid "B: Try to (de)install things even when not root." msgstr "B: Försök (av)installera saker även utan att vara root." # type: Plain text -#: ../../man/dpkg.1:420 +#: ../../man/dpkg.1:423 msgid "B: Install a package even if it fails authenticity check." msgstr "" "B: Installera ett paket även om det inte går att verifiera dess " "äkthet." # type: TP -#: ../../man/dpkg.1:421 +#: ../../man/dpkg.1:424 #, no-wrap msgid "B<--ignore-depends>=I,..." msgstr "B<--ignore-depends>=I,..." # type: Plain text -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 msgid "" "Ignore dependency-checking for specified packages (actually, checking is " "performed, but only warnings about conflicts are given, nothing else)." @@ -2727,13 +2752,13 @@ msgstr "" "kontrollen, men det ges endast varningar, ingenting annat)." # type: TP -#: ../../man/dpkg.1:425 +#: ../../man/dpkg.1:428 #, no-wrap msgid "B<--new>, B<--old>" msgstr "B<--new>, B<--old>" # type: Plain text -#: ../../man/dpkg.1:429 +#: ../../man/dpkg.1:432 msgid "" "Select new or old binary package format. This is a B(1) option." msgstr "" @@ -2741,13 +2766,13 @@ msgstr "" "deb>(1)." # type: TP -#: ../../man/dpkg.1:429 ../../man/dpkg-deb.1:211 +#: ../../man/dpkg.1:432 ../../man/dpkg-deb.1:211 #, no-wrap msgid "B<--nocheck>" msgstr "B<--nocheck>" # type: Plain text -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 msgid "" "Don't read or check contents of control file while building a package. This " "is a B(1) option." @@ -2756,13 +2781,13 @@ msgstr "" "Detta är en flagga till B(1)." # type: TP -#: ../../man/dpkg.1:433 +#: ../../man/dpkg.1:436 #, no-wrap msgid "B<--no-act>, B<--dry-run>, B<--simulate>" msgstr "B<--no-act>, B<--dry-run>, B<--simulate>" # type: Plain text -#: ../../man/dpkg.1:438 +#: ../../man/dpkg.1:441 msgid "" "Do everything which is supposed to be done, but don't write any changes. " "This is used to see what would happen with the specified action, without " @@ -2772,7 +2797,7 @@ msgstr "" "för att se vad som skulle ha hänt med åtgärden utan att faktiskt ändra något." # type: Plain text -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 msgid "" "Be sure to give B<--no-act> before the action-parameter, or you might end up " "with undesirable results. (e.g. B will first " @@ -2785,13 +2810,13 @@ msgstr "" "att du troligen förväntade dig att ingenting skulle utföras)" # type: TP -#: ../../man/dpkg.1:443 +#: ../../man/dpkg.1:446 #, no-wrap msgid "B<-R>, B<--recursive>" msgstr "B<-R>, B<--recursive>" # type: Plain text -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 msgid "" "Recursively handle all regular files matching pattern B<*.deb> found at " "specified directories and all of its subdirectories. This can be used with " @@ -2802,13 +2827,13 @@ msgstr "" "tillsammans med B<-i>, B<-A>, B<--install>, B<--unpack> och B<--avail>." # type: TP -#: ../../man/dpkg.1:449 +#: ../../man/dpkg.1:452 #, no-wrap msgid "B<-G>" msgstr "B<-G>" # type: Plain text -#: ../../man/dpkg.1:453 +#: ../../man/dpkg.1:456 msgid "" "Don't install a package if a newer version of the same package is already " "installed. This is an alias of B<--refuse-downgrade>." @@ -2817,7 +2842,7 @@ msgstr "" "installerat. Detta är ett alias för B<--refuse-downgrade>." # type: TP -#: ../../man/dpkg.1:453 ../../man/dpkg-buildpackage.1:168 +#: ../../man/dpkg.1:456 ../../man/dpkg-buildpackage.1:168 #: ../../man/dpkg-checkbuilddeps.1:19 ../../man/dpkg-query.1:70 #: ../../man/dpkg-shlibdeps.1:105 #, no-wrap @@ -2825,7 +2850,7 @@ msgid "B<--admindir=>I" msgstr "B<--admindir=>I" # type: Plain text -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 msgid "" "Change default administrative directory, which contains many files that give " "information about status of installed or uninstalled packages, etc. " @@ -2836,13 +2861,13 @@ msgstr "" "(standardvärde är I)" # type: TP -#: ../../man/dpkg.1:458 +#: ../../man/dpkg.1:461 #, no-wrap msgid "B<--instdir=>I" msgstr "B<--instdir=>I" # type: Plain text -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 msgid "" "Change default installation directory which refers to the directory where " "packages are to be installed. B is also the directory passed to " @@ -2855,13 +2880,13 @@ msgstr "" "skripten ser B som rotkatalog. (Förval är I)" # type: TP -#: ../../man/dpkg.1:465 +#: ../../man/dpkg.1:468 #, no-wrap msgid "B<--root=>I" msgstr "B<--root=>I" # type: Plain text -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 msgid "" "Changing B changes B to I and B to IB." @@ -2870,13 +2895,13 @@ msgstr "" "B till IB." # type: TP -#: ../../man/dpkg.1:469 +#: ../../man/dpkg.1:472 #, no-wrap msgid "B<-O>, B<--selected-only>" msgstr "B<-O>, B<--selected-only>" # type: Plain text -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 msgid "" "Only process the packages that are selected for installation. The actual " "marking is done with B or by B, when it handles packages. For " @@ -2888,13 +2913,13 @@ msgstr "" "kommer paket som tas bort att markeras för installation." # type: TP -#: ../../man/dpkg.1:475 +#: ../../man/dpkg.1:478 #, no-wrap msgid "B<-E>, B<--skip-same-version>" msgstr "B<-E>, B<--skip-same-version>" # type: Plain text -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 msgid "" "Don't install the package if the same version of the package is already " "installed." @@ -2902,13 +2927,13 @@ msgstr "" "Installera inte paketet om samma version av paketet redan är installerat." # type: TP -#: ../../man/dpkg.1:479 +#: ../../man/dpkg.1:482 #, no-wrap msgid "B<--status-fd >InE>" msgstr "B<--status-fd >InE>" # type: Plain text -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 msgid "" "Send package status info to file descriptor InE>. This can be " "given multiple times. Status updates are of the form `status: EpkgE: " @@ -2925,13 +2950,13 @@ msgstr "" "prompt: conffile : \"nuvarande-fil\" \"ny-fil\" useredited distedited\"" # type: TP -#: ../../man/dpkg.1:486 +#: ../../man/dpkg.1:489 #, no-wrap msgid "B<--log=>I" msgstr "B<--log=>I" # type: Plain text -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 msgid "" "Log status change updates and actions to I, instead of the default " "I. If this option is given multiple times, the last " @@ -2954,40 +2979,40 @@ msgstr "" "konfigurationsfilsändringar där Ival> antingen är install eller keep." # type: TP -#: ../../man/dpkg.1:498 +#: ../../man/dpkg.1:501 #, no-wrap msgid "B<--no-debsig>" msgstr "B<--no-debsig>" # type: Plain text -#: ../../man/dpkg.1:501 +#: ../../man/dpkg.1:504 msgid "Do not try to verify package signatures." msgstr "Försök inte verifiera paketsignaturer." # type: TP -#: ../../man/dpkg.1:503 ../../man/dpkg.cfg.5:14 +#: ../../man/dpkg.1:506 ../../man/dpkg.cfg.5:14 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 msgid "Configuration file with default options." msgstr "Konfigurationsfil med förvalda inställningar." # type: TP -#: ../../man/dpkg.1:506 +#: ../../man/dpkg.1:509 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:510 +#: ../../man/dpkg.1:513 msgid "Default log file (see I(5) and option B<--log>)." msgstr "Förvald loggfil (se I(5) och flaggan B<--log>)." # type: Plain text -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 msgid "" "The other files listed below are in their default directories, see option " "B<--admindir> to see how to change locations of these files." @@ -2996,24 +3021,24 @@ msgstr "" "admindir> för information om hur du ändrar placeringen av dessa filer." # type: TP -#: ../../man/dpkg.1:513 +#: ../../man/dpkg.1:516 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 msgid "List of available packages." msgstr "Lista över tillgängliga paket." # type: TP -#: ../../man/dpkg.1:516 +#: ../../man/dpkg.1:519 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../../man/dpkg.1:522 +#: ../../man/dpkg.1:525 msgid "" "Statuses of available packages. This file contains information about whether " "a package is marked for removing or not, whether it is installed or not, " @@ -3024,7 +3049,7 @@ msgstr "" "osv. Se sektionen B för ytterligare information." # type: Plain text -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 msgid "" "The following files are components of a binary package. See B(5) for " "more information about them:" @@ -3033,55 +3058,55 @@ msgstr "" "ytterligare information om dem:" # type: TP -#: ../../man/dpkg.1:525 +#: ../../man/dpkg.1:528 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:527 +#: ../../man/dpkg.1:530 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:529 +#: ../../man/dpkg.1:532 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:531 +#: ../../man/dpkg.1:534 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:533 +#: ../../man/dpkg.1:536 #, no-wrap msgid "I" msgstr "I" # type: TP -#: ../../man/dpkg.1:535 +#: ../../man/dpkg.1:538 #, no-wrap msgid "I" msgstr "I" # type: SH -#: ../../man/dpkg.1:538 +#: ../../man/dpkg.1:541 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "MILJÖVARIABLER" # type: TP -#: ../../man/dpkg.1:539 +#: ../../man/dpkg.1:542 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 msgid "" "Define this to something if you prefer B starting a new shell rather " "than suspending itself, while doing a shell escape." @@ -3090,24 +3115,24 @@ msgstr "" "skal istället för att lägga sig i bakgrunden när ett skal startas." # type: TP -#: ../../man/dpkg.1:543 +#: ../../man/dpkg.1:546 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:546 +#: ../../man/dpkg.1:549 msgid "The program B will execute when starting a new shell." msgstr "Programmet B kommer att exekveras när ett nytt skal startas." # type: TP -#: ../../man/dpkg.1:546 ../../man/dpkg-query.1:144 +#: ../../man/dpkg.1:549 ../../man/dpkg-query.1:145 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../../man/dpkg.1:550 +#: ../../man/dpkg.1:553 msgid "" "Sets the number of columns B should use when displaying formatted " "text. Currently only used by -l." @@ -3116,7 +3141,7 @@ msgstr "" "Används för närvarande enbart av -l." # type: SH -#: ../../man/dpkg.1:551 ../../man/dpkg-architecture.1:246 +#: ../../man/dpkg.1:554 ../../man/dpkg-architecture.1:246 #: ../../man/dpkg-divert.8:87 ../../man/dpkg-name.1:66 #: ../../man/update-alternatives.8:356 #, no-wrap @@ -3124,52 +3149,52 @@ msgid "EXAMPLES" msgstr "EXEMPEL" # type: Plain text -#: ../../man/dpkg.1:553 +#: ../../man/dpkg.1:556 msgid "To list packages related to the editor B(1):" msgstr "" "För att lista paket relaterade till textredigeringsprogrammet B(1):" # type: Plain text -#: ../../man/dpkg.1:555 +#: ../../man/dpkg.1:558 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:558 +#: ../../man/dpkg.1:561 msgid "To see the entries in I of two packages:" msgstr "För att se posterna i I för två paket:" # type: Plain text -#: ../../man/dpkg.1:560 +#: ../../man/dpkg.1:563 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:563 +#: ../../man/dpkg.1:566 msgid "To search the listing of packages yourself:" msgstr "För att själv söka i paketlistan:" # type: Plain text -#: ../../man/dpkg.1:565 +#: ../../man/dpkg.1:568 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:568 +#: ../../man/dpkg.1:571 msgid "To remove an installed elvis package:" msgstr "För att ta bort det installerade paketet elvis:" # type: Plain text -#: ../../man/dpkg.1:570 +#: ../../man/dpkg.1:573 #, no-wrap msgid " B\n" msgstr " B\n" # type: Plain text -#: ../../man/dpkg.1:575 +#: ../../man/dpkg.1:578 msgid "" "To install a package, you first need to find it in an archive or CDROM. The " "\"available\" file shows that the vim package is in section \"editors\":" @@ -3179,7 +3204,7 @@ msgstr "" "\"editors\":" # type: Plain text -#: ../../man/dpkg.1:578 +#: ../../man/dpkg.1:581 #, no-wrap msgid "" " B\n" @@ -3189,18 +3214,18 @@ msgstr "" " B\n" # type: Plain text -#: ../../man/dpkg.1:581 +#: ../../man/dpkg.1:584 msgid "To make a local copy of the package selection states:" msgstr "För att göra en lokal kopia av paketmarkeringarna:" # type: Plain text -#: ../../man/dpkg.1:583 +#: ../../man/dpkg.1:586 #, no-wrap msgid " Bmyselections>\n" msgstr " Bmitturval>\n" # type: Plain text -#: ../../man/dpkg.1:587 +#: ../../man/dpkg.1:590 msgid "" "You might transfer this file to another computer, and install it there with:" msgstr "" @@ -3208,7 +3233,7 @@ msgstr "" "skriva:" # type: Plain text -#: ../../man/dpkg.1:590 +#: ../../man/dpkg.1:593 #, no-wrap msgid "" " B\n" @@ -3218,7 +3243,7 @@ msgstr "" " Bmitturval>\n" # type: Plain text -#: ../../man/dpkg.1:596 +#: ../../man/dpkg.1:599 msgid "" "Note that this will not actually install or remove anything, but just set " "the selection state on the requested packages. You will need some other " @@ -3231,7 +3256,7 @@ msgstr "" "Till exempel kan du köra B och välja I." # type: Plain text -#: ../../man/dpkg.1:599 +#: ../../man/dpkg.1:602 msgid "" "Ordinarily, you will find that B(1) provides a more convenient way " "to modify the package selection states." @@ -3240,13 +3265,13 @@ msgstr "" "ett bekvämare sätt att ändra paketmarkeringarna." # type: SH -#: ../../man/dpkg.1:601 +#: ../../man/dpkg.1:604 #, no-wrap msgid "ADDITIONAL FUNCTIONALITY" msgstr "YTTERLIGARE FUNKTIONER" # type: Plain text -#: ../../man/dpkg.1:604 +#: ../../man/dpkg.1:607 msgid "" "Additional functionality can be gained by installing any of the following " "packages: B, B and B." @@ -3255,7 +3280,7 @@ msgstr "" "paket: B, B och B." # type: Plain text -#: ../../man/dpkg.1:614 +#: ../../man/dpkg.1:617 msgid "" "B(1), B(1), B(1), B(5), B" "(5), B(5), and B(8)." @@ -3264,12 +3289,12 @@ msgstr "" "(5), B(5) och B(8)." # type: Plain text -#: ../../man/dpkg.1:617 +#: ../../man/dpkg.1:620 msgid "B<--no-act> usually gives less information than might be helpful." msgstr "B<--no-act> ger oftast mindre information än vad som vore hjälpsamt." # type: SH -#: ../../man/dpkg.1:618 ../../man/dpkg-buildpackage.1:191 +#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:191 #: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144 #: ../../man/dpkg-gencontrol.1:119 ../../man/dpkg-parsechangelog.1:48 #: ../../man/dpkg-shlibdeps.1:130 ../../man/dpkg-source.1:247 @@ -3279,7 +3304,7 @@ msgid "AUTHORS" msgstr "FÖRFATTARE" # type: Plain text -#: ../../man/dpkg.1:622 +#: ../../man/dpkg.1:625 #, no-wrap msgid "" "See I for the list of people who have\n" @@ -4127,7 +4152,7 @@ msgstr "" # type: Plain text #: ../../man/dpkg.cfg.5:22 ../../man/dpkg-divert.8:120 -#: ../../man/dpkg-query.1:160 ../../man/dpkg-statoverride.8:80 +#: ../../man/dpkg-query.1:161 ../../man/dpkg-statoverride.8:80 msgid "B(1)." msgstr "B(1)." @@ -6334,14 +6359,15 @@ msgstr "" "vänsterjustering kommer att användas. Följande I stöds:" # type: Plain text -#: ../../man/dpkg-query.1:129 -#, no-wrap +#: ../../man/dpkg-query.1:130 +#, fuzzy, no-wrap msgid "" " B\n" " B\n" " B\n" " B\n" " B\n" +" B\n" " B\n" " B\n" " B\n" @@ -6396,7 +6422,7 @@ msgstr "" " B\n" # type: Plain text -#: ../../man/dpkg-query.1:137 +#: ../../man/dpkg-query.1:138 msgid "" "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq. " "Actually, all other fields found in the status file (i.e. user defined " @@ -6411,19 +6437,19 @@ msgstr "" "av dpkg och kan du köra:" # type: Plain text -#: ../../man/dpkg-query.1:141 +#: ../../man/dpkg-query.1:142 #, no-wrap msgid " B\n" msgstr " B\n" # type: SH -#: ../../man/dpkg-query.1:143 +#: ../../man/dpkg-query.1:144 #, no-wrap msgid "ENVIRONMENT" msgstr "MILJÖVARIABLER" # type: Plain text -#: ../../man/dpkg-query.1:148 +#: ../../man/dpkg-query.1:149 msgid "" "This setting influences the output of the B<--list> option by changing the " "width of its output." @@ -6432,18 +6458,18 @@ msgstr "" "bredden på dess utdata." # type: Plain text -#: ../../man/dpkg-query.1:151 +#: ../../man/dpkg-query.1:152 msgid "Copyright (C) 2001 Wichert Akkerman" msgstr "Upphovsrättsskyddat © 2001 Wichert Akkerman" # type: UR -#: ../../man/dpkg-query.1:151 ../../man/dpkg-statoverride.8:83 +#: ../../man/dpkg-query.1:152 ../../man/dpkg-statoverride.8:83 #, no-wrap msgid "mailto:wakkerma@debian.org" msgstr "mailto:wakkerma@debian.org" # type: Plain text -#: ../../man/dpkg-query.1:153 ../../man/dpkg-statoverride.8:85 +#: ../../man/dpkg-query.1:154 ../../man/dpkg-statoverride.8:85 msgid "Ewakkerma@debian.orgE" msgstr "Ewakkerma@debian.orgE" diff --git a/po/ChangeLog b/po/ChangeLog index 0f06a0c9..bb2aa549 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2007-08-18 Guillem Jover + + * dpkg.pot: Regenerated. + * *.po: Merged with dpkg.pot. + 2007-08-14 Robert Luberda * pl.po: Updated to 921t. diff --git a/po/bs.po b/po/bs.po index f611d46b..688ef980 100644 --- a/po/bs.po +++ b/po/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2007-05-24 19:33+0300\n" +"POT-Creation-Date: 2007-08-18 03:58+0300\n" "PO-Revision-Date: 2006-02-17 08:50+0200\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -151,7 +151,7 @@ msgstr "" # Now that we have verified everything its time to actually # * build something. Lets start by making the ar-wrapper. -#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319 +#: lib/dbmodify.c:111 src/archives.c:650 dpkg-deb/build.c:319 #, c-format msgid "unable to create `%.255s'" msgstr "" @@ -490,7 +490,7 @@ msgstr "" msgid "malloc failed (%ld bytes)" msgstr "" -#: lib/mlib.c:64 dpkg-deb/info.c:98 +#: lib/mlib.c:64 dpkg-deb/info.c:99 #, c-format msgid "realloc failed (%ld bytes)" msgstr "" @@ -778,67 +778,64 @@ msgstr "" msgid "failed to read `%s' at line %d" msgstr "" -#: lib/parsehelp.c:39 +#: lib/parsehelp.c:41 #, c-format -msgid "%s, in file `%.255s' near line %d" +msgid "warning, in file `%.255s' near line %d" msgstr "" -#: lib/parsehelp.c:40 -msgid "warning" -msgstr "upozorenje" - -#: lib/parsehelp.c:40 -msgid "parse error" +#: lib/parsehelp.c:44 +#, c-format +msgid "parse error, in file `%.255s' near line %d" msgstr "" -#: lib/parsehelp.c:42 +#: lib/parsehelp.c:48 #, c-format msgid " package `%.255s'" msgstr "" -#: lib/parsehelp.c:53 +#: lib/parsehelp.c:59 msgid "failed to write parsing warning" msgstr "" -#: lib/parsehelp.c:113 +#: lib/parsehelp.c:119 msgid "may not be empty string" msgstr "" -#: lib/parsehelp.c:114 +#: lib/parsehelp.c:120 msgid "must start with an alphanumeric" msgstr "mora počinjati sa alfanumeričkim znakom" -#: lib/parsehelp.c:123 +#: lib/parsehelp.c:129 #, c-format msgid "character `%c' not allowed (only letters, digits and characters `%s')" msgstr "" -#: lib/parsehelp.c:178 +#: lib/parsehelp.c:184 msgid "" msgstr "" -#: lib/parsehelp.c:193 +#: lib/parsehelp.c:199 msgid "version string is empty" msgstr "" -#: lib/parsehelp.c:204 +#: lib/parsehelp.c:210 msgid "version string has embedded spaces" msgstr "" -#: lib/parsehelp.c:209 +#: lib/parsehelp.c:215 msgid "epoch in version is not number" msgstr "" -#: lib/parsehelp.c:210 +#: lib/parsehelp.c:216 msgid "nothing after colon in version number" msgstr "" -#: lib/parsehelp.c:232 +#: lib/parsehelp.c:238 #, c-format msgid "missing %s" msgstr "" -#: lib/parsehelp.c:236 +#: lib/parsehelp.c:242 #, c-format msgid "empty value for %s" msgstr "" @@ -874,283 +871,334 @@ msgstr "" msgid "error setting timestamps of `%.255s'" msgstr "" -#: src/archives.c:273 src/archives.c:618 +#: src/archives.c:273 src/archives.c:667 #, c-format msgid "error setting ownership of `%.255s'" msgstr "" -#: src/archives.c:275 src/archives.c:621 +#: src/archives.c:275 src/archives.c:670 #, c-format msgid "error setting permissions of `%.255s'" msgstr "" -#: src/archives.c:368 +#: src/archives.c:339 +#, c-format +msgid "failed to stat (dereference) existing symlink `%.250s'" +msgstr "" + +#: src/archives.c:360 #, c-format msgid "" -"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s" -"%.100s%.10s" +"failed to stat (dereference) proposed new symlink target `%.250s' for " +"symlink `%.250s'" msgstr "" -#: src/archives.c:372 -msgid " (package: " +#: src/archives.c:411 +#, c-format +msgid "" +"trying to overwrite `%.250s', which is the diverted version of `" +"%.250s' (package: %.100s)" msgstr "" -#: src/archives.c:394 +#: src/archives.c:417 +#, c-format +msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'" +msgstr "" + +#: src/archives.c:440 #, c-format msgid "unable to stat `%.255s' (which I was about to install)" msgstr "" -#: src/archives.c:402 +#: src/archives.c:448 #, c-format msgid "" "unable to clean up mess surrounding `%.255s' before installing another " "version" msgstr "" -#: src/archives.c:408 +#: src/archives.c:454 #, c-format msgid "unable to stat restored `%.255s' before installing another version" msgstr "" -#: src/archives.c:440 +#: src/archives.c:489 #, c-format msgid "archive contained object `%.255s' of unknown type 0x%x" msgstr "" -#: src/archives.c:500 +#: src/archives.c:549 #, c-format msgid "Replacing files in old package %s ...\n" msgstr "" -#: src/archives.c:503 +#: src/archives.c:552 #, fuzzy, c-format msgid "Replaced by files in installed package %s ...\n" msgstr "Ažurirani instalirani paketi" -#: src/archives.c:509 +#: src/archives.c:558 #, c-format msgid "" "trying to overwrite directory `%.250s' in package %.250s with nondirectory" msgstr "" -#: src/archives.c:519 +#: src/archives.c:568 #, c-format msgid "trying to overwrite `%.250s', which is also in package %.250s" msgstr "" -#: src/archives.c:544 +#: src/archives.c:593 #, c-format msgid "gobble replaced file `%.255s'" msgstr "" -#: src/archives.c:606 +#: src/archives.c:655 #, c-format msgid "backend dpkg-deb during `%.255s'" msgstr "" -#: src/archives.c:624 +#: src/archives.c:673 #, c-format msgid "error closing/writing `%.255s'" msgstr "" -#: src/archives.c:629 +#: src/archives.c:678 #, c-format msgid "error creating pipe `%.255s'" msgstr "" -#: src/archives.c:635 src/archives.c:641 +#: src/archives.c:684 src/archives.c:690 #, c-format msgid "error creating device `%.255s'" msgstr "" -#: src/archives.c:650 +#: src/archives.c:699 #, c-format msgid "error creating hard link `%.255s'" msgstr "" -#: src/archives.c:657 +#: src/archives.c:706 #, c-format msgid "error creating symbolic link `%.255s'" msgstr "" -#: src/archives.c:663 src/archives.c:668 +#: src/archives.c:712 src/archives.c:717 #, c-format msgid "error setting ownership of symlink `%.255s'" msgstr "" -#: src/archives.c:674 +#: src/archives.c:723 #, c-format msgid "error creating directory `%.255s'" msgstr "" -#: src/archives.c:709 +#: src/archives.c:758 #, c-format msgid "unable to move aside `%.255s' to install new version" msgstr "" -#: src/archives.c:718 +#: src/archives.c:767 #, c-format msgid "unable to read link `%.255s'" msgstr "" -#: src/archives.c:722 +#: src/archives.c:771 #, c-format msgid "unable to make backup symlink for `%.255s'" msgstr "" -#: src/archives.c:725 src/archives.c:728 +#: src/archives.c:774 src/archives.c:777 #, c-format msgid "unable to chown backup symlink for `%.255s'" msgstr "" -#: src/archives.c:733 +#: src/archives.c:782 #, c-format msgid "unable to make backup link of `%.255s' before installing new version" msgstr "" -#: src/archives.c:757 +#: src/archives.c:806 #, c-format msgid "unable to install new version of `%.255s'" msgstr "" -#: src/archives.c:789 +#: src/archives.c:853 #, c-format msgid "" -"dpkg: warning - ignoring dependency problem with removal of %s:\n" +"dpkg: warning - ignoring dependency problem with %s:\n" "%s" msgstr "" -#: src/archives.c:796 +#: src/archives.c:860 #, c-format msgid "" "dpkg: warning - considering deconfiguration of essential\n" -" package %s, to enable removal of %s.\n" +" package %s, to enable %s.\n" msgstr "" -#: src/archives.c:800 +#: src/archives.c:864 #, c-format msgid "" "dpkg: no, %s is essential, will not deconfigure\n" -" it in order to enable removal of %s.\n" +" it in order to enable %s.\n" msgstr "" -#: src/archives.c:813 +#: src/archives.c:878 #, c-format msgid "" -"dpkg: no, cannot remove %s (--auto-deconfigure will help):\n" +"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n" "%s" msgstr "" -#: src/archives.c:847 +#: src/archives.c:888 +#, c-format +msgid "removal of %.250s" +msgstr "" + +#: src/archives.c:915 +#, c-format +msgid "installation of %.250s" +msgstr "" + +#: src/archives.c:916 +#, c-format +msgid "" +"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n" +msgstr "" + +#: src/archives.c:923 +#, c-format +msgid "dpkg: yes, will deconfigure %s (broken by %s).\n" +msgstr "" + +#: src/archives.c:927 src/archives.c:1048 +#, c-format +msgid "" +"dpkg: regarding %s containing %s:\n" +"%s" +msgstr "" + +#: src/archives.c:935 +#, c-format +msgid "dpkg: warning - ignoring breakage, may proceed anyway !\n" +msgstr "" + +#: src/archives.c:941 +#, c-format +msgid "" +"installing %.250s would break %.250s, and\n" +" deconfiguration is not permitted (--auto-deconfigure might help)" +msgstr "" + +#: src/archives.c:945 +#, c-format +msgid "installing %.250s would break existing software" +msgstr "" + +#: src/archives.c:978 #, c-format msgid "dpkg: considering removing %s in favour of %s ...\n" msgstr "" -#: src/archives.c:851 +#: src/archives.c:982 #, c-format msgid "%s is not properly installed - ignoring any dependencies on it.\n" msgstr "" -#: src/archives.c:878 +#: src/archives.c:1009 #, c-format msgid "dpkg: may have trouble removing %s, as it provides %s ...\n" msgstr "" -#: src/archives.c:893 +#: src/archives.c:1024 #, c-format msgid "" "dpkg: package %s requires reinstallation, but will remove anyway as you " "request.\n" msgstr "" -#: src/archives.c:896 +#: src/archives.c:1027 #, c-format msgid "dpkg: package %s requires reinstallation, will not remove.\n" msgstr "" -#: src/archives.c:903 +#: src/archives.c:1034 #, c-format msgid "package %s has too many Conflicts/Replaces pairs" msgstr "" -#: src/archives.c:909 +#: src/archives.c:1040 #, c-format msgid "dpkg: yes, will remove %s in favour of %s.\n" msgstr "" -#: src/archives.c:917 -#, c-format -msgid "" -"dpkg: regarding %s containing %s:\n" -"%s" -msgstr "" - -#: src/archives.c:920 +#: src/archives.c:1051 #, c-format msgid "conflicting packages - not installing %.250s" msgstr "" -#: src/archives.c:921 +#: src/archives.c:1052 #, c-format msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n" msgstr "" -#: src/archives.c:959 +#: src/archives.c:1090 #, c-format msgid "--%s --recursive needs at least one path argument" msgstr "" -#: src/archives.c:989 +#: src/archives.c:1120 msgid "failed to exec find for --recursive" msgstr "" -#: src/archives.c:994 +#: src/archives.c:1125 msgid "failed to fdopen find's pipe" msgstr "" -#: src/archives.c:1000 +#: src/archives.c:1131 msgid "error reading find's pipe" msgstr "" -#: src/archives.c:1001 +#: src/archives.c:1132 msgid "error closing find's pipe" msgstr "" -#: src/archives.c:1004 +#: src/archives.c:1135 #, c-format msgid "find for --recursive returned unhandled error %i" msgstr "" -#: src/archives.c:1007 +#: src/archives.c:1138 msgid "searched, but found no packages (files matching *.deb)" msgstr "" -#: src/archives.c:1023 +#: src/archives.c:1154 #, c-format msgid "--%s needs at least one package archive file argument" msgstr "" -#: src/archives.c:1092 +#: src/archives.c:1223 #, c-format msgid "Selecting previously deselected package %s.\n" msgstr "" -#: src/archives.c:1097 +#: src/archives.c:1228 #, c-format msgid "Skipping deselected package %s.\n" msgstr "" -#: src/archives.c:1111 +#: src/archives.c:1242 #, c-format msgid "Version %.250s of %.250s already installed, skipping.\n" msgstr "" -#: src/archives.c:1121 +#: src/archives.c:1252 #, c-format msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n" msgstr "" -#: src/archives.c:1127 +#: src/archives.c:1258 #, c-format msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n" msgstr "" @@ -1194,46 +1242,46 @@ msgid "" " cannot configure (current status `%.250s')" msgstr "" -#: src/configure.c:115 +#: src/configure.c:117 #, c-format msgid "" "dpkg: dependency problems prevent configuration of %s:\n" "%s" msgstr "" -#: src/configure.c:118 +#: src/configure.c:120 msgid "dependency problems - leaving unconfigured" msgstr "" -#: src/configure.c:122 +#: src/configure.c:124 #, c-format msgid "" "dpkg: %s: dependency problems, but configuring anyway as you request:\n" "%s" msgstr "" -#: src/configure.c:130 +#: src/configure.c:132 msgid "" "Package is in a very bad inconsistent state - you should\n" " reinstall it before attempting configuration." msgstr "" -#: src/configure.c:133 +#: src/configure.c:135 #, c-format msgid "Setting up %s (%s) ...\n" msgstr "" -#: src/configure.c:180 +#: src/configure.c:182 #, c-format msgid "unable to stat new dist conffile `%.250s'" msgstr "" -#: src/configure.c:190 src/configure.c:431 +#: src/configure.c:192 src/configure.c:431 #, c-format msgid "unable to stat current installed conffile `%.250s'" msgstr "" -#: src/configure.c:199 +#: src/configure.c:201 #, c-format msgid "" "\n" @@ -1241,42 +1289,42 @@ msgid "" "Installing new config file as you request.\n" msgstr "" -#: src/configure.c:233 +#: src/configure.c:235 #, c-format msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n" msgstr "" -#: src/configure.c:241 +#: src/configure.c:243 #, c-format msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n" msgstr "" -#: src/configure.c:249 +#: src/configure.c:251 #, c-format msgid "dpkg: %s: warning - failed to remove `%.250s': %s\n" msgstr "" -#: src/configure.c:257 +#: src/configure.c:259 #, c-format msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n" msgstr "" -#: src/configure.c:262 +#: src/configure.c:264 #, c-format msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n" msgstr "" -#: src/configure.c:267 +#: src/configure.c:269 #, c-format msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n" msgstr "" -#: src/configure.c:271 +#: src/configure.c:273 #, c-format msgid "Installing new version of config file %s ...\n" msgstr "" -#: src/configure.c:275 +#: src/configure.c:277 #, c-format msgid "unable to install `%.250s' as `%.250s'" msgstr "" @@ -1514,82 +1562,82 @@ msgstr "sukobljava se sa" msgid "%s enhances %s" msgstr "poboljÅ¡ava" -#: src/depcon.c:269 +#: src/depcon.c:265 #, c-format msgid " %.250s is to be removed.\n" msgstr "" -#: src/depcon.c:272 +#: src/depcon.c:268 #, c-format msgid " %.250s is to be deconfigured.\n" msgstr "" -#: src/depcon.c:276 +#: src/depcon.c:272 #, c-format msgid " %.250s is to be installed, but is version %.250s.\n" msgstr "" -#: src/depcon.c:284 +#: src/depcon.c:280 #, c-format msgid " %.250s is installed, but is version %.250s.\n" msgstr "" -#: src/depcon.c:299 +#: src/depcon.c:295 #, c-format msgid " %.250s is unpacked, but has never been configured.\n" msgstr "" -#: src/depcon.c:303 +#: src/depcon.c:299 #, c-format msgid " %.250s is unpacked, but is version %.250s.\n" msgstr "" -#: src/depcon.c:309 +#: src/depcon.c:305 #, c-format msgid " %.250s latest configured version is %.250s.\n" msgstr "" -#: src/depcon.c:318 +#: src/depcon.c:314 #, c-format msgid " %.250s is %s.\n" msgstr "" -#: src/depcon.c:354 +#: src/depcon.c:350 #, c-format msgid " %.250s provides %.250s but is to be removed.\n" msgstr "" -#: src/depcon.c:358 +#: src/depcon.c:354 #, c-format msgid " %.250s provides %.250s but is to be deconfigured.\n" msgstr "" -#: src/depcon.c:363 +#: src/depcon.c:359 #, c-format msgid " %.250s provides %.250s but is %s.\n" msgstr "" -#: src/depcon.c:377 +#: src/depcon.c:373 #, c-format msgid " %.250s is not installed.\n" msgstr "" -#: src/depcon.c:408 +#: src/depcon.c:404 #, c-format msgid " %.250s (version %.250s) is to be installed.\n" msgstr "" -#: src/depcon.c:422 +#: src/depcon.c:424 #, c-format msgid " %.250s (version %.250s) is %s.\n" msgstr "" -#: src/depcon.c:447 +#: src/depcon.c:449 #, c-format msgid " %.250s provides %.250s and is to be installed.\n" msgstr "" -#: src/depcon.c:478 +#: src/depcon.c:485 #, c-format msgid " %.250s provides %.250s and is %s.\n" msgstr "" @@ -1925,99 +1973,99 @@ msgid "" "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin." msgstr "" -#: src/help.c:179 +#: src/help.c:185 #, c-format msgid "failed to chroot to `%.250s'" msgstr "" -#: src/help.c:227 +#: src/help.c:233 #, c-format msgid "error un-catching signal %s: %s\n" msgstr "" -#: src/help.c:245 +#: src/help.c:251 #, c-format msgid "unable to ignore signal %s before running script" msgstr "" -#: src/help.c:254 +#: src/help.c:260 #, c-format msgid "unable to set execute permissions on `%.250s'" msgstr "" -#: src/help.c:299 +#: src/help.c:305 #, c-format msgid "unable to stat installed %s script `%.250s'" msgstr "" -#: src/help.c:301 src/help.c:357 src/help.c:377 +#: src/help.c:307 src/help.c:363 src/help.c:383 #, c-format msgid "unable to execute %s" msgstr "" -#: src/help.c:325 +#: src/help.c:331 #, c-format msgid "unable to stat new %s script `%.250s'" msgstr "" -#: src/help.c:327 +#: src/help.c:333 #, c-format msgid "unable to execute new %s" msgstr "" -#: src/help.c:346 +#: src/help.c:352 #, c-format msgid "old %s script" msgstr "" -#: src/help.c:354 +#: src/help.c:360 #, c-format msgid "dpkg: warning - unable to stat %s `%.250s': %s\n" msgstr "" -#: src/help.c:361 +#: src/help.c:367 #, c-format msgid "dpkg - trying script from the new package instead ...\n" msgstr "" -#: src/help.c:368 +#: src/help.c:374 #, c-format msgid "new %s script" msgstr "" -#: src/help.c:372 +#: src/help.c:378 msgid "there is no script in the new version of the package - giving up" msgstr "" -#: src/help.c:374 +#: src/help.c:380 #, c-format msgid "unable to stat %s `%.250s'" msgstr "" -#: src/help.c:378 +#: src/help.c:384 #, c-format msgid "dpkg: ... it looks like that went OK.\n" msgstr "" -#: src/help.c:467 +#: src/help.c:473 msgid "unlink" msgstr "" -#: src/help.c:481 +#: src/help.c:487 #, fuzzy msgid "chmod" msgstr "zadrži" -#: src/help.c:497 src/processarc.c:711 +#: src/help.c:503 src/processarc.c:721 msgid "delete" msgstr "" -#: src/help.c:507 +#: src/help.c:513 #, c-format msgid "failed to %s `%%.255s'" msgstr "" -#: src/help.c:513 dpkg-deb/info.c:54 +#: src/help.c:519 dpkg-deb/info.c:54 msgid "failed to exec rm for cleanup" msgstr "" @@ -2026,7 +2074,7 @@ msgstr "" msgid "Debian `%s' package management program version %s.\n" msgstr "Debianov `%s' program za rukovanje paketima." -#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41 +#: src/main.c:46 src/query.c:490 dpkg-deb/main.c:48 dpkg-split/main.c:41 #, fuzzy, c-format msgid "" "This is free software; see the GNU General Public License version 2 or\n" @@ -2040,7 +2088,7 @@ msgstr "" "ili kasniju za uslove kopiranja. NEMA garancije. Pogledajte\n" "dselect --licence za detalje.\n" -#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49 +#: src/main.c:57 src/query.c:501 dpkg-deb/main.c:56 dpkg-split/main.c:49 #, c-format msgid "" "Usage: %s [