diff --git a/debian/changelog b/debian/changelog index 87c3203..0509416 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -co2monitor (0.0.9) UNRELEASED; urgency=medium +co2monitor (0.0.9) unstable; urgency=medium * fix multiple co2monitor-service invocation bug diff --git a/usr/bin/co2monitor-invoker b/usr/bin/co2monitor-invoker index 44301e4..96bd9d9 100755 --- a/usr/bin/co2monitor-invoker +++ b/usr/bin/co2monitor-invoker @@ -130,7 +130,7 @@ else: # get DEVNAME environment variable DEVNAME = os.environ.get('DEVNAME') if not DEVNAME: # stop if there is no devname environment variable - logger.critical(_("no DEVNAME environment variable given. Aborting.")) + logger.info(_("no DEVNAME environment variable given. Nothing more to do.")) sys.exit(1) logger.debug(_("DEVNAME environment variable: {}".format(DEVNAME))) diff --git a/usr/bin/co2monitor-service b/usr/bin/co2monitor-service index bb5c9a6..c559354 100755 --- a/usr/bin/co2monitor-service +++ b/usr/bin/co2monitor-service @@ -45,7 +45,7 @@ systembus = dbus.SystemBus() # the system bus # co2monitor is already running if systembus.name_has_owner(CO2MONITOR_BUSNAME): - logger.warning(_("co2monitor is already running. Aborting.")) + logger.info(_("co2monitor is already running. Aborting.")) sys.exit() diff --git a/usr/share/co2monitor/lang/de/LC_MESSAGES/co2monitor.po b/usr/share/co2monitor/lang/de/LC_MESSAGES/co2monitor.po index 4200d0e..0a521bb 100644 --- a/usr/share/co2monitor/lang/de/LC_MESSAGES/co2monitor.po +++ b/usr/share/co2monitor/lang/de/LC_MESSAGES/co2monitor.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-23 16:15+0100\n" -"PO-Revision-Date: 2016-11-22 13:56+0100\n" +"POT-Creation-Date: 2016-11-23 17:30+0100\n" +"PO-Revision-Date: 2016-11-23 17:36+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de\n" @@ -18,22 +18,6 @@ msgstr "" "X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: usr/lib/co2monitor/python/co2monitor/gui.py:76 -msgid "Welcome to Co2monitor!" -msgstr "Willkommen bei Co2monitor!" - -#: usr/lib/co2monitor/python/co2monitor/gui.py:84 -msgid "Starting GLib main loop..." -msgstr "starte GLib Hautpschleife..." - -#: usr/lib/co2monitor/python/co2monitor/gui.py:86 -msgid "GLib main loop ended." -msgstr "GLib Hauptschleife beendet." - -#: usr/lib/co2monitor/python/co2monitor/gui.py:90 -msgid "Received quitting signal." -msgstr "Anhaltesignal erhalten." - #: usr/lib/co2monitor/python/co2monitor/device.py:31 msgid "Device file '{}' does not exist." msgstr "Gerätedatei '{}' existiert nicht." @@ -74,6 +58,22 @@ msgstr "Versuche Neuverbindung..." msgid "Could not reconnect. Aborting." msgstr "Konnte nicht wiederverbinden. Abbruch." +#: usr/lib/co2monitor/python/co2monitor/gui.py:76 +msgid "Welcome to Co2monitor!" +msgstr "Willkommen bei Co2monitor!" + +#: usr/lib/co2monitor/python/co2monitor/gui.py:84 +msgid "Starting GLib main loop..." +msgstr "starte GLib Hautpschleife..." + +#: usr/lib/co2monitor/python/co2monitor/gui.py:86 +msgid "GLib main loop ended." +msgstr "GLib Hauptschleife beendet." + +#: usr/lib/co2monitor/python/co2monitor/gui.py:90 +msgid "Received quitting signal." +msgstr "Anhaltesignal erhalten." + #: usr/lib/co2monitor/python/co2monitor/service.py:82 msgid "received stop signal {}," msgstr "Anhaltesignal {} erhalten," @@ -189,9 +189,8 @@ msgid "Stopped data logging on device {}" msgstr "beende Datenaufzeichnung auf Gerät {}" #: usr/bin/co2monitor-service:48 -#, fuzzy msgid "co2monitor is already running. Aborting." -msgstr "co2monitor läuft bereits" +msgstr "co2monitor läuft bereits. Abbruch." #: usr/bin/co2monitor-invoker:84 msgid "co2monitor is already running" @@ -240,8 +239,8 @@ msgstr "" "funktioniert." #: usr/bin/co2monitor-invoker:133 -msgid "no DEVNAME environment variable given. Aborting." -msgstr "keine DEVNAME Umgebungsvariable. Abbruch." +msgid "no DEVNAME environment variable given. Nothing more to do." +msgstr "keine DEVNAME Umgebungsvariable. Nichts mehr zu tun." #: usr/bin/co2monitor-invoker:136 msgid "DEVNAME environment variable: {}" diff --git a/usr/share/co2monitor/lang/fr/LC_MESSAGES/co2monitor.po b/usr/share/co2monitor/lang/fr/LC_MESSAGES/co2monitor.po index b51d493..a88e62e 100644 --- a/usr/share/co2monitor/lang/fr/LC_MESSAGES/co2monitor.po +++ b/usr/share/co2monitor/lang/fr/LC_MESSAGES/co2monitor.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-23 16:15+0100\n" -"PO-Revision-Date: 2016-11-22 13:51+0100\n" +"POT-Creation-Date: 2016-11-23 17:30+0100\n" +"PO-Revision-Date: 2016-11-23 17:37+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr_FR\n" @@ -18,22 +18,6 @@ msgstr "" "X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: usr/lib/co2monitor/python/co2monitor/gui.py:76 -msgid "Welcome to Co2monitor!" -msgstr "Bienvenue à Co2monitor!" - -#: usr/lib/co2monitor/python/co2monitor/gui.py:84 -msgid "Starting GLib main loop..." -msgstr "lance GLib boucle... " - -#: usr/lib/co2monitor/python/co2monitor/gui.py:86 -msgid "GLib main loop ended." -msgstr "GLib boucle terminé." - -#: usr/lib/co2monitor/python/co2monitor/gui.py:90 -msgid "Received quitting signal." -msgstr "reçu signal de interruption." - #: usr/lib/co2monitor/python/co2monitor/device.py:31 msgid "Device file '{}' does not exist." msgstr "Fichier d'appareil '{}' n'existe pas." @@ -74,6 +58,22 @@ msgstr "Essai de reconnexion..." msgid "Could not reconnect. Aborting." msgstr "Ne pourrais pas reconnecter. Interruption." +#: usr/lib/co2monitor/python/co2monitor/gui.py:76 +msgid "Welcome to Co2monitor!" +msgstr "Bienvenue à Co2monitor!" + +#: usr/lib/co2monitor/python/co2monitor/gui.py:84 +msgid "Starting GLib main loop..." +msgstr "lance GLib boucle... " + +#: usr/lib/co2monitor/python/co2monitor/gui.py:86 +msgid "GLib main loop ended." +msgstr "GLib boucle terminé." + +#: usr/lib/co2monitor/python/co2monitor/gui.py:90 +msgid "Received quitting signal." +msgstr "reçu signal de interruption." + #: usr/lib/co2monitor/python/co2monitor/service.py:82 msgid "received stop signal {}," msgstr "reçu signal stop {}" @@ -188,9 +188,8 @@ msgid "Stopped data logging on device {}" msgstr "arrêté enregistrement d'appareil {}" #: usr/bin/co2monitor-service:48 -#, fuzzy msgid "co2monitor is already running. Aborting." -msgstr "co2monitor marche déja" +msgstr "co2monitor marche déja. Interruption." #: usr/bin/co2monitor-invoker:84 msgid "co2monitor is already running" @@ -235,8 +234,8 @@ msgstr "" "Lancer co2monitor par 'at now' n'a pas marché, ça durait trop longtemps." #: usr/bin/co2monitor-invoker:133 -msgid "no DEVNAME environment variable given. Aborting." -msgstr "pas de variable d'environnement DEVNAME. Interruption." +msgid "no DEVNAME environment variable given. Nothing more to do." +msgstr "pas de variable d'environnement DEVNAME. Rien à faire." #: usr/bin/co2monitor-invoker:136 msgid "DEVNAME environment variable: {}"