diff options
| -rw-r--r-- | SConstruct | 13 | ||||
| -rw-r--r-- | configure.ac | 96 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/da.po | 217 | ||||
| -rw-r--r-- | po/redshift.pot | 209 | ||||
| -rw-r--r-- | po/ru.po | 217 | ||||
| -rw-r--r-- | src/gtk-redshift/Makefile.am | 25 | ||||
| -rw-r--r-- | src/gtk-redshift/gtk-redshift.in | 2 | ||||
| -rw-r--r-- | src/redshift.c | 6 |
9 files changed, 505 insertions, 281 deletions
diff --git a/SConstruct b/SConstruct deleted file mode 100644 index 1da5c65..0000000 --- a/SConstruct +++ /dev/null @@ -1,13 +0,0 @@ - -sources = ['src/redshift.c', - 'src/solar.c', - 'src/colorramp.c', - 'src/randr.c', - 'src/vidmode.c'] - -env = Environment() -env.ParseConfig('pkg-config --cflags --libs xcb xcb-randr') -env.ParseConfig('pkg-config --cflags --libs x11 xxf86vm') -env.Program('redshift', sources, - CFLAGS='-std=gnu99 -O2 -Wall', - LINKFLAGS='-lm') diff --git a/configure.ac b/configure.ac index e667f64..10637f0 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,7 @@ AS_IF([test "x$enable_randr" != xno], [ AC_DEFINE([ENABLE_RANDR], 1, [Define to 1 to enable RANDR method]) AC_MSG_RESULT([yes]) + enable_randr=yes ], [ AC_MSG_RESULT([missing dependencies]) AS_IF([test "x$enable_randr" = xyes], [ @@ -47,8 +48,9 @@ AS_IF([test "x$enable_randr" != xno], [ ]) ], [ AC_MSG_RESULT([no]) + enable_randr=no ]) -AM_CONDITIONAL([ENABLE_RANDR], [test "x$enable_randr" != xno]) +AM_CONDITIONAL([ENABLE_RANDR], [test "x$enable_randr" = xyes]) # Check VidMode method AC_MSG_CHECKING([whether to enable VidMode method]) @@ -60,6 +62,7 @@ AS_IF([test "x$enable_vidmode" != xno], [ AC_DEFINE([ENABLE_VIDMODE], 1, [Define to 1 to enable VidMode method]) AC_MSG_RESULT([yes]) + enable_vidmode=yes ], [ AC_MSG_RESULT([missing dependencies]) AS_IF([test "x$enable_vidmode" = xyes], [ @@ -69,8 +72,9 @@ AS_IF([test "x$enable_vidmode" != xno], [ ]) ], [ AC_MSG_RESULT([no]) + enable_vidmode=no ]) -AM_CONDITIONAL([ENABLE_VIDMODE], [test "x$enable_vidmode" != xno]) +AM_CONDITIONAL([ENABLE_VIDMODE], [test "x$enable_vidmode" = xyes]) # Check Windows GDI method AC_MSG_CHECKING([whether to enable WinGDI method]) @@ -82,6 +86,7 @@ AS_IF([test "x$enable_wingdi" != xno], [ AC_DEFINE([ENABLE_WINGDI], 1, [Define to 1 to enable WinGDI method]) AC_MSG_RESULT([yes]) + enable_wingdi=yes ], [ AC_MSG_RESULT([missing dependencies]) AS_IF([test "x$enable_wingdi" = xyes], [ @@ -91,8 +96,9 @@ AS_IF([test "x$enable_wingdi" != xno], [ ]) ], [ AC_MSG_RESULT([no]) + enable_wingdi=no ]) -AM_CONDITIONAL([ENABLE_WINGDI], [test "x$enable_wingdi" != xno]) +AM_CONDITIONAL([ENABLE_WINGDI], [test "x$enable_wingdi" = xyes]) # Check that at least one method is enabled AS_IF([test "x$enable_randr" = xno -a "x$enable_vidmode" = xno -a "x$enable_wingdi" = xno], [ @@ -109,6 +115,7 @@ AS_IF([test "x$enable_gnome_clock" != xno], [ AC_DEFINE([ENABLE_GNOME_CLOCK], 1, [Define to 1 to enable GNOME Clock location provider]) AC_MSG_RESULT([yes]) + enable_gnome_clock=yes ], [ AC_MSG_RESULT([missing dependencies]) AS_IF([test "x$enable_gnome_clock" = xyes], [ @@ -118,49 +125,49 @@ AS_IF([test "x$enable_gnome_clock" != xno], [ ]) ], [ AC_MSG_RESULT([no]) + enable_gnome_clock=no ]) -AM_CONDITIONAL([ENABLE_GNOME_CLOCK], [test "x$enable_gnome_clock" != xno]) - -# Check for application indicator -AC_MSG_CHECKING([whether to enable application indicator]) -AC_ARG_ENABLE([appindicator], [AC_HELP_STRING([--enable-appindicator], - [enable application indicator])], - [enable_appindicator=$enableval],[enable_appindicator=no]) -AS_IF([test "x$enable_appindicator" != xno], [ - AS_IF([test $have_python = yes], [ - AC_MSG_RESULT([yes]) - enable_gtk=no - ], [ - AC_MSG_RESULT([missing dependencies]) - AS_IF([test "x$enable_appindicator" = xyes], [ - AC_MSG_ERROR([application indicator script requires Python 2.6]) +AM_CONDITIONAL([ENABLE_GNOME_CLOCK], [test "x$enable_gnome_clock" = xyes]) + + +# Check for GUI +# There doesn't seem to be an easy way of detecting the presence +# of a python module. For that reason, statusicon is the default GUI. +AC_MSG_CHECKING([which GUI to enable]) +AC_ARG_ENABLE([gui], [AC_HELP_STRING([--enable-gui], + [enable GUI (appindicator, statusicon or none)])], + [enable_gui=$enableval],[enable_gui=maybe]) + +# Statusicon GUI +AS_IF([test "x$enable_gui" = xstatusicon -o "x$enable_gui" = maybe], [ + AS_IF([test $have_python != yes], [ + AS_IF([test "x$enable_gui" = xstatusicon], [ + AC_MSG_ERROR([status icon script requires Python 2.6]) ]) - enable_appindicator=no + enable_gui=maybe ]) -], [ - AC_MSG_RESULT([no]) ]) -AM_CONDITIONAL([ENABLE_APPINDICATOR], [test "x$enable_appindicator" != xno]) - -# Check for GTK+ status icon -AC_MSG_CHECKING([whether to enable GTK status icon]) -AC_ARG_ENABLE([gtk], [AC_HELP_STRING([--enable-gtk], - [enable GTK status icon])], - [enable_gtk=$enableval],[enable_gtk=maybe]) -AS_IF([test "x$enable_gtk" != xno], [ - AS_IF([test $have_python = yes], [ - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([missing dependencies]) - AS_IF([test "x$enable_gtk" = xyes], [ - AC_MSG_ERROR([status icon script requires Python 2.6]) + +# Appindicator GUI +AS_IF([test "x$enable_gui" = xappindicator -o "x$enable_gui" = maybe], [ + AS_IF([test $have_python != yes], [ + AS_IF([test "x$enable_gui" = xappindicator], [ + AC_MSG_ERROR([application indicator script requires Python 2.6]) ]) - enable_gtk=no + enable_gui=maybe ]) -], [ - AC_MSG_RESULT([no]) ]) -AM_CONDITIONAL([ENABLE_GTK], [test "x$enable_gtk" != xno]) + +# Fall back to no GUI +AS_IF([test "x$enable_gui" != xappindicator -a "x$enable_gui" != xstatusicon], [ + enable_gui=none +]) + +AC_MSG_RESULT([$enable_gui]) + +AM_CONDITIONAL([ENABLE_STATUSICON], [test "x$enable_gui" = xstatusicon]) +AM_CONDITIONAL([ENABLE_APPINDICATOR], [test "x$enable_gui" = xappindicator]) + # Checks for header files. AC_CHECK_HEADERS([locale.h stdint.h stdlib.h string.h unistd.h sys/signal.h]) @@ -190,6 +197,13 @@ echo " cflags: ${CFLAGS} ldflags: ${LDFLAGS} - gtk status icon: ${enable_gtk} - application indicator: ${enable_appindicator} + Adjustment methods: + RANDR: ${enable_randr} + VidMode: ${enable_vidmode} + WinGDI: ${enable_wingdi} + + Location providers: + GNOME Clock: ${enable_gnome_clock} + + GUI: ${enable_gui} " diff --git a/po/POTFILES.in b/po/POTFILES.in index a46a9d4..6bd7210 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -10,3 +10,4 @@ src/location-gnome-clock.c src/location-manual.c src/gtk-redshift/statusicon.py +src/gtk-redshift/rsappindicator.py @@ -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-25 01:34+0200\n" +"POT-Creation-Date: 2010-06-06 23:32+0200\n" "PO-Revision-Date: 2010-05-05 22:20+0000\n" "Last-Translator: Jon Lund Steffensen <Unknown>\n" "Language-Team: Danish <da@li.org>\n" @@ -17,17 +17,17 @@ msgstr "" "X-Launchpad-Export-Date: 2010-05-06 04:09+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/redshift.c:214 +#: src/redshift.c:233 #, c-format msgid "Period: Night\n" msgstr "Periode: Nat\n" -#: src/redshift.c:221 +#: src/redshift.c:240 #, c-format msgid "Period: Transition (%.2f%% day)\n" msgstr "Periode: Overgang (%.2f%% dag)\n" -#: src/redshift.c:225 +#: src/redshift.c:244 #, c-format msgid "Period: Daytime\n" msgstr "Periode: Dag\n" @@ -37,20 +37,20 @@ msgstr "Periode: Dag\n" #. DAY is temperature at daytime, #. NIGHT is temperature at night #. no-wrap -#: src/redshift.c:240 +#: src/redshift.c:259 #, c-format msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" msgstr "Brug: %s -l BRED:LÆNG -t DAG:NAT [TILVALG...]\n" #. TRANSLATORS: help output 2 #. no-wrap -#: src/redshift.c:246 +#: src/redshift.c:265 msgid "Set color temperature of display according to time of day.\n" msgstr "Indstil skærmens farvetemperatur ud fra klokkeslæt.\n" #. TRANSLATORS: help output 3 #. no-wrap -#: src/redshift.c:252 +#: src/redshift.c:271 msgid "" " -h\t\tDisplay this help message\n" " -v\t\tVerbose output\n" @@ -59,8 +59,9 @@ msgstr "" " -v\t\tUddybende udskrift\n" #. TRANSLATORS: help output 4 +#. `list' must not be translated #. no-wrap -#: src/redshift.c:258 +#: src/redshift.c:278 #, fuzzy msgid "" " -g R:G:B\tAdditional gamma correction to apply\n" @@ -84,7 +85,7 @@ msgstr "" " -t DAG:NAT\tFarvetemperatur som sættes hhv. dag og nat\n" #. TRANSLATORS: help output 5 -#: src/redshift.c:273 +#: src/redshift.c:293 #, c-format msgid "" "Default values:\n" @@ -98,196 +99,254 @@ msgstr "" " Nattemperatur: %uK\n" #. TRANSLATORS: help output 6 -#: src/redshift.c:281 +#: src/redshift.c:301 #, c-format msgid "Please report bugs to <%s>\n" msgstr "" -#: src/redshift.c:287 +#: src/redshift.c:307 msgid "Available adjustment methods:\n" msgstr "" -#: src/redshift.c:296 +#: src/redshift.c:313 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#: src/redshift.c:315 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "" + +#: src/redshift.c:321 msgid "Available location providers:\n" msgstr "" -#: src/redshift.c:351 +#: src/redshift.c:327 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#: src/redshift.c:329 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "" + +#: src/redshift.c:341 src/redshift.c:393 +#, fuzzy, c-format +msgid "Initialization of %s failed.\n" +msgstr "Fejl under klargøring af RANDR.\n" + +#: src/redshift.c:363 src/redshift.c:415 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "" + +#: src/redshift.c:365 src/redshift.c:417 +#, fuzzy, c-format +msgid "Try `-p %s:help' for more information.\n" +msgstr "Prøv `-h' for mere information.\n" + +#: src/redshift.c:377 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "" + +#: src/redshift.c:429 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "" + +#: src/redshift.c:486 msgid "Malformed gamma argument.\n" msgstr "Fejl i gamma-argument.\n" -#: src/redshift.c:353 src/redshift.c:445 src/redshift.c:457 +#: src/redshift.c:488 src/redshift.c:603 src/redshift.c:615 msgid "Try `-h' for more information.\n" msgstr "Prøv `-h' for mere information.\n" -#: src/redshift.c:405 +#: src/redshift.c:542 #, fuzzy, c-format msgid "Unknown location provider `%s'.\n" msgstr "Ukendt metode `%s'.\n" #. TRANSLATORS: This refers to the method #. used to adjust colors e.g VidMode -#: src/redshift.c:429 +#: src/redshift.c:580 #, c-format msgid "Unknown method `%s'.\n" msgstr "Ukendt metode `%s'.\n" -#: src/redshift.c:443 +#: src/redshift.c:601 msgid "Malformed temperature argument.\n" msgstr "Fejl i temperaturargument.\n" -#: src/redshift.c:471 src/redshift.c:481 src/redshift.c:572 src/redshift.c:582 -#, fuzzy, c-format -msgid "Initialization of %s failed.\n" -msgstr "Fejl under klargøring af RANDR.\n" - -#: src/redshift.c:483 +#: src/redshift.c:636 #, fuzzy msgid "Trying other provider...\n" msgstr "Prøver anden metode...\n" -#: src/redshift.c:492 +#: src/redshift.c:646 msgid "No more location providers to try.\n" msgstr "" -#: src/redshift.c:504 +#: src/redshift.c:658 msgid "Unable to get location from provider.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: src/redshift.c:512 +#: src/redshift.c:666 #, c-format msgid "Location: %f, %f\n" msgstr "Placering: %f°, %f°\n" -#: src/redshift.c:519 +#: src/redshift.c:673 #, c-format msgid "Latitude must be between %.1f and %.1f.\n" msgstr "Breddegrad skal være mellem %.1f° og %.1f°.\n" -#: src/redshift.c:528 +#: src/redshift.c:682 #, 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:536 src/redshift.c:544 +#: src/redshift.c:690 src/redshift.c:698 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Temperatur skal være mellem %uK og %uK.\n" -#: src/redshift.c:554 +#: src/redshift.c:708 #, 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:560 +#: src/redshift.c:714 #, c-format msgid "Gamma: %.3f, %.3f, %.3f\n" msgstr "Gamma: %.3f, %.3f, %.3f\n" -#: src/redshift.c:584 +#: src/redshift.c:732 msgid "Trying other method...\n" msgstr "Prøver anden metode...\n" -#: src/redshift.c:593 +#: src/redshift.c:742 msgid "No more methods to try.\n" msgstr "" -#: src/redshift.c:603 src/redshift.c:710 +#: src/redshift.c:752 src/redshift.c:859 #, fuzzy msgid "Unable to read system time.\n" msgstr "Kan ikke genskabe CRTC %i\n" #. TRANSLATORS: Append degree symbol if possible. -#: src/redshift.c:612 +#: src/redshift.c:761 #, c-format msgid "Solar elevation: %f\n" msgstr "Solhøjde: %f°\n" -#: src/redshift.c:619 src/redshift.c:777 +#: src/redshift.c:768 src/redshift.c:926 #, c-format msgid "Color temperature: %uK\n" msgstr "Farvetemperatur: %uK\n" -#: src/redshift.c:624 src/redshift.c:785 +#: src/redshift.c:773 src/redshift.c:934 msgid "Temperature adjustment failed.\n" msgstr "Fejl ved justering af temperatur.\n" -#: src/gamma-randr.c:59 src/gamma-randr.c:67 src/gamma-vidmode.c:54 -#, c-format -msgid "Missing value for parameter: `%s'.\n" -msgstr "" - -#: src/gamma-randr.c:74 src/gamma-vidmode.c:61 -#, fuzzy, c-format -msgid "Unknown method parameter: `%s'.\n" -msgstr "Ukendt metode `%s'.\n" - -#: src/gamma-randr.c:98 src/gamma-randr.c:145 src/gamma-randr.c:186 -#: src/gamma-randr.c:214 src/gamma-randr.c:273 src/gamma-randr.c:337 +#: src/gamma-randr.c:66 src/gamma-randr.c:123 src/gamma-randr.c:162 +#: src/gamma-randr.c:188 src/gamma-randr.c:245 src/gamma-randr.c:341 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s' returnerede fejlen %d\n" -#: src/gamma-randr.c:106 +#: src/gamma-randr.c:74 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Ikke-understøttet RANDR version (%u.%u)\n" -#: src/gamma-randr.c:129 +#: src/gamma-randr.c:108 #, c-format msgid "Screen %i could not be found.\n" msgstr "Skærm %i kunne ikke findes.\n" -#: src/gamma-randr.c:199 src/gamma-vidmode.c:103 +#: src/gamma-randr.c:174 src/gamma-vidmode.c:86 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Størrelsen på gammarampen er for lille: %i\n" -#: src/gamma-randr.c:275 +#: src/gamma-randr.c:247 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Kan ikke genskabe CRTC %i\n" -#: src/gamma-randr.c:300 +#: src/gamma-randr.c:268 +msgid "Adjust gamma ramps with the X RANDR extension.\n" +msgstr "" + +#: src/gamma-randr.c:271 +msgid "" +" screen=N\tX screen to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" +msgstr "" + +#: src/gamma-randr.c:280 src/gamma-vidmode.c:142 +#, c-format +msgid "Missing value for parameter: `%s'.\n" +msgstr "" + +#: src/gamma-randr.c:290 src/gamma-vidmode.c:150 src/location-manual.c:96 +#, fuzzy, c-format +msgid "Unknown method parameter: `%s'.\n" +msgstr "Ukendt metode `%s'.\n" + +#: src/gamma-randr.c:304 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d eksisterer ikke. " -#: src/gamma-randr.c:303 +#: src/gamma-randr.c:307 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Gyldige CRTCer er [0-%d].\n" -#: src/gamma-randr.c:306 +#: src/gamma-randr.c:310 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Kun CRTC 0 eksisterer.\n" -#: src/gamma-vidmode.c:74 src/gamma-vidmode.c:86 src/gamma-vidmode.c:96 -#: src/gamma-vidmode.c:126 src/gamma-vidmode.c:157 src/gamma-vidmode.c:186 +#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79 +#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:169 src/gamma-vidmode.c:198 #, c-format msgid "X request failed: %s\n" msgstr "Fejl ved X forespørgsel: %s\n" -#: src/gamma-w32gdi.c:48 +#: src/gamma-vidmode.c:131 +msgid "Adjust gamma ramps with the X VidMode extension.\n" +msgstr "" + +#: src/gamma-vidmode.c:134 +msgid " screen=N\tX screen to apply adjustments to\n" +msgstr "" + +#: src/gamma-w32gdi.c:57 #, fuzzy msgid "Unable to open device context.\n" msgstr "Kan ikke genskabe CRTC %i\n" -#: src/gamma-w32gdi.c:55 +#: src/gamma-w32gdi.c:64 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: src/gamma-w32gdi.c:71 +#: src/gamma-w32gdi.c:80 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: src/gamma-w32gdi.c:94 +#: src/gamma-w32gdi.c:102 +msgid "Adjust gamma ramps with the Windows GDI.\n" +msgstr "" + +#: src/gamma-w32gdi.c:117 #, fuzzy msgid "Unable to restore gamma ramps.\n" msgstr "Kan ikke genskabe CRTC %i\n" -#: src/gamma-w32gdi.c:119 +#: src/gamma-w32gdi.c:142 #, fuzzy msgid "Unable to set gamma ramps.\n" msgstr "Kan ikke genskabe CRTC %i\n" @@ -313,21 +372,35 @@ msgstr "" msgid "Location not specified for city.\n" msgstr "" -#: src/location-manual.c:46 -#, fuzzy -msgid "Too many arguments.\n" -msgstr "Fejl i gamma-argument.\n" +#: src/location-gnome-clock.c:140 +msgid "Use the location as set in the GNOME Clock applet.\n" +msgstr "" -#: src/location-manual.c:58 +#: src/location-manual.c:50 +msgid "Latitude and longitude must be set.\n" +msgstr "Breddegrad og længdegrad skal angives.\n" + +#: src/location-manual.c:65 +msgid "Specify location manually.\n" +msgstr "" + +#: src/location-manual.c:68 +msgid "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" +msgstr "" + +#: src/location-manual.c:82 #, fuzzy msgid "Malformed argument.\n" msgstr "Fejl i gamma-argument.\n" -#: src/location-manual.c:73 -msgid "Latitude and longitude must be set.\n" -msgstr "Breddegrad og længdegrad skal angives.\n" +#: src/location-manual.c:93 +#, fuzzy +msgid "Too many arguments.\n" +msgstr "Fejl i gamma-argument.\n" -#: src/gtk-redshift/statusicon.py:61 +#: src/gtk-redshift/statusicon.py:61 src/gtk-redshift/rsappindicator.py:70 msgid "Toggle" msgstr "Slå til/fra" diff --git a/po/redshift.pot b/po/redshift.pot index b20763e..35901dc 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-25 01:34+0200\n" +"POT-Creation-Date: 2010-06-06 23:32+0200\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" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/redshift.c:214 +#: src/redshift.c:233 #, c-format msgid "Period: Night\n" msgstr "" -#: src/redshift.c:221 +#: src/redshift.c:240 #, c-format msgid "Period: Transition (%.2f%% day)\n" msgstr "" -#: src/redshift.c:225 +#: src/redshift.c:244 #, c-format msgid "Period: Daytime\n" msgstr "" @@ -36,28 +36,29 @@ msgstr "" #. DAY is temperature at daytime, #. NIGHT is temperature at night #. no-wrap -#: src/redshift.c:240 +#: src/redshift.c:259 #, c-format msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" msgstr "" #. TRANSLATORS: help output 2 #. no-wrap -#: src/redshift.c:246 +#: src/redshift.c:265 msgid "Set color temperature of display according to time of day.\n" msgstr "" #. TRANSLATORS: help output 3 #. no-wrap -#: src/redshift.c:252 +#: src/redshift.c:271 msgid "" " -h\t\tDisplay this help message\n" " -v\t\tVerbose output\n" msgstr "" #. TRANSLATORS: help output 4 +#. `list' must not be translated #. no-wrap -#: src/redshift.c:258 +#: src/redshift.c:278 msgid "" " -g R:G:B\tAdditional gamma correction to apply\n" " -l LAT:LON\tYour current location\n" @@ -71,7 +72,7 @@ msgid "" msgstr "" #. TRANSLATORS: help output 5 -#: src/redshift.c:273 +#: src/redshift.c:293 #, c-format msgid "" "Default values:\n" @@ -81,192 +82,250 @@ msgid "" msgstr "" #. TRANSLATORS: help output 6 -#: src/redshift.c:281 +#: src/redshift.c:301 #, c-format msgid "Please report bugs to <%s>\n" msgstr "" -#: src/redshift.c:287 +#: src/redshift.c:307 msgid "Available adjustment methods:\n" msgstr "" -#: src/redshift.c:296 +#: src/redshift.c:313 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#: src/redshift.c:315 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "" + +#: src/redshift.c:321 msgid "Available location providers:\n" msgstr "" -#: src/redshift.c:351 +#: src/redshift.c:327 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#: src/redshift.c:329 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "" + +#: src/redshift.c:341 src/redshift.c:393 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "" + +#: src/redshift.c:363 src/redshift.c:415 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "" + +#: src/redshift.c:365 src/redshift.c:417 +#, c-format +msgid "Try `-p %s:help' for more information.\n" +msgstr "" + +#: src/redshift.c:377 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "" + +#: src/redshift.c:429 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "" + +#: src/redshift.c:486 msgid "Malformed gamma argument.\n" msgstr "" -#: src/redshift.c:353 src/redshift.c:445 src/redshift.c:457 +#: src/redshift.c:488 src/redshift.c:603 src/redshift.c:615 msgid "Try `-h' for more information.\n" msgstr "" -#: src/redshift.c:405 +#: src/redshift.c:542 #, c-format msgid "Unknown location provider `%s'.\n" msgstr "" #. TRANSLATORS: This refers to the method #. used to adjust colors e.g VidMode -#: src/redshift.c:429 +#: src/redshift.c:580 #, c-format msgid "Unknown method `%s'.\n" msgstr "" -#: src/redshift.c:443 +#: src/redshift.c:601 msgid "Malformed temperature argument.\n" msgstr "" -#: src/redshift.c:471 src/redshift.c:481 src/redshift.c:572 src/redshift.c:582 -#, c-format -msgid "Initialization of %s failed.\n" -msgstr "" - -#: src/redshift.c:483 +#: src/redshift.c:636 msgid "Trying other provider...\n" msgstr "" -#: src/redshift.c:492 +#: src/redshift.c:646 msgid "No more location providers to try.\n" msgstr "" -#: src/redshift.c:504 +#: src/redshift.c:658 msgid "Unable to get location from provider.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: src/redshift.c:512 +#: src/redshift.c:666 #, c-format msgid "Location: %f, %f\n" msgstr "" -#: src/redshift.c:519 +#: src/redshift.c:673 #, c-format msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: src/redshift.c:528 +#: src/redshift.c:682 #, c-format msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: src/redshift.c:536 src/redshift.c:544 +#: src/redshift.c:690 src/redshift.c:698 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: src/redshift.c:554 +#: src/redshift.c:708 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" -#: src/redshift.c:560 +#: src/redshift.c:714 #, c-format msgid "Gamma: %.3f, %.3f, %.3f\n" msgstr "" -#: src/redshift.c:584 +#: src/redshift.c:732 msgid "Trying other method...\n" msgstr "" -#: src/redshift.c:593 +#: src/redshift.c:742 msgid "No more methods to try.\n" msgstr "" -#: src/redshift.c:603 src/redshift.c:710 +#: src/redshift.c:752 src/redshift.c:859 msgid "Unable to read system time.\n" msgstr "" #. TRANSLATORS: Append degree symbol if possible. -#: src/redshift.c:612 +#: src/redshift.c:761 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: src/redshift.c:619 src/redshift.c:777 +#: src/redshift.c:768 src/redshift.c:926 #, c-format msgid "Color temperature: %uK\n" msgstr "" -#: src/redshift.c:624 src/redshift.c:785 +#: src/redshift.c:773 src/redshift.c:934 msgid "Temperature adjustment failed.\n" msgstr "" -#: src/gamma-randr.c:59 src/gamma-randr.c:67 src/gamma-vidmode.c:54 +#: src/gamma-randr.c:66 src/gamma-randr.c:123 src/gamma-randr.c:162 +#: src/gamma-randr.c:188 src/gamma-randr.c:245 src/gamma-randr.c:341 #, c-format -msgid "Missing value for parameter: `%s'.\n" +msgid "`%s' returned error %d\n" msgstr "" -#: src/gamma-randr.c:74 src/gamma-vidmode.c:61 +#: src/gamma-randr.c:74 #, c-format -msgid "Unknown method parameter: `%s'.\n" +msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: src/gamma-randr.c:98 src/gamma-randr.c:145 src/gamma-randr.c:186 -#: src/gamma-randr.c:214 src/gamma-randr.c:273 src/gamma-randr.c:337 +#: src/gamma-randr.c:108 #, c-format -msgid "`%s' returned error %d\n" +msgid "Screen %i could not be found.\n" msgstr "" -#: src/gamma-randr.c:106 +#: src/gamma-randr.c:174 src/gamma-vidmode.c:86 #, c-format -msgid "Unsupported RANDR version (%u.%u)\n" +msgid "Gamma ramp size too small: %i\n" msgstr "" -#: src/gamma-randr.c:129 +#: src/gamma-randr.c:247 #, c-format -msgid "Screen %i could not be found.\n" +msgid "Unable to restore CRTC %i\n" msgstr "" -#: src/gamma-randr.c:199 src/gamma-vidmode.c:103 +#: src/gamma-randr.c:268 +msgid "Adjust gamma ramps with the X RANDR extension.\n" +msgstr "" + +#: src/gamma-randr.c:271 +msgid "" +" screen=N\tX screen to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" +msgstr "" + +#: src/gamma-randr.c:280 src/gamma-vidmode.c:142 #, c-format -msgid "Gamma ramp size too small: %i\n" +msgid "Missing value for parameter: `%s'.\n" msgstr "" -#: src/gamma-randr.c:275 +#: src/gamma-randr.c:290 src/gamma-vidmode.c:150 src/location-manual.c:96 #, c-format -msgid "Unable to restore CRTC %i\n" +msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: src/gamma-randr.c:300 +#: src/gamma-randr.c:304 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: src/gamma-randr.c:303 +#: src/gamma-randr.c:307 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: src/gamma-randr.c:306 +#: src/gamma-randr.c:310 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: src/gamma-vidmode.c:74 src/gamma-vidmode.c:86 src/gamma-vidmode.c:96 -#: src/gamma-vidmode.c:126 src/gamma-vidmode.c:157 src/gamma-vidmode.c:186 +#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79 +#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:169 src/gamma-vidmode.c:198 #, c-format msgid "X request failed: %s\n" msgstr "" -#: src/gamma-w32gdi.c:48 +#: src/gamma-vidmode.c:131 +msgid "Adjust gamma ramps with the X VidMode extension.\n" +msgstr "" + +#: src/gamma-vidmode.c:134 +msgid " screen=N\tX screen to apply adjustments to\n" +msgstr "" + +#: src/gamma-w32gdi.c:57 msgid "Unable to open device context.\n" msgstr "" -#: src/gamma-w32gdi.c:55 +#: src/gamma-w32gdi.c:64 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: src/gamma-w32gdi.c:71 +#: src/gamma-w32gdi.c:80 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: src/gamma-w32gdi.c:94 +#: src/gamma-w32gdi.c:102 +msgid "Adjust gamma ramps with the Windows GDI.\n" +msgstr "" + +#: src/gamma-w32gdi.c:117 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: src/gamma-w32gdi.c:119 +#: src/gamma-w32gdi.c:142 msgid "Unable to set gamma ramps.\n" msgstr "" @@ -291,18 +350,32 @@ msgstr "" msgid "Location not specified for city.\n" msgstr "" -#: src/location-manual.c:46 -msgid "Too many arguments.\n" +#: src/location-gnome-clock.c:140 +msgid "Use the location as set in the GNOME Clock applet.\n" msgstr "" -#: src/location-manual.c:58 +#: src/location-manual.c:50 +msgid "Latitude and longitude must be set.\n" +msgstr "" + +#: src/location-manual.c:65 +msgid "Specify location manually.\n" +msgstr "" + +#: src/location-manual.c:68 +msgid "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" +msgstr "" + +#: src/location-manual.c:82 msgid "Malformed argument.\n" msgstr "" -#: src/location-manual.c:73 -msgid "Latitude and longitude must be set.\n" +#: src/location-manual.c:93 +msgid "Too many arguments.\n" msgstr "" -#: src/gtk-redshift/statusicon.py:61 +#: src/gtk-redshift/statusicon.py:61 src/gtk-redshift/rsappindicator.py:70 msgid "Toggle" msgstr "" @@ -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-25 01:34+0200\n" +"POT-Creation-Date: 2010-06-06 23:32+0200\n" "PO-Revision-Date: 2010-02-02 09:20+0000\n" "Last-Translator: Gregory Petrosyan <gregory.petrosyan@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -17,17 +17,17 @@ msgstr "" "X-Launchpad-Export-Date: 2010-02-13 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/redshift.c:214 +#: src/redshift.c:233 #, c-format msgid "Period: Night\n" msgstr "Период: Ночь\n" -#: src/redshift.c:221 +#: src/redshift.c:240 #, c-format msgid "Period: Transition (%.2f%% day)\n" msgstr "Период: Переходный (%.2f%% дневной)\n" -#: src/redshift.c:225 +#: src/redshift.c:244 #, c-format msgid "Period: Daytime\n" msgstr "Период: День\n" @@ -37,20 +37,20 @@ msgstr "Период: День\n" #. DAY is temperature at daytime, #. NIGHT is temperature at night #. no-wrap -#: src/redshift.c:240 +#: src/redshift.c:259 #, c-format msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" msgstr "Использование: %s -l ШИР:ДОЛ -t ДЕНЬ:НОЧЬ [ОПЦИИ...]\n" #. TRANSLATORS: help output 2 #. no-wrap -#: src/redshift.c:246 +#: src/redshift.c:265 msgid "Set color temperature of display according to time of day.\n" msgstr "Установить цветовую температуру в соответствии со временем суток.\n" #. TRANSLATORS: help output 3 #. no-wrap -#: src/redshift.c:252 +#: src/redshift.c:271 msgid "" " -h\t\tDisplay this help message\n" " -v\t\tVerbose output\n" @@ -59,8 +59,9 @@ msgstr "" " -v\t\tМногословный вывод\n" #. TRANSLATORS: help output 4 +#. `list' must not be translated #. no-wrap -#: src/redshift.c:258 +#: src/redshift.c:278 #, fuzzy msgid "" " -g R:G:B\tAdditional gamma correction to apply\n" @@ -82,7 +83,7 @@ msgstr "" " -t ДЕНЬ:НОЧЬ\tЦветовая температура для ночного/дневного времени\n" #. TRANSLATORS: help output 5 -#: src/redshift.c:273 +#: src/redshift.c:293 #, c-format msgid "" "Default values:\n" @@ -92,196 +93,254 @@ msgid "" msgstr "" #. TRANSLATORS: help output 6 -#: src/redshift.c:281 +#: src/redshift.c:301 #, c-format msgid "Please report bugs to <%s>\n" msgstr "" -#: src/redshift.c:287 +#: src/redshift.c:307 msgid "Available adjustment methods:\n" msgstr "" -#: src/redshift.c:296 +#: src/redshift.c:313 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#: src/redshift.c:315 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "" + +#: src/redshift.c:321 msgid "Available location providers:\n" msgstr "" -#: src/redshift.c:351 +#: src/redshift.c:327 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#: src/redshift.c:329 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "" + +#: src/redshift.c:341 src/redshift.c:393 +#, fuzzy, c-format +msgid "Initialization of %s failed.\n" +msgstr "Инициализация RANDR не удалась.\n" + +#: src/redshift.c:363 src/redshift.c:415 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "" + +#: src/redshift.c:365 src/redshift.c:417 +#, fuzzy, c-format +msgid "Try `-p %s:help' for more information.\n" +msgstr "Воспользуйтесь «-h» для получения дополнительной информации.\n" + +#: src/redshift.c:377 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "" + +#: src/redshift.c:429 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "" + +#: src/redshift.c:486 msgid "Malformed gamma argument.\n" msgstr "Некорректная величина гаммы.\n" -#: src/redshift.c:353 src/redshift.c:445 src/redshift.c:457 +#: src/redshift.c:488 src/redshift.c:603 src/redshift.c:615 msgid "Try `-h' for more information.\n" msgstr "Воспользуйтесь «-h» для получения дополнительной информации.\n" -#: src/redshift.c:405 +#: src/redshift.c:542 #, fuzzy, c-format msgid "Unknown location provider `%s'.\n" msgstr "Неизвестный метод «%s».\n" #. TRANSLATORS: This refers to the method #. used to adjust colors e.g VidMode -#: src/redshift.c:429 +#: src/redshift.c:580 #, c-format msgid "Unknown method `%s'.\n" msgstr "Неизвестный метод «%s».\n" -#: src/redshift.c:443 +#: src/redshift.c:601 msgid "Malformed temperature argument.\n" msgstr "Некорректное значение температуры.\n" -#: src/redshift.c:471 src/redshift.c:481 src/redshift.c:572 src/redshift.c:582 -#, fuzzy, c-format -msgid "Initialization of %s failed.\n" -msgstr "Инициализация RANDR не удалась.\n" - -#: src/redshift.c:483 +#: src/redshift.c:636 #, fuzzy msgid "Trying other provider...\n" msgstr "Пробую другой метод...\n" -#: src/redshift.c:492 +#: src/redshift.c:646 msgid "No more location providers to try.\n" msgstr "" -#: src/redshift.c:504 +#: src/redshift.c:658 msgid "Unable to get location from provider.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: src/redshift.c:512 +#: src/redshift.c:666 #, c-format msgid "Location: %f, %f\n" msgstr "Местоположение: %f°, %f°\n" -#: src/redshift.c:519 +#: src/redshift.c:673 #, c-format msgid "Latitude must be between %.1f and %.1f.\n" msgstr "Широта должна быть между %.1f и %.1f.\n" -#: src/redshift.c:528 +#: src/redshift.c:682 #, c-format msgid "Longitude must be between %.1f and %.1f.\n" msgstr "Долгота должна быть между %.1f и %.1f.\n" -#: src/redshift.c:536 src/redshift.c:544 +#: src/redshift.c:690 src/redshift.c:698 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Температура должна быть между %uK и %uK.\n" -#: src/redshift.c:554 +#: src/redshift.c:708 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Гамма должна быть между %.1f и %.1f.\n" -#: src/redshift.c:560 +#: src/redshift.c:714 #, c-format msgid "Gamma: %.3f, %.3f, %.3f\n" msgstr "Гамма: %.3f, %.3f, %.3f\n" -#: src/redshift.c:584 +#: src/redshift.c:732 msgid "Trying other method...\n" msgstr "Пробую другой метод...\n" -#: src/redshift.c:593 +#: src/redshift.c:742 msgid "No more methods to try.\n" msgstr "" -#: src/redshift.c:603 src/redshift.c:710 +#: src/redshift.c:752 src/redshift.c:859 #, fuzzy msgid "Unable to read system time.\n" msgstr "Не удается восстановить CRTC %i\n" #. TRANSLATORS: Append degree symbol if possible. -#: src/redshift.c:612 +#: src/redshift.c:761 #, c-format msgid "Solar elevation: %f\n" msgstr "Высота Солнца над горизонтом: %f°\n" -#: src/redshift.c:619 src/redshift.c:777 +#: src/redshift.c:768 src/redshift.c:926 #, c-format msgid "Color temperature: %uK\n" msgstr "Цветовая температура: %uK\n" -#: src/redshift.c:624 src/redshift.c:785 +#: src/redshift.c:773 src/redshift.c:934 msgid "Temperature adjustment failed.\n" msgstr "Корректировка цветовой температуры не удалась.\n" -#: src/gamma-randr.c:59 src/gamma-randr.c:67 src/gamma-vidmode.c:54 -#, c-format -msgid "Missing value for parameter: `%s'.\n" -msgstr "" - -#: src/gamma-randr.c:74 src/gamma-vidmode.c:61 -#, fuzzy, c-format -msgid "Unknown method parameter: `%s'.\n" -msgstr "Неизвестный метод «%s».\n" - -#: src/gamma-randr.c:98 src/gamma-randr.c:145 src/gamma-randr.c:186 -#: src/gamma-randr.c:214 src/gamma-randr.c:273 src/gamma-randr.c:337 +#: src/gamma-randr.c:66 src/gamma-randr.c:123 src/gamma-randr.c:162 +#: src/gamma-randr.c:188 src/gamma-randr.c:245 src/gamma-randr.c:341 #, c-format msgid "`%s' returned error %d\n" msgstr "«%s» завершилось с ошибкой %d\n" -#: src/gamma-randr.c:106 +#: src/gamma-randr.c:74 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Неподдерживаемая версия RANDR (%u.%u)\n" -#: src/gamma-randr.c:129 +#: src/gamma-randr.c:108 #, c-format msgid "Screen %i could not be found.\n" msgstr "Экран %i не может быть найден.\n" -#: src/gamma-randr.c:199 src/gamma-vidmode.c:103 +#: src/gamma-randr.c:174 src/gamma-vidmode.c:86 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Размер кривой гаммы слишком мал: %i\n" -#: src/gamma-randr.c:275 +#: src/gamma-randr.c:247 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Не удается восстановить CRTC %i\n" -#: src/gamma-randr.c:300 +#: src/gamma-randr.c:268 +msgid "Adjust gamma ramps with the X RANDR extension.\n" +msgstr "" + +#: src/gamma-randr.c:271 +msgid "" +" screen=N\tX screen to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" +msgstr "" + +#: src/gamma-randr.c:280 src/gamma-vidmode.c:142 +#, c-format +msgid "Missing value for parameter: `%s'.\n" +msgstr "" + +#: src/gamma-randr.c:290 src/gamma-vidmode.c:150 src/location-manual.c:96 +#, fuzzy, c-format +msgid "Unknown method parameter: `%s'.\n" +msgstr "Неизвестный метод «%s».\n" + +#: src/gamma-randr.c:304 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: src/gamma-randr.c:303 +#: src/gamma-randr.c:307 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: src/gamma-randr.c:306 +#: src/gamma-randr.c:310 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: src/gamma-vidmode.c:74 src/gamma-vidmode.c:86 src/gamma-vidmode.c:96 -#: src/gamma-vidmode.c:126 src/gamma-vidmode.c:157 src/gamma-vidmode.c:186 +#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79 +#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:169 src/gamma-vidmode.c:198 #, c-format msgid "X request failed: %s\n" msgstr "Запрос X не удался: %s\n" -#: src/gamma-w32gdi.c:48 +#: src/gamma-vidmode.c:131 +msgid "Adjust gamma ramps with the X VidMode extension.\n" +msgstr "" + +#: src/gamma-vidmode.c:134 +msgid " screen=N\tX screen to apply adjustments to\n" +msgstr "" + +#: src/gamma-w32gdi.c:57 #, fuzzy msgid "Unable to open device context.\n" msgstr "Не удается восстановить CRTC %i\n" -#: src/gamma-w32gdi.c:55 +#: src/gamma-w32gdi.c:64 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: src/gamma-w32gdi.c:71 +#: src/gamma-w32gdi.c:80 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: src/gamma-w32gdi.c:94 +#: src/gamma-w32gdi.c:102 +msgid "Adjust gamma ramps with the Windows GDI.\n" +msgstr "" + +#: src/gamma-w32gdi.c:117 #, fuzzy msgid "Unable to restore gamma ramps.\n" msgstr "Не удается восстановить CRTC %i\n" -#: src/gamma-w32gdi.c:119 +#: src/gamma-w32gdi.c:142 #, fuzzy msgid "Unable to set gamma ramps.\n" msgstr "Не удается восстановить CRTC %i\n" @@ -307,21 +366,35 @@ msgstr "" msgid "Location not specified for city.\n" msgstr "" -#: src/location-manual.c:46 -#, fuzzy -msgid "Too many arguments.\n" -msgstr "Некорректная величина гаммы.\n" +#: src/location-gnome-clock.c:140 +msgid "Use the location as set in the GNOME Clock applet.\n" +msgstr "" -#: src/location-manual.c:58 +#: src/location-manual.c:50 +msgid "Latitude and longitude must be set.\n" +msgstr "Широта и долгота должны быть указаны.\n" + +#: src/location-manual.c:65 +msgid "Specify location manually.\n" +msgstr "" + +#: src/location-manual.c:68 +msgid "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" +msgstr "" + +#: src/location-manual.c:82 #, fuzzy msgid "Malformed argument.\n" msgstr "Некорректная величина гаммы.\n" -#: src/location-manual.c:73 -msgid "Latitude and longitude must be set.\n" -msgstr "Широта и долгота должны быть указаны.\n" +#: src/location-manual.c:93 +#, fuzzy +msgid "Too many arguments.\n" +msgstr "Некорректная величина гаммы.\n" -#: src/gtk-redshift/statusicon.py:61 +#: src/gtk-redshift/statusicon.py:61 src/gtk-redshift/rsappindicator.py:70 msgid "Toggle" msgstr "Включить / Выключить" diff --git a/src/gtk-redshift/Makefile.am b/src/gtk-redshift/Makefile.am index 9c8479f..ddeafd6 100644 --- a/src/gtk-redshift/Makefile.am +++ b/src/gtk-redshift/Makefile.am @@ -1,6 +1,6 @@ -if ENABLE_GTK -module=statusicon +if ENABLE_STATUSICON +gui_module=statusicon gtk_redshift_PYTHON = \ __init__.py \ statusicon.py @@ -8,13 +8,11 @@ nodist_gtk_redshift_PYTHON = \ defs.py gtk_redshiftdir = $(pythondir)/gtk_redshift -dist_bin_SCRIPTS = gtk-redshift -EXTRA_DIST = gtk-redshift.in \ - defs.py.in +bin_SCRIPTS = gtk-redshift endif if ENABLE_APPINDICATOR -module=rsappindicator +gui_module=rsappindicator gtk_redshift_PYTHON = \ __init__.py \ rsappindicator.py @@ -22,18 +20,21 @@ nodist_gtk_redshift_PYTHON = \ defs.py gtk_redshiftdir = $(pythondir)/gtk_redshift -dist_bin_SCRIPTS = gtk-redshift -EXTRA_DIST = gtk-redshift.in \ - defs.py.in +bin_SCRIPTS = gtk-redshift endif +EXTRA_DIST = gtk-redshift.in \ + defs.py.in + CLEANFILES = defs.py \ - gtk-redshift + gtk-redshift -# Local python definitions + +# Main GUI script gtk-redshift: gtk-redshift.in - sed -e "s|\@module\@|$(module)|g" $< > $@ + sed -e "s|\@gui_module\@|$(gui_module)|g" $< > $@ +# Local python definitions defs.py: defs.py.in sed -e "s|\@bindir\@|$(bindir)|g" \ -e "s|\@localedir\@|$(localedir)|g" $< > $@ diff --git a/src/gtk-redshift/gtk-redshift.in b/src/gtk-redshift/gtk-redshift.in index 18ee145..120e05c 100644 --- a/src/gtk-redshift/gtk-redshift.in +++ b/src/gtk-redshift/gtk-redshift.in @@ -19,5 +19,5 @@ if __name__ == '__main__': - from gtk_redshift.@module@ import run + from gtk_redshift.@gui_module@ import run run() diff --git a/src/redshift.c b/src/redshift.c index 6483cf0..a8f2966 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -273,6 +273,7 @@ print_help(const char *program_name) fputs("\n", stdout); /* TRANSLATORS: help output 4 + `list' must not be translated no-wrap */ fputs(_(" -g R:G:B\tAdditional gamma correction to apply\n" " -l LAT:LON\tYour current location\n" @@ -507,10 +508,11 @@ main(int argc, char *argv[]) char *provider_name = NULL; - /* Try to parse provider name as float */ + /* Don't save the result of strtof(); we simply want + to know if optarg can be parsed as a float. */ errno = 0; char *end; - float v = strtof(optarg, &end); + strtof(optarg, &end); if (errno == 0 && *end == ':') { /* Use instead as arguments to `manual'. */ provider_name = "manual"; |