From 98db6bb53978ed221ffbb746505e06dfaad46113 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 12 Apr 2016 12:29:25 +0200 Subject: po: merge changes Signed-off-by: Karel Zak --- po/util-linux.pot | 189 +++++++++++++++++++++++++++--------------------------- 1 file changed, 96 insertions(+), 93 deletions(-) (limited to 'po/util-linux.pot') diff --git a/po/util-linux.pot b/po/util-linux.pot index d75037afa..0b46ab20c 100644 --- a/po/util-linux.pot +++ b/po/util-linux.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: util-linux 2.28.rc1-90-4bf2e\n" +"Project-Id-Version: util-linux 2.28.rc2-29-de610\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-03-29 10:35+0200\n" +"POT-Creation-Date: 2016-04-12 12:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,7 +44,7 @@ msgstr "" #: lib/path.c:70 lib/path.c:82 login-utils/islocal.c:87 login-utils/last.c:653 #: login-utils/sulogin.c:480 login-utils/sulogin.c:517 #: login-utils/utmpdump.c:126 login-utils/utmpdump.c:348 -#: login-utils/utmpdump.c:370 login-utils/vipw.c:255 login-utils/vipw.c:273 +#: login-utils/utmpdump.c:370 login-utils/vipw.c:258 login-utils/vipw.c:276 #: misc-utils/findmnt.c:1121 misc-utils/logger.c:1180 misc-utils/mcookie.c:115 #: misc-utils/uuidd.c:207 sys-utils/blkdiscard.c:183 sys-utils/dmesg.c:522 #: sys-utils/eject.c:500 sys-utils/eject.c:700 sys-utils/fallocate.c:374 @@ -56,8 +56,8 @@ msgstr "" #: sys-utils/rtcwake.c:269 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529 #: sys-utils/setpriv.c:552 sys-utils/swapon.c:371 sys-utils/swapon.c:514 #: sys-utils/switch_root.c:163 sys-utils/unshare.c:106 sys-utils/unshare.c:121 -#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2616 -#: term-utils/agetty.c:2640 term-utils/mesg.c:127 term-utils/script.c:420 +#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2615 +#: term-utils/agetty.c:2639 term-utils/mesg.c:127 term-utils/script.c:420 #: term-utils/script.c:426 term-utils/script.c:428 term-utils/script.c:516 #: term-utils/scriptreplay.c:206 term-utils/scriptreplay.c:209 #: term-utils/wall.c:331 text-utils/colcrt.c:275 text-utils/more.c:518 @@ -1520,15 +1520,15 @@ msgstr "" msgid "Entering nested BSD disklabel." msgstr "" -#: disk-utils/fdisk-menu.c:955 +#: disk-utils/fdisk-menu.c:954 msgid "Number of cylinders" msgstr "" -#: disk-utils/fdisk-menu.c:959 +#: disk-utils/fdisk-menu.c:958 msgid "Number of heads" msgstr "" -#: disk-utils/fdisk-menu.c:963 +#: disk-utils/fdisk-menu.c:962 msgid "Number of sectors" msgstr "" @@ -1604,7 +1604,7 @@ msgid "%s: failed to parse fstab" msgstr "" #: disk-utils/fsck.c:679 login-utils/login.c:967 login-utils/sulogin.c:1063 -#: login-utils/vipw.c:203 sys-utils/flock.c:326 sys-utils/nsenter.c:151 +#: login-utils/vipw.c:204 sys-utils/flock.c:326 sys-utils/nsenter.c:151 #: sys-utils/swapon.c:316 sys-utils/unshare.c:219 sys-utils/unshare.c:420 #: term-utils/script.c:774 msgid "fork failed" @@ -4374,8 +4374,8 @@ msgid "" "For more details see %s.\n" msgstr "" -#: include/closestream.h:42 include/closestream.h:44 login-utils/vipw.c:270 -#: login-utils/vipw.c:289 sys-utils/rtcwake.c:279 term-utils/setterm.c:813 +#: include/closestream.h:42 include/closestream.h:44 login-utils/vipw.c:273 +#: login-utils/vipw.c:292 sys-utils/rtcwake.c:279 term-utils/setterm.c:813 #: text-utils/col.c:157 msgid "write error" msgstr "" @@ -7635,7 +7635,7 @@ msgid "" msgstr "" #: login-utils/sulogin.c:900 misc-utils/findmnt.c:1472 sys-utils/wdctl.c:523 -#: term-utils/wall.c:135 +#: term-utils/agetty.c:754 term-utils/wall.c:135 msgid "invalid timeout argument" msgstr "" @@ -7738,38 +7738,38 @@ msgstr "" msgid "Can't set context for %s" msgstr "" -#: login-utils/vipw.c:235 +#: login-utils/vipw.c:236 #, c-format msgid "%s unchanged" msgstr "" -#: login-utils/vipw.c:251 +#: login-utils/vipw.c:254 msgid "cannot get lock" msgstr "" -#: login-utils/vipw.c:278 +#: login-utils/vipw.c:281 msgid "no changes made" msgstr "" -#: login-utils/vipw.c:287 +#: login-utils/vipw.c:290 msgid "cannot chmod file" msgstr "" -#: login-utils/vipw.c:301 +#: login-utils/vipw.c:304 msgid "Edit the password or group file.\n" msgstr "" -#: login-utils/vipw.c:347 +#: login-utils/vipw.c:350 msgid "You are using shadow groups on this system.\n" msgstr "" -#: login-utils/vipw.c:348 +#: login-utils/vipw.c:351 msgid "You are using shadow passwords on this system.\n" msgstr "" #. TRANSLATORS: this program uses for y and n rpmatch(3), #. * which means they can be translated. -#: login-utils/vipw.c:352 +#: login-utils/vipw.c:355 #, c-format msgid "Would you like to edit %s now [y/n]? " msgstr "" @@ -8356,7 +8356,7 @@ msgid "%s and %s are mutually exclusive" msgstr "" #: misc-utils/kill.c:396 misc-utils/kill.c:438 misc-utils/rename.c:174 -#: sys-utils/ipcrm.c:160 term-utils/agetty.c:794 term-utils/agetty.c:803 +#: sys-utils/ipcrm.c:160 term-utils/agetty.c:793 term-utils/agetty.c:802 msgid "not enough arguments" msgstr "" @@ -16180,309 +16180,312 @@ msgstr "" msgid "%s: can't exec %s: %m" msgstr "" -#: term-utils/agetty.c:559 term-utils/agetty.c:846 term-utils/agetty.c:858 -#: term-utils/agetty.c:1415 term-utils/agetty.c:1433 term-utils/agetty.c:1468 -#: term-utils/agetty.c:1478 term-utils/agetty.c:1515 term-utils/agetty.c:1975 -#: term-utils/agetty.c:2509 +#: term-utils/agetty.c:559 term-utils/agetty.c:845 term-utils/agetty.c:857 +#: term-utils/agetty.c:1414 term-utils/agetty.c:1432 term-utils/agetty.c:1467 +#: term-utils/agetty.c:1477 term-utils/agetty.c:1514 term-utils/agetty.c:1974 +#: term-utils/agetty.c:2508 #, c-format msgid "failed to allocate memory: %m" msgstr "" +#: term-utils/agetty.c:684 +msgid "invalid delay argument" +msgstr "" + #: term-utils/agetty.c:723 msgid "invalid argument of --local-line" msgstr "" -#: term-utils/agetty.c:755 -#, c-format -msgid "bad timeout value: %s" +#: term-utils/agetty.c:742 +msgid "invalid nice argument" msgstr "" -#: term-utils/agetty.c:876 +#: term-utils/agetty.c:875 #, c-format msgid "bad speed: %s" msgstr "" -#: term-utils/agetty.c:878 +#: term-utils/agetty.c:877 msgid "too many alternate speeds" msgstr "" -#: term-utils/agetty.c:1006 term-utils/agetty.c:1010 term-utils/agetty.c:1063 +#: term-utils/agetty.c:1005 term-utils/agetty.c:1009 term-utils/agetty.c:1062 #, c-format msgid "/dev/%s: cannot open as standard input: %m" msgstr "" -#: term-utils/agetty.c:1029 +#: term-utils/agetty.c:1028 #, c-format msgid "/dev/%s: not a character device" msgstr "" -#: term-utils/agetty.c:1031 +#: term-utils/agetty.c:1030 #, c-format msgid "/dev/%s: not a tty" msgstr "" -#: term-utils/agetty.c:1035 term-utils/agetty.c:1067 +#: term-utils/agetty.c:1034 term-utils/agetty.c:1066 #, c-format msgid "/dev/%s: cannot get controlling tty: %m" msgstr "" -#: term-utils/agetty.c:1057 +#: term-utils/agetty.c:1056 #, c-format msgid "/dev/%s: vhangup() failed: %m" msgstr "" -#: term-utils/agetty.c:1078 +#: term-utils/agetty.c:1077 #, c-format msgid "%s: not open for read/write" msgstr "" -#: term-utils/agetty.c:1083 +#: term-utils/agetty.c:1082 #, c-format msgid "/dev/%s: cannot set process group: %m" msgstr "" -#: term-utils/agetty.c:1097 +#: term-utils/agetty.c:1096 #, c-format msgid "%s: dup problem: %m" msgstr "" -#: term-utils/agetty.c:1114 +#: term-utils/agetty.c:1113 #, c-format msgid "%s: failed to get terminal attributes: %m" msgstr "" -#: term-utils/agetty.c:1321 term-utils/agetty.c:1341 +#: term-utils/agetty.c:1320 term-utils/agetty.c:1340 #, c-format msgid "setting terminal attributes failed: %m" msgstr "" -#: term-utils/agetty.c:1458 +#: term-utils/agetty.c:1457 msgid "cannot open os-release file" msgstr "" -#: term-utils/agetty.c:1636 +#: term-utils/agetty.c:1635 #, c-format msgid "failed to create reload file: %s: %m" msgstr "" -#: term-utils/agetty.c:1733 +#: term-utils/agetty.c:1732 msgid "[press ENTER to login]" msgstr "" -#: term-utils/agetty.c:1757 +#: term-utils/agetty.c:1756 msgid "Num Lock off" msgstr "" -#: term-utils/agetty.c:1760 +#: term-utils/agetty.c:1759 msgid "Num Lock on" msgstr "" -#: term-utils/agetty.c:1763 +#: term-utils/agetty.c:1762 msgid "Caps Lock on" msgstr "" -#: term-utils/agetty.c:1766 +#: term-utils/agetty.c:1765 msgid "Scroll Lock on" msgstr "" -#: term-utils/agetty.c:1769 +#: term-utils/agetty.c:1768 #, c-format msgid "" "Hint: %s\n" "\n" msgstr "" -#: term-utils/agetty.c:1896 +#: term-utils/agetty.c:1895 #, c-format msgid "%s: read: %m" msgstr "" -#: term-utils/agetty.c:1955 +#: term-utils/agetty.c:1954 #, c-format msgid "%s: input overrun" msgstr "" -#: term-utils/agetty.c:1971 term-utils/agetty.c:1979 +#: term-utils/agetty.c:1970 term-utils/agetty.c:1978 #, c-format msgid "%s: invalid character conversion for login name" msgstr "" -#: term-utils/agetty.c:1985 +#: term-utils/agetty.c:1984 #, c-format msgid "%s: invalid character 0x%x in login name" msgstr "" -#: term-utils/agetty.c:2070 +#: term-utils/agetty.c:2069 #, c-format msgid "%s: failed to set terminal attributes: %m" msgstr "" -#: term-utils/agetty.c:2106 +#: term-utils/agetty.c:2105 #, c-format msgid "" " %1$s [options] [,...] []\n" " %1$s [options] ,... []\n" msgstr "" -#: term-utils/agetty.c:2110 +#: term-utils/agetty.c:2109 msgid "Open a terminal and set its mode.\n" msgstr "" -#: term-utils/agetty.c:2113 +#: term-utils/agetty.c:2112 msgid " -8, --8bits assume 8-bit tty\n" msgstr "" -#: term-utils/agetty.c:2114 +#: term-utils/agetty.c:2113 msgid " -a, --autologin login the specified user automatically\n" msgstr "" -#: term-utils/agetty.c:2115 +#: term-utils/agetty.c:2114 msgid " -c, --noreset do not reset control mode\n" msgstr "" -#: term-utils/agetty.c:2116 +#: term-utils/agetty.c:2115 msgid " -E, --remote use -r for login(1)\n" msgstr "" -#: term-utils/agetty.c:2117 +#: term-utils/agetty.c:2116 msgid " -f, --issue-file display issue file\n" msgstr "" -#: term-utils/agetty.c:2118 +#: term-utils/agetty.c:2117 msgid " -h, --flow-control enable hardware flow control\n" msgstr "" -#: term-utils/agetty.c:2119 +#: term-utils/agetty.c:2118 msgid " -H, --host specify login host\n" msgstr "" -#: term-utils/agetty.c:2120 +#: term-utils/agetty.c:2119 msgid " -i, --noissue do not display issue file\n" msgstr "" -#: term-utils/agetty.c:2121 +#: term-utils/agetty.c:2120 msgid " -I, --init-string set init string\n" msgstr "" -#: term-utils/agetty.c:2122 +#: term-utils/agetty.c:2121 msgid " -J --noclear do not clear the screen before prompt\n" msgstr "" -#: term-utils/agetty.c:2123 +#: term-utils/agetty.c:2122 msgid " -l, --login-program specify login program\n" msgstr "" -#: term-utils/agetty.c:2124 +#: term-utils/agetty.c:2123 msgid " -L, --local-line[=] control the local line flag\n" msgstr "" -#: term-utils/agetty.c:2125 +#: term-utils/agetty.c:2124 msgid " -m, --extract-baud extract baud rate during connect\n" msgstr "" -#: term-utils/agetty.c:2126 +#: term-utils/agetty.c:2125 msgid " -n, --skip-login do not prompt for login\n" msgstr "" -#: term-utils/agetty.c:2127 +#: term-utils/agetty.c:2126 msgid " -N --nonewline do not print a newline before issue\n" msgstr "" -#: term-utils/agetty.c:2128 +#: term-utils/agetty.c:2127 msgid " -o, --login-options options that are passed to login\n" msgstr "" -#: term-utils/agetty.c:2129 +#: term-utils/agetty.c:2128 msgid " -p, --login-pause wait for any key before the login\n" msgstr "" -#: term-utils/agetty.c:2130 +#: term-utils/agetty.c:2129 msgid " -r, --chroot change root to the directory\n" msgstr "" -#: term-utils/agetty.c:2131 +#: term-utils/agetty.c:2130 msgid " -R, --hangup do virtually hangup on the tty\n" msgstr "" -#: term-utils/agetty.c:2132 +#: term-utils/agetty.c:2131 msgid " -s, --keep-baud try to keep baud rate after break\n" msgstr "" -#: term-utils/agetty.c:2133 +#: term-utils/agetty.c:2132 msgid " -t, --timeout login process timeout\n" msgstr "" -#: term-utils/agetty.c:2134 +#: term-utils/agetty.c:2133 msgid " -U, --detect-case detect uppercase terminal\n" msgstr "" -#: term-utils/agetty.c:2135 +#: term-utils/agetty.c:2134 msgid " -w, --wait-cr wait carriage-return\n" msgstr "" -#: term-utils/agetty.c:2136 +#: term-utils/agetty.c:2135 msgid " --nohints do not print hints\n" msgstr "" -#: term-utils/agetty.c:2137 +#: term-utils/agetty.c:2136 msgid " --nohostname no hostname at all will be shown\n" msgstr "" -#: term-utils/agetty.c:2138 +#: term-utils/agetty.c:2137 msgid " --long-hostname show full qualified hostname\n" msgstr "" -#: term-utils/agetty.c:2139 +#: term-utils/agetty.c:2138 msgid " --erase-chars additional backspace chars\n" msgstr "" -#: term-utils/agetty.c:2140 +#: term-utils/agetty.c:2139 msgid " --kill-chars additional kill chars\n" msgstr "" -#: term-utils/agetty.c:2141 +#: term-utils/agetty.c:2140 msgid " --chdir chdir before the login\n" msgstr "" -#: term-utils/agetty.c:2142 +#: term-utils/agetty.c:2141 msgid " --delay sleep seconds before prompt\n" msgstr "" -#: term-utils/agetty.c:2143 +#: term-utils/agetty.c:2142 msgid " --nice run login with this priority\n" msgstr "" -#: term-utils/agetty.c:2144 +#: term-utils/agetty.c:2143 msgid "" " --reload reload prompts on running agetty instances\n" msgstr "" -#: term-utils/agetty.c:2145 +#: term-utils/agetty.c:2144 msgid " --help display this help and exit\n" msgstr "" -#: term-utils/agetty.c:2146 +#: term-utils/agetty.c:2145 msgid " --version output version information and exit\n" msgstr "" -#: term-utils/agetty.c:2469 +#: term-utils/agetty.c:2468 #, c-format msgid "%d user" msgid_plural "%d users" msgstr[0] "" msgstr[1] "" -#: term-utils/agetty.c:2597 +#: term-utils/agetty.c:2596 #, c-format msgid "checkname failed: %m" msgstr "" -#: term-utils/agetty.c:2643 +#: term-utils/agetty.c:2642 #, c-format msgid "cannot touch file %s" msgstr "" -#: term-utils/agetty.c:2647 +#: term-utils/agetty.c:2646 msgid "--reload is unsupported on your system" msgstr "" -- cgit v1.2.3-55-g7522