style and some minor fixes

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 37 insertions, 48 deletions

diff --git a/po/redshift.pot b/po/redshift.pot
index 1b4cd87..52ad401 100644
--- a/po/redshift.pot
+++ b/po/redshift.pot
@@ -262,7 +262,7 @@ msgstr ""
 
 #: ../src/redshift.c:1049
 #, c-format
-msgid "Temperatures: %dK at day, %dK at night\n"
+msgid "Temperatures: %iK at day, %iK at night\n"
 msgstr ""
 
 #: ../src/redshift.c:1060 ../src/redshift.c:1071
@@ -415,102 +415,93 @@ msgid "Try `-l PROVIDER:help' for help.\n"
 msgstr ""
 
 #: ../src/options.c:356
-msgid "Malformed gamma argument.\n"
+msgid "Malformed gamma argument."
 msgstr ""
 
 #: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491
-msgid "Try `-h' for more information.\n"
+msgid "Try `-h' for more information."
 msgstr ""
 
 #: ../src/options.c:407 ../src/options.c:610
 #, c-format
-msgid "Unknown location provider `%s'.\n"
+msgid "Unknown location provider `%s'."
 msgstr ""
 
 #. TRANSLATORS: This refers to the method
 #. used to adjust colors e.g VidMode
 #: ../src/options.c:439 ../src/options.c:597
 #, c-format
-msgid "Unknown adjustment method `%s'.\n"
+msgid "Unknown adjustment method `%s'."
 msgstr ""
 
 #: ../src/options.c:470
-msgid "Malformed temperature argument.\n"
+msgid "Malformed temperature argument."
 msgstr ""
 
 #: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586
-msgid "Malformed gamma setting.\n"
+msgid "Malformed gamma setting."
 msgstr ""
 
 #: ../src/options.c:621
 #, c-format
-msgid "Malformed dawn-time setting `%s'.\n"
+msgid "Malformed dawn-time setting `%s'."
 msgstr ""
 
 #: ../src/options.c:632
 #, c-format
-msgid "Malformed dusk-time setting `%s'.\n"
+msgid "Malformed dusk-time setting `%s'."
 msgstr ""
 
 #: ../src/options.c:639
 #, c-format
-msgid "Unknown configuration setting `%s'.\n"
+msgid "Unknown configuration setting `%s'."
 msgstr ""
 
 #: ../src/config-ini.c:167
-msgid "Malformed section header in config file.\n"
+msgid "Malformed section header in config file."
 msgstr ""
 
 #: ../src/config-ini.c:203
-msgid "Malformed assignment in config file.\n"
+msgid "Malformed assignment in config file."
 msgstr ""
 
 #: ../src/config-ini.c:214
-msgid "Assignment outside section in config file.\n"
+msgid "Assignment outside section in config file."
 msgstr ""
 
 #: ../src/gamma-drm.c:97
 #, c-format
-msgid "Failed to open DRM device: %s\n"
+msgid "Failed to open DRM device: %s"
 msgstr ""
 
 #: ../src/gamma-drm.c:105
 #, c-format
-msgid "Failed to get DRM mode resources\n"
-msgstr ""
-
-#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384
-#, c-format
-msgid "CRTC %d does not exist. "
+msgid "Failed to get DRM mode resources"
 msgstr ""
 
 #: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387
 #, c-format
-msgid "Valid CRTCs are [0-%d].\n"
+msgid "CRTC %i does not exist, valid CRTCs are [0-%i]."
 msgstr ""
 
 #: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390
 #, c-format
-msgid "Only CRTC 0 exists.\n"
+msgid "CRTC %i does not exist, only CRTC 0 exists."
 msgstr ""
 
 #: ../src/gamma-drm.c:159
 #, c-format
-msgid "CRTC %i lost, skipping\n"
+msgid "CRTC %i lost, skipping"
 msgstr ""
 
 #: ../src/gamma-drm.c:165
 #, c-format
-msgid ""
-"Could not get gamma ramp size for CRTC %i\n"
-"on graphics card %i, ignoring device.\n"
+msgid "Could not get gamma ramp size for CRTC %i on graphics card %i, ignoring device."
 msgstr ""
 
 #: ../src/gamma-drm.c:178
 #, c-format
-msgid ""
-"DRM could not read gamma ramps on CRTC %i on\n"
-"graphics card %i, ignoring device.\n"
+msgid "DRM could not read gamma ramps on CRTC %i on graphics card %i, ignoring device."
 msgstr ""
 
 #: ../src/gamma-drm.c:242
