Fix localized error message from ipptool.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11958 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/locale/cups.pot b/locale/cups.pot
index 8681d8b5d0a29f904ffeb9f244a1a612c3582c11..743303f827359231b4053539e1130999a6237603 100644 (file)
--- 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-06-12 20:06-0400\n"
+"POT-Creation-Date: 2014-06-26 14:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1101,15 +1101,15 @@ msgstr ""
 msgid "  --version               Show program version."
 msgstr ""
 
-#: test/ippfind.c:2716 test/ipptool.c:4718
+#: test/ippfind.c:2716 test/ipptool.c:4714
 msgid "  -4                      Connect using IPv4."
 msgstr ""
 
-#: test/ippfind.c:2717 test/ipptool.c:4719
+#: test/ippfind.c:2717 test/ipptool.c:4715
 msgid "  -6                      Connect using IPv6."
 msgstr ""
 
-#: test/ipptool.c:4720
+#: test/ipptool.c:4716
 msgid "  -C                      Send requests using chunking (default)."
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "  -E                      Encrypt the connection."
 msgstr ""
 
-#: test/ipptool.c:4722
+#: test/ipptool.c:4718
 msgid "  -E                      Test with HTTP Upgrade to TLS."
 msgstr ""
 
@@ -1137,7 +1137,7 @@ msgstr ""
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr ""
 
-#: test/ipptool.c:4724
+#: test/ipptool.c:4720
 msgid "  -I                      Ignore errors."
 msgstr ""
 
@@ -1149,7 +1149,7 @@ msgstr ""
 msgid "  -I {filename,filters,none,profiles}"
 msgstr ""
 
-#: test/ipptool.c:4725
+#: test/ipptool.c:4721
 msgid "  -L                      Send requests using content-length."
 msgstr ""
 
@@ -1165,7 +1165,7 @@ msgstr ""
 msgid "  -R root-directory       Set alternate root."
 msgstr ""
 
-#: test/ipptool.c:4727
+#: test/ipptool.c:4723
 msgid "  -S                      Test with SSL encryption."
 msgstr ""
 
@@ -1173,7 +1173,7 @@ msgstr ""
 msgid "  -T seconds              Set the browse timeout in seconds."
 msgstr ""
 
-#: test/ipptool.c:4729
+#: test/ipptool.c:4725
 msgid "  -T seconds              Set the receive/send timeout in seconds."
 msgstr ""
 
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid "  -U username             Specify username."
 msgstr ""
 
-#: test/ippfind.c:2720 test/ipptool.c:4731
+#: test/ippfind.c:2720 test/ipptool.c:4727
 msgid "  -V version              Set default IPP version."
 msgstr ""
 
@@ -1189,7 +1189,7 @@ msgstr ""
 msgid "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
 msgstr ""
 
-#: test/ipptool.c:4733
+#: test/ipptool.c:4729
 msgid "  -X                      Produce XML plist instead of plain text."
 msgstr ""
 
@@ -1217,7 +1217,7 @@ msgstr ""
 msgid "  -d domain               Browse/resolve in specified domain."
 msgstr ""
 
-#: test/ipptool.c:4735
+#: test/ipptool.c:4731
 msgid "  -d name=value           Set named variable to value."
 msgstr ""
 
@@ -1241,7 +1241,7 @@ msgstr ""
 msgid "  -f                      Run in the foreground."
 msgstr ""
 
-#: test/ipptool.c:4737
+#: test/ipptool.c:4733
 msgid "  -f filename             Set default request filename."
 msgstr ""
 
@@ -1261,7 +1261,7 @@ msgstr ""
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 
-#: test/ipptool.c:4739
+#: test/ipptool.c:4735
 msgid "  -i seconds              Repeat the last file with the given time interval."
 msgstr ""
 
@@ -1293,7 +1293,7 @@ msgstr ""
 msgid "  -n copies               Set number of copies."
 msgstr ""
 
-#: test/ipptool.c:4741
+#: test/ipptool.c:4737
 msgid "  -n count                Repeat the last file the given number of times."
 msgstr ""
 
@@ -1329,7 +1329,7 @@ msgstr ""
 msgid "  -q                      Quietly report match via exit code."
 msgstr ""
 
-#: systemv/cupstestppd.c:3826 test/ipptool.c:4743
+#: systemv/cupstestppd.c:3826 test/ipptool.c:4739
 msgid "  -q                      Run silently."
 msgstr ""
 
