From: Karel Zak Date: Thu, 2 Jul 2009 13:07:49 +0000 (+0200) Subject: po: merge changes X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dea22a3de9a02f2ac0453828d9c2d5a360e7eb36;p=util-linux po: merge changes Signed-off-by: Karel Zak --- diff --git a/po/POTFILES.in b/po/POTFILES.in index 334b8e5e..96655a7e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -58,8 +58,10 @@ login-utils/simpleinit.c login-utils/ttymsg.c login-utils/vipw.c login-utils/wall.c +misc-utils/blkid.c misc-utils/cal.c misc-utils/ddate.c +misc-utils/findfs.c misc-utils/kill.c misc-utils/logger.c misc-utils/look.c @@ -96,8 +98,6 @@ partx/unixware.c schedutils/chrt.c schedutils/ionice.c schedutils/taskset.c -shlibs/blkid/bin/blkid.c -shlibs/blkid/bin/findfs.c shlibs/blkid/src/cache.c shlibs/blkid/src/config.c shlibs/blkid/src/dev.c diff --git a/po/ca.po b/po/ca.po index 296e3f0d..7f1df901 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre3\n" "Report-Msgid-Bugs-To: Karel Zak \n" -"POT-Creation-Date: 2009-06-28 22:12+0200\n" +"POT-Creation-Date: 2009-07-02 14:56+0200\n" "PO-Revision-Date: 2005-09-17 13:40+0200\n" "Last-Translator: Josep Puigdemont \n" "Language-Team: Catalan \n" @@ -944,7 +944,7 @@ msgstr "no es pot fer \"stat\" al dispositiu %s" msgid "%s is not a block special device" msgstr "%s no es un dispositiu de bloc especial" -#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200 +#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205 #, c-format msgid "cannot open %s" msgstr "%s no es pot obrir" @@ -1535,53 +1535,53 @@ msgid "" " %s " msgstr "Forma d'ús:\n" -#: disk-utils/raw.c:122 +#: disk-utils/raw.c:125 #, c-format msgid "" "Device '%s' is control raw dev (use raw where is greater than zero)\n" msgstr "" -#: disk-utils/raw.c:130 -#, fuzzy, c-format -msgid "Cannot locate raw device '%s' (%s)\n" -msgstr "no es pot fer \"stat\" al dispositiu %s" - -#: disk-utils/raw.c:136 -#, fuzzy, c-format -msgid "Raw device '%s' is not a character dev\n" -msgstr "/dev/%s: no és un dispositiu de caràcter" - -#: disk-utils/raw.c:141 -#, fuzzy, c-format -msgid "Device '%s' is not a raw dev\n" -msgstr "%s no es un dispositiu de bloc especial" - -#: disk-utils/raw.c:162 +#: disk-utils/raw.c:145 #, fuzzy, c-format msgid "Cannot locate block device '%s' (%s)\n" msgstr "No s'ha pogut blocar el fitxer de blocat %s: %s\n" -#: disk-utils/raw.c:168 +#: disk-utils/raw.c:151 #, fuzzy, c-format msgid "Device '%s' is not a block dev\n" msgstr "Avís: %s no és un dispositiu de blocs\n" -#: disk-utils/raw.c:203 +#: disk-utils/raw.c:186 #, fuzzy, c-format msgid "Cannot open master raw device '" msgstr "no es pot fer \"stat\" al dispositiu %s" -#: disk-utils/raw.c:225 +#: disk-utils/raw.c:205 +#, fuzzy, c-format +msgid "Cannot locate raw device '%s' (%s)\n" +msgstr "no es pot fer \"stat\" al dispositiu %s" + +#: disk-utils/raw.c:211 +#, fuzzy, c-format +msgid "Raw device '%s' is not a character dev\n" +msgstr "/dev/%s: no és un dispositiu de caràcter" + +#: disk-utils/raw.c:216 +#, fuzzy, c-format +msgid "Device '%s' is not a raw dev\n" +msgstr "%s no es un dispositiu de bloc especial" + +#: disk-utils/raw.c:231 #, c-format msgid "Error querying raw device (%s)\n" msgstr "" -#: disk-utils/raw.c:235 disk-utils/raw.c:255 +#: disk-utils/raw.c:241 disk-utils/raw.c:261 #, c-format msgid "raw%d:\tbound to major %d, minor %d\n" msgstr "" -#: disk-utils/raw.c:251 +#: disk-utils/raw.c:257 #, fuzzy, c-format msgid "Error setting raw device (%s)\n" msgstr "s'ha produït un error en aturar el servei: \"%s\"" @@ -6988,8 +6988,8 @@ msgid "%s: PAM failure, aborting: %s\n" msgstr "login: PAM ha fallat; s'està avortant: %s\n" #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823 -#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753 -#: mount/lomount.c:756 +#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744 +#: mount/lomount.c:747 msgid "Password: " msgstr "Contrasenya: " @@ -7901,6 +7901,16 @@ msgstr "forma d'ús: %s [+format] [dia mes any]\n" msgid "St. Tib's Day" msgstr "Dia de Sant Tibb" +#: misc-utils/findfs.c:24 +#, c-format +msgid "Usage: %s LABEL=