Author: qwiat Date: Thu Oct 1 18:14:31 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fixed patch quota-pl.po-update.patch is back
- cosmetics
---- Files affected:
packages/quota:
quota-pl.po-update.patch (1.10 -> 1.11) , quota.spec (1.98 -> 1.99)
---- Diffs:
================================================================
Index: packages/quota/quota-pl.po-update.patch
diff -u packages/quota/quota-pl.po-update.patch:1.10
packages/quota/quota-pl.po-update.patch:1.11
--- packages/quota/quota-pl.po-update.patch:1.10 Fri Apr 18 18:51:57 2008
+++ packages/quota/quota-pl.po-update.patch Thu Oct 1 20:14:26 2009
@@ -1,5 +1,5 @@
---- quota-tools/po/pl.po.orig 2008-04-18 18:13:31.141544000 +0200
-+++ quota-tools/po/pl.po 2008-04-18 18:31:13.978114365 +0200
+--- quota-tools/po/pl.po 2008-10-13 19:29:17.000000000 +0200
++++ ../../BUILD/quota-tools/po/pl.po 2009-09-30 23:00:05.388146728 +0200
@@ -1,14 +1,14 @@
# Polish translation for quota.
# Copyright (C) 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -97,93 +97,15 @@
msgid ""
"-F, --format=formatname edit quotas of a specific format\n"
"-p, --prototype=name copy data from a prototype user/group\n"
-@@ -186,70 +178,70 @@
- "-V, --version wy�wietlenie informacji o wersji i
zako�czenie\n"
- "\n"
-
--#: edquota.c:101 quota.c:107 setquota.c:71
-+#: edquota.c:103 quota.c:109 setquota.c:76
- #, c-format
- msgid "Bugs to: %s\n"
- msgstr "B��dy na adres: %s\n"
+@@ -197,7 +189,7 @@
--#: edquota.c:178
-+#: edquota.c:184
- msgid "Prototype name does not make sence when editting grace period or
times.\n"
- msgstr "Wzorcowy u�ytkownik nie ma sensu przy edycji okres�w pob�a�liwo�ci.\n"
-
--#: edquota.c:199
-+#: edquota.c:205
+ #: edquota.c:199
msgid "fsname mismatch\n"
- msgstr "nazwa systemu plik�w si� nie zgadza\n"
+-msgstr "nazwa systemu plik�w si� nie zgadza\n"
++msgstr "Nazwa systemu plik�w si� nie zgadza\n"
--#: edquota.c:239
-+#: edquota.c:247
+ #: edquota.c:239
msgid "No filesystems with quota detected.\n"
- msgstr "Nie wykryto system�w plik�w z limitami.\n"
-
--#: edquota.c:255
-+#: edquota.c:263
- #, c-format
- msgid "Cannot create temporary file: %s\n"
- msgstr "Nie mo�na utworzy� pliku tymczasowego: %s\n"
-
--#: edquota.c:260
-+#: edquota.c:268
- #, c-format
- msgid "Cannot change owner of temporary file: %s\n"
- msgstr "Nie mo�na zmieni� w�a�ciciela pliku tymczasowego: %s\n"
-
--#: edquota.c:267
-+#: edquota.c:275
- msgid "Cannot write grace times to file.\n"
- msgstr "Nie mo�na zapisa� okres�w pob�a�liwo�ci do pliku.\n"
-
--#: edquota.c:271
-+#: edquota.c:279
- msgid "Error while editting grace times.\n"
- msgstr "B��d podczas edycji okres�w pob�a�liwo�ci.\n"
-
--#: edquota.c:275
-+#: edquota.c:283
- msgid "Failed to parse grace times file.\n"
- msgstr "Analiza pliku okres�w pob�a�liwo�ci nie powiod�a si�.\n"
-
--#: edquota.c:284
-+#: edquota.c:292
- msgid "Cannot write individual grace times to file.\n"
- msgstr "Nie mo�na zapisa� do pliku pojedynczych okres�w pob�a�liwo�ci.\n"
-
--#: edquota.c:289
-+#: edquota.c:297
- msgid "Error while editting individual grace times.\n"
- msgstr "B��d podczas edycji pojedynczych okres�w pob�a�liwo�ci.\n"
-
--#: edquota.c:294
-+#: edquota.c:302
- msgid "Cannot read individual grace times from file.\n"
- msgstr "Nie mo�na odczyta� z pliku pojedynczych okres�w pob�a�liwo�ci.\n"
-
--#: edquota.c:308
-+#: edquota.c:316
- msgid "Cannot write quotas to file.\n"
- msgstr "Nie mo�na zapisa� limit�w do pliku.\n"
-
--#: edquota.c:313
-+#: edquota.c:321
- msgid "Error while editting quotas.\n"
- msgstr "B��d podczas edycji limit�w.\n"
-
--#: edquota.c:319
-+#: edquota.c:327
- msgid "Cannot reopen!"
- msgstr "Nie mo�na ponownie otworzy�!"
-
--#: edquota.c:321
-+#: edquota.c:329
- msgid "Cannot read quotas from file.\n"
- msgstr "Nie mo�na odczyta� limit�w z pliku.\n"
-
@@ -308,23 +300,23 @@
msgid "XFS_IOC_FSBULKSTAT ioctl failed: %s\n"
msgstr "ioctl XFS_IOC_FSBULKSTAT nie powi�d� si�: %s\n"
@@ -427,18 +349,18 @@
msgstr "Nie uda�o si� wypisa� komunikatu przez dbus: za ma�o pami�ci.\n"
-#: quota_nld.c:329
--#, c-format
--msgid "Read from netlink socket failed: %s\n"
--msgstr "Odczyt z gniazda netlink nie powi�d� si�: %s\n"
--
--#: quota_nld.c:344
+#: quota_nld.c:337
#, c-format
--msgid "Failed parsing netlink command: %s\n"
--msgstr "Nie uda�o si� przeanalizowa� polecenia netlink: %s\n"
+-msgid "Read from netlink socket failed: %s\n"
+-msgstr "Odczyt z gniazda netlink nie powi�d� si�: %s\n"
+msgid "Failed to read or parse quota netlink message: %s\n"
+msgstr "Nie uda�o si� odczyta� lub przeanalizowa� komunikatu netlink: %s\n"
+-#: quota_nld.c:344
+-#, c-format
+-msgid "Failed parsing netlink command: %s\n"
+-msgstr "Nie uda�o si� przeanalizowa� polecenia netlink: %s\n"
+-
-#: quotacheck.c:95
+#: quotacheck.c:96
msgid "Not enough memory.\n"
@@ -1441,88 +1363,20 @@
msgid ""
"-t, --edit-period edit grace period\n"
"-T, --edit-times edit grace times for user/group\n"
-@@ -2267,70 +2283,83 @@
- "-h, --help wy�wietlenie tego opisu i zako�czenie\n"
- "-V, --version wy�wietlenie informacji o wersji i zako�czenie\n"
-
--#: setquota.c:82
-+#: setquota.c:87
- #, c-format
- msgid "Bad %s: %s\n"
- msgstr "B��dny %s: %s\n"
-
--#: setquota.c:170
-+#: setquota.c:183
- msgid "Group and user quotas cannot be used together.\n"
- msgstr "Limity grupy i u�ytkownika nie mog� by� u�yte razem.\n"
-
--#: setquota.c:174
-+#: setquota.c:187
- msgid "Prototype user has no sense when editting grace times.\n"
- msgstr "Wzorcowy u�ytkownik nie ma sensu przy edycji okres�w pob�a�liwo�ci.\n"
-
--#: setquota.c:178
-+#: setquota.c:191
- msgid "Cannot set both individual and global grace time.\n"
- msgstr "Nie mo�na ustawi� jednocze�nie jednostkowych i globalnych okres�w
pob�a�liwo�ci.\n"
-
--#: setquota.c:182
-+#: setquota.c:195
- msgid "Batch mode cannot be used for setting grace times.\n"
- msgstr "Nie mo�na u�y� trybu wsadowego do ustawienia okres�w pob�a�liwo�ci.\n"
-
--#: setquota.c:186
-+#: setquota.c:199
- msgid "Batch mode and prototype user cannot be used together.\n"
- msgstr "Tryb wsadowy i u�ytkownik wzorcowy nie mog� by� u�yte razem.\n"
-
--#: setquota.c:209
-+#: setquota.c:222
- msgid "block softlimit"
- msgstr "mi�kki limit blok�w"
-
--#: setquota.c:210
-+#: setquota.c:223
- msgid "block hardlimit"
- msgstr "twardy limit blok�w"
-
--#: setquota.c:211
-+#: setquota.c:224
- msgid "inode softlimit"
- msgstr "mi�kki limit i-w�z��w"
-
--#: setquota.c:212
-+#: setquota.c:225
- msgid "inode hardlimit"
- msgstr "twardy limit i-w�z��w"
-
--#: setquota.c:218 setquota.c:230
-+#: setquota.c:231 setquota.c:243
- msgid "block grace time"
- msgstr "okres pob�a�liwo�ci dla blok�w"
-
--#: setquota.c:219 setquota.c:236
-+#: setquota.c:232 setquota.c:249
- msgid "inode grace time"
- msgstr "okres pob�a�liwo�ci dla i-w�z��w"
-
--#: setquota.c:242
-+#: setquota.c:255
- msgid "Mountpoint not specified.\n"
- msgstr "Nie podano punktu montowania.\n"
+@@ -2327,8 +2343,21 @@
--#: setquota.c:297
+ #: setquota.c:301
+ #, c-format
+-msgid "Unable to get name '%s'.\n"
+-msgstr "Nie mo�na uzyska� nazwy '%s'.\n"
++msgid "Unable to resolve name '%s' on line %d.\n"
++msgstr "Nie mo�na rozwi�za� nazwy '%s' w linii %d.\n"
++
+#: setquota.c:310
+#, c-format
+msgid "Line %d too long.\n"
+msgstr "Linia %d zbyt d�uga.\n"
+
-+#: setquota.c:322
- #, c-format
- msgid "Cannot parse input line %d.\n"
- msgstr "Nie mo�na przetworzy� linii wej�cia %d.\n"
-
--#: setquota.c:301
+#: setquota.c:324 setquota.c:332
+msgid "Exitting.\n"
+msgstr "Zako�czenie.\n"
@@ -1530,19 +1384,9 @@
+#: setquota.c:325 setquota.c:333
+msgid "Skipping line.\n"
+msgstr "Pomijanie linii.\n"
-+
-+#: setquota.c:330
- #, c-format
--msgid "Unable to get name '%s'.\n"
--msgstr "Nie mo�na uzyska� nazwy '%s'.\n"
-+msgid "Unable to resolve name '%s' on line %d.\n"
-+msgstr "Nie mo�na rozwi�za� nazwy '%s' w linii %d.\n"
--#: setquota.c:359
-+#: setquota.c:394
+ #: setquota.c:359
#, c-format
- msgid "cannot write times for %s. Maybe kernel does not support such
operation?\n"
- msgstr "nie mo�na zapisa� czas�w %s. Mo�e j�dro nie obs�uguje takiej
operacji?\n"
@@ -2568,7 +2597,7 @@
msgid "Unterminated last line, ignoring\n"
msgstr "Niezako�czona ostatnia linia, zignorowano\n"
================================================================
Index: packages/quota/quota.spec
diff -u packages/quota/quota.spec:1.98 packages/quota/quota.spec:1.99
--- packages/quota/quota.spec:1.98 Tue Sep 29 11:56:05 2009
+++ packages/quota/quota.spec Thu Oct 1 20:14:26 2009
@@ -17,7 +17,7 @@
Summary(zh_CN.UTF-8): 磁盘使用情况的监控工具
Name: quota%{?with_kernel64:64}
Version: 3.17
-Release: 0.1
+Release: 1
Epoch: 1
License: BSD
Group: Applications/System
@@ -29,7 +29,7 @@
Source3: rquotad.sysconfig
URL: http://sourceforge.net/projects/linuxquota/
Patch0: quota-defaults.patch
-#Patch1: quota-pl.po-update.patch
+Patch1: quota-pl.po-update.patch
Patch2: quota-repquota-len-fix.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -40,7 +40,7 @@
%if %{with kernel64}
ExclusiveArch: %{ix86}
%endif
-BuildRoot: %{tmpdir}/quota-%{version}-root-%(id -u -n)
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Quotas allow the system administrator to limit disk usage by a user
@@ -134,7 +134,7 @@
%prep
%setup -q -n quota-tools
%patch0 -p1
-#%patch1 -p1
+%patch1 -p1
%patch2 -p1
%build
@@ -242,6 +242,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.99 2009/10/01 18:14:26 qwiat
+- fixed patch quota-pl.po-update.patch is back
+- cosmetics
+
Revision 1.98 2009/09/29 09:56:05 qwiat
- updated to 3.17
- disabled patch quota-pl.po-update.patch, need to be fixed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quota/quota-pl.po-update.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quota/quota.spec?r1=1.98&r2=1.99&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
