From da622908b0102d34118c182b804698e21a88307d Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Wed, 10 Feb 2010 22:52:11 +0100 Subject: redshift.c: Handle -? parameter. This is also used when a parameter is not recognized. Update translations. --- po/da.po | 40 +++++++++++++++++++--------------------- po/redshift.pot | 37 ++++++++++++++++--------------------- po/ru.po | 40 +++++++++++++++++++--------------------- src/redshift.c | 17 +++++++---------- 4 files changed, 61 insertions(+), 73 deletions(-) diff --git a/po/da.po b/po/da.po index 26c6a43..64ec49f 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n" -"POT-Creation-Date: 2010-02-10 22:03+0100\n" +"POT-Creation-Date: 2010-02-10 22:50+0100\n" "PO-Revision-Date: 2010-02-02 11:34+0000\n" "Last-Translator: Jon Lund Steffensen \n" "Language-Team: Danish \n" @@ -88,8 +88,8 @@ msgstr "" msgid "Malformed gamma argument.\n" msgstr "Fejl i gamma-argument.\n" -#: src/redshift.c:280 src/redshift.c:299 src/redshift.c:350 src/redshift.c:363 -#: src/redshift.c:373 +#: src/redshift.c:280 src/redshift.c:299 src/redshift.c:350 src/redshift.c:362 +#: src/redshift.c:371 #, fuzzy msgid "Try `-h' for more information.\n" msgstr "Prøv `--help' for mere information.\n" @@ -117,70 +117,65 @@ msgstr "Ukendt metode `%s'.\n" msgid "Malformed temperature argument.\n" msgstr "Fejl i temperaturargument.\n" -#: src/redshift.c:362 -#, c-format -msgid "Unknown parameter `%c'.\n" -msgstr "Ukendt parameter `%c'.\n" - -#: src/redshift.c:372 +#: src/redshift.c:370 msgid "Latitude and longitude must be set.\n" msgstr "Breddegrad og længdegrad skal angives.\n" #. TRANSLATORS: Append degree symbols if possible. -#: src/redshift.c:380 +#: src/redshift.c:377 #, c-format msgid "Location: %f, %f\n" msgstr "Placering: %f°, %f°\n" -#: src/redshift.c:387 +#: src/redshift.c:384 #, c-format msgid "Latitude must be between %.1f and %.1f.\n" msgstr "Breddegrad skal være mellem %.1f° og %.1f°.\n" -#: src/redshift.c:396 +#: src/redshift.c:393 #, c-format msgid "Longitude must be between %.1f and %.1f.\n" msgstr "Længdegrad skal være mellem %.1f° og %.1f°.\n" -#: src/redshift.c:404 src/redshift.c:412 +#: src/redshift.c:401 src/redshift.c:409 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Temperatur skal være mellem %uK og %uK.\n" -#: src/redshift.c:422 +#: src/redshift.c:419 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Gamma-værdi skal være mellem %.1f og %.1f.\n" -#: src/redshift.c:428 +#: src/redshift.c:425 #, c-format msgid "Gamma: %.3f, %.3f, %.3f\n" msgstr "Gamma: %.3f, %.3f, %.3f\n" -#: src/redshift.c:440 +#: src/redshift.c:437 msgid "Initialization of RANDR failed.\n" msgstr "Fejl under klargøring af RANDR.\n" -#: src/redshift.c:442 +#: src/redshift.c:439 msgid "Trying other method...\n" msgstr "Prøver anden metode...\n" -#: src/redshift.c:457 +#: src/redshift.c:454 msgid "Initialization of VidMode failed.\n" msgstr "Fejl under klargøring af VidMode.\n" #. TRANSLATORS: Append degree symbol if possible. -#: src/redshift.c:480 +#: src/redshift.c:477 #, c-format msgid "Solar elevation: %f\n" msgstr "Solhøjde: %f°\n" -#: src/redshift.c:487 src/redshift.c:649 +#: src/redshift.c:484 src/redshift.c:646 #, c-format msgid "Color temperature: %uK\n" msgstr "Farvetemperatur: %uK\n" -#: src/redshift.c:493 src/redshift.c:658 +#: src/redshift.c:490 src/redshift.c:655 msgid "Temperature adjustment failed.\n" msgstr "Fejl ved justering af temperatur.\n" @@ -219,3 +214,6 @@ msgstr "Fejl ved X forespørgsel: %s\n" #: src/gtk-redshift/gtk-redshift.py:59 msgid "Toggle" msgstr "Slå til/fra" + +#~ msgid "Unknown parameter `%c'.\n" +#~ msgstr "Ukendt parameter `%c'.\n" diff --git a/po/redshift.pot b/po/redshift.pot index 6014150..0eaa481 100644 --- a/po/redshift.pot +++ b/po/redshift.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: redshift 1.1\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n" -"POT-Creation-Date: 2010-02-10 22:03+0100\n" +"POT-Creation-Date: 2010-02-10 22:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -72,8 +72,8 @@ msgstr "" msgid "Malformed gamma argument.\n" msgstr "" -#: src/redshift.c:280 src/redshift.c:299 src/redshift.c:350 src/redshift.c:363 -#: src/redshift.c:373 +#: src/redshift.c:280 src/redshift.c:299 src/redshift.c:350 src/redshift.c:362 +#: src/redshift.c:371 msgid "Try `-h' for more information.\n" msgstr "" @@ -100,70 +100,65 @@ msgstr "" msgid "Malformed temperature argument.\n" msgstr "" -#: src/redshift.c:362 -#, c-format -msgid "Unknown parameter `%c'.\n" -msgstr "" - -#: src/redshift.c:372 +#: src/redshift.c:370 msgid "Latitude and longitude must be set.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: src/redshift.c:380 +#: src/redshift.c:377 #, c-format msgid "Location: %f, %f\n" msgstr "" -#: src/redshift.c:387 +#: src/redshift.c:384 #, c-format msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: src/redshift.c:396 +#: src/redshift.c:393 #, c-format msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: src/redshift.c:404 src/redshift.c:412 +#: src/redshift.c:401 src/redshift.c:409 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: src/redshift.c:422 +#: src/redshift.c:419 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" -#: src/redshift.c:428 +#: src/redshift.c:425 #, c-format msgid "Gamma: %.3f, %.3f, %.3f\n" msgstr "" -#: src/redshift.c:440 +#: src/redshift.c:437 msgid "Initialization of RANDR failed.\n" msgstr "" -#: src/redshift.c:442 +#: src/redshift.c:439 msgid "Trying other method...\n" msgstr "" -#: src/redshift.c:457 +#: src/redshift.c:454 msgid "Initialization of VidMode failed.\n" msgstr "" #. TRANSLATORS: Append degree symbol if possible. -#: src/redshift.c:480 +#: src/redshift.c:477 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: src/redshift.c:487 src/redshift.c:649 +#: src/redshift.c:484 src/redshift.c:646 #, c-format msgid "Color temperature: %uK\n" msgstr "" -#: src/redshift.c:493 src/redshift.c:658 +#: src/redshift.c:490 src/redshift.c:655 msgid "Temperature adjustment failed.\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 1d8890e..2dac004 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n" -"POT-Creation-Date: 2010-02-10 22:03+0100\n" +"POT-Creation-Date: 2010-02-10 22:50+0100\n" "PO-Revision-Date: 2010-02-02 09:20+0000\n" "Last-Translator: Gregory Petrosyan \n" "Language-Team: Russian \n" @@ -87,8 +87,8 @@ msgstr "" msgid "Malformed gamma argument.\n" msgstr "Некорректная величина гаммы.\n" -#: src/redshift.c:280 src/redshift.c:299 src/redshift.c:350 src/redshift.c:363 -#: src/redshift.c:373 +#: src/redshift.c:280 src/redshift.c:299 src/redshift.c:350 src/redshift.c:362 +#: src/redshift.c:371 #, fuzzy msgid "Try `-h' for more information.\n" msgstr "Воспользуйтесь «--help» для получения дополнительной информации.\n" @@ -116,70 +116,65 @@ msgstr "Неизвестный метод «%s».\n" msgid "Malformed temperature argument.\n" msgstr "Некорректное значение температуры.\n" -#: src/redshift.c:362 -#, c-format -msgid "Unknown parameter `%c'.\n" -msgstr "Неизвестный параметр «%c».\n" - -#: src/redshift.c:372 +#: src/redshift.c:370 msgid "Latitude and longitude must be set.\n" msgstr "Широта и долгота должны быть указаны.\n" #. TRANSLATORS: Append degree symbols if possible. -#: src/redshift.c:380 +#: src/redshift.c:377 #, c-format msgid "Location: %f, %f\n" msgstr "Местоположение: %f°, %f°\n" -#: src/redshift.c:387 +#: src/redshift.c:384 #, c-format msgid "Latitude must be between %.1f and %.1f.\n" msgstr "Широта должна быть между %.1f и %.1f.\n" -#: src/redshift.c:396 +#: src/redshift.c:393 #, c-format msgid "Longitude must be between %.1f and %.1f.\n" msgstr "Долгота должна быть между %.1f и %.1f.\n" -#: src/redshift.c:404 src/redshift.c:412 +#: src/redshift.c:401 src/redshift.c:409 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Температура должна быть между %uK и %uK.\n" -#: src/redshift.c:422 +#: src/redshift.c:419 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Гамма должна быть между %.1f и %.1f.\n" -#: src/redshift.c:428 +#: src/redshift.c:425 #, c-format msgid "Gamma: %.3f, %.3f, %.3f\n" msgstr "Гамма: %.3f, %.3f, %.3f\n" -#: src/redshift.c:440 +#: src/redshift.c:437 msgid "Initialization of RANDR failed.\n" msgstr "Инициализация RANDR не удалась.\n" -#: src/redshift.c:442 +#: src/redshift.c:439 msgid "Trying other method...\n" msgstr "Пробую другой метод...\n" -#: src/redshift.c:457 +#: src/redshift.c:454 msgid "Initialization of VidMode failed.\n" msgstr "Инициализация VidMode не удалась.\n" #. TRANSLATORS: Append degree symbol if possible. -#: src/redshift.c:480 +#: src/redshift.c:477 #, c-format msgid "Solar elevation: %f\n" msgstr "Высота Солнца над горизонтом: %f°\n" -#: src/redshift.c:487 src/redshift.c:649 +#: src/redshift.c:484 src/redshift.c:646 #, c-format msgid "Color temperature: %uK\n" msgstr "Цветовая температура: %uK\n" -#: src/redshift.c:493 src/redshift.c:658 +#: src/redshift.c:490 src/redshift.c:655 msgid "Temperature adjustment failed.\n" msgstr "Корректировка цветовой температуры не удалась.\n" @@ -218,3 +213,6 @@ msgstr "Запрос X не удался: %s\n" #: src/gtk-redshift/gtk-redshift.py:59 msgid "Toggle" msgstr "Включить / Выключить" + +#~ msgid "Unknown parameter `%c'.\n" +#~ msgstr "Неизвестный параметр «%c».\n" diff --git a/src/redshift.c b/src/redshift.c index 12390d3..9c3f404 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -296,8 +296,8 @@ main(int argc, char *argv[]) if (s == NULL) { fputs(_("Malformed location argument.\n"), stderr); - fputs(_("Try `-h' for more" - " information.\n"), stderr); + fputs(_("Try `-h' for more information.\n"), + stderr); exit(EXIT_FAILURE); } *(s++) = '\0'; @@ -347,8 +347,8 @@ main(int argc, char *argv[]) if (s == NULL) { fputs(_("Malformed temperature argument.\n"), stderr); - fputs(_("Try `-h' for more" - " information.\n"), stderr); + fputs(_("Try `-h' for more information.\n"), + stderr); exit(EXIT_FAILURE); } *(s++) = '\0'; @@ -358,10 +358,8 @@ main(int argc, char *argv[]) case 'v': verbose = 1; break; - default: - fprintf(stderr, _("Unknown parameter `%c'.\n"), opt); - fputs(_("Try `-h' for more" - " information.\n"), stderr); + case '?': + fputs(_("Try `-h' for more information.\n"), stderr); exit(EXIT_FAILURE); break; } @@ -370,8 +368,7 @@ main(int argc, char *argv[]) /* Latitude and longitude must be set */ if (isnan(lat) || isnan(lon)) { fputs(_("Latitude and longitude must be set.\n"), stderr); - fputs(_("Try `-h' for more" - " information.\n"), stderr); + fputs(_("Try `-h' for more information.\n"), stderr); exit(EXIT_FAILURE); } -- cgit v1.2.3-70-g09d2