@@ -1345,7 +1345,7 @@ msgstr ""
 msgid "  -s                      Print service name if true."
 msgstr ""
 
-#: test/ipptool.c:4744
+#: test/ipptool.c:4740
 msgid "  -t                      Produce a test report."
 msgstr ""
 
@@ -1377,7 +1377,7 @@ msgstr ""
 msgid "  -u regex                Match URI to regular expression."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4745
+#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4741
 #: ppdc/ppdc.cxx:447 ppdc/ppdpo.cxx:259
 msgid "  -v                      Be verbose."
 msgstr ""
@@ -1828,7 +1828,7 @@ msgstr ""
 msgid "%s: %s failed: %s"
 msgstr ""
 
-#: test/ippfind.c:773 test/ipptool.c:377
+#: test/ippfind.c:773 test/ipptool.c:376
 #, c-format
 msgid "%s: Bad version %s for \"-V\"."
 msgstr ""
@@ -2048,12 +2048,12 @@ msgstr ""
 msgid "%s: Missing filename for \"-P\"."
 msgstr ""
 
-#: test/ippfind.c:745 test/ipptool.c:345
+#: test/ippfind.c:745 test/ipptool.c:344
 #, c-format
 msgid "%s: Missing timeout for \"-T\"."
 msgstr ""
 
-#: test/ippfind.c:758 test/ipptool.c:359
+#: test/ippfind.c:758 test/ipptool.c:358
 #, c-format
 msgid "%s: Missing version for \"-V\"."
 msgstr ""
@@ -2076,7 +2076,7 @@ msgstr ""
 #: berkeley/lpq.c:83 berkeley/lpr.c:67 berkeley/lprm.c:67 systemv/cancel.c:82
 #: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:96
 #: systemv/lpadmin.c:225 systemv/lpinfo.c:88 systemv/lpmove.c:73
-#: systemv/lpstat.c:88 test/ipptool.c:289 test/ipptool.c:334
+#: systemv/lpstat.c:88 test/ipptool.c:289 test/ipptool.c:333
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr ""
@@ -3657,7 +3657,7 @@ msgstr ""
 msgid "Empty PPD file."
 msgstr ""
 
-#: cups/http.c:4608
+#: cups/http.c:4609
 msgid "Encryption is not supported."
 msgstr ""
 
@@ -3670,7 +3670,7 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: scheduler/client.c:2200
+#: scheduler/client.c:2203
 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 ""
 
@@ -4823,7 +4823,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:4717 ppdc/ppdc.cxx:432
+#: test/ippfind.c:2715 test/ipptool.c:4713 ppdc/ppdc.cxx:432
 #: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:363
 #: ppdc/ppdpo.cxx:254
 msgid "Options:"
@@ -5487,7 +5487,7 @@ msgstr ""
 msgid "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/client.c:2223
+#: scheduler/client.c:2226
 msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
 msgstr ""
 
@@ -6167,7 +6167,7 @@ msgid ""
 "       ippfind --version"
 msgstr ""
 
-#: test/ipptool.c:4715
+#: test/ipptool.c:4711
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr ""
 
@@ -6247,7 +6247,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: scheduler/client.c:2210
+#: scheduler/client.c:2213
 #, c-format
 msgid "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
 msgstr ""
@@ -6494,48 +6494,44 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-#: test/ipptool.c:324
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -P\"."
-msgstr ""
-
-#: test/ipptool.c:388 test/ipptool.c:544 test/ipptool.c:568
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+#: test/ipptool.c:324 test/ipptool.c:387 test/ipptool.c:542 test/ipptool.c:565
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
-#: test/ipptool.c:625
+#: test/ipptool.c:621
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr ""
 
-#: test/ipptool.c:537
+#: test/ipptool.c:535
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:606
+#: test/ipptool.c:602
 msgid "ipptool: May only specify a single URI."
 msgstr ""
 
-#: test/ipptool.c:560
+#: test/ipptool.c:557
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
-#: test/ipptool.c:423
+#: test/ipptool.c:421
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
-#: test/ipptool.c:404
+#: test/ipptool.c:402
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr ""
 
-#: test/ipptool.c:527
+#: test/ipptool.c:525
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:651
+#: test/ipptool.c:647
 msgid "ipptool: URI required before test file."
 msgstr ""
 
