aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rwxr-xr-xdata/applications/redshift.desktop.in5
-rw-r--r--po/cs.po32
-rw-r--r--po/de.mobin0 -> 15021 bytes
-rw-r--r--po/de.po153
-rw-r--r--po/zh_CN.po44
-rw-r--r--redshift.18
-rw-r--r--redshift.conf.sample56
-rw-r--r--src/config-ini.c2
-rw-r--r--src/gamma-randr.c2
-rw-r--r--src/gamma-vidmode.c2
-rw-r--r--src/location-geoclue.c4
-rw-r--r--src/redshift-gtk/statusicon.py6
-rw-r--r--src/redshift.c6
14 files changed, 202 insertions, 121 deletions
diff --git a/Makefile.am b/Makefile.am
index a5f5eb4..1e2f1c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,8 @@ EXTRA_ROOTDOC_FILES = \
HACKING \
DESIGN \
README \
- README-colorramp
+ README-colorramp \
+ redshift.conf.sample
_HICOLOR_FILES = \
data/icons/hicolor/scalable/apps/redshift.svg \
diff --git a/data/applications/redshift.desktop.in b/data/applications/redshift.desktop.in
index 5511c24..74ca416 100755
--- a/data/applications/redshift.desktop.in
+++ b/data/applications/redshift.desktop.in
@@ -5,8 +5,7 @@ _GenericName=Color temperature adjustment
_Comment=Color temperature adjustment tool
Exec=redshift
Icon=redshift
-Terminal=false
+Terminal=true
Type=Application
Categories=Utility;
-StartupNotify=true
-Hidden=true
+NoDisplay=true
diff --git a/po/cs.po b/po/cs.po
index ccb9868..70be597 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n"
"POT-Creation-Date: 2015-02-22 11:23-0500\n"
"PO-Revision-Date: 2014-12-31 23:54+0000\n"
-"Last-Translator: Jakub Vaněk <vanek.jakub4@seznam.cz>\n"
+"Last-Translator: David Nguyen <varial88@gmail.com>\n"
"Language-Team: Czech <cs@li.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -50,11 +50,11 @@ msgstr ""
#: ../data/applications/redshift-gtk.desktop.in.h:2
msgid "Color temperature adjustment"
-msgstr ""
+msgstr "Nastavení teploty barev"
#: ../data/applications/redshift-gtk.desktop.in.h:3
msgid "Color temperature adjustment tool"
-msgstr ""
+msgstr "Nástroj pro nastavení teploty barev"
#. TRANSLATORS: Name printed when period of day is unknown
#: ../src/redshift.c:319
@@ -63,15 +63,15 @@ msgstr ""
#: ../src/redshift.c:320 ../src/redshift.c:1546
msgid "Daytime"
-msgstr ""
+msgstr "Den"
#: ../src/redshift.c:321 ../src/redshift.c:1549
msgid "Night"
-msgstr ""
+msgstr "Noc"
#: ../src/redshift.c:322
msgid "Transition"
-msgstr ""
+msgstr "Přechod"
#: ../src/redshift.c:389
#, c-format
@@ -86,22 +86,22 @@ msgstr ""
#. TRANSLATORS: Abbreviation for `north'
#: ../src/redshift.c:404
msgid "N"
-msgstr ""
+msgstr "S"
#. TRANSLATORS: Abbreviation for `south'
#: ../src/redshift.c:406
msgid "S"
-msgstr ""
+msgstr "J"
#. TRANSLATORS: Abbreviation for `east'
#: ../src/redshift.c:408
msgid "E"
-msgstr ""
+msgstr "V"
#. TRANSLATORS: Abbreviation for `west'
#: ../src/redshift.c:410
msgid "W"
-msgstr ""
+msgstr "Z"
#. TRANSLATORS: Append degree symbols after %f if possible.
#. The string following each number is an abreviation for
@@ -723,7 +723,7 @@ msgstr ""
#: ../src/location-geoclue2.c:114
#, c-format
msgid "Unable to obtain location: %s.\n"
-msgstr ""
+msgstr "Nelze zjistit polohu: %s. \n"
#: ../src/location-geoclue2.c:153
#, c-format
@@ -733,12 +733,12 @@ msgstr ""
#: ../src/location-geoclue2.c:168
#, c-format
msgid "Unable to obtain GeoClue client path: %s.\n"
-msgstr ""
+msgstr "Nelze zjistit umístění klienta GeoClue: %s. \n"
#: ../src/location-geoclue2.c:189
#, c-format
msgid "Unable to obtain GeoClue Client: %s.\n"
-msgstr ""
+msgstr "Nelze použít klienta GeoClue: %s. \n"
#: ../src/location-geoclue2.c:228
#, c-format
@@ -748,12 +748,12 @@ msgstr ""
#: ../src/location-geoclue2.c:251
#, c-format
msgid "Unable to start GeoClue client: %s.\n"
-msgstr ""
+msgstr "Nelze spustit klienta GeoClue: %s. \n"
#: ../src/location-geoclue2.c:269
#, c-format
msgid "Unable to connect to GeoClue.\n"
-msgstr ""
+msgstr "Nelze se připojit do GeoClue. \n"
#: ../src/location-corelocation.m:59
msgid "Not authorized to obtain location from CoreLocation.\n"
@@ -770,7 +770,7 @@ msgstr ""
#: ../src/location-corelocation.m:99
msgid "Request for location was not authorized!\n"
-msgstr ""
+msgstr "Poždavek na zjištění polohy nebyl autorizován! \n"
#: ../src/location-corelocation.m:128
msgid "Use the location as discovered by the Corelocation provider.\n"
diff --git a/po/de.mo b/po/de.mo
new file mode 100644
index 0000000..725feaa
--- /dev/null
+++ b/po/de.mo
Binary files differ
diff --git a/po/de.po b/po/de.po
index 818864e..0f5e105 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,15 +8,15 @@ msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n"
"POT-Creation-Date: 2015-02-22 11:23-0500\n"
-"PO-Revision-Date: 2014-12-31 23:53+0000\n"
-"Last-Translator: Jon Lund Steffensen <Unknown>\n"
+"PO-Revision-Date: 2015-08-04 14:42+0100\n"
+"Last-Translator: Michael Vetter <jubalh@openmailbox.org>\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: 2015-01-04 20:00+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Generator: Poedit 1.5.4\n"
#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1
msgid ""
@@ -24,6 +24,8 @@ msgid ""
"surroundings. This may help your eyes hurt less if you are working in front "
"of the screen at night."
msgstr ""
+"Redshift passt die Farbtemperator des Bildschirms an die Umgebung an. Somit "
+"werden die Augen geschont wenn man nachts am Bildschirm arbeitet."
#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2
msgid ""
@@ -32,76 +34,84 @@ msgid ""
"and early morning, the color temperature transitions smoothly from night to "
"daytime temperature to allow your eyes to slowly adapt."
msgstr ""
+"Die Farbtemperatur wird nach der Position der Sonne gesetzt. Nachts wird "
+"eine andere als tags genutzt. Wenn es dämmert und die Sonne aufgeht wird die "
+"Farbtemperatur einen sanften Übergang vollziehen damit sich die Augen "
+"langsam umgewöhnen können."
#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3
msgid ""
"This program provides a status icon that allows the user to control Redshift."
msgstr ""
+"Die Farbtemperatur wird nach der Position der Sonne gesetzt. Nachts wird "
+"eine andere als tags genutzt. Wenn es dämmert und die Sonne aufgeht wird die "
+"Farbtemperatur einen sanften Übergang vollziehen damit sich die Augen "
+"langsam umgewöhnen können."
#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4
msgid ""
"The Redshift information window overlaid with an example of the redness "
"effect"
-msgstr ""
+msgstr "Das Redshift Informationsfenster mit einem Beispiel Effekt"
#: ../data/applications/redshift-gtk.desktop.in.h:1
msgid "Redshift"
-msgstr ""
+msgstr "Redshift"
#: ../data/applications/redshift-gtk.desktop.in.h:2
msgid "Color temperature adjustment"
-msgstr ""
+msgstr "Farbtemperatur Anpassung"
#: ../data/applications/redshift-gtk.desktop.in.h:3
msgid "Color temperature adjustment tool"
-msgstr ""
+msgstr "Farbtemperatur Anpassungswerkzeug"
#. TRANSLATORS: Name printed when period of day is unknown
#: ../src/redshift.c:319
msgid "None"
-msgstr ""
+msgstr "Keine"
#: ../src/redshift.c:320 ../src/redshift.c:1546
msgid "Daytime"
-msgstr ""
+msgstr "Tags"
#: ../src/redshift.c:321 ../src/redshift.c:1549
msgid "Night"
-msgstr ""
+msgstr "Nachts"
#: ../src/redshift.c:322
msgid "Transition"
-msgstr ""
+msgstr "Übergang"
#: ../src/redshift.c:389
#, c-format
msgid "Period: %s\n"
-msgstr ""
+msgstr "Zeitraum: %s\n"
#: ../src/redshift.c:392
#, c-format
msgid "Period: %s (%.2f%% day)\n"
-msgstr ""
+msgstr "Zeitraum: %s (%.2f%% day)\n"
#. TRANSLATORS: Abbreviation for `north'
#: ../src/redshift.c:404
msgid "N"
-msgstr ""
+msgstr "N"
#. TRANSLATORS: Abbreviation for `south'
#: ../src/redshift.c:406
msgid "S"
-msgstr ""
+msgstr "S"
#. TRANSLATORS: Abbreviation for `east'
#: ../src/redshift.c:408
msgid "E"
-msgstr ""
+msgstr "O"
#. TRANSLATORS: Abbreviation for `west'
#: ../src/redshift.c:410
msgid "W"
-msgstr ""
+msgstr "W"
#. TRANSLATORS: Append degree symbols after %f if possible.
#. The string following each number is an abreviation for
@@ -109,7 +119,7 @@ msgstr ""
#: ../src/redshift.c:415
#, c-format
msgid "Location: %.2f %s, %.2f %s\n"
-msgstr ""
+msgstr "Lage: %.2f %s, %.2f %s\n"
#. TRANSLATORS: help output 1
#. LAT is latitude, LON is longitude,
@@ -243,7 +253,7 @@ msgstr "Benutzen Sie »-l %s:help« für weitere Informationen.\n"
#: ../src/redshift.c:601 ../src/redshift.c:682
#, c-format
msgid "Failed to parse option `%s'.\n"
-msgstr ""
+msgstr "Konnte Option nicht parsen `%s'.\n"
#: ../src/redshift.c:628
#, c-format
@@ -271,16 +281,16 @@ msgstr "Starten der Änderungsmethode %s fehlgeschlagen.\n"
#: ../src/redshift.c:870 ../src/redshift.c:898
#, c-format
msgid "Status: %s\n"
-msgstr ""
+msgstr "Status: %s\n"
#: ../src/redshift.c:870 ../src/redshift.c:899
#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466
msgid "Enabled"
-msgstr ""
+msgstr "Aktiviert"
#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466
msgid "Disabled"
-msgstr ""
+msgstr "Deaktiviert"
#: ../src/redshift.c:927 ../src/redshift.c:1600
msgid "Unable to read system time.\n"
@@ -337,7 +347,7 @@ msgstr "Unbekannte Konfigurationseinstellung »%s«\n"
#: ../src/redshift.c:1422
#, c-format
msgid "Trying location provider `%s'...\n"
-msgstr ""
+msgstr "Versuche Location Provider `%s'...\n"
#: ../src/redshift.c:1427
msgid "Trying next provider...\n"
@@ -359,7 +369,7 @@ msgstr "Konnte Standort nicht vom Dienst erhalten.\n"
#: ../src/redshift.c:1460
#, c-format
msgid "Temperatures: %dK at day, %dK at night\n"
-msgstr ""
+msgstr "Farben: %dK am Tag, %dK nachts\n"
#. TRANSLATORS: Append degree symbols if possible.
#: ../src/redshift.c:1465
@@ -392,12 +402,12 @@ msgstr ""
#: ../src/redshift.c:1523
#, c-format
msgid "Brightness values must be between %.1f and %.1f.\n"
-msgstr ""
+msgstr "Der Helligkeitswert muss zwischen %.1f und %.1f liegen.\n"
#: ../src/redshift.c:1529
#, c-format
msgid "Brightness: %.2f:%.2f\n"
-msgstr ""
+msgstr "Helligkeit: %.2f:%.2f\n"
#: ../src/redshift.c:1537
#, c-format
@@ -409,7 +419,7 @@ msgstr "Der Gamma-Wert muss sich zwischen %.1f und %.1f befinden.\n"
#: ../src/redshift.c:1545 ../src/redshift.c:1548
#, c-format
msgid "Gamma (%s): %.3f, %.3f, %.3f\n"
-msgstr ""
+msgstr "Gamma (%s): %.3f, %.3f, %.3f\n"
#: ../src/redshift.c:1572
msgid "Trying next method...\n"
@@ -432,7 +442,7 @@ msgstr "Sonnenstand: %f°\n"
#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689
msgid "Press ctrl-c to stop...\n"
-msgstr ""
+msgstr "Drücke Str-c um anzuhalten..\n"
#: ../src/config-ini.c:167
msgid "Malformed section header in config file.\n"
@@ -449,7 +459,7 @@ msgstr "Zuweisung außerhalb von Sektion in Konfigurationsdatei.\n"
#: ../src/gamma-drm.c:78
#, c-format
msgid "Failed to get DRM mode resources\n"
-msgstr ""
+msgstr "Konnte DRM Modus Resourcen nicht erhalten\n"
#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311
#, c-format
@@ -469,7 +479,7 @@ msgstr "Es gibt nur CRTC 0.\n"
#: ../src/gamma-drm.c:132
#, c-format
msgid "CRTC %i lost, skipping\n"
-msgstr ""
+msgstr "CRTC %i verlorgen, es wird abgebrochen\n"
#: ../src/gamma-drm.c:138
#, c-format
@@ -589,7 +599,7 @@ msgstr ""
#. left column must not be translated
#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109
msgid " preserve={0,1}\tWhether existing gamma should be preserved\n"
-msgstr ""
+msgstr " preserve={0,1}\tOb existierender Gammawert behalten werden soll\n"
#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134
#: ../src/gamma-w32gdi.c:155
@@ -617,54 +627,58 @@ msgid ""
"WARNING: Using dummy gamma method! Display will not be affected by this "
"gamma method.\n"
msgstr ""
+"WARNUNG: Es wird eine Pseudo Gamma Methode genutzt? Der Bildschirm wird von "
+"dieser Methode nicht beeinflusst werden.\n"
#: ../src/gamma-dummy.c:59
msgid ""
"Does not affect the display but prints the color temperature to the "
"terminal.\n"
msgstr ""
+"Betrifft das Display nicht aber gibt die Farbtemperatur im Terminal aus.\n"
#: ../src/gamma-dummy.c:73
#, c-format
msgid "Temperature: %i\n"
-msgstr ""
+msgstr "Temperatur: %i\n"
#: ../src/location-geoclue.c:76
#, c-format
msgid "Unable to obtain master client: %s\n"
-msgstr ""
+msgstr "Konnte master client nicht bestimmen: %s\n"
#: ../src/location-geoclue.c:80
#, c-format
msgid "Unable to obtain master client\n"
-msgstr ""
+msgstr "Konnte master client nicht bestimmen\n"
#: ../src/location-geoclue.c:91
#, c-format
msgid "Can't set requirements for master: %s\n"
-msgstr ""
+msgstr "Kann Vorraussetzungen für Master nicht setzen: %s\n"
#: ../src/location-geoclue.c:95
#, c-format
msgid "Can't set requirements for master\n"
-msgstr ""
+msgstr "Kann Vorraussetzungen für Master nicht setzen\n"
#: ../src/location-geoclue.c:111
#, c-format
msgid "Started Geoclue provider `%s'.\n"
-msgstr ""
+msgstr "Geoclue Provider `%s' gestartet.\n"
#: ../src/location-geoclue.c:114
msgid "Could not find a usable Geoclue provider.\n"
-msgstr ""
+msgstr "Konnte keinen benutzbaren Geoclue Provider finden.\n"
#: ../src/location-geoclue.c:115
msgid "Try setting name and path to specify which to use.\n"
msgstr ""
+"Setze den Namen und Pfad um zu bestimmen welche genutzt werden sollen.\n"
#: ../src/location-geoclue.c:133
msgid "Use the location as discovered by a Geoclue provider.\n"
-msgstr ""
+msgstr "Benutze die Lage die vom Geoclue Proiver festgestellt wurde.\n"
#. TRANSLATORS: Geoclue help output
#. left column must not be translated
@@ -673,6 +687,8 @@ msgid ""
" name=N\tName of Geoclue provider (or `default')\n"
" path=N\tPath of Geoclue provider (or `default')\n"
msgstr ""
+" name=N\tName des Geoclue Providers (oder `default')\n"
+" path=N\tPFad des Geoclue Providers (oder `default')\n"
#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72
#: ../src/location-corelocation.m:131
@@ -681,80 +697,83 @@ msgid ""
"NOTE: currently Redshift doesn't recheck %s once started,\n"
"which means it has to be restarted to take notice after travel.\n"
msgstr ""
+"HINWEIS: Redshift liest %s nach dem starten nicht mehr,\n"
+"was bedeutet das es neugestartet werden muss wenn man seine Position "
+"ändert.\n"
#: ../src/location-geoclue.c:199
#, c-format
msgid "Could not get location: %s.\n"
-msgstr ""
+msgstr "Konnte Lage nicht bestimmen: %s.\n"
#: ../src/location-geoclue.c:206
#, c-format
msgid "According to the geoclue provider we're at: %.2f, %.2f\n"
-msgstr ""
+msgstr "Laut geoclue provider wir sind bei: : %.2f, %.2f\n"
#: ../src/location-geoclue.c:210
msgid "Provider does not have a valid location available."
-msgstr ""
+msgstr "Provider hat keine gültige Lage."
#: ../src/location-geoclue2.c:69
msgid "Use the location as discovered by a GeoClue2 provider.\n"
-msgstr ""
+msgstr "Benutze die von GeoClue2 Provider erhaltene Lage.\n"
#: ../src/location-geoclue2.c:114
#, c-format
msgid "Unable to obtain location: %s.\n"
-msgstr ""
+msgstr "Konnte Lage nicht bestimmen: %s.\n"
#: ../src/location-geoclue2.c:153
#, c-format
msgid "Unable to obtain GeoClue Manager: %s.\n"
-msgstr ""
+msgstr "Konnte GeoClue Manager nicht bestimmen: %s.\n"
#: ../src/location-geoclue2.c:168
#, c-format
msgid "Unable to obtain GeoClue client path: %s.\n"
-msgstr ""
+msgstr "Konnte GeoClue Client nicht bestimmen: %s.\n"
#: ../src/location-geoclue2.c:189
#, c-format
msgid "Unable to obtain GeoClue Client: %s.\n"
-msgstr ""
+msgstr "Konnte GeoClue Client nicht bestimmen: %s.\n"
#: ../src/location-geoclue2.c:228
#, c-format
msgid "Unable to set distance threshold: %s.\n"
-msgstr ""
+msgstr "Konnte Distanzgrenzwert nicht setzen: %s.\n"
#: ../src/location-geoclue2.c:251
#, c-format
msgid "Unable to start GeoClue client: %s.\n"
-msgstr ""
+msgstr "Konnte GeoClue Client nicht starten: %s.\n"
#: ../src/location-geoclue2.c:269
#, c-format
msgid "Unable to connect to GeoClue.\n"
-msgstr ""
+msgstr "Konnte nicht mit GeoClue verbinden.\n"
#: ../src/location-corelocation.m:59
msgid "Not authorized to obtain location from CoreLocation.\n"
-msgstr ""
+msgstr "Nicht authorisiert die Lage von CoreLocation zu beziehen.\n"
#: ../src/location-corelocation.m:87
#, c-format
msgid "Error obtaining location from CoreLocation: %s\n"
-msgstr ""
+msgstr "Fehler beim beziehen der Lage von CoreLocation: %s\n"
#: ../src/location-corelocation.m:96
msgid "Waiting for authorization to obtain location...\n"
-msgstr ""
+msgstr "Warte auf Authorisierung um die Lage zu beziehen..\n"
#: ../src/location-corelocation.m:99
msgid "Request for location was not authorized!\n"
-msgstr ""
+msgstr "Anfrage der Lage wurde nicht genehmigt!\n"
#: ../src/location-corelocation.m:128
msgid "Use the location as discovered by the Corelocation provider.\n"
-msgstr ""
+msgstr "Benutze die Lage die vom Corelocation Provider gefunden wurde.\n"
#: ../src/location-manual.c:50
msgid "Latitude and longitude must be set.\n"
@@ -779,6 +798,8 @@ msgid ""
"Both values are expected to be floating point numbers,\n"
"negative values representing west / south, respectively.\n"
msgstr ""
+"Beides sollten Kommawerte sein,\n"
+"negative Werte stehen für Westen/Süden.\n"
#: ../src/location-manual.c:87
msgid "Malformed argument.\n"
@@ -786,19 +807,19 @@ msgstr "Fehlerhaftes Kommando.\n"
#: ../src/redshift-gtk/statusicon.py:265
msgid "Suspend for"
-msgstr ""
+msgstr "Unterbrechen für"
#: ../src/redshift-gtk/statusicon.py:267
msgid "30 minutes"
-msgstr ""
+msgstr "30 Minuten"
#: ../src/redshift-gtk/statusicon.py:268
msgid "1 hour"
-msgstr ""
+msgstr "1 Stunde"
#: ../src/redshift-gtk/statusicon.py:269
msgid "2 hours"
-msgstr ""
+msgstr "2 Stunden"
#: ../src/redshift-gtk/statusicon.py:277
msgid "Autostart"
@@ -806,31 +827,31 @@ msgstr "Automatischer Start"
#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300
msgid "Info"
-msgstr ""
+msgstr "Info"
#: ../src/redshift-gtk/statusicon.py:294
msgid "Quit"
-msgstr ""
+msgstr "Beenden"
#: ../src/redshift-gtk/statusicon.py:301
msgid "Close"
-msgstr ""
+msgstr "Schliessen"
#: ../src/redshift-gtk/statusicon.py:466
msgid "<b>Status:</b> {}"
-msgstr ""
+msgstr "<b>Status:</b> {}"
#: ../src/redshift-gtk/statusicon.py:470
msgid "Color temperature"
-msgstr ""
+msgstr "Farbtemperatur"
#: ../src/redshift-gtk/statusicon.py:474
msgid "Period"
-msgstr ""
+msgstr "Zeitraum"
#: ../src/redshift-gtk/statusicon.py:478
msgid "Location"
-msgstr ""
+msgstr "Lage"
#~ msgid " screen=N\tX screen to apply adjustments to\n"
#~ msgstr " screen=N\tX-Bildschirm, auf den die Änderungen angewandt werden\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 854d896..1db4ea1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -50,38 +50,38 @@ msgstr ""
#: ../data/applications/redshift-gtk.desktop.in.h:2
msgid "Color temperature adjustment"
-msgstr ""
+msgstr "色温调节"
#: ../data/applications/redshift-gtk.desktop.in.h:3
msgid "Color temperature adjustment tool"
-msgstr ""
+msgstr "色温调节工具"
#. TRANSLATORS: Name printed when period of day is unknown
#: ../src/redshift.c:319
msgid "None"
-msgstr ""
+msgstr "无"
#: ../src/redshift.c:320 ../src/redshift.c:1546
msgid "Daytime"
-msgstr ""
+msgstr "白天"
#: ../src/redshift.c:321 ../src/redshift.c:1549
msgid "Night"
-msgstr ""
+msgstr "夜晚"
#: ../src/redshift.c:322
msgid "Transition"
-msgstr ""
+msgstr "过渡"
#: ../src/redshift.c:389
#, c-format
msgid "Period: %s\n"
-msgstr ""
+msgstr "时段: %s\n"
#: ../src/redshift.c:392
#, c-format
msgid "Period: %s (%.2f%% day)\n"
-msgstr ""
+msgstr "时段: %s (%.2f%% 白天)\n"
#. TRANSLATORS: Abbreviation for `north'
#: ../src/redshift.c:404
@@ -265,11 +265,11 @@ msgstr ""
#: ../src/redshift.c:870 ../src/redshift.c:899
#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466
msgid "Enabled"
-msgstr ""
+msgstr "已启用"
#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466
msgid "Disabled"
-msgstr ""
+msgstr "已禁用"
#: ../src/redshift.c:927 ../src/redshift.c:1600
msgid "Unable to read system time.\n"
@@ -767,48 +767,48 @@ msgstr ""
#: ../src/redshift-gtk/statusicon.py:265
msgid "Suspend for"
-msgstr ""
+msgstr "停用"
#: ../src/redshift-gtk/statusicon.py:267
msgid "30 minutes"
-msgstr ""
+msgstr "30 分钟"
#: ../src/redshift-gtk/statusicon.py:268
msgid "1 hour"
-msgstr ""
+msgstr "1 小时"
#: ../src/redshift-gtk/statusicon.py:269
msgid "2 hours"
-msgstr ""
+msgstr "2 小时"
#: ../src/redshift-gtk/statusicon.py:277
msgid "Autostart"
-msgstr ""
+msgstr "开机启动"
#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300
msgid "Info"
-msgstr ""
+msgstr "信息"
#: ../src/redshift-gtk/statusicon.py:294
msgid "Quit"
-msgstr ""
+msgstr "退出"
#: ../src/redshift-gtk/statusicon.py:301
msgid "Close"
-msgstr ""
+msgstr "关闭"
#: ../src/redshift-gtk/statusicon.py:466
msgid "<b>Status:</b> {}"
-msgstr ""
+msgstr "<b>状态:</b> {}"
#: ../src/redshift-gtk/statusicon.py:470
msgid "Color temperature"
-msgstr ""
+msgstr "色温"
#: ../src/redshift-gtk/statusicon.py:474
msgid "Period"
-msgstr ""
+msgstr "时段"
#: ../src/redshift-gtk/statusicon.py:478
msgid "Location"
-msgstr ""
+msgstr "位置"
diff --git a/redshift.1 b/redshift.1
index c9667aa..607152e 100644
--- a/redshift.1
+++ b/redshift.1
@@ -1,6 +1,6 @@
-.TH REDSHIFT: "1" "October 2011" "redshift" "User Commands"
+.TH REDSHIFT 1 2011-10-01 redshift
.SH NAME
-redshift \- Set color temperature of display according to time of day.
+redshift \- set color temperature of display according to time of day
.SH SYNOPSIS
.B redshift
\fI[\-l LAT:LON | \-l PROVIDER:OPTIONS] [\-t DAY:NIGHT] \fR[\fIOPTIONS\fR...]
@@ -149,14 +149,14 @@ lat=55.7
lon=12.6
.fi
.SH HOOKS
-Executable files (e.g. scripts) placed in `~/.config/redshift/hooks'
+Executables (e.g. scripts) placed in folder `~/.config/redshift/hooks'
will be run when a certain event happens. The first parameter to the
script indicates the event and further parameters may indicate
more details about the event. The event `period-changed' is indicated
when the period changes (`night', `daytime', `transition'). The second
parameter is the old period and the third is the new period. The event
is also signaled when Redshift starts up with the old period set to
-`none'.
+`none'. Any dotfiles in the folder are skipped.
A simple script to handle these events can be written like this:
.IP
diff --git a/redshift.conf.sample b/redshift.conf.sample
new file mode 100644
index 0000000..633d0b3
--- /dev/null
+++ b/redshift.conf.sample
@@ -0,0 +1,56 @@
+; Global settings for redshift
+[redshift]
+; Set the day and night screen temperatures
+temp-day=5700
+temp-night=3500
+
+; Enable/Disable a smooth transition between day and night
+; 0 will cause a direct change from day to night screen temperature.
+; 1 will gradually increase or decrease the screen temperature.
+transition=1
+
+; Set the screen brightness. Default is 1.0.
+;brightness=0.9
+; It is also possible to use different settings for day and night
+; since version 1.8.
+;brightness-day=0.7
+;brightness-night=0.4
+; Set the screen gamma (for all colors, or each color channel
+; individually)
+gamma=0.8
+;gamma=0.8:0.7:0.8
+; This can also be set individually for day and night since
+; version 1.10.
+;gamma-day=0.8:0.7:0.8
+;gamma-night=0.6
+
+; Set the location-provider: 'geoclue', 'geoclue2', 'manual'
+; type 'redshift -l list' to see possible values.
+; The location provider settings are in a different section.
+location-provider=manual
+
+; Set the adjustment-method: 'randr', 'vidmode'
+; type 'redshift -m list' to see all possible values.
+; 'randr' is the preferred method, 'vidmode' is an older API.
+; but works in some cases when 'randr' does not.
+; The adjustment method settings are in a different section.
+adjustment-method=randr
+
+; Configuration of the location-provider:
+; type 'redshift -l PROVIDER:help' to see the settings.
+; ex: 'redshift -l manual:help'
+; Keep in mind that longitudes west of Greenwich (e.g. the Americas)
+; are negative numbers.
+[manual]
+lat=48.1
+lon=11.6
+
+; Configuration of the adjustment-method
+; type 'redshift -m METHOD:help' to see the settings.
+; ex: 'redshift -m randr:help'
+; In this example, randr is configured to adjust screen 1.
+; Note that the numbering starts from 0, so this is actually the
+; second screen. If this option is not specified, Redshift will try
+; to adjust _all_ screens.
+[randr]
+screen=1
diff --git a/src/config-ini.c b/src/config-ini.c
index 65751dd..749512a 100644
--- a/src/config-ini.c
+++ b/src/config-ini.c
@@ -226,7 +226,7 @@ config_ini_init(config_ini_state_t *state, const char *filepath)
config_ini_free(state);
return -1;
}
-
+
/* Insert into section list. */
setting->name = NULL;
setting->value = NULL;
diff --git a/src/gamma-randr.c b/src/gamma-randr.c
index 0594332..6fa2bc6 100644
--- a/src/gamma-randr.c
+++ b/src/gamma-randr.c
@@ -306,7 +306,7 @@ randr_set_temperature_for_crtc(randr_state_t *state, int crtc_num,
const color_setting_t *setting)
{
xcb_generic_error_t *error;
-
+
if (crtc_num >= state->crtc_count || crtc_num < 0) {
fprintf(stderr, _("CRTC %d does not exist. "),
state->crtc_num);
diff --git a/src/gamma-vidmode.c b/src/gamma-vidmode.c
index 254d065..c9682d2 100644
--- a/src/gamma-vidmode.c
+++ b/src/gamma-vidmode.c
@@ -167,7 +167,7 @@ vidmode_restore(vidmode_state_t *state)
if (!r) {
fprintf(stderr, _("X request failed: %s\n"),
"XF86VidModeSetGammaRamp");
- }
+ }
}
int
diff --git a/src/location-geoclue.c b/src/location-geoclue.c
index 851a75b..e24c2d2 100644
--- a/src/location-geoclue.c
+++ b/src/location-geoclue.c
@@ -50,7 +50,7 @@ location_geoclue_init(location_geoclue_state_t *state)
state->position = NULL;
state->provider = NULL;
state->provider_path = NULL;
-
+
return 0;
}
@@ -200,7 +200,7 @@ location_geoclue_get_location(location_geoclue_state_t *state,
g_error_free(error);
return -1;
}
-
+
if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) {
fprintf(stdout, _("According to the geoclue provider"
diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py
index b766175..5159437 100644
--- a/src/redshift-gtk/statusicon.py
+++ b/src/redshift-gtk/statusicon.py
@@ -29,11 +29,15 @@ import signal
import re
import gettext
+import gi
+gi.require_version('Gtk', '3.0')
+
from gi.repository import Gtk, GLib, GObject
try:
+ gi.require_version('AppIndicator3', '0.1')
from gi.repository import AppIndicator3 as appindicator
-except ImportError:
+except (ImportError, ValueError):
appindicator = None
from . import defs
diff --git a/src/redshift.c b/src/redshift.c
index defd0a1..a8c49b6 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -1447,9 +1447,9 @@ main(int argc, char *argv[])
stderr);
exit(EXIT_FAILURE);
}
-
+
provider->free(&location_state);
-
+
if (verbose) {
print_location(&loc);
@@ -1470,7 +1470,7 @@ main(int argc, char *argv[])
MIN_LAT, MAX_LAT);
exit(EXIT_FAILURE);
}
-
+
/* Longitude */
if (loc.lon < MIN_LON || loc.lon > MAX_LON) {
/* TRANSLATORS: Append degree symbols if possible. */