@@ -527,7 +518,7 @@ msgstr ""
 
 #: ../src/gamma-drm.c:260
 #, c-format
-msgid "CRTC must be a non-negative integer\n"
+msgid "CRTC must be a non-negative integer"
 msgstr ""
 
 #: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161
@@ -535,13 +526,13 @@ msgstr ""
 #: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243
 #: ../src/location-manual.c:106
 #, c-format
-msgid "Unknown method parameter: `%s'.\n"
+msgid "Unknown method parameter: `%s'."
 msgstr ""
 
 #: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192
 #: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435
 #, c-format
-msgid "`%s' returned error %d\n"
+msgid "`%s' returned error %i\n"
 msgstr ""
 
 #: ../src/gamma-randr.c:103
@@ -556,7 +547,7 @@ msgstr ""
 
 #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114
 #, c-format
-msgid "Gamma ramp size too small: %i\n"
+msgid "Gamma ramp size too small: %i"
 msgstr ""
 
 #: ../src/gamma-randr.c:277
@@ -584,16 +575,14 @@ msgstr ""
 #: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156
 #: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123
 #, c-format
-msgid ""
-"Parameter `%s` is now always on;  Use the `%s` command-line option to "
-"disable.\n"
+msgid "Parameter `%s' is now always on; use the `%s' command-line option to disable."
 msgstr ""
 
 #: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81
 #: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117
 #: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225
 #, c-format
-msgid "X request failed: %s\n"
+msgid "X request failed: %s"
 msgstr ""
 
 #: ../src/gamma-vidmode.c:140
@@ -607,7 +596,7 @@ msgid "  screen=N\t\tX screen to apply adjustments to\n"
 msgstr ""
 
 #: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91
-msgid "Unable to save current gamma ramp.\n"
+msgid "Unable to save current gamma ramp."
 msgstr ""
 
 #: ../src/gamma-quartz.c:170
@@ -619,7 +608,7 @@ msgid "Unable to open device context.\n"
 msgstr ""
 
 #: ../src/gamma-w32gdi.c:75
-msgid "Display device does not support gamma ramps.\n"
+msgid "Display device does not support gamma ramps."
 msgstr ""
 
 #: ../src/gamma-w32gdi.c:115
@@ -663,36 +652,36 @@ msgstr ""
 
 #: ../src/location-geoclue2.c:107
 #, c-format
-msgid "Unable to obtain location: %s.\n"
+msgid "Unable to obtain location: %s."
 msgstr ""
 
 #: ../src/location-geoclue2.c:150
 #, c-format
-msgid "Unable to obtain GeoClue Manager: %s.\n"
+msgid "Unable to obtain GeoClue Manager: %s."
 msgstr ""
 
 #: ../src/location-geoclue2.c:166
 #, c-format
-msgid "Unable to obtain GeoClue client path: %s.\n"
+msgid "Unable to obtain GeoClue client path: %s."
 msgstr ""
 
 #: ../src/location-geoclue2.c:188
 #, c-format
-msgid "Unable to obtain GeoClue Client: %s.\n"
+msgid "Unable to obtain GeoClue Client: %s."
 msgstr ""
 
 #: ../src/location-geoclue2.c:229
 #, c-format
-msgid "Unable to set distance threshold: %s.\n"
+msgid "Unable to set distance threshold: %s."
 msgstr ""
 
 #: ../src/location-geoclue2.c:253
 #, c-format
-msgid "Unable to start GeoClue client: %s.\n"
+msgid "Unable to start GeoClue client: %s."
 msgstr ""
 
 #: ../src/location-geoclue2.c:365
-msgid "Failed to start GeoClue2 provider!\n"
+msgid "Failed to start GeoClue2 provider!"
 msgstr ""
 
 #: ../src/location-geoclue2.c:399
@@ -725,7 +714,7 @@ msgid "Use the location as discovered by the Corelocation provider.\n"
 msgstr ""
 
 #: ../src/location-manual.c:59
-msgid "Latitude and longitude must be set.\n"
+msgid "Latitude and longitude must be set."
 msgstr ""
 
 #: ../src/location-manual.c:75
@@ -747,7 +736,7 @@ msgid ""
 msgstr ""
 
 #: ../src/location-manual.c:97
-msgid "Malformed argument.\n"
+msgid "Malformed argument."
 msgstr ""
 
 #: ../src/redshift-gtk/statusicon.py:78