summaryrefslogtreecommitdiff
path: root/doc/po/pl.po
diff options
context:
space:
mode:
Diffstat (limited to 'doc/po/pl.po')
-rw-r--r--doc/po/pl.po139
1 files changed, 139 insertions, 0 deletions
diff --git a/doc/po/pl.po b/doc/po/pl.po
index b74746ffc..b401a1ed1 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,11 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
+<<<<<<< TREE
+"POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
"PO-Revision-Date: 2010-03-18 22:00+0100\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -1363,7 +1367,11 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1391,12 +1399,20 @@ msgstr ""
"Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1534,7 +1550,11 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1660,7 +1680,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
@@ -1678,7 +1702,11 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
#: sources.list.5.xml:234
@@ -1693,7 +1721,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnostyka"
@@ -1842,7 +1874,11 @@ msgid "Options"
msgstr "Opcje"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2105,7 +2141,11 @@ msgid "Just show the contents of the configuration space."
msgstr "Wyświetla zawartość przestrzeni konfiguracji."
#. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -3106,20 +3146,35 @@ msgid ""
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
+=======
"<literal><replaceable>Index</replaceable></literal> can be "
"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:539
+=======
#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:541
+=======
#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
#, fuzzy
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
@@ -3130,7 +3185,11 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:547
+=======
#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3144,13 +3203,21 @@ msgstr ""
"pliku konfiguracyjnym: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:553
+=======
#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:555
+=======
#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
#, fuzzy
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -3164,12 +3231,20 @@ msgstr ""
"<literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:561
+=======
#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:563
+=======
#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3179,13 +3254,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:571
+=======
#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:573
+=======
#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
#, fuzzy
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
@@ -3197,13 +3280,21 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:577
+=======
#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:579
+=======
#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
#, fuzzy
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
@@ -3213,14 +3304,22 @@ msgstr ""
"pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:583
+=======
#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
#, fuzzy
#| msgid "<option>-a</option>"
msgid "<option>--arch</option>"
msgstr "<option>-a</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:584
+=======
#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
#, fuzzy
#| msgid ""
#| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3240,13 +3339,21 @@ msgstr ""
"AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:590
+=======
#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
#, fuzzy
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:592
+=======
#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3260,13 +3367,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:602
+=======
#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
#, fuzzy
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:604
+=======
#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3276,19 +3391,31 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
#: sources.list.5.xml:198
msgid "Examples"
msgstr "Przykłady"
#. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:622
+=======
#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:618
+=======
#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3296,7 +3423,11 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:632
+=======
#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -7526,7 +7657,11 @@ msgid ""
"APT also supports pinning by glob() expressions and regular expressions "
"surrounded by /. For example, the following example assigns the priority 500 "
"to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
+"()-like expression or contains the word kde (as a POSIX extended regular "
+=======
"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
"expression surrounded by slashes)."
msgstr ""
@@ -7550,7 +7685,11 @@ msgstr ""
#: apt_preferences.5.xml:279
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
+"string can occur. Those, the following pin assigns the priority 990 to all "
+=======
"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
"packages from a release starting with karmic."
msgstr ""