aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS22
-rw-r--r--Makefile.am33
-rw-r--r--NEWS42
-rw-r--r--README78
-rw-r--r--configure.ac51
-rwxr-xr-xdata/applications/gtk-redshift.desktop11
-rw-r--r--data/icons/hicolor/scalable/apps/redshift-status-off.svg (renamed from data/icons/hicolor/scalable/apps/redshift-idle.svg)0
-rw-r--r--data/icons/hicolor/scalable/apps/redshift-status-on.svg2185
-rw-r--r--data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg459
-rw-r--r--data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg460
-rw-r--r--data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg525
-rw-r--r--data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg635
-rw-r--r--po/LINGUAS2
-rw-r--r--po/POTFILES.in3
-rw-r--r--po/cs.po214
-rw-r--r--po/da.po179
-rw-r--r--po/de.po129
-rw-r--r--po/es.po137
-rw-r--r--po/eu.po174
-rw-r--r--po/fi.po172
-rw-r--r--po/fr.po178
-rw-r--r--po/gtk-redshift/cs.po22
-rw-r--r--po/gtk-redshift/da.po22
-rw-r--r--po/gtk-redshift/de.po22
-rw-r--r--po/gtk-redshift/es.po22
-rw-r--r--po/gtk-redshift/fi.po22
-rw-r--r--po/gtk-redshift/he.po22
-rw-r--r--po/gtk-redshift/it.po22
-rw-r--r--po/gtk-redshift/ru.po22
-rw-r--r--po/he.po171
-rw-r--r--po/it.po95
-rw-r--r--po/ka.po171
-rw-r--r--po/lt.po176
-rw-r--r--po/pt_BR.po180
-rw-r--r--po/redshift.pot207
-rw-r--r--po/ru.po177
-rw-r--r--po/zh_CN.po169
-rw-r--r--redshift.173
-rw-r--r--src/Makefile.am7
-rw-r--r--src/colorramp.c2
-rw-r--r--src/config-ini.c237
-rw-r--r--src/config-ini.h49
-rw-r--r--src/gamma-randr.c7
-rw-r--r--src/gamma-vidmode.c5
-rw-r--r--src/gtk-redshift/Makefile.am29
-rw-r--r--src/gtk-redshift/__init__.py1
-rw-r--r--src/gtk-redshift/defs.py.in1
-rw-r--r--src/gtk-redshift/gtk-redshift (renamed from src/gtk-redshift/gtk-redshift.in)2
-rw-r--r--src/gtk-redshift/rsappindicator.py99
-rw-r--r--src/gtk-redshift/statusicon.py77
-rw-r--r--src/gtk-redshift/utils.py66
-rw-r--r--src/location-gnome-clock.c109
-rw-r--r--src/redshift.c310
53 files changed, 6786 insertions, 1499 deletions
diff --git a/AUTHORS b/AUTHORS
index b37798f..1a69b00 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,12 +9,28 @@ Contributors
Francesco Marella
Alexandros Frantzis
Dan Helfman
+Gabriel de Perthuis
Martin Koelewijn
-Tango Desktop Project provided artwork for the redshift icon.
+Joern Konopka (Ubuntu Mono icons)
+aleth (Ubuntu Mono icons)
+Andrew Starr-Bochicchio (man page for redshift)
+Tango Desktop Project provided artwork for the official redshift icon.
Translators
--------------------
-Gregory Petrosyan (ru)
-Jon Lund Steffensen (da)
+Ibai Oihanguren (Basque)
+Gustavo Guidorizzi (Brazilian Portuguese)
+Rafael Beraldo (Brazilian Portuguese)
+clever_fox (Czech)
+Jon Lund Steffensen (Danish)
+Ilari Oras (Finnish)
+XioNoX (French)
+Hangman (French)
+Jan-Christoph Borchardt (German)
+dotancohen (Hebrew)
+Andrea Amoroso (Italian)
+Gregory Petrosyan (Russian)
+Чистый (Russian)
+Fernando Ossandon (Spanish)
diff --git a/Makefile.am b/Makefile.am
index b2ba5d3..89055e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,11 +3,36 @@ SUBDIRS = src po
ACLOCAL_AMFLAGS = -I m4
# Icons
-icondir = @datadir@/icons/hicolor/scalable/apps
-icon_DATA = data/icons/hicolor/scalable/apps/redshift.svg \
- data/icons/hicolor/scalable/apps/redshift-idle.svg
+hicolor_icondir = @datadir@/icons/hicolor/scalable/apps
+hicolor_icon_DATA = data/icons/hicolor/scalable/apps/redshift.svg \
+ data/icons/hicolor/scalable/apps/redshift-status-on.svg \
+ data/icons/hicolor/scalable/apps/redshift-status-off.svg
-EXTRA_DIST = $(icon_DATA)
+ubuntu_mono_dark_icondir = @datadir@/icons/ubuntu-mono-dark/scalable/apps
+ubuntu_mono_dark_icon_DATA = \
+ data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg \
+ data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg
+
+ubuntu_mono_light_icondir = @datadir@/icons/ubuntu-mono-light/scalable/apps
+ubuntu_mono_light_icon_DATA = \
+ data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg \
+ data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg
+
+
+# Desktop file
+if ENABLE_GUI
+desktopdir = @datadir@/applications
+desktop_DATA = data/applications/gtk-redshift.desktop
+endif
+
+# man page
+dist_man1_MANS = redshift.1
+
+EXTRA_DIST = \
+ $(hicolor_icon_DATA) \
+ $(ubuntu_mono_dark_icon_DATA) \
+ $(ubuntu_mono_light_icon_DATA) \
+ $(desktop_DATA)
# Update PO translations
diff --git a/NEWS b/NEWS
index 3e107c8..ed63de6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,45 @@
+v1.6 (2010-10-18)
+* Support for optional configuration file (fixes #590722).
+* Add man page for redshift written by Andrew Starr-Bochicchio (fixes #582196).
+* Explain in help output that 6500K is the neutral color temperature
+ (fixes #627113).
+* Fix: Handle multiple instances of the GNOME clock applet; contributed by
+ Francesco Marella (fixes #610860).
+* Fix: Redshift crashes when VidMode fails (fixes #657451).
+* Fix: Toggle menu item should not be of class gtk.ImageMenuItem
+ (fixes #620355).
+
+v1.5 (2010-08-18)
+* New ubuntu-mono-dark icons that fit better with the color guidelines.
+ Contributed by aleth.
+* Improve GNOME location provider (patch by Gabriel de Perthuis).
+* Application launcher and autostart feature contributed by Francesco Marella.
+* Translation updates: Basque (Ibai Oihanguren); Chinese (Jonathan Lumb);
+ French (Hangman, XioNoX); German (Jan-Christoph Borchardt); Hebrew
+ (dotancohen); Spanish (Fernando Ossandon).
+
+v1.4.1 (2010-06-15)
+* Include Ubuntu Mono icons by Joern Konopka.
+* Fix: Toggle icon in statusicon.py like appindicator already does.
+* Tranlation updates: Spanish (Fernando Ossandon), Russian (Чистый)
+
+v1.4 (2010-06-13)
+* Command line options for color adjustment methods changed. Procedure for
+ setting specific screen (-s) or CRTC (-c) changed. See `redshift -h' for
+ more information.
+* Automatically obtain the location from the GNOME Clock applet if possible.
+* Add application indicator GUI (by Francesco Marella) (fixes #588086).
+* Add reset option (-x) that removes any color adjustment applied. Based on
+ patch by Dan Helfman (fixes #590777).
+* `configure' options for GUI changed; see `configure --help' for more
+ information.
+* New translations:
+ - German (Jan-Christoph Borchardt)
+ - Italian (Andrea Amoroso)
+ - Czech (clever_fox)
+ - Spanish (Fernando Ossandon)
+ - Finnish (Ilari Oras)
+
v1.3 (2010-05-12)
* Allow adjusting individual CRTCs when using RANDR. Contributed by
Alexandros Frantzis.
diff --git a/README b/README
index 3902a63..2fb3450 100644
--- a/README
+++ b/README
@@ -6,78 +6,8 @@ Redshift adjusts the color temperature of your screen according to
your surroundings. This may help your eyes hurt less if you are
working in front of the screen at night.
-Download
---------
+Run `redshift -h' for help on command line options. You can run the program
+as `gtk-redshift' instead of 'redshift' for a graphical status icon.
-Latest release is redshift 1.3 published on 2010-05-12. There are also
-packages available for some distributions:
-
- * Ubuntu: Packages for Ubuntu Karmic.
- * Gentoo: Redshift is in the Sunrise overlay.
-
-What is it?
------------
-
-The program uses an X server extension to adjust the color
-temperature. This is done by setting appropriate gamma ramps. If you
-have configured your own gamma ramps they will be overwritten but in
-that case you probably care too much about color accuracy to use this
-program anyway. Your graphics driver and X server needs to either
-support at least RANDR version 1.3 or the VidMode extension.
-
-The color temperature is set according to the position of the sun. A
-different color temperature is set during night and daytime. During
-twilight and early morning, the color temperature transitions smoothly
-from night to daytime temperature to allow your eyes to slowly
-adapt. At night the color temperature should be set to match the lamps in your
-room. This is typically a low temperature at around 3000K--4000K
-(default is 3700K). During the day, the color temperature should match
-the light from outside, typically around 5500K--6500K (default is
-5500K). The light has a higher temperature on an overcast day.
-
-How does it work?
------------------
-
-Redshift will continously update the color temperature at regular
-intervals. One shot mode can be selected if you only want to do one
-adjustment. The color adjustments done by Redshift can be temporarily
-toggled on and off by sending it the USR1 signal:
-
- $ killall -USR1 redshift
-
-The command line options are explained in the following paragraphs. The
-only required parameter is your current location, all other options
-have reasonable defaults.
-
- -h Display help message.
- -v Verbose output.
-
- -g R:G:B Additional gamma correction to apply. Can also be
- specified as -g GAMMA to set all channels to the same
- gamma value.
- -l LAT:LON Your current location in latitudes and longitudes.
- -m METHOD Method to use to set color temperature (randr or
- vidmode). Default is randr. In some cases one of the
- methods will not work. In that case you may be able to
- use the other method.
- -o One shot mode. Do not continously adjust color
- temperature.
- -r Disable temperature transition. By default the program
- will make a smooth transition to the desired color
- temperature when the program is started and stopped.
- -s SCREEN X screen to apply adjustments to.
- -c CRTC CRTC to apply adjustments to (RANDR only)
- -t DAY:NIGHT Color temperature to set at daytime/night.
-
-Example (location is Copenhagen, Denmark):
-
- $ redshift -l 55.7:12.6 -t 5700:3600 -g 0.8 -m vidmode -v
-
-Status icon
------------
-
-Start the program gtk-redshift instead of redshift, with the same
-arguments as you would pass to redshift. This will create an icon for
-Redshift in the system tray. The icon will allow you to toggle
-Redshift on and off. Thanks goes to the Tango Desktop Project for the
-icon. gtk-redshift requires at least Python 2.6 and PyGTK 2.12.
+Website: http://jonls.dk/redshift/
+Project page: http://launchpad.net/redshift
diff --git a/configure.ac b/configure.ac
index 22dd3e9..05bf8cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.64])
-AC_INIT([redshift], [1.3], [https://bugs.launchpad.net/redshift])
+AC_INIT([redshift], [1.6], [https://bugs.launchpad.net/redshift])
AC_CONFIG_SRCDIR([src/redshift.c])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -22,7 +22,7 @@ PKG_CHECK_MODULES([XCB], [xcb], [have_xcb=yes], [have_xcb=no])
PKG_CHECK_MODULES([XCB_RANDR], [xcb-randr],
[have_xcb_randr=yes], [have_xcb_randr=no])
-PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 gobject-2.0], [have_glib=yes], [have_glib=no])
PKG_CHECK_MODULES([GCONF], [gconf-2.0], [have_gconf=yes], [have_gconf=no])
AC_CHECK_HEADER([windows.h], [have_windows_h=yes], [have_windows_h=no])
@@ -131,44 +131,25 @@ AS_IF([test "x$enable_gnome_clock" != xno], [
])
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])
+# Check for GUI status icon
+AC_MSG_CHECKING([whether to enable GUI status icon])
AC_ARG_ENABLE([gui], [AC_HELP_STRING([--enable-gui],
- [enable GUI (appindicator, statusicon or none)])],
+ [enable GUI status icon])],
[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_gui=maybe
- ])
-])
-
-# 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])
+AS_IF([test "x$enable_gui" != xno], [
+ AS_IF([test $have_python = yes], [
+ AC_MSG_RESULT([yes])
+ ], [
+ AC_MSG_RESULT([missing dependencies])
+ AS_IF([test "x$enable_gui" = xyes], [
+ AC_MSG_ERROR([GUI status icon script requires Python 2.6])
])
- enable_gui=maybe
+ enable_gui=no
])
+], [
+ AC_MSG_RESULT([no])
])
-
-# 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])
+AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" != xno])
# Checks for header files.
diff --git a/data/applications/gtk-redshift.desktop b/data/applications/gtk-redshift.desktop
new file mode 100755
index 0000000..850255c
--- /dev/null
+++ b/data/applications/gtk-redshift.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Redshift
+GenericName=Color temperature adjustment
+Comment=Color temperature adjustment tool
+Exec=gtk-redshift
+Icon=redshift
+Terminal=false
+Type=Application
+Categories=Utility;
+StartupNotify=true
diff --git a/data/icons/hicolor/scalable/apps/redshift-idle.svg b/data/icons/hicolor/scalable/apps/redshift-status-off.svg
index 9125a20..9125a20 100644
--- a/data/icons/hicolor/scalable/apps/redshift-idle.svg
+++ b/data/icons/hicolor/scalable/apps/redshift-status-off.svg
diff --git a/data/icons/hicolor/scalable/apps/redshift-status-on.svg b/data/icons/hicolor/scalable/apps/redshift-status-on.svg
new file mode 100644
index 0000000..68cee9f
--- /dev/null
+++ b/data/icons/hicolor/scalable/apps/redshift-status-on.svg
@@ -0,0 +1,2185 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47pre4 r22446"
+ sodipodi:docname="redshift.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <linearGradient
+ y2="-4.4493785"
+ x2="-34.700153"
+ y1="-37.550461"
+ x1="-27.006643"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient14132"
+ xlink:href="#linearGradient2298"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="-24.88446"
+ x2="-35.652866"
+ y1="-1.2491118"
+ x1="-25.137094"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient14130"
+ xlink:href="#linearGradient2527"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="-8.3080902"
+ x2="4.9625983"
+ y1="-43.997444"
+ x1="11.149398"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient14128"
+ xlink:href="#linearGradient3478"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="-8.3080902"
+ x2="4.9625983"
+ y1="-43.997444"
+ x1="11.149398"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1431"
+ xlink:href="#linearGradient3478"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="-4.4493785"
+ x2="-34.700153"
+ y1="-37.550461"
+ x1="-27.006643"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1427"
+ xlink:href="#linearGradient2298"
+ inkscape:collect="always" />
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.565657,0,-0.496855)"
+ r="17.500893"
+ fy="-1.1439217"
+ fx="-35.001785"
+ cy="-1.1439217"
+ cx="-35.001785"
+ id="radialGradient4835"
+ xlink:href="#linearGradient4829"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="-24.88446"
+ x2="-35.652866"
+ y1="-1.2491118"
+ x1="-25.137094"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1557"
+ xlink:href="#linearGradient2527"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(57.97693,-10.56876)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1538"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(-0.976307,0,0,1,123.1162,-5.446357)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1536"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.106619,0,0,1,0.795022,6.093572)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1534"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.462015,0,0,1.262475,-11.2762,1.403411)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1532"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.834148,0,0,1,9.287262,8.163122)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1530"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.751222,0,0,1,-5.7863,7.206012)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1528"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(3.674812,3.08837)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1526"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(-2.033818,0.56172)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1524"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(-7.197595,2.690414)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1522"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="-24.88446"
+ x2="-35.652866"
+ y1="-1.2491118"
+ x1="-25.137094"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1520"
+ xlink:href="#linearGradient2527"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.284317,0,0,1,79.36909,-3.193747)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1518"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.462015,0,0,1.262475,56.25514,-12.39388)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1516"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(88.49344,-9.697877)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1514"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(4.561802,-4.303373)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3405"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(-7.197595,2.690414)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3401"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(-2.033818,0.56172)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3398"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(3.674812,3.08837)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3395"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.751222,0,0,1,-5.7863,7.206012)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3392"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.834148,0,0,1,9.287262,8.163122)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3389"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.462015,0,0,1.262475,-11.2762,1.403411)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3386"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.106619,0,0,1,0.795022,6.093572)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3383"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.106619,0,0,1,9.63386,11.75043)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3380"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.462015,0,0,1.262475,-2.437359,7.060269)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3378"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.834148,0,0,1,18.1261,13.81998)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3376"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.751222,0,0,1,3.052538,12.86287)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3374"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(12.51365,8.745228)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3372"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(6.80502,6.218578)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3370"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(1.641243,8.347272)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3368"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(13.40064,1.353485)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3366"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="46.09293"
+ x2="29.75"
+ y1="29.115711"
+ x1="23.303862"
+ id="linearGradient3353"
+ xlink:href="#linearGradient3347"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(-0.72683,2.481141)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2563"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(-7.499805,1.708617)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2555"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(13.40064,1.353485)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2541"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(17.33814,3.415985)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2537"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="-24.88446"
+ x2="-35.652866"
+ y1="-1.2491118"
+ x1="-25.137094"
+ id="linearGradient2533"
+ xlink:href="#linearGradient2527"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="9"
+ x2="53.75"
+ y1="-21.75"
+ x1="37"
+ gradientTransform="matrix(0.414169,0,0,0.778853,-1.910724,36.8785)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2517"
+ xlink:href="#linearGradient2500"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="9"
+ x2="53.75"
+ y1="-18.407482"
+ x1="38.857941"
+ gradientTransform="matrix(0.605509,0,0,0.710542,-0.224971,42.195)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2513"
+ xlink:href="#linearGradient2500"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="matrix(0.889091,0,0,0.617886,-4.771368,39.81402)"
+ y2="9"
+ x2="53.75"
+ y1="-21.75"
+ x1="37"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2509"
+ xlink:href="#linearGradient2500"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="9"
+ x2="53.75"
+ y1="-21.75"
+ x1="37"
+ id="linearGradient2506"
+ xlink:href="#linearGradient2500"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(0.842481,-3.998086)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2483"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(1.641243,8.347272)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2478"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(6.80502,6.218578)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2475"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(12.51365,8.745228)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2472"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.751222,0,0,1,3.052538,12.86287)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2469"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.834148,0,0,1,18.1261,13.81998)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2463"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.462015,0,0,1.262475,-2.437359,7.060269)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2460"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.106619,0,0,1,9.63386,11.75043)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2457"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="13.802798"
+ x2="41.403877"
+ y1="13.802798"
+ x1="6.6651416"
+ gradientTransform="matrix(0.992367,0,0,0.990713,4.378541,10.65407)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2451"
+ xlink:href="#linearGradient2392"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="13.802798"
+ x2="41.403877"
+ y1="13.802798"
+ x1="6.6651416"
+ gradientTransform="matrix(0.992367,0,0,0.990713,1.128541,5.404075)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2448"
+ xlink:href="#linearGradient2392"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(-0.976307,0,0,1,53.94753,8.563694)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2446"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.106619,0,0,1,6.38386,6.500432)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2444"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.462015,0,0,1.262475,-5.687359,1.810269)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2442"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.834148,0,0,1,14.8761,8.569976)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2440"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.284317,0,0,1,14.61983,4.452335)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2438"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.751222,0,0,1,-0.197462,7.612867)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2436"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(9.263651,3.495228)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2434"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(3.55502,0.968578)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2432"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(-1.608757,3.097272)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2430"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(8.497184,-2.330824)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2428"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(14.4634,2.014073)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2426"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="matrix(0.992367,0,0,0.990713,1.128541,5.404075)"
+ gradientUnits="userSpaceOnUse"
+ y2="13.802798"
+ x2="41.403877"
+ y1="13.802798"
+ x1="6.6651416"
+ id="linearGradient2398"
+ xlink:href="#linearGradient2392"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(-0.976307,0,0,1,56.12415,32.08882)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2372"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(4.207586,21.30544)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2370"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.106619,0,0,1,8.185476,29.52556)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2368"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.462015,0,0,1.262475,-4.010744,24.9604)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2366"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.834148,0,0,1,17.05272,31.4701)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2364"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.284317,0,0,1,16.67145,27.22746)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2362"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.751222,0,0,1,0.229156,30.76299)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2360"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(10.30638,19.27251)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2358"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(11.19027,26.52035)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2356"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(5.356636,23.8687)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2354"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(-0.932144,25.8724)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2352"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(16.14002,24.6642)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2350"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(-0.976307,0,0,1,53.94753,8.563694)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2311"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(1.707748,-5.784024)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2303"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.106619,0,0,1,6.38386,6.500432)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2299"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.462015,0,0,1.262475,-5.687359,1.810269)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2295"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.834148,0,0,1,14.8761,8.569976)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2291"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(1.284317,0,0,1,14.61983,4.452335)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2287"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="matrix(0.751222,0,0,1,-0.197462,7.612867)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2283"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(14.4634,2.014073)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2279"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(8.497184,-2.330824)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2275"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(9.263651,3.495228)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2271"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientTransform="translate(3.55502,0.968578)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2267"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-1.608757,3.097272)"
+ y2="16.268581"
+ x2="16.851845"
+ y1="9.285902"
+ x1="14.260854"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2263"
+ xlink:href="#linearGradient2254"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2254"
+ inkscape:collect="always">
+ <stop
+ id="stop2256"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop2258"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2392"
+ inkscape:collect="always">
+ <stop
+ id="stop2394"
+ offset="0"
+ style="stop-color:#eeeeec;stop-opacity:1;" />
+ <stop
+ id="stop2396"
+ offset="1"
+ style="stop-color:#eeeeec;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2500"
+ inkscape:collect="always">
+ <stop
+ id="stop2502"
+ offset="0"
+ style="stop-color:#fce94f;stop-opacity:1;" />
+ <stop
+ id="stop2504"
+ offset="1"
+ style="stop-color:#fce94f;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2527"
+ inkscape:collect="always">
+ <stop
+ id="stop2529"
+ offset="0"
+ style="stop-color:#fcaf3e;stop-opacity:1;" />
+ <stop
+ id="stop2531"
+ offset="1"
+ style="stop-color:#fcaf3e;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3347"
+ inkscape:collect="always">
+ <stop
+ id="stop3349"
+ offset="0"
+ style="stop-color:#edd400;stop-opacity:1;" />
+ <stop
+ id="stop3351"
+ offset="1"
+ style="stop-color:#edd400;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2298"
+ inkscape:collect="always">
+ <stop
+ id="stop2300"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop2302"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3478"
+ inkscape:collect="always">
+ <stop
+ id="stop3480"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop3482"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4829"
+ inkscape:collect="always">
+ <stop
+ id="stop4831"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop4833"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="-8.3080902"
+ x2="4.9625983"
+ y1="-43.997444"
+ x1="11.149398"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient7744"
+ xlink:href="#linearGradient3478"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="-24.88446"
+ x2="-35.652866"
+ y1="-1.2491118"
+ x1="-25.137094"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient7746"
+ xlink:href="#linearGradient2527"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="-4.4493785"
+ x2="-34.700153"
+ y1="-37.550461"
+ x1="-27.006643"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient7748"
+ xlink:href="#linearGradient2298"
+ inkscape:collect="always" />
+ <radialGradient
+ r="358.44638"
+ fy="-405.91245"
+ fx="97.468246"
+ cy="-405.91245"
+ cx="97.468246"
+ gradientTransform="matrix(0.02128891,0,0,0.02758631,323.3674,-435.104)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient7778"
+ xlink:href="#linearGradient9642"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient9642"
+ inkscape:collect="always">
+ <stop
+ id="stop9644"
+ offset="0"
+ style="stop-color:#787974;stop-opacity:1;" />
+ <stop
+ id="stop9646"
+ offset="1"
+ style="stop-color:#787974;stop-opacity:0;" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective2979"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 24 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ gradientTransform="matrix(1.341774,0,0,1.0894455,-13.234228,-3.745426)"
+ r="15.0625"
+ fy="18.625"
+ fx="27.75"
+ cy="18.625"
+ cx="27.75"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient2996"
+ xlink:href="#lG3584"
+ inkscape:collect="always" />
+ <radialGradient
+ r="7.8289828"
+ fy="74.20993"
+ fx="14.772334"
+ cy="74.20993"
+ cx="14.772334"
+ gradientTransform="matrix(2.1121636,0,0,0.6226858,-6.201582,-3.209507)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient2993"
+ xlink:href="#lG20210"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="43.165001"
+ x2="26.4785"
+ y1="43.165001"
+ x1="23.124001"
+ gradientTransform="matrix(1.7634105,0,0,1.5366701,-19.732605,-23.884032)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2990"
+ xlink:href="#aigrd1"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="26.739624"
+ x2="24.613028"
+ y1="31.146202"
+ x1="24.613028"
+ gradientTransform="matrix(0.9917,0,0,0.9909251,-0.408739,1.0079205)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2987"
+ xlink:href="#lG3300"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="39.142845"
+ x2="-23.851389"
+ y1="39.033951"
+ x1="-10.480865"
+ gradientTransform="matrix(0.5604295,0.02969716,-0.1172615,0.6523102,35.381303,20.961615)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2984"
+ xlink:href="#lG2399"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="38.675991"
+ x2="-4.3908315"
+ y1="38.675991"
+ x1="-22.87417"
+ gradientTransform="matrix(0.5604295,0.02969716,-0.1172615,0.6523102,35.381303,20.961615)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2982"
+ xlink:href="#lG19894"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="39.142845"
+ x2="-23.851389"
+ y1="39.033951"
+ x1="-10.480865"
+ gradientTransform="matrix(0.6119222,-0.1311763,0.06194293,0.7364078,30.37142,15.405948)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2979"
+ xlink:href="#lG2399"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="38.675991"
+ x2="-4.3908315"
+ y1="38.675991"
+ x1="-22.87417"
+ gradientTransform="matrix(0.6119222,-0.1311763,0.06194293,0.7364078,30.37142,15.405948)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2977"
+ xlink:href="#lG19894"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="39.142845"
+ x2="-23.851389"
+ y1="39.033951"
+ x1="-10.480865"
+ gradientTransform="matrix(0.6119222,-0.1311763,0.06194293,0.7364078,30.37142,12.330395)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2974"
+ xlink:href="#lG2399"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="38.675991"
+ x2="-4.3908315"
+ y1="38.675991"
+ x1="-22.87417"
+ gradientTransform="matrix(0.6119222,-0.1311763,0.06194293,0.7364078,30.37142,12.330395)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2972"
+ xlink:href="#lG19894"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="39.142845"
+ x2="-23.851389"
+ y1="39.033951"
+ x1="-10.480865"
+ gradientTransform="matrix(0.6119217,-0.1311762,0.06194293,0.7364078,30.37142,9.2548427)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2969"
+ xlink:href="#lG2399"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="38.675991"
+ x2="-4.3908315"
+ y1="38.675991"
+ x1="-22.87417"
+ gradientTransform="matrix(0.6119217,-0.1311762,0.06194293,0.7364078,30.37142,9.2548427)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2967"
+ xlink:href="#lG19894"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="-29.598314"
+ x2="-37.641232"
+ y1="-29.799353"
+ x1="-29.007195"
+ gradientTransform="matrix(-0.8644621,-0.0434172,0.1808757,-0.9536764,1.0306099,1.6641308)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2959"
+ xlink:href="#lG3265"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="54.863026"
+ x2="11.906206"
+ y1="55.362793"
+ x1="17.879995"
+ gradientTransform="matrix(1.5303857,0,0,0.5438301,1.0306099,1.6641308)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2957"
+ xlink:href="#lG3311"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="34.005379"
+ x2="23.413288"
+ y1="1.9996886"
+ x1="23.413288"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2954"
+ xlink:href="#lG3531"
+ inkscape:collect="always" />
+ <radialGradient
+ r="33.93409"
+ fy="29.869318"
+ fx="68.137589"
+ cy="29.869318"
+ cx="68.137589"
+ gradientTransform="matrix(0.5261727,0,0,0.7582733,-9.5647863,5.1185895)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient2952"
+ xlink:href="#aigrd7"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="3.8557322"
+ x2="-5.2517161"
+ y1="16.651863"
+ x1="37.940434"
+ gradientTransform="matrix(0.8533916,0,0,0.9752486,1.8913364,1.6641308)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2949"
+ xlink:href="#lG3175"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="18.162935"
+ x2="32.16608"
+ y1="10.313651"
+ x1="30.620375"
+ gradientTransform="matrix(-0.5899687,0,0,1.4729675,47.100499,4.7781825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2946"
+ xlink:href="#lG20393"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="18.162935"
+ x2="32.16608"
+ y1="10.313651"
+ x1="30.620375"
+ gradientTransform="matrix(0.5899687,0,0,1.4729675,0.9038103,4.8940498)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2943"
+ xlink:href="#lG20393"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="32.25098"
+ x2="9.3648205"
+ y1="31.504122"
+ x1="14.637301"
+ gradientTransform="matrix(1.8610153,0,0,0.4669515,1.2553727,5.473386)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2940"
+ xlink:href="#lG20428"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="36.726292"
+ x2="32.096882"
+ y1="10.061084"
+ x1="16.998856"
+ gradientTransform="matrix(1.088532,0,0,0.9166207,0.7043474,-1.5743919)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2937"
+ xlink:href="#lG6339"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG3531"
+ id="lG3537"
+ y2="34.005379"
+ x2="23.413288"
+ y1="1.9996886"
+ x1="23.413288" />
+ <linearGradient
+ gradientTransform="matrix(0.9917,0,0,0.9909251,-0.408739,1.0079205)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG3300"
+ id="lG3845"
+ y2="26.739624"
+ x2="24.613028"
+ y1="31.146202"
+ x1="24.613028" />
+ <linearGradient
+ gradientTransform="matrix(0.5604295,0.02969716,-0.1172615,0.6523102,35.381303,20.961615)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG2399"
+ id="lG3842"
+ y2="39.142845"
+ x2="-23.851389"
+ y1="39.033951"
+ x1="-10.480865" />
+ <linearGradient
+ gradientTransform="matrix(0.5604295,0.02969716,-0.1172615,0.6523102,35.381303,20.961615)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG19894"
+ id="lG3840"
+ y2="38.675991"
+ x2="-4.3908315"
+ y1="38.675991"
+ x1="-22.87417" />
+ <linearGradient
+ gradientTransform="matrix(0.6119217,-0.1311762,0.06194293,0.7364078,30.37142,9.2548427)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG2399"
+ id="lG3835"
+ y2="39.142845"
+ x2="-23.851389"
+ y1="39.033951"
+ x1="-10.480865" />
+ <linearGradient
+ gradientTransform="matrix(0.6119217,-0.1311762,0.06194293,0.7364078,30.37142,9.2548427)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG19894"
+ id="lG3833"
+ y2="38.675991"
+ x2="-4.3908315"
+ y1="38.675991"
+ x1="-22.87417" />
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG3584"
+ id="rG3590"
+ fy="18.625"
+ fx="27.75"
+ r="15.0625"
+ cy="18.625"
+ cx="27.75" />
+ <linearGradient
+ gradientTransform="matrix(-0.5899687,0,0,1.4729675,47.100499,4.7781825)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG20393"
+ id="lG3580"
+ y2="18.162935"
+ x2="32.16608"
+ y1="10.313651"
+ x1="30.620375" />
+ <linearGradient
+ gradientTransform="matrix(0.5899687,0,0,1.4729675,0.9038103,4.8940498)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG20393"
+ id="lG3577"
+ y2="18.162935"
+ x2="32.16608"
+ y1="10.313651"
+ x1="30.620375" />
+ <linearGradient
+ gradientTransform="matrix(1.8610153,0,0,0.4669515,1.2553727,5.473386)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG20428"
+ id="lG3574"
+ y2="32.25098"
+ x2="9.3648205"
+ y1="31.504122"
+ x1="14.637301" />
+ <linearGradient
+ gradientTransform="matrix(-0.8644621,-0.0434172,0.1808757,-0.9536764,1.0306099,1.6641308)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG3265"
+ id="lG2801"
+ y2="-29.598314"
+ x2="-37.641232"
+ y1="-29.799353"
+ x1="-29.007195" />
+ <linearGradient
+ gradientTransform="matrix(1.5303857,0,0,0.5438301,1.0306099,1.6641308)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG3311"
+ id="lG2799"
+ y2="54.863026"
+ x2="11.906206"
+ y1="55.362793"
+ x1="17.879995" />
+ <radialGradient
+ gradientTransform="matrix(0.5261727,0,0,0.7582733,-9.5647863,5.1185895)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#aigrd7"
+ id="rG2796"
+ fy="29.869318"
+ fx="68.137589"
+ r="33.93409"
+ cy="29.869318"
+ cx="68.137589" />
+ <linearGradient
+ gradientTransform="matrix(0.8533916,0,0,0.9752486,1.8913364,1.6641308)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG3175"
+ id="lG2793"
+ y2="3.8557322"
+ x2="-5.2517161"
+ y1="16.651863"
+ x1="37.940434" />
+ <linearGradient
+ gradientTransform="matrix(1.088532,0,0,0.9166207,0.7043474,-1.5743919)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG6339"
+ id="lG2774"
+ y2="36.726292"
+ x2="32.096882"
+ y1="10.061084"
+ x1="16.998856" />
+ <linearGradient
+ gradientTransform="matrix(1.7634105,0,0,1.5366701,-19.732605,-23.884032)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#aigrd1"
+ id="lG2755"
+ y2="43.165001"
+ x2="26.4785"
+ y1="43.165001"
+ x1="23.124001" />
+ <linearGradient
+ gradientTransform="scale(1.02645,0.974232)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG2399"
+ id="lG4114"
+ y2="39.142845"
+ x2="-23.851389"
+ y1="39.033951"
+ x1="-10.480865" />
+ <linearGradient
+ gradientTransform="scale(1.02645,0.974232)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG19894"
+ id="lG4112"
+ y2="38.675991"
+ x2="-4.3908315"
+ y1="38.675991"
+ x1="-22.87417" />
+ <linearGradient
+ gradientTransform="scale(1.02645,0.974232)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG2399"
+ id="lG4110"
+ y2="39.142845"
+ x2="-23.851389"
+ y1="39.033951"
+ x1="-10.480865" />
+ <linearGradient
+ gradientTransform="scale(1.02645,0.974232)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG19894"
+ id="lG4108"
+ y2="38.675991"
+ x2="-4.3908315"
+ y1="38.675991"
+ x1="-22.87417" />
+ <radialGradient
+ gradientTransform="scale(1.764278,0.566804)"
+ gradientUnits="userSpaceOnUse"
+ xlink:href="#lG20210"
+ id="rG20216"
+ fy="74.20993"
+ fx="14.772334"
+ r="7.8289828"
+ cy="74.20993"
+ cx="14.772334" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ id="lG19894"
+ y2="37.226601"
+ x2="30.169901"
+ y1="37.226601"
+ x1="18.9951">
+ <stop
+ id="stop2842"
+ offset="0.005618"
+ style="stop-color:#a3a349;" />
+ <stop
+ id="stop2844"
+ offset="0.02078677"
+ style="stop-color:#acac54;" />
+ <stop
+ id="stop2846"
+ offset="0.066"
+ style="stop-color:#c1c172;" />
+ <stop
+ id="stop2848"
+ offset="0.1148"
+ style="stop-color:#d4d68e;" />
+ <stop
+ id="stop2850"
+ offset="0.1677"
+ style="stop-color:#e2e4a6;" />
+ <stop
+ id="stop2852"
+ offset="0.2265"
+ style="stop-color:#edf0b8;" />
+ <stop
+ id="stop2854"
+ offset="0.2963"
+ style="stop-color:#f3f6c3;" />
+ <stop
+ id="stop2856"
+ offset="0.4045"
+ style="stop-color:#f5f8c7;" />
+ <stop
+ id="stop2858"
+ offset="0.5239"
+ style="stop-color:#eef0be;" />
+ <stop
+ id="stop2860"
+ offset="0.6666"
+ style="stop-color:#dbdda9;" />
+ <stop
+ id="stop2862"
+ offset="0.8211"
+ style="stop-color:#bebd88;" />
+ <stop
+ id="stop2864"
+ offset="0.9832"
+ style="stop-color:#989564;" />
+ <stop
+ id="stop2866"
+ offset="1"
+ style="stop-color:#949160;" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ id="aigrd1"
+ y2="43.165001"
+ x2="26.4785"
+ y1="43.165001"
+ x1="23.124001">
+ <stop
+ id="stop2815"
+ offset="0.005618"
+ style="stop-color:#686868;" />
+ <stop
+ id="stop2817"
+ offset="0.03012137"
+ style="stop-color:#777777;" />
+ <stop
+ id="stop2819"
+ offset="0.08366583"
+ style="stop-color:#929292;" />
+ <stop
+ id="stop2821"
+ offset="0.1422"
+ style="stop-color:#a7a7a7;" />
+ <stop
+ id="stop2823"
+ offset="0.2074"
+ style="stop-color:#b6b6b6;" />
+ <stop
+ id="stop2825"
+ offset="0.2846"
+ style="stop-color:#bebebe;" />
+ <stop
+ id="stop2827"
+ offset="0.4045"
+ style="stop-color:#c1c1c1;" />
+ <stop
+ id="stop2829"
+ offset="0.4962"
+ style="stop-color:#bcbcbc;" />
+ <stop
+ id="stop2831"
+ offset="0.6057"
+ style="stop-color:#adadad;" />
+ <stop
+ id="stop2833"
+ offset="0.7245"
+ style="stop-color:#959595;" />
+ <stop
+ id="stop2835"
+ offset="0.8497"
+ style="stop-color:#747474;" />
+ <stop
+ id="stop2837"
+ offset="0.9789"
+ style="stop-color:#494949;" />
+ <stop
+ id="stop2839"
+ offset="1"
+ style="stop-color:#414141;" />
+ </linearGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ id="aigrd7"
+ fy="11.4873"
+ fx="17.8335"
+ r="22.709299"
+ cy="11.4873"
+ cx="17.8335">
+ <stop
+ id="stop2808"
+ style="stop-color:#ffffff;stop-opacity:0.17525773" />
+ <stop
+ id="stop2810"
+ offset="0.88200003"
+ style="stop-color:#ff3300;stop-opacity:1;" />
+ <stop
+ id="stop2812"
+ offset="1"
+ style="stop-color:#ff5600;stop-opacity:1;" />
+ </radialGradient>
+ <linearGradient
+ id="lG20210">
+ <stop
+ id="stop2801"
+ style="stop-color:#000000;stop-opacity:0.51546389" />
+ <stop
+ id="stop2803"
+ offset="0.55172414"
+ style="stop-color:#000000;stop-opacity:0.14432989" />
+ <stop
+ id="stop2805"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ id="lG20393">
+ <stop
+ offset="0"
+ id="stop2794"
+ style="stop-color:#ff1708;stop-opacity:1;" />
+ <stop
+ id="stop2796"
+ offset="0.41176471"
+ style="stop-color:#ff4f04;stop-opacity:0.43921569;" />
+ <stop
+ id="stop2798"
+ offset="1"
+ style="stop-color:#4c3e1c;stop-opacity:0.47843137" />
+ </linearGradient>
+ <linearGradient
+ id="lG20428">
+ <stop
+ id="stop2789"
+ style="stop-color:#ffb812" />
+ <stop
+ id="stop2791"
+ offset="1"
+ style="stop-color:#ffb812;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ id="lG6339">
+ <stop
+ id="stop2784"
+ style="stop-color:#ffffff" />
+ <stop
+ id="stop2786"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ id="lG2399">
+ <stop
+ id="stop2775"
+ style="stop-color:#929470" />
+ <stop
+ id="stop2777"
+ offset="0.2647059"
+ style="stop-color:#fcffc1" />
+ <stop
+ id="stop2779"
+ offset="0.63235295"
+ style="stop-color:#f3f5ba" />
+ <stop
+ id="stop2781"
+ offset="1"
+ style="stop-color:#929470" />
+ </linearGradient>
+ <linearGradient
+ id="lG3175">
+ <stop
+ id="stop2770"
+ style="stop-color:#fffff1" />
+ <stop
+ id="stop2772"
+ offset="1"
+ style="stop-color:#f1f3ff;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ id="lG3265">
+ <stop
+ id="stop2761"
+ style="stop-color:#dcd763" />
+ <stop
+ id="stop2763"
+ offset="0.2647059"
+ style="stop-color:#d9bb05" />
+ <stop
+ id="stop2765"
+ offset="0.63235295"
+ style="stop-color:#dcd763" />
+ <stop
+ id="stop2767"
+ offset="1"
+ style="stop-color:#c7a107" />
+ </linearGradient>
+ <linearGradient
+ id="lG3311">
+ <stop
+ id="stop2756"
+ style="stop-color:#d6d87b" />
+ <stop
+ id="stop2758"
+ offset="1"
+ style="stop-color:#fbe843" />
+ </linearGradient>
+ <linearGradient
+ id="lG3300">
+ <stop
+ id="stop2751"
+ style="stop-color:#4c4428" />
+ <stop
+ id="stop2753"
+ offset="1"
+ style="stop-color:#e7b600;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ id="lG3584">
+ <stop
+ offset="0"
+ id="stop2744"
+ style="stop-color:#ff4300;stop-opacity:0;" />
+ <stop
+ id="stop2746"
+ offset="0.5"
+ style="stop-color:#ff2c00;stop-opacity:0.32549018;" />
+ <stop
+ id="stop2748"
+ offset="1"
+ style="stop-color:#ff5600;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="lG3531">
+ <stop
+ offset="0"
+ id="stop2737"
+ style="stop-color:#ab1d04;stop-opacity:1;" />
+ <stop
+ id="stop2739"
+ offset="0.73602742"
+ style="stop-color:#ab4704;stop-opacity:1;" />
+ <stop
+ id="stop2741"
+ offset="1"
+ style="stop-color:#616471" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective2934"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 24 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="63.874394"
+ inkscape:cy="35.126778"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="955"
+ inkscape:window-height="680"
+ inkscape:window-x="241"
+ inkscape:window-y="36"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1004.3622)">
+ <g
+ inkscape:label="Layer 1"
+ id="layer1-1"
+ transform="matrix(0.76551132,0,0,0.76551132,15.682475,1006.0323)">
+ <g
+ transform="matrix(0.998698,0,0,0.998698,-342.5411,469.4117)"
+ id="g7594">
+ <path
+ sodipodi:type="arc"
+ style="fill:#eaece8;fill-opacity:1;stroke:none"
+ id="path7596"
+ sodipodi:cx="-56.25"
+ sodipodi:cy="0.24999997"
+ sodipodi:rx="9.75"
+ sodipodi:ry="9.75"
+ d="M -46.5,0.24999997 C -46.5,5.6347763 -50.865224,10 -56.25,10 -61.634776,10 -66,5.6347763 -66,0.24999997 -66,-5.1347763 -61.634776,-9.5 -56.25,-9.5 c 5.384776,0 9.75,4.3652237 9.75,9.74999997 z"
+ transform="matrix(1.386488,0,0,1.386488,444.99,-446.4716)" />
+ <g
+ id="g7598"
+ transform="translate(37.125,-1.625)">
+ <path
+ id="path7600"
+ d="m 323.84614,-456.07802 c 0.0486,0.17562 -0.12591,0.39397 -0.27934,0.59855 -0.20144,0.2686 -0.31042,0.44775 -0.0798,0.67837 0.14329,0.14328 0.57893,0.0158 0.71827,-0.0399 0.3214,-0.12856 0.67358,-0.22953 0.9976,-0.35913 0.24571,-0.0983 0.4292,-0.13723 0.67836,-0.19952 0.28672,-0.0717 0.57153,0.0571 0.67837,0.19952 0.0681,0.0908 -0.46179,0.49026 -0.51875,0.51874 -0.24201,0.12101 -0.47287,0.21798 -0.71827,0.27933 -0.30202,0.0755 -0.57153,0.17815 -0.87788,0.23942 -0.30771,0.0615 -0.52362,0.15456 -0.79808,0.31923 -0.34006,0.20404 -0.62606,0.50635 -0.91778,0.79808 -0.27257,0.27257 -0.36706,0.56686 -0.27933,0.91778 0.0844,0.33751 0.21002,0.457 0.51875,0.51875 0.3433,0.0687 0.51056,-0.0955 0.67836,-0.31923 0.21824,-0.29099 0.30168,-0.66081 0.55865,-0.91778 0.21494,-0.21495 0.36222,-0.4213 0.59856,-0.59856 0.23962,-0.17971 0.42089,-0.27386 0.71827,-0.19952 0.24731,0.0618 0.44872,0.30522 0.71826,0.35914 0.22729,0.0455 0.56158,-0.26084 0.75817,-0.35914 0.0429,-0.0215 0.0798,-0.0532 0.11972,-0.0798 0.20735,-0.13824 0.55041,-0.0798 0.79807,-0.0798 0.26905,0 0.49616,0.12837 0.71826,0.23942 0.26878,0.13438 0.50065,0.12608 0.75817,0.31923 0.27256,0.20441 0.41892,0.35898 0.55866,0.63846 0.13199,0.26397 0.19033,0.42976 0.39904,0.63846 0.22072,0.22072 0.56031,0.36079 0.79806,0.59855 0.14292,0.14291 0.23261,0.53136 0.27934,0.71827 0.0733,0.29311 0.1394,0.59907 0,0.87788 -0.15089,0.30177 -0.33188,0.58396 -0.47885,0.87788 -0.1446,0.28922 -0.54921,0.53162 -0.79807,0.71827 -0.34301,0.25726 -0.75121,0.27237 -1.0774,0.59856 -0.37514,0.37513 -0.41054,0.59585 -0.75818,1.1173 -0.25687,0.38531 0.0488,0.55643 0.35914,0.47885 0.32847,-0.0821 0.63271,-0.15818 0.95769,-0.23943 0.0532,-0.0133 0.10641,-0.0266 0.15961,-0.0399 0.40008,-0.10002 0.71782,-0.41888 1.11731,-0.51875 0.49734,-0.12433 1.54284,0.64638 1.99518,0.91779 0.35667,0.214 -0.0691,0.63308 -0.23942,0.71826 -0.31687,0.15844 -0.63299,0.19952 -0.99759,0.19952 -0.23599,0 -0.49249,-0.0745 -0.71827,-0.11971 -0.30515,-0.061 -0.5178,-0.0606 -0.75817,0.11971 -0.26721,0.20042 -0.2359,0.45813 -0.0798,0.71827 0.15594,0.25989 0.41021,0.4437 0.47884,0.71827 0.0866,0.34645 -0.19337,0.53102 -0.43893,0.67836 -0.24655,0.14793 -0.67219,-0.0399 -0.95769,-0.0399 -0.3617,0 -0.71143,0.18442 -0.99759,0.39904 -0.12967,0.0973 -0.24307,0.61316 -0.27933,0.75817 -0.0133,0.0532 -0.0266,0.10641 -0.0399,0.15962 -0.0973,0.38907 0.0274,0.58727 0.15962,0.91778 0.0957,0.23926 0.32804,0.45656 0.43894,0.67837 0.13845,0.27689 0.22919,0.4594 0.0798,0.75817 -0.12733,0.25465 -0.17554,0.46276 -0.23943,0.71826 -0.0447,0.17901 0.20742,0.65822 0.27933,0.83798 0.14424,0.36058 0.0101,0.42884 -0.23943,0.67837 -0.2208,0.2208 -0.55161,0.2758 -0.79806,0.39903 -0.2292,0.1146 -0.68093,-0.0206 -0.91779,-0.0798 -0.26703,-0.0668 -0.51539,0.0582 -0.71827,0.15962 -0.32213,0.16107 -0.3211,0.31673 -0.55865,0 -0.25189,-0.33585 -0.46083,-0.68615 -0.55865,-1.0774 -0.0133,-0.0532 -0.0266,-0.10641 -0.0399,-0.15962 -0.0668,-0.26738 -0.0399,-0.59608 -0.0399,-0.87788 0,-0.28763 0.0798,-0.54462 0.0798,-0.83798 0,-0.31598 -0.75459,0.2779 -0.95768,0.35914 -0.0941,0.0376 -0.18623,0.0798 -0.27934,0.11971 -0.39873,0.17089 -0.35913,0.53524 -0.35913,0.87788 0,0.34152 0.19951,0.60231 0.19951,0.95769 0,0.34243 -0.40342,0.43894 -0.67835,0.43894 -0.39099,0 -0.5722,-0.45249 -0.83798,-0.71827 -0.25426,-0.25425 -0.68805,-0.53811 -0.83798,-0.83797 -0.21217,-0.42435 -0.28391,-0.66496 0.15961,-0.9976 0.25414,-0.1906 0.60842,-0.22596 0.79808,-0.47884 0.19924,-0.26566 0.48175,-0.63773 0,-0.75817 -0.32828,-0.0821 -0.45563,-0.19618 -0.83798,-0.11971 -0.0665,0.0133 -0.13301,0.0266 -0.19952,0.0399 -0.65946,0.13189 -0.65494,0.0716 -1.27692,-0.23942 -0.44759,-0.2238 -0.60098,-0.56108 -0.91778,-0.87788 -0.29493,-0.29493 -0.46228,-0.69193 -0.55865,-1.0774 -0.0887,-0.3548 -0.19371,-0.69501 -0.27933,-1.0375 -0.0701,-0.28054 -0.0798,-0.62556 -0.0798,-0.91778 0,-0.29704 -0.0798,-0.61345 -0.0798,-0.91779 0,-0.33253 0,-0.66506 0,-0.99759 0,-0.33653 0.0399,-0.63407 0.0399,-0.95769 0,-0.27723 0.0542,-0.61602 0.11971,-0.87789 0.006,-0.0258 0,-0.0532 0,-0.0798 0,-0.34036 0.19708,-0.69223 0.31923,-0.9976 0.10762,-0.26907 0.27463,-0.54927 0.39904,-0.79807 0.13029,-0.26057 0.26091,-0.48091 0.43894,-0.71827 0.1922,-0.25627 0.39689,-0.51616 0.59855,-0.75817 0.34733,-0.41679 0.70836,-0.80669 1.11731,-1.15721 0.23897,-0.20482 0.35656,-0.54674 0.63846,-0.75816 0.34879,-0.2616 0.65243,-0.53921 0.99759,-0.79808 0.2624,-0.1968 0.50187,-0.4241 0.67836,-0.71827 0.14357,-0.23929 0.22463,-0.46405 0.43894,-0.67836 0.0527,-0.0527 0.22985,-0.13487 0.27934,-0.15961 z"
+ style="opacity:0.10555552;fill:#787974;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ id="path7602"
+ d="m 334.85956,-450.97035 c -0.38499,0.0925 -1.15273,0.22436 -1.67596,0.11971 -0.40086,-0.0802 -0.41421,-0.30406 -0.79807,0.0798 -0.0266,0.0266 -0.0532,0.0532 -0.0798,0.0798 -0.24233,0.24233 -0.27932,0.27859 -0.27932,0.63846 0,0.2363 0.004,0.4611 -0.0399,0.67836 -0.0467,0.23338 -0.0115,0.59226 0.0399,0.79807 0.0784,0.31372 0.12792,0.53517 0.27932,0.83798 0.12091,0.24181 0.17725,0.43221 0.39904,0.59856 0.288,0.21599 0.68441,0.27376 0.9976,0.39903 0.22083,0.0883 0.59074,0.0399 0.83797,0.0399 0.31364,0 0.35914,0.0355 0.35914,0.39903 0,0.31202 -0.58566,0.74998 -0.75817,1.0375 -0.19089,0.31814 -0.11781,0.56436 0,0.91779 0.0878,0.26347 0.1448,0.5245 0.19951,0.79807 0.057,0.28517 0.13143,0.49056 0.35914,0.71827 0.24219,0.2422 0.68895,-0.0258 0.91778,0.27933 0.11503,0.15336 0.11972,0.40725 0.11972,0.59855 0,0.31727 0.10251,0.46749 0.39903,0.31923 0.26993,-0.13496 0.4726,-0.12467 0.67837,-0.39904 0.19592,-0.26123 0.29408,-0.58817 0.43894,-0.87788 0.12918,-0.25837 0.35001,-0.27932 0.63846,-0.27932 0.26664,0 0.4808,0.0693 0.75817,0 0.40637,-0.1016 0.46832,-0.2289 0.75816,-0.51875 0.36667,-0.36667 0.32315,-0.62199 0.39904,-1.0774 0.0342,-0.20545 -0.0338,-0.45465 -0.0798,-0.63846 -0.0133,-0.0532 -0.0266,-0.10641 -0.0399,-0.15962 -0.0556,-0.22243 -0.54378,-0.23942 -0.71826,-0.23942 -0.38567,0 -0.95765,-0.18953 -1.31683,-0.27933 -0.18343,-0.0458 -0.69207,-0.65216 -0.83797,-0.79807 -0.2109,-0.21089 -0.25241,-0.37116 -0.31923,-0.63846 -0.0823,-0.32931 -0.0384,-0.67226 -0.11971,-0.99759 -0.0932,-0.37293 0.0159,-0.5827 -0.27933,-0.87788 -0.20899,-0.209 -0.34674,-0.49671 -0.39904,-0.75818 -0.0504,-0.25226 -0.28717,-0.53461 -0.47884,-0.67836 -0.14021,-0.10515 -0.15679,-0.0792 -0.35913,-0.11971 z"
+ style="opacity:0.18888885;fill:#787974;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ id="path7604"
+ d="m 341.00473,-448.65593 c -0.20686,0.007 -0.41855,0.25893 -0.59856,0.43894 -0.17692,0.17692 -0.11971,0.4801 -0.11971,0.71826 0,0.26057 0.056,0.5433 0.11971,0.79808 0.054,0.21611 0.253,0.49242 0.39904,0.63846 0.22008,0.22008 0.50176,0.34965 0.79807,0.39903 0.38807,0.0647 0.60185,0.11149 0.75818,-0.27932 0.10737,-0.26842 0.15961,-0.45302 0.15961,-0.75817 0,-0.27625 -0.0124,-0.48851 -0.0798,-0.75817 -0.0815,-0.32585 -0.18635,-0.49221 -0.47884,-0.63846 -0.20729,-0.10364 -0.41834,-0.34368 -0.59856,-0.47885 -0.10339,-0.0775 -0.23587,-0.0798 -0.35913,-0.0798 z"
+ style="opacity:0.18333327;fill:#787974;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ id="path7606"
+ d="m 328.35524,-436.20598 c 0.21632,-0.14825 0.84563,-0.79382 1.27693,-1.1173 0.0831,-0.0623 0.15961,-0.13301 0.23942,-0.19952 0.43011,-0.35842 0.80496,-0.92811 1.11731,-1.39663 0.49552,-0.74328 0.71315,-1.41096 0.87788,-2.23461 0.20928,-1.0464 0.26214,-0.34748 0.0399,0.31924 -0.0347,0.10405 -0.0532,0.21282 -0.0798,0.31922 -0.10903,0.43615 -0.15211,0.89903 -0.31922,1.31683 -0.22556,0.5639 -0.65123,1.04865 -0.79808,1.63605 -0.0784,0.31342 -0.18502,0.69649 -0.11972,0.95769 0.078,0.31211 0.53278,-0.37711 0.83799,-0.47885 0.4153,-0.13843 0.51874,-0.22895 0.51874,0.23943 0,0.28308 -0.14275,0.67387 -0.19952,0.95769 -0.0979,0.48934 1.28804,0.077 1.59615,0 1.0073,-0.25183 1.69819,-0.59713 2.51394,-1.27692 0.89829,-0.74857 1.64541,-1.5656 2.47402,-2.39423 0.66669,-0.66668 0.98041,-1.08477 0.55866,0.0399 -0.0399,0.10641 -0.0798,0.21282 -0.11971,0.31923 -0.0399,0.10641 -0.0798,0.21282 -0.11971,0.31923 -0.22087,0.58898 -0.62389,1.2406 -1.15721,1.59615 -0.83096,0.55397 -1.36956,1.58261 -2.27451,2.03508 -0.36626,0.18313 -0.74917,0.25488 -1.1173,0.43894 -0.36945,0.18473 0.71851,0.31485 0.91778,0.35914 2.00332,0.44518 -1.62115,0.63846 -2.07499,0.63846 -0.74853,0 -1.12279,-0.15633 -1.71586,0.19951 -0.20269,0.12161 0.94323,0.58769 0.99758,0.59856 0.4676,0.0935 0.88473,0.39904 1.39664,0.39904 0.84991,0 -1.77287,0.26507 -2.51393,0.0798 -0.62118,-0.1553 -1.20981,-0.2825 -1.83557,-0.43895 -0.31755,-0.0794 -0.63616,-0.0305 -0.9178,0.0399 -0.056,0.014 0.0399,0.82339 0.0399,0.91778 0,0.591 -0.15469,1.05225 -0.43894,0.19952 -0.15311,-0.45935 -0.43894,-0.94432 -0.43894,-1.43653 0,-0.31166 -0.41156,0.46894 -0.59855,0.71827 -0.26333,0.3511 -0.78197,0.8539 -0.87788,0.87788 -0.0131,0.003 0.25819,-0.55392 0.35913,-0.95769 0.0759,-0.3034 0.56595,-1.11548 0.23942,-1.19711 -0.3049,-0.0762 -0.72505,-0.0173 -1.0375,-0.0798 -0.46341,-0.0927 -0.96027,-0.18086 -1.39663,-0.39904 -0.84451,-0.42225 -2.16285,-0.81006 -3.07258,-1.0375 -0.0838,-0.0209 -1.45551,-1.49541 -0.15962,-0.19951 0.85544,0.85544 2.19059,1.43653 3.39182,1.43653 0.38491,0 0.95655,-0.14935 1.31682,-0.23942 0.21699,-0.0543 0.51677,-0.38229 0.75817,-0.47885 0.26199,-0.10479 -0.41791,-0.38179 -0.59855,-0.59855 -0.0665,-0.0798 -0.13302,-0.15962 -0.19953,-0.23942 -0.71532,-0.8584 -0.96642,-2.04384 -1.79565,-2.87307 -0.13341,-0.1334 -2.07779,-2.40319 -1.15721,-1.63605 0.95189,0.79324 1.83163,1.49845 2.63364,2.43412 0.41125,0.4798 0.76487,1.10573 1.15721,1.59615 0.39477,0.49348 0.31152,-0.10291 0.19951,-0.43894 -0.24012,-0.72038 -0.1197,-1.72147 -0.1197,-2.47403 0,-0.99806 0.51551,1.02456 0.55865,1.19711 0.12401,0.49605 0.38047,1.14206 0.75816,0.63846 0.39026,-0.52034 0.43894,-0.61871 0.43894,0.0399 0,0.0532 0,0.10641 0,0.15961 0,0.24765 -0.0131,0.53284 0.0399,0.79807 z"
+ style="opacity:0.47222218;fill:#f3f4f2;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ id="path7608"
+ d="m 340.04704,-444.98479 c 0.08,0.0851 0.15962,0.37727 0.15962,0.63846 0,0.10627 -0.65983,0.61991 -0.75818,0.71827 -0.19197,0.19196 -0.23069,0.51496 -0.27932,0.75816 -0.0627,0.31332 -0.14128,0.53067 -0.0798,0.83798 0.0521,0.26046 0.16017,0.51987 0.27932,0.75817 0.14338,0.28674 0.35124,0.43104 0.59856,0.67837 0.27549,0.27549 0.61563,0.27362 0.95768,0.35913 0.43482,0.1087 -0.25838,0.523 -0.35913,0.59856 -0.26793,0.20095 -0.5291,0.26013 -0.67836,0.55865 -0.1729,0.3458 0.18476,0.47294 0.39904,0.55865 0.2419,0.0968 0.60668,-0.33006 0.71827,-0.47885 0.15065,-0.20087 0.39904,-0.42712 0.39904,-0.67836 0,-0.24697 0.1197,-0.50826 0.1197,-0.79807 0,-0.27029 0.0614,-0.56478 0.11971,-0.79808 0.0889,-0.35541 0.21725,-0.49656 0.43894,-0.71826 0.17864,-0.17863 0.17417,-0.6202 0.11972,-0.83798 -0.0624,-0.24974 -0.21901,-0.47698 -0.27933,-0.71827 -0.0615,-0.24606 -0.36202,-0.38978 -0.55865,-0.43894 -0.23626,-0.0591 -0.56748,-0.48767 -0.71827,-0.63846 -0.20761,-0.20761 -0.2995,-0.35913 -0.59855,-0.35913 z"
+ style="opacity:0.11666661;fill:#787974;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ id="path7610"
+ d="m 322.68884,-446.02226 c -0.009,-0.009 0.0266,0 0,0 z"
+ style="fill:none;stroke:#000000;stroke-width:1.0013057px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ id="path7612"
+ d="m 327.59708,-455.67899 c 0.17193,-0.0426 0.57166,-0.17284 0.83797,-0.23942 0.34034,-0.0851 0.69744,0.11971 1.0375,0.11971 0.0345,0 0.25527,0.43894 0.63846,0.43894 0.0532,0 0.10641,0 0.15962,0 0.24164,0 0.51173,0.1925 0.67836,0.35914 0.16091,0.1609 0.0136,0.54508 -0.0798,0.63846 -0.25418,0.25417 -0.48157,0.0771 -0.67836,-0.11972 -0.21053,-0.21053 -0.32098,-0.28974 -0.59856,-0.35913 -0.27563,-0.0689 -0.57017,-0.0271 -0.83797,0.0399 -0.32704,0.0818 -0.54193,0.15961 -0.91779,0.15961 -0.12562,0 -0.5121,-0.54536 -0.55866,-0.63846 -0.0821,-0.16419 0.21875,-0.37391 0.31924,-0.39904 z"
+ style="opacity:0.2;fill:#938f8b;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ id="path7614"
+ d="m 332.42543,-455.00062 c 0.19753,0.0512 0.64044,0.0394 0.95768,-0.0399 0.35162,-0.0879 0.90828,-0.13206 1.27693,-0.0399 0.22336,0.0558 1.58727,0.32367 0.95768,0.63846 -0.31149,0.15575 -0.64122,0.19319 -0.91778,0.35913 -0.33295,0.19977 0.40229,0.27933 0.55865,0.27933 0.42422,0 0.18044,0.51064 0.0798,0.67836 -0.15693,0.26154 -0.0504,0.66587 0,0.91779 0.0571,0.28533 0.54752,0.23942 0.79807,0.23942 0.34322,0 0.63189,0.0444 0.83798,0.31923 0.18225,0.243 0.43466,0.4874 0.31923,0.71827 -0.11889,0.23778 -0.72141,0.27932 -0.91778,0.27932 -0.15157,0 -0.75039,-0.7629 -0.83799,-0.83798 -0.23047,-0.19755 -0.49986,-0.0147 -0.71825,0.0399 -0.38884,0.0972 -0.67608,-0.39713 -0.9178,-0.59856 -0.26154,-0.21795 -0.42515,-0.53108 -0.55865,-0.79807 -0.16889,-0.33778 0.10385,-0.47885 -0.39903,-0.47885 -0.3123,0 -0.48314,-0.0631 -0.71828,-0.23942 -0.31928,-0.23946 -0.55864,-0.14689 -0.55864,-0.59856 0,-0.39868 0.0217,-0.5158 0.35913,-0.71826 0.10827,-0.065 0.25395,-0.0327 0.39904,-0.11971 z"
+ style="opacity:0.28888891;fill:#938f8b;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ id="path7616"
+ d="m 323.87671,-456.18983 c 0.0486,0.17563 -0.12589,0.39398 -0.27933,0.59856 -0.20144,0.2686 -0.31042,0.44774 -0.0798,0.67836 0.14329,0.14329 0.57893,0.0158 0.71827,-0.0399 0.3214,-0.12856 0.67358,-0.22953 0.99759,-0.35914 0.24572,-0.0983 0.42921,-0.13723 0.67837,-0.19952 0.28672,-0.0717 0.57153,0.0571 0.67836,0.19952 0.0681,0.0908 -0.46179,0.49027 -0.51875,0.51875 -0.24201,0.12101 -0.47286,0.21798 -0.71826,0.27933 -0.30202,0.0755 -0.57153,0.17815 -0.87789,0.23942 -0.3077,0.0615 -0.52361,0.15455 -0.79807,0.31923 -0.34006,0.20404 -0.62606,0.50635 -0.91778,0.79807 -0.27258,0.27258 -0.36706,0.56687 -0.27933,0.91779 0.0844,0.33751 0.21002,0.457 0.51874,0.51875 0.34331,0.0687 0.51057,-0.0955 0.67837,-0.31923 0.21824,-0.29099 0.30168,-0.66081 0.55865,-0.91779 0.21494,-0.21494 0.36221,-0.4213 0.59856,-0.59855 0.23961,-0.17971 0.42089,-0.27386 0.71826,-0.19952 0.24732,0.0618 0.44873,0.30522 0.71827,0.35913 0.22729,0.0455 0.56158,-0.26083 0.75817,-0.35913 0.0429,-0.0215 0.0798,-0.0532 0.11972,-0.0798 0.20735,-0.13823 0.55041,-0.0798 0.79807,-0.0798 0.26905,0 0.49616,0.12837 0.71826,0.23943 0.26878,0.13438 0.50064,0.12608 0.75817,0.31922 0.27256,0.20442 0.41891,0.35898 0.55865,0.63846 0.132,0.26398 0.19034,0.42976 0.39905,0.63846 0.22072,0.22073 0.5603,0.3608 0.79806,0.59856 0.14292,0.14291 0.23261,0.53136 0.27934,0.71827 0.0733,0.29311 0.1394,0.59907 0,0.87788 -0.15089,0.30177 -0.33189,0.58395 -0.47885,0.87788 -0.14461,0.28922 -0.54921,0.53161 -0.79808,0.71827 -0.343,0.25726 -0.75121,0.27237 -1.07739,0.59855 -0.37514,0.37514 -0.41054,0.59586 -0.75818,1.11731 -0.25687,0.38531 0.0488,0.55643 0.35914,0.47884 0.32847,-0.0821 0.63271,-0.15818 0.95769,-0.23942 0.0532,-0.0133 0.10641,-0.0266 0.15961,-0.0399 0.40007,-0.10002 0.71782,-0.41888 1.11731,-0.51875 0.49733,-0.12434 1.54284,0.64638 1.99518,0.91778 0.35667,0.214 -0.0691,0.63309 -0.23943,0.71827 -0.31686,0.15844 -0.63298,0.19952 -0.99758,0.19952 -0.23599,0 -0.49249,-0.0746 -0.71827,-0.11971 -0.30515,-0.061 -0.51781,-0.0606 -0.75817,0.11971 -0.26722,0.20041 -0.2359,0.45813 -0.0798,0.71827 0.15594,0.25988 0.4102,0.4437 0.47884,0.71826 0.0866,0.34646 -0.19337,0.53103 -0.43894,0.67837 -0.24654,0.14793 -0.67218,-0.0399 -0.95768,-0.0399 -0.36171,0 -0.71143,0.18442 -0.99759,0.39904 -0.12968,0.0972 -0.24307,0.61316 -0.27933,0.75817 -0.0133,0.0532 -0.0266,0.10641 -0.0399,0.15961 -0.0973,0.38907 0.0274,0.58727 0.15962,0.91779 0.0957,0.23925 0.32804,0.45656 0.43894,0.67836 0.13845,0.2769 0.22919,0.45941 0.0798,0.75817 -0.12733,0.25466 -0.17555,0.46276 -0.23943,0.71827 -0.0447,0.17901 0.20742,0.65821 0.27933,0.83798 0.14423,0.36058 0.0101,0.42884 -0.23942,0.67836 -0.22081,0.22081 -0.55162,0.27581 -0.79808,0.39904 -0.22919,0.11459 -0.68092,-0.0206 -0.91778,-0.0798 -0.26703,-0.0668 -0.51539,0.0582 -0.71827,0.15962 -0.32213,0.16106 -0.32111,0.31673 -0.55865,0 -0.25189,-0.33586 -0.46084,-0.68615 -0.55865,-1.0774 -0.0133,-0.0532 -0.0266,-0.10641 -0.0399,-0.15962 -0.0669,-0.26738 -0.0399,-0.59608 -0.0399,-0.87788 0,-0.28764 0.0798,-0.54462 0.0798,-0.83798 0,-0.31598 -0.75459,0.2779 -0.95769,0.35914 -0.094,0.0376 -0.18622,0.0798 -0.27933,0.11971 -0.39874,0.17088 -0.35913,0.53524 -0.35913,0.87788 0,0.34152 0.19952,0.60231 0.19952,0.95769 0,0.34242 -0.40343,0.43894 -0.67836,0.43894 -0.39099,0 -0.5722,-0.45249 -0.83798,-0.71827 -0.25427,-0.25426 -0.68805,-0.53811 -0.83798,-0.83798 -0.21218,-0.42434 -0.28391,-0.66495 0.15961,-0.99759 0.25414,-0.1906 0.60842,-0.22596 0.79808,-0.47885 0.19924,-0.26565 0.48175,-0.63773 0,-0.75816 -0.32828,-0.0821 -0.45564,-0.19619 -0.83798,-0.11972 -0.0665,0.0133 -0.13301,0.0266 -0.19952,0.0399 -0.65946,0.13189 -0.65494,0.0716 -1.27692,-0.23943 -0.44759,-0.22379 -0.60098,-0.56108 -0.91778,-0.87787 -0.29493,-0.29493 -0.46228,-0.69193 -0.55865,-1.07741 -0.0887,-0.3548 -0.19371,-0.69501 -0.27933,-1.03749 -0.0701,-0.28055 -0.0798,-0.62556 -0.0798,-0.91779 0,-0.29703 -0.0798,-0.61344 -0.0798,-0.91778 0,-0.33253 0,-0.66507 0,-0.9976 0,-0.33652 0.0399,-0.63406 0.0399,-0.95769 0,-0.27723 0.0542,-0.61602 0.11971,-0.87788 0.006,-0.0258 0,-0.0532 0,-0.0798 0,-0.34035 0.19708,-0.69222 0.31923,-0.99759 0.10762,-0.26907 0.27463,-0.54927 0.39904,-0.79807 0.13028,-0.26058 0.26091,-0.48091 0.43893,-0.71827 0.19221,-0.25628 0.3969,-0.51617 0.59856,-0.75817 0.34733,-0.4168 0.70836,-0.80669 1.11731,-1.15721 0.23897,-0.20483 0.35655,-0.54675 0.63846,-0.75817 0.34879,-0.26159 0.65243,-0.5392 0.99759,-0.79807 0.2624,-0.1968 0.50186,-0.42411 0.67837,-0.71827 0.14356,-0.23929 0.22462,-0.46405 0.43893,-0.67836 0.0527,-0.0527 0.22984,-0.13487 0.27933,-0.15962 z"
+ style="opacity:0.17777776;fill:url(#radialGradient7778);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ transform="matrix(0.02128891,0,0,0.02128891,345.1547,-457.7716)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7618"
+ style="opacity:0.61666667;fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.01127061,0,0,0.01127061,330.388,-456.653)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7620"
+ style="opacity:0.54444442;fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.02128891,0,0,0.02128891,354.9312,-458.5298)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7622"
+ style="opacity:0.54444442;fill:#c2c3be;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.02128891,0,0,0.02128891,349.8235,-448.3144)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7624"
+ style="opacity:0.56666667;fill:#c2c3be;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.01377519,0,0,0.01377519,347.8565,-453.491)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7626"
+ style="opacity:0.61666667;fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.01127061,0,0,0.01127061,337.4909,-441.33)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7628"
+ style="opacity:0.61666667;fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.01377519,0,0,0.01377519,346.1806,-447.5852)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7630"
+ style="opacity:0.61666667;fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.01377519,0,0,0.01377519,351.368,-458.9977)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7632"
+ style="opacity:0.61666667;fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.01377519,0,0,0.01377519,348.3353,-458.1996)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7634"
+ style="opacity:0.61666667;fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.01377519,0,0,0.01377519,349.5325,-462.6689)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7636"
+ style="opacity:0.61666667;fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.01377519,0,0,0.01377519,340.6738,-449.4208)"
+ d="m -824.73115,649.36853 c 0,17.59834 -14.26627,31.86461 -31.86461,31.86461 -17.59834,0 -31.86462,-14.26627 -31.86462,-31.86461 0,-17.59834 14.26628,-31.86461 31.86462,-31.86461 17.59834,0 31.86461,14.26627 31.86461,31.86461 z"
+ sodipodi:ry="31.864613"
+ sodipodi:rx="31.864613"
+ sodipodi:cy="649.36853"
+ sodipodi:cx="-856.59576"
+ id="path7638"
+ style="opacity:0.61666667;fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ id="path7640"
+ d="m 328.31362,-435.94304 c 0.20049,-0.13569 0.7838,-0.72662 1.18356,-1.02271 0.077,-0.0571 0.14794,-0.12175 0.22192,-0.18263 0.39866,-0.32808 0.74611,-0.84954 1.03562,-1.2784 0.45929,-0.68036 0.66102,-1.29151 0.81369,-2.04542 0.19399,-0.95783 0.24299,-0.31807 0.037,0.2922 -0.0322,0.0953 -0.0493,0.1948 -0.074,0.29221 -0.10106,0.39921 -0.14098,0.82291 -0.29589,1.20534 -0.20907,0.51616 -0.60361,0.95987 -0.73973,1.49755 -0.0726,0.28688 -0.17148,0.63753 -0.11095,0.87661 0.0723,0.28568 0.49382,-0.34519 0.77671,-0.43831 0.38495,-0.12671 0.48082,-0.20957 0.48082,0.21916 0,0.25912 -0.13232,0.61682 -0.18493,0.87661 -0.0907,0.44791 1.19386,0.0705 1.47945,0 0.93365,-0.23051 1.57404,-0.54658 2.33015,-1.16882 0.83261,-0.6852 1.52511,-1.43306 2.29315,-2.19153 0.61795,-0.61025 0.90873,-0.99294 0.51781,0.0365 -0.037,0.0974 -0.074,0.19481 -0.11096,0.29221 -0.037,0.0974 -0.074,0.1948 -0.11095,0.2922 -0.20473,0.53913 -0.57829,1.13557 -1.07261,1.46102 -0.77021,0.50708 -1.26944,1.44864 -2.10823,1.8628 -0.33947,0.16763 -0.6944,0.2333 -1.03562,0.40179 -0.34243,0.16909 0.66599,0.28819 0.85069,0.32873 1.85687,0.40749 -1.50262,0.58441 -1.92329,0.58441 -0.6938,0 -1.04071,-0.14309 -1.59041,0.18263 -0.18787,0.11131 0.87427,0.53793 0.92465,0.54788 0.43341,0.0856 0.82005,0.36525 1.29453,0.36525 0.78777,0 -1.64325,0.24264 -2.33015,0.0731 -0.57575,-0.14215 -1.12135,-0.25859 -1.70136,-0.40179 -0.29434,-0.0727 -0.58965,-0.0279 -0.85069,0.0365 -0.0519,0.0128 0.037,0.75369 0.037,0.84009 0,0.54096 -0.1434,0.96316 -0.40685,0.18263 -0.14193,-0.42047 -0.40686,-0.86438 -0.40686,-1.31492 0,-0.28528 -0.38147,0.42924 -0.55479,0.65746 -0.24407,0.32138 -0.7248,0.78161 -0.8137,0.80356 -0.0121,0.003 0.23931,-0.50702 0.33287,-0.87662 0.0703,-0.27771 0.52458,-1.02104 0.22192,-1.09576 -0.28262,-0.0698 -0.67204,-0.0159 -0.96164,-0.0731 -0.42953,-0.0848 -0.89007,-0.16554 -1.29453,-0.36525 -0.78276,-0.38651 -2.00472,-0.74149 -2.84795,-0.94967 -0.0777,-0.0192 -1.3491,-1.36881 -0.14795,-0.18262 0.7929,0.78302 2.03043,1.31492 3.14385,1.31492 0.35677,0 0.88662,-0.13671 1.22055,-0.21916 0.20112,-0.0496 0.47898,-0.34992 0.70274,-0.4383 0.24283,-0.0959 -0.38736,-0.34947 -0.5548,-0.54788 -0.0616,-0.0731 -0.12328,-0.14611 -0.18493,-0.21916 -0.66303,-0.78573 -0.89577,-1.87081 -1.66438,-2.62984 -0.12365,-0.12211 -1.92588,-2.19974 -1.07261,-1.49755 0.8823,0.72609 1.69774,1.3716 2.4411,2.22806 0.38119,0.43918 0.70895,1.01212 1.07261,1.46103 0.36592,0.45169 0.28875,-0.0942 0.18493,-0.40178 -0.22258,-0.6594 -0.11096,-1.57575 -0.11096,-2.26459 0,-0.91357 0.47782,0.93782 0.51781,1.09577 0.11494,0.45405 0.35266,1.04537 0.70274,0.58441 0.36173,-0.47629 0.40685,-0.56634 0.40685,0.0365 0,0.0487 0,0.0974 0,0.1461 0,0.22669 -0.0122,0.48773 0.037,0.73051 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <g
+ transform="translate(461.6971,-517.2066)"
+ style="opacity:0.31666661"
+ id="g7642">
+ <path
+ sodipodi:type="arc"
+ style="fill:#a3a4a0;fill-opacity:1;stroke:none"
+ id="path7644"
+ sodipodi:cx="-127.456"
+ sodipodi:cy="68.682877"
+ sodipodi:rx="1.767767"
+ sodipodi:ry="1.5909903"
+ d="m -125.68823,68.682877 c 0,0.878679 -0.79146,1.59099 -1.76777,1.59099 -0.97631,0 -1.76777,-0.712311 -1.76777,-1.59099 0,-0.87868 0.79146,-1.590991 1.76777,-1.590991 0.97631,0 1.76777,0.712311 1.76777,1.590991 z"
+ transform="matrix(1,0,0,1.055556,-0.176777,-4.08088)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#a3a4a0;fill-opacity:1;stroke:none"
+ id="path7646"
+ sodipodi:cx="-127.456"
+ sodipodi:cy="68.682877"
+ sodipodi:rx="1.767767"
+ sodipodi:ry="1.5909903"
+ d="m -125.68823,68.682877 c 0,0.878679 -0.79146,1.59099 -1.76777,1.59099 -0.97631,0 -1.76777,-0.712311 -1.76777,-1.59099 0,-0.87868 0.79146,-1.590991 1.76777,-1.590991 0.97631,0 1.76777,0.712311 1.76777,1.590991 z"
+ transform="matrix(1,0,0,1.055556,1.767771,-0.103439)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#a3a4a0;fill-opacity:1;stroke:none"
+ id="path7648"
+ sodipodi:cx="-127.456"
+ sodipodi:cy="68.682877"
+ sodipodi:rx="1.767767"
+ sodipodi:ry="1.5909903"
+ d="m -125.68823,68.682877 c 0,0.878679 -0.79146,1.59099 -1.76777,1.59099 -0.97631,0 -1.76777,-0.712311 -1.76777,-1.59099 0,-0.87868 0.79146,-1.590991 1.76777,-1.590991 0.97631,0 1.76777,0.712311 1.76777,1.590991 z"
+ transform="matrix(0.65,0,0,0.686111,-40.27856,25.21363)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#a3a4a0;fill-opacity:1;stroke:none"
+ id="path7651"
+ sodipodi:cx="-127.456"
+ sodipodi:cy="68.682877"
+ sodipodi:rx="1.767767"
+ sodipodi:ry="1.5909903"
+ d="m -125.68823,68.682877 c 0,0.878679 -0.79146,1.59099 -1.76777,1.59099 -0.97631,0 -1.76777,-0.712311 -1.76777,-1.59099 0,-0.87868 0.79146,-1.590991 1.76777,-1.590991 0.97631,0 1.76777,0.712311 1.76777,1.590991 z"
+ transform="matrix(1.55,0,0,1.636111,63.02973,-45.53725)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#a3a4a0;fill-opacity:1;stroke:none"
+ id="path7653"
+ sodipodi:cx="-127.456"
+ sodipodi:cy="68.682877"
+ sodipodi:rx="1.767767"
+ sodipodi:ry="1.5909903"
+ d="m -125.68823,68.682877 c 0,0.878679 -0.79146,1.59099 -1.76777,1.59099 -0.97631,0 -1.76777,-0.712311 -1.76777,-1.59099 0,-0.87868 0.79146,-1.590991 1.76777,-1.590991 0.97631,0 1.76777,0.712311 1.76777,1.590991 z"
+ transform="matrix(1.8,0,0,1.9,89.14849,-57.50565)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#a3a4a0;fill-opacity:1;stroke:none"
+ id="path7655"
+ sodipodi:cx="-127.456"
+ sodipodi:cy="68.682877"
+ sodipodi:rx="1.767767"
+ sodipodi:ry="1.5909903"
+ d="m -125.68823,68.682877 c 0,0.878679 -0.79146,1.59099 -1.76777,1.59099 -0.97631,0 -1.76777,-0.712311 -1.76777,-1.59099 0,-0.87868 0.79146,-1.590991 1.76777,-1.590991 0.97631,0 1.76777,0.712311 1.76777,1.590991 z"
+ transform="matrix(1.4,0,0,1.477778,42.32034,-25.70873)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#a3a4a0;fill-opacity:1;stroke:none"
+ id="path7657"
+ sodipodi:cx="-127.456"
+ sodipodi:cy="68.682877"
+ sodipodi:rx="1.767767"
+ sodipodi:ry="1.5909903"
+ d="m -125.68823,68.682877 c 0,0.878679 -0.79146,1.59099 -1.76777,1.59099 -0.97631,0 -1.76777,-0.712311 -1.76777,-1.59099 0,-0.87868 0.79146,-1.590991 1.76777,-1.590991 0.97631,0 1.76777,0.712311 1.76777,1.590991 z"
+ transform="matrix(1.4,0,0,1.477778,40.72936,-32.28484)" />
+ </g>
+ <path
+ transform="translate(490.9094,-504.2577)"
+ d="m -161.83907,69.52256 c 0,0.366117 -0.2968,0.662913 -0.66291,0.662913 -0.36612,0 -0.66292,-0.296796 -0.66292,-0.662913 0,-0.366116 0.2968,-0.662912 0.66292,-0.662912 0.36611,0 0.66291,0.296796 0.66291,0.662912 z"
+ sodipodi:ry="0.66291261"
+ sodipodi:rx="0.66291261"
+ sodipodi:cy="69.52256"
+ sodipodi:cx="-162.50198"
+ id="path7659"
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ </g>
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#888a85;stroke-width:0.7221877;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path7661"
+ sodipodi:cx="-56.25"
+ sodipodi:cy="0.24999997"
+ sodipodi:rx="9.75"
+ sodipodi:ry="9.75"
+ d="M -46.5,0.24999997 C -46.5,5.6347763 -50.865224,10 -56.25,10 -61.634776,10 -66,5.6347763 -66,0.24999997 -66,-5.1347763 -61.634776,-9.5 -56.25,-9.5 c 5.384776,0 9.75,4.3652237 9.75,9.74999997 z"
+ transform="matrix(1.386488,0,0,1.386488,445.0082,-446.3649)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#ffffff;stroke-width:0.76089418;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path7663"
+ sodipodi:cx="-32"
+ sodipodi:cy="-17.5"
+ sodipodi:rx="9.5"
+ sodipodi:ry="9.5"
+ d="m -22.5,-17.5 c 0,5.246705 -4.253295,9.5 -9.5,9.5 -5.246705,0 -9.5,-4.253295 -9.5,-9.5 0,-5.246705 4.253295,-9.5 9.5,-9.5 5.246705,0 9.5,4.253295 9.5,9.5 z"
+ transform="matrix(0.778069,-1.061297,1.061298,0.778071,410.4716,-466.346)" />
+ </g>
+ </g>
+ <g
+ id="g3397"
+ transform="matrix(0.93551831,0,0,0.93551831,-5.4800873,1005.5951)">
+ <path
+ d="m 44.210471,16.545496 c 0,9.062868 -9.048536,16.409773 -20.21047,16.409773 -11.161935,0 -20.2104714,-7.346905 -20.2104714,-16.409773 0,-9.0628668 9.0485364,-16.40977241 20.2104714,-16.40977241 11.161934,0 20.21047,7.34690561 20.21047,16.40977241 z"
+ style="fill:url(#radialGradient2996)"
+ id="path2891" />
+ <path
+ d="m 41.53609,42.999977 c 0,2.692387 -7.40346,4.874998 -16.53609,4.874998 -9.13263,0 -16.5360902,-2.182611 -16.5360902,-4.874998 0,-2.692387 7.4034602,-4.874998 16.5360902,-4.874998 9.13263,0 16.53609,2.182611 16.53609,4.874998 z"
+ style="opacity:0.8;fill:url(#radialGradient2993)"
+ id="path2893" />
+ <path
+ d="m 21.0022,40.502514 0,1.383004 c 0,1.383004 1.41073,2.612342 2.9978,2.612342 1.587071,0 2.997799,-1.229338 2.997799,-2.612342 l 0,-1.383004 -5.995599,0 z"
+ style="fill:url(#linearGradient2990);stroke:#565656;stroke-width:1"
+ id="path2895" />
+ <path
+ d="m 23.835146,28.498489 c -3.26679,-0.0079 -6.971431,0.956981 -4.963971,2.781027 -0.497724,0.201695 -1.209183,0.652152 -1.125314,1.706225 0.04631,0.550494 0.627148,0.88841 1.421489,1.136517 -0.900504,0.634496 -1.4735,1.304983 -1.421489,1.923336 0.04576,0.544076 0.61438,0.916665 1.392479,1.165659 -0.877813,0.627195 -1.443778,1.313462 -1.392479,1.923337 0.0784,0.932091 2.079601,1.97616 6.412913,1.855912 3.119933,-0.08543 5.873101,-0.647189 6.090386,-1.855912 0.08532,-0.474625 -0.301362,-0.91747 -0.899309,-1.311366 0.447626,-0.453222 0.761216,-0.912917 0.725249,-1.340508 -0.04598,-0.546638 -0.607907,-0.917007 -1.392478,-1.165658 0.877813,-0.627195 1.443777,-1.313462 1.392478,-1.923336 -0.04598,-0.54664 -0.607907,-0.887866 -1.392478,-1.136518 0.88828,-0.630582 1.444108,-1.309539 1.392478,-1.923337 -0.05739,-0.682277 -3.169609,-1.827935 -6.239954,-1.835378 z"
+ style="fill:#aeae57;stroke:url(#linearGradient2987);stroke-width:2"
+ id="path2897" />
+ <path
+ d="m 30.173604,39.09069 c -0.217286,1.208725 -3.292412,1.890831 -8.214327,1.643249 -3.117187,-0.1568 -3.29556,-1.032919 -3.078276,-2.241643 0.217286,-1.208726 2.923176,-2.055679 6.039934,-1.890522 3.116758,0.165157 5.469953,1.280192 5.252669,2.488916 z"
+ style="fill:url(#linearGradient2982);stroke:url(#linearGradient2984);stroke-width:0.08828904"
+ id="path2899" />
+ <path
+ d="m 29.994936,36.439584 c 0.114839,1.365262 -2.552269,3.063723 -5.957153,3.79362 -3.404884,0.729897 -6.258183,0.214832 -6.373022,-1.150429 -0.114839,-1.365262 2.552269,-3.063723 5.957153,-3.79362 3.404884,-0.729897 6.258183,-0.214832 6.373022,1.150429 l 0,0 z"
+ style="fill:url(#linearGradient2977);stroke:url(#linearGradient2979);stroke-width:0.08828909"
+ id="path2901" />
+ <path
+ d="m 29.994936,33.364031 c 0.114839,1.365262 -2.552269,3.063723 -5.957153,3.79362 -3.404884,0.729897 -6.258183,0.214832 -6.373022,-1.150429 -0.114839,-1.365262 2.552269,-3.063723 5.957153,-3.79362 3.404884,-0.729897 6.258183,-0.214832 6.373022,1.150429 l 0,0 z"
+ style="fill:url(#linearGradient2972);stroke:url(#linearGradient2974);stroke-width:0.08828909"
+ id="path2903" />
+ <path
+ d="m 29.95391,30.45333 c 0,1.36942 -2.512998,2.89925 -5.916126,3.628771 -3.403128,0.729521 -6.258242,0.214128 -6.373022,-1.150429 -0.11478,-1.364557 2.212069,-2.956163 5.617159,-3.1416 3.432075,-0.186903 6.671989,-0.04364 6.671989,0.663258 z"
+ style="fill:url(#linearGradient2967);stroke:url(#linearGradient2969);stroke-width:0.08828908"
+ id="path2905" />
+ <path
+ d="m 21.495434,35.516215 c 0,0.598253 -0.482791,1.083232 -1.078344,1.083232 -0.595554,0 -1.078345,-0.484979 -1.078345,-1.083232 0,-0.598253 0.482791,-1.083233 1.078345,-1.083233 0.595553,0 1.078344,0.48498 1.078344,1.083233 z"
+ style="fill:#ffffff"
+ id="path2907" />
+ <path
+ d="m 18.722092,34.171692 c 3.357318,0.501416 6.902552,-0.03246 9.764259,-1.895762 0.802402,-0.522457 0.923091,-1.119601 1.292329,-1.586673 -1.40857,1.1196 -4.971021,4.134963 -11.056588,3.482435 z"
+ style="fill:#000000;fill-opacity:0.23391807;fill-rule:evenodd"
+ id="path2909" />
+ <path
+ d="m 21.495434,38.504493 c 0,0.598253 -0.482791,1.083232 -1.078344,1.083232 -0.595554,0 -1.078345,-0.484979 -1.078345,-1.083232 0,-0.598253 0.482791,-1.083233 1.078345,-1.083233 0.595553,0 1.078344,0.48498 1.078344,1.083233 z"
+ style="fill:#ffffff"
+ id="path2911" />
+ <path
+ d="m 18.84517,40.271106 c 3.357319,0.501415 6.902552,-0.03246 9.764259,-1.895763 0.802403,-0.522456 0.923092,-1.119599 1.292329,-1.586672 -1.408569,1.119599 -4.97102,4.134962 -11.056588,3.482435 z"
+ style="fill:#000000;fill-opacity:0.23391807;fill-rule:evenodd"
+ id="path2913" />
+ <path
+ d="m 18.865684,37.180187 c 3.357318,0.501416 6.902551,-0.03246 9.764258,-1.895763 0.802403,-0.522456 0.923092,-1.119599 1.29233,-1.586672 -1.40857,1.119599 -4.971021,4.134962 -11.056588,3.482435 z"
+ style="fill:#000000;fill-opacity:0.23391807;fill-rule:evenodd"
+ id="path2915" />
+ <path
+ d="m 18.455672,30.967846 c 0,-0.783415 1.502387,-1.72053 5.295422,-1.668083 3.514168,0.04859 5.829116,0.886614 5.829116,2.140524 0,1.227316 -3.072688,2.048051 -6.348862,1.883507 -3.276173,-0.164544 -4.775676,-1.128632 -4.775676,-2.355948 z"
+ style="fill:url(#linearGradient2957);stroke:url(#linearGradient2959);stroke-width:0.08828903"
+ id="path2917" />
+ <path
+ d="m 24,2.4934387 c -7.465638,0 -13.52799,5.9144368 -13.52799,13.1979183 0,7.466149 5.479974,8.293052 5.479974,11.044668 0,3.232977 3.212906,6.899082 8.495922,6.766744 5.617685,-0.140719 7.936039,-3.329266 7.936039,-6.766744 0,-2.938853 5.144044,-3.017226 5.144044,-11.044668 C 37.527989,8.4078755 31.465638,2.4934387 24,2.4934387 z"
+ style="fill:url(#radialGradient2952);stroke:url(#linearGradient2954);stroke-width:0.98750001"
+ id="path2919" />
+ <path
+ d="m 24,3.5480659 c -6.957882,0 -12.607919,5.5121823 -12.607919,12.3002971 0,6.958358 5.107268,7.729022 5.107268,10.293494 0,3.013096 2.994388,6.429859 7.918095,6.306522 5.235612,-0.13115 7.39629,-3.102835 7.39629,-6.306522 0,-2.738974 4.794185,-2.812018 4.794185,-10.293494 C 36.607919,9.0602482 30.957882,3.5480659 24,3.5480659 z"
+ style="fill:none;stroke:url(#linearGradient2949);stroke-width:0.92033798"
+ id="path2921" />
+ <path
+ d="m 29.53101,19.070048 c 0.293196,0.09663 0.48866,0.386524 0.390927,0.676416 l -3.616075,10.726009 c -0.09773,0.289892 -0.390927,0.483153 -0.684123,0.386523 -0.293194,-0.09663 -0.488657,-0.386523 -0.390926,-0.676415 l 3.616075,-10.726009 c 0.09773,-0.289892 0.390928,-0.483154 0.684122,-0.386524 z"
+ style="fill:url(#linearGradient2946)"
+ id="path2923" />
+ <path
+ d="m 18.473303,19.185915 c -0.293196,0.09663 -0.48866,0.386524 -0.390927,0.676416 l 3.616075,10.726009 c 0.09773,0.289893 0.390927,0.483154 0.684123,0.386523 0.293194,-0.09663 0.488658,-0.386523 0.390926,-0.676414 l -3.616075,-10.72601 c -0.09773,-0.289892 -0.390928,-0.483154 -0.684122,-0.386524 z"
+ style="fill:url(#linearGradient2943)"
+ id="path2925" />
+ <path
+ d="m 18.569826,19.116755 c -0.230541,0.03899 -0.411146,0.2175 -0.450665,0.44543 -0.03952,0.227929 0.07064,0.455721 0.274884,0.568408 0,0 1.727083,1.001899 3.984375,1.506274 2.257291,0.504376 5.145844,0.537093 7.324218,-1.564207 0.164293,-0.128875 0.240462,-0.338718 0.196543,-0.541475 -0.04392,-0.202757 -0.200327,-0.363351 -0.403592,-0.414393 -0.203265,-0.05104 -0.418222,0.0163 -0.554669,0.173764 -1.828628,1.763927 -4.260786,1.765438 -6.328125,1.303506 -2.06734,-0.461932 -3.66211,-1.390407 -3.66211,-1.390407 -0.111969,-0.07396 -0.247434,-0.104868 -0.380859,-0.0869 z"
+ style="fill:#ff4600;fill-opacity:1;stroke:url(#linearGradient2940);stroke-width:0.2"
+ id="path2927" />
+ <path
+ d="m 24.306505,5.1682019 c -5.978176,0 -10.828873,3.9848174 -10.828873,8.8924001 0,1.960052 0.933021,3.676289 2.243551,5.146519 1.481923,0.625458 3.096028,1.074904 4.875985,1.074904 5.978176,0 10.828871,-3.984816 10.828873,-8.892402 0,-1.9718701 -0.948528,-3.7041538 -2.273465,-5.1790881 -1.47501,-0.6180475 -3.077416,-1.0423331 -4.846071,-1.042333 z"
+ style="opacity:0.5977654;fill:url(#linearGradient2937)"
+ id="path2929" />
+ </g>
+ </g>
+</svg>
diff --git a/data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg b/data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg
new file mode 100644
index 0000000..5bf4883
--- /dev/null
+++ b/data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="24"
+ id="svg2837"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="redshift-dark-7.svg"
+ inkscape:export-filename="/home/joern/Desktop/redshiftIconlight.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs2839">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2845" />
+ <inkscape:perspective
+ id="perspective7076"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7107"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7107-0"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7164"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7202"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-2"
+ id="radialGradient7192-2"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-2">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-4" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-9" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-9"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-4"
+ id="radialGradient7192-4"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-4">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-8" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-7" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-5"
+ id="radialGradient7192-1"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-5">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-5" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-4" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-90"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-9"
+ id="radialGradient7192-8"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-9">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-88" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-1" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7369"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-8"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-0"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-51"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-9"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-93"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-3"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-84"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7667"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7691"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7757"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7782"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810-28"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7883"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2901"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2950"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2921"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3058"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2916"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2882"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2904"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="12.50008"
+ inkscape:cy="11.54906"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer5"
+ showgrid="false"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="955"
+ inkscape:window-height="801"
+ inkscape:window-x="174"
+ inkscape:window-y="71"
+ inkscape:window-maximized="0"
+ inkscape:snap-global="false">
+ <sodipodi:guide
+ position="0,0"
+ orientation="0,24"
+ id="guide2847" />
+ <sodipodi:guide
+ position="24,0"
+ orientation="-24,0"
+ id="guide2849" />
+ <sodipodi:guide
+ position="24,24"
+ orientation="0,-24"
+ id="guide2851" />
+ <sodipodi:guide
+ position="0,24"
+ orientation="24,0"
+ id="guide2853" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid7095"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-4.6845824,12.020815"
+ id="guide7849" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-5.08233,17.987029"
+ id="guide7867" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="6.0104077,18.870912"
+ id="guide7869" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="17.987029,20.019961"
+ id="guide7871" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="9.1923882,6.0104077"
+ id="guide7873" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2842">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Ebene#1"
+ style="display:inline">
+ <g
+ id="g4255"
+ transform="matrix(0.98314262,0,0,0.98314262,0.05987544,0.20244021)"
+ style="opacity:0.4">
+ <g
+ id="g4252" />
+ </g>
+ <g
+ id="g4411">
+ <path
+ d="m 11.901568,3.515032 c -3.6085296,0 -6.5338204,2.925291 -6.5338204,6.533821 0,2.308483 1.0115514,4.239217 3.021892,5.512911 0.9197379,0.58272 2.3031584,0.94774 3.4545534,0.951673 1.249176,0.0043 2.539034,-0.235058 3.569303,-0.99251 1.631571,-1.199528 3.021893,-3.170417 3.021893,-5.472074 0,-3.60853 -2.925291,-6.533821 -6.533821,-6.533821 z m 0,-1e-7 c -3.6085297,0 -6.5338204,2.9252909 -6.5338204,6.5338201 0,2.308484 1.2145131,4.350661 3.021892,5.512912 l 0.8984002,3.634437 c 0,0 0,1.306764 2.6135282,1.306764 2.613528,0 2.613528,-1.306764 2.613528,-1.306764 l 0.8984,-3.675274 c 1.79843,-1.163919 3.021892,-3.170418 3.021892,-5.472075 0,-3.6085292 -2.925291,-6.5338201 -6.53382,-6.5338201 z"
+ style="opacity:0.24;fill:none;stroke:#43423e;stroke-width:3.70000004999999987;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ id="path4672-2-2" />
+ <path
+ d="m 11.901568,3.515032 c -3.6085296,0 -6.5338204,2.925291 -6.5338204,6.533821 0,2.308483 1.0115514,4.239217 3.021892,5.512911 0.9197379,0.58272 2.3031584,0.94774 3.4545534,0.951673 1.249176,0.0043 2.539034,-0.235058 3.569303,-0.99251 1.631571,-1.199528 3.021893,-3.170417 3.021893,-5.472074 0,-3.60853 -2.925291,-6.533821 -6.533821,-6.533821 z m 0,-3e-7 c -3.6085297,0 -6.5338204,2.9252909 -6.5338204,6.5338203 0,2.308484 1.2145131,4.350661 3.021892,5.512912 l 0.8984002,3.634437 c 0,0 0,1.306764 2.6135282,1.306764 2.613528,0 2.613528,-1.306764 2.613528,-1.306764 l 0.8984,-3.675274 c 1.79843,-1.163919 3.021892,-3.170418 3.021892,-5.472075 0,-3.6085294 -2.925291,-6.5338203 -6.53382,-6.5338203 z"
+ style="fill:none;stroke:#dfd8c8;stroke-width:1.96014606999999996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;opacity:0.4"
+ id="path4672-2" />
+ </g>
+ </g>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1028.3622)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="Ebene"
+ style="display:inline" />
+</svg>
diff --git a/data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg b/data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg
new file mode 100644
index 0000000..86ac824
--- /dev/null
+++ b/data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg
@@ -0,0 +1,460 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="24"
+ id="svg2837"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="redshift-dark-5.svg"
+ inkscape:export-filename="/home/joern/Desktop/redshiftIconlight.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs2839">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2845" />
+ <inkscape:perspective
+ id="perspective7076"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7107"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7107-0"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7164"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7202"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-2"
+ id="radialGradient7192-2"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-2">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-4" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-9" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-9"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-4"
+ id="radialGradient7192-4"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-4">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-8" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-7" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-5"
+ id="radialGradient7192-1"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-5">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-5" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-4" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-90"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-9"
+ id="radialGradient7192-8"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-9">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-88" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-1" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7369"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-8"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-0"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-51"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-9"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-93"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-3"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-84"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7667"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7691"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7757"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7782"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810-28"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7883"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2901"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2950"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2921"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3058"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2916"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2882"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2904"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="-2.4433352"
+ inkscape:cy="11.54906"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer5"
+ showgrid="false"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="955"
+ inkscape:window-height="801"
+ inkscape:window-x="174"
+ inkscape:window-y="71"
+ inkscape:window-maximized="0"
+ inkscape:snap-global="false">
+ <sodipodi:guide
+ position="0,0"
+ orientation="0,24"
+ id="guide2847" />
+ <sodipodi:guide
+ position="24,0"
+ orientation="-24,0"
+ id="guide2849" />
+ <sodipodi:guide
+ position="24,24"
+ orientation="0,-24"
+ id="guide2851" />
+ <sodipodi:guide
+ position="0,24"
+ orientation="24,0"
+ id="guide2853" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid7095"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-4.6845824,12.020815"
+ id="guide7849" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-5.08233,17.987029"
+ id="guide7867" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="6.0104077,18.870912"
+ id="guide7869" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="17.987029,20.019961"
+ id="guide7871" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="9.1923882,6.0104077"
+ id="guide7873" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2842">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Ebene#1"
+ style="display:inline">
+ <path
+ id="path4672-2-2"
+ style="fill:none;stroke:#000000;stroke-width:3.7;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;opacity:0.59999999999999998"
+ d="m 11.901568,3.515032 c -3.6085296,0 -6.5338204,2.925291 -6.5338204,6.533821 0,2.308483 1.0115514,4.239217 3.021892,5.512911 0.9197379,0.58272 2.3031584,0.94774 3.4545534,0.951673 1.249176,0.0043 2.539034,-0.235058 3.569303,-0.99251 1.631571,-1.199528 3.021893,-3.170417 3.021893,-5.472074 0,-3.60853 -2.925291,-6.533821 -6.533821,-6.533821 z m 0,-1e-7 c -3.6085297,0 -6.5338204,2.9252909 -6.5338204,6.5338201 0,2.308484 1.2145131,4.350661 3.021892,5.512912 l 0.8984002,3.634437 c 0,0 0,1.306764 2.6135282,1.306764 2.613528,0 2.613528,-1.306764 2.613528,-1.306764 l 0.8984,-3.675274 c 1.79843,-1.163919 3.021892,-3.170418 3.021892,-5.472075 0,-3.6085292 -2.925291,-6.5338201 -6.53382,-6.5338201 z" />
+ <g
+ id="g4255"
+ transform="matrix(0.98314262,0,0,0.98314262,0.05987544,0.20244021)">
+ <g
+ id="g4252" />
+ <path
+ style="fill:none;stroke:#dfd8c8;stroke-width:1.99375558;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path4672"
+ d="m 12.044735,3.3693906 c -3.6704028,0 -6.6458518,2.9754492 -6.6458518,6.6458524 0,2.348066 1.2353376,4.425259 3.0737066,5.607438 l 0.9138046,3.696755 c 0,0 0,1.32917 2.6583406,1.32917 2.658341,0 2.658341,-1.32917 2.658341,-1.32917 l 0.913804,-3.738292 c 1.829267,-1.183876 3.073707,-3.224779 3.073707,-5.565901 0,-3.6704032 -2.975449,-6.6458524 -6.645852,-6.6458524 z" />
+ </g>
+ <path
+ style="fill:none;stroke:#dfd8c8;stroke-width:1.96014607;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ id="path4672-2"
+ d="m 11.901568,3.515032 c -3.6085296,0 -6.5338204,2.925291 -6.5338204,6.533821 0,2.308483 1.0115514,4.239217 3.021892,5.512911 0.9197379,0.58272 2.3031584,0.94774 3.4545534,0.951673 1.249176,0.0043 2.539034,-0.235058 3.569303,-0.99251 1.631571,-1.199528 3.021893,-3.170417 3.021893,-5.472074 0,-3.60853 -2.925291,-6.533821 -6.533821,-6.533821 z"
+ sodipodi:nodetypes="csssssc" />
+ </g>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1028.3622)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="Ebene"
+ style="display:inline" />
+</svg>
diff --git a/data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg b/data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg
new file mode 100644
index 0000000..737fd64
--- /dev/null
+++ b/data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg
@@ -0,0 +1,525 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="24"
+ id="svg2837"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="redshiftIconlight.svg"
+ inkscape:export-filename="/home/joern/Desktop/redshiftIconlight.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs2839">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2845" />
+ <inkscape:perspective
+ id="perspective7076"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7107"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7107-0"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7164"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7202"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-2"
+ id="radialGradient7192-2"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-2">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-4" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-9" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-9"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-4"
+ id="radialGradient7192-4"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-4">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-8" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-7" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-5"
+ id="radialGradient7192-1"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-5">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-5" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-4" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-90"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-9"
+ id="radialGradient7192-8"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-9">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-88" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-1" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7369"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-8"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-0"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-51"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-9"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-93"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-3"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-84"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7667"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7691"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7757"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7782"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810-28"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7883"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="8"
+ inkscape:cx="49.496586"
+ inkscape:cy="1.9672137"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer5"
+ showgrid="false"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1440"
+ inkscape:window-height="848"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <sodipodi:guide
+ position="0,0"
+ orientation="0,24"
+ id="guide2847" />
+ <sodipodi:guide
+ position="24,0"
+ orientation="-24,0"
+ id="guide2849" />
+ <sodipodi:guide
+ position="24,24"
+ orientation="0,-24"
+ id="guide2851" />
+ <sodipodi:guide
+ position="0,24"
+ orientation="24,0"
+ id="guide2853" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid7095"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-4.6845824,12.020815"
+ id="guide7849" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-5.08233,17.987029"
+ id="guide7867" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="6.0104077,18.870912"
+ id="guide7869" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="17.987029,20.019961"
+ id="guide7871" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="9.1923882,6.0104077"
+ id="guide7873" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2842">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1028.3622)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="Ebene"
+ style="display:inline" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Ebene#1"
+ style="display:inline">
+ <path
+ style="opacity:0.6;fill:#eae3d0;fill-opacity:1;stroke:#eae3d0;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ d="m 11.510863,1.2668107 c -0.212123,0 -0.306981,0.1387472 -0.345273,0.2014092 -0.03829,0.062662 -0.04233,0.1226004 -0.05754,0.1726365 -0.03043,0.100072 -0.06871,0.2142696 -0.08632,0.345273 -0.03522,0.2620066 -0.05755,0.5978084 -0.05755,0.9782734 0,0.380465 0.02233,0.7162668 0.05755,0.9782734 0.0176,0.1310034 0.05589,0.245201 0.08632,0.345273 0.01521,0.050036 0.01925,0.1099745 0.05754,0.1726365 0.03829,0.062662 0.13315,0.2014092 0.345273,0.2014092 l 0.633001,0 0.460364,0 c 0.212123,0 0.306981,-0.1387472 0.345273,-0.2014092 0.03829,-0.062662 0.04233,-0.1226004 0.05755,-0.1726365 0.03043,-0.100072 0.06871,-0.2142696 0.08632,-0.345273 0.03522,-0.2620066 0.05755,-0.5978084 0.05755,-0.9782734 0,-0.380465 -0.02233,-0.7162668 -0.05755,-0.9782734 -0.01761,-0.1310034 -0.05589,-0.245201 -0.08632,-0.345273 -0.01522,-0.050036 -0.01925,-0.1099745 -0.05755,-0.1726365 -0.03829,-0.062662 -0.13315,-0.2014092 -0.345273,-0.2014092 l -1.093365,0 z m 0.633001,3.3951842 c -1.875109,0 -3.5762342,0.7565046 -4.8050492,1.9853197 -1.1007691,1.1007691 -1.8174891,2.5858504 -1.9565469,4.2295944 -0.027501,-0.03353 -0.065131,-0.07337 -0.086318,-0.08632 -0.062662,-0.03829 -0.1226005,-0.04233 -0.1726365,-0.05754 -0.100072,-0.03043 -0.2142696,-0.06871 -0.345273,-0.08632 -0.2620067,-0.03522 -0.5978084,-0.05755 -0.9782734,-0.05755 -0.3804651,0 -0.7162668,0.02233 -0.9782735,0.05755 -0.1310033,0.0176 -0.2452009,0.05589 -0.3452729,0.08632 -0.050036,0.01521 -0.1099745,0.01925 -0.1726365,0.05754 -0.062662,0.03829 -0.2014093,0.13315 -0.2014093,0.345273 l 0,1.093365 c 0,0.212123 0.1387473,0.306981 0.2014093,0.345273 0.062662,0.03829 0.1226004,0.04233 0.1726365,0.05755 0.100072,0.03043 0.2142696,0.06871 0.3452729,0.08632 0.2620067,0.03522 0.5978084,0.05755 0.9782735,0.05755 0.380465,0 0.7162667,-0.02233 0.9782734,-0.05755 0.1310034,-0.0176 0.245201,-0.05589 0.345273,-0.08632 0.050036,-0.01521 0.1099745,-0.01925 0.1726365,-0.05755 0.034213,-0.02091 0.098481,-0.05373 0.1438637,-0.115091 0.051534,0.346746 0.1283003,0.679486 0.230182,1.007046 0.015206,0.04889 0.041272,0.09545 0.057545,0.143864 0.01823,0.05826 0.037764,0.115059 0.057545,0.172636 0.03808,0.104002 0.07214,0.214951 0.115091,0.3165 0.015829,0.03944 0.040985,0.07601 0.057546,0.115091 0.071497,0.160061 0.118173,0.30714 0.2014092,0.460364 0.015919,0.03078 0.041161,0.05582 0.057545,0.08632 0.09074,0.161237 0.1845422,0.336402 0.2877275,0.489136 0.00725,0.0111 0.021465,0.01771 0.028773,0.02877 0.019407,0.02837 0.037722,0.05826 0.057545,0.08632 0.2210746,0.323613 0.4748727,0.610999 0.7480914,0.891955 1.26202,1.29776 3.0801933,2.504184 5.0533333,2.504184 1.598657,0 3.036377,-0.912679 4.211492,-1.813638 -0.149994,0.149994 -0.132324,0.302661 -0.115091,0.374046 0.01724,0.07138 0.0617,0.126497 0.08632,0.172637 0.04924,0.09228 0.121227,0.182643 0.201409,0.287727 0.160366,0.210167 0.363971,0.479062 0.633001,0.748092 0.269029,0.269029 0.537924,0.501407 0.748091,0.661773 0.105085,0.08019 0.195449,0.123391 0.287728,0.172636 0.04614,0.02462 0.101251,0.06908 0.172636,0.08632 0.07138,0.01724 0.224052,0.0349 0.374046,-0.115091 l 0.776864,-0.776864 c 0.149994,-0.149994 0.132323,-0.30266 0.115091,-0.374045 -0.01724,-0.07138 -0.0617,-0.126497 -0.08632,-0.172637 -0.04924,-0.09228 -0.09245,-0.182643 -0.172637,-0.287727 -0.160366,-0.210168 -0.392744,-0.479063 -0.661773,-0.748092 -0.269029,-0.269029 -0.537924,-0.472634 -0.748091,-0.633 -0.105085,-0.08019 -0.19545,-0.152164 -0.287728,-0.20141 -0.04614,-0.02462 -0.101251,-0.06908 -0.172636,-0.08632 -0.04934,-0.01191 -0.12721,-0.01046 -0.230182,0.02877 0.133815,-0.147968 0.253808,-0.301818 0.374045,-0.460364 0.09057,-0.148931 0.07867,-0.351384 -0.02877,-0.489137 0.492324,-0.761973 0.794943,-1.629932 0.9495,-2.560774 0.01963,0.0045 0.04003,0.02345 0.05755,0.02877 0.100072,0.03043 0.21427,0.06871 0.345273,0.08632 0.262007,0.03522 0.597808,0.05755 0.978273,0.05755 0.380465,0 0.716267,-0.02233 0.978274,-0.05755 0.131003,-0.0176 0.245201,-0.05589 0.345273,-0.08632 0.05003,-0.01521 0.109974,-0.01925 0.172636,-0.05754 0.06266,-0.03829 0.201409,-0.13315 0.201409,-0.345273 l 0,-1.093364 c 0,-0.212123 -0.138747,-0.306981 -0.201409,-0.345273 -0.06266,-0.03829 -0.1226,-0.04234 -0.172636,-0.05755 -0.100072,-0.03043 -0.21427,-0.06871 -0.345273,-0.08632 -0.262007,-0.03522 -0.597809,-0.05755 -0.978274,-0.05755 -0.380465,0 -0.716266,0.02233 -0.978273,0.05755 -0.120729,0.01622 -0.22222,0.0573 -0.3165,0.08632 -0.138617,-1.2620594 -0.647596,-2.4093405 -1.381092,-3.3664115 0.06584,0.012178 0.10817,0.00862 0.143863,0 0.07138,-0.017232 0.126497,-0.061696 0.172637,-0.086318 0.09228,-0.049245 0.182643,-0.092454 0.287727,-0.1726365 0.210168,-0.1603659 0.479062,-0.3927438 0.748092,-0.6617732 0.269029,-0.2690295 0.472634,-0.537924 0.633,-0.7480915 0.08019,-0.1050841 0.152164,-0.1954493 0.201409,-0.2877275 0.02462,-0.04614 0.04031,-0.1012511 0.05755,-0.1726364 0.01724,-0.071385 0.06368,-0.2240523 -0.08632,-0.3740458 L 18.90546,4.0577672 c -0.149994,-0.1499935 -0.302661,-0.132323 -0.374046,-0.115091 -0.07138,0.017232 -0.126497,0.061696 -0.172637,0.086318 -0.09228,0.049245 -0.211415,0.1212266 -0.3165,0.2014092 -0.210167,0.1603659 -0.450289,0.363971 -0.719319,0.6330005 -0.269029,0.2690294 -0.501407,0.5379239 -0.661773,0.7480914 -0.08019,0.1050842 -0.123391,0.1954493 -0.172636,0.2877275 -0.02462,0.046139 -0.06908,0.1012512 -0.08632,0.1726365 -0.0052,0.021415 7.1e-4,0.052539 0,0.086318 C 16.162841,5.9653055 15.889871,5.7997031 15.625366,5.6402684 14.603179,5.0241285 13.424384,4.6619949 12.143864,4.6619949 z M 7.3388148,6.6473146 7.540224,6.4171326 C 7.6902175,6.2671391 7.6437744,6.1144722 7.6265423,6.0430868 7.6093102,5.9717015 7.5648462,5.9165899 7.540224,5.8704504 7.4909791,5.7781722 7.4477702,5.687807 7.3675876,5.5827229 7.2072217,5.3725554 6.9748438,5.1036609 6.7058143,4.8346314 6.4367849,4.565602 6.1966631,4.3619968 5.9864956,4.201631 5.8814115,4.1214484 5.7622736,4.0494667 5.6699954,4.0002217 5.6238559,3.9755995 5.597517,3.9311356 5.5261317,3.9139035 c -0.035693,-0.00862 -0.1036682,-0.00884 -0.1726365,0 -0.068968,0.00884 -0.1551852,0.040094 -0.230182,0.115091 L 4.346449,4.8058587 C 4.1964555,4.9558522 4.2428987,5.1085191 4.260131,5.1799044 c 0.017232,0.071385 0.061696,0.126497 0.086318,0.1726365 0.049245,0.092278 0.092454,0.2114161 0.1726365,0.3165002 0.1603658,0.2101675 0.3927438,0.4502893 0.6617732,0.7193187 0.2690294,0.2690295 0.5091512,0.5014074 0.7193187,0.6617732 0.1050841,0.080183 0.224222,0.1233916 0.3165002,0.1726365 0.04614,0.024622 0.072479,0.069086 0.1438638,0.086318 0.071385,0.017232 0.252825,0.034903 0.4028184,-0.115091 L 7.3388148,6.6473146 z M 6.4756324,16.02723 c -0.071385,0.01724 -0.126497,0.0617 -0.1726365,0.08632 -0.092278,0.04925 -0.2114161,0.121226 -0.3165003,0.201409 -0.2101674,0.160366 -0.4502892,0.363971 -0.7193187,0.633 -0.2690294,0.26903 -0.5014073,0.537925 -0.6617732,0.748092 -0.080183,0.105084 -0.1233915,0.195449 -0.1726365,0.287727 -0.024622,0.04614 -0.069086,0.101252 -0.086318,0.172637 -0.017232,0.07138 -0.034903,0.224052 0.115091,0.374046 l 0.7480914,0.776864 c 0.1499935,0.149994 0.3314332,0.132323 0.4028185,0.115091 0.071385,-0.01724 0.126497,-0.0617 0.1726365,-0.08632 0.092278,-0.04924 0.1826433,-0.09245 0.2877275,-0.172636 0.2101675,-0.160366 0.479062,-0.392744 0.7480914,-0.661773 0.2690295,-0.26903 0.4726346,-0.509152 0.6330005,-0.719319 0.080182,-0.105084 0.1521643,-0.224222 0.2014092,-0.3165 0.024622,-0.04614 0.040313,-0.101252 0.057545,-0.172637 0.017232,-0.07138 0.063676,-0.224051 -0.086318,-0.374045 L 6.8496781,16.142321 C 6.6996846,15.992327 6.5470177,16.009998 6.4756324,16.02723 z m 2.5039806,1.98265 c 0,2.854452 -0.04866,3.55799 0.670352,4.24065 0.788942,0.749054 4.90207,0.771827 5.669586,-7.61e-4 0.750879,-0.755841 0.4737,-2.476062 0.4737,-4.25723 l -6.813638,0.01734 z"
+ id="path7926"
+ sodipodi:nodetypes="cssssssscccssssssscccscsssssssccssssssscsssssssssssscsssssssccsssssssssccssssssccsssssccsssssssccssssssssscccssssssssccssssssscccssssssccsssssssccccsscc" />
+ <rect
+ style="fill:#3a3935;fill-opacity:1;stroke:none"
+ id="rect7657"
+ width="2.6470928"
+ height="1.4386374"
+ x="2.4762204"
+ y="10.973947"
+ rx="3.3423133"
+ ry="0.17260009" />
+ <path
+ style="fill:#3a3935;fill-opacity:1;stroke:none"
+ d="m 12.356893,5.2190517 c -3.5109807,0 -6.3543456,2.8711131 -6.3543456,6.3820933 0,3.510981 2.8433649,6.354346 6.3543456,6.354346 2.091831,0 4.451587,-1.515552 5.194062,-2.801557 0,0 -1.511326,-0.879634 -1.558261,-3.750072 3e-6,-2.0257978 1.313096,-3.3782058 1.311203,-3.3749278 C 15.435977,5.602336 13.445296,5.2190517 12.356893,5.2190517 z"
+ id="path7356"
+ sodipodi:nodetypes="csscccc" />
+ <path
+ transform="matrix(0.80552866,-0.05090045,0.33309036,1.1343219,-1.4163082,-1.6701199)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-5"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <path
+ transform="matrix(0.2317115,-0.03569794,0.06301311,0.4090114,5.381261,7.964564)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-2"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <path
+ transform="matrix(0.07560196,-0.03056249,0.06655832,0.16464426,9.5398059,11.647215)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-8"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <path
+ transform="matrix(0.34805141,-0.5199518,0.59727893,0.22716849,-0.304213,7.8949168)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-4"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <path
+ transform="matrix(-0.44099836,1.4339535,-1.0763276,-0.24400487,28.714594,2.6361874)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-56"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <rect
+ style="fill:#3a3935;fill-opacity:1;stroke:none"
+ id="rect7657-0"
+ width="2.6470928"
+ height="1.4386374"
+ x="6.8505774"
+ y="-0.95078588"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+ <rect
+ style="fill:#3a3935;fill-opacity:1;stroke:none"
+ id="rect7657-0-4"
+ width="2.6470928"
+ height="1.4386374"
+ x="1.6418734"
+ y="-12.791093"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <rect
+ style="fill:#3a3935;fill-opacity:1;stroke:none"
+ id="rect7657-0-6"
+ width="2.6470928"
+ height="1.4386374"
+ x="7.481966"
+ y="16.063971"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+ <rect
+ style="fill:#3a3935;fill-opacity:1;stroke:none"
+ id="rect7657-0-0"
+ width="2.6470928"
+ height="1.4386374"
+ x="18.88641"
+ y="10.946954"
+ rx="3.3423133"
+ ry="0.17260009" />
+ <rect
+ style="fill:#3a3935;fill-opacity:1;stroke:none"
+ id="rect7657-0-8"
+ width="2.6470928"
+ height="1.4386374"
+ x="-26.738235"
+ y="-0.41279015"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
+ <path
+ style="fill:#3a3935;fill-opacity:1;stroke:none"
+ d="m 9.6829134,20.753986 c 0,-0.733245 -0.09979,-2.494693 -0.00418,-2.494693 0,0 1.3184246,0.665411 2.8116726,0.662912 1.332012,-0.0023 2.723282,-0.662912 2.723282,-0.662912 0.09562,0 0.04002,1.916127 0.04002,2.649372 0,0.733244 -0.717466,1.039968 -1.255358,1.323546 -0.472012,0.248847 -1.047234,0.26394 -1.580706,0.252681 -0.533175,-0.01125 -1.110463,-0.0446 -1.567761,-0.318972 -0.52358,-0.31414 -1.1669709,-0.67869 -1.1669709,-1.411934 z"
+ id="rect7657-0-4-8"
+ sodipodi:nodetypes="ccscsaaac" />
+ <rect
+ style="fill:#3a3935;fill-opacity:1;stroke:none"
+ id="rect7657-0-6-9"
+ width="2.6470928"
+ height="1.4386374"
+ x="6.9439716"
+ y="-17.524841"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+ </g>
+</svg>
diff --git a/data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg b/data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg
new file mode 100644
index 0000000..2ea5d42
--- /dev/null
+++ b/data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="24"
+ id="svg2837"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="redshift.svg"
+ inkscape:export-filename="/home/joern/Desktop/redshiftIconlight.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs2839">
+ <linearGradient
+ id="linearGradient3652">
+ <stop
+ style="stop-color:#dc0000;stop-opacity:1;"
+ offset="0"
+ id="stop3654" />
+ <stop
+ style="stop-color:#dc4300;stop-opacity:1;"
+ offset="1"
+ id="stop3656" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2845" />
+ <inkscape:perspective
+ id="perspective7076"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7107"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7107-0"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7164"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7202"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-2"
+ id="radialGradient7192-2"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-2">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-4" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-9" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-9"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-4"
+ id="radialGradient7192-4"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-4">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-8" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-7" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-5"
+ id="radialGradient7192-1"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-5">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-5" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-4" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7202-90"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7186-9"
+ id="radialGradient7192-8"
+ cx="4.0879612"
+ cy="15.890368"
+ fx="4.6574459"
+ fy="16.146029"
+ r="0.66291261"
+ gradientTransform="matrix(2.8333333,0.9,-0.43392852,1.3660713,-0.59931111,-9.4961718)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7186-9">
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0.38275862"
+ offset="0"
+ id="stop7188-88" />
+ <stop
+ style="stop-color:#eae3d0;stop-opacity:0;"
+ offset="1"
+ id="stop7190-1" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective7369"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-8"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-0"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-51"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-9"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-93"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-3"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7369-84"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7667"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7691"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7757"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7782"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7810-28"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7883"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3652"
+ id="radialGradient3658"
+ cx="11.776751"
+ cy="11.587271"
+ fx="11.776751"
+ fy="11.587271"
+ r="5.7742038"
+ gradientTransform="matrix(1,0,0,1.1028741,0,-1.1920298)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3652"
+ id="radialGradient3662"
+ cx="-25.414688"
+ cy="0.30652854"
+ fx="-25.414688"
+ fy="0.30652854"
+ r="1.3235464"
+ gradientTransform="matrix(1,0,0,0.54347825,0,0.13993694)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3652"
+ id="radialGradient3664"
+ cx="20.209955"
+ cy="11.666272"
+ fx="20.209955"
+ fy="11.666272"
+ r="1.3235464"
+ gradientTransform="matrix(1,0,0,0.54347825,0,5.3259071)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3652"
+ id="radialGradient3666"
+ cx="8.8055124"
+ cy="16.783289"
+ fx="8.8055124"
+ fy="16.783289"
+ r="1.3235464"
+ gradientTransform="matrix(1,0,0,0.54347825,0,7.6619366)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3652"
+ id="radialGradient3668"
+ cx="2.9654198"
+ cy="-12.071774"
+ fx="2.9654198"
+ fy="-12.071774"
+ r="1.3235464"
+ gradientTransform="matrix(1,0,0,0.54347825,0,-5.5110275)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3652"
+ id="radialGradient3670"
+ cx="8.1741238"
+ cy="-0.23146719"
+ fx="8.1741238"
+ fy="-0.23146719"
+ r="1.3235464"
+ gradientTransform="matrix(1,0,0,0.54347825,0,-0.10566981)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3652"
+ id="radialGradient3672"
+ cx="3.7997668"
+ cy="11.693265"
+ fx="3.7997668"
+ fy="11.693265"
+ r="1.3235464"
+ gradientTransform="matrix(1,0,0,0.54347825,0,5.3382299)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3652"
+ id="radialGradient3674"
+ cx="8.267518"
+ cy="-16.805523"
+ fx="8.267518"
+ fy="-16.805523"
+ r="1.3235464"
+ gradientTransform="matrix(1,0,0,0.54347825,0,-7.6720866)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3652"
+ id="radialGradient3676"
+ cx="12.453539"
+ cy="20.373398"
+ fx="12.453539"
+ fy="20.373398"
+ r="2.816242"
+ gradientTransform="matrix(1,0,0,0.75068297,0,5.079435)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16"
+ inkscape:cx="4.5713314"
+ inkscape:cy="2.7216751"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer5"
+ showgrid="false"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1440"
+ inkscape:window-height="848"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <sodipodi:guide
+ position="0,0"
+ orientation="0,24"
+ id="guide2847" />
+ <sodipodi:guide
+ position="24,0"
+ orientation="-24,0"
+ id="guide2849" />
+ <sodipodi:guide
+ position="24,24"
+ orientation="0,-24"
+ id="guide2851" />
+ <sodipodi:guide
+ position="0,24"
+ orientation="24,0"
+ id="guide2853" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid7095"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-4.6845824,12.020815"
+ id="guide7849" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-5.08233,17.987029"
+ id="guide7867" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="6.0104077,18.870912"
+ id="guide7869" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="17.987029,20.019961"
+ id="guide7871" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="9.1923882,6.0104077"
+ id="guide7873" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2842">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1028.3622)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="Ebene"
+ style="display:inline" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Ebene#1"
+ style="display:inline">
+ <path
+ style="opacity:0.6;fill:#eae3d0;fill-opacity:1;stroke:#eae3d0;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ d="m 11.510863,1.2668107 c -0.212123,0 -0.306981,0.1387472 -0.345273,0.2014092 -0.03829,0.062662 -0.04233,0.1226004 -0.05754,0.1726365 -0.03043,0.100072 -0.06871,0.2142696 -0.08632,0.345273 -0.03522,0.2620066 -0.05755,0.5978084 -0.05755,0.9782734 0,0.380465 0.02233,0.7162668 0.05755,0.9782734 0.0176,0.1310034 0.05589,0.245201 0.08632,0.345273 0.01521,0.050036 0.01925,0.1099745 0.05754,0.1726365 0.03829,0.062662 0.13315,0.2014092 0.345273,0.2014092 l 0.633001,0 0.460364,0 c 0.212123,0 0.306981,-0.1387472 0.345273,-0.2014092 0.03829,-0.062662 0.04233,-0.1226004 0.05755,-0.1726365 0.03043,-0.100072 0.06871,-0.2142696 0.08632,-0.345273 0.03522,-0.2620066 0.05755,-0.5978084 0.05755,-0.9782734 0,-0.380465 -0.02233,-0.7162668 -0.05755,-0.9782734 -0.01761,-0.1310034 -0.05589,-0.245201 -0.08632,-0.345273 -0.01522,-0.050036 -0.01925,-0.1099745 -0.05755,-0.1726365 -0.03829,-0.062662 -0.13315,-0.2014092 -0.345273,-0.2014092 l -1.093365,0 z m 0.633001,3.3951842 c -1.875109,0 -3.5762342,0.7565046 -4.8050492,1.9853197 -1.1007691,1.1007691 -1.8174891,2.5858504 -1.9565469,4.2295944 -0.027501,-0.03353 -0.065131,-0.07337 -0.086318,-0.08632 -0.062662,-0.03829 -0.1226005,-0.04233 -0.1726365,-0.05754 -0.100072,-0.03043 -0.2142696,-0.06871 -0.345273,-0.08632 -0.2620067,-0.03522 -0.5978084,-0.05755 -0.9782734,-0.05755 -0.3804651,0 -0.7162668,0.02233 -0.9782735,0.05755 -0.1310033,0.0176 -0.2452009,0.05589 -0.3452729,0.08632 -0.050036,0.01521 -0.1099745,0.01925 -0.1726365,0.05754 -0.062662,0.03829 -0.2014093,0.13315 -0.2014093,0.345273 l 0,1.093365 c 0,0.212123 0.1387473,0.306981 0.2014093,0.345273 0.062662,0.03829 0.1226004,0.04233 0.1726365,0.05755 0.100072,0.03043 0.2142696,0.06871 0.3452729,0.08632 0.2620067,0.03522 0.5978084,0.05755 0.9782735,0.05755 0.380465,0 0.7162667,-0.02233 0.9782734,-0.05755 0.1310034,-0.0176 0.245201,-0.05589 0.345273,-0.08632 0.050036,-0.01521 0.1099745,-0.01925 0.1726365,-0.05755 0.034213,-0.02091 0.098481,-0.05373 0.1438637,-0.115091 0.051534,0.346746 0.1283003,0.679486 0.230182,1.007046 0.015206,0.04889 0.041272,0.09545 0.057545,0.143864 0.01823,0.05826 0.037764,0.115059 0.057545,0.172636 0.03808,0.104002 0.07214,0.214951 0.115091,0.3165 0.015829,0.03944 0.040985,0.07601 0.057546,0.115091 0.071497,0.160061 0.118173,0.30714 0.2014092,0.460364 0.015919,0.03078 0.041161,0.05582 0.057545,0.08632 0.09074,0.161237 0.1845422,0.336402 0.2877275,0.489136 0.00725,0.0111 0.021465,0.01771 0.028773,0.02877 0.019407,0.02837 0.037722,0.05826 0.057545,0.08632 0.2210746,0.323613 0.4748727,0.610999 0.7480914,0.891955 1.26202,1.29776 3.0801933,2.504184 5.0533333,2.504184 1.598657,0 3.036377,-0.912679 4.211492,-1.813638 -0.149994,0.149994 -0.132324,0.302661 -0.115091,0.374046 0.01724,0.07138 0.0617,0.126497 0.08632,0.172637 0.04924,0.09228 0.121227,0.182643 0.201409,0.287727 0.160366,0.210167 0.363971,0.479062 0.633001,0.748092 0.269029,0.269029 0.537924,0.501407 0.748091,0.661773 0.105085,0.08019 0.195449,0.123391 0.287728,0.172636 0.04614,0.02462 0.101251,0.06908 0.172636,0.08632 0.07138,0.01724 0.224052,0.0349 0.374046,-0.115091 l 0.776864,-0.776864 c 0.149994,-0.149994 0.132323,-0.30266 0.115091,-0.374045 -0.01724,-0.07138 -0.0617,-0.126497 -0.08632,-0.172637 -0.04924,-0.09228 -0.09245,-0.182643 -0.172637,-0.287727 -0.160366,-0.210168 -0.392744,-0.479063 -0.661773,-0.748092 -0.269029,-0.269029 -0.537924,-0.472634 -0.748091,-0.633 -0.105085,-0.08019 -0.19545,-0.152164 -0.287728,-0.20141 -0.04614,-0.02462 -0.101251,-0.06908 -0.172636,-0.08632 -0.04934,-0.01191 -0.12721,-0.01046 -0.230182,0.02877 0.133815,-0.147968 0.253808,-0.301818 0.374045,-0.460364 0.09057,-0.148931 0.07867,-0.351384 -0.02877,-0.489137 0.492324,-0.761973 0.794943,-1.629932 0.9495,-2.560774 0.01963,0.0045 0.04003,0.02345 0.05755,0.02877 0.100072,0.03043 0.21427,0.06871 0.345273,0.08632 0.262007,0.03522 0.597808,0.05755 0.978273,0.05755 0.380465,0 0.716267,-0.02233 0.978274,-0.05755 0.131003,-0.0176 0.245201,-0.05589 0.345273,-0.08632 0.05003,-0.01521 0.109974,-0.01925 0.172636,-0.05754 0.06266,-0.03829 0.201409,-0.13315 0.201409,-0.345273 l 0,-1.093364 c 0,-0.212123 -0.138747,-0.306981 -0.201409,-0.345273 -0.06266,-0.03829 -0.1226,-0.04234 -0.172636,-0.05755 -0.100072,-0.03043 -0.21427,-0.06871 -0.345273,-0.08632 -0.262007,-0.03522 -0.597809,-0.05755 -0.978274,-0.05755 -0.380465,0 -0.716266,0.02233 -0.978273,0.05755 -0.120729,0.01622 -0.22222,0.0573 -0.3165,0.08632 -0.138617,-1.2620594 -0.647596,-2.4093405 -1.381092,-3.3664115 0.06584,0.012178 0.10817,0.00862 0.143863,0 0.07138,-0.017232 0.126497,-0.061696 0.172637,-0.086318 0.09228,-0.049245 0.182643,-0.092454 0.287727,-0.1726365 0.210168,-0.1603659 0.479062,-0.3927438 0.748092,-0.6617732 0.269029,-0.2690295 0.472634,-0.537924 0.633,-0.7480915 0.08019,-0.1050841 0.152164,-0.1954493 0.201409,-0.2877275 0.02462,-0.04614 0.04031,-0.1012511 0.05755,-0.1726364 0.01724,-0.071385 0.06368,-0.2240523 -0.08632,-0.3740458 L 18.90546,4.0577672 c -0.149994,-0.1499935 -0.302661,-0.132323 -0.374046,-0.115091 -0.07138,0.017232 -0.126497,0.061696 -0.172637,0.086318 -0.09228,0.049245 -0.211415,0.1212266 -0.3165,0.2014092 -0.210167,0.1603659 -0.450289,0.363971 -0.719319,0.6330005 -0.269029,0.2690294 -0.501407,0.5379239 -0.661773,0.7480914 -0.08019,0.1050842 -0.123391,0.1954493 -0.172636,0.2877275 -0.02462,0.046139 -0.06908,0.1012512 -0.08632,0.1726365 -0.0052,0.021415 7.1e-4,0.052539 0,0.086318 C 16.162841,5.9653055 15.889871,5.7997031 15.625366,5.6402684 14.603179,5.0241285 13.424384,4.6619949 12.143864,4.6619949 z M 7.3388148,6.6473146 7.540224,6.4171326 C 7.6902175,6.2671391 7.6437744,6.1144722 7.6265423,6.0430868 7.6093102,5.9717015 7.5648462,5.9165899 7.540224,5.8704504 7.4909791,5.7781722 7.4477702,5.687807 7.3675876,5.5827229 7.2072217,5.3725554 6.9748438,5.1036609 6.7058143,4.8346314 6.4367849,4.565602 6.1966631,4.3619968 5.9864956,4.201631 5.8814115,4.1214484 5.7622736,4.0494667 5.6699954,4.0002217 5.6238559,3.9755995 5.597517,3.9311356 5.5261317,3.9139035 c -0.035693,-0.00862 -0.1036682,-0.00884 -0.1726365,0 -0.068968,0.00884 -0.1551852,0.040094 -0.230182,0.115091 L 4.346449,4.8058587 C 4.1964555,4.9558522 4.2428987,5.1085191 4.260131,5.1799044 c 0.017232,0.071385 0.061696,0.126497 0.086318,0.1726365 0.049245,0.092278 0.092454,0.2114161 0.1726365,0.3165002 0.1603658,0.2101675 0.3927438,0.4502893 0.6617732,0.7193187 0.2690294,0.2690295 0.5091512,0.5014074 0.7193187,0.6617732 0.1050841,0.080183 0.224222,0.1233916 0.3165002,0.1726365 0.04614,0.024622 0.072479,0.069086 0.1438638,0.086318 0.071385,0.017232 0.252825,0.034903 0.4028184,-0.115091 L 7.3388148,6.6473146 z M 6.4756324,16.02723 c -0.071385,0.01724 -0.126497,0.0617 -0.1726365,0.08632 -0.092278,0.04925 -0.2114161,0.121226 -0.3165003,0.201409 -0.2101674,0.160366 -0.4502892,0.363971 -0.7193187,0.633 -0.2690294,0.26903 -0.5014073,0.537925 -0.6617732,0.748092 -0.080183,0.105084 -0.1233915,0.195449 -0.1726365,0.287727 -0.024622,0.04614 -0.069086,0.101252 -0.086318,0.172637 -0.017232,0.07138 -0.034903,0.224052 0.115091,0.374046 l 0.7480914,0.776864 c 0.1499935,0.149994 0.3314332,0.132323 0.4028185,0.115091 0.071385,-0.01724 0.126497,-0.0617 0.1726365,-0.08632 0.092278,-0.04924 0.1826433,-0.09245 0.2877275,-0.172636 0.2101675,-0.160366 0.479062,-0.392744 0.7480914,-0.661773 0.2690295,-0.26903 0.4726346,-0.509152 0.6330005,-0.719319 0.080182,-0.105084 0.1521643,-0.224222 0.2014092,-0.3165 0.024622,-0.04614 0.040313,-0.101252 0.057545,-0.172637 0.017232,-0.07138 0.063676,-0.224051 -0.086318,-0.374045 L 6.8496781,16.142321 C 6.6996846,15.992327 6.5470177,16.009998 6.4756324,16.02723 z m 2.5039806,1.98265 c 0,2.854452 -0.04866,3.55799 0.670352,4.24065 0.788942,0.749054 4.90207,0.771827 5.669586,-7.61e-4 0.750879,-0.755841 0.4737,-2.476062 0.4737,-4.25723 l -6.813638,0.01734 z"
+ id="path7926"
+ sodipodi:nodetypes="cssssssscccssssssscccscsssssssccssssssscsssssssssssscsssssssccsssssssssccssssssccsssssccsssssssccssssssssscccssssssssccssssssscccssssssccsssssssccccsscc" />
+ <rect
+ style="fill:url(#radialGradient3672);fill-opacity:1.0;stroke:none"
+ id="rect7657"
+ width="2.6470928"
+ height="1.4386374"
+ x="2.4762204"
+ y="10.973947"
+ rx="3.3423133"
+ ry="0.17260009" />
+ <path
+ style="fill:url(#radialGradient3658);fill-opacity:1;stroke:none"
+ d="m 12.356893,5.2190517 c -3.5109807,0 -6.3543456,2.8711131 -6.3543456,6.3820933 0,3.510981 2.8433649,6.354346 6.3543456,6.354346 2.091831,0 4.451587,-1.515552 5.194062,-2.801557 0,0 -1.511326,-0.879634 -1.558261,-3.750072 3e-6,-2.0257978 1.313096,-3.3782058 1.311203,-3.3749278 C 15.435977,5.602336 13.445296,5.2190517 12.356893,5.2190517 z"
+ id="path7356"
+ sodipodi:nodetypes="csscccc" />
+ <path
+ transform="matrix(0.80552866,-0.05090045,0.33309036,1.1343219,-1.4163082,-1.6701199)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-5"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <path
+ transform="matrix(0.2317115,-0.03569794,0.06301311,0.4090114,5.381261,7.964564)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-2"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <path
+ transform="matrix(0.07560196,-0.03056249,0.06655832,0.16464426,9.5398059,11.647215)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-8"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <path
+ transform="matrix(0.34805141,-0.5199518,0.59727893,0.22716849,-0.304213,7.8949168)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-4"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <path
+ transform="matrix(-0.44099836,1.4339535,-1.0763276,-0.24400487,28.714594,2.6361874)"
+ sodipodi:type="arc"
+ style="fill:#eae3d0;fill-opacity:1;stroke:none"
+ id="path7359-56"
+ sodipodi:cx="7.65625"
+ sodipodi:cy="15.09375"
+ sodipodi:rx="1.53125"
+ sodipodi:ry="1.40625"
+ d="m 9.1875,15.09375 a 1.53125,1.40625 0 1 1 -3.0625,0 1.53125,1.40625 0 1 1 3.0625,0 z" />
+ <rect
+ style="fill:url(#radialGradient3670);fill-opacity:1.0;stroke:none"
+ id="rect7657-0"
+ width="2.6470928"
+ height="1.4386374"
+ x="6.8505774"
+ y="-0.95078588"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+ <rect
+ style="fill:url(#radialGradient3668);fill-opacity:1.0;stroke:none"
+ id="rect7657-0-4"
+ width="2.6470928"
+ height="1.4386374"
+ x="1.6418734"
+ y="-12.791093"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <rect
+ style="fill:url(#radialGradient3666);fill-opacity:1.0;stroke:none"
+ id="rect7657-0-6"
+ width="2.6470928"
+ height="1.4386374"
+ x="7.481966"
+ y="16.063971"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+ <rect
+ style="fill:url(#radialGradient3664);fill-opacity:1.0;stroke:none"
+ id="rect7657-0-0"
+ width="2.6470928"
+ height="1.4386374"
+ x="18.88641"
+ y="10.946954"
+ rx="3.3423133"
+ ry="0.17260009" />
+ <rect
+ style="fill:url(#radialGradient3662);fill-opacity:1.0;stroke:none"
+ id="rect7657-0-8"
+ width="2.6470928"
+ height="1.4386374"
+ x="-26.738235"
+ y="-0.41279015"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
+ <path
+ style="fill:url(#radialGradient3676);fill-opacity:1.0;stroke:none"
+ d="m 9.6829134,20.753986 c 0,-0.733245 -0.09979,-2.494693 -0.00418,-2.494693 0,0 1.3184246,0.665411 2.8116726,0.662912 1.332012,-0.0023 2.723282,-0.662912 2.723282,-0.662912 0.09562,0 0.04002,1.916127 0.04002,2.649372 0,0.733244 -0.717466,1.039968 -1.255358,1.323546 -0.472012,0.248847 -1.047234,0.26394 -1.580706,0.252681 -0.533175,-0.01125 -1.110463,-0.0446 -1.567761,-0.318972 -0.52358,-0.31414 -1.1669709,-0.67869 -1.1669709,-1.411934 z"
+ id="rect7657-0-4-8"
+ sodipodi:nodetypes="ccscsaaac" />
+ <rect
+ style="fill:url(#radialGradient3674);fill-opacity:1.0;stroke:none"
+ id="rect7657-0-6-9"
+ width="2.6470928"
+ height="1.4386374"
+ x="6.9439716"
+ y="-17.524841"
+ rx="3.3423133"
+ ry="0.17260009"
+ transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+ </g>
+</svg>
diff --git a/po/LINGUAS b/po/LINGUAS
index fde03e4..3c9e5a6 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
# List of available languages
-cs da de es fi it pt_BR ru
+cs da de es eu fi fr he it ka lt pt_BR ru zh_CN
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6bd7210..ff61d9a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,8 @@
src/redshift.c
+src/config-ini.c
+
src/gamma-randr.c
src/gamma-vidmode.c
src/gamma-w32gdi.c
@@ -10,4 +12,3 @@ src/location-gnome-clock.c
src/location-manual.c
src/gtk-redshift/statusicon.py
-src/gtk-redshift/rsappindicator.py
diff --git a/po/cs.po b/po/cs.po
index 7f64848..2432d78 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-13 22:39+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-06-13 20:24+0000\n"
"Last-Translator: clever_fox <clever_fox@seznam.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-14 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Doba: Noc\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Doba: Přechod (%.2f%% den)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Doba: Den\n"
@@ -37,7 +38,7 @@ msgstr "Doba: Den\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr ""
@@ -46,13 +47,13 @@ msgstr ""
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr "Nastavení teploty barev podle denní doby.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -63,8 +64,9 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -78,7 +80,18 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -91,240 +104,284 @@ msgstr ""
" Teplota ve dně: %uK\n"
" Teplota v noci: %uK\n"
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Chyby prosím hlaste na <%s>\n"
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Dostupné metody přizpůsobení:\n"
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr ""
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Dostupní poskytovatelé polohy:\n"
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr ""
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "Inicializace %s selhala.\n"
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Zkuste `-h' pro více informací.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr ""
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Neplatný argument gamma.\n"
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Zkuste `-h' pro více informací.\n"
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, c-format
msgid "Unknown location provider `%s'.\n"
msgstr "Neznámý poskytovatel polohy `%s'.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:595
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Neznámá metoda `%s'.\n"
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Neplatný argument teploty.\n"
-#: src/redshift.c:659
-msgid "Trying other provider...\n"
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Neplatný argument gamma.\n"
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "Neznámý poskytovatel polohy `%s'.\n"
+
+#: src/redshift.c:836
+#, fuzzy
+msgid "Trying next provider...\n"
msgstr "Zkouší se jiný poskytovatel...\n"
-#: src/redshift.c:671
+#: src/redshift.c:842
+#, fuzzy, c-format
+msgid "Using provider `%s'.\n"
+msgstr "Neznámý poskytovatel polohy `%s'.\n"
+
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "Nejsou žádní další poskytovatelé polohy k vyzkoušení.\n"
-#: src/redshift.c:685
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Nebylo možné získat polohu od poskytovatele.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:694
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Poloha: %f, %f\n"
-#: src/redshift.c:701
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Zeměpisná šířka musí být mezi %.1f a %.1f.\n"
-#: src/redshift.c:710
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "Zeměpisná délka musí být mezi %.1f a %.1f.\n"
-#: src/redshift.c:719 src/redshift.c:727
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "Teplota musí být mezi %uK a %uK.\n"
-#: src/redshift.c:737
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Hodnota gamma musí být %.1f a %.1f.\n"
-#: src/redshift.c:743
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gamma: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:761
-msgid "Trying other method...\n"
+#: src/redshift.c:941
+#, fuzzy
+msgid "Trying next method...\n"
msgstr "Zkouší se jiná metoda...\n"
-#: src/redshift.c:771
+#: src/redshift.c:946
+#, fuzzy, c-format
+msgid "Using method `%s'.\n"
+msgstr "Neznámá metoda `%s'.\n"
+
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr "Nejsou další metody k vyzkoušení.\n"
-#: src/redshift.c:783 src/redshift.c:904
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr "Nebylo možné načíst systémový čas.\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:792
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Solarní elevace: %f\n"
-#: src/redshift.c:799 src/redshift.c:971
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Teplota barev: %uK\n"
-#: src/redshift.c:804 src/redshift.c:815 src/redshift.c:979
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "Přizpůsobení barev selhalo.\n"
-#: 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:343
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+#, fuzzy
+msgid "Malformed assignment in config file.\n"
+msgstr "Nevhodný argument.\n"
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
+#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
+#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
msgid "`%s' returned error %d\n"
msgstr "`%s' vrátila chybu %d\n"
-#: src/gamma-randr.c:74
+#: src/gamma-randr.c:77
#, c-format
msgid "Unsupported RANDR version (%u.%u)\n"
msgstr "Nepodporovaná verze RANDR (%u.%u)\n"
-#: src/gamma-randr.c:108
+#: src/gamma-randr.c:111
#, c-format
msgid "Screen %i could not be found.\n"
msgstr "Obrazovka %i nebyla nalezena.\n"
-#: src/gamma-randr.c:174 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Velikost gamma ramp je příliš malá: %i\n"
-#: src/gamma-randr.c:247
+#: src/gamma-randr.c:250
#, c-format
msgid "Unable to restore CRTC %i\n"
msgstr "Nebylo možné obnovit CRTC %i\n"
-#: src/gamma-randr.c:268
+#: src/gamma-randr.c:271
msgid "Adjust gamma ramps with the X RANDR extension.\n"
msgstr ""
#. TRANSLATORS: RANDR help output
#. left column must not be translated
-#: src/gamma-randr.c:273
+#: src/gamma-randr.c:276
msgid ""
" screen=N\tX screen to apply adjustments to\n"
" crtc=N\tCRTC to apply adjustments to\n"
msgstr ""
-#: src/gamma-randr.c:282 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr "Chybějící hodnota parametru: `%s'.\n"
-#: src/gamma-randr.c:292 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr "Neznámý parametr metody: `%s'.\n"
-#: src/gamma-randr.c:306
+#: src/gamma-randr.c:309
#, c-format
msgid "CRTC %d does not exist. "
msgstr "CRTC %d neexistuje. "
-#: src/gamma-randr.c:309
+#: src/gamma-randr.c:312
#, c-format
msgid "Valid CRTCs are [0-%d].\n"
msgstr "Platné CRTCs jsou [0-%d].\n"
-#: src/gamma-randr.c:312
+#: src/gamma-randr.c:315
#, c-format
msgid "Only CRTC 0 exists.\n"
msgstr "Existuje pouze CRTC 0.\n"
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr "Požadavek na X selhal: %s\n"
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr ""
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr ""
@@ -352,28 +409,29 @@ msgstr "Není možné obnovit gamma ramp.\n"
msgid "Unable to set gamma ramps.\n"
msgstr "Není možné nastavit gamma ramp.\n"
-#: src/location-gnome-clock.c:46
-msgid "Cannot list dirs in `/apps/panel/applets'.\n"
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
+msgstr "Chyba při čtení seznamu měst: `%s'.\n"
+
+#: src/location-gnome-clock.c:83
+#, fuzzy
+msgid "Cannot list GNOME panel applets.\n"
msgstr "Není možné zobrazit adresáře v `/apps/panel/applets'.\n"
-#: src/location-gnome-clock.c:78
+#: src/location-gnome-clock.c:125
msgid "No clock applet was found.\n"
msgstr "Nebyl nalezen žádný applet hodin.\n"
-#: src/location-gnome-clock.c:86
-#, c-format
-msgid "Error reading city list: `%s'.\n"
-msgstr "Chyba při čtení seznamu měst: `%s'.\n"
-
-#: src/location-gnome-clock.c:106
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr "Není zvoleno současné město.\n"
-#: src/location-gnome-clock.c:113
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr "Tato lokace není ve městě definována.\n"
-#: src/location-gnome-clock.c:140
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr ""
@@ -401,6 +459,10 @@ msgstr "Nevhodný argument.\n"
msgid "Too many arguments.\n"
msgstr "Příliš mnoho argumentů.\n"
-#: src/gtk-redshift/statusicon.py:61 src/gtk-redshift/rsappindicator.py:70
+#: src/gtk-redshift/statusicon.py:91
msgid "Toggle"
msgstr "Přepnout"
+
+#: src/gtk-redshift/statusicon.py:95
+msgid "Autostart"
+msgstr ""
diff --git a/po/da.po b/po/da.po
index 81a4cf4..7da6aec 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-08-18 21:23+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Danish <da@li.org>\n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Periode: Nat\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Periode: Overgang (%.2f%% dag)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Periode: Dag\n"
@@ -37,20 +38,20 @@ msgstr "Periode: Dag\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, 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:275
+#: src/redshift.c:276
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:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -61,8 +62,10 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
+#, fuzzy
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -87,7 +90,18 @@ msgstr ""
" -t DAG:NAT\tFarvetemperatur som sættes hhv. dag og nat\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -100,174 +114,207 @@ msgstr ""
" Dagtemperatur: %uK\n"
" Nattemperatur: %uK\n"
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Rapporter venligst fejl til <%s>\n"
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Tilgængelige justeringsmetoder:\n"
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr "Specificer indstillinger separeret med kolon: `-m METODE:VALG'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr "Prøv `-m METODE:help' for at få hjælp.\n"
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Tilgængelige metoder til placeringsopdatering:\n"
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr "Specificer indstillinger separeret med kolon: `-l METODE:VALG'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr "Prøv `-l METODE:help' for at få hjælp.\n"
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "Fejl under klargøring af %s.\n"
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr "Kunne ikke sætte indstilling %s.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr "Prøv `-l %s:help' for mere information.\n"
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr "Kunne ikke starte placeringsmetode %s.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Prøv `-m %s:help' for mere information.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr "Prøv `-m %s:help' for mere information.\n"
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "Kunne ikke starte justeringsmetode %s.\n"
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Fejl i gamma-argument.\n"
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Prøv `-h' for mere information.\n"
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, c-format
msgid "Unknown location provider `%s'.\n"
msgstr "Ukendt metode til placeringsopdatering `%s'.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:595
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Ukendt justeringsmetode `%s'.\n"
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Fejl i temperaturargument.\n"
-#: src/redshift.c:659
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Fejl i gamma-argument.\n"
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "Ukendt metode til placeringsopdatering `%s'.\n"
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr "Prøver næste placeringsmetode...\n"
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr "Bruger placeringsmetoden `%s'.\n"
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "Ikke flere metoder til placeringsopdateringer kan prøves.\n"
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Kan ikke modtage placeringsopdatering.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Placering: %f°, %f°\n"
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Breddegrad skal være mellem %.1f° og %.1f°.\n"
-#: src/redshift.c:712
+#: src/redshift.c:889
#, 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:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "Temperatur skal være mellem %uK og %uK.\n"
-#: src/redshift.c:739
+#: src/redshift.c:916
#, 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:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gamma: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr "Prøver næste farvejusteringsmetode...\n"
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr "Bruger farvejusteringsmetoden `%s'.\n"
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr "Der er ikke flere justeringsmetoder som kan prøves.\n"
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr "Kan ikke læse systemtid.\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Solhøjde: %f°\n"
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Farvetemperatur: %uK\n"
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "Fejl ved justering af temperatur.\n"
+#: src/config-ini.c:109
+#, fuzzy
+msgid "Malformed section header in config file.\n"
+msgstr "Fejl i placeringsargument.\n"
+
+#: src/config-ini.c:145
+#, fuzzy
+msgid "Malformed assignment in config file.\n"
+msgstr "Fejl i parameteren.\n"
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -284,7 +331,7 @@ msgstr "Ikke-understøttet RANDR version (%u.%u)\n"
msgid "Screen %i could not be found.\n"
msgstr "Skærm %i kunne ikke findes.\n"
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Størrelsen på gammarampen er for lille: %i\n"
@@ -308,12 +355,12 @@ msgstr ""
" screen=N\tX sckærm som skal justeres\n"
" crtc=N\tCRTC som skal justeres\n"
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr "Manglende værdi for parameter: `%s'.\n"
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr "Ukendt parameter til justeringsmetode: `%s'.\n"
@@ -333,19 +380,19 @@ msgstr "Gyldige CRTCer er [0-%d].\n"
msgid "Only CRTC 0 exists.\n"
msgstr "Kun CRTC 0 eksisterer.\n"
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr "Fejl ved X forespørgsel: %s\n"
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr "Juster gammaramper med X VidMode udvidelsen.\n"
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr " screen=N\tX skærm som skal justeres\n"
@@ -373,28 +420,28 @@ msgstr "Kan ikke genskabe gammaramper.\n"
msgid "Unable to set gamma ramps.\n"
msgstr "Kan ikke sætte gammaramper.\n"
-#: src/location-gnome-clock.c:47
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
+msgstr "Fejl ved læsning af liste over byer: `%s'.\n"
+
+#: src/location-gnome-clock.c:83
msgid "Cannot list GNOME panel applets.\n"
msgstr "Kan ikke hente liste over GNOMEs panelprogrammer.\n"
-#: src/location-gnome-clock.c:81
+#: src/location-gnome-clock.c:125
msgid "No clock applet was found.\n"
msgstr "Fandt intet ur i panelet.\n"
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
-msgstr "Fejl ved læsning af liste over byer: `%s'.\n"
-
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr "Ingen by er valgt som den gældende by.\n"
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr "Placering er ikke specificeret for byen.\n"
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr ""
"Brug placering som er indstillet i panelprogrammet i GNOME som viser "
@@ -434,9 +481,6 @@ msgstr "Slå til/fra"
msgid "Autostart"
msgstr "Automatisk opstart"
-#~ msgid "Malformed location argument.\n"
-#~ msgstr "Fejl i placeringsargument.\n"
-
#~ msgid "RANDR method was not enabled at compile time.\n"
#~ msgstr "RANDR metode blev ikke slået til under kompilering.\n"
@@ -446,6 +490,5 @@ msgstr "Automatisk opstart"
#~ msgid "Initialization of VidMode failed.\n"
#~ msgstr "Fejl under klargøring af VidMode.\n"
-#, c-format
#~ msgid "CRTC can only be selected with the RANDR method.\n"
#~ msgstr "CRTC kan kun vælges med RANDR metoden.\n"
diff --git a/po/de.po b/po/de.po
index 92377b0..23a13cc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-10-09 23:01+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-10-11 18:08+0000\n"
"Last-Translator: Jan-Christoph Borchardt <JanCBorchardt@gmail.com>\n"
"Language-Team: German <de@li.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-12 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Zeitraum: Nacht\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Zeitraum: Übergang (%.2f%% Tag)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Zeitraum: Tag\n"
@@ -37,20 +38,20 @@ msgstr "Zeitraum: Tag\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr "Benutzung: %s -l BREITE:LÄNGE -t TAG:NACHT [OPTIONEN …]\n"
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr "Farbtemperatur des Bildschirms je nach Tageszeit ändern.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -61,8 +62,10 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
+#, fuzzy
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -86,7 +89,7 @@ msgstr ""
" -t TAG:NACHT\tFarbtemperatur tagsüber und nachts\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
#, c-format
msgid ""
"The neutral temperature is %uK. Using this value will not\n"
@@ -101,7 +104,7 @@ msgstr ""
"eine niedrige ergibt roteres Licht.\n"
#. TRANSLATORS: help output 6
-#: src/redshift.c:314
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -115,173 +118,205 @@ msgstr ""
" Temperatur nachts: %uK\n"
#. TRANSLATORS: help output 7
-#: src/redshift.c:322
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Bitte melden Sie Fehler auf <%s>\n"
-#: src/redshift.c:328
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Verfügbare Änderungsmethoden:\n"
-#: src/redshift.c:334
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr "Geben Sie kommaseparierte Optionen an: »-m METHODE:OPTIONEN«.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:337
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr "Benutzen Sie »-m METHODE:help« für Hilfe.\n"
-#: src/redshift.c:343
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Verfügbare Standortbestimmungs-Dienste:\n"
-#: src/redshift.c:349
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr "Geben Sie kommaseparierte Optionen an: »-l DIENST:OPTIONEN«.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:352
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr "Benutzen Sie »-l DIENST:help« für Hilfe.\n"
-#: src/redshift.c:364 src/redshift.c:417
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "Starten von %s fehlgeschlagen.\n"
-#: src/redshift.c:386 src/redshift.c:439
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr "Setzen der Option %s fehlgeschlagen.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:389
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr "Benutzen Sie »-l %s:help« für weitere Informationen.\n"
-#: src/redshift.c:401
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr "Starten des Dienstes %s fehlgeschlagen.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Benutzen Sie »-m %s:help« für weitere Informationen.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:442
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr "Benutzen Sie »-m %s:help« für weitere Informationen.\n"
-#: src/redshift.c:454
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "Starten der Änderungsmethode %s fehlgeschlagen.\n"
-#: src/redshift.c:511
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Fehlerhaftes Kommando für Gamma-Wert.\n"
-#: src/redshift.c:513 src/redshift.c:628 src/redshift.c:643
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Benutzen Sie »-h« für mehr Informationen.\n"
-#: src/redshift.c:567
+#: src/redshift.c:656 src/redshift.c:792
#, c-format
msgid "Unknown location provider `%s'.\n"
msgstr "Unbekannter Dienst »%s«.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:605
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Unbekannte Methode »%s«.\n"
-#: src/redshift.c:626
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Fehlerhaftes Kommando für Temperatur.\n"
-#: src/redshift.c:669
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Fehlerhaftes Kommando für Gamma-Wert.\n"
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "Unbekannter Dienst »%s«.\n"
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr "Nächster Dienst wird getestet …\n"
-#: src/redshift.c:675
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr "Dienst »%s« wird benutzt.\n"
-#: src/redshift.c:683
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "Keine weiteren Dienste verfügbar.\n"
-#: src/redshift.c:697
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Konnte Standort nicht vom Dienst erhalten.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:706
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Standort: %f, %f\n"
-#: src/redshift.c:713
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Der Breitengrad muss sich zwischen %.1f und %.1f befinden.\n"
-#: src/redshift.c:722
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "Der Längengrad muss sich zwischen %.1f und %.1f befinden.\n"
-#: src/redshift.c:731 src/redshift.c:739
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "Die Temperatur muss sich zwischen %uK und %uK befinden.\n"
-#: src/redshift.c:749
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Der Gamma-Wert muss sich zwischen %.1f und %.1f befinden.\n"
-#: src/redshift.c:755
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gamma: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:773
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr "Nächste Methode wird getestet …\n"
-#: src/redshift.c:778
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr "Methode »%s« wird benutzt.\n"
-#: src/redshift.c:785
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr "Keine weiteren Methoden verfügbar.\n"
-#: src/redshift.c:797 src/redshift.c:918
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr "Konnte Systemzeit nicht auslesen.\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:806
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Sonnenstand: %f°\n"
-#: src/redshift.c:813 src/redshift.c:985
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Farbtemperatur: %uK\n"
-#: src/redshift.c:818 src/redshift.c:829 src/redshift.c:993
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "Temperaturänderung fehlgeschlagen.\n"
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+#, fuzzy
+msgid "Malformed assignment in config file.\n"
+msgstr "Fehlerhaftes Kommando.\n"
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
diff --git a/po/es.po b/po/es.po
index d68669d..9d283fd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-10-09 23:01+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-10-12 15:56+0000\n"
"Last-Translator: Fernando Ossandon <ferossan@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-13 05:06+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Periodo: Noche\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Periodo: Transición (%.2f%% día)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Periodo: Día\n"
@@ -37,20 +38,20 @@ msgstr "Periodo: Día\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr "Uso: %s -l LAT:LON -t DÍA:NOCHE [OPCIONES...]\n"
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr "La temperatura del color es mostrada de acuerdo a la hora del día.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -61,8 +62,10 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
+#, fuzzy
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -87,7 +90,7 @@ msgstr ""
" -t DAY:NIGHT\tTemperatura del color a establecer en el día/noche\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
#, c-format
msgid ""
"The neutral temperature is %uK. Using this value will not\n"
@@ -103,7 +106,7 @@ msgstr ""
"más bajo, el tono será más rojo.\n"
#. TRANSLATORS: help output 6
-#: src/redshift.c:314
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -117,177 +120,209 @@ msgstr ""
" Temperatura de la noche: %uK\n"
#. TRANSLATORS: help output 7
-#: src/redshift.c:322
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Por favor reporta fallos a <%s>\n"
-#: src/redshift.c:328
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Métodos de ajuste disponibles:\n"
-#: src/redshift.c:334
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
-"Señalar opciones separadas con \"dos puntos\" mediante `-m "
-"MÉTODO:OPCIONES'.\n"
+"Señalar opciones separadas con \"dos puntos\" mediante `-m MÉTODO:"
+"OPCIONES'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:337
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr "Prueba `-m MÉTODO:help' para ayuda.\n"
-#: src/redshift.c:343
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Proveedores de localización disponibles:\n"
-#: src/redshift.c:349
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
-"Señalar opciones separadas con \"dos puntos\" mediante `-l "
-"PROVEEDOR:OPCIONES'.\n"
+"Señalar opciones separadas con \"dos puntos\" mediante `-l PROVEEDOR:"
+"OPCIONES'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:352
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr "Prueba `-l PROVEEDOR:help' para ayuda.\n"
-#: src/redshift.c:364 src/redshift.c:417
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "Iniciación de %s falló.\n"
-#: src/redshift.c:386 src/redshift.c:439
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr "Falló establecer la opción %s\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:389
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr "Prueba `-l %s:help' para más información.\n"
-#: src/redshift.c:401
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr "Falló iniciar el proveedor %s.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Prueba -m %s:help' para más información.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:442
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr "Prueba -m %s:help' para más información.\n"
-#: src/redshift.c:454
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "Falló el inicio del método de ajuste %s.\n"
-#: src/redshift.c:511
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Parámetro gamma no válido.\n"
-#: src/redshift.c:513 src/redshift.c:628 src/redshift.c:643
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Tipee `-h' para más información.\n"
-#: src/redshift.c:567
+#: src/redshift.c:656 src/redshift.c:792
#, c-format
msgid "Unknown location provider `%s'.\n"
msgstr "Proveedor de localización `%s' desconocido.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:605
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Método `%s' desconocido.\n"
-#: src/redshift.c:626
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Parámetro de temperatura no válido.\n"
-#: src/redshift.c:669
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Parámetro gamma no válido.\n"
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "Proveedor de localización `%s' desconocido.\n"
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr "Probando el siguiente proveedor...\n"
-#: src/redshift.c:675
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr "Usando el proveedor `%s'.\n"
-#: src/redshift.c:683
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "No hay más proveedores de localización para probar.\n"
-#: src/redshift.c:697
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Incapaz de obtener localización desde el proveedor.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:706
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Localización: %f, %f\n"
-#: src/redshift.c:713
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "La latitud debe estar entre %.1f y %.1f.\n"
-#: src/redshift.c:722
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "La longitud debe estar entre %.1f y %.1f.\n"
-#: src/redshift.c:731 src/redshift.c:739
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "La temperatura debe estar entre %uK y %uK.\n"
-#: src/redshift.c:749
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "El valor gamma debe estar entre %.1f y %.1f.\n"
-#: src/redshift.c:755
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gamma: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:773
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr "Probando el siguiente método...\n"
-#: src/redshift.c:778
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr "Usando el método `%s'.\n"
-#: src/redshift.c:785
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr "No hay más métodos para probar.\n"
-#: src/redshift.c:797 src/redshift.c:918
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr "Imposible leer la hora del sistema.\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:806
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Elevación solar: %f\n"
-#: src/redshift.c:813 src/redshift.c:985
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Temperatura del color: %uK\n"
-#: src/redshift.c:818 src/redshift.c:829 src/redshift.c:993
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "El ajuste de la temperatura falló.\n"
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+#, fuzzy
+msgid "Malformed assignment in config file.\n"
+msgstr "Parámetro no válido.\n"
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
diff --git a/po/eu.po b/po/eu.po
index 40d487b..275897b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-08-18 21:19+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Basque <eu@li.org>\n"
+"Language: eu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Unea: Gaua\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Unea: Trantsizioa (egunaren %.2f%%)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Unea: Eguna\n"
@@ -37,20 +38,20 @@ msgstr "Unea: Eguna\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr "Erabilera: %s -l LAT:LON -t EGUNEZ:GAUEZ [AUKERAK...]\n"
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr "Aldatu pantailaren kolore-tenperatura eguneko unearen arabera.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -61,8 +62,10 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
+#, fuzzy
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -88,7 +91,18 @@ msgstr ""
" -t EGUNEZ:GAUEZ\tEgunez/gauez aplikatuko den kolore-tenperatura\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -101,175 +115,207 @@ msgstr ""
" Eguneko tenperatura: %uK\n"
" Gaueko tenperatura: %uK\n"
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Mesedez, eman arazoen berri <%s> helbidean\n"
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Eskuragarri dauden metodoak:\n"
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr "Zehaztu aukerak kakotxez bereizita honela: `-m METODOA:AUKERAK'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr "Idatzi `-m METODOA:help' laguntza lortzeko.\n"
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Eskuragarri dauden kokapen-hornitzaileak:\n"
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
"Zehaztu aukerak kakotxez bereizita honela: `-l HORNITZAILEA:AUKERAK'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr "Idatzi `-l HORNITZAILEA:help' laguntza lortzeko.\n"
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "%s abiarazteak huts egin du.\n"
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr "Ezin izan da %s aukera ezarri.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr "Idatzi `-l %s:help' informazio gehiagorako.\n"
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr "Ezin izan da %s hornitzailea abiarazi.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Idatzi `-m %s:help' informazio gehiagorako.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr "Idatzi `-m %s:help' informazio gehiagorako.\n"
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "Ezin izan da %s egokitze-metodoa abiarazi.\n"
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Gaizki eratutako gamma argumentua.\n"
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Idatzi `-h' informazio gehiagorako.\n"
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, c-format
msgid "Unknown location provider `%s'.\n"
msgstr "Kokapen-hornitzaile ezezaguna: `%s'.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:595
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Metodo ezezaguna: `%s'.\n"
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Gaizki eratutako tenperatura argumentua.\n"
-#: src/redshift.c:659
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Gaizki eratutako gamma argumentua.\n"
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "Kokapen-hornitzaile ezezaguna: `%s'.\n"
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr "Hurrengo hornitzailearekin saiatzen...\n"
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr "`%s' hornitzailea erabiltzen.\n"
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "Ez dago beste kokapen-hornitzailerik probatzeko.\n"
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Ezin izan da hornitzailearengandik kokapenik lortu.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Kokapena: %f, %f\n"
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Latitudea muga hauen barruan egon behar da: %.1f eta %.1f.\n"
-#: src/redshift.c:712
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "Longitudea muga hauen barruan egon behar da: %.1f eta %.1f.\n"
-#: src/redshift.c:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "Tenperatura muga hauen barruan egon behar da: %uK eta %uK.\n"
-#: src/redshift.c:739
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Gamma balioa muga hauen barruan egon behar da: %.1f eta %.1f.\n"
-#: src/redshift.c:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gamma: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr "Hurrengo metodoarekin saiatzen...\n"
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr "`%s' metodoa erabiltzen.\n"
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr "Ez dago beste metodorik probatzeko.\n"
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr "Ezin izan da sistemaren ordua irakurri.\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Eguzkiaren gorapen-angelua: %fº\n"
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Kolore-tenperatura: %uK\n"
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "Tenperatura egokitzeak huts egin du.\n"
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+#, fuzzy
+msgid "Malformed assignment in config file.\n"
+msgstr "Gaizki eratutako argumentua.\n"
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -286,7 +332,7 @@ msgstr "Onartu gabeko RANDR bertsioa (%u.%u)\n"
msgid "Screen %i could not be found.\n"
msgstr "%i pantaila ez da aurkitu.\n"
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Gamma ramp tamaina txikiegia: %i\n"
@@ -310,12 +356,12 @@ msgstr ""
" screen=N\tEgokitzapenak aplikatzeko X pantaila\n"
" crtc=N\tEgokitzapenak aplikatzeko CRTCa\n"
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr "Balioa falta da parametro honentzat: `%s'.\n"
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr "Metodoaren parametro ezezaguna: `%s'.\n"
@@ -335,19 +381,19 @@ msgstr "Onartutako CRTCak honakoak dira [0-%d].\n"
msgid "Only CRTC 0 exists.\n"
msgstr "0 CRTCa baino ez da existitzen.\n"
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr "X eskaerak huts egin du: %s\n"
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr "Egokitu gammaren ramp-ak X VidMode hedapenarekin.\n"
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr " screen=N\tEgokitzapenak aplikatzeko X pantaila\n"
@@ -375,28 +421,28 @@ msgstr "Ezin izan dira gammaren ramp-ak berrezarri.\n"
msgid "Unable to set gamma ramps.\n"
msgstr "Ezin izan dira gammaren ramp-ak ezarri.\n"
-#: src/location-gnome-clock.c:47
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
+msgstr "Errorea herrien zerrenda irakurtzean: `%s'.\n"
+
+#: src/location-gnome-clock.c:83
msgid "Cannot list GNOME panel applets.\n"
msgstr "Ezin dira GNOME paneleko applet-ak zerrendatu.\n"
-#: src/location-gnome-clock.c:81
+#: src/location-gnome-clock.c:125
msgid "No clock applet was found.\n"
msgstr "Ez da erloju appletik aurkitu.\n"
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
-msgstr "Errorea herrien zerrenda irakurtzean: `%s'.\n"
-
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr "Ez da herririk aukeratu momentuko herri gisa.\n"
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr "Ez da herriarentzako kokapenik zehaztu.\n"
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr "Erabili GNOMEren erloju appletean ezarritako kokapena.\n"
diff --git a/po/fi.po b/po/fi.po
index f4f249e..f85af7a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-09-10 16:10+0000\n"
"Last-Translator: Jani Välimaa <Unknown>\n"
"Language-Team: Finnish <fi@li.org>\n"
+"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-09-11 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Hetki: Yö\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Hetki: siirtymä (%.2f%% päivä)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Hetki: Päivä\n"
@@ -37,20 +38,20 @@ msgstr "Hetki: Päivä\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr "Käyttö: %s -l LAT:LON -t PÄIVÄ:YÖ [VALINNAT...]\n"
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr "Säädä näytön värilämpötila vuorokaudenajan mukaan.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -61,8 +62,9 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -76,7 +78,18 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -89,174 +102,205 @@ msgstr ""
" Päiväsajan värilämpötila: %uK\n"
" Yöajan värilämpötila: %uK\n"
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Ole ystävällinen ja raportoi bugi <%s>lle\n"
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Käytettävissä olevat säätömahdollisuudet:\n"
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr ""
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr ""
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr ""
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr ""
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Kokeile '-h' saadaksesi lisää tietoa.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr ""
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Vääränlainen gamman argumentti.\n"
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Kokeile '-h' saadaksesi lisää tietoa.\n"
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, 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:595
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Tuntematon metodi `%s'.\n"
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Vääränmuotoinen värilämpötilan argumentti.\n"
-#: src/redshift.c:659
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Vääränlainen gamman argumentti.\n"
+
+#: src/redshift.c:801
+#, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr ""
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr ""
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr ""
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr ""
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr ""
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Sijainti: %f, %f\n"
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Leveyspiiri on asetettava väliltä %.1f - %.1f.\n"
-#: src/redshift.c:712
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "Pituuspiiri on asetettava väliltä %.1f - %.1f.\n"
-#: src/redshift.c:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "Värilämpötila on säädettävä väliltä %uK - %uK.\n"
-#: src/redshift.c:739
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Gamman arvo on asetettava väliltä %.1f - %.1f.\n"
-#: src/redshift.c:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gamma: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr ""
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr ""
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr ""
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr ""
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr ""
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Värilämpötila: %uK\n"
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "Värilämpötilan säätö epäonnistui.\n"
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+msgid "Malformed assignment in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -273,7 +317,7 @@ msgstr "RANDRin versio ei ole tuettu (%u.%u)\n"
msgid "Screen %i could not be found.\n"
msgstr "Näyttöä %i ei löytynyt.\n"
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr ""
@@ -295,12 +339,12 @@ msgid ""
" crtc=N\tCRTC to apply adjustments to\n"
msgstr ""
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr ""
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr ""
@@ -320,19 +364,19 @@ msgstr ""
msgid "Only CRTC 0 exists.\n"
msgstr "Vain CRTC 0 on olemassa.\n"
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr "X-kutsu epäonnistui: %s\n"
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr ""
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr ""
@@ -360,28 +404,28 @@ msgstr ""
msgid "Unable to set gamma ramps.\n"
msgstr ""
-#: src/location-gnome-clock.c:47
-msgid "Cannot list GNOME panel applets.\n"
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
msgstr ""
-#: src/location-gnome-clock.c:81
-msgid "No clock applet was found.\n"
+#: src/location-gnome-clock.c:83
+msgid "Cannot list GNOME panel applets.\n"
msgstr ""
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
+#: src/location-gnome-clock.c:125
+msgid "No clock applet was found.\n"
msgstr ""
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr ""
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr ""
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 697ee61..9a00871 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-08-31 19:31+0000\n"
"Last-Translator: Emilien Klein <emilien+ubuntu@klein.st>\n"
"Language-Team: French <fr@li.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-09-01 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Période : Nuit\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Période : Transition (%.2f%% jour)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Période : Jour\n"
@@ -37,14 +38,14 @@ msgstr "Période : Jour\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr "Utilisation : %s -l LAT:LON -t JOUR:NUIT [OPTIONS...]\n"
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr ""
"Régler la température de couleur de l'affichage selon le moment de la "
@@ -52,7 +53,7 @@ msgstr ""
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -63,8 +64,10 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
+#, fuzzy
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -90,7 +93,18 @@ msgstr ""
" -t JOUR:NUIT\tDéfinir les températures de couleur du jour / nuit\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -103,178 +117,210 @@ msgstr ""
" Température du jour : %uK\n"
" Température de la nuit : %uK\n"
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Rapporter les bugs à <%s>\n"
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Méthodes d'ajustement disponibles :\n"
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
-"Spécifiez les options séparées par des deux-points en tant que '-m "
-"MÉTHODE:OPTIONS'.\n"
+"Spécifiez les options séparées par des deux-points en tant que '-m MÉTHODE:"
+"OPTIONS'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr "Essayez '-m MÉTHODE:help' pour de l'aide.\n"
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Fournisseurs de localisation disponibles :\n"
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
"Spécifiez les options séparées par des deux-points en tant que '-l "
"FOURNISSEUR:OPTIONS'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr "Essayez '-l FOURNISSEUR:help' pour de l'aide.\n"
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "L'initialisation de %s a échouée.\n"
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr "Impossible de spécifier l'option %s.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr "Essayez '-l %s:help' pour plus d'informations.\n"
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr "Impossible de démarrer le fournisseur %s.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Essayez '-m %s:help' pour plus d'informations.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr "Essayez '-m %s:help' pour plus d'informations.\n"
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "Impossible de démarrer la méthode d'ajustement %s.\n"
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Argument gamma mal formé.\n"
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Essayez '-h' pour plus de renseignements.\n"
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, c-format
msgid "Unknown location provider `%s'.\n"
msgstr "Fournisseur de localisation « %s » inconnu.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:595
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Méthode « %s » inconnue.\n"
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Argument de la température incorrect.\n"
-#: src/redshift.c:659
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Argument gamma mal formé.\n"
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "Fournisseur de localisation « %s » inconnu.\n"
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr "Essai du fournisseur suivant...\n"
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr "Utilisation du fournisseur « %s ».\n"
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "Il n'y a plus de fournisseur de localisation à essayer.\n"
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Impossible d'obtenir une localisation du fournisseur.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Localisation: %f, %f\n"
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "La latitude doit être comprise entre %.1f et %.1f.\n"
-#: src/redshift.c:712
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "La longitude doit être comprise entre %.1f et %.1f.\n"
-#: src/redshift.c:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "La température doit être comprise entre %uK et %uK.\n"
-#: src/redshift.c:739
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "La valeur gamma doit être comprise entre %.1f et %.1f.\n"
-#: src/redshift.c:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gamma: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr "Essai de la méthode suivante...\n"
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr "Utilisation de la méthode « %s ».\n"
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr "Il n'y a plus de méthodes à essayer.\n"
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr "Impossible d'obtenir l'heure du système.\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Élévation solaire : %f\n"
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Température de couleur : %uK\n"
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "L'ajustement de la température a échoué.\n"
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+#, fuzzy
+msgid "Malformed assignment in config file.\n"
+msgstr "Paramètre incorrect.\n"
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -291,7 +337,7 @@ msgstr "Version de RANDR non supporté (%u.%u)\n"
msgid "Screen %i could not be found.\n"
msgstr "Moniteur %i introuvable.\n"
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "La taille de la rampe gamma est trop petite: %i\n"
@@ -315,12 +361,12 @@ msgstr ""
" screen=N\tL'écran X auquel appliquer les ajustements\n"
" crtc=N\tLe CRTC auquel appliquer les ajustements\n"
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr "Valeur manquante pour le paramètre « %s ».\n"
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr "Paramètre de la méthode inconnu: « %s ».\n"
@@ -340,19 +386,19 @@ msgstr "Les CRTCs valides sont [0-%d].\n"
msgid "Only CRTC 0 exists.\n"
msgstr "Le CRTC 0 est le seul à exister.\n"
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr "La requête X a échoué: %s\n"
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr "Ajuster les rampes gamma avec l'extension X VidMode.\n"
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr " screen=N\tEcran X auquel appliquer les ajustements\n"
@@ -380,28 +426,28 @@ msgstr "Impossible de restaurer les rampes gamma.\n"
msgid "Unable to set gamma ramps.\n"
msgstr "Impossible de spécifier les rampes gamma.\n"
-#: src/location-gnome-clock.c:47
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
+msgstr "Erreur lors de la lecture de la liste des villes : « %s ».\n"
+
+#: src/location-gnome-clock.c:83
msgid "Cannot list GNOME panel applets.\n"
msgstr "Impossible de lister les applets de panneaux de GNOME.\n"
-#: src/location-gnome-clock.c:81
+#: src/location-gnome-clock.c:125
msgid "No clock applet was found.\n"
msgstr "Aucun applet d'horloge n'a été trouvé.\n"
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
-msgstr "Erreur lors de la lecture de la liste des villes : « %s ».\n"
-
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr "Aucune ville n'a été sélectionnée en tant que ville actuelle.\n"
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr "La localisation de la ville n'a pas été spécifiée.\n"
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr ""
"Utilise la localisation telle que spécifiée dans l'applet d'horloge GNOME.\n"
diff --git a/po/gtk-redshift/cs.po b/po/gtk-redshift/cs.po
deleted file mode 100644
index 79806eb..0000000
--- a/po/gtk-redshift/cs.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Czech translation for redshift
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the redshift package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-02-01 22:16+0100\n"
-"PO-Revision-Date: 2010-06-01 11:10+0000\n"
-"Last-Translator: clever_fox <clever_fox@seznam.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-14 03:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: src/gtk-redshift/gtk-redshift:59
-msgid "Toggle"
-msgstr "Přepnout"
diff --git a/po/gtk-redshift/da.po b/po/gtk-redshift/da.po
deleted file mode 100644
index fb8be1a..0000000
--- a/po/gtk-redshift/da.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Danish translation for redshift
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the redshift package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-02-01 22:16+0100\n"
-"PO-Revision-Date: 2010-02-02 11:34+0000\n"
-"Last-Translator: Jon Lund Steffensen <Unknown>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-14 03:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: src/gtk-redshift/gtk-redshift:59
-msgid "Toggle"
-msgstr "Slå til/fra"
diff --git a/po/gtk-redshift/de.po b/po/gtk-redshift/de.po
deleted file mode 100644
index 27c7971..0000000
--- a/po/gtk-redshift/de.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# German translation for redshift
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the redshift package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-02-01 22:16+0100\n"
-"PO-Revision-Date: 2010-06-12 18:07+0000\n"
-"Last-Translator: Jan-Christoph Borchardt <inquata@gmail.com>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-14 03:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: src/gtk-redshift/gtk-redshift:59
-msgid "Toggle"
-msgstr "Umschalten"
diff --git a/po/gtk-redshift/es.po b/po/gtk-redshift/es.po
deleted file mode 100644
index 71c8a52..0000000
--- a/po/gtk-redshift/es.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Spanish translation for redshift
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the redshift package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-02-01 22:16+0100\n"
-"PO-Revision-Date: 2010-06-14 15:32+0000\n"
-"Last-Translator: Fernando Ossandon <ferossan@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-15 03:38+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: src/gtk-redshift/gtk-redshift:59
-msgid "Toggle"
-msgstr "Cambiar"
diff --git a/po/gtk-redshift/fi.po b/po/gtk-redshift/fi.po
deleted file mode 100644
index 1c491c5..0000000
--- a/po/gtk-redshift/fi.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Finnish translation for redshift
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the redshift package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-02-01 22:16+0100\n"
-"PO-Revision-Date: 2010-05-23 20:18+0000\n"
-"Last-Translator: Ilari Oras <happo1472583@gmail.com>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-14 03:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: src/gtk-redshift/gtk-redshift:59
-msgid "Toggle"
-msgstr "Kytke"
diff --git a/po/gtk-redshift/he.po b/po/gtk-redshift/he.po
deleted file mode 100644
index f847e8f..0000000
--- a/po/gtk-redshift/he.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Hebrew translation for redshift
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the redshift package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-02-01 22:16+0100\n"
-"PO-Revision-Date: 2010-06-14 11:38+0000\n"
-"Last-Translator: Ddorda <d.dorda@gmail.com>\n"
-"Language-Team: Hebrew <he@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-15 03:38+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: src/gtk-redshift/gtk-redshift:59
-msgid "Toggle"
-msgstr "הפיכת מצב"
diff --git a/po/gtk-redshift/it.po b/po/gtk-redshift/it.po
deleted file mode 100644
index 8a7ef56..0000000
--- a/po/gtk-redshift/it.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Italian translation for redshift
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the redshift package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-02-01 22:16+0100\n"
-"PO-Revision-Date: 2010-06-06 13:04+0000\n"
-"Last-Translator: Francesco Marella <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-14 03:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: src/gtk-redshift/gtk-redshift:59
-msgid "Toggle"
-msgstr "Attiva/Disattiva"
diff --git a/po/gtk-redshift/ru.po b/po/gtk-redshift/ru.po
deleted file mode 100644
index ebcc0c9..0000000
--- a/po/gtk-redshift/ru.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Russian translation for redshift
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the redshift package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-02-01 22:16+0100\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-14 03:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: src/gtk-redshift/gtk-redshift:59
-msgid "Toggle"
-msgstr "Включить / Выключить"
diff --git a/po/he.po b/po/he.po
index 4f8264a..b9683f1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-08-18 21:19+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Hebrew <he@li.org>\n"
+"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "תקופה: לילה\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "תקופה: מעבר (%.2f%% יום)‏\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "תקופה: יום\n"
@@ -37,20 +38,20 @@ msgstr "תקופה: יום\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, 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:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr "הגדר את טמפרטורת צבעי המסך לפי שעת היום.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -61,8 +62,9 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -76,7 +78,18 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -85,174 +98,204 @@ msgid ""
" Night temperature: %uK\n"
msgstr ""
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr ""
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr ""
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr ""
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "ספקים מקומיים זמינים:\n"
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr ""
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr ""
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "תנסה \"-h\" לקבלת מידע נוסף.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "כשל בתחילת שיטת הזזה %s.‏\n"
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr ""
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "תנסה \"-h\" לקבלת מידע נוסף.\n"
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, 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:595
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "שיטה \"%s\" לא מוכר.\n"
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr ""
-#: src/redshift.c:659
+#: src/redshift.c:766
+msgid "Malformed gamma setting.\n"
+msgstr ""
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "ספק מיקום \"%s\" לא מוכר.\n"
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr "מנסה ספק הבא...\n"
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr "משתמש בספק \"%s\".‏\n"
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "אין ספקי מיקום נוספים לנסות.\n"
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "לא ניתן לקבל מיקום מהספק.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr ""
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:712
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr ""
-#: src/redshift.c:739
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr ""
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr ""
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr ""
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr ""
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr ""
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr ""
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr ""
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr ""
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+msgid "Malformed assignment in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -269,7 +312,7 @@ msgstr ""
msgid "Screen %i could not be found.\n"
msgstr ""
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr ""
@@ -291,12 +334,12 @@ msgid ""
" crtc=N\tCRTC to apply adjustments to\n"
msgstr ""
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr ""
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr ""
@@ -316,19 +359,19 @@ msgstr ""
msgid "Only CRTC 0 exists.\n"
msgstr ""
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr ""
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr ""
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr ""
@@ -356,28 +399,28 @@ msgstr ""
msgid "Unable to set gamma ramps.\n"
msgstr ""
-#: src/location-gnome-clock.c:47
-msgid "Cannot list GNOME panel applets.\n"
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
msgstr ""
-#: src/location-gnome-clock.c:81
-msgid "No clock applet was found.\n"
+#: src/location-gnome-clock.c:83
+msgid "Cannot list GNOME panel applets.\n"
msgstr ""
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
+#: src/location-gnome-clock.c:125
+msgid "No clock applet was found.\n"
msgstr ""
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr ""
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr ""
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 591d620..949c4d9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-10-15 12:40+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-10-15 20:56+0000\n"
"Last-Translator: simone.sandri <Unknown>\n"
"Language-Team: Italian <it@li.org>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-16 04:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-"Language: it\n"
#: src/redshift.c:244
#, c-format
@@ -65,7 +65,9 @@ msgstr ""
#. `list' must not be translated
#. no-wrap
#: src/redshift.c:289
+#, fuzzy
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -91,7 +93,7 @@ msgstr ""
" -t GIORNO:NOTTE\tLa temperatura di colore da impostare di giorno/notte\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:305
+#: src/redshift.c:306
#, c-format
msgid ""
"The neutral temperature is %uK. Using this value will not\n"
@@ -102,7 +104,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 6
-#: src/redshift.c:315
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -116,45 +118,44 @@ msgstr ""
" Temperatura notturna: %uK\n"
#. TRANSLATORS: help output 7
-#: src/redshift.c:323
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Per favore segnala gli errori a <%s>.\n"
-#: src/redshift.c:329
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Metodi di correzione disponibili:\n"
-#: src/redshift.c:335
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
-msgstr ""
-"Specificare opzioni separate dai due punti con `-m METODO:OPZIONI'.\n"
+msgstr "Specificare opzioni separate dai due punti con `-m METODO:OPZIONI'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:338
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr "Provare `-m METODO:help' per aiuto.\n"
-#: src/redshift.c:344
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Provider posizionali disponibili:\n"
-#: src/redshift.c:350
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
"Specificare opzioni separate dai due punti con `-m PROVIDER:OPZIONI'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:353
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr "Provare `-m PROVIDER:help' per aiuto.\n"
-#: src/redshift.c:366 src/redshift.c:444
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "Inizializzazione di %s non riuscita.\n"
-#: src/redshift.c:381 src/redshift.c:412 src/redshift.c:459 src/redshift.c:490
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr "Impossibile impostare l'opzione %s.\n"
@@ -162,156 +163,156 @@ msgstr "Impossibile impostare l'opzione %s.\n"
#. TRANSLATORS: `help' must not be
#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:386 src/redshift.c:415
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr "Provare `-l %s:help' per maggiori informazioni.\n"
-#: src/redshift.c:427
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr "Impossibile avviare il provider %s.\n"
#. TRANSLATORS: `help' must not be
#. translated.
-#: src/redshift.c:464
+#: src/redshift.c:465
#, c-format
msgid "Try `-m %s:help' for more information.\n"
msgstr "Prova `-m %s:help' per maggiori informazioni.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:493
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr "Provare `-m %s:help' per maggiori informazioni.\n"
-#: src/redshift.c:505
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "Impossibile avviare il metodo di regolazione %s.\n"
-#: src/redshift.c:606
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Argomento del gamma in forma errata.\n"
-#: src/redshift.c:608 src/redshift.c:703 src/redshift.c:718
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Prova `-h' per ulteriori informazioni.\n"
-#: src/redshift.c:649 src/redshift.c:783
+#: src/redshift.c:656 src/redshift.c:792
#, c-format
msgid "Unknown location provider `%s'.\n"
msgstr "Provider posizionale sconosciuto `%s'.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:680 src/redshift.c:769
+#: src/redshift.c:687 src/redshift.c:778
#, c-format
msgid "Unknown adjustment method `%s'.\n"
msgstr ""
-#: src/redshift.c:701
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Argomento della temperatura in forma errata.\n"
-#: src/redshift.c:757
+#: src/redshift.c:766
msgid "Malformed gamma setting.\n"
msgstr ""
-#: src/redshift.c:792
+#: src/redshift.c:801
#, c-format
msgid "Unknown configuration setting `%s'.\n"
msgstr "Opzioni di configurazione sconosciute '%s'.\n"
-#: src/redshift.c:827
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr "Provando il prossimo provider...\n"
-#: src/redshift.c:833
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr "Usando il provider `%s'\n"
-#: src/redshift.c:841
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "Nessun altro provider posizionale da provare.\n"
-#: src/redshift.c:855
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Impossibile ottenere la posizione dal provider.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:864
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Posizione geografica: %f, %f\n"
-#: src/redshift.c:871
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "La latitudine deve essere compresa tra %.1f e %.1f.\n"
-#: src/redshift.c:880
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "La longitudine deve essere compresa tra %.1f e %.1f.\n"
-#: src/redshift.c:889 src/redshift.c:897
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "La temperatura deve essere compresa tra %uK e %uK.\n"
-#: src/redshift.c:907
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Il valore gamma deve essere compreso tra %.1f e %.1f.\n"
-#: src/redshift.c:913
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gamma: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:932
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr "Provando il prossimo metodo...\n"
-#: src/redshift.c:937
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr "Usando il metodo `%s'.\n"
-#: src/redshift.c:944
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr "Nessun altro metodo da provare.\n"
-#: src/redshift.c:956 src/redshift.c:1077
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr "Impossibile leggere l'orario di sistema.\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:965
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Elevazione solare: %f °\n"
-#: src/redshift.c:972 src/redshift.c:1144
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Temperatura di colore: %uK\n"
-#: src/redshift.c:977 src/redshift.c:988 src/redshift.c:1152
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "Impostazione della temperatura fallita.\n"
-#: src/config-ini.c:107
+#: src/config-ini.c:109
msgid "Malformed section header in config file.\n"
msgstr ""
-#: src/config-ini.c:143
+#: src/config-ini.c:145
msgid "Malformed assignment in config file.\n"
msgstr ""
-#: src/config-ini.c:154
+#: src/config-ini.c:156
msgid "Assignment outside section in config file.\n"
msgstr ""
diff --git a/po/ka.po b/po/ka.po
index 5000931..8385736 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -6,28 +6,29 @@
msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-08-19 19:31+0000\n"
"Last-Translator: Giorgi Maghlakelidze [DrAcid] <Unknown>\n"
"Language-Team: Georgian <ka@li.org>\n"
+"Language: ka\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-20 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr ""
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr ""
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr ""
@@ -37,20 +38,20 @@ msgstr ""
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr ""
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr ""
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -59,8 +60,9 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -74,7 +76,18 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -83,174 +96,204 @@ msgid ""
" Night temperature: %uK\n"
msgstr ""
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr ""
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr ""
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr ""
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr ""
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr ""
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr ""
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr ""
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr ""
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr ""
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr ""
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, 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:595
+#: src/redshift.c:687 src/redshift.c:778
#, c-format
-msgid "Unknown method `%s'.\n"
+msgid "Unknown adjustment method `%s'.\n"
msgstr ""
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr ""
-#: src/redshift.c:659
+#: src/redshift.c:766
+msgid "Malformed gamma setting.\n"
+msgstr ""
+
+#: src/redshift.c:801
+#, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr ""
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr ""
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr ""
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr ""
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr ""
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr ""
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:712
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr ""
-#: src/redshift.c:739
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr ""
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr ""
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr ""
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr ""
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr ""
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr ""
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr ""
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr ""
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+msgid "Malformed assignment in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -267,7 +310,7 @@ msgstr ""
msgid "Screen %i could not be found.\n"
msgstr ""
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr ""
@@ -289,12 +332,12 @@ msgid ""
" crtc=N\tCRTC to apply adjustments to\n"
msgstr ""
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr ""
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr ""
@@ -314,19 +357,19 @@ msgstr ""
msgid "Only CRTC 0 exists.\n"
msgstr ""
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr ""
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr ""
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr ""
@@ -354,28 +397,28 @@ msgstr ""
msgid "Unable to set gamma ramps.\n"
msgstr ""
-#: src/location-gnome-clock.c:47
-msgid "Cannot list GNOME panel applets.\n"
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
msgstr ""
-#: src/location-gnome-clock.c:81
-msgid "No clock applet was found.\n"
+#: src/location-gnome-clock.c:83
+msgid "Cannot list GNOME panel applets.\n"
msgstr ""
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
+#: src/location-gnome-clock.c:125
+msgid "No clock applet was found.\n"
msgstr ""
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr ""
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr ""
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index d9d588e..d410299 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,28 +6,29 @@
msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-08-19 16:22+0000\n"
"Last-Translator: Aurimas Fišeras <Unknown>\n"
"Language-Team: Lithuanian <lt@li.org>\n"
+"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-20 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Periodas: naktis\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Period: perėjimas (%.2f%% day)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Periodas: Diena\n"
@@ -37,20 +38,20 @@ msgstr "Periodas: Diena\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr "Naudojimas: %s -l PLA:ILG -t DIENA:NAKTIS [PARAMETRAI...]\n"
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr "Monitoriaus spalvų temperatūros nustatymas pagal paros laiką.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -61,8 +62,10 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
+#, fuzzy
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -87,7 +90,18 @@ msgstr ""
" -t DIENA:NAKTIS\tNustatoma spalvų temperatūra dieną/naktį\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -100,176 +114,208 @@ msgstr ""
" Dienos temperatūra: %uK\n"
" Nakties temperatūra: %uK\n"
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Apie klaidas praneškite <%s>\n"
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Prieinami sureguliavimo metodai:\n"
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
"Nurodykite dvitaškiu atskirtus parametrus taip „-m METODAS:PARAMETRAI“.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr "Mėginkite „-m METODAS:help“ pagalbai gauti.\n"
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Prieinami vietos tiekėjai:\n"
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
"Nurodykite dvitaškiu atskirtus parametrus taip „-l TIEKĖJAS:PARAMETRAI“.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr "Mėginkite „-l TIEKĖJAS:help“ pagalbai gauti.\n"
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "Nepavyko inicijuoti %s.\n"
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr "Nepavyko nustatyti parametro %s.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr "Norėdami gauti daugiau informacijos, mėginkite „-l %s:help“.\n"
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr "Nepavyko paleisti tiekėjo %s.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Norėdami gauti daugiau informacijos, mėginkite „-m %s:help“.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr "Norėdami gauti daugiau informacijos, mėginkite „-m %s:help“.\n"
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "Nepavyko paleisti sureguliavimo metodo %s.\n"
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Blogai suformuotas gamos argumentas.\n"
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Norėdami gauti daugiau informacijos, mėginkite „-h“.\n"
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, c-format
msgid "Unknown location provider `%s'.\n"
msgstr "Nežinomas vietos tiekėjas „%s“.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:595
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Nežinomas metodas „%s“.\n"
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Blogai suformuotas temperatūros argumentas.\n"
-#: src/redshift.c:659
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Blogai suformuotas gamos argumentas.\n"
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "Nežinomas vietos tiekėjas „%s“.\n"
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr "Mėginamas kitas tiekėjas...\n"
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr "Naudojamas tiekėjas „%s“.\n"
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "Daugiau nebeliko vietos tiekėjų mėginimui.\n"
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Nepavyko gauti vietos iš tiekėjo.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Vieta: %f, %f\n"
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Platuma turi būti tarp %.1f ir %.1f.\n"
-#: src/redshift.c:712
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "Ilguma turi būti tarp %.1f ir %.1f.\n"
-#: src/redshift.c:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "Temperatūra turi būti tarp %uK ir %uK.\n"
-#: src/redshift.c:739
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Gamos reikšmė turi būti tarp %.1f ir %.1f.\n"
-#: src/redshift.c:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gama: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr "Mėginamas kitas metodas...\n"
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr "Naudojamas metodas „%s“.\n"
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr "Daugiau nebeliko metodų mėginimui.\n"
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr "Nepavyko perskaityti sistemos laiko.\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Saulės aukštis virš horizonto: %f\n"
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Spalvų temperatūra: %uK\n"
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "Nepavyko sureguliuoti temperatūros.\n"
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+#, fuzzy
+msgid "Malformed assignment in config file.\n"
+msgstr "Blogai suformuotas argumentas.\n"
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -286,7 +332,7 @@ msgstr "Nepalaikoma RANDR versija (%u.%u)\n"
msgid "Screen %i could not be found.\n"
msgstr "Nepavyko rasti ekrano %i.\n"
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Gamos lentelės dydis per mažas: %i\n"
@@ -310,12 +356,12 @@ msgstr ""
" ekranas=N\tX ekranas sureguliavimui taikyti\n"
" crtc=N\tCRTC sureguliavimui taikyti\n"
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr "Trūksta reikšmės parametrui: „%s“.\n"
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr "Nežinomas metodo parametras: „%s“.\n"
@@ -335,19 +381,19 @@ msgstr "Galimi CRTC yra [0-%d].\n"
msgid "Only CRTC 0 exists.\n"
msgstr "Egzistuoja tik CRTC 0.\n"
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr "X užklausa nepavyko: %s\n"
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr "Gamos lentelių sureguliavimas naudojant X VidMode plėtinį.\n"
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr " ekranas=N\tX ekranas sureguliavimui taikyti\n"
@@ -375,28 +421,28 @@ msgstr "Nepavyko atkurti gamos lentelių.\n"
msgid "Unable to set gamma ramps.\n"
msgstr "Nepavyko nustatyti gamos lentelių.\n"
-#: src/location-gnome-clock.c:47
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
+msgstr "Klaida skaitant miestų sąrašą: „%s“.\n"
+
+#: src/location-gnome-clock.c:83
msgid "Cannot list GNOME panel applets.\n"
msgstr "Nepavyko išvesti GNOME skydelio elementų sąrašo.\n"
-#: src/location-gnome-clock.c:81
+#: src/location-gnome-clock.c:125
msgid "No clock applet was found.\n"
msgstr "Nepavyko rasti laikrodžio programėlės.\n"
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
-msgstr "Klaida skaitant miestų sąrašą: „%s“.\n"
-
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr "Nė vienas miestas nepasirinktas kaip dabartinis miestas.\n"
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr "Miestui nenurodyta vieta.\n"
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr "Naudoti GNOME laikrodžio programėlėje nustatytą vietą.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 752e927..495fc7e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-09-08 03:24+0000\n"
"Last-Translator: Gustavo Guidorizzi <Unknown>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-09-09 04:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Período: Noite\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Período: Transição (%2f%% dia)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Período: dia\n"
@@ -37,21 +38,20 @@ msgstr "Período: dia\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr "Utilização: %s -l LAT:LON -t DIA:NOITE [OPÇÕES...]\n"
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
-msgstr ""
-"Regular a temperatura da cor do monitor de acordo com a hora do dia.\n"
+msgstr "Regular a temperatura da cor do monitor de acordo com a hora do dia.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -62,8 +62,10 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
+#, fuzzy
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -88,7 +90,18 @@ msgstr ""
" -t DIA:NOITE\tConfigurar temperatura de cor diurna/noturna\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -101,176 +114,207 @@ msgstr ""
" Temperatura diurna: %uK\n"
" Temperatura noturna: %uK\n"
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Por favor, reporte bugs para <%s>\n"
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Métodos de ajuste disponíveis:\n"
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
-msgstr ""
-"Especifique opções separadas por dois pontos com `-m MÉTODO:OPÇÕES'.\n"
+msgstr "Especifique opções separadas por dois pontos com `-m MÉTODO:OPÇÕES'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr "Tente `-m MÉTODO:help' para obter ajuda.\n"
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Fornecedores de localidade disponíveis:\n"
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
"Especifique opções separadas por dois pontos com `-l PROVEDOR:OPÇÕES'.\n"
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr "Tente `-l PROVEDOR:help' para obter ajuda.\n"
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "Não foi possível inicializar %s.\n"
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr "Não foi possível configurar a opção %s.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr "Tente `-l %s:help' para maiores informações.\n"
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr "Não foi possível iniciar o provedor %s.\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Tente -m %s:help' para maiores informações.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr "Tente -m %s:help' para maiores informações.\n"
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "Não foi possível iniciar método de ajuste %s.\n"
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Argumento gama mal-formatado.\n"
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Tente `-h' para mais informações.\n"
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, c-format
msgid "Unknown location provider `%s'.\n"
msgstr "Provedor de localização `%s' desconhecido.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:595
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Método desconhecido: `%s'.\n"
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Argumento de temperatura mal-formatado.\n"
-#: src/redshift.c:659
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Argumento gama mal-formatado.\n"
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "Provedor de localização `%s' desconhecido.\n"
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr "Tentando próximo provedor...\n"
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr "Usando provedor `%s'.\n"
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr "Não há mais provedores de localização para contactar.\n"
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Não foi possível determinar a localização pelo provedor.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Localização: %fº, %fº\n"
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Latitude deve estar entre %.1f e %.1f.\n"
-#: src/redshift.c:712
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "Longitude deve estar entre %.1f and %.1f.\n"
-#: src/redshift.c:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "A temperatura deve estar entre %uK e %uK.\n"
-#: src/redshift.c:739
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Valor gama deve estar entre %.1f and %.1f.\n"
-#: src/redshift.c:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gama: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr "Tentando próximo método...\n"
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr "Usando o método `%s'.\n"
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr "Não há mais métodos a serem tentados.\n"
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr "Não foi possível determinar a hora do sistema.\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Elevação solar: %fº\n"
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Temperatura de cor: %uK\n"
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "O ajuste de temperatura falhou.\n"
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+#, fuzzy
+msgid "Malformed assignment in config file.\n"
+msgstr "Argumento mal-formatado.\n"
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -287,7 +331,7 @@ msgstr "Não há suporte para a versão RANDR (%u.%u)\n"
msgid "Screen %i could not be found.\n"
msgstr "Tela %i não foi encontrada.\n"
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Tamanho da curva gama é pequeno demais: %i\n"
@@ -311,12 +355,12 @@ msgstr ""
" screen=N\tAplicar ajustes a tela X\n"
" crtc=N\tAplicar ajustes a CRTC\n"
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr "Valor ausente para o parâmetro: `%s'.\n"
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr "Parâmetro de método desconhecido: `%s'.\n"
@@ -336,19 +380,19 @@ msgstr "CRTCs válidos são [0-%d].\n"
msgid "Only CRTC 0 exists.\n"
msgstr "Existe apenas CRTC 0.\n"
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr "Requisição X falhou: %s\n"
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr "Ajuste as curvas gama com a extensão X VidMode.\n"
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr " screen=N\tAplicar ajustes a tela X\n"
@@ -376,28 +420,28 @@ msgstr "Não foi possível restaurar as curvas gama.\n"
msgid "Unable to set gamma ramps.\n"
msgstr "Não foi possível configurar as curvas gama.\n"
-#: src/location-gnome-clock.c:47
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
+msgstr "Erro ao ler lista de cidades: `%s'.\n"
+
+#: src/location-gnome-clock.c:83
msgid "Cannot list GNOME panel applets.\n"
msgstr "Não é possível listar os miniaplicativos do painel GNOME.\n"
-#: src/location-gnome-clock.c:81
+#: src/location-gnome-clock.c:125
msgid "No clock applet was found.\n"
msgstr "Não foi encontrado nenhum miniaplicativo relógio.\n"
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
-msgstr "Erro ao ler lista de cidades: `%s'.\n"
-
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr "Não há cidade atualmente selecionada.\n"
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr "Localização não especificada para cidade.\n"
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr ""
"Utilize a localização conforme configurada no miniaplicativo Relógio do "
diff --git a/po/redshift.pot b/po/redshift.pot
index 505d425..baed4ab 100644
--- a/po/redshift.pot
+++ b/po/redshift.pot
@@ -6,27 +6,28 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: redshift 1.3\n"
+"Project-Id-Version: redshift 1.6\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-13 21:58+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+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"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr ""
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr ""
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr ""
@@ -36,20 +37,20 @@ msgstr ""
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr ""
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr ""
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -58,8 +59,9 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -73,7 +75,18 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -82,240 +95,280 @@ msgid ""
" Night temperature: %uK\n"
msgstr ""
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr ""
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr ""
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr ""
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr ""
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr ""
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr ""
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr ""
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr ""
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr ""
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr ""
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, 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:595
+#: src/redshift.c:687 src/redshift.c:778
#, c-format
-msgid "Unknown method `%s'.\n"
+msgid "Unknown adjustment method `%s'.\n"
msgstr ""
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr ""
-#: src/redshift.c:659
-msgid "Trying other provider...\n"
+#: src/redshift.c:766
+msgid "Malformed gamma setting.\n"
+msgstr ""
+
+#: src/redshift.c:801
+#, c-format
+msgid "Unknown configuration setting `%s'.\n"
msgstr ""
-#: src/redshift.c:671
+#: src/redshift.c:836
+msgid "Trying next provider...\n"
+msgstr ""
+
+#: src/redshift.c:842
+#, c-format
+msgid "Using provider `%s'.\n"
+msgstr ""
+
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr ""
-#: src/redshift.c:685
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr ""
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:694
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr ""
-#: src/redshift.c:701
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:710
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:719 src/redshift.c:727
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr ""
-#: src/redshift.c:737
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:743
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr ""
-#: src/redshift.c:761
-msgid "Trying other method...\n"
+#: src/redshift.c:941
+msgid "Trying next method...\n"
+msgstr ""
+
+#: src/redshift.c:946
+#, c-format
+msgid "Using method `%s'.\n"
msgstr ""
-#: src/redshift.c:771
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr ""
-#: src/redshift.c:783 src/redshift.c:904
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr ""
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:792
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr ""
-#: src/redshift.c:799 src/redshift.c:971
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr ""
-#: src/redshift.c:804 src/redshift.c:815 src/redshift.c:979
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr ""
-#: 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:343
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+msgid "Malformed assignment in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
+#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
+#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
msgid "`%s' returned error %d\n"
msgstr ""
-#: src/gamma-randr.c:74
+#: src/gamma-randr.c:77
#, c-format
msgid "Unsupported RANDR version (%u.%u)\n"
msgstr ""
-#: src/gamma-randr.c:108
+#: src/gamma-randr.c:111
#, c-format
msgid "Screen %i could not be found.\n"
msgstr ""
-#: src/gamma-randr.c:174 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr ""
-#: src/gamma-randr.c:247
+#: src/gamma-randr.c:250
#, c-format
msgid "Unable to restore CRTC %i\n"
msgstr ""
-#: src/gamma-randr.c:268
+#: src/gamma-randr.c:271
msgid "Adjust gamma ramps with the X RANDR extension.\n"
msgstr ""
#. TRANSLATORS: RANDR help output
#. left column must not be translated
-#: src/gamma-randr.c:273
+#: src/gamma-randr.c:276
msgid ""
" screen=N\tX screen to apply adjustments to\n"
" crtc=N\tCRTC to apply adjustments to\n"
msgstr ""
-#: src/gamma-randr.c:282 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr ""
-#: src/gamma-randr.c:292 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr ""
-#: src/gamma-randr.c:306
+#: src/gamma-randr.c:309
#, c-format
msgid "CRTC %d does not exist. "
msgstr ""
-#: src/gamma-randr.c:309
+#: src/gamma-randr.c:312
#, c-format
msgid "Valid CRTCs are [0-%d].\n"
msgstr ""
-#: src/gamma-randr.c:312
+#: src/gamma-randr.c:315
#, c-format
msgid "Only CRTC 0 exists.\n"
msgstr ""
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr ""
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr ""
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr ""
@@ -343,28 +396,28 @@ msgstr ""
msgid "Unable to set gamma ramps.\n"
msgstr ""
-#: src/location-gnome-clock.c:46
-msgid "Cannot list dirs in `/apps/panel/applets'.\n"
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
msgstr ""
-#: src/location-gnome-clock.c:78
-msgid "No clock applet was found.\n"
+#: src/location-gnome-clock.c:83
+msgid "Cannot list GNOME panel applets.\n"
msgstr ""
-#: src/location-gnome-clock.c:86
-#, c-format
-msgid "Error reading city list: `%s'.\n"
+#: src/location-gnome-clock.c:125
+msgid "No clock applet was found.\n"
msgstr ""
-#: src/location-gnome-clock.c:106
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr ""
-#: src/location-gnome-clock.c:113
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr ""
-#: src/location-gnome-clock.c:140
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr ""
@@ -392,6 +445,10 @@ msgstr ""
msgid "Too many arguments.\n"
msgstr ""
-#: src/gtk-redshift/statusicon.py:61 src/gtk-redshift/rsappindicator.py:70
+#: src/gtk-redshift/statusicon.py:91
msgid "Toggle"
msgstr ""
+
+#: src/gtk-redshift/statusicon.py:95
+msgid "Autostart"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 986cf70..e34cbb8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-08-18 21:25+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Russian <ru@li.org>\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr "Период: Ночь\n"
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Период: Переходный (%.2f%% дневной)\n"
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr "Период: День\n"
@@ -37,20 +38,20 @@ msgstr "Период: День\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, 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:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr "Установить цветовую температуру в соответствии со временем суток.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -61,8 +62,10 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
+#, fuzzy
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -86,7 +89,18 @@ msgstr ""
"-t DAY:NIGHT\tColor temperature to set at daytime/night\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -98,174 +112,206 @@ msgstr ""
"Температура днем: %uK\n"
"Температура ночью: %uK\n"
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr "Пожалуйста, об ошибках сообщайте на <%s>\n"
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr "Доступны методы корректировки:\n"
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr "Попробуйте `-m METHOD:help' для справки.\n"
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr "Доступные местные поставщики:\n"
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr "Попробуйте `-l PROVIDER:help' для справки.\n"
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr "Ошибка инициализации %s\n"
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr "Не удалось установить опцию %s\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr "Попробуйте `-l %s:help' для дополнительной информации.\n"
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr "Ошибка запуска поставщика %s\n"
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, fuzzy, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr "Попробуйте -m %s:help' для дополнительной информации.\n"
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr "Попробуйте -m %s:help' для дополнительной информации.\n"
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr "Не удалось запустить метод корректировки %s.\n"
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr "Некорректная величина гаммы.\n"
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr "Воспользуйтесь «-h» для получения дополнительной информации.\n"
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, 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:595
-#, c-format
-msgid "Unknown method `%s'.\n"
+#: src/redshift.c:687 src/redshift.c:778
+#, fuzzy, c-format
+msgid "Unknown adjustment method `%s'.\n"
msgstr "Неизвестный метод «%s».\n"
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr "Некорректное значение температуры.\n"
-#: src/redshift.c:659
+#: src/redshift.c:766
+#, fuzzy
+msgid "Malformed gamma setting.\n"
+msgstr "Некорректная величина гаммы.\n"
+
+#: src/redshift.c:801
+#, fuzzy, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr "Неизвестное местоположение поставщика `%s'.\n"
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr ""
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr ""
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr ""
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr "Не удается получить местоположение от поставщика.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr "Местоположение: %f°, %f°\n"
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Широта должна быть между %.1f и %.1f.\n"
-#: src/redshift.c:712
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "Долгота должна быть между %.1f и %.1f.\n"
-#: src/redshift.c:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "Температура должна быть между %uK и %uK.\n"
-#: src/redshift.c:739
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Гамма должна быть между %.1f и %.1f.\n"
-#: src/redshift.c:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Гамма: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr ""
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr ""
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr ""
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr ""
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Высота Солнца над горизонтом: %f°\n"
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Цветовая температура: %uK\n"
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr "Корректировка цветовой температуры не удалась.\n"
+#: src/config-ini.c:109
+#, fuzzy
+msgid "Malformed section header in config file.\n"
+msgstr "Некорректное значение местоположения.\n"
+
+#: src/config-ini.c:145
+msgid "Malformed assignment in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -282,7 +328,7 @@ msgstr "Неподдерживаемая версия RANDR (%u.%u)\n"
msgid "Screen %i could not be found.\n"
msgstr "Экран %i не может быть найден.\n"
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Размер кривой гаммы слишком мал: %i\n"
@@ -304,12 +350,12 @@ msgid ""
" crtc=N\tCRTC to apply adjustments to\n"
msgstr ""
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr "Отсутствует значение для параметра: `%s'.\n"
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr "Неизвестный параметр метода: `%s'.\n"
@@ -329,19 +375,19 @@ msgstr "Правильный CRTCs [0-%d].\n"
msgid "Only CRTC 0 exists.\n"
msgstr "Существует только CRTC 0.\n"
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr "Ошибка X запроса: %s\n"
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr ""
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr ""
@@ -369,28 +415,28 @@ msgstr ""
msgid "Unable to set gamma ramps.\n"
msgstr ""
-#: src/location-gnome-clock.c:47
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
+msgstr "Ошибка при чтении списка городов: `%s'.\n"
+
+#: src/location-gnome-clock.c:83
msgid "Cannot list GNOME panel applets.\n"
msgstr ""
-#: src/location-gnome-clock.c:81
+#: src/location-gnome-clock.c:125
msgid "No clock applet was found.\n"
msgstr "Апплет часов не найден.\n"
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
-msgstr "Ошибка при чтении списка городов: `%s'.\n"
-
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr ""
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr ""
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr "Использовать местоположение, указанное в апплете Gnome Clock\n"
@@ -426,9 +472,6 @@ msgstr "Включить / Выключить"
msgid "Autostart"
msgstr ""
-#~ msgid "Malformed location argument.\n"
-#~ msgstr "Некорректное значение местоположения.\n"
-
#~ msgid "RANDR method was not enabled at compile time.\n"
#~ msgstr "Метод RANDR был выключен во время компиляции.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 61fdfc3..6d3285b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,27 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-08-18 21:09+0200\n"
+"POT-Creation-Date: 2010-10-18 01:15+0200\n"
"PO-Revision-Date: 2010-08-18 21:20+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:243
+#: src/redshift.c:244
#, c-format
msgid "Period: Night\n"
msgstr ""
-#: src/redshift.c:250
+#: src/redshift.c:251
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr ""
-#: src/redshift.c:254
+#: src/redshift.c:255
#, c-format
msgid "Period: Daytime\n"
msgstr ""
@@ -37,20 +38,20 @@ msgstr ""
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:269
+#: src/redshift.c:270
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr ""
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:275
+#: src/redshift.c:276
msgid "Set color temperature of display according to time of day.\n"
msgstr ""
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:281
+#: src/redshift.c:282
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -59,8 +60,9 @@ msgstr ""
#. TRANSLATORS: help output 4
#. `list' must not be translated
#. no-wrap
-#: src/redshift.c:288
+#: src/redshift.c:289
msgid ""
+" -c FILE\tLoad settings from specified configuration file\n"
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic location updates\n"
@@ -74,7 +76,18 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 5
-#: src/redshift.c:304
+#: src/redshift.c:306
+#, c-format
+msgid ""
+"The neutral temperature is %uK. Using this value will not\n"
+"change the color temperature of the display. Setting the\n"
+"color temperature to a value higher than this results in\n"
+"more blue light, and setting a lower value will result in\n"
+"more red light.\n"
+msgstr ""
+
+#. TRANSLATORS: help output 6
+#: src/redshift.c:316
#, c-format
msgid ""
"Default values:\n"
@@ -83,174 +96,204 @@ msgid ""
" Night temperature: %uK\n"
msgstr ""
-#. TRANSLATORS: help output 6
-#: src/redshift.c:312
+#. TRANSLATORS: help output 7
+#: src/redshift.c:324
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr ""
-#: src/redshift.c:318
+#: src/redshift.c:330
msgid "Available adjustment methods:\n"
msgstr ""
-#: src/redshift.c:324
+#: src/redshift.c:336
msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:327
+#: src/redshift.c:339
msgid "Try `-m METHOD:help' for help.\n"
msgstr ""
-#: src/redshift.c:333
+#: src/redshift.c:345
msgid "Available location providers:\n"
msgstr ""
-#: src/redshift.c:339
+#: src/redshift.c:351
msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"
msgstr ""
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:342
+#: src/redshift.c:354
msgid "Try `-l PROVIDER:help' for help.\n"
msgstr ""
-#: src/redshift.c:354 src/redshift.c:407
+#: src/redshift.c:367 src/redshift.c:445
#, c-format
msgid "Initialization of %s failed.\n"
msgstr ""
-#: src/redshift.c:376 src/redshift.c:429
+#: src/redshift.c:382 src/redshift.c:413 src/redshift.c:460 src/redshift.c:491
#, c-format
msgid "Failed to set %s option.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:379
+#: src/redshift.c:387 src/redshift.c:416
#, c-format
msgid "Try `-l %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:391
+#: src/redshift.c:428
#, c-format
msgid "Failed to start provider %s.\n"
msgstr ""
+#. TRANSLATORS: `help' must not be
+#. translated.
+#: src/redshift.c:465
+#, c-format
+msgid "Try `-m %s:help' for more information.\n"
+msgstr ""
+
#. TRANSLATORS: `help' must not be translated.
-#: src/redshift.c:432
+#: src/redshift.c:494
#, c-format
msgid "Try -m %s:help' for more information.\n"
msgstr ""
-#: src/redshift.c:444
+#: src/redshift.c:506
#, c-format
msgid "Failed to start adjustment method %s.\n"
msgstr ""
-#: src/redshift.c:501
+#: src/redshift.c:613
msgid "Malformed gamma argument.\n"
msgstr ""
-#: src/redshift.c:503 src/redshift.c:618 src/redshift.c:633
+#: src/redshift.c:615 src/redshift.c:710 src/redshift.c:725
msgid "Try `-h' for more information.\n"
msgstr ""
-#: src/redshift.c:557
+#: src/redshift.c:656 src/redshift.c:792
#, 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:595
+#: src/redshift.c:687 src/redshift.c:778
#, c-format
-msgid "Unknown method `%s'.\n"
+msgid "Unknown adjustment method `%s'.\n"
msgstr ""
-#: src/redshift.c:616
+#: src/redshift.c:708
msgid "Malformed temperature argument.\n"
msgstr ""
-#: src/redshift.c:659
+#: src/redshift.c:766
+msgid "Malformed gamma setting.\n"
+msgstr ""
+
+#: src/redshift.c:801
+#, c-format
+msgid "Unknown configuration setting `%s'.\n"
+msgstr ""
+
+#: src/redshift.c:836
msgid "Trying next provider...\n"
msgstr ""
-#: src/redshift.c:665
+#: src/redshift.c:842
#, c-format
msgid "Using provider `%s'.\n"
msgstr ""
-#: src/redshift.c:673
+#: src/redshift.c:850
msgid "No more location providers to try.\n"
msgstr ""
-#: src/redshift.c:687
+#: src/redshift.c:864
msgid "Unable to get location from provider.\n"
msgstr ""
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:696
+#: src/redshift.c:873
#, c-format
msgid "Location: %f, %f\n"
msgstr ""
-#: src/redshift.c:703
+#: src/redshift.c:880
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:712
+#: src/redshift.c:889
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:721 src/redshift.c:729
+#: src/redshift.c:898 src/redshift.c:906
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr ""
-#: src/redshift.c:739
+#: src/redshift.c:916
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:745
+#: src/redshift.c:922
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr ""
-#: src/redshift.c:763
+#: src/redshift.c:941
msgid "Trying next method...\n"
msgstr ""
-#: src/redshift.c:768
+#: src/redshift.c:946
#, c-format
msgid "Using method `%s'.\n"
msgstr ""
-#: src/redshift.c:775
+#: src/redshift.c:953
msgid "No more methods to try.\n"
msgstr ""
-#: src/redshift.c:787 src/redshift.c:908
+#: src/redshift.c:965 src/redshift.c:1086
msgid "Unable to read system time.\n"
msgstr ""
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:796
+#: src/redshift.c:974
#, c-format
msgid "Solar elevation: %f\n"
msgstr ""
-#: src/redshift.c:803 src/redshift.c:975
+#: src/redshift.c:981 src/redshift.c:1153
#, c-format
msgid "Color temperature: %uK\n"
msgstr ""
-#: src/redshift.c:808 src/redshift.c:819 src/redshift.c:983
+#: src/redshift.c:986 src/redshift.c:997 src/redshift.c:1161
msgid "Temperature adjustment failed.\n"
msgstr ""
+#: src/config-ini.c:109
+msgid "Malformed section header in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:145
+msgid "Malformed assignment in config file.\n"
+msgstr ""
+
+#: src/config-ini.c:156
+msgid "Assignment outside section in config file.\n"
+msgstr ""
+
#: src/gamma-randr.c:69 src/gamma-randr.c:126 src/gamma-randr.c:165
#: src/gamma-randr.c:191 src/gamma-randr.c:248 src/gamma-randr.c:346
#, c-format
@@ -267,7 +310,7 @@ msgstr ""
msgid "Screen %i could not be found.\n"
msgstr ""
-#: src/gamma-randr.c:177 src/gamma-vidmode.c:86
+#: src/gamma-randr.c:177 src/gamma-vidmode.c:84
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr ""
@@ -289,12 +332,12 @@ msgid ""
" crtc=N\tCRTC to apply adjustments to\n"
msgstr ""
-#: src/gamma-randr.c:285 src/gamma-vidmode.c:144
+#: src/gamma-randr.c:285 src/gamma-vidmode.c:139
#, c-format
msgid "Missing value for parameter: `%s'.\n"
msgstr ""
-#: src/gamma-randr.c:295 src/gamma-vidmode.c:152 src/location-manual.c:98
+#: src/gamma-randr.c:295 src/gamma-vidmode.c:147 src/location-manual.c:98
#, c-format
msgid "Unknown method parameter: `%s'.\n"
msgstr ""
@@ -314,19 +357,19 @@ msgstr ""
msgid "Only CRTC 0 exists.\n"
msgstr ""
-#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:79
-#: src/gamma-vidmode.c:109 src/gamma-vidmode.c:171 src/gamma-vidmode.c:200
+#: src/gamma-vidmode.c:48 src/gamma-vidmode.c:69 src/gamma-vidmode.c:78
+#: src/gamma-vidmode.c:105 src/gamma-vidmode.c:166 src/gamma-vidmode.c:195
#, c-format
msgid "X request failed: %s\n"
msgstr ""
-#: src/gamma-vidmode.c:131
+#: src/gamma-vidmode.c:126
msgid "Adjust gamma ramps with the X VidMode extension.\n"
msgstr ""
#. TRANSLATORS: VidMode help output
#. left column must not be translated
-#: src/gamma-vidmode.c:136
+#: src/gamma-vidmode.c:131
msgid " screen=N\tX screen to apply adjustments to\n"
msgstr ""
@@ -354,28 +397,28 @@ msgstr ""
msgid "Unable to set gamma ramps.\n"
msgstr ""
-#: src/location-gnome-clock.c:47
-msgid "Cannot list GNOME panel applets.\n"
+#: src/location-gnome-clock.c:50
+#, c-format
+msgid "Error reading city list: `%s'.\n"
msgstr ""
-#: src/location-gnome-clock.c:81
-msgid "No clock applet was found.\n"
+#: src/location-gnome-clock.c:83
+msgid "Cannot list GNOME panel applets.\n"
msgstr ""
-#: src/location-gnome-clock.c:89
-#, c-format
-msgid "Error reading city list: `%s'.\n"
+#: src/location-gnome-clock.c:125
+msgid "No clock applet was found.\n"
msgstr ""
-#: src/location-gnome-clock.c:109
+#: src/location-gnome-clock.c:130
msgid "No city selected as current city.\n"
msgstr ""
-#: src/location-gnome-clock.c:116
+#: src/location-gnome-clock.c:139
msgid "Location not specified for city.\n"
msgstr ""
-#: src/location-gnome-clock.c:143
+#: src/location-gnome-clock.c:169
msgid "Use the location as set in the GNOME Clock applet.\n"
msgstr ""
diff --git a/redshift.1 b/redshift.1
new file mode 100644
index 0000000..8a1560b
--- /dev/null
+++ b/redshift.1
@@ -0,0 +1,73 @@
+.TH REDSHIFT: "1" "August 2010" "redshift" "User Commands"
+.SH NAME
+redshift \- Set color temperature of display according to time of day.
+.SH SYNOPSIS
+.B redshift
+\fI-l LAT:LON -t DAY:NIGHT \fR[\fIOPTIONS\fR...]
+.SH DESCRIPTION
+.B redshift
+adjusts the color temperature of your screen according to your
+surroundings. This may help your eyes hurt less if you are working in
+front of the screen at night.
+
+The color temperature is set according to the position of the sun. A
+different color temperature is set during night and daytime. During
+twilight and early morning, the color temperature transitions smoothly
+from night to daytime temperature to allow your eyes to slowly
+adapt.
+.SH OPTIONS
+.TP
+\fB\-h\fR
+Display this help message
+.TP
+\fB\-v\fR
+Verbose output
+.TP
+\fB\-g\fR R:G:B
+Additional gamma correction to apply
+.TP
+\fB\-l\fR LAT:LON
+Your current location
+.TP
+\fB\-l\fR PROVIDER
+Select provider for automatic location updates
+(Type `list' to see available providers)
+.TP
+\fB\-m\fR METHOD
+Method to use to set color temperature
+(Type `list' to see available methods)
+.TP
+\fB\-o\fR
+One shot mode (do not continously adjust color temperature)
+.TP
+\fB\-x\fR
+Reset mode (remove adjustment from screen)
+.TP
+\fB\-r\fR
+Disable temperature transitions
+.TP
+\fB\-t\fR DAY:NIGHT
+Color temperature to set at daytime/night
+.PP
+Default values:
+.IP
+Daytime temperature: 5500K
+Night temperature: 3700K
+.SH EXAMPLE
+Example for Copenhagen, Denmark:
+.IP
+$ redshift -l 55.7:12.6 -t 5700:3600 -g 0.8 -m vidmode -v
+.SH AUTHOR
+.B redshift
+was written by Jon Lund Steffensen <jonlst@gmail.com>.
+.PP
+Both
+.B redshift
+and this manual page are released under the GNU General Public
+License, version 3.
+.SH BUGS
+Please report bugs to <https://bugs.launchpad.net/redshift>
+.SH KNOWN ISSUES
+Redshift won’t affect the color of your cursor when your graphics driver
+is configured to use hardware cursors. Some graphics drivers have an
+option to disable hardware cursors in xorg.conf.
diff --git a/src/Makefile.am b/src/Makefile.am
index c07aea3..3680f4a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,11 +9,12 @@ INCLUDES = -DLOCALEDIR=\"$(localedir)\"
bin_PROGRAMS = redshift
redshift_SOURCES = \
- redshift.c \
+ redshift.c redshift.h \
colorramp.c colorramp.h \
+ config-ini.c config-ini.h \
+ location-manual.c location-manual.h \
solar.c solar.h \
- systemtime.c systemtime.h \
- location-manual.c location-manual.h
+ systemtime.c systemtime.h
EXTRA_redshift_SOURCES = \
gamma-randr.c gamma-randr.h \
diff --git a/src/colorramp.c b/src/colorramp.c
index a154a9e..7241a8d 100644
--- a/src/colorramp.c
+++ b/src/colorramp.c
@@ -130,7 +130,7 @@ void
colorramp_fill(uint16_t *gamma_r, uint16_t *gamma_g, uint16_t *gamma_b,
int size, int temp, float gamma[3])
{
- /* Calculate white point */
+ /* Approximate white point */
float white_point[3];
float alpha = (temp % 100) / 100.0;
int temp_index = ((temp - 1000) / 100)*3;
diff --git a/src/config-ini.c b/src/config-ini.c
new file mode 100644
index 0000000..5231ba5
--- /dev/null
+++ b/src/config-ini.c
@@ -0,0 +1,237 @@
+/* config-ini.c -- INI config file parser
+ This file is part of Redshift.
+
+ Redshift is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Redshift is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Redshift. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright (c) 2010 Jon Lund Steffensen <jonlst@gmail.com>
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "config-ini.h"
+
+#ifdef ENABLE_NLS
+# include <libintl.h>
+# define _(s) gettext(s)
+#else
+# define _(s) s
+#endif
+
+#define MAX_CONFIG_PATH 4096
+#define MAX_LINE_LENGTH 512
+
+
+static FILE *
+open_config_file(const char *filepath)
+{
+ FILE *f = NULL;
+
+ if (filepath == NULL) {
+ char cp[MAX_CONFIG_PATH];
+ char *env;
+
+ if ((env = getenv("XDG_CONFIG_HOME")) != NULL &&
+ env[0] != '\0') {
+ snprintf(cp, sizeof(cp), "%s/redshift.conf", env);
+ filepath = cp;
+ } else if ((env = getenv("HOME")) != NULL && env[0] != '\0') {
+ snprintf(cp, sizeof(cp),
+ "%s/.config/redshift.conf", env);
+ filepath = cp;
+ }
+
+ if (filepath != NULL) {
+ f = fopen(filepath, "r");
+ if (f != NULL) return f;
+ else if (f == NULL && errno != ENOENT) return NULL;
+ }
+
+ /* TODO look in getenv("XDG_CONFIG_DIRS") */
+ } else {
+ f = fopen(filepath, "r");
+ if (f == NULL) {
+ perror("fopen");
+ return NULL;
+ }
+ }
+
+ return f;
+}
+
+int
+config_ini_init(config_ini_state_t *state, const char *filepath)
+{
+ config_ini_section_t *section = NULL;
+ state->sections = NULL;
+
+ FILE *f = open_config_file(filepath);
+ if (f == NULL) {
+ /* Only a serious error if a file was explicitly requested. */
+ if (filepath != NULL) return -1;
+ return 0;
+ }
+
+ char line[MAX_LINE_LENGTH];
+ char *s;
+
+ while (1) {
+ /* Handle the file input linewise. */
+ char *r = fgets(line, sizeof(line), f);
+ if (r == NULL) break;
+
+ /* Strip leading blanks and trailing newline. */
+ s = line + strspn(line, " \t");
+ s[strcspn(s, "\r\n")] = '\0';
+
+ /* Skip comments and empty lines. */
+ if (s[0] == ';' || s[0] == '\0') continue;
+
+ if (s[0] == '[') {
+ /* Read name of section. */
+ const char *name = s+1;
+ char *end = strchr(s, ']');
+ if (end == NULL || end[1] != '\0' || end == name) {
+ fputs(_("Malformed section header in config"
+ " file.\n"), stderr);
+ fclose(f);
+ config_ini_free(state);
+ return -1;
+ }
+
+ *end = '\0';
+
+ /* Create section. */
+ section = malloc(sizeof(config_ini_section_t));
+ if (section == NULL) {
+ fclose(f);
+ config_ini_free(state);
+ return -1;
+ }
+
+ /* Insert into section list. */
+ section->name = NULL;
+ section->settings = NULL;
+ section->next = state->sections;
+ state->sections = section;
+
+ /* Copy section name. */
+ section->name = malloc(end - name + 1);
+ if (section->name == NULL) {
+ fclose(f);
+ config_ini_free(state);
+ return -1;
+ }
+
+ memcpy(section->name, name, end - name + 1);
+ } else {
+ /* Split assignment at equals character. */
+ char *end = strchr(s, '=');
+ if (end == NULL || end == s) {
+ fputs(_("Malformed assignment in config"
+ " file.\n"), stderr);
+ fclose(f);
+ config_ini_free(state);
+ return -1;
+ }
+
+ *end = '\0';
+ char *value = end + 1;
+
+ if (section == NULL) {
+ fputs(_("Assignment outside section in config"
+ " file.\n"), stderr);
+ fclose(f);
+ config_ini_free(state);
+ return -1;
+ }
+
+ /* Create section. */
+ config_ini_setting_t *setting =
+ malloc(sizeof(config_ini_setting_t));
+ if (setting == NULL) {
+ fclose(f);
+ config_ini_free(state);
+ return -1;
+ }
+
+ /* Insert into section list. */
+ setting->name = NULL;
+ setting->value = NULL;
+ setting->next = section->settings;
+ section->settings = setting;
+
+ /* Copy name of setting. */
+ setting->name = malloc(end - s + 1);
+ if (setting->name == NULL) {
+ fclose(f);
+ config_ini_free(state);
+ return -1;
+ }
+
+ memcpy(setting->name, s, end - s + 1);
+
+ /* Copy setting value. */
+ size_t value_len = strlen(value) + 1;
+ setting->value = malloc(value_len);
+ if (setting->value == NULL) {
+ fclose(f);
+ config_ini_free(state);
+ return -1;
+ }
+
+ memcpy(setting->value, value, value_len);
+ }
+ }
+
+ fclose(f);
+
+ return 0;
+}
+
+void
+config_ini_free(config_ini_state_t *state)
+{
+ config_ini_section_t *section = state->sections;
+
+ while (section != NULL) {
+ config_ini_setting_t *setting = section->settings;
+
+ while (setting != NULL) {
+ free(setting->name);
+ free(setting->value);
+ setting = setting->next;
+ }
+
+ free(section->name);
+ section = section->next;
+ }
+}
+
+config_ini_section_t *
+config_ini_get_section(config_ini_state_t *state, const char *name)
+{
+ config_ini_section_t *section = state->sections;
+ while (section != NULL) {
+ if (strcasecmp(section->name, name) == 0) {
+ return section;
+ }
+ section = section->next;
+ }
+
+ return NULL;
+}
diff --git a/src/config-ini.h b/src/config-ini.h
new file mode 100644
index 0000000..e1bff73
--- /dev/null
+++ b/src/config-ini.h
@@ -0,0 +1,49 @@
+/* config-ini.h -- INI config file parser header
+ This file is part of Redshift.
+
+ Redshift is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Redshift is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Redshift. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright (c) 2010 Jon Lund Steffensen <jonlst@gmail.com>
+*/
+
+#ifndef _REDSHIFT_CONFIG_INI_H
+#define _REDSHIFT_CONFIG_INI_H
+
+typedef struct _config_ini_section config_ini_section_t;
+typedef struct _config_ini_setting config_ini_setting_t;
+
+struct _config_ini_setting {
+ config_ini_setting_t *next;
+ char *name;
+ char *value;
+};
+
+struct _config_ini_section {
+ config_ini_section_t *next;
+ char *name;
+ config_ini_setting_t *settings;
+};
+
+typedef struct {
+ config_ini_section_t *sections;
+} config_ini_state_t;
+
+
+int config_ini_init(config_ini_state_t *state, const char *filepath);
+void config_ini_free(config_ini_state_t *state);
+
+config_ini_section_t *config_ini_get_section(config_ini_state_t *state,
+ const char *name);
+
+#endif /* ! _REDSHIFT_CONFIG_INI_H */
diff --git a/src/gamma-randr.c b/src/gamma-randr.c
index 66d5c48..be8bdd9 100644
--- a/src/gamma-randr.c
+++ b/src/gamma-randr.c
@@ -62,9 +62,12 @@ randr_init(randr_state_t *state)
xcb_randr_query_version_reply_t *ver_reply =
xcb_randr_query_version_reply(state->conn, ver_cookie, &error);
- if (error) {
+ /* TODO What does it mean when both error and ver_reply is NULL?
+ Apparently, we have to check both to avoid seg faults. */
+ if (error || ver_reply == NULL) {
+ int ec = (error != 0) ? error->error_code : -1;
fprintf(stderr, _("`%s' returned error %d\n"),
- "RANDR Query Version", error->error_code);
+ "RANDR Query Version", ec);
xcb_disconnect(state->conn);
return -1;
}
diff --git a/src/gamma-vidmode.c b/src/gamma-vidmode.c
index e6b9412..7b891d8 100644
--- a/src/gamma-vidmode.c
+++ b/src/gamma-vidmode.c
@@ -68,7 +68,6 @@ vidmode_start(vidmode_state_t *state)
if (!r) {
fprintf(stderr, _("X request failed: %s\n"),
"XF86VidModeQueryVersion");
- XCloseDisplay(state->display);
return -1;
}
@@ -78,14 +77,12 @@ vidmode_start(vidmode_state_t *state)
if (!r) {
fprintf(stderr, _("X request failed: %s\n"),
"XF86VidModeGetGammaRampSize");
- XCloseDisplay(state->display);
return -1;
}
if (state->ramp_size == 0) {
fprintf(stderr, _("Gamma ramp size too small: %i\n"),
state->ramp_size);
- XCloseDisplay(state->display);
return -1;
}
@@ -93,7 +90,6 @@ vidmode_start(vidmode_state_t *state)
state->saved_ramps = malloc(3*state->ramp_size*sizeof(uint16_t));
if (state->saved_ramps == NULL) {
perror("malloc");
- XCloseDisplay(state->display);
return -1;
}
@@ -108,7 +104,6 @@ vidmode_start(vidmode_state_t *state)
if (!r) {
fprintf(stderr, _("X request failed: %s\n"),
"XF86VidModeGetGammaRamp");
- XCloseDisplay(state->display);
return -1;
}
diff --git a/src/gtk-redshift/Makefile.am b/src/gtk-redshift/Makefile.am
index ddeafd6..bb69459 100644
--- a/src/gtk-redshift/Makefile.am
+++ b/src/gtk-redshift/Makefile.am
@@ -1,38 +1,19 @@
-if ENABLE_STATUSICON
-gui_module=statusicon
+if ENABLE_GUI
gtk_redshift_PYTHON = \
__init__.py \
+ utils.py \
statusicon.py
nodist_gtk_redshift_PYTHON = \
defs.py
gtk_redshiftdir = $(pythondir)/gtk_redshift
-bin_SCRIPTS = gtk-redshift
+dist_bin_SCRIPTS = gtk-redshift
endif
-if ENABLE_APPINDICATOR
-gui_module=rsappindicator
-gtk_redshift_PYTHON = \
- __init__.py \
- rsappindicator.py
-nodist_gtk_redshift_PYTHON = \
- defs.py
-gtk_redshiftdir = $(pythondir)/gtk_redshift
-
-bin_SCRIPTS = gtk-redshift
-endif
-
-EXTRA_DIST = gtk-redshift.in \
- defs.py.in
-
-CLEANFILES = defs.py \
- gtk-redshift
-
+EXTRA_DIST = defs.py.in
+CLEANFILES = defs.py
-# Main GUI script
-gtk-redshift: gtk-redshift.in
- sed -e "s|\@gui_module\@|$(gui_module)|g" $< > $@
# Local python definitions
defs.py: defs.py.in
diff --git a/src/gtk-redshift/__init__.py b/src/gtk-redshift/__init__.py
index 51ab2ef..0e4f254 100644
--- a/src/gtk-redshift/__init__.py
+++ b/src/gtk-redshift/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# __init__.py -- gtk-redshift package __init__ file
# This file is part of Redshift.
diff --git a/src/gtk-redshift/defs.py.in b/src/gtk-redshift/defs.py.in
index d3ca5ed..026fefd 100644
--- a/src/gtk-redshift/defs.py.in
+++ b/src/gtk-redshift/defs.py.in
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# defs.py -- GTK+ redshift local definitions
# This file is part of Redshift.
diff --git a/src/gtk-redshift/gtk-redshift.in b/src/gtk-redshift/gtk-redshift
index 120e05c..56d940e 100644
--- a/src/gtk-redshift/gtk-redshift.in
+++ b/src/gtk-redshift/gtk-redshift
@@ -19,5 +19,5 @@
if __name__ == '__main__':
- from gtk_redshift.@gui_module@ import run
+ from gtk_redshift.statusicon import run
run()
diff --git a/src/gtk-redshift/rsappindicator.py b/src/gtk-redshift/rsappindicator.py
deleted file mode 100644
index 59fa725..0000000
--- a/src/gtk-redshift/rsappindicator.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env python
-# rsappindicator.py -- Application Panel Indicator source
-# This file is part of Redshift.
-
-# Redshift is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# Redshift is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with Redshift. If not, see <http://www.gnu.org/licenses/>.
-
-# Copyright (c) 2010 Jon Lund Steffensen <jonlst@gmail.com>
-
-
-import sys, os
-import subprocess, signal
-import gettext
-
-import pygtk
-pygtk.require("2.0")
-
-import gtk, glib
-try:
- import appindicator
-except ImportError as ie:
- # No module named appindicator
- sys.exit(str(ie))
-
-import defs
-
-
-def run():
- # Internationalisation
- gettext.bindtextdomain('redshift', defs.LOCALEDIR)
- gettext.textdomain('redshift')
- _ = gettext.gettext
-
- # Start redshift with arguments from the command line
- args = sys.argv[1:]
- args.insert(0, os.path.join(defs.BINDIR, 'redshift'))
- process = subprocess.Popen(args)
-
- try:
- # Create status icon
- indicator = appindicator.Indicator ("redshift",
- "redshift",
- appindicator.CATEGORY_APPLICATION_STATUS)
- indicator.set_status (appindicator.STATUS_ACTIVE)
-
- def toggle_cb(widget, data=None):
- if indicator.get_icon() == 'redshift':
- indicator.set_icon('redshift-idle')
- else:
- indicator.set_icon('redshift')
- process.send_signal(signal.SIGUSR1)
-
- def destroy_cb(widget, data=None):
- gtk.main_quit()
- return False
-
- # Create popup menu
- status_menu = gtk.Menu()
-
- toggle_item = gtk.ImageMenuItem(_('Toggle'))
- toggle_item.connect('activate', toggle_cb)
- status_menu.append(toggle_item)
-
- quit_item = gtk.ImageMenuItem(gtk.STOCK_QUIT)
- quit_item.connect('activate', destroy_cb)
- status_menu.append(quit_item)
-
- status_menu.show_all()
-
- # Set the menu
- indicator.set_menu(status_menu)
-
- def child_cb(pid, cond, data=None):
- sys.exit(-1)
-
- # Add watch on child process
- glib.child_watch_add(process.pid, child_cb)
-
- # Run main loop
- gtk.main()
-
- except KeyboardInterrupt:
- # Ignore user interruption
- pass
-
- finally:
- # Always terminate redshift
- process.terminate()
- process.wait()
diff --git a/src/gtk-redshift/statusicon.py b/src/gtk-redshift/statusicon.py
index 2295963..29801e8 100644
--- a/src/gtk-redshift/statusicon.py
+++ b/src/gtk-redshift/statusicon.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-# statusicon.py -- GTK+ status icon source
+# statusicon.py -- GUI status icon source
# This file is part of Redshift.
# Redshift is free software: you can redistribute it and/or modify
@@ -18,6 +17,12 @@
# Copyright (c) 2010 Jon Lund Steffensen <jonlst@gmail.com>
+'''GUI status icon for Redshift.
+
+The run method will try to start an appindicator for Redshift. If the
+appindicator module isn't present it will fall back to a GTK status icon.
+'''
+
import sys, os
import subprocess, signal
import gettext
@@ -26,8 +31,13 @@ import pygtk
pygtk.require("2.0")
import gtk, glib
+try:
+ import appindicator
+except ImportError:
+ appindicator = None
import defs
+import utils
def run():
@@ -42,39 +52,76 @@ def run():
process = subprocess.Popen(args)
try:
- # Create status icon
- status_icon = gtk.StatusIcon()
- status_icon.set_from_icon_name('redshift')
- status_icon.set_tooltip('Redshift')
+ if appindicator:
+ # Create indicator
+ indicator = appindicator.Indicator('redshift', 'redshift',
+ appindicator.CATEGORY_APPLICATION_STATUS)
+ indicator.set_status(appindicator.STATUS_ACTIVE)
+ else:
+ # Create status icon
+ status_icon = gtk.StatusIcon()
+ status_icon.set_from_icon_name('redshift-status-on')
+ status_icon.set_tooltip('Redshift')
def toggle_cb(widget, data=None):
process.send_signal(signal.SIGUSR1)
+ if appindicator:
+ if indicator.get_icon() == 'redshift':
+ indicator.set_icon('redshift-status-off')
+ else:
+ indicator.set_icon('redshift-status-on')
+ else:
+ if status_icon.get_icon_name() == 'redshift':
+ status_icon.set_from_icon_name('redshift-status-off')
+ else:
+ status_icon.set_from_icon_name('redshift-status-on')
+
+ def autostart_cb(widget, data=None):
+ utils.set_autostart(widget.get_active())
def destroy_cb(widget, data=None):
- status_icon.set_visible(False)
+ if not appindicator:
+ status_icon.set_visible(False)
gtk.main_quit()
return False
# Create popup menu
status_menu = gtk.Menu()
- toggle_item = gtk.ImageMenuItem(_('Toggle'))
+ toggle_item = gtk.MenuItem(_('Toggle'))
toggle_item.connect('activate', toggle_cb)
status_menu.append(toggle_item)
+ autostart_item = gtk.CheckMenuItem(_('Autostart'))
+ try:
+ autostart_item.set_active(utils.get_autostart())
+ except IOError as strerror:
+ print strerror
+ autostart_item.set_property('sensitive', False)
+ else:
+ autostart_item.connect('activate', autostart_cb)
+ finally:
+ status_menu.append(autostart_item)
+
quit_item = gtk.ImageMenuItem(gtk.STOCK_QUIT)
quit_item.connect('activate', destroy_cb)
status_menu.append(quit_item)
- def popup_menu_cb(widget, button, time, data=None):
+ if appindicator:
status_menu.show_all()
- status_menu.popup(None, None, gtk.status_icon_position_menu,
- button, time, status_icon)
- # Connect signals for status icon and show
- status_icon.connect('activate', toggle_cb)
- status_icon.connect('popup-menu', popup_menu_cb)
- status_icon.set_visible(True)
+ # Set the menu
+ indicator.set_menu(status_menu)
+ else:
+ def popup_menu_cb(widget, button, time, data=None):
+ status_menu.show_all()
+ status_menu.popup(None, None, gtk.status_icon_position_menu,
+ button, time, status_icon)
+
+ # Connect signals for status icon and show
+ status_icon.connect('activate', toggle_cb)
+ status_icon.connect('popup-menu', popup_menu_cb)
+ status_icon.set_visible(True)
def child_cb(pid, cond, data=None):
sys.exit(-1)
diff --git a/src/gtk-redshift/utils.py b/src/gtk-redshift/utils.py
new file mode 100644
index 0000000..93e0195
--- /dev/null
+++ b/src/gtk-redshift/utils.py
@@ -0,0 +1,66 @@
+# utils.py -- utility functions source
+# This file is part of Redshift.
+
+# Redshift is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Redshift is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Redshift. If not, see <http://www.gnu.org/licenses/>.
+
+# Copyright (c) 2010 Francesco Marella <francesco.marella@gmail.com>
+
+import os
+from xdg import BaseDirectory as base
+from xdg import DesktopEntry as desktop
+
+REDSHIFT_DESKTOP = 'gtk-redshift.desktop'
+
+
+def get_autostart():
+ AUTOSTART_KEY = "X-GNOME-Autostart-enabled"
+ autostart_dir = base.save_config_path("autostart")
+ autostart_file = os.path.join(autostart_dir, REDSHIFT_DESKTOP)
+ if not os.path.exists(autostart_file):
+ desktop_files = list(base.load_data_paths("applications",
+ REDSHIFT_DESKTOP))
+ if not desktop_files:
+ raise IOError("Installed redshift desktop file not found!")
+ desktop_file_path = desktop_files[0]
+ # Read installed file and modify it
+ dfile = desktop.DesktopEntry(desktop_file_path)
+ dfile.set(AUTOSTART_KEY, "false")
+ dfile.write(filename=autostart_file)
+ return False
+ else:
+ dfile = desktop.DesktopEntry(autostart_file)
+ if dfile.get(AUTOSTART_KEY) == 'false':
+ return False
+ else:
+ return True
+
+def set_autostart(active):
+ AUTOSTART_KEY = "X-GNOME-Autostart-enabled"
+ autostart_dir = base.save_config_path("autostart")
+ autostart_file = os.path.join(autostart_dir, REDSHIFT_DESKTOP)
+ if not os.path.exists(autostart_file):
+ desktop_files = list(base.load_data_paths("applications",
+ REDSHIFT_DESKTOP))
+ if not desktop_files:
+ raise IOError("Installed redshift desktop file not found!")
+ return
+ desktop_file_path = desktop_files[0]
+ # Read installed file and modify it
+ dfile = desktop.DesktopEntry(desktop_file_path)
+ else:
+ dfile = desktop.DesktopEntry(autostart_file)
+ activestr = str(bool(active)).lower()
+ # print "Setting autostart to %s" % activestr
+ dfile.set(AUTOSTART_KEY, activestr)
+ dfile.write(filename=autostart_file)
diff --git a/src/location-gnome-clock.c b/src/location-gnome-clock.c
index 10b95eb..8c317ed 100644
--- a/src/location-gnome-clock.c
+++ b/src/location-gnome-clock.c
@@ -32,6 +32,41 @@
#endif
+/* Find current selected city for the clock applet with the specified id.
+ Returns NULL if not found. */
+static char *
+find_current_city(GConfClient *client, const char *id)
+{
+ GError *error = NULL;
+
+ char *current_city = NULL;
+ char *cities_key = g_strdup_printf("/apps/panel/applets/%s"
+ "/prefs/cities", id);
+ GSList *cities = gconf_client_get_list(client,
+ cities_key,
+ GCONF_VALUE_STRING, &error);
+
+ if (error) {
+ fprintf(stderr, _("Error reading city list: `%s'.\n"),
+ cities_key);
+ g_free(cities_key);
+ return NULL;
+ }
+
+ g_free(cities_key);
+
+ for (GSList *city = cities; city != NULL;
+ city = g_slist_next(city)) {
+ char *city_spec = city->data;
+ char *c = strstr(city_spec, "current=\"true\"");
+ if (c) current_city = g_strdup(city_spec);
+ g_free(city->data);
+ }
+ g_slist_free(cities);
+
+ return current_city;
+}
+
int
location_gnome_clock_init(location_gnome_clock_state_t *state)
{
@@ -40,80 +75,74 @@ location_gnome_clock_init(location_gnome_clock_state_t *state)
GError *error = NULL;
GConfClient *client = gconf_client_get_default();
- GSList *applets = gconf_client_all_dirs(client, "/apps/panel/applets",
- &error);
+ /* Get a list of active applets in the panel. */
+ GSList *applets = gconf_client_get_list(client,
+ "/apps/panel/general/applet_id_list",
+ GCONF_VALUE_STRING, &error);
if (error) {
- fputs(_("Cannot list dirs in `/apps/panel/applets'.\n"),
- stderr);
+ fputs(_("Cannot list GNOME panel applets.\n"), stderr);
g_object_unref(client);
+ g_slist_free(applets);
return -1;
}
- char *cities_key = NULL;
+ /* Go through each applet and check if it is a clock applet.
+ When a clock applet is found, check whether there is a
+ city selected as the current city. */
+ char *current_city = NULL;
+
+ /* Keep track of the number of clock applets found to be able to give
+ better error output if something fails. */
+ int clock_applet_count = 0;
+
for (GSList *applet = applets; applet != NULL;
applet = g_slist_next(applet)) {
- char *path = applet->data;
- if (cities_key == NULL) {
- char *key = g_strdup_printf("%s/bonobo_iid", path);
+ char *id = applet->data;
+ if (current_city == NULL) {
+ char *key = g_strdup_printf("/apps/panel/applets/%s"
+ "/bonobo_iid", id);
char *bonobo_iid = gconf_client_get_string(client, key,
&error);
- if (!error && bonobo_iid != NULL) {
- if (!strcmp(bonobo_iid,
- "OAFIID:GNOME_ClockApplet")) {
- cities_key = g_strdup_printf(
- "%s/prefs/cities", path);
- }
- g_free(bonobo_iid);
+ if (!error && bonobo_iid != NULL &&
+ !strcmp(bonobo_iid, "OAFIID:GNOME_ClockApplet")) {
+ clock_applet_count += 1;
+ current_city = find_current_city(client, id);
}
+ g_free(bonobo_iid);
g_free(key);
}
- g_free(path);
+ g_free(id);
}
g_slist_free(applets);
+ g_object_unref(client);
- if (cities_key == NULL) {
- fputs(_("No clock applet was found.\n"), stderr);
- g_object_unref(client);
- return -1;
- }
+ /* Check whether an applet and a current city was found. */
- GSList *cities = gconf_client_get_list(client, cities_key,
- GCONF_VALUE_STRING, &error);
- if (error) {
- fprintf(stderr, _("Error reading city list: `%s'.\n"),
- cities_key);
- g_free(cities_key);
- g_object_unref(client);
+ if (clock_applet_count == 0) {
+ fputs(_("No clock applet was found.\n"), stderr);
return -1;
}
- g_free(cities_key);
-
- char *current_city = NULL;
- for (GSList *city = cities; city != NULL;
- city = g_slist_next(city)) {
- char *city_spec = city->data;
- char *c = strstr(city_spec, "current=\"true\"");
- if (c) current_city = g_strdup(city_spec);
- g_free(city->data);
- }
- g_slist_free(cities);
-
if (current_city == NULL) {
fputs(_("No city selected as current city.\n"), stderr);
return -1;
}
+ /* Find coords for selected city and parse as number. */
+
char *lat_str = strstr(current_city, "latitude=\"");
char *lon_str = strstr(current_city, "longitude=\"");
if (lat_str == NULL || lon_str == NULL) {
fputs(_("Location not specified for city.\n"), stderr);
+ g_free(current_city);
return -1;
}
+ g_free(current_city);
+
char *lat_num_str = lat_str + strlen("latitude=\"");
char *lon_num_str = lon_str + strlen("longitude=\"");
diff --git a/src/redshift.c b/src/redshift.c
index 18cc2c5..f5a7762 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -42,6 +42,7 @@
#endif
#include "redshift.h"
+#include "config-ini.h"
#include "solar.h"
#include "systemtime.h"
@@ -285,7 +286,8 @@ print_help(const char *program_name)
/* TRANSLATORS: help output 4
`list' must not be translated
no-wrap */
- fputs(_(" -g R:G:B\tAdditional gamma correction to apply\n"
+ fputs(_(" -c FILE\tLoad settings from specified configuration file\n"
+ " -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
" -l PROVIDER\tSelect provider for automatic"
" location updates\n"
@@ -301,6 +303,16 @@ print_help(const char *program_name)
fputs("\n", stdout);
/* TRANSLATORS: help output 5 */
+ printf(_("The neutral temperature is %uK. Using this value will not\n"
+ "change the color temperature of the display. Setting the\n"
+ "color temperature to a value higher than this results in\n"
+ "more blue light, and setting a lower value will result in\n"
+ "more red light.\n"),
+ NEUTRAL_TEMP);
+
+ fputs("\n", stdout);
+
+ /* TRANSLATORS: help output 6 */
printf(_("Default values:\n\n"
" Daytime temperature: %uK\n"
" Night temperature: %uK\n"),
@@ -308,7 +320,7 @@ print_help(const char *program_name)
fputs("\n", stdout);
- /* TRANSLATORS: help output 6 */
+ /* TRANSLATORS: help output 7 */
printf(_("Please report bugs to <%s>\n"), PACKAGE_BUGREPORT);
}
@@ -345,7 +357,8 @@ print_provider_list()
static int
provider_try_start(const location_provider_t *provider,
- location_state_t *state, char *args)
+ location_state_t *state,
+ config_ini_state_t *config, char *args)
{
int r;
@@ -356,7 +369,31 @@ provider_try_start(const location_provider_t *provider,
return -1;
}
- /* Set provider options. */
+ /* Set provider options from config file. */
+ config_ini_section_t *section =
+ config_ini_get_section(config, provider->name);
+ if (section != NULL) {
+ config_ini_setting_t *setting = section->settings;
+ while (setting != NULL) {
+ r = provider->set_option(state, setting->name,
+ setting->value);
+ if (r < 0) {
+ provider->free(state);
+ fprintf(stderr, _("Failed to set %s"
+ " option.\n"),
+ provider->name);
+ /* TRANSLATORS: `help' must not be
+ translated. */
+ fprintf(stderr, _("Try `-l %s:help' for more"
+ " information.\n"),
+ provider->name);
+ return -1;
+ }
+ setting = setting->next;
+ }
+ }
+
+ /* Set provider options from command line. */
while (args != NULL) {
char *next_arg = strchr(args, ':');
if (next_arg != NULL) *(next_arg++) = '\0';
@@ -398,7 +435,8 @@ provider_try_start(const location_provider_t *provider,
static int
method_try_start(const gamma_method_t *method,
- gamma_state_t *state, char *args)
+ gamma_state_t *state,
+ config_ini_state_t *config, char *args)
{
int r;
@@ -409,7 +447,31 @@ method_try_start(const gamma_method_t *method,
return -1;
}
- /* Set method options. */
+ /* Set method options from config file. */
+ config_ini_section_t *section =
+ config_ini_get_section(config, method->name);
+ if (section != NULL) {
+ config_ini_setting_t *setting = section->settings;
+ while (setting != NULL) {
+ r = method->set_option(state, setting->name,
+ setting->value);
+ if (r < 0) {
+ method->free(state);
+ fprintf(stderr, _("Failed to set %s"
+ " option.\n"),
+ method->name);
+ /* TRANSLATORS: `help' must not be
+ translated. */
+ fprintf(stderr, _("Try `-m %s:help' for more"
+ " information.\n"),
+ method->name);
+ return -1;
+ }
+ setting = setting->next;
+ }
+ }
+
+ /* Set method options from command line. */
while (args != NULL) {
char *next_arg = strchr(args, ':');
if (next_arg != NULL) *(next_arg++) = '\0';
@@ -449,6 +511,60 @@ method_try_start(const gamma_method_t *method,
return 0;
}
+/* A gamma string contains either one floating point value,
+ or three values separated by colon. */
+static int
+parse_gamma_string(const char *str, float gamma[])
+{
+ char *s = strchr(str, ':');
+ if (s == NULL) {
+ /* Use value for all channels */
+ float g = atof(str);
+ gamma[0] = gamma[1] = gamma[2] = g;
+ } else {
+ /* Parse separate value for each channel */
+ *(s++) = '\0';
+ char *g_s = s;
+ s = strchr(s, ':');
+ if (s == NULL) return -1;
+
+ *(s++) = '\0';
+ gamma[0] = atof(str); /* Red */
+ gamma[1] = atof(g_s); /* Blue */
+ gamma[2] = atof(s); /* Green */
+ }
+}
+
+static const gamma_method_t *
+find_gamma_method(const char *name)
+{
+ const gamma_method_t *method = NULL;
+ for (int i = 0; gamma_methods[i].name != NULL; i++) {
+ const gamma_method_t *m = &gamma_methods[i];
+ if (strcasecmp(name, m->name) == 0) {
+ method = m;
+ break;
+ }
+ }
+
+ return method;
+}
+
+static const location_provider_t *
+find_location_provider(const char *name)
+{
+ const location_provider_t *provider = NULL;
+ for (int i = 0; location_providers[i].name != NULL; i++) {
+ const location_provider_t *p = &location_providers[i];
+ if (strcasecmp(name, p->name) == 0) {
+ provider = p;
+ break;
+ }
+ }
+
+ return provider;
+}
+
int
main(int argc, char *argv[])
@@ -465,10 +581,12 @@ main(int argc, char *argv[])
textdomain(PACKAGE);
#endif
- /* Initialize to defaults */
- int temp_day = DEFAULT_DAY_TEMP;
- int temp_night = DEFAULT_NIGHT_TEMP;
- float gamma[3] = { DEFAULT_GAMMA, DEFAULT_GAMMA, DEFAULT_GAMMA };
+ /* Initialize settings to NULL values. */
+ char *config_filepath = NULL;
+
+ int temp_day = -1;
+ int temp_night = -1;
+ float gamma[3] = { NAN, NAN, NAN };
const gamma_method_t *method = NULL;
char *method_args = NULL;
@@ -476,38 +594,27 @@ main(int argc, char *argv[])
const location_provider_t *provider = NULL;
char *provider_args = NULL;
- int transition = 1;
+ int transition = -1;
program_mode_t mode = PROGRAM_MODE_CONTINUAL;
int verbose = 0;
char *s;
- /* Parse arguments. */
+ /* Parse command line arguments. */
int opt;
- while ((opt = getopt(argc, argv, "g:hl:m:ort:vx")) != -1) {
+ while ((opt = getopt(argc, argv, "c:g:hl:m:ort:vx")) != -1) {
switch (opt) {
+ case 'c':
+ if (config_filepath != NULL) free(config_filepath);
+ config_filepath = strdup(optarg);
+ break;
case 'g':
- s = strchr(optarg, ':');
- if (s == NULL) {
- /* Use value for all channels */
- float g = atof(optarg);
- gamma[0] = gamma[1] = gamma[2] = g;
- } else {
- /* Parse separate value for each channel */
- *(s++) = '\0';
- gamma[0] = atof(optarg); /* Red */
- char *g_s = s;
- s = strchr(s, ':');
- if (s == NULL) {
- fputs(_("Malformed gamma argument.\n"),
- stderr);
- fputs(_("Try `-h' for more"
- " information.\n"), stderr);
- exit(EXIT_FAILURE);
- }
-
- *(s++) = '\0';
- gamma[1] = atof(g_s); /* Blue */
- gamma[2] = atof(s); /* Green */
+ r = parse_gamma_string(optarg, gamma);
+ if (r < 0) {
+ fputs(_("Malformed gamma argument.\n"),
+ stderr);
+ fputs(_("Try `-h' for more"
+ " information.\n"), stderr);
+ exit(EXIT_FAILURE);
}
break;
case 'h':
@@ -543,16 +650,8 @@ main(int argc, char *argv[])
provider_name = optarg;
}
- /* Lookup argument in location provider table */
- for (int i = 0; location_providers[i].name != NULL;
- i++) {
- const location_provider_t *p =
- &location_providers[i];
- if (strcasecmp(provider_name, p->name) == 0) {
- provider = p;
- }
- }
-
+ /* Lookup provider from name. */
+ provider = find_location_provider(provider_name);
if (provider == NULL) {
fprintf(stderr, _("Unknown location provider"
" `%s'.\n"), provider_name);
@@ -563,7 +662,7 @@ main(int argc, char *argv[])
if (provider_args != NULL &&
strcasecmp(provider_args, "help") == 0) {
provider->print_help(stdout);
- exit(EXIT_FAILURE);
+ exit(EXIT_SUCCESS);
}
break;
case 'm':
@@ -580,20 +679,13 @@ main(int argc, char *argv[])
method_args = s;
}
- /* Lookup argument in gamma methods table */
- for (int i = 0; gamma_methods[i].name != NULL; i++) {
- const gamma_method_t *m =
- &gamma_methods[i];
- if (strcasecmp(optarg, m->name) == 0) {
- method = m;
- }
- }
-
+ /* Find adjustment method by name. */
+ method = find_gamma_method(optarg);
if (method == NULL) {
/* TRANSLATORS: This refers to the method
used to adjust colors e.g VidMode */
- fprintf(stderr, _("Unknown method `%s'.\n"),
- optarg);
+ fprintf(stderr, _("Unknown adjustment method"
+ " `%s'.\n"), optarg);
exit(EXIT_FAILURE);
}
@@ -601,7 +693,7 @@ main(int argc, char *argv[])
if (method_args != NULL &&
strcasecmp(method_args, "help") == 0) {
method->print_help(stdout);
- exit(EXIT_FAILURE);
+ exit(EXIT_SUCCESS);
}
break;
case 'o':
@@ -636,6 +728,91 @@ main(int argc, char *argv[])
}
}
+ /* Load settings from config file. */
+ config_ini_state_t config_state;
+ r = config_ini_init(&config_state, config_filepath);
+ if (r < 0) {
+ fputs("Unable to load config file.\n", stderr);
+ exit(EXIT_FAILURE);
+ }
+
+ if (config_filepath != NULL) free(config_filepath);
+
+ /* Read global config settings. */
+ config_ini_section_t *section = config_ini_get_section(&config_state,
+ "redshift");
+ if (section != NULL) {
+ config_ini_setting_t *setting = section->settings;
+ while (setting != NULL) {
+ if (strcasecmp(setting->name, "temp-day") == 0) {
+ if (temp_day < 0) {
+ temp_day = atoi(setting->value);
+ }
+ } else if (strcasecmp(setting->name,
+ "temp-night") == 0) {
+ if (temp_night < 0) {
+ temp_night = atoi(setting->value);
+ }
+ } else if (strcasecmp(setting->name,
+ "transition") == 0) {
+ if (transition < 0) {
+ transition = !!atoi(setting->value);
+ }
+ } else if (strcasecmp(setting->name, "gamma") == 0) {
+ if (isnan(gamma[0])) {
+ r = parse_gamma_string(setting->value,
+ gamma);
+ if (r < 0) {
+ fputs(_("Malformed gamma"
+ " setting.\n"),
+ stderr);
+ exit(EXIT_FAILURE);
+ }
+ }
+ } else if (strcasecmp(setting->name,
+ "adjustment-method") == 0) {
+ if (method == NULL) {
+ method = find_gamma_method(
+ setting->value);
+ if (method == NULL) {
+ fprintf(stderr, _("Unknown"
+ " adjustment"
+ " method"
+ " `%s'.\n"),
+ setting->value);
+ exit(EXIT_FAILURE);
+ }
+ }
+ } else if (strcasecmp(setting->name,
+ "location-provider") == 0) {
+ if (provider == NULL) {
+ provider = find_location_provider(
+ setting->value);
+ if (provider == NULL) {
+ fprintf(stderr, _("Unknown"
+ " location"
+ " provider"
+ " `%s'.\n"),
+ setting->value);
+ exit(EXIT_FAILURE);
+ }
+ }
+ } else {
+ fprintf(stderr, _("Unknown configuration"
+ " setting `%s'.\n"),
+ setting->name);
+ }
+ setting = setting->next;
+ }
+ }
+
+ /* Use default values for settings that were neither defined in
+ the config file nor on the command line. */
+ if (temp_day < 0) temp_day = DEFAULT_DAY_TEMP;
+ if (temp_night < 0) temp_night = DEFAULT_NIGHT_TEMP;
+ if (isnan(gamma[0])) gamma[0] = gamma[1] = gamma[2] = DEFAULT_GAMMA;
+ if (transition < 0) transition = 1;
+
/* Initialize location provider. If provider is NULL
try all providers until one that works is found. */
location_state_t location_state;
@@ -645,7 +822,7 @@ main(int argc, char *argv[])
if (provider != NULL) {
/* Use provider specified on command line. */
r = provider_try_start(provider, &location_state,
- provider_args);
+ &config_state, provider_args);
if (r < 0) exit(EXIT_FAILURE);
} else {
/* Try all providers, use the first that works. */
@@ -654,13 +831,15 @@ main(int argc, char *argv[])
const location_provider_t *p =
&location_providers[i];
r = provider_try_start(p, &location_state,
- NULL);
+ &config_state, NULL);
if (r < 0) {
- fputs(_("Trying other provider...\n"),
+ fputs(_("Trying next provider...\n"),
stderr);
continue;
}
+ /* Found provider that works. */
+ printf(_("Using provider `%s'.\n"), p->name);
provider = p;
break;
}
@@ -750,18 +929,21 @@ main(int argc, char *argv[])
if (method != NULL) {
/* Use method specified on command line. */
- r = method_try_start(method, &state, method_args);
+ r = method_try_start(method, &state, &config_state,
+ method_args);
if (r < 0) exit(EXIT_FAILURE);
} else {
/* Try all methods, use the first that works. */
for (int i = 0; gamma_methods[i].name != NULL; i++) {
const gamma_method_t *m = &gamma_methods[i];
- r = method_try_start(m, &state, NULL);
+ r = method_try_start(m, &state, &config_state, NULL);
if (r < 0) {
- fputs(_("Trying other method...\n"), stderr);
+ fputs(_("Trying next method...\n"), stderr);
continue;
}
+ /* Found method that works. */
+ printf(_("Using method `%s'.\n"), m->name);
method = m;
break;
}