diff options
| -rw-r--r-- | po/ar.po | 14 | ||||
| -rw-r--r-- | po/be.po | 28 | ||||
| -rw-r--r-- | po/bg.po | 14 | ||||
| -rw-r--r-- | po/ca.po | 28 | ||||
| -rw-r--r-- | po/cs.po | 28 | ||||
| -rw-r--r-- | po/da.po | 28 | ||||
| -rw-r--r-- | po/de.po | 28 | ||||
| -rw-r--r-- | po/el.po | 14 | ||||
| -rw-r--r-- | po/en_GB.po | 28 | ||||
| -rw-r--r-- | po/eo.po | 16 | ||||
| -rw-r--r-- | po/es.po | 28 | ||||
| -rw-r--r-- | po/et.po | 14 | ||||
| -rw-r--r-- | po/eu.po | 28 | ||||
| -rw-r--r-- | po/fi.po | 24 | ||||
| -rw-r--r-- | po/fr.po | 28 | ||||
| -rw-r--r-- | po/gl.po | 22 | ||||
| -rw-r--r-- | po/he.po | 14 | ||||
| -rw-r--r-- | po/hi.po | 14 | ||||
| -rw-r--r-- | po/hr.po | 24 | ||||
| -rw-r--r-- | po/hu.po | 28 | ||||
| -rw-r--r-- | po/it.po | 28 | ||||
| -rw-r--r-- | po/ja.po | 26 | ||||
| -rw-r--r-- | po/ka.po | 14 | ||||
| -rw-r--r-- | po/lt.po | 28 | ||||
| -rw-r--r-- | po/nb.po | 28 | ||||
| -rw-r--r-- | po/nl.po | 28 | ||||
| -rw-r--r-- | po/oc.po | 20 | ||||
| -rw-r--r-- | po/pl.po | 28 | ||||
| -rw-r--r-- | po/pt.po | 26 | ||||
| -rw-r--r-- | po/pt_BR.po | 28 | ||||
| -rw-r--r-- | po/redshift.pot | 14 | ||||
| -rw-r--r-- | po/ro.po | 14 | ||||
| -rw-r--r-- | po/ru.po | 28 | ||||
| -rw-r--r-- | po/sr.po | 24 | ||||
| -rw-r--r-- | po/sv.po | 28 | ||||
| -rw-r--r-- | po/tr.po | 16 | ||||
| -rw-r--r-- | po/uk.po | 28 | ||||
| -rw-r--r-- | po/zh_CN.po | 28 | ||||
| -rw-r--r-- | po/zh_TW.po | 28 | ||||
| -rw-r--r-- | src/common.h | 103 | ||||
| -rw-r--r-- | src/config-ini.c | 8 | ||||
| -rw-r--r-- | src/gamma-dummy.c | 2 | ||||
| -rw-r--r-- | src/gamma-quartz.c | 2 | ||||
| -rw-r--r-- | src/gamma-randr.c | 2 | ||||
| -rw-r--r-- | src/gamma-vidmode.c | 2 | ||||
| -rw-r--r-- | src/location-manual.c | 1 | ||||
| -rw-r--r-- | src/options.c | 28 | ||||
| -rw-r--r-- | src/redshift.c | 89 |
48 files changed, 597 insertions, 552 deletions
@@ -185,7 +185,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -259,12 +259,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -381,8 +381,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -544,7 +544,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -634,7 +634,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -195,8 +195,8 @@ msgstr "Ад пастаўшчыка атрымана хібнае месцазн #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Каляровая тэмпература: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Каляровая тэмпература: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -271,13 +271,13 @@ msgstr "Вышыня сонца : днём вышэй %.1f, ноччу ніжэ #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Тэмпература : %iK днём, %iK уначы\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Тэмпература : %luK днём, %luK уначы\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Тэмпература павінна быць паміж %uK і %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Тэмпература павінна быць паміж %luK і %luK." #: ../src/redshift.c:1083 #, c-format @@ -417,13 +417,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Прадвызначаныя значэнні:\n" "\n" -"Тэмпература днём: %uK\n" -"Тэмпература ноччу: %uK\n" +"Тэмпература днём: %luK\n" +"Тэмпература ноччу: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -588,8 +588,8 @@ msgstr "Хібны экран %i .\n" #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Значэнне гамы занадта малое : %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Значэнне гамы занадта малое : %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -686,8 +686,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Тэмпература: %i\n" +msgid "Temperature: %lu\n" +msgstr "Тэмпература: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -185,7 +185,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -259,12 +259,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -381,8 +381,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -544,7 +544,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -634,7 +634,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -197,8 +197,8 @@ msgstr "La ubicació proporcionada pel proveïdor no és vàlida.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura de color: %u K\n" +msgid "Color temperature: %luK\n" +msgstr "Temperatura de color: %lu K\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -273,13 +273,13 @@ msgstr "Elevacions solars: dia per sobre de %.1f °, nit per sota de %.1f °\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperatures: %i K de dia, %i K de nit\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperatures: %lu K de dia, %lu K de nit\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "La temperatura ha d'estar entre %u K y %u K." +msgid "Temperature must be between %luK and %luK." +msgstr "La temperatura ha d'estar entre %lu K y %lu K." #: ../src/redshift.c:1083 #, c-format @@ -420,13 +420,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Valors per defecte:\n" "\n" -" Temperatura de dia: %u K\n" -" Temperatura de nit: %u K\n" +" Temperatura de dia: %lu K\n" +" Temperatura de nit: %lu K\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -593,8 +593,8 @@ msgstr "No s'ha trobat la pantalla %i." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "El valor gamma és massa petit: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "El valor gamma és massa petit: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -689,8 +689,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatura: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatura: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -195,8 +195,8 @@ msgstr "Poskytovatel vrátil neplatnou polohu.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Barevná teplota: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Barevná teplota: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -273,13 +273,13 @@ msgstr "Výšky (úhly) Slunce: den nad %.1f°, noc pod %.1f°\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Barevné teploty: %iK ve dne, %iK v noci\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Barevné teploty: %luK ve dne, %luK v noci\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Je třeba, aby teplota byla z rozsahu %uK až %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Je třeba, aby teplota byla z rozsahu %luK až %luK." #: ../src/redshift.c:1083 #, c-format @@ -418,13 +418,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Výchozí hodnoty:\n" "\n" -" Teplota ve dne: %uK\n" -" Teplota v noci: %uK\n" +" Teplota ve dne: %luK\n" +" Teplota v noci: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -594,8 +594,8 @@ msgstr "Obrazovku %i nelze nalézt." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Rozsah gama křivky není dostačující: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Rozsah gama křivky není dostačující: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -691,8 +691,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Teplota: %i\n" +msgid "Temperature: %lu\n" +msgstr "Teplota: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -195,8 +195,8 @@ msgstr "Ugyldig placering returneret fra udbyder.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Farvetemperatur: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Farvetemperatur: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -273,13 +273,13 @@ msgstr "Solhøjde: dag over %.1f°, nat under %.1f°\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperaturer: %iK om dagen, %iK om natten\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperaturer: %luK om dagen, %luK om natten\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Temperatur skal være mellem %uK og %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Temperatur skal være mellem %luK og %luK." #: ../src/redshift.c:1083 #, c-format @@ -417,13 +417,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Standardværdier:\n" "\n" -" Dagtemperatur: %uK\n" -" Nattemperatur: %uK\n" +" Dagtemperatur: %luK\n" +" Nattemperatur: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -586,8 +586,8 @@ msgstr "Skærm %i kunne ikke findes." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Størrelsen på gammatabellen er for lille: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Størrelsen på gammatabellen er for lille: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -681,8 +681,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatur: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatur: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -195,8 +195,8 @@ msgstr "Es ist ein ungültiger Standort vom Anbieter geliefert worden.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Farbtemperatur: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Farbtemperatur: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -273,13 +273,13 @@ msgstr "Sonnenstand: Tag oben %.1f, Nacht unten %.1f\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Farbtemperatur: %iK tagsüber, %iK nachts\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Farbtemperatur: %luK tagsüber, %luK nachts\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Die Temperatur muss sich zwischen %uK und %uK befinden." +msgid "Temperature must be between %luK and %luK." +msgstr "Die Temperatur muss sich zwischen %luK und %luK befinden." #: ../src/redshift.c:1083 #, c-format @@ -417,13 +417,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Vorgabewerte:\n" "\n" -" Temperatur tagsüber: %uK\n" -" Temperatur nachts: %uK\n" +" Temperatur tagsüber: %luK\n" +" Temperatur nachts: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -589,8 +589,8 @@ msgstr "Schirm %i konnte nicht gefunden werden." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Gamma-Anstiegswert zu klein: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Gamma-Anstiegswert zu klein: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -685,8 +685,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatur: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatur: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -185,7 +185,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -259,12 +259,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -381,8 +381,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -544,7 +544,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -634,7 +634,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 diff --git a/po/en_GB.po b/po/en_GB.po index 5909e52..5b9ee8f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -194,8 +194,8 @@ msgstr "Invalid location returned from provider.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Colour temperature: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Colour temperature: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -272,13 +272,13 @@ msgstr "Solar elevations: day above %.1f, night below %.1f\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperatures: %luK at day, %luK at night\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Temperature must be between %luK and %luK." #: ../src/redshift.c:1083 #, c-format @@ -418,13 +418,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -587,8 +587,8 @@ msgstr "Screen %i could not be found." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Gamma ramp size too small: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Gamma ramp size too small: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -683,8 +683,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperature: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperature: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -186,7 +186,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -260,12 +260,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -382,8 +382,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #. TRANSLATORS: help output 7 @@ -551,7 +551,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -641,8 +641,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperaturo: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperaturo: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -197,8 +197,8 @@ msgstr "La ubicación proporcionada por el proveedor no es válida.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura de color: %u K\n" +msgid "Color temperature: %luK\n" +msgstr "Temperatura de color: %lu K\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -275,13 +275,13 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperaturas: %i K de día, %i K de noche\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperaturas: %lu K de día, %lu K de noche\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "La temperatura debe estar entre %u K y %u K." +msgid "Temperature must be between %luK and %luK." +msgstr "La temperatura debe estar entre %lu K y %lu K." #: ../src/redshift.c:1083 #, c-format @@ -423,13 +423,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Valores por defecto:\n" "\n" -" Temperatura de día: %u K\n" -" Temperatura de noche: %u K\n" +" Temperatura de día: %lu K\n" +" Temperatura de noche: %lu K\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -597,8 +597,8 @@ msgstr "No se ha encontrado la pantalla %i." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "El valor gamma es demasiado pequeño: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "El valor gamma es demasiado pequeño: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -693,8 +693,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatura: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatura: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -185,7 +185,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -259,12 +259,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -381,8 +381,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -544,7 +544,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -634,7 +634,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -194,8 +194,8 @@ msgstr "Hornitzaileak emandako kokapena ez da baliozkoa.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Kolore-tenperatura: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Kolore-tenperatura: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -271,13 +271,13 @@ msgstr "Eguzkiaren goratzeak: egunez %.1f-ren gainea, gauez %.1f-ren azpian.\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Tenperaturak: %iK egunez, %iK gauez\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Tenperaturak: %luK egunez, %luK gauez\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Tenperatura muga hauen barruan egon behar da: %uK eta %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Tenperatura muga hauen barruan egon behar da: %luK eta %luK." #: ../src/redshift.c:1083 #, c-format @@ -414,13 +414,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Balio lehenetsiak:\n" "\n" -" Eguneko tenperatura: %uK\n" -" Gaueko tenperatura: %uK\n" +" Eguneko tenperatura: %luK\n" +" Gaueko tenperatura: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -585,8 +585,8 @@ msgstr "%i pantaila ez da aurkitu." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Gamma ramp tamaina txikiegia: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Gamma ramp tamaina txikiegia: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -681,8 +681,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Tenperatura: %i\n" +msgid "Temperature: %lu\n" +msgstr "Tenperatura: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -186,8 +186,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Värilämpötila: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Värilämpötila: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -260,13 +260,13 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Värilämpötilan on oltava väliltä %uK - %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Värilämpötilan on oltava väliltä %luK - %luK." #: ../src/redshift.c:1083 #, c-format @@ -385,13 +385,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Oletusvalinnat:\n" "\n" -" Päiväsajan värilämpötila: %uK\n" -" Yöajan värilämpötila: %uK\n" +" Päiväsajan värilämpötila: %luK\n" +" Yöajan värilämpötila: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -556,8 +556,8 @@ msgstr "Näyttöä %i ei löytynyt." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Gamman askellus liian pieni: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Gamman askellus liian pieni: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -646,7 +646,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -196,8 +196,8 @@ msgstr "Le fournisseur a renvoyé une localisation invalide.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Température de couleur : %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Température de couleur : %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -275,13 +275,13 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Températures : %iK le jour, %iK la nuit\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Températures : %luK le jour, %luK la nuit\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "La température doit être comprise entre %uK et %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "La température doit être comprise entre %luK et %luK." #: ../src/redshift.c:1083 #, c-format @@ -427,13 +427,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Valeurs par défaut :\n" "\n" -" Température du jour : %uK\n" -" Température de la nuit : %uK\n" +" Température du jour : %luK\n" +" Température de la nuit : %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -601,8 +601,8 @@ msgstr "Moniteur %i introuvable." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "La taille de la rampe gamma est trop petite : %i" +msgid "Gamma ramp size too small: %zu" +msgstr "La taille de la rampe gamma est trop petite : %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -695,8 +695,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Température : %i\n" +msgid "Temperature: %lu\n" +msgstr "Température : %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -185,8 +185,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura da color: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Temperatura da color: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -259,13 +259,13 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "A temperatura debe estar entre %uK e %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "A temperatura debe estar entre %luK e %luK." #: ../src/redshift.c:1083 #, c-format @@ -381,13 +381,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Valores por defecto:\n" "\n" -" Temperatura do día: %uK\n" -" Temperatura da noite: %uK\n" +" Temperatura do día: %luK\n" +" Temperatura da noite: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -549,7 +549,7 @@ msgstr "A pantalla %i podería non atoparse." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -639,7 +639,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -187,7 +187,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -261,12 +261,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -383,8 +383,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -546,7 +546,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -636,7 +636,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -185,7 +185,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -259,12 +259,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -384,8 +384,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -547,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -637,7 +637,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -185,8 +185,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura boje: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Temperatura boje: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -259,13 +259,13 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Temperatura mora biti između %uK i %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Temperatura mora biti između %luK i %luK." #: ../src/redshift.c:1083 #, c-format @@ -384,13 +384,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Zadane vrijednosti:\n" "\n" -" Dnevna temperatura: %uK\n" -" Noćna temperatura: %uK\n" +" Dnevna temperatura: %luK\n" +" Noćna temperatura: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -554,8 +554,8 @@ msgstr "Zaslon %i nije moguće pronaći." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Veličina gama krivulje je premala: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Veličina gama krivulje je premala: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -644,7 +644,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -195,8 +195,8 @@ msgstr "Érvénytelen helyet küldött a szolgáltató.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Színhőmérséklet: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Színhőmérséklet: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -273,13 +273,13 @@ msgstr "Nap szögmagasságai: nappal %.1f felett, éjszaka %.1f alatt\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Hőmérsékletek: %iK nappal, %iK éjszaka\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Hőmérsékletek: %luK nappal, %luK éjszaka\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "A hőmérsékletnek %uK és %uK közti értéknek kell lennie." +msgid "Temperature must be between %luK and %luK." +msgstr "A hőmérsékletnek %luK és %luK közti értéknek kell lennie." #: ../src/redshift.c:1083 #, c-format @@ -398,13 +398,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Alapértelmezett értékek:\n" "\n" -" Nappali hőmérséklet: %uK\n" -" Éjszakai hőmérséklet: %uK\n" +" Nappali hőmérséklet: %luK\n" +" Éjszakai hőmérséklet: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -571,8 +571,8 @@ msgstr "%i képernyő nem található." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Gamma emelkedés mérete túl kicsi: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Gamma emelkedés mérete túl kicsi: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -668,8 +668,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Hőmérséklet: %i\n" +msgid "Temperature: %lu\n" +msgstr "Hőmérséklet: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -197,8 +197,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura del colore: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Temperatura del colore: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -271,13 +271,13 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperature: %iK di giorno, %iK di notte\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperature: %luK di giorno, %luK di notte\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "La temperatura deve essere compresa tra %uK e %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "La temperatura deve essere compresa tra %luK e %luK." #: ../src/redshift.c:1083 #, c-format @@ -398,13 +398,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Valori predefiniti:\n" "\n" -" Temperatura giornaliera: %uK\n" -" Temperatura notturna: %uK\n" +" Temperatura giornaliera: %luK\n" +" Temperatura notturna: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -567,8 +567,8 @@ msgstr "Lo schermo %i non è stato trovato." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Dimensione della scala di gamma troppo piccola: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Dimensione della scala di gamma troppo piccola: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -661,8 +661,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatura: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatura: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -189,8 +189,8 @@ msgstr "プロバイダから無効な位置が返されました。\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "色温度: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "色温度: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -263,12 +263,12 @@ msgstr "太陽の高度範囲: 昼間は %.1f° より上, 夜間は %.1f° よ #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "温度: 昼間 %iK, 夜間 %iK\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "温度: 昼間 %luK, 夜間 %luK\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "温度は %uK と %uK の間でなければなりません。" #: ../src/redshift.c:1083 @@ -406,13 +406,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "既定値:\n" "\n" -" 昼間の温度: %uK\n" -" 夜間の温度: %uK\n" +" 昼間の温度: %luK\n" +" 夜間の温度: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -576,8 +576,8 @@ msgstr "スクリーン %i を見つけられませんでした。" #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "ガンマ ランプのサイズが小さすぎます: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "ガンマ ランプのサイズが小さすぎます: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -668,8 +668,8 @@ msgstr "ディスプレイには影響を与えませんが、端末に色温度 #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "温度: %i\n" +msgid "Temperature: %lu\n" +msgstr "温度: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -185,7 +185,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -259,12 +259,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -381,8 +381,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -544,7 +544,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -634,7 +634,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -193,8 +193,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Spalvos temperatūra: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Spalvos temperatūra: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -267,13 +267,13 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperatūros: %iK dieną, %iK naktį\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperatūros: %luK dieną, %luK naktį\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Temperatūra turi būti tarp %uK ir %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Temperatūra turi būti tarp %luK ir %luK." #: ../src/redshift.c:1083 #, c-format @@ -392,13 +392,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Numatytosios reikšmės:\n" "\n" -" Dienos temperatūra: %uK\n" -" Nakties temperatūra: %uK\n" +" Dienos temperatūra: %luK\n" +" Nakties temperatūra: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -562,8 +562,8 @@ msgstr "Nepavyko rasti ekrano %i." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Gamos lentelės dydis per mažas: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Gamos lentelės dydis per mažas: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -652,8 +652,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatūra: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatūra: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -194,8 +194,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Fargetemperatur: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Fargetemperatur: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -268,13 +268,13 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperaturer: %iK på dagen, %iK om natta\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperaturer: %luK på dagen, %luK om natta\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Temperatur må være mellom %uK og %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Temperatur må være mellom %luK og %luK." #: ../src/redshift.c:1083 #, c-format @@ -393,13 +393,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Standardverdier:\n" "\n" -" Dagtemperatur: %uK\n" -" Natttemperatur: %uK\n" +" Dagtemperatur: %luK\n" +" Natttemperatur: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -561,8 +561,8 @@ msgstr "Skjerm %i ble ikke funnet." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "For lav verdi for gammarampen: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "For lav verdi for gammarampen: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -653,8 +653,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatur: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatur: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -196,8 +196,8 @@ msgstr "Aanbieder gaf ongeldige locatie op.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Kleurtemperatuur: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Kleurtemperatuur: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -273,13 +273,13 @@ msgstr "Zonnestanden: dag boven %.1f, nacht onder %.1f\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperaturen: %iK overdag, %iK 's nachts\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperaturen: %luK overdag, %luK 's nachts\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Temperatuur moet tussen %uK en %uK zijn." +msgid "Temperature must be between %luK and %luK." +msgstr "Temperatuur moet tussen %luK en %luK zijn." #: ../src/redshift.c:1083 #, c-format @@ -404,13 +404,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Standaardwaarden:\n" "\n" -" Temperatuur overdag: %uK\n" -" Temperatuur 's nachts: %uK\n" +" Temperatuur overdag: %luK\n" +" Temperatuur 's nachts: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -576,8 +576,8 @@ msgstr "Scherm %i kon niet worden gevonden." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Gamma ramp grootte te klein: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Gamma ramp grootte te klein: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -673,8 +673,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatuur: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatuur: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -180,8 +180,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura de color : %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Temperatura de color : %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -254,12 +254,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperaturas : %iK lo jorn, %iK la nuèch\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperaturas : %luK lo jorn, %luK la nuèch\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -376,8 +376,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #. TRANSLATORS: help output 7 @@ -545,7 +545,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -636,8 +636,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatura : %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatura : %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -193,8 +193,8 @@ msgstr "Dostawca zwrócił nieprawidłową lokalizację\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura barwowa: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Temperatura barwowa: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -269,13 +269,13 @@ msgstr "Wysokość słońca (°): w dzień powyżej %.1f, nocą poniżej %.1f\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperatury: %i K w dzień, %i K w nocy\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperatury: %lu K w dzień, %lu K w nocy\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Temperatura barwowa musi być pomiędzy %uK i %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Temperatura barwowa musi być pomiędzy %luK i %luK." #: ../src/redshift.c:1083 #, c-format @@ -394,13 +394,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Wartości domyślne:\n" "\n" -" Temperatura dla dnia: %uK\n" -" Temperatura dla nocy: %uK\n" +" Temperatura dla dnia: %luK\n" +" Temperatura dla nocy: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -564,8 +564,8 @@ msgstr "Ekran %i nie może być znaleziony." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Rozmiar gamma ramp jest zbyt mały: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Rozmiar gamma ramp jest zbyt mały: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -656,8 +656,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatura: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatura: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -185,8 +185,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura da cor: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Temperatura da cor: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -261,13 +261,13 @@ msgstr "Elevações solares: dia acima %.1f, noite abaixo %.1f\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperaturas: %iK de dia, %iK à noite\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperaturas: %luK de dia, %luK à noite\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "A temperatura deve estar entre %uK e %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "A temperatura deve estar entre %luK e %luK." #: ../src/redshift.c:1083 #, c-format @@ -386,13 +386,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Valores por omissão:\n" "\n" -" Temperatura diurna: %uK\n" -" Temperatura noturna: %uK\n" +" Temperatura diurna: %luK\n" +" Temperatura noturna: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -557,8 +557,8 @@ msgstr "Ecrã %i não consegue ser encontrado." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Tamanho do declive gama demasiado pequeno: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Tamanho do declive gama demasiado pequeno: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -647,7 +647,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 diff --git a/po/pt_BR.po b/po/pt_BR.po index f72957b..fc53d73 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -196,8 +196,8 @@ msgstr "Localização inválida retornado do provedor\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura da cor: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Temperatura da cor: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -272,13 +272,13 @@ msgstr "Elevacao Solar: dia acima %.1f, noite abaixo %.1f\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperaturas: %iK de dia, %iK de noite\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperaturas: %luK de dia, %luK de noite\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "A temperatura deve estar entre %uK e %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "A temperatura deve estar entre %luK e %luK." #: ../src/redshift.c:1083 #, c-format @@ -398,13 +398,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Valores padrão:\n" "\n" -" Temperatura diurna: %uK\n" -" Temperatura noturna: %uK\n" +" Temperatura diurna: %luK\n" +" Temperatura noturna: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -569,8 +569,8 @@ msgstr "Tela %i não foi encontrada." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Tamanho da escala gamma muito pequeno: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Tamanho da escala gamma muito pequeno: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -659,8 +659,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatura: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatura: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format diff --git a/po/redshift.pot b/po/redshift.pot index 7b10639..378cbb0 100644 --- a/po/redshift.pot +++ b/po/redshift.pot @@ -181,7 +181,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -255,12 +255,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -377,8 +377,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -540,7 +540,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -630,7 +630,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -184,7 +184,7 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" +msgid "Color temperature: %luK\n" msgstr "" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 @@ -258,12 +258,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -380,8 +380,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -543,7 +543,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -633,7 +633,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -194,8 +194,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Температура цвета: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Температура цвета: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -268,13 +268,13 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Температуры: %iK днём, %iK ночью\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Температуры: %luK днём, %luK ночью\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Температура должна быть между %uK и %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Температура должна быть между %luK и %luK." #: ../src/redshift.c:1083 #, c-format @@ -393,12 +393,12 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Значения по умолчанию:\n" -" Температура цвета днем: %uK\n" -" Температура цвета ночью: %uK\n" +" Температура цвета днем: %luK\n" +" Температура цвета ночью: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -559,8 +559,8 @@ msgstr "Экран %i не может быть найден." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Размер таблицы корректировки цвета мал: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Размер таблицы корректировки цвета мал: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -649,8 +649,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Температура: %i\n" +msgid "Temperature: %lu\n" +msgstr "Температура: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -194,8 +194,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Температура боје: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Температура боје: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -268,12 +268,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Температуре: %iK дању, %iK ноћу\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Температуре: %luK дању, %luK ноћу\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -393,13 +393,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Подразумеване вредности:\n" "\n" -" Дневна температура: %uK\n" -" Ноћна температура: %uK\n" +" Дневна температура: %luK\n" +" Ноћна температура: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -560,7 +560,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -650,8 +650,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Температура: %i\n" +msgid "Temperature: %lu\n" +msgstr "Температура: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -196,8 +196,8 @@ msgstr "Ogiltig plats mottagen från leverantör.\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Färgtemperatur: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Färgtemperatur: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -272,13 +272,13 @@ msgstr "Solhöjd: dag över %.1f, natt under %.1f\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Temperaturer: %iK vid dag, %iK vid natt\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Temperaturer: %luK vid dag, %luK vid natt\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "Temperatur måste vara mellan %uK och %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "Temperatur måste vara mellan %luK och %luK." #: ../src/redshift.c:1083 #, c-format @@ -397,13 +397,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Standardvärden:\n" "\n" -" Dagtidstemperatur: %uK\n" -" Nattemperatur: %uK\n" +" Dagtidstemperatur: %luK\n" +" Nattemperatur: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -566,8 +566,8 @@ msgstr "Skärm %i kunde inte hittas." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Gammaförfinings storlek för liten: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Gammaförfinings storlek för liten: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -660,8 +660,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Temperatur: %i\n" +msgid "Temperature: %lu\n" +msgstr "Temperatur: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format @@ -185,8 +185,8 @@ msgstr "" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Renk sıcaklığı: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Renk sıcaklığı: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -259,12 +259,12 @@ msgstr "" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" +msgid "Temperatures: %luK at day, %luK at night\n" msgstr "" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." +msgid "Temperature must be between %luK and %luK." msgstr "" #: ../src/redshift.c:1083 @@ -381,8 +381,8 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" #: ../src/options.c:225 @@ -544,7 +544,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" +msgid "Gamma ramp size too small: %zu" msgstr "" #: ../src/gamma-randr.c:277 @@ -634,7 +634,7 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" +msgid "Temperature: %lu\n" msgstr "" #: ../src/location-geoclue2.c:59 @@ -195,8 +195,8 @@ msgstr "Отримано недійсне місце знаходження ві #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "Колірна температура: %uK\n" +msgid "Color temperature: %luK\n" +msgstr "Колірна температура: %luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -273,13 +273,13 @@ msgstr "Сонцестояння: день більший %.1f, ніч менш #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "Температура: %iK в день, %iK у ночі\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "Температура: %luK в день, %luK у ночі\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "температура повинна бути між %uK і %uK." +msgid "Temperature must be between %luK and %luK." +msgstr "температура повинна бути між %luK і %luK." #: ../src/redshift.c:1083 #, c-format @@ -418,13 +418,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "Значення за замовчуванням:\n" "\n" -" Денна температура: %uK\n" -" Нічна температура: %uK\n" +" Денна температура: %luK\n" +" Нічна температура: %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -590,8 +590,8 @@ msgstr "Екран %i не знайдений." #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "Розмір гамма-рампи надто малий: %i" +msgid "Gamma ramp size too small: %zu" +msgstr "Розмір гамма-рампи надто малий: %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -686,8 +686,8 @@ msgstr "" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "Температура: %i\n" +msgid "Temperature: %lu\n" +msgstr "Температура: %lu\n" #: ../src/location-geoclue2.c:59 #, c-format diff --git a/po/zh_CN.po b/po/zh_CN.po index d1cb67c..46783ea 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -185,8 +185,8 @@ msgstr "从提供程序返回的位置无效。\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "色温：%uK\n" +msgid "Color temperature: %luK\n" +msgstr "色温：%luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -259,13 +259,13 @@ msgstr "太阳高度：日间高于 %.1f 度，夜间低于 %.1f 度\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "色温：日间 %iK，夜间 %iK\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "色温：日间 %luK，夜间 %luK\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "色温必须介于 %uK 和 %uK。" +msgid "Temperature must be between %luK and %luK." +msgstr "色温必须介于 %luK 和 %luK。" #: ../src/redshift.c:1083 #, c-format @@ -402,13 +402,13 @@ msgstr "中性温度是 %uK. 使用这个值不会改变颜色\n" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "默认值：\n" "\n" -" 日间色温：%uK\n" -" 夜间色温：%uK\n" +" 日间色温：%luK\n" +" 夜间色温：%luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -573,8 +573,8 @@ msgstr "屏幕 %i 无法找到。" #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "伽马斜面值太小：%i" +msgid "Gamma ramp size too small: %zu" +msgstr "伽马斜面值太小：%zu" #: ../src/gamma-randr.c:277 #, c-format @@ -665,8 +665,8 @@ msgstr "不要影响显示器但打印色温到终端上。\n" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "色温：%i\n" +msgid "Temperature: %lu\n" +msgstr "色温：%lu\n" #: ../src/location-geoclue2.c:59 #, c-format diff --git a/po/zh_TW.po b/po/zh_TW.po index f17069a..fc34636 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -187,8 +187,8 @@ msgstr "供應者回覆不合用的位置資訊。\n" #: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 #: ../src/redshift.c:1253 #, c-format -msgid "Color temperature: %uK\n" -msgstr "色溫：%uK\n" +msgid "Color temperature: %luK\n" +msgstr "色溫：%luK\n" #: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format @@ -261,13 +261,13 @@ msgstr "太陽海拔：日間高於 %.1f ．夜間低於 %.1f 。\n" #: ../src/redshift.c:1049 #, c-format -msgid "Temperatures: %iK at day, %iK at night\n" -msgstr "溫度：日間為 %iK ．夜間為 %iK\n" +msgid "Temperatures: %luK at day, %luK at night\n" +msgstr "溫度：日間為 %luK ．夜間為 %luK\n" #: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format -msgid "Temperature must be between %uK and %uK." -msgstr "溫度必須介於 %uK 及 %uK 之間。" +msgid "Temperature must be between %luK and %luK." +msgstr "溫度必須介於 %luK 及 %luK 之間。" #: ../src/redshift.c:1083 #, c-format @@ -405,13 +405,13 @@ msgstr "" msgid "" "Default values:\n" "\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" +" Daytime temperature: %luK\n" +" Night temperature: %luK\n" msgstr "" "預設值：\n" "\n" -" 日間色溫： %uK\n" -" 夜間色溫： %uK\n" +" 日間色溫： %luK\n" +" 夜間色溫： %luK\n" #: ../src/options.c:225 msgid "Available adjustment methods:\n" @@ -578,8 +578,8 @@ msgstr "螢幕 %i 未被找到。" #: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format -msgid "Gamma ramp size too small: %i" -msgstr "咖瑪斜面值太小： %i" +msgid "Gamma ramp size too small: %zu" +msgstr "咖瑪斜面值太小： %zu" #: ../src/gamma-randr.c:277 #, c-format @@ -672,8 +672,8 @@ msgstr "不要影響顯示器，但列印色溫至終端器。\n" #: ../src/gamma-dummy.c:75 #, c-format -msgid "Temperature: %i\n" -msgstr "色溫： %i\n" +msgid "Temperature: %lu\n" +msgstr "色溫： %lu\n" #: ../src/location-geoclue2.c:59 #, c-format diff --git a/src/common.h b/src/common.h index ca9e439..4ac8b53 100644 --- a/src/common.h +++ b/src/common.h @@ -82,6 +82,11 @@ #if defined(__GNUC__) +# pragma GCC diagnostic ignored "-Wunsuffixed-float-constants" +#endif + + +#if defined(__GNUC__) # define GCC_ONLY(...) __VA_ARGS__ #else # define GCC_ONLY(...) @@ -89,13 +94,7 @@ /** - * The colour temperature corresponding to no effect - */ -#define NEUTRAL_TEMP 6500 - - -/** - * Truncate a value into a bounded range + * Truncate a value into a closed range * * @param LO The lower bound * @param X The value to truncated @@ -104,6 +103,43 @@ */ #define CLAMP(LO, X, UP) (((LO) > (X)) ? (LO) : (((X) < (UP)) ? (X) : (UP))) +/** + * Check whether a value is within a closed range + * + * @param LO The lower bound + * @param X The value to check + * @param UP The upper bound + * @return :int 1 if `X` is within [`LO`, `UP`], 0 otherwise + */ +#define WITHIN(LO, X, UP) ((LO) <= (X) && (X) <= (UP)) + + +/** + * The colour temperature corresponding to no effect + */ +#define NEUTRAL_TEMP 6500U + +/** + * Initialiser for `struct color_setting` + * + * Sets all values to their neutral values (no effects applied) + */ +#define COLOR_SETTING_NEUTRAL ((struct color_setting){NEUTRAL_TEMP, 1.0, {1.0, 1.0, 1.0}}) + + +/** + * State of an adjustment method + * + * Each method has their own definition of this structure + */ +typedef struct gamma_state GAMMA_STATE; + +/** + * State of a location provider + * + * Each provider has their own definition of this structure + */ +typedef struct location_state LOCATION_STATE; enum period { @@ -121,16 +157,45 @@ enum program_mode { PROGRAM_MODE_MANUAL }; + +/** + * Geographical location, using GPS coordinates + */ struct location { - double lat, lon; + /** + * Degrees north of the equator + */ + double lat; + + /** + * Degrees east of the prime meridian + */ + double lon; }; + +/** + * Colour setting to apply + */ struct color_setting { - int temperature; - double gamma[3]; + /** + * Colour temperature, in Kelvin + */ + unsigned long int temperature; + + /** + * Whitepoint brightness level + */ double brightness; + + /** + * Gamma correct, for the each RGB channel + * in the order: red, green, and blue + */ + double gamma[3]; }; + /* Time range. Fields are offsets from midnight in seconds. */ struct time_range { @@ -138,6 +203,7 @@ struct time_range { int end; }; + /* Transition scheme. The solar elevations at which the transition begins/ends, and the association color settings. */ @@ -151,18 +217,21 @@ struct transition_scheme { struct color_setting night; }; + struct config_ini_setting { struct config_ini_setting *next; char *name; char *value; }; + struct config_ini_section { struct config_ini_section *next; char *name; struct config_ini_setting *settings; }; + struct config_ini_state { struct config_ini_section *sections; }; @@ -177,7 +246,7 @@ struct options { int verbose; /* Temperature to set in manual mode. */ - int temp_set; + unsigned long int temp_set; /* Whether to fade between large skips in color temperature. */ int use_fade; /* Whether to preserve gamma ramps if supported by gamma method. */ @@ -195,9 +264,9 @@ struct options { }; -/* Gamma adjustment method */ -typedef struct gamma_state GAMMA_STATE; - +/** + * Adjustment method information and interface + */ struct gamma_method { const char *name; @@ -223,9 +292,9 @@ struct gamma_method { }; -/* Location provider */ -typedef struct location_state LOCATION_STATE; - +/** + * Location provider information and interface + */ struct location_provider { const char *name; diff --git a/src/config-ini.c b/src/config-ini.c index db94f22..c524605 100644 --- a/src/config-ini.c +++ b/src/config-ini.c @@ -193,19 +193,19 @@ try_path(const struct env_path *path_spec, char **path_out) stpcpy(&path[len], path_spec->suffix); f = fopen(path, "r"); if (f) { - weprintf(_("Found configuration file `%s'.")); + weprintf(_("Found configuration file `%s'."), path); break; } else if (errno != ENOENT) { - eprintf("fopen %s \"%s\":", path); + eprintf("fopen %s \"r\":", path); } } } else { stpcpy(stpcpy(path, prefix), path_spec->suffix); f = fopen(path, "r"); if (f) - weprintf(_("Found configuration file `%s'.")); + weprintf(_("Found configuration file `%s'."), path); else if (errno != ENOENT) - eprintf("fopen %s \"%s\":", path); + eprintf("fopen %s \"r\":", path); } if (f) { diff --git a/src/gamma-dummy.c b/src/gamma-dummy.c index cc494e4..9f3e907 100644 --- a/src/gamma-dummy.c +++ b/src/gamma-dummy.c @@ -69,7 +69,7 @@ gamma_dummy_set_temperature( { (void) state; (void) preserve; - printf(_("Temperature: %i\n"), setting->temperature); + printf(_("Temperature: %lu\n"), setting->temperature); return 0; } diff --git a/src/gamma-quartz.c b/src/gamma-quartz.c index 4645da2..3d7cde3 100644 --- a/src/gamma-quartz.c +++ b/src/gamma-quartz.c @@ -83,7 +83,7 @@ quartz_start(struct gamma_state *state, program_mode_t mode) ramp_size = CGDisplayGammaTableCapacity(display); if (!ramp_size) { - weprintf(_("Gamma ramp size too small: %i"), ramp_size); + weprintf(_("Gamma ramp size too small: %zu"), (size_t)ramp_size); return -1; } diff --git a/src/gamma-randr.c b/src/gamma-randr.c index 1c648a9..00fdc0c 100644 --- a/src/gamma-randr.c +++ b/src/gamma-randr.c @@ -181,7 +181,7 @@ randr_start(struct gamma_state *state, enum program_mode mode) free(gamma_size_reply); if (ramp_size == 0) { - weprintf(_("Gamma ramp size too small: %i"), ramp_size); + weprintf(_("Gamma ramp size too small: %zu"), (size_t)ramp_size); return -1; } diff --git a/src/gamma-vidmode.c b/src/gamma-vidmode.c index 0876f47..13ac50d 100644 --- a/src/gamma-vidmode.c +++ b/src/gamma-vidmode.c @@ -80,7 +80,7 @@ vidmode_start(struct gamma_state *state, enum program_mode mode) } if (!state->ramp_size) { - weprintf(_("Gamma ramp size too small: %i"), state->ramp_size); + weprintf(_("Gamma ramp size too small: %zu"), (size_t)state->ramp_size); return -1; } diff --git a/src/location-manual.c b/src/location-manual.c index 90f30bd..aeffa10 100644 --- a/src/location-manual.c +++ b/src/location-manual.c @@ -34,6 +34,7 @@ location_manual_init(struct location_state **state) return 0; } +GCC_ONLY(__attribute__((__pure__))) static int location_manual_start(struct location_state *state) { diff --git a/src/options.c b/src/options.c index fafc603..c25eb03 100644 --- a/src/options.c +++ b/src/options.c @@ -15,7 +15,7 @@ * along with redshift-ng. If not, see <http://www.gnu.org/licenses/>. * * Copyright (c) 2017 Jon Lund Steffensen <jonlst@gmail.com> - * Copyright (c) 2025 Mattias Andrée <m@maandre.se> + * Copyright (c) 2025 Mattias Andrée <m@maandree.se> */ #include "common.h" @@ -27,8 +27,8 @@ #define TRANSITION_HIGH 3.0 /* Default values for parameters. */ -#define DEFAULT_DAY_TEMP 6500 -#define DEFAULT_NIGHT_TEMP 4500 +#define DEFAULT_DAY_TEMP 6500UL +#define DEFAULT_NIGHT_TEMP 4500UL #define DEFAULT_BRIGHTNESS 1.0 #define DEFAULT_GAMMA 1.0 @@ -67,7 +67,7 @@ parse_gamma_string(const char *str, double gamma[3]) if (!s) return -1; - *(s++) = '\0'; + *s++ = '\0'; gamma[0] = atof(str); /* Red */ gamma[1] = atof(g_s); /* Blue */ gamma[2] = atof(s); /* Green */ @@ -189,8 +189,8 @@ print_help(void) /* TRANSLATORS: help output 6 */ printf(_("Default values:\n\n" - " Daytime temperature: %uK\n" - " Night temperature: %uK\n"), + " Daytime temperature: %luK\n" + " Night temperature: %luK\n"), DEFAULT_DAY_TEMP, DEFAULT_NIGHT_TEMP); fputs("\n", stdout); @@ -228,6 +228,7 @@ print_provider_list(void) } /* Return the gamma method with the given name. */ +GCC_ONLY(__attribute__((__pure__))) static const struct gamma_method * find_gamma_method(const char *name) { @@ -239,6 +240,7 @@ find_gamma_method(const char *name) } /* Return location provider with the given name. */ +GCC_ONLY(__attribute__((__pure__))) static const struct location_provider * find_location_provider(const char *name) { @@ -269,16 +271,16 @@ options_init(struct options *options) options->scheme.dusk.start = -1; options->scheme.dusk.end = -1; - options->scheme.day.temperature = -1; + options->scheme.day.temperature = 0; options->scheme.day.gamma[0] = NAN; options->scheme.day.brightness = NAN; - options->scheme.night.temperature = -1; + options->scheme.night.temperature = 0; options->scheme.night.gamma[0] = NAN; options->scheme.night.brightness = NAN; /* Temperature for manual mode */ - options->temp_set = -1; + options->temp_set = 0; options->method = NULL; options->method_args = NULL; @@ -457,10 +459,10 @@ static void parse_config_file_option(const char *key, const char *value, struct options *options) { if (!strcasecmp(key, "temp-day")) { - if (options->scheme.day.temperature < 0) + if (!options->scheme.day.temperature) options->scheme.day.temperature = atoi(value); } else if (!strcasecmp(key, "temp-night")) { - if (options->scheme.night.temperature < 0) + if (!options->scheme.night.temperature) options->scheme.night.temperature = atoi(value); } else if (!strcasecmp(key, "transition") || !strcasecmp(key, "fade")) { /* "fade" is preferred, "transition" is deprecated as the setting key. */ @@ -547,9 +549,9 @@ options_parse_config_file(struct options *options, struct config_ini_state *conf void options_set_defaults(struct options *options) { - if (options->scheme.day.temperature < 0) + if (!options->scheme.day.temperature) options->scheme.day.temperature = DEFAULT_DAY_TEMP; - if (options->scheme.night.temperature < 0) + if (!options->scheme.night.temperature) options->scheme.night.temperature = DEFAULT_NIGHT_TEMP; if (isnan(options->scheme.day.brightness)) diff --git a/src/redshift.c b/src/redshift.c index 836a848..451c4bf 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -15,7 +15,7 @@ * along with redshift-ng. If not, see <http://www.gnu.org/licenses/>. * * Copyright (c) 2009-2017 Jon Lund Steffensen <jonlst@gmail.com> - * Copyright (c) 2025 Mattias Andrée <m@maandre.se> + * Copyright (c) 2025 Mattias Andrée <m@maandree.se> */ #include "common.h" @@ -40,8 +40,8 @@ int poll(struct pollfd *fds, int nfds, int timeout) { abort(); return -1; } #define MAX_LAT 90.0 #define MIN_LON -180.0 #define MAX_LON 180.0 -#define MIN_TEMP 1000 -#define MAX_TEMP 25000 +#define MIN_TEMP 1000UL +#define MAX_TEMP 25000UL /* TODO README documents that there is no limit */ #define MIN_BRIGHTNESS 0.1 #define MAX_BRIGHTNESS 1.0 #define MIN_GAMMA 0.1 @@ -179,16 +179,10 @@ get_seconds_since_midnight(double timestamp) static void print_period(enum period period, double transition) { - switch (period) { - case PERIOD_NONE: - case PERIOD_NIGHT: - case PERIOD_DAYTIME: - printf(_("Period: %s\n"), gettext(period_names[period])); - break; - case PERIOD_TRANSITION: + if (period == PERIOD_TRANSITION) printf(_("Period: %s (%.2f%% day)\n"), gettext(period_names[period]), transition * 100); - break; - } + else + printf(_("Period: %s\n"), gettext(period_names[period])); } /* Print location */ @@ -237,24 +231,13 @@ interpolate_transition_scheme(const struct transition_scheme *transition, double static int color_setting_diff_is_major(const struct color_setting *first, const struct color_setting *second) { - return abs(first->temperature - second->temperature) > 25 || + return MAX(first->temperature, second->temperature) - MIN(first->temperature, second->temperature) > 25UL || fabs(first->brightness - second->brightness) > 0.1 || fabs(first->gamma[0] - second->gamma[0]) > 0.1 || fabs(first->gamma[1] - second->gamma[1]) > 0.1 || fabs(first->gamma[2] - second->gamma[2]) > 0.1; } -/* Reset color setting to default values. */ -static void -color_setting_reset(struct color_setting *color) -{ - color->temperature = NEUTRAL_TEMP; - color->gamma[0] = 1.0; - color->gamma[1] = 1.0; - color->gamma[2] = 1.0; - color->brightness = 1.0; -} - static int provider_try_start(const struct location_provider *provider, LOCATION_STATE **state, @@ -397,9 +380,9 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state, static int gamma_is_valid(const double gamma[3]) { - return !(gamma[0] < MIN_GAMMA || gamma[0] > MAX_GAMMA || - gamma[1] < MIN_GAMMA || gamma[1] > MAX_GAMMA || - gamma[2] < MIN_GAMMA || gamma[2] > MAX_GAMMA); + return WITHIN(MIN_GAMMA, gamma[0], MAX_GAMMA) && + WITHIN(MIN_GAMMA, gamma[1], MAX_GAMMA) && + WITHIN(MIN_GAMMA, gamma[2], MAX_GAMMA); } /* Check whether location is valid. @@ -408,20 +391,16 @@ gamma_is_valid(const double gamma[3]) static int location_is_valid(const struct location *location) { - /* Latitude */ - if (location->lat < MIN_LAT || location->lat > MAX_LAT) { + if (!WITHIN(MIN_LAT, location->lat, MAX_LAT)) { /* TRANSLATORS: Append degree symbols if possible. */ weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LAT, MAX_LAT); /* TODO \n */ return 0; } - - /* Longitude */ - if (location->lon < MIN_LON || location->lon > MAX_LON) { + if (!WITHIN(MIN_LON, location->lon, MAX_LON)) { /* TRANSLATORS: Append degree symbols if possible. */ weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LON, MAX_LON); /* TODO \n */ return 0; } - return 1; } @@ -513,11 +492,11 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc /* Previous target color setting and current actual color setting. Actual color setting takes into account the current color fade. */ - color_setting_reset(&prev_target_interp); + prev_target_interp = COLOR_SETTING_NEUTRAL; - color_setting_reset(&interp); + interp = COLOR_SETTING_NEUTRAL; - loc = (struct location){ NAN, NAN }; + loc = (struct location){NAN, NAN}; need_location = !scheme->use_time; if (need_location) { weprintf(_("Waiting for initial location to become available...\n")); /* TODO \n */ @@ -533,7 +512,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc } if (verbose) { - printf(_("Color temperature: %uK\n"), interp.temperature); + printf(_("Color temperature: %luK\n"), interp.temperature); printf(_("Brightness: %.2f\n"), interp.brightness); } @@ -589,7 +568,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc if (disabled) { period = PERIOD_NONE; - color_setting_reset(&target_interp); + target_interp = COLOR_SETTING_NEUTRAL; } if (done) @@ -638,7 +617,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc if (verbose) { if (prev_target_interp.temperature != target_interp.temperature) - printf(_("Color temperature: %uK\n"), target_interp.temperature); + printf(_("Color temperature: %luK\n"), target_interp.temperature); if (!exact_eq(prev_target_interp.brightness, target_interp.brightness)) printf(_("Brightness: %.2f\n"), target_interp.brightness); } @@ -715,7 +694,7 @@ main(int argc, char *argv[]) struct transition_scheme *scheme; GAMMA_STATE *method_state; LOCATION_STATE *location_state; - int r, need_location; + int need_location; size_t i; struct location loc = { NAN, NAN }; double now, transition_prog; @@ -805,29 +784,25 @@ main(int argc, char *argv[]) if (options.mode != PROGRAM_MODE_RESET && options.mode != PROGRAM_MODE_MANUAL) { if (options.verbose) { - printf(_("Temperatures: %iK at day, %iK at night\n"), + printf(_("Temperatures: %luK at day, %luK at night\n"), options.scheme.day.temperature, options.scheme.night.temperature); } /* Color temperature */ - if (options.scheme.day.temperature < MIN_TEMP || - options.scheme.day.temperature > MAX_TEMP || - options.scheme.night.temperature < MIN_TEMP || - options.scheme.night.temperature > MAX_TEMP) - eprintf(_("Temperature must be between %uK and %uK."), MIN_TEMP, MAX_TEMP); + if (!WITHIN(MIN_TEMP, options.scheme.day.temperature, MAX_TEMP) || + !WITHIN(MIN_TEMP, options.scheme.night.temperature, MAX_TEMP)) + eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMP, MAX_TEMP); } if (options.mode == PROGRAM_MODE_MANUAL) { /* Check color temperature to be set */ - if (options.temp_set < MIN_TEMP || options.temp_set > MAX_TEMP) - eprintf(_("Temperature must be between %uK and %uK."), MIN_TEMP, MAX_TEMP); + if (!WITHIN(MIN_TEMP, options.temp_set, MAX_TEMP)) + eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMP, MAX_TEMP); } /* Brightness */ - if (options.scheme.day.brightness < MIN_BRIGHTNESS || - options.scheme.day.brightness > MAX_BRIGHTNESS || - options.scheme.night.brightness < MIN_BRIGHTNESS || - options.scheme.night.brightness > MAX_BRIGHTNESS) + if (!WITHIN(MIN_BRIGHTNESS, options.scheme.day.brightness, MAX_BRIGHTNESS) || + !WITHIN(MIN_BRIGHTNESS, options.scheme.night.brightness, MAX_BRIGHTNESS)) eprintf(_("Brightness values must be between %.1f and %.1f."), MIN_BRIGHTNESS, MAX_BRIGHTNESS); if (options.verbose) @@ -860,9 +835,7 @@ main(int argc, char *argv[]) if (options.mode != PROGRAM_MODE_PRINT) { if (options.method) { /* Use method specified on command line. */ - r = method_try_start(options.method, &method_state, options.mode, - &config_state, options.method_args); - if (r < 0) + if (method_try_start(options.method, &method_state, options.mode, &config_state, options.method_args) < 0) exit(1); } else { /* Try all methods, use the first that works. */ @@ -931,7 +904,7 @@ main(int argc, char *argv[]) if (options.verbose || options.mode == PROGRAM_MODE_PRINT) { print_period(period, transition_prog); - printf(_("Color temperature: %uK\n"), color.temperature); + printf(_("Color temperature: %luK\n"), color.temperature); printf(_("Brightness: %.2f\n"), color.brightness); } @@ -955,13 +928,13 @@ main(int argc, char *argv[]) case PROGRAM_MODE_MANUAL: if (options.verbose) - printf(_("Color temperature: %uK\n"), options.temp_set); + printf(_("Color temperature: %luK\n"), options.temp_set); color = scheme->day; color.temperature = options.temp_set; goto apply; case PROGRAM_MODE_RESET: - color_setting_reset(&color); + color = COLOR_SETTING_NEUTRAL; options.preserve_gamma = 0; goto apply; |