-#: test/ipptool.c:587
+#: test/ipptool.c:583
 #, c-format
 msgid "ipptool: Unknown option \"-%c\"."
 msgstr ""

diff --git a/locale/cups.strings b/locale/cups.strings
index 6056f864ccf2864ce88c357e2048de9cd3701b22..22b446964ae4f87b33089fda9b58f6b3f9d9abd1 100644 (file)
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -1448,8 +1448,7 @@
 "ippfind: Unable to execute \"%s\": %s" = "ippfind: Unable to execute \"%s\": %s";
 "ippfind: Unable to use Bonjour: %s" = "ippfind: Unable to use Bonjour: %s";
 "ippfind: Unknown variable \"{%s}\"." = "ippfind: Unknown variable \"{%s}\".";
-"ipptool: \"-i\" and \"-n\" are incompatible with -P\"." = "ipptool: \"-i\" and \"-n\" are incompatible with -P\".";
-"ipptool: \"-i\" and \"-n\" are incompatible with -X\"." = "ipptool: \"-i\" and \"-n\" are incompatible with -X\".";
+"ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"." = "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\".";
 "ipptool: Bad URI - %s." = "ipptool: Bad URI - %s.";
 "ipptool: Invalid seconds for \"-i\"." = "ipptool: Invalid seconds for \"-i\".";
 "ipptool: May only specify a single URI." = "ipptool: May only specify a single URI.";

diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 86522394c0ddea260d5d1bbf62f689f9306812f2..39642373ec13a452e882950a44c85c8cd66f1a18 100644 (file)
--- 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-06-12 20:06-0400\n"
+"POT-Creation-Date: 2014-06-26 14:24-0400\n"
 "PO-Revision-Date: 2012-09-29 11:21+0200\n"
 "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -5255,12 +5255,9 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -P\"."
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
-msgstr "ipptool: «-i» i «-n» no són compatibles amb «-X»."
-
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr "ipptool: l'URI no es correcte - %s."
@@ -6281,6 +6278,9 @@ msgstr "La variable-bindings fa servir una longitud indefinida"
 #~ "cupsd: no s'ha compilat amb compatibilitat per launchd(8). S'executa en "
 #~ "mode normal."
 
+#~ msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+#~ msgstr "ipptool: «-i» i «-n» no són compatibles amb «-X»."
+
 #~ msgid "ipptool: \"-i\" is incompatible with \"-X\"."
 #~ msgstr "ipptool: «-i» no és compatible amb «-X»."
 

diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index 03b6cd9a34020c29c69a87cacc08cb6fb2344862..c11372e5aa05a652e45d19a6d7072e9a193062a5 100644 (file)
--- 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-06-12 20:06-0400\n"
+"POT-Creation-Date: 2014-06-26 14:24-0400\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"
@@ -4984,10 +4984,7 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -P\"."
-msgstr ""
-
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
 #, c-format

diff --git a/locale/cups_es.po b/locale/cups_es.po
index 8ec0f88bd11fa16443251ae31dabc69916d1a288..a2b9a34ac727058082c5e3977483bba2f4780874 100644 (file)
--- 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-06-12 20:06-0400\n"
+"POT-Creation-Date: 2014-06-26 14:24-0400\n"
 "PO-Revision-Date: 2012-07-01 20:21+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <riopedre13@yahoo.es>\n"
 "Language-Team: Spanish\n"
@@ -5253,12 +5253,9 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -P\"."
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
-msgstr "ipptool: \"-i\" y \"-n\" son incompatibles with -X\"."
-
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr "ipptool: URI - %s incorrecto."
@@ -6112,6 +6109,9 @@ msgstr "variable-bindings usa una longitud indefinida"
 #~ "cupsd: el uso de launchd(8) no ha sido compilado, ejecutándose en modo "
 #~ "normal."
 
+#~ msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+#~ msgstr "ipptool: \"-i\" y \"-n\" son incompatibles with -X\"."
+
 #~ msgid "ipptool: Bad version %s for \"-V\"."
 #~ msgstr "ipptool: Versión %s para \"-V\" incorrecta."
 

diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index 9c97d303d8195a47d3bed3df20df6fef4e64b6ae..87d9e6b69bf1538ae10cf2bd02d98074ccbde822 100644 (file)
--- 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-06-12 20:06-0400\n"
+"POT-Creation-Date: 2014-06-26 14:24-0400\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: denis meramdjougoma <dcmeram@libertysurf.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4986,10 +4986,7 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -P\"."
-msgstr ""
-
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
 #, c-format

diff --git a/locale/cups_it.po b/locale/cups_it.po
index 303775a61d9ea7c15fd1e906ba597c8e4e3b52ee..4b95c7c88aee2b8583a42afefa0d7f120f7d90a0 100644 (file)
--- 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-06-12 20:06-0400\n"
+"POT-Creation-Date: 2014-06-26 14:24-0400\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -5332,12 +5332,9 @@ msgstr "ippfind: non è possibile utilizzare Bonjour: %s"
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr "ippfind: variabile sconosciuta \"{%s}\"."
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -P\"."
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
-msgstr "ipptool: \"-i\" e \"-n\" sono incompatibili con -X\"."
-
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr "ipptool: l'URI non è valido - %s."
@@ -6160,6 +6157,9 @@ msgstr "variable-bindings utilizza una lunghezza indefinita"
 #~ msgstr ""
 #~ "cupsd: launchd(8) non supporta i compilati, quando è in modalità normale."
 
+#~ msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+#~ msgstr "ipptool: \"-i\" e \"-n\" sono incompatibili con -X\"."
+
 #~ msgid "lppasswd: Only root can add or delete passwords."
 #~ msgstr "lppasswd: solo root può aggiungere o eliminare le password."
 

diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index cfa5ebf36817deb47672da95b3c99633a397a601..c0b31e586c62d52bf2263acb2e5170746b11c264 100644 (file)
--- 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-06-12 20:06-0400\n"
+"POT-Creation-Date: 2014-06-26 14:24-0400\n"
 "PO-Revision-Date: 2013-08-19 11:51+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -5272,12 +5272,9 @@ msgstr "ippfind: Bonjour を利用できません。: %s"
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr "ippfind: \"{%s}\" は不明な変数です。"
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -P\"."
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
-msgstr "ipptool: \"-i\" と \"-n\" は \"-X\" と組み合わせられません。"
-
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr "ipptool: 不正な URI です - %s。"
@@ -6168,6 +6165,9 @@ msgstr "variable-bindings の長さが不定"
 #~ "cupsd: launchd(8) サポートがコンパイルされていないので、通常モードで動作し"
 #~ "ます。"
 
+#~ msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+#~ msgstr "ipptool: \"-i\" と \"-n\" は \"-X\" と組み合わせられません。"
+
 #~ msgid "ipptool: Bad version %s for \"-V\"."
 #~ msgstr "ipptool: \"-V\" オプションに不正なバージョン %s が指定されました。"
 

diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 4166d004d8682bc005179e09af5e6abe29a9253c..6a12416b44bc01277a313533aa0413bea3f311b6 100644 (file)
--- 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-06-12 20:06-0400\n"
+"POT-Creation-Date: 2014-06-26 14:24-0400\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -4958,10 +4958,7 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -P\"."
-msgstr ""
-
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
 #, c-format

diff --git a/test/ipptool.c b/test/ipptool.c
index cbbc39994548ed0197aad9748c8099b24ff187c0..458c7dab88d3b41c238deeb1bb0c590605b95f7c 100644 (file)
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -321,8 +321,7 @@ main(int  argc,                             /* I - Number of command-line args */
 
               if (interval || repeat)
              {
-               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are "
-                                       "incompatible with -P\"."));
+               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."));
                usage();
              }
               break;
@@ -385,8 +384,7 @@ main(int  argc,                             /* I - Number of command-line args */
 
               if (interval || repeat)
              {
-               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are "
-                                       "incompatible with -X\"."));
+               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."));
                usage();
              }
              break;
@@ -541,8 +539,7 @@ main(int  argc,                             /* I - Number of command-line args */
 
               if (Output == _CUPS_OUTPUT_PLIST && interval)
              {
-               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are "
-                                       "incompatible with -X\"."));
+               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."));
                usage();
              }
              break;
@@ -565,8 +562,7 @@ main(int  argc,                             /* I - Number of command-line args */
 
               if (Output == _CUPS_OUTPUT_PLIST && repeat)
              {
-               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are "
-                                       "incompatible with -X\"."));
+               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."));
                usage();
              }
              break;