From be76a9737d617abeb227fc79d9990af7c4bbbd19 Mon Sep 17 00:00:00 2001 From: msweet Date: Tue, 8 Apr 2014 19:53:57 +0000 Subject: [PATCH] Make sure that the sample drivers include all installed localizations () git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11800 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 4 +- locale/cups.pot | 269 +++++++++++++++--------------------------- locale/cups.strings | 18 --- locale/cups_ca.po | 144 +++++++++++----------- locale/cups_cs.po | 76 ++---------- locale/cups_es.po | 140 +++++++++++----------- locale/cups_fr.po | 76 ++---------- locale/cups_it.po | 142 +++++++++++----------- locale/cups_ja.po | 136 ++++++++++----------- locale/cups_ru.po | 76 ++---------- ppdc/Makefile | 6 +- ppdc/genstrings.cxx | 27 ++--- ppdc/ppdc-catalog.cxx | 96 +++++++++++++-- ppdc/ppdc.cxx | 23 ++-- ppdc/sample.drv | 71 ++++++----- 15 files changed, 549 insertions(+), 755 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 4fcb5903d..5566eb523 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 2.0b1 - 2014-04-02 +CHANGES.txt - 2.0b1 - 2014-04-08 -------------------------------- CHANGES IN CUPS V2.0b1 @@ -11,6 +11,8 @@ CHANGES IN CUPS V2.0b1 - Dropped support for AIX, HP-UX, and OSF/1 (aka Digital UNIX) - Dropped lppasswd and support for Digest authentication in in the scheduler (STR #4321) + - The sample drivers now include all of the installed localizations by + default () - Adopted Linux man page conventions and updated all man pages (STR #4372) - Changed the default AccessLogLevel and PageLogFormat to disable the diff --git a/locale/cups.pot b/locale/cups.pot index a29ca210d..36df6e742 100644 --- a/locale/cups.pot +++ b/locale/cups.pot @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-28 10:47-0400\n" +"POT-Creation-Date: 2014-04-08 15:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1003,11 +1003,11 @@ msgstr "" msgid " --[no-]user-cancel-any Allow/prevent users to cancel any job." msgstr "" -#: ppdc/ppdc.cxx:455 +#: ppdc/ppdc.cxx:450 msgid " --cr End lines with CR (Mac OS 9)." msgstr "" -#: ppdc/ppdc.cxx:457 +#: ppdc/ppdc.cxx:452 msgid " --crlf End lines with CR + LF (Windows)." msgstr "" @@ -1033,7 +1033,7 @@ msgstr "" msgid " --host regex Match hostname to regular expression." msgstr "" -#: ppdc/ppdc.cxx:459 +#: ppdc/ppdc.cxx:454 msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr "" @@ -1117,7 +1117,7 @@ msgstr "" msgid " -D Remove the input file when finished." msgstr "" -#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255 +#: ppdc/ppdc.cxx:433 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255 msgid " -D name=value Set named variable to value." msgstr "" @@ -1141,7 +1141,7 @@ msgstr "" msgid " -I Ignore errors." msgstr "" -#: ppdc/ppdc.cxx:440 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257 +#: ppdc/ppdc.cxx:435 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257 msgid " -I include-dir Add include directory to search path." msgstr "" @@ -1201,7 +1201,7 @@ msgstr "" msgid " -a Export all printers." msgstr "" -#: ppdc/ppdc.cxx:442 +#: ppdc/ppdc.cxx:437 msgid " -c catalog.po Load the specified message catalog." msgstr "" @@ -1221,7 +1221,7 @@ msgstr "" msgid " -d name=value Set named variable to value." msgstr "" -#: ppdc/ppdc.cxx:444 +#: ppdc/ppdc.cxx:439 msgid " -d output-dir Specify the output directory." msgstr "" @@ -1277,11 +1277,11 @@ msgstr "" msgid " -l Run cupsd on demand." msgstr "" -#: ppdc/ppdc.cxx:446 +#: ppdc/ppdc.cxx:441 msgid " -l lang[,lang,...] Specify the output language(s) (locale)." msgstr "" -#: ppdc/ppdc.cxx:448 +#: ppdc/ppdc.cxx:443 msgid " -m Use the ModelName value as the filename." msgstr "" @@ -1349,7 +1349,7 @@ msgstr "" msgid " -t Produce a test report." msgstr "" -#: ppdc/ppdc.cxx:450 +#: ppdc/ppdc.cxx:445 msgid " -t Test PPDs instead of generating them." msgstr "" @@ -1378,7 +1378,7 @@ msgid " -u regex Match URI to regular expression." msgstr "" #: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4703 -#: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259 +#: ppdc/ppdc.cxx:447 ppdc/ppdpo.cxx:259 msgid " -v Be verbose." msgstr "" @@ -1392,7 +1392,7 @@ msgid "" " Execute program if true." msgstr "" -#: ppdc/ppdc.cxx:453 +#: ppdc/ppdc.cxx:448 msgid " -z Compress PPD files using GNU zip." msgstr "" @@ -1543,172 +1543,172 @@ msgstr "" msgid " PASS" msgstr "" -#: cups/ipp.c:5139 +#: cups/ipp.c:5219 #, c-format msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)." msgstr "" -#: cups/ipp.c:5150 +#: cups/ipp.c:5230 #, c-format msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)." msgstr "" -#: cups/ipp.c:4770 +#: cups/ipp.c:4850 #, c-format msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)." msgstr "" -#: cups/ipp.c:4762 +#: cups/ipp.c:4842 #, c-format msgid "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)." msgstr "" -#: cups/ipp.c:4788 +#: cups/ipp.c:4868 #, c-format msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)." msgstr "" -#: cups/ipp.c:5202 +#: cups/ipp.c:5282 #, c-format msgid "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)." msgstr "" -#: cups/ipp.c:5211 +#: cups/ipp.c:5291 #, c-format msgid "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)." msgstr "" -#: cups/ipp.c:4888 +#: cups/ipp.c:4968 #, c-format msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)." msgstr "" -#: cups/ipp.c:4896 +#: cups/ipp.c:4976 #, c-format msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)." msgstr "" -#: cups/ipp.c:4880 +#: cups/ipp.c:4960 #, c-format msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)." msgstr "" -#: cups/ipp.c:4840 +#: cups/ipp.c:4920 #, c-format msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)." msgstr "" -#: cups/ipp.c:4872 +#: cups/ipp.c:4952 #, c-format msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)." msgstr "" -#: cups/ipp.c:4848 +#: cups/ipp.c:4928 #, c-format msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)." msgstr "" -#: cups/ipp.c:4856 +#: cups/ipp.c:4936 #, c-format msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)." msgstr "" -#: cups/ipp.c:4832 +#: cups/ipp.c:4912 #, c-format msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)." msgstr "" -#: cups/ipp.c:4864 +#: cups/ipp.c:4944 #, c-format msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)." msgstr "" -#: cups/ipp.c:4802 +#: cups/ipp.c:4882 #, c-format msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)." msgstr "" -#: cups/ipp.c:5117 +#: cups/ipp.c:5197 #, c-format msgid "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)." msgstr "" -#: cups/ipp.c:5108 +#: cups/ipp.c:5188 #, c-format msgid "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section 4.1.3)." msgstr "" -#: cups/ipp.c:5311 +#: cups/ipp.c:5391 #, c-format msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section 4.1.9)." msgstr "" -#: cups/ipp.c:5321 +#: cups/ipp.c:5401 #, c-format msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section 4.1.9)." msgstr "" -#: cups/ipp.c:5079 +#: cups/ipp.c:5159 #, c-format msgid "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)." msgstr "" -#: cups/ipp.c:5088 +#: cups/ipp.c:5168 #, c-format msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)." msgstr "" -#: cups/ipp.c:5257 +#: cups/ipp.c:5337 #, c-format msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section 4.1.8)." msgstr "" -#: cups/ipp.c:5267 +#: cups/ipp.c:5347 #, c-format msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section 4.1.8)." msgstr "" -#: cups/ipp.c:4816 +#: cups/ipp.c:4896 #, c-format msgid "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)." msgstr "" -#: cups/ipp.c:4959 +#: cups/ipp.c:5039 #, c-format msgid "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 section 4.1.13)." msgstr "" -#: cups/ipp.c:4940 +#: cups/ipp.c:5020 #, c-format msgid "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section 4.1.15)." msgstr "" -#: cups/ipp.c:4909 +#: cups/ipp.c:4989 #, c-format msgid "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 2911 section 4.1.15)." msgstr "" -#: cups/ipp.c:4924 +#: cups/ipp.c:5004 #, c-format msgid "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC 2911 section 4.1.15)." msgstr "" -#: cups/ipp.c:5021 +#: cups/ipp.c:5101 #, c-format msgid "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)." msgstr "" -#: cups/ipp.c:5030 +#: cups/ipp.c:5110 #, c-format msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)." msgstr "" -#: cups/ipp.c:5173 +#: cups/ipp.c:5253 #, c-format msgid "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)." msgstr "" -#: cups/ipp.c:5182 +#: cups/ipp.c:5262 #, c-format msgid "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)." msgstr "" @@ -3617,18 +3617,6 @@ msgstr "" msgid "English" msgstr "" -#: systemv/lppasswd.c:193 -msgid "Enter old password:" -msgstr "" - -#: systemv/lppasswd.c:224 -msgid "Enter password again:" -msgstr "" - -#: systemv/lppasswd.c:212 -msgid "Enter password:" -msgstr "" - #: scheduler/client.c:2200 msgid "Enter your username and password or the root username and password to access this page. If you are using Kerberos authentication, make sure you have a valid Kerberos ticket." msgstr "" @@ -4031,95 +4019,95 @@ msgstr "" msgid "Help file not in index." msgstr "" -#: cups/ipp.c:3095 cups/ipp.c:3122 cups/ipp.c:3145 +#: cups/ipp.c:3175 cups/ipp.c:3202 cups/ipp.c:3225 msgid "IPP 1setOf attribute with incompatible value tags." msgstr "" -#: cups/ipp.c:3058 +#: cups/ipp.c:3138 msgid "IPP attribute has no name." msgstr "" -#: cups/ipp.c:6912 +#: cups/ipp.c:6992 msgid "IPP attribute is not a member of the message." msgstr "" -#: cups/ipp.c:3506 +#: cups/ipp.c:3586 msgid "IPP begCollection value not 0 bytes." msgstr "" -#: cups/ipp.c:3288 +#: cups/ipp.c:3368 msgid "IPP boolean value not 1 byte." msgstr "" -#: cups/ipp.c:3349 +#: cups/ipp.c:3429 msgid "IPP date value not 11 bytes." msgstr "" -#: cups/ipp.c:3527 +#: cups/ipp.c:3607 msgid "IPP endCollection value not 0 bytes." msgstr "" -#: cups/ipp.c:3263 +#: cups/ipp.c:3343 msgid "IPP enum value not 4 bytes." msgstr "" -#: cups/ipp.c:2987 +#: cups/ipp.c:3067 msgid "IPP extension tag larger than 0x7FFFFFFF." msgstr "" -#: cups/ipp.c:3260 +#: cups/ipp.c:3340 msgid "IPP integer value not 4 bytes." msgstr "" -#: cups/ipp.c:3459 +#: cups/ipp.c:3539 msgid "IPP language length overflows value." msgstr "" -#: cups/ipp.c:3468 +#: cups/ipp.c:3548 msgid "IPP language length too large." msgstr "" -#: cups/ipp.c:3172 +#: cups/ipp.c:3252 msgid "IPP member name is not empty." msgstr "" -#: cups/ipp.c:3553 +#: cups/ipp.c:3633 msgid "IPP memberName value is empty." msgstr "" -#: cups/ipp.c:3545 +#: cups/ipp.c:3625 msgid "IPP memberName with no attribute." msgstr "" -#: cups/ipp.c:3041 +#: cups/ipp.c:3121 msgid "IPP name larger than 32767 bytes." msgstr "" -#: cups/ipp.c:3426 +#: cups/ipp.c:3506 msgid "IPP nameWithLanguage value less than minimum 4 bytes." msgstr "" -#: cups/ipp.c:3583 +#: cups/ipp.c:3663 msgid "IPP octetString length too large." msgstr "" -#: cups/ipp.c:3394 +#: cups/ipp.c:3474 msgid "IPP rangeOfInteger value not 8 bytes." msgstr "" -#: cups/ipp.c:3367 +#: cups/ipp.c:3447 msgid "IPP resolution value not 9 bytes." msgstr "" -#: cups/ipp.c:3486 +#: cups/ipp.c:3566 msgid "IPP string length overflows value." msgstr "" -#: cups/ipp.c:3422 +#: cups/ipp.c:3502 msgid "IPP textWithLanguage value less than minimum 4 bytes." msgstr "" -#: cups/ipp.c:3246 +#: cups/ipp.c:3326 msgid "IPP value larger than 32767 bytes." msgstr "" @@ -4774,7 +4762,7 @@ msgstr "" #: scheduler/cupsfilter.c:1482 scheduler/main.c:2158 systemv/cupsaddsmb.c:284 #: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3817 -#: test/ippfind.c:2715 test/ipptool.c:4675 ppdc/ppdc.cxx:437 +#: test/ippfind.c:2715 test/ipptool.c:4675 ppdc/ppdc.cxx:432 #: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:363 #: ppdc/ppdpo.cxx:254 msgid "Options:" @@ -4868,7 +4856,7 @@ msgstr "" msgid "ParamCustominTearInterval" msgstr "" -#: cups/auth.c:195 cups/auth.c:363 +#: cups/auth.c:195 cups/auth.c:362 #, c-format msgid "Password for %s on %s? " msgstr "" @@ -5603,12 +5591,12 @@ msgstr "" msgid "Unable to change server settings" msgstr "" -#: cups/ipp.c:5301 +#: cups/ipp.c:5381 #, c-format msgid "Unable to compile mimeMediaType regular expression: %s." msgstr "" -#: cups/ipp.c:5247 +#: cups/ipp.c:5327 #, c-format msgid "Unable to compile naturalLanguage regular expression: %s." msgstr "" @@ -5738,7 +5726,7 @@ msgstr "" msgid "Unable to find server credentials." msgstr "" -#: backend/ipp.c:3465 +#: backend/ipp.c:3448 msgid "Unable to get backend exit status." msgstr "" @@ -5885,7 +5873,7 @@ msgstr "" msgid "Unable to set server default" msgstr "" -#: backend/ipp.c:3324 backend/ipp.c:3401 backend/ipp.c:3409 +#: backend/ipp.c:3307 backend/ipp.c:3384 backend/ipp.c:3392 msgid "Unable to start backend process." msgstr "" @@ -6138,22 +6126,11 @@ msgid "" " lpoptions [-h server] [-E] -x printer" msgstr "" -#: systemv/lppasswd.c:476 -msgid "Usage: lppasswd [-g groupname]" -msgstr "" - -#: systemv/lppasswd.c:479 -msgid "" -"Usage: lppasswd [-g groupname] [username]\n" -" lppasswd [-g groupname] -a [username]\n" -" lppasswd [-g groupname] -x [username]" -msgstr "" - #: berkeley/lpq.c:637 msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" -#: ppdc/ppdc.cxx:435 +#: ppdc/ppdc.cxx:430 msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]" msgstr "" @@ -6218,10 +6195,6 @@ msgstr "" msgid "You must access this page using the URL https://%s:%d%s." msgstr "" -#: systemv/lppasswd.c:254 -msgid "Your password must be at least 6 characters long, cannot contain your username, and must contain at least one letter and number." -msgstr "" - #: ppdc/sample.c:439 msgid "ZPL Label Printer" msgstr "" @@ -6740,60 +6713,6 @@ msgstr "" msgid "lpoptions: Unknown printer or class." msgstr "" -#: systemv/lppasswd.c:173 -msgid "lppasswd: Only root can add or delete passwords." -msgstr "" - -#: systemv/lppasswd.c:302 -msgid "lppasswd: Password file busy." -msgstr "" - -#: systemv/lppasswd.c:431 -msgid "lppasswd: Password file not updated." -msgstr "" - -#: systemv/lppasswd.c:398 -msgid "lppasswd: Sorry, password doesn't match." -msgstr "" - -#: systemv/lppasswd.c:253 -msgid "lppasswd: Sorry, password rejected." -msgstr "" - -#: systemv/lppasswd.c:230 -msgid "lppasswd: Sorry, passwords don't match." -msgstr "" - -#: systemv/lppasswd.c:199 systemv/lppasswd.c:218 -#, c-format -msgid "lppasswd: Unable to copy password string: %s" -msgstr "" - -#: systemv/lppasswd.c:304 systemv/lppasswd.c:312 systemv/lppasswd.c:329 -#, c-format -msgid "lppasswd: Unable to open password file: %s" -msgstr "" - -#: systemv/lppasswd.c:364 systemv/lppasswd.c:377 systemv/lppasswd.c:408 -#, c-format -msgid "lppasswd: Unable to write to password file: %s" -msgstr "" - -#: systemv/lppasswd.c:446 -#, c-format -msgid "lppasswd: failed to backup old password file: %s" -msgstr "" - -#: systemv/lppasswd.c:458 -#, c-format -msgid "lppasswd: failed to rename password file: %s" -msgstr "" - -#: systemv/lppasswd.c:389 -#, c-format -msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." -msgstr "" - #: systemv/lpstat.c:1076 #, c-format msgid "lpstat: error - %s environment variable names non-existent destination \"%s\"." @@ -6830,7 +6749,7 @@ msgstr "" msgid "pending" msgstr "" -#: ppdc/ppdc.cxx:113 ppdc/ppdpo.cxx:93 +#: ppdc/ppdc.cxx:108 ppdc/ppdpo.cxx:93 #, c-format msgid "ppdc: Adding include directory \"%s\"." msgstr "" @@ -7040,7 +6959,7 @@ msgstr "" msgid "ppdc: Expected override field after Resolution on line %d of %s." msgstr "" -#: ppdc/ppdc-catalog.cxx:328 ppdc/ppdc-catalog.cxx:340 +#: ppdc/ppdc-catalog.cxx:389 ppdc/ppdc-catalog.cxx:401 #, c-format msgid "ppdc: Expected quoted string on line %d of %s." msgstr "" @@ -7125,17 +7044,17 @@ msgstr "" msgid "ppdc: Invalid option type \"%s\" on line %d of %s." msgstr "" -#: ppdc/ppdc.cxx:251 ppdc/ppdpo.cxx:123 +#: ppdc/ppdc.cxx:246 ppdc/ppdpo.cxx:123 #, c-format msgid "ppdc: Loading driver information file \"%s\"." msgstr "" -#: ppdc/ppdc.cxx:187 +#: ppdc/ppdc.cxx:182 #, c-format msgid "ppdc: Loading messages for locale \"%s\"." msgstr "" -#: ppdc/ppdc.cxx:126 +#: ppdc/ppdc.cxx:121 #, c-format msgid "ppdc: Loading messages from \"%s\"." msgstr "" @@ -7151,7 +7070,7 @@ msgstr "" msgid "ppdc: Missing #if on line %d of %s." msgstr "" -#: ppdc/ppdc-catalog.cxx:405 +#: ppdc/ppdc-catalog.cxx:466 #, c-format msgid "ppdc: Need a msgid line before any translation strings on line %d of %s." msgstr "" @@ -7183,22 +7102,22 @@ msgstr "" msgid "ppdc: Too many nested #if's on line %d of %s." msgstr "" -#: ppdc/ppdc.cxx:374 +#: ppdc/ppdc.cxx:369 #, c-format msgid "ppdc: Unable to create PPD file \"%s\" - %s." msgstr "" -#: ppdc/ppdc.cxx:266 +#: ppdc/ppdc.cxx:261 #, c-format msgid "ppdc: Unable to create output directory %s: %s" msgstr "" -#: ppdc/ppdc.cxx:287 +#: ppdc/ppdc.cxx:282 #, c-format msgid "ppdc: Unable to create output pipes: %s" msgstr "" -#: ppdc/ppdc.cxx:303 ppdc/ppdc.cxx:309 +#: ppdc/ppdc.cxx:298 ppdc/ppdc.cxx:304 #, c-format msgid "ppdc: Unable to execute cupstestppd: %s" msgstr "" @@ -7213,12 +7132,12 @@ msgstr "" msgid "ppdc: Unable to find include file \"%s\" on line %d of %s." msgstr "" -#: ppdc/ppdc.cxx:198 +#: ppdc/ppdc.cxx:193 #, c-format msgid "ppdc: Unable to find localization for \"%s\" - %s" msgstr "" -#: ppdc/ppdc.cxx:135 +#: ppdc/ppdc.cxx:130 #, c-format msgid "ppdc: Unable to load localization file \"%s\" - %s" msgstr "" @@ -7233,7 +7152,7 @@ msgstr "" msgid "ppdc: Undefined variable (%s) on line %d of %s." msgstr "" -#: ppdc/ppdc-catalog.cxx:422 +#: ppdc/ppdc-catalog.cxx:483 #, c-format msgid "ppdc: Unexpected text on line %d of %s." msgstr "" @@ -7253,7 +7172,7 @@ msgstr "" msgid "ppdc: Unknown media size \"%s\" on line %d of %s." msgstr "" -#: ppdc/ppdc-catalog.cxx:450 +#: ppdc/ppdc-catalog.cxx:511 #, c-format msgid "ppdc: Unknown message catalog format for \"%s\"." msgstr "" @@ -7273,17 +7192,17 @@ msgstr "" msgid "ppdc: Unterminated string starting with %c on line %d of %s." msgstr "" -#: ppdc/ppdc.cxx:365 +#: ppdc/ppdc.cxx:360 #, c-format msgid "ppdc: Warning - overlapping filename \"%s\"." msgstr "" -#: ppdc/ppdc.cxx:380 +#: ppdc/ppdc.cxx:375 #, c-format msgid "ppdc: Writing %s." msgstr "" -#: ppdc/ppdc.cxx:148 +#: ppdc/ppdc.cxx:143 #, c-format msgid "ppdc: Writing PPD files to directory \"%s\"." msgstr "" diff --git a/locale/cups.strings b/locale/cups.strings index 359445a70..ee34e0453 100644 --- a/locale/cups.strings +++ b/locale/cups.strings @@ -776,9 +776,6 @@ // TRANSLATORS: Banner/cover sheet after the print job. "Ending Banner" = "Ending Banner"; "English" = "English"; -"Enter old password:" = "Enter old password:"; -"Enter password again:" = "Enter password again:"; -"Enter password:" = "Enter password:"; "Enter your username and password or the root username and password to access this page. If you are using Kerberos authentication, make sure you have a valid Kerberos ticket." = "Enter your username and password or the root username and password to access this page. If you are using Kerberos authentication, make sure you have a valid Kerberos ticket."; "Envelope #10 " = "Envelope #10 "; "Envelope #11" = "Envelope #11"; @@ -1368,8 +1365,6 @@ "Usage: ipptool [options] URI filename [ ... filenameN ]" = "Usage: ipptool [options] URI filename [ ... filenameN ]"; "Usage: lpmove job/src dest" = "Usage: lpmove job/src dest"; "Usage: lpoptions [-h server] [-E] -d printer\n lpoptions [-h server] [-E] [-p printer] -l\n lpoptions [-h server] [-E] -p printer -o option[=value] ...\n lpoptions [-h server] [-E] -x printer" = "Usage: lpoptions [-h server] [-E] -d printer\n lpoptions [-h server] [-E] [-p printer] -l\n lpoptions [-h server] [-E] -p printer -o option[=value] ...\n lpoptions [-h server] [-E] -x printer"; -"Usage: lppasswd [-g groupname]" = "Usage: lppasswd [-g groupname]"; -"Usage: lppasswd [-g groupname] [username]\n lppasswd [-g groupname] -a [username]\n lppasswd [-g groupname] -x [username]" = "Usage: lppasswd [-g groupname] [username]\n lppasswd [-g groupname] -a [username]\n lppasswd [-g groupname] -x [username]"; "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" = "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"; "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]" = "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"; "Usage: ppdhtml [options] filename.drv >filename.html" = "Usage: ppdhtml [options] filename.drv >filename.html"; @@ -1387,7 +1382,6 @@ "Web Interface is Disabled" = "Web Interface is Disabled"; "Yes" = "Yes"; "You must access this page using the URL https://%s:%d%s." = "You must access this page using the URL https://%s:%d%s."; -"Your password must be at least 6 characters long, cannot contain your username, and must contain at least one letter and number." = "Your password must be at least 6 characters long, cannot contain your username, and must contain at least one letter and number."; "ZPL Label Printer" = "ZPL Label Printer"; "Zebra" = "Zebra"; "aborted" = "aborted"; @@ -1504,18 +1498,6 @@ "lpoptions: Unable to get PPD file for %s: %s" = "lpoptions: Unable to get PPD file for %s: %s"; "lpoptions: Unable to open PPD file for %s." = "lpoptions: Unable to open PPD file for %s."; "lpoptions: Unknown printer or class." = "lpoptions: Unknown printer or class."; -"lppasswd: Only root can add or delete passwords." = "lppasswd: Only root can add or delete passwords."; -"lppasswd: Password file busy." = "lppasswd: Password file busy."; -"lppasswd: Password file not updated." = "lppasswd: Password file not updated."; -"lppasswd: Sorry, password doesn't match." = "lppasswd: Sorry, password doesn't match."; -"lppasswd: Sorry, password rejected." = "lppasswd: Sorry, password rejected."; -"lppasswd: Sorry, passwords don't match." = "lppasswd: Sorry, passwords don't match."; -"lppasswd: Unable to copy password string: %s" = "lppasswd: Unable to copy password string: %s"; -"lppasswd: Unable to open password file: %s" = "lppasswd: Unable to open password file: %s"; -"lppasswd: Unable to write to password file: %s" = "lppasswd: Unable to write to password file: %s"; -"lppasswd: failed to backup old password file: %s" = "lppasswd: failed to backup old password file: %s"; -"lppasswd: failed to rename password file: %s" = "lppasswd: failed to rename password file: %s"; -"lppasswd: user \"%s\" and group \"%s\" do not exist." = "lppasswd: user \"%s\" and group \"%s\" do not exist."; "lpstat: error - %s environment variable names non-existent destination \"%s\"." = "lpstat: error - %s environment variable names non-existent destination \"%s\"."; "members of class %s:" = "members of class %s:"; "no entries" = "no entries"; diff --git a/locale/cups_ca.po b/locale/cups_ca.po index 1dd442bd4..79829844c 100644 --- a/locale/cups_ca.po +++ b/locale/cups_ca.po @@ -32,7 +32,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.4.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-28 10:47-0400\n" +"POT-Creation-Date: 2014-04-08 15:48-0400\n" "PO-Revision-Date: 2012-09-29 11:21+0200\n" "Last-Translator: Àngel Mompó \n" "Language-Team: Catalan \n" @@ -2988,15 +2988,6 @@ msgstr "S'està acabant el bàner" msgid "English" msgstr "Anglès" -msgid "Enter old password:" -msgstr "Introduïu la contrasenya antiga:" - -msgid "Enter password again:" -msgstr "Introduïu la contrasenya un altre cop:" - -msgid "Enter password:" -msgstr "Introduïu la contrasenya:" - msgid "" "Enter your username and password or the root username and password to access " "this page. If you are using Kerberos authentication, make sure you have a " @@ -4971,18 +4962,6 @@ msgstr "" " lpoptions [-h servidor] [-E] -p impressora -o opció[=valor] ...\n" " lpoptions [-h servidor] [-E] -x impressora" -msgid "Usage: lppasswd [-g groupname]" -msgstr "Sintaxi: lppasswd [-g nomgrup]" - -msgid "" -"Usage: lppasswd [-g groupname] [username]\n" -" lppasswd [-g groupname] -a [username]\n" -" lppasswd [-g groupname] -x [username]" -msgstr "" -"Sintaxi: lppasswd [-g nomgrup] [nomusuari]\n" -" lppasswd [-g nomgrup] -a [nomusuari]\n" -" lppasswd [-g nomgrup] -x [nomusuari]" - msgid "" "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" @@ -5044,13 +5023,6 @@ msgstr "" "Heu d'accedir a aquesta pagina a través de la URL https://%s:%d%s." -msgid "" -"Your password must be at least 6 characters long, cannot contain your " -"username, and must contain at least one letter and number." -msgstr "" -"La contrasenya ha de tenir com a mínim 6 caràcters, no pot contenir el nom " -"d'usuari, i ha de tenir com a mínim una lletra i un número." - msgid "ZPL Label Printer" msgstr "Impressora d'etiquetes ZPL" @@ -5465,51 +5437,6 @@ msgstr "lpoptions: no s'ha pogut obrir el fitxer PPD per %s." msgid "lpoptions: Unknown printer or class." msgstr "lpoptions: la impressora o la classe són desconegudes." -msgid "lppasswd: Only root can add or delete passwords." -msgstr "" -"lppasswd: només l'usuari primari (root) pot afegir o esborrar contrasenyes." - -msgid "lppasswd: Password file busy." -msgstr "lppaswd: el fitxer de contrasenyes està ocupat." - -msgid "lppasswd: Password file not updated." -msgstr "lppaswd: el fitxer de contrasenyes no està actualitzat." - -msgid "lppasswd: Sorry, password doesn't match." -msgstr "lppaswwd: la contrasenya no coincideix." - -msgid "lppasswd: Sorry, password rejected." -msgstr "lppaswwd: s'ha refusat la contrasenya." - -msgid "lppasswd: Sorry, passwords don't match." -msgstr "lppaswwd: les contrasenyes no coincideixen." - -#, c-format -msgid "lppasswd: Unable to copy password string: %s" -msgstr "lppasswd: no s'ha pogut copiar la cadena de contrasenya: %s" - -#, c-format -msgid "lppasswd: Unable to open password file: %s" -msgstr "lppasswd: no s'ha pogut obrir el fitxer de contrasenyes: %s" - -#, c-format -msgid "lppasswd: Unable to write to password file: %s" -msgstr "lppasswd: no s'ha pogut escriure al fitxer de contrasenyes: %s" - -#, c-format -msgid "lppasswd: failed to backup old password file: %s" -msgstr "" -"lppasswd: no s'ha pogut fer la còpia de seguretat del fitxer de contrasenyes " -"antic: %s" - -#, c-format -msgid "lppasswd: failed to rename password file: %s" -msgstr "lppasswd: no s'ha pogut canviar el nom del fitxer de contrasenyes: %s" - -#, c-format -msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." -msgstr "lppaswd: l'usuari «%s» i el grup «%s» no existeixen." - #, c-format msgid "" "lpstat: error - %s environment variable names non-existent destination \"%s" @@ -6111,6 +6038,15 @@ msgstr "La variable-bindings fa servir una longitud indefinida" #~ msgid "Address - 1 1/8 x 3 1/2\"" #~ msgstr "Adreça - 1 1/8 x 3 1/2\"" +#~ msgid "Enter old password:" +#~ msgstr "Introduïu la contrasenya antiga:" + +#~ msgid "Enter password again:" +#~ msgstr "Introduïu la contrasenya un altre cop:" + +#~ msgid "Enter password:" +#~ msgstr "Introduïu la contrasenya:" + #~ msgid "File Folder - 9/16 x 3 7/16\"" #~ msgstr "Carpeta d'arxivador: 9/16 x 3 7/16\"" @@ -6265,6 +6201,25 @@ msgstr "La variable-bindings fa servir una longitud indefinida" #~ msgid "Usage: cupsfilter [ options ] filename" #~ msgstr "Sintaxi: cupsfilter [ opcions ] nomfitxer" +#~ msgid "Usage: lppasswd [-g groupname]" +#~ msgstr "Sintaxi: lppasswd [-g nomgrup]" + +#~ msgid "" +#~ "Usage: lppasswd [-g groupname] [username]\n" +#~ " lppasswd [-g groupname] -a [username]\n" +#~ " lppasswd [-g groupname] -x [username]" +#~ msgstr "" +#~ "Sintaxi: lppasswd [-g nomgrup] [nomusuari]\n" +#~ " lppasswd [-g nomgrup] -a [nomusuari]\n" +#~ " lppasswd [-g nomgrup] -x [nomusuari]" + +#~ msgid "" +#~ "Your password must be at least 6 characters long, cannot contain your " +#~ "username, and must contain at least one letter and number." +#~ msgstr "" +#~ "La contrasenya ha de tenir com a mínim 6 caràcters, no pot contenir el " +#~ "nom d'usuari, i ha de tenir com a mínim una lletra i un número." + #~ msgid "convert: Use the -f option to specify a file to convert." #~ msgstr "" #~ "convert: feu servir l'opció -f per especificar el fitxer que voleu " @@ -6289,3 +6244,44 @@ msgstr "La variable-bindings fa servir una longitud indefinida" #~ msgid "ipptool: Missing version for \"-V\"." #~ msgstr "ipptool: falta la versió a «-V»." + +#~ msgid "lppasswd: Only root can add or delete passwords." +#~ msgstr "" +#~ "lppasswd: només l'usuari primari (root) pot afegir o esborrar " +#~ "contrasenyes." + +#~ msgid "lppasswd: Password file busy." +#~ msgstr "lppaswd: el fitxer de contrasenyes està ocupat." + +#~ msgid "lppasswd: Password file not updated." +#~ msgstr "lppaswd: el fitxer de contrasenyes no està actualitzat." + +#~ msgid "lppasswd: Sorry, password doesn't match." +#~ msgstr "lppaswwd: la contrasenya no coincideix." + +#~ msgid "lppasswd: Sorry, password rejected." +#~ msgstr "lppaswwd: s'ha refusat la contrasenya." + +#~ msgid "lppasswd: Sorry, passwords don't match." +#~ msgstr "lppaswwd: les contrasenyes no coincideixen." + +#~ msgid "lppasswd: Unable to copy password string: %s" +#~ msgstr "lppasswd: no s'ha pogut copiar la cadena de contrasenya: %s" + +#~ msgid "lppasswd: Unable to open password file: %s" +#~ msgstr "lppasswd: no s'ha pogut obrir el fitxer de contrasenyes: %s" + +#~ msgid "lppasswd: Unable to write to password file: %s" +#~ msgstr "lppasswd: no s'ha pogut escriure al fitxer de contrasenyes: %s" + +#~ msgid "lppasswd: failed to backup old password file: %s" +#~ msgstr "" +#~ "lppasswd: no s'ha pogut fer la còpia de seguretat del fitxer de " +#~ "contrasenyes antic: %s" + +#~ msgid "lppasswd: failed to rename password file: %s" +#~ msgstr "" +#~ "lppasswd: no s'ha pogut canviar el nom del fitxer de contrasenyes: %s" + +#~ msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." +#~ msgstr "lppaswd: l'usuari «%s» i el grup «%s» no existeixen." diff --git a/locale/cups_cs.po b/locale/cups_cs.po index 78f376ff7..79dcbde4f 100644 --- a/locale/cups_cs.po +++ b/locale/cups_cs.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-28 10:47-0400\n" +"POT-Creation-Date: 2014-04-08 15:48-0400\n" "PO-Revision-Date: 2012-09-14 10:26+0100\n" "Last-Translator: Jan Bartos \n" "Language-Team: Czech\n" @@ -2786,15 +2786,6 @@ msgstr "Ukončení baneru" msgid "English" msgstr "Čeština" -msgid "Enter old password:" -msgstr "Zadejte původní heslo:" - -msgid "Enter password again:" -msgstr "Opakujte heslo:" - -msgid "Enter password:" -msgstr "Zadejte heslo:" - msgid "" "Enter your username and password or the root username and password to access " "this page. If you are using Kerberos authentication, make sure you have a " @@ -4704,15 +4695,6 @@ msgid "" " lpoptions [-h server] [-E] -x printer" msgstr "" -msgid "Usage: lppasswd [-g groupname]" -msgstr "" - -msgid "" -"Usage: lppasswd [-g groupname] [username]\n" -" lppasswd [-g groupname] -a [username]\n" -" lppasswd [-g groupname] -x [username]" -msgstr "" - msgid "" "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" @@ -4771,11 +4753,6 @@ msgstr "" "Pro přístup k této stránce, použijte adresu URL https://%s:%d%s." -msgid "" -"Your password must be at least 6 characters long, cannot contain your " -"username, and must contain at least one letter and number." -msgstr "" - msgid "ZPL Label Printer" msgstr "Tiskárna štítků ZPL" @@ -5174,48 +5151,6 @@ msgstr "" msgid "lpoptions: Unknown printer or class." msgstr "" -msgid "lppasswd: Only root can add or delete passwords." -msgstr "" - -msgid "lppasswd: Password file busy." -msgstr "" - -msgid "lppasswd: Password file not updated." -msgstr "" - -msgid "lppasswd: Sorry, password doesn't match." -msgstr "" - -msgid "lppasswd: Sorry, password rejected." -msgstr "" - -msgid "lppasswd: Sorry, passwords don't match." -msgstr "" - -#, c-format -msgid "lppasswd: Unable to copy password string: %s" -msgstr "" - -#, c-format -msgid "lppasswd: Unable to open password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: Unable to write to password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: failed to backup old password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: failed to rename password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." -msgstr "" - #, c-format msgid "" "lpstat: error - %s environment variable names non-existent destination \"%s" @@ -5694,3 +5629,12 @@ msgstr "nepojmenovaný" msgid "variable-bindings uses indefinite length" msgstr "\"variable-bindings\" má neomezenou délku" + +#~ msgid "Enter old password:" +#~ msgstr "Zadejte původní heslo:" + +#~ msgid "Enter password again:" +#~ msgstr "Opakujte heslo:" + +#~ msgid "Enter password:" +#~ msgstr "Zadejte heslo:" diff --git a/locale/cups_es.po b/locale/cups_es.po index 8883e172d..66cfc4053 100644 --- a/locale/cups_es.po +++ b/locale/cups_es.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-28 10:47-0400\n" +"POT-Creation-Date: 2014-04-08 15:48-0400\n" "PO-Revision-Date: 2012-07-01 20:21+0100\n" "Last-Translator: Juan Pablo González Riopedre \n" "Language-Team: Spanish\n" @@ -2977,15 +2977,6 @@ msgstr "Rótulo final" msgid "English" msgstr "Spanish" -msgid "Enter old password:" -msgstr "Introduzca la contraseña antigua:" - -msgid "Enter password again:" -msgstr "Introduzca nuevamente la contraseña:" - -msgid "Enter password:" -msgstr "Introduzca la contraseña:" - msgid "" "Enter your username and password or the root username and password to access " "this page. If you are using Kerberos authentication, make sure you have a " @@ -4964,18 +4955,6 @@ msgstr "" " lpoptions [-h servidor] [-E] -p impresora -o opción[=valor] ...\n" " lpoptions [-h servidor] [-E] -x impresora" -msgid "Usage: lppasswd [-g groupname]" -msgstr "Uso: lppasswd [-g nombre_grupo]" - -msgid "" -"Usage: lppasswd [-g groupname] [username]\n" -" lppasswd [-g groupname] -a [username]\n" -" lppasswd [-g groupname] -x [username]" -msgstr "" -"Uso: lppasswd [-g nombre_grupo] [nombre_usuario]\n" -" lppasswd [-g nombre_grupo] -a [nombre_usuario]\n" -" lppasswd [-g nombre_grupo] -x [nombre_usuario]" - msgid "" "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" @@ -5041,13 +5020,6 @@ msgstr "" "Debe acceder a esta página usando el URL https://" "%s:%d%s." -msgid "" -"Your password must be at least 6 characters long, cannot contain your " -"username, and must contain at least one letter and number." -msgstr "" -"Su contraseña debe tener al menos 6 caracteres, no puede contener su nombre " -"de usuario, y debe tener al menos una letra y un número." - msgid "ZPL Label Printer" msgstr "Impresora de etiquetas ZPL" @@ -5460,50 +5432,6 @@ msgstr "lpoptions: No se ha podido abrir el archivo PPD para %s." msgid "lpoptions: Unknown printer or class." msgstr "lpoptions: Impresora o clase desconocida." -msgid "lppasswd: Only root can add or delete passwords." -msgstr "lppasswd: Solo el usuario root puede añadir o borrar contraseñas." - -msgid "lppasswd: Password file busy." -msgstr "lppasswd: Archivo de contraseñas ocupado." - -msgid "lppasswd: Password file not updated." -msgstr "lppasswd: Archivo de contraseñas no actualizado." - -msgid "lppasswd: Sorry, password doesn't match." -msgstr "lppasswd: Lo siento, la contraseña no coincide." - -msgid "lppasswd: Sorry, password rejected." -msgstr "lppasswd: Lo siento, la contraseña ha sido rechazada." - -msgid "lppasswd: Sorry, passwords don't match." -msgstr "lppasswd: Lo siento, las contraseñas no coinciden." - -#, c-format -msgid "lppasswd: Unable to copy password string: %s" -msgstr "lppasswd: No se ha podido copiar la cadena de contraseña: %s" - -#, c-format -msgid "lppasswd: Unable to open password file: %s" -msgstr "lppasswd: No se ha podido abrir el archivo de contraseñas: %s" - -#, c-format -msgid "lppasswd: Unable to write to password file: %s" -msgstr "lppasswd: No se ha podido escribir en el archivo de contraseñas: %s" - -#, c-format -msgid "lppasswd: failed to backup old password file: %s" -msgstr "" -"lppasswd: falló al hacer una copia de seguridad del antiguo archivo de " -"contraseñas: %s" - -#, c-format -msgid "lppasswd: failed to rename password file: %s" -msgstr "lppasswd: falló al cambiar de nombre al archivo de contraseñas: %s" - -#, c-format -msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." -msgstr "lppasswd: el usuario \"%s\" y el grupo \"%s\" no existen." - #, c-format msgid "" "lpstat: error - %s environment variable names non-existent destination \"%s" @@ -6020,6 +5948,15 @@ msgstr "variable-bindings usa una longitud indefinida" #~ msgid "%s: Error - expected destination after \"-b\" option." #~ msgstr "%s: Error - se esperaba un destino tras la opción \"-b\"." +#~ msgid "Enter old password:" +#~ msgstr "Introduzca la contraseña antigua:" + +#~ msgid "Enter password again:" +#~ msgstr "Introduzca nuevamente la contraseña:" + +#~ msgid "Enter password:" +#~ msgstr "Introduzca la contraseña:" + #~ msgid "Output for printer %s is sent to %s" #~ msgstr "La salida de la impresora %s se ha enviado a %s" @@ -6100,6 +6037,25 @@ msgstr "variable-bindings usa una longitud indefinida" #~ msgid "Usage: cupsfilter [ options ] filename" #~ msgstr "Uso: cupsfilter ( opciones ) archivo" +#~ msgid "Usage: lppasswd [-g groupname]" +#~ msgstr "Uso: lppasswd [-g nombre_grupo]" + +#~ msgid "" +#~ "Usage: lppasswd [-g groupname] [username]\n" +#~ " lppasswd [-g groupname] -a [username]\n" +#~ " lppasswd [-g groupname] -x [username]" +#~ msgstr "" +#~ "Uso: lppasswd [-g nombre_grupo] [nombre_usuario]\n" +#~ " lppasswd [-g nombre_grupo] -a [nombre_usuario]\n" +#~ " lppasswd [-g nombre_grupo] -x [nombre_usuario]" + +#~ msgid "" +#~ "Your password must be at least 6 characters long, cannot contain your " +#~ "username, and must contain at least one letter and number." +#~ msgstr "" +#~ "Su contraseña debe tener al menos 6 caracteres, no puede contener su " +#~ "nombre de usuario, y debe tener al menos una letra y un número." + #~ msgid "cupsd: launchd(8) support not compiled in, running in normal mode." #~ msgstr "" #~ "cupsd: el uso de launchd(8) no ha sido compilado, ejecutándose en modo " @@ -6113,3 +6069,41 @@ msgstr "variable-bindings usa una longitud indefinida" #~ msgid "ipptool: Missing version for \"-V\"." #~ msgstr "ipptool: Falta la versión para \"-V\"." + +#~ msgid "lppasswd: Only root can add or delete passwords." +#~ msgstr "lppasswd: Solo el usuario root puede añadir o borrar contraseñas." + +#~ msgid "lppasswd: Password file busy." +#~ msgstr "lppasswd: Archivo de contraseñas ocupado." + +#~ msgid "lppasswd: Password file not updated." +#~ msgstr "lppasswd: Archivo de contraseñas no actualizado." + +#~ msgid "lppasswd: Sorry, password doesn't match." +#~ msgstr "lppasswd: Lo siento, la contraseña no coincide." + +#~ msgid "lppasswd: Sorry, password rejected." +#~ msgstr "lppasswd: Lo siento, la contraseña ha sido rechazada." + +#~ msgid "lppasswd: Sorry, passwords don't match." +#~ msgstr "lppasswd: Lo siento, las contraseñas no coinciden." + +#~ msgid "lppasswd: Unable to copy password string: %s" +#~ msgstr "lppasswd: No se ha podido copiar la cadena de contraseña: %s" + +#~ msgid "lppasswd: Unable to open password file: %s" +#~ msgstr "lppasswd: No se ha podido abrir el archivo de contraseñas: %s" + +#~ msgid "lppasswd: Unable to write to password file: %s" +#~ msgstr "lppasswd: No se ha podido escribir en el archivo de contraseñas: %s" + +#~ msgid "lppasswd: failed to backup old password file: %s" +#~ msgstr "" +#~ "lppasswd: falló al hacer una copia de seguridad del antiguo archivo de " +#~ "contraseñas: %s" + +#~ msgid "lppasswd: failed to rename password file: %s" +#~ msgstr "lppasswd: falló al cambiar de nombre al archivo de contraseñas: %s" + +#~ msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." +#~ msgstr "lppasswd: el usuario \"%s\" y el grupo \"%s\" no existen." diff --git a/locale/cups_fr.po b/locale/cups_fr.po index 1859b00b0..4388fb82c 100644 --- a/locale/cups_fr.po +++ b/locale/cups_fr.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-28 10:47-0400\n" +"POT-Creation-Date: 2014-04-08 15:48-0400\n" "PO-Revision-Date: 2012-12-12 11:12+0100\n" "Last-Translator: denis meramdjougoma \n" "Language-Team: LANGUAGE \n" @@ -2786,15 +2786,6 @@ msgstr "Fin de la bannière" msgid "English" msgstr "French" -msgid "Enter old password:" -msgstr "Ancien mot de passe :" - -msgid "Enter password again:" -msgstr "Confirmez le nouveau mot de passe :" - -msgid "Enter password:" -msgstr "Entrez le nouveau mot de passe :" - msgid "" "Enter your username and password or the root username and password to access " "this page. If you are using Kerberos authentication, make sure you have a " @@ -4706,15 +4697,6 @@ msgid "" " lpoptions [-h server] [-E] -x printer" msgstr "" -msgid "Usage: lppasswd [-g groupname]" -msgstr "" - -msgid "" -"Usage: lppasswd [-g groupname] [username]\n" -" lppasswd [-g groupname] -a [username]\n" -" lppasswd [-g groupname] -x [username]" -msgstr "" - msgid "" "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" @@ -4773,11 +4755,6 @@ msgstr "" "Vous devez accéder à cette page par l’URL https://%s:%d%s." -msgid "" -"Your password must be at least 6 characters long, cannot contain your " -"username, and must contain at least one letter and number." -msgstr "" - msgid "ZPL Label Printer" msgstr "Imprimante pour étiquettes ZPL" @@ -5176,48 +5153,6 @@ msgstr "" msgid "lpoptions: Unknown printer or class." msgstr "" -msgid "lppasswd: Only root can add or delete passwords." -msgstr "" - -msgid "lppasswd: Password file busy." -msgstr "" - -msgid "lppasswd: Password file not updated." -msgstr "" - -msgid "lppasswd: Sorry, password doesn't match." -msgstr "" - -msgid "lppasswd: Sorry, password rejected." -msgstr "" - -msgid "lppasswd: Sorry, passwords don't match." -msgstr "" - -#, c-format -msgid "lppasswd: Unable to copy password string: %s" -msgstr "" - -#, c-format -msgid "lppasswd: Unable to open password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: Unable to write to password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: failed to backup old password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: failed to rename password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." -msgstr "" - #, c-format msgid "" "lpstat: error - %s environment variable names non-existent destination \"%s" @@ -5696,3 +5631,12 @@ msgstr "sans titre" msgid "variable-bindings uses indefinite length" msgstr "" + +#~ msgid "Enter old password:" +#~ msgstr "Ancien mot de passe :" + +#~ msgid "Enter password again:" +#~ msgstr "Confirmez le nouveau mot de passe :" + +#~ msgid "Enter password:" +#~ msgstr "Entrez le nouveau mot de passe :" diff --git a/locale/cups_it.po b/locale/cups_it.po index 8fd1e0f5f..99ed64c61 100644 --- a/locale/cups_it.po +++ b/locale/cups_it.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-28 10:47-0400\n" +"POT-Creation-Date: 2014-04-08 15:48-0400\n" "PO-Revision-Date: 2013-07-14 12:00+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -3064,15 +3064,6 @@ msgstr "Termine del banner" msgid "English" msgstr "Inglese" -msgid "Enter old password:" -msgstr "Digitare la vecchia password:" - -msgid "Enter password again:" -msgstr "Digitare di nuovo la password:" - -msgid "Enter password:" -msgstr "Digitare la password:" - msgid "" "Enter your username and password or the root username and password to access " "this page. If you are using Kerberos authentication, make sure you have a " @@ -5050,18 +5041,6 @@ msgstr "" " lpoptions [-h server] [-E] -p stampante -o opzione[=valore] ...\n" " lpoptions [-h server] [-E] -x stampante" -msgid "Usage: lppasswd [-g groupname]" -msgstr "Uso: lppasswd [-g groupname]" - -msgid "" -"Usage: lppasswd [-g groupname] [username]\n" -" lppasswd [-g groupname] -a [username]\n" -" lppasswd [-g groupname] -x [username]" -msgstr "" -"Uso: lppasswd [-g groupname] [username]\n" -" lppasswd [-g groupname] -a [username]\n" -" lppasswd [-g groupname] -x [username]" - msgid "" "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" @@ -5122,13 +5101,6 @@ msgstr "" "Bisogna accedere a questa pagina, usando l'URL https://%s:%d%s." -msgid "" -"Your password must be at least 6 characters long, cannot contain your " -"username, and must contain at least one letter and number." -msgstr "" -"La password deve contenere almeno 6 caratteri, non può contenere l'username " -"e deve contenere almeno una lettera ed un numero." - msgid "ZPL Label Printer" msgstr "ZPL Label Printer" @@ -5537,51 +5509,6 @@ msgstr "lpoptions: non è possibile aprire il file PPD per %s." msgid "lpoptions: Unknown printer or class." msgstr "lpoptions: stampante o classe sconosciuta." -msgid "lppasswd: Only root can add or delete passwords." -msgstr "lppasswd: solo root può aggiungere o eliminare le password." - -msgid "lppasswd: Password file busy." -msgstr "lppasswd: il file delle password è già in uso." - -msgid "lppasswd: Password file not updated." -msgstr "lppasswd: il file delle password non è aggiornato." - -msgid "lppasswd: Sorry, password doesn't match." -msgstr "lppasswd: spiacenti, la password non è esatta." - -msgid "lppasswd: Sorry, password rejected." -msgstr "lppasswd: spiacenti, la password è stata rifiutata." - -msgid "lppasswd: Sorry, passwords don't match." -msgstr "lppasswd: spiacenti, le password non sono esatte." - -#, c-format -msgid "lppasswd: Unable to copy password string: %s" -msgstr "lppasswd: non è possibile copiare la stringa della password: %s" - -#, c-format -msgid "lppasswd: Unable to open password file: %s" -msgstr "lppasswd: non è possibile aprire il file delle password: %s" - -#, c-format -msgid "lppasswd: Unable to write to password file: %s" -msgstr "" -"lppasswd: non è possibile scrivere all'interno del file delle password: %s" - -#, c-format -msgid "lppasswd: failed to backup old password file: %s" -msgstr "" -"lppasswd: non è possibile eseguire il backup del vecchio file delle " -"password: %s" - -#, c-format -msgid "lppasswd: failed to rename password file: %s" -msgstr "lppasswd: non è possibile rinominare il file delle password: %s" - -#, c-format -msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." -msgstr "lppasswd: l'utente \"%s\" ed il gruppo \"%s\" non esistono." - #, c-format msgid "" "lpstat: error - %s environment variable names non-existent destination \"%s" @@ -6094,6 +6021,15 @@ msgstr "variable-bindings utilizza una lunghezza indefinita" #~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes" #~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f byte" +#~ msgid "Enter old password:" +#~ msgstr "Digitare la vecchia password:" + +#~ msgid "Enter password again:" +#~ msgstr "Digitare di nuovo la password:" + +#~ msgid "Enter password:" +#~ msgstr "Digitare la password:" + #~ msgid "Output for printer %s is sent to %s" #~ msgstr "L'output della stampante %s è stato inviato a %s" @@ -6150,6 +6086,64 @@ msgstr "variable-bindings utilizza una lunghezza indefinita" #~ msgid "Usage: cupsfilter [ options ] filename" #~ msgstr "Uso: cupsfilter [ opzioni ] file" +#~ msgid "Usage: lppasswd [-g groupname]" +#~ msgstr "Uso: lppasswd [-g groupname]" + +#~ msgid "" +#~ "Usage: lppasswd [-g groupname] [username]\n" +#~ " lppasswd [-g groupname] -a [username]\n" +#~ " lppasswd [-g groupname] -x [username]" +#~ msgstr "" +#~ "Uso: lppasswd [-g groupname] [username]\n" +#~ " lppasswd [-g groupname] -a [username]\n" +#~ " lppasswd [-g groupname] -x [username]" + +#~ msgid "" +#~ "Your password must be at least 6 characters long, cannot contain your " +#~ "username, and must contain at least one letter and number." +#~ msgstr "" +#~ "La password deve contenere almeno 6 caratteri, non può contenere " +#~ "l'username e deve contenere almeno una lettera ed un numero." + #~ msgid "cupsd: launchd(8) support not compiled in, running in normal mode." #~ msgstr "" #~ "cupsd: launchd(8) non supporta i compilati, quando è in modalità normale." + +#~ msgid "lppasswd: Only root can add or delete passwords." +#~ msgstr "lppasswd: solo root può aggiungere o eliminare le password." + +#~ msgid "lppasswd: Password file busy." +#~ msgstr "lppasswd: il file delle password è già in uso." + +#~ msgid "lppasswd: Password file not updated." +#~ msgstr "lppasswd: il file delle password non è aggiornato." + +#~ msgid "lppasswd: Sorry, password doesn't match." +#~ msgstr "lppasswd: spiacenti, la password non è esatta." + +#~ msgid "lppasswd: Sorry, password rejected." +#~ msgstr "lppasswd: spiacenti, la password è stata rifiutata." + +#~ msgid "lppasswd: Sorry, passwords don't match." +#~ msgstr "lppasswd: spiacenti, le password non sono esatte." + +#~ msgid "lppasswd: Unable to copy password string: %s" +#~ msgstr "lppasswd: non è possibile copiare la stringa della password: %s" + +#~ msgid "lppasswd: Unable to open password file: %s" +#~ msgstr "lppasswd: non è possibile aprire il file delle password: %s" + +#~ msgid "lppasswd: Unable to write to password file: %s" +#~ msgstr "" +#~ "lppasswd: non è possibile scrivere all'interno del file delle password: %s" + +#~ msgid "lppasswd: failed to backup old password file: %s" +#~ msgstr "" +#~ "lppasswd: non è possibile eseguire il backup del vecchio file delle " +#~ "password: %s" + +#~ msgid "lppasswd: failed to rename password file: %s" +#~ msgstr "lppasswd: non è possibile rinominare il file delle password: %s" + +#~ msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." +#~ msgstr "lppasswd: l'utente \"%s\" ed il gruppo \"%s\" non esistono." diff --git a/locale/cups_ja.po b/locale/cups_ja.po index f0825e47c..fe98cda88 100644 --- a/locale/cups_ja.po +++ b/locale/cups_ja.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.7\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-28 10:47-0400\n" +"POT-Creation-Date: 2014-04-08 15:48-0400\n" "PO-Revision-Date: 2013-08-19 11:51+0900\n" "Last-Translator: OPFC TRANSCUPS \n" "Language-Team: OPFC TRANSCUPS \n" @@ -3020,15 +3020,6 @@ msgstr "終了バナー" msgid "English" msgstr "English" -msgid "Enter old password:" -msgstr "古いパスワードを入力:" - -msgid "Enter password again:" -msgstr "パスワードを再度入力:" - -msgid "Enter password:" -msgstr "パスワードを入力:" - msgid "" "Enter your username and password or the root username and password to access " "this page. If you are using Kerberos authentication, make sure you have a " @@ -4988,18 +4979,6 @@ msgstr "" " lpoptions [-h サーバー] [-E] -p プリンター -o オプション[=値] ...\n" " lpoptions [-h サーバー] [-E] -x プリンター" -msgid "Usage: lppasswd [-g groupname]" -msgstr "使い方: lppasswd [-g グループ名]" - -msgid "" -"Usage: lppasswd [-g groupname] [username]\n" -" lppasswd [-g groupname] -a [username]\n" -" lppasswd [-g groupname] -x [username]" -msgstr "" -"使い方: lppasswd [-g グループ名] [ユーザー名]\n" -" lppasswd [-g グループ名] -a [ユーザー名]\n" -" lppasswd [-g グループ名] -x [ユーザー名]" - msgid "" "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" @@ -5061,13 +5040,6 @@ msgstr "" "このページには URL https://%s:%d%s を使ってア" "クセスする必要があります。" -msgid "" -"Your password must be at least 6 characters long, cannot contain your " -"username, and must contain at least one letter and number." -msgstr "" -"パスワードは少なくとも 6 文字以上で、あなたのユーザー名を含んではならず、少な" -"くとも 1 つの英字および数値を含んでなければなりません。" - msgid "ZPL Label Printer" msgstr "ZPL ラベルプリンター" @@ -5486,48 +5458,6 @@ msgstr "lpoptions: %s の PPD ファイルを開けません。" msgid "lpoptions: Unknown printer or class." msgstr "lpoptions: 未知のプリンターまたはクラスです。" -msgid "lppasswd: Only root can add or delete passwords." -msgstr "lppasswd: root だけがパスワードの追加と削除を行えます。" - -msgid "lppasswd: Password file busy." -msgstr "lppasswd: パスワードファイルがビジー状態です。" - -msgid "lppasswd: Password file not updated." -msgstr "lppasswd: パスワードファイルは更新されません。" - -msgid "lppasswd: Sorry, password doesn't match." -msgstr "lppasswd: 残念ながら、パスワードがマッチしません。" - -msgid "lppasswd: Sorry, password rejected." -msgstr "lppasswd: 残念ながら、パスワードは拒否されました。" - -msgid "lppasswd: Sorry, passwords don't match." -msgstr "lppasswd: 残念ながら、パスワードがマッチしません。" - -#, c-format -msgid "lppasswd: Unable to copy password string: %s" -msgstr "lppasswd: パスワード文字列をコピーできません: %s" - -#, c-format -msgid "lppasswd: Unable to open password file: %s" -msgstr "lppasswd: パスワードファイルを開けません: %s" - -#, c-format -msgid "lppasswd: Unable to write to password file: %s" -msgstr "lppasswd: パスワードファイルに書き込めません: %s" - -#, c-format -msgid "lppasswd: failed to backup old password file: %s" -msgstr "lppasswd: 古いパスワードファイルのバックアップに失敗しました: %s" - -#, c-format -msgid "lppasswd: failed to rename password file: %s" -msgstr "lppasswd: パスワードファイルの名前の変更に失敗しました: %s" - -#, c-format -msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." -msgstr "lppasswd: ユーザー \"%s\" およびグループ \"%s\" は存在しません。" - #, c-format msgid "" "lpstat: error - %s environment variable names non-existent destination \"%s" @@ -6076,6 +6006,15 @@ msgstr "variable-bindings の長さが不定" #~ msgid "%s: Error - expected destination after \"-b\" option." #~ msgstr "%s: エラー - \"-b\" オプションのあとに宛先が必要です。" +#~ msgid "Enter old password:" +#~ msgstr "古いパスワードを入力:" + +#~ msgid "Enter password again:" +#~ msgstr "パスワードを再度入力:" + +#~ msgid "Enter password:" +#~ msgstr "パスワードを入力:" + #~ msgid "Output for printer %s is sent to %s" #~ msgstr "プリンター %s の出力は %s に送られます" @@ -6154,6 +6093,25 @@ msgstr "variable-bindings の長さが不定" #~ msgid "Usage: cupsfilter [ options ] filename" #~ msgstr "使い方: cupsfilter [オプション] ファイル名" +#~ msgid "Usage: lppasswd [-g groupname]" +#~ msgstr "使い方: lppasswd [-g グループ名]" + +#~ msgid "" +#~ "Usage: lppasswd [-g groupname] [username]\n" +#~ " lppasswd [-g groupname] -a [username]\n" +#~ " lppasswd [-g groupname] -x [username]" +#~ msgstr "" +#~ "使い方: lppasswd [-g グループ名] [ユーザー名]\n" +#~ " lppasswd [-g グループ名] -a [ユーザー名]\n" +#~ " lppasswd [-g グループ名] -x [ユーザー名]" + +#~ msgid "" +#~ "Your password must be at least 6 characters long, cannot contain your " +#~ "username, and must contain at least one letter and number." +#~ msgstr "" +#~ "パスワードは少なくとも 6 文字以上で、あなたのユーザー名を含んではならず、" +#~ "少なくとも 1 つの英字および数値を含んでなければなりません。" + #~ msgid "cupsd: launchd(8) support not compiled in, running in normal mode." #~ msgstr "" #~ "cupsd: launchd(8) サポートがコンパイルされていないので、通常モードで動作し" @@ -6167,3 +6125,39 @@ msgstr "variable-bindings の長さが不定" #~ msgid "ipptool: Missing version for \"-V\"." #~ msgstr "ipptool: \"-V\" にバージョンの指定がありません。" + +#~ msgid "lppasswd: Only root can add or delete passwords." +#~ msgstr "lppasswd: root だけがパスワードの追加と削除を行えます。" + +#~ msgid "lppasswd: Password file busy." +#~ msgstr "lppasswd: パスワードファイルがビジー状態です。" + +#~ msgid "lppasswd: Password file not updated." +#~ msgstr "lppasswd: パスワードファイルは更新されません。" + +#~ msgid "lppasswd: Sorry, password doesn't match." +#~ msgstr "lppasswd: 残念ながら、パスワードがマッチしません。" + +#~ msgid "lppasswd: Sorry, password rejected." +#~ msgstr "lppasswd: 残念ながら、パスワードは拒否されました。" + +#~ msgid "lppasswd: Sorry, passwords don't match." +#~ msgstr "lppasswd: 残念ながら、パスワードがマッチしません。" + +#~ msgid "lppasswd: Unable to copy password string: %s" +#~ msgstr "lppasswd: パスワード文字列をコピーできません: %s" + +#~ msgid "lppasswd: Unable to open password file: %s" +#~ msgstr "lppasswd: パスワードファイルを開けません: %s" + +#~ msgid "lppasswd: Unable to write to password file: %s" +#~ msgstr "lppasswd: パスワードファイルに書き込めません: %s" + +#~ msgid "lppasswd: failed to backup old password file: %s" +#~ msgstr "lppasswd: 古いパスワードファイルのバックアップに失敗しました: %s" + +#~ msgid "lppasswd: failed to rename password file: %s" +#~ msgstr "lppasswd: パスワードファイルの名前の変更に失敗しました: %s" + +#~ msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." +#~ msgstr "lppasswd: ユーザー \"%s\" およびグループ \"%s\" は存在しません。" diff --git a/locale/cups_ru.po b/locale/cups_ru.po index e40307211..d13dc6094 100644 --- a/locale/cups_ru.po +++ b/locale/cups_ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-28 10:47-0400\n" +"POT-Creation-Date: 2014-04-08 15:48-0400\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" @@ -2759,15 +2759,6 @@ msgstr "Конечный баннер" msgid "English" msgstr "Russian" -msgid "Enter old password:" -msgstr "Введите старый пароль:" - -msgid "Enter password again:" -msgstr "Введите пароль снова:" - -msgid "Enter password:" -msgstr "Введите пароль:" - msgid "" "Enter your username and password or the root username and password to access " "this page. If you are using Kerberos authentication, make sure you have a " @@ -4678,15 +4669,6 @@ msgid "" " lpoptions [-h server] [-E] -x printer" msgstr "" -msgid "Usage: lppasswd [-g groupname]" -msgstr "" - -msgid "" -"Usage: lppasswd [-g groupname] [username]\n" -" lppasswd [-g groupname] -a [username]\n" -" lppasswd [-g groupname] -x [username]" -msgstr "" - msgid "" "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" @@ -4745,11 +4727,6 @@ msgstr "" "Вы должны получить доступ к этой странице с помощью URL https://%s:%d%s." -msgid "" -"Your password must be at least 6 characters long, cannot contain your " -"username, and must contain at least one letter and number." -msgstr "" - msgid "ZPL Label Printer" msgstr "Принтер для печати этикеток ZPL" @@ -5148,48 +5125,6 @@ msgstr "" msgid "lpoptions: Unknown printer or class." msgstr "" -msgid "lppasswd: Only root can add or delete passwords." -msgstr "" - -msgid "lppasswd: Password file busy." -msgstr "" - -msgid "lppasswd: Password file not updated." -msgstr "" - -msgid "lppasswd: Sorry, password doesn't match." -msgstr "" - -msgid "lppasswd: Sorry, password rejected." -msgstr "" - -msgid "lppasswd: Sorry, passwords don't match." -msgstr "" - -#, c-format -msgid "lppasswd: Unable to copy password string: %s" -msgstr "" - -#, c-format -msgid "lppasswd: Unable to open password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: Unable to write to password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: failed to backup old password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: failed to rename password file: %s" -msgstr "" - -#, c-format -msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." -msgstr "" - #, c-format msgid "" "lpstat: error - %s environment variable names non-existent destination \"%s" @@ -8157,6 +8092,15 @@ msgstr "Для variable-bindings длина не установлена" #~ msgid "Empty PPD file!" #~ msgstr "Пустой PPD-файл!" +#~ msgid "Enter old password:" +#~ msgstr "Введите старый пароль:" + +#~ msgid "Enter password again:" +#~ msgstr "Введите пароль снова:" + +#~ msgid "Enter password:" +#~ msgstr "Введите пароль:" + #~ msgid "Error: need hostname after '-h' option\n" #~ msgstr "ERROR: Требуется имя хоста после параметра '-h'\n" diff --git a/ppdc/Makefile b/ppdc/Makefile index 0943d10b3..1bf09dd6a 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile @@ -3,7 +3,7 @@ # # Makefile for the CUPS PPD Compiler. # -# Copyright 2007-2013 by Apple Inc. +# Copyright 2007-2014 by Apple Inc. # Copyright 2002-2006 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -290,9 +290,9 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) echo Testing PPD importer... $(RM) -r ppd ppd2 sample-import.drv - ./ppdc-static -I ../data sample.drv + ./ppdc-static -l en -I ../data sample.drv ./ppdi-static -I ../data -o sample-import.drv ppd/* - ./ppdc-static -I ../data -d ppd2 sample-import.drv + ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv if diff -r ppd ppd2 >/dev/null; then \ echo PPD import OK; \ else \ diff --git a/ppdc/genstrings.cxx b/ppdc/genstrings.cxx index d08416d32..8d0061ba0 100644 --- a/ppdc/genstrings.cxx +++ b/ppdc/genstrings.cxx @@ -1,31 +1,24 @@ // // "$Id$" // -// GNU gettext message generator for the CUPS PPD Compiler. +// GNU gettext message generator for the CUPS PPD Compiler. // -// This program is used to generate a dummy source file containing all of -// the standard media and sample driver strings. The results are picked up -// by GNU gettext and placed in the CUPS message catalog. +// This program is used to generate a dummy source file containing all of +// the standard media and sample driver strings. The results are picked up +// by GNU gettext and placed in the CUPS message catalog. // -// Copyright 2008-2011 by Apple Inc. +// Copyright 2008-2014 by Apple Inc. // -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // Usage: // // ./genstrings >sample.c // -// Contents: -// -// main() - Main entry for the PPD compiler. -// add_ui_strings() - Add all UI strings from the driver. -// write_cstring() - Write a translation string as a valid C string to -// stdout. -// // // Include necessary headers... diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx index 1bf46566f..567163731 100644 --- a/ppdc/ppdc-catalog.cxx +++ b/ppdc/ppdc-catalog.cxx @@ -37,6 +37,9 @@ typedef enum // Local functions... // +#if defined(__APPLE__) && defined(CUPS_BUNDLEDIR) +static void apple_add_message(CFStringRef key, CFStringRef val, ppdcCatalog *c); +#endif /* __APPLE__ && CUPS_BUNDLEDIR */ static int get_utf8(char *&ptr); static int get_utf16(cups_file_t *fp, ppdc_cs_t &cs); static int put_utf8(int ch, char *&ptr, char *end); @@ -51,10 +54,6 @@ ppdcCatalog::ppdcCatalog(const char *l, // I - Locale const char *f) // I - Message catalog file : ppdcShared() { - _cups_globals_t *cg = _cupsGlobals(); - // Global information - - PPDC_NEW; locale = new ppdcString(l); @@ -67,6 +66,67 @@ ppdcCatalog::ppdcCatalog(const char *l, // I - Locale char pofile[1024]; // Message catalog file +#if defined(__APPLE__) && defined(CUPS_BUNDLEDIR) + char applelang[256]; // Apple language ID + CFURLRef url; // URL to cups.strings file + CFReadStreamRef stream = NULL; // File stream + CFPropertyListRef plist = NULL; // Localization file + + snprintf(pofile, sizeof(pofile), CUPS_BUNDLEDIR "/Resources/%s.lproj/cups.strings", _cupsAppleLanguage(l, applelang, sizeof(applelang))); + if (access(pofile, 0)) + { + // Try alternate lproj directory names... + const char *tl = l; // Temporary locale string + + if (!strncmp(l, "en", 2)) + tl = "English"; + else if (!strncmp(l, "nb", 2) || !strncmp(l, "nl", 2)) + tl = "Dutch"; + else if (!strncmp(l, "fr", 2)) + tl = "French"; + else if (!strncmp(l, "de", 2)) + tl = "German"; + else if (!strncmp(l, "it", 2)) + tl = "Italian"; + else if (!strncmp(l, "ja", 2)) + tl = "Japanese"; + else if (!strncmp(l, "es", 2)) + tl = "Spanish"; + + snprintf(pofile, sizeof(pofile), CUPS_BUNDLEDIR "/Resources/%s.lproj/cups.strings", tl); + } + + url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (UInt8 *)pofile, (CFIndex)strlen(pofile), false); + if (url) + { + stream = CFReadStreamCreateWithFile(kCFAllocatorDefault, url); + + if (stream) + { + /* + * Read the property list containing the localization data. + */ + + CFReadStreamOpen(stream); + + plist = CFPropertyListCreateWithStream(kCFAllocatorDefault, stream, 0, kCFPropertyListImmutable, NULL, NULL); + + if (plist && CFGetTypeID(plist) == CFDictionaryGetTypeID()) + CFDictionaryApplyFunction((CFDictionaryRef)plist, (CFDictionaryApplierFunction)apple_add_message, this); + + if (plist) + CFRelease(plist); + + CFRelease(stream); + } + + CFRelease(url); + } + +#else + _cups_globals_t *cg = _cupsGlobals(); + // Global information + snprintf(pofile, sizeof(pofile), "%s/%s/cups_%s.po", cg->localedir, l, l); if (load_messages(pofile) && strchr(l, '_')) @@ -81,9 +141,10 @@ ppdcCatalog::ppdcCatalog(const char *l, // I - Locale load_messages(pofile); } +#endif /* __APPLE__ && CUPS_BUNDLEDIR */ } - if (f) + if (f && *f) load_messages(f); } @@ -193,8 +254,8 @@ ppdcCatalog::load_messages( else if (!strcmp(ptr, ".strings")) { /* - * Read messages in OS X ".strings" format, which are UTF-16 text files of - * the format: + * Read messages in OS X ".strings" format, which are either UTF-8/UTF-16 + * text files of the format: * * "id" = "str"; * @@ -597,6 +658,27 @@ ppdcCatalog::save_messages( } +#if defined(__APPLE__) && defined(CUPS_BUNDLEDIR) +// +// 'apple_add_message()' - Add a message from a localization dictionary. +// + +static void +apple_add_message(CFStringRef key, // I - Localization key + CFStringRef val, // I - Localized value + ppdcCatalog *c) // I - Message catalog +{ + char id[1024], // Message id + str[1024]; // Localized message + + + if (CFStringGetCString(key, id, sizeof(id), kCFStringEncodingUTF8) && + CFStringGetCString(val, str, sizeof(str), kCFStringEncodingUTF8)) + c->add_message(id, str); +} +#endif /* __APPLE__ && CUPS_BUNDLEDIR */ + + // // 'get_utf8()' - Get a UTF-8 character. // diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx index 9074df173..67d3b6690 100644 --- a/ppdc/ppdc.cxx +++ b/ppdc/ppdc.cxx @@ -1,21 +1,16 @@ // // "$Id$" // -// PPD file compiler main entry for the CUPS PPD Compiler. +// PPD file compiler main entry for the CUPS PPD Compiler. // -// Copyright 2007-2012 by Apple Inc. -// Copyright 2002-2007 by Easy Software Products. +// Copyright 2007-2014 by Apple Inc. +// Copyright 2002-2007 by Easy Software Products. // -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// main() - Main entry for the PPD compiler. -// usage() - Show usage and exit. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -192,7 +187,7 @@ main(int argc, // I - Number of command-line arguments catalog = new ppdcCatalog(argv[i]); - if (catalog->messages->count == 0) + if (catalog->messages->count == 0 && strcmp(argv[i], "en")) { _cupsLangPrintf(stderr, _("ppdc: Unable to find localization for " diff --git a/ppdc/sample.drv b/ppdc/sample.drv index 22fffa14c..1d487004c 100644 --- a/ppdc/sample.drv +++ b/ppdc/sample.drv @@ -1,16 +1,16 @@ // // "$Id$" // -// Driver info file for CUPS-supplied PPDs. +// Driver info file for CUPS-supplied PPDs. // -// Copyright 2007-2012 by Apple Inc. -// Copyright 1993-2006 by Easy Software Products. +// Copyright 2007-2014 by Apple Inc. +// Copyright 1993-2006 by Easy Software Products. // -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // Include necessary files... @@ -22,26 +22,37 @@ // Localizations are provided for all of the base languages supported by // CUPS... -//#po da "" -//#po de "" -//#po es "" -//#po et "" -//#po fi "" -//#po fr "" -//#po he "" -//#po id "" -//#po it "" -//#po ja "" -//#po ko "" -//#po nl "" -//#po no "" -//#po pl "" -//#po pt "" -//#po pt_BR "" -//#po ru "" -//#po sv "" -//#po zh "" -//#po zh_TW "" +#po ar "" +#po ca "" +#po cs "" +#po da "" +#po de "" +#po el "" +#po es "" +#po fi "" +#po fr "" +#po he "" +#po hr "" +#po hu "" +#po id "" +#po it "" +#po ja "" +#po ko "" +#po ms "" +#po no "" +#po pl "" +#po pt "" +#po pt_PT "" +#po ro "" +#po ru "" +#po sk "" +#po sv "" +#po th "" +#po tr "" +#po uk "" +#po vi "" +#po zh_CN "" +#po zh_TW "" // MediaSize sizes used by label drivers... #media "w90h18/1.25x0.25\"" 90 18 @@ -108,7 +119,7 @@ Attribute "FileSystem" "" "False" Attribute "LandscapeOrientation" "" "Plus90" Attribute "TTRasterizer" "" "Type42" -Copyright "Copyright 2007-2013 by Apple Inc." +Copyright "Copyright 2007-2014 by Apple Inc." Copyright "Copyright 1997-2007 by Easy Software Products." Copyright "" Copyright "These coded instructions, statements, and computer programs are the" @@ -119,7 +130,7 @@ Copyright "file is missing or damaged, see the license at \"http://www.cups.org/ Font * -Version "1.5" +Version "2.0" // Dymo Label Printer { -- 2.39.5