Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master1.0.1ubuntu1

Conflicts:
	debian/changelog

1 files changed, 19 insertions, 19 deletions

diff --git a/po/sk.po b/po/sk.po
index 8f09fcd0c..cb394a91c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 15:51+0200\n"
+"POT-Creation-Date: 2014-04-10 10:18+0200\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -859,9 +859,9 @@ msgstr "Uplynul čas spojenia"
 msgid "Server closed the connection"
 msgstr "Server ukončil spojenie"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1468
-#: apt-pkg/contrib/fileutl.cc:1477 apt-pkg/contrib/fileutl.cc:1482
-#: apt-pkg/contrib/fileutl.cc:1484
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Chyba pri čítaní"
 
@@ -874,9 +874,9 @@ msgid "Protocol corruption"
 msgstr "Narušenie protokolu"
 
 #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:875
-#: apt-pkg/contrib/fileutl.cc:1590 apt-pkg/contrib/fileutl.cc:1599
-#: apt-pkg/contrib/fileutl.cc:1604 apt-pkg/contrib/fileutl.cc:1606
-#: apt-pkg/contrib/fileutl.cc:1631
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Chyba pri zápise"
 
@@ -1132,7 +1132,7 @@ msgstr "Spojenie zlyhalo"
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: apt-private/private-list.cc:132
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
@@ -2608,54 +2608,54 @@ msgstr "Podproces %s neočakávane skončil"
 msgid "Problem closing the gzip file %s"
 msgstr "Problém pri zatváraní gzip súboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1097
+#: apt-pkg/contrib/fileutl.cc:1104
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nedá sa otvoriť súbor %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156 apt-pkg/contrib/fileutl.cc:1203
+#: apt-pkg/contrib/fileutl.cc:1163 apt-pkg/contrib/fileutl.cc:1210
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nedá sa otvoriť popisovač súboru %d"
 
-#: apt-pkg/contrib/fileutl.cc:1310
+#: apt-pkg/contrib/fileutl.cc:1317
 msgid "Failed to create subprocess IPC"
 msgstr "Nedá sa vytvoriť podproces IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1365
+#: apt-pkg/contrib/fileutl.cc:1372
 msgid "Failed to exec compressor "
 msgstr "Nepodarilo sa spustiť kompresor "
 
-#: apt-pkg/contrib/fileutl.cc:1506
+#: apt-pkg/contrib/fileutl.cc:1513
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva"
 
-#: apt-pkg/contrib/fileutl.cc:1619 apt-pkg/contrib/fileutl.cc:1641
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "zápis, treba zapísať ešte %llu, no nedá sa to"
 
-#: apt-pkg/contrib/fileutl.cc:1911
+#: apt-pkg/contrib/fileutl.cc:1918
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problém pri zatváraní súboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1923
+#: apt-pkg/contrib/fileutl.cc:1930
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problém pri synchronizovaní súboru %s na %s"
 
-#: apt-pkg/contrib/fileutl.cc:1934
+#: apt-pkg/contrib/fileutl.cc:1941
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problém pri odstraňovaní súboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1947
+#: apt-pkg/contrib/fileutl.cc:1954
 msgid "Problem syncing the file"
 msgstr "Problém pri synchronizovaní súboru"
 
-#: apt-pkg/contrib/fileutl.cc:2043 apt-pkg/acquire-item.cc:148
+#: apt-pkg/contrib/fileutl.cc:2050 apt-pkg/acquire-item.cc:148
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "premenovanie zlyhalo, %s (%s -> %s)."