make update-po

1 files changed, 43 insertions, 29 deletions

diff --git a/doc/po/pl.po b/doc/po/pl.po
index ee4461f39..b89d992a0 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,11 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+0300\n"
 "PO-Revision-Date: 2012-07-28 21:59+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -815,9 +811,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the "
-"package(s) specified for installation will also be retrieved and installed.  "
-"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed.  The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
 "desired packages. If a hyphen is appended to the package name (with no "
 "intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
@@ -1623,7 +1619,7 @@ msgstr "Pliki"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -1644,7 +1640,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
 msgid "Diagnostics"
 msgstr "Diagnostyka"
@@ -2998,6 +2994,24 @@ msgstr ""
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:85
+#, fuzzy
+#| msgid ""
+#| "Mount point; specify the location to mount the CD-ROM. This mount point "
+#| "must be listed in <filename>/etc/fstab</filename> and properly "
+#| "configured.  Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+"Punkt montowania. Podaje lokalizację katalogu, w którym będzie zamontowany "
+"CD-ROM. Musi istnieć odpowiednia konfiguracja dla tego punktu montowania w "
+"pliku <filename>/etc/fstab</filename>. Pozycja w pliku konfiguracyjnym: "
+"<literal>Acquire::cdrom::mount</literal>."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -3010,7 +3024,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3023,7 +3037,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3035,7 +3049,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3050,7 +3064,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3063,7 +3077,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3075,13 +3089,13 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -6103,13 +6117,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 "<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</"
 "literal>, która zostanie rozwinięta do architektury Debiana (takiej jak "
@@ -7418,9 +7432,9 @@ msgstr "OPIS"
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
+"options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 "APT jest systemem zarządzania pakietami oprogramowania. Jest kilka nakładek "
 "przydatnych do codziennego zarządzania pakietami, takich jak B<aptitude>(8), "
@@ -7706,8 +7720,8 @@ msgstr ""
 "Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw "
 "ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</"
 "p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest "
-"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources."
-"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za "
+"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources.list"
+"(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za "
 "pomocą polecenia <tt>apt-get update</tt>. Na przykład:"
 
 #. type: <example></example>