From f8c3b9839dfee51da1a7bef87bf92bcaf169c0d6 Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Mon, 24 May 2010 18:24:56 +0200 Subject: Don't include gettext headers when NLS is disabled. --- po/da.po | 30 ++++++++++++++++++------------ po/redshift.pot | 30 ++++++++++++++++++------------ po/ru.po | 30 ++++++++++++++++++------------ src/colorramp.c | 2 -- src/randr.c | 8 ++++++-- src/redshift.c | 2 +- src/vidmode.c | 8 ++++++-- 7 files changed, 67 insertions(+), 43 deletions(-) diff --git a/po/da.po b/po/da.po index e7505f1..9d0c6e2 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n" -"POT-Creation-Date: 2010-05-24 18:10+0200\n" +"POT-Creation-Date: 2010-05-24 18:24+0200\n" "PO-Revision-Date: 2010-05-05 22:20+0000\n" "Last-Translator: Jon Lund Steffensen \n" "Language-Team: Danish \n" @@ -97,6 +97,12 @@ msgstr "" " Dagtemperatur: %uK\n" " Nattemperatur: %uK\n" +#. TRANSLATORS: help output 6 +#: src/redshift.c:263 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "" + #: src/redshift.c:269 msgid "Available adjustment methods:\n" msgstr "" @@ -198,49 +204,49 @@ msgstr "Farvetemperatur: %uK\n" msgid "Temperature adjustment failed.\n" msgstr "Fejl ved justering af temperatur.\n" -#: src/randr.c:57 src/randr.c:104 src/randr.c:145 src/randr.c:173 -#: src/randr.c:232 src/randr.c:296 +#: src/randr.c:61 src/randr.c:108 src/randr.c:149 src/randr.c:177 +#: src/randr.c:236 src/randr.c:300 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s' returnerede fejlen %d\n" -#: src/randr.c:65 +#: src/randr.c:69 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Ikke-understøttet RANDR version (%u.%u)\n" -#: src/randr.c:88 +#: src/randr.c:92 #, c-format msgid "Screen %i could not be found.\n" msgstr "Skærm %i kunne ikke findes.\n" -#: src/randr.c:158 src/vidmode.c:71 +#: src/randr.c:162 src/vidmode.c:75 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Størrelsen på gammarampen er for lille: %i\n" -#: src/randr.c:234 +#: src/randr.c:238 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Kan ikke genskabe CRTC %i\n" -#: src/randr.c:259 +#: src/randr.c:263 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d eksisterer ikke. " -#: src/randr.c:262 +#: src/randr.c:266 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Gyldige CRTCer er [0-%d].\n" -#: src/randr.c:265 +#: src/randr.c:269 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Kun CRTC 0 eksisterer.\n" -#: src/vidmode.c:42 src/vidmode.c:54 src/vidmode.c:64 src/vidmode.c:94 -#: src/vidmode.c:125 src/vidmode.c:154 +#: src/vidmode.c:46 src/vidmode.c:58 src/vidmode.c:68 src/vidmode.c:98 +#: src/vidmode.c:129 src/vidmode.c:158 #, c-format msgid "X request failed: %s\n" msgstr "Fejl ved X forespørgsel: %s\n" diff --git a/po/redshift.pot b/po/redshift.pot index 498409b..48c84cc 100644 --- a/po/redshift.pot +++ b/po/redshift.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: redshift 1.3\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n" -"POT-Creation-Date: 2010-05-24 18:10+0200\n" +"POT-Creation-Date: 2010-05-24 18:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -80,6 +80,12 @@ msgid "" " Night temperature: %uK\n" msgstr "" +#. TRANSLATORS: help output 6 +#: src/redshift.c:263 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "" + #: src/redshift.c:269 msgid "Available adjustment methods:\n" msgstr "" @@ -180,49 +186,49 @@ msgstr "" msgid "Temperature adjustment failed.\n" msgstr "" -#: src/randr.c:57 src/randr.c:104 src/randr.c:145 src/randr.c:173 -#: src/randr.c:232 src/randr.c:296 +#: src/randr.c:61 src/randr.c:108 src/randr.c:149 src/randr.c:177 +#: src/randr.c:236 src/randr.c:300 #, c-format msgid "`%s' returned error %d\n" msgstr "" -#: src/randr.c:65 +#: src/randr.c:69 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: src/randr.c:88 +#: src/randr.c:92 #, c-format msgid "Screen %i could not be found.\n" msgstr "" -#: src/randr.c:158 src/vidmode.c:71 +#: src/randr.c:162 src/vidmode.c:75 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: src/randr.c:234 +#: src/randr.c:238 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "" -#: src/randr.c:259 +#: src/randr.c:263 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: src/randr.c:262 +#: src/randr.c:266 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: src/randr.c:265 +#: src/randr.c:269 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: src/vidmode.c:42 src/vidmode.c:54 src/vidmode.c:64 src/vidmode.c:94 -#: src/vidmode.c:125 src/vidmode.c:154 +#: src/vidmode.c:46 src/vidmode.c:58 src/vidmode.c:68 src/vidmode.c:98 +#: src/vidmode.c:129 src/vidmode.c:158 #, c-format msgid "X request failed: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 2a75ad3..f6e19b8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n" -"POT-Creation-Date: 2010-05-24 18:10+0200\n" +"POT-Creation-Date: 2010-05-24 18:24+0200\n" "PO-Revision-Date: 2010-02-02 09:20+0000\n" "Last-Translator: Gregory Petrosyan \n" "Language-Team: Russian \n" @@ -91,6 +91,12 @@ msgid "" " Night temperature: %uK\n" msgstr "" +#. TRANSLATORS: help output 6 +#: src/redshift.c:263 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "" + #: src/redshift.c:269 msgid "Available adjustment methods:\n" msgstr "" @@ -192,49 +198,49 @@ msgstr "Цветовая температура: %uK\n" msgid "Temperature adjustment failed.\n" msgstr "Корректировка цветовой температуры не удалась.\n" -#: src/randr.c:57 src/randr.c:104 src/randr.c:145 src/randr.c:173 -#: src/randr.c:232 src/randr.c:296 +#: src/randr.c:61 src/randr.c:108 src/randr.c:149 src/randr.c:177 +#: src/randr.c:236 src/randr.c:300 #, c-format msgid "`%s' returned error %d\n" msgstr "«%s» завершилось с ошибкой %d\n" -#: src/randr.c:65 +#: src/randr.c:69 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Неподдерживаемая версия RANDR (%u.%u)\n" -#: src/randr.c:88 +#: src/randr.c:92 #, c-format msgid "Screen %i could not be found.\n" msgstr "Экран %i не может быть найден.\n" -#: src/randr.c:158 src/vidmode.c:71 +#: src/randr.c:162 src/vidmode.c:75 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Размер кривой гаммы слишком мал: %i\n" -#: src/randr.c:234 +#: src/randr.c:238 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Не удается восстановить CRTC %i\n" -#: src/randr.c:259 +#: src/randr.c:263 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: src/randr.c:262 +#: src/randr.c:266 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: src/randr.c:265 +#: src/randr.c:269 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: src/vidmode.c:42 src/vidmode.c:54 src/vidmode.c:64 src/vidmode.c:94 -#: src/vidmode.c:125 src/vidmode.c:154 +#: src/vidmode.c:46 src/vidmode.c:58 src/vidmode.c:68 src/vidmode.c:98 +#: src/vidmode.c:129 src/vidmode.c:158 #, c-format msgid "X request failed: %s\n" msgstr "Запрос X не удался: %s\n" diff --git a/src/colorramp.c b/src/colorramp.c index 9bc3b94..a154a9e 100644 --- a/src/colorramp.c +++ b/src/colorramp.c @@ -17,8 +17,6 @@ Copyright (c) 2010 Jon Lund Steffensen */ -#include -#include #include #include diff --git a/src/randr.c b/src/randr.c index f401190..3ee0f42 100644 --- a/src/randr.c +++ b/src/randr.c @@ -21,8 +21,12 @@ #include #include -#include -#define _(s) gettext(s) +#ifdef ENABLE_NLS +# include +# define _(s) gettext(s) +#else +# define _(s) s +#endif #include #include diff --git a/src/redshift.c b/src/redshift.c index ad151ce..430c732 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -260,7 +260,7 @@ print_help(const char *program_name) fputs("\n", stdout); /* TRANSLATORS: help output 6 */ - printf("Please report bugs to <%s>\n", PACKAGE_BUGREPORT); + printf(_("Please report bugs to <%s>\n"), PACKAGE_BUGREPORT); } static void diff --git a/src/vidmode.c b/src/vidmode.c index 10da7d1..12bec8b 100644 --- a/src/vidmode.c +++ b/src/vidmode.c @@ -21,8 +21,12 @@ #include #include -#include -#define _(s) gettext(s) +#ifdef ENABLE_NLS +# include +# define _(s) gettext(s) +#else +# define _(s) s +#endif #include #include -- cgit v1.2.3-70-g09d2