From f5f2e19e8826c46c13d638d2c277878cb4f1895e Mon Sep 17 00:00:00 2001 From: msweet Date: Thu, 26 Jun 2014 18:30:19 +0000 Subject: [PATCH] Use "printer-uri" and not "printer URI". git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11959 a1ca3aef-8c08-0410-bb20-df032aa958be --- cups/dest.c | 8 ++++---- locale/cups.pot | 12 ++++++------ locale/cups.strings | 4 ++-- locale/cups_ca.po | 18 ++++++++++++------ locale/cups_cs.po | 10 +++++----- locale/cups_es.po | 18 ++++++++++++------ locale/cups_fr.po | 10 +++++----- locale/cups_it.po | 18 ++++++++++++------ locale/cups_ja.po | 18 ++++++++++++------ locale/cups_ru.po | 10 +++++----- 10 files changed, 75 insertions(+), 51 deletions(-) diff --git a/cups/dest.c b/cups/dest.c index dc73573093..f3db6b1d66 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -607,7 +607,7 @@ cupsConnectDest( userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, (int)resourcesize) < HTTP_URI_STATUS_OK) { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad printer URI."), 1); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad printer-uri."), 1); if (cb) (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_ERROR, @@ -1293,7 +1293,7 @@ _cupsGetDestResource( userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, (int)resourcesize) < HTTP_URI_STATUS_OK) { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad printer URI."), 1); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad printer-uri."), 1); return (NULL); } @@ -1340,7 +1340,7 @@ cupsGetDestWithURI(const char *name, /* I - Desired printer name or @code NULL@ if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK || (strncmp(uri, "ipp://", 6) && strncmp(uri, "ipps://", 7))) { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad printer URI."), 1); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad printer-uri."), 1); return (NULL); } @@ -3442,7 +3442,7 @@ cups_dnssd_resolve( _HTTP_RESOLVE_FQDN, cups_dnssd_resolve_cb, &resolve)) == NULL) { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to resolve printer URI."), 1); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to resolve printer-uri."), 1); if (cb) (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_ERROR, diff --git a/locale/cups.pot b/locale/cups.pot index 743303f827..40b972896e 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-06-26 14:24-0400\n" +"POT-Creation-Date: 2014-06-26 14:29-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3376,15 +3376,15 @@ msgstr "" msgid "Bad port-monitor \"%s\"." msgstr "" -#: cups/dest.c:610 cups/dest.c:1296 cups/dest.c:1343 -msgid "Bad printer URI." -msgstr "" - #: scheduler/ipp.c:2502 #, c-format msgid "Bad printer-state value %d." msgstr "" +#: cups/dest.c:610 cups/dest.c:1296 cups/dest.c:1343 +msgid "Bad printer-uri." +msgstr "" + #: scheduler/ipp.c:207 #, c-format msgid "Bad request ID %d." @@ -5897,7 +5897,7 @@ msgid "Unable to read print data." msgstr "" #: cups/dest.c:3445 -msgid "Unable to resolve printer URI." +msgid "Unable to resolve printer-uri." msgstr "" #: cups/adminutil.c:2077 diff --git a/locale/cups.strings b/locale/cups.strings index 22b446964a..faaa462c24 100644 --- a/locale/cups.strings +++ b/locale/cups.strings @@ -719,8 +719,8 @@ "Bad page-ranges values %d-%d." = "Bad page-ranges values %d-%d."; "Bad port number in URI" = "Bad port number in URI"; "Bad port-monitor \"%s\"." = "Bad port-monitor \"%s\"."; -"Bad printer URI." = "Bad printer URI."; "Bad printer-state value %d." = "Bad printer-state value %d."; +"Bad printer-uri." = "Bad printer-uri."; "Bad request ID %d." = "Bad request ID %d."; "Bad request version number %d.%d." = "Bad request version number %d.%d."; "Bad resource in URI" = "Bad resource in URI"; @@ -1317,7 +1317,7 @@ "Unable to open raster file" = "Unable to open raster file"; "Unable to print test page" = "Unable to print test page"; "Unable to read print data." = "Unable to read print data."; -"Unable to resolve printer URI." = "Unable to resolve printer URI."; +"Unable to resolve printer-uri." = "Unable to resolve printer-uri."; "Unable to run \"%s\": %s" = "Unable to run \"%s\": %s"; "Unable to see in file" = "Unable to see in file"; "Unable to send command to printer driver" = "Unable to send command to printer driver"; diff --git a/locale/cups_ca.po b/locale/cups_ca.po index 39642373ec..8e524fc35c 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-06-26 14:24-0400\n" +"POT-Creation-Date: 2014-06-26 14:29-0400\n" "PO-Revision-Date: 2012-09-29 11:21+0200\n" "Last-Translator: Àngel Mompó \n" "Language-Team: Catalan \n" @@ -2797,13 +2797,13 @@ msgstr "" msgid "Bad port-monitor \"%s\"." msgstr "La port-monitor «%s» és incorrecta." -msgid "Bad printer URI." -msgstr "L'URI de la impressora és incorrecte." - #, c-format msgid "Bad printer-state value %d." msgstr "El valor %d de printer-state és incorrecte." +msgid "Bad printer-uri." +msgstr "" + #, c-format msgid "Bad request ID %d." msgstr "L'identificador %d de la sol·licitud és incorrecte." @@ -4766,8 +4766,8 @@ msgstr "No es pot imprimir la pàgina de prova" msgid "Unable to read print data." msgstr "No es poden llegir les dades d'impressió." -msgid "Unable to resolve printer URI." -msgstr "No es pot resoldre l'URI de la impressora." +msgid "Unable to resolve printer-uri." +msgstr "" #, c-format msgid "Unable to run \"%s\": %s" @@ -6083,6 +6083,9 @@ 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 "Bad printer URI." +#~ msgstr "L'URI de la impressora és incorrecte." + #~ msgid "Enter old password:" #~ msgstr "Introduïu la contrasenya antiga:" @@ -6240,6 +6243,9 @@ msgstr "La variable-bindings fa servir una longitud indefinida" #~ msgid "Unable to read print data" #~ msgstr "No es poden llegir les dades d'impressió" +#~ msgid "Unable to resolve printer URI." +#~ msgstr "No es pot resoldre l'URI de la impressora." + #~ msgid "Usage: %s job-id user title copies options file" #~ msgstr "Sintaxi: %s id-tasca usuari títol còpies opcions fitxer" diff --git a/locale/cups_cs.po b/locale/cups_cs.po index c11372e5aa..d72c190473 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-06-26 14:24-0400\n" +"POT-Creation-Date: 2014-06-26 14:29-0400\n" "PO-Revision-Date: 2012-09-14 10:26+0100\n" "Last-Translator: Jan Bartos \n" "Language-Team: Czech\n" @@ -2604,13 +2604,13 @@ msgstr "" msgid "Bad port-monitor \"%s\"." msgstr "" -msgid "Bad printer URI." -msgstr "" - #, c-format msgid "Bad printer-state value %d." msgstr "" +msgid "Bad printer-uri." +msgstr "" + #, c-format msgid "Bad request ID %d." msgstr "" @@ -4515,7 +4515,7 @@ msgstr "Nelze vytisknout zkušební stránku" msgid "Unable to read print data." msgstr "" -msgid "Unable to resolve printer URI." +msgid "Unable to resolve printer-uri." msgstr "" #, c-format diff --git a/locale/cups_es.po b/locale/cups_es.po index a2b9a34ac7..461553c9ab 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-06-26 14:24-0400\n" +"POT-Creation-Date: 2014-06-26 14:29-0400\n" "PO-Revision-Date: 2012-07-01 20:21+0100\n" "Last-Translator: Juan Pablo González Riopedre \n" "Language-Team: Spanish\n" @@ -2786,13 +2786,13 @@ msgstr "" msgid "Bad port-monitor \"%s\"." msgstr "port-monitor \"%s\" incorrecto." -msgid "Bad printer URI." -msgstr "URI de impresora incorrecto." - #, c-format msgid "Bad printer-state value %d." msgstr "Valor printer-state %d incorrecto." +msgid "Bad printer-uri." +msgstr "" + #, c-format msgid "Bad request ID %d." msgstr "Petición incorrecta de ID %d." @@ -4754,8 +4754,8 @@ msgstr "No se ha podido imprimir la página de prueba" msgid "Unable to read print data." msgstr "No se han podido leer los datos de impresión." -msgid "Unable to resolve printer URI." -msgstr "No se ha podido resolver el URI de la impresora." +msgid "Unable to resolve printer-uri." +msgstr "" #, c-format msgid "Unable to run \"%s\": %s" @@ -5993,6 +5993,9 @@ 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 "Bad printer URI." +#~ msgstr "URI de impresora incorrecto." + #~ msgid "Enter old password:" #~ msgstr "Introduzca la contraseña antigua:" @@ -6082,6 +6085,9 @@ msgstr "variable-bindings usa una longitud indefinida" #~ msgid "Unable to open compressed print file" #~ msgstr "No se ha podido abrir el archivo de impresión comprimido" +#~ msgid "Unable to resolve printer URI." +#~ msgstr "No se ha podido resolver el URI de la impresora." + #~ msgid "Usage: cupsfilter [ options ] filename" #~ msgstr "Uso: cupsfilter ( opciones ) archivo" diff --git a/locale/cups_fr.po b/locale/cups_fr.po index 87d9e6b69b..402e54a396 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-06-26 14:24-0400\n" +"POT-Creation-Date: 2014-06-26 14:29-0400\n" "PO-Revision-Date: 2012-12-12 11:12+0100\n" "Last-Translator: denis meramdjougoma \n" "Language-Team: LANGUAGE \n" @@ -2604,13 +2604,13 @@ msgstr "" msgid "Bad port-monitor \"%s\"." msgstr "" -msgid "Bad printer URI." -msgstr "" - #, c-format msgid "Bad printer-state value %d." msgstr "" +msgid "Bad printer-uri." +msgstr "" + #, c-format msgid "Bad request ID %d." msgstr "" @@ -4517,7 +4517,7 @@ msgstr "Impossible d’imprimer la page de test :" msgid "Unable to read print data." msgstr "" -msgid "Unable to resolve printer URI." +msgid "Unable to resolve printer-uri." msgstr "" #, c-format diff --git a/locale/cups_it.po b/locale/cups_it.po index 4b95c7c88a..30b1027723 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-06-26 14:24-0400\n" +"POT-Creation-Date: 2014-06-26 14:29-0400\n" "PO-Revision-Date: 2013-07-14 12:00+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -2872,13 +2872,13 @@ msgstr "" msgid "Bad port-monitor \"%s\"." msgstr "Il valore di port-monitor \"%s\" non è valido." -msgid "Bad printer URI." -msgstr "L'URI della stampante non è valido." - #, c-format msgid "Bad printer-state value %d." msgstr "Il valore di printer-state %d non è valido." +msgid "Bad printer-uri." +msgstr "" + #, c-format msgid "Bad request ID %d." msgstr "L'ID della richiesta %d non è valido." @@ -4838,8 +4838,8 @@ msgstr "Non è possibile stampare la pagina di prova" msgid "Unable to read print data." msgstr "Non è possibile leggere i dati della stampa." -msgid "Unable to resolve printer URI." -msgstr "Non è possibile risolvere l'URI della stampante." +msgid "Unable to resolve printer-uri." +msgstr "" #, c-format msgid "Unable to run \"%s\": %s" @@ -6066,6 +6066,9 @@ 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 "Bad printer URI." +#~ msgstr "L'URI della stampante non è valido." + #~ msgid "Enter old password:" #~ msgstr "Digitare la vecchia password:" @@ -6131,6 +6134,9 @@ msgstr "variable-bindings utilizza una lunghezza indefinita" #~ msgid "There is a paper jam." #~ msgstr "Vi è un inceppamento della carta." +#~ msgid "Unable to resolve printer URI." +#~ msgstr "Non è possibile risolvere l'URI della stampante." + #~ msgid "Usage: cupsfilter [ options ] filename" #~ msgstr "Uso: cupsfilter [ opzioni ] file" diff --git a/locale/cups_ja.po b/locale/cups_ja.po index c0b31e586c..9f3dd4f8e2 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-06-26 14:24-0400\n" +"POT-Creation-Date: 2014-06-26 14:29-0400\n" "PO-Revision-Date: 2013-08-19 11:51+0900\n" "Last-Translator: OPFC TRANSCUPS \n" "Language-Team: OPFC TRANSCUPS \n" @@ -2826,13 +2826,13 @@ msgstr "" msgid "Bad port-monitor \"%s\"." msgstr "\"%s\" は無効な port-monitor です。" -msgid "Bad printer URI." -msgstr "不正なプリンター URI です。" - #, c-format msgid "Bad printer-state value %d." msgstr "%d は無効な printer-state 値です。" +msgid "Bad printer-uri." +msgstr "" + #, c-format msgid "Bad request ID %d." msgstr "%d は無効なリクエストIDです。" @@ -4772,8 +4772,8 @@ msgstr "テストページを印刷できません" msgid "Unable to read print data." msgstr "プリントデータを読み込めません。" -msgid "Unable to resolve printer URI." -msgstr "プリンター URI を解決できません。" +msgid "Unable to resolve printer-uri." +msgstr "" #, c-format msgid "Unable to run \"%s\": %s" @@ -6051,6 +6051,9 @@ msgstr "variable-bindings の長さが不定" #~ msgid "%s: Error - expected destination after \"-b\" option." #~ msgstr "%s: エラー - \"-b\" オプションのあとに宛先が必要です。" +#~ msgid "Bad printer URI." +#~ msgstr "不正なプリンター URI です。" + #~ msgid "Enter old password:" #~ msgstr "古いパスワードを入力:" @@ -6138,6 +6141,9 @@ msgstr "variable-bindings の長さが不定" #~ msgid "Unable to open compressed print file" #~ msgstr "圧縮プリントファイルを開けません" +#~ msgid "Unable to resolve printer URI." +#~ msgstr "プリンター URI を解決できません。" + #~ msgid "Usage: cupsfilter [ options ] filename" #~ msgstr "使い方: cupsfilter [オプション] ファイル名" diff --git a/locale/cups_ru.po b/locale/cups_ru.po index 6a12416b44..425dbdf49c 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-06-26 14:24-0400\n" +"POT-Creation-Date: 2014-06-26 14:29-0400\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" @@ -2577,13 +2577,13 @@ msgstr "" msgid "Bad port-monitor \"%s\"." msgstr "" -msgid "Bad printer URI." -msgstr "" - #, c-format msgid "Bad printer-state value %d." msgstr "" +msgid "Bad printer-uri." +msgstr "" + #, c-format msgid "Bad request ID %d." msgstr "" @@ -4489,7 +4489,7 @@ msgstr "" msgid "Unable to read print data." msgstr "" -msgid "Unable to resolve printer URI." +msgid "Unable to resolve printer-uri." msgstr "" #, c-format -- 2.47.2