- updated pl.po-update patch; dropped duplicate Patch entry

Changed files:
    util-linux-pl.po-update.patch -> 1.4
    util-linux.spec -> 1.333

diff --git a/util-linux-pl.po-update.patch b/util-linux-pl.po-update.patch
index 0d7be5a2b92ca999356ec62817c0f28705aabf9a..7b5d75d29f2c0eca8abc0c8e1d6563a0db5a7e8e 100644 (file)
--- a/util-linux-pl.po-update.patch
+++ b/util-linux-pl.po-update.patch
@@ -1,19 +1,49 @@
---- util-linux-2.20/po/pl.po.orig      2011-08-29 12:13:30.000000000 +0200
-+++ util-linux-2.20/po/pl.po   2011-09-07 18:56:25.389765661 +0200
+--- util-linux-2.20.1/po/pl.po.orig    2011-10-20 10:13:15.000000000 +0200
++++ util-linux-2.20.1/po/pl.po 2011-12-03 08:40:19.058372761 +0100
 @@ -6,10 +6,10 @@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: util-linux 2.20-rc2\n"
-+"Project-Id-Version: util-linux 2.20\n"
++"Project-Id-Version: util-linux 2.20.1\n"
  "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
  "POT-Creation-Date: 2011-10-20 10:13+0200\n"
 -"PO-Revision-Date: 2011-08-20 21:22+0200\n"
-+"PO-Revision-Date: 2011-09-07 18:50+0200\n"
++"PO-Revision-Date: 2011-12-03 08:35+0100\n"
  "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
  "Language: pl\n"
-@@ -12898,7 +12898,7 @@
+@@ -5499,12 +5499,12 @@
+ msgstr "Uwaga: partycje %s i %s zachodz± na siebie\n"
+ 
+ #: fdisk/sfdisk.c:1260
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "Warning: partition %s contains part of the partition table (sector %llu),\n"
+ "and will destroy it when filled\n"
+ msgstr ""
+-"Uwaga: partycja %s zawiera czê¶æ tablicy partycji (sektor %lu)\n"
++"Uwaga: partycja %s zawiera czê¶æ tablicy partycji (sektor %llu)\n"
+ "i zostanie zniszczona po jej wype³nieniu\n"
+ 
+ #: fdisk/sfdisk.c:1273
+@@ -11524,13 +11524,12 @@
+ " -v, --verbose       wypisanie liczby usuniêtych bajtów\n"
+ 
+ #: sys-utils/fstrim.c:66
+-#, fuzzy
+ msgid ""
+ "\n"
+ "For more information see fstrim(8).\n"
+ msgstr ""
+ "\n"
+-"Wiêcej informacji w fstrim(1).\n"
++"Wiêcej informacji w fstrim(8).\n"
+ 
+ #: sys-utils/fstrim.c:102
+ #, c-format
+@@ -12899,7 +12898,7 @@
  #: sys-utils/setarch.c:137
  #, c-format
  msgid "     --uname-2.6          turns on UNAME26\n"

diff --git a/util-linux.spec b/util-linux.spec
index 4085dc477c3c8feefaedc99e1f527f18c6afdf34..808b6b725f15dfb12981afff14fb800e80aa357b 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -48,7 +48,6 @@ Patch2:               %{name}-ctrlaltdel-man.patch
 Patch3:                %{name}-fdformat-ide.patch
 Patch4:                %{name}-fhs.patch
 Patch5:                %{name}-hotkeys.patch
-Patch6:                %{name}-pl.po-update.patch
 Patch7:                %{name}-login-lastlog.patch
 Patch8:                %{name}-procpartitions.patch
 Patch9:                %{name}-swaponsymlink.patch
@@ -628,7 +627,6 @@ etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1