From 45269b4a56b94ea2d206fc168afefd63ff323fa3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Thu, 1 Dec 2011 01:04:55 +0000 Subject: [PATCH] prepare release update debian files --- configure | 2 ++ debian/changelog | 69 +++++++++++++++++++++++++++------------------------- debian/control | 2 +- po/Makefile.in | 8 +++---- po/fr.po | 73 ++++++++++++++++++++++++++++++++++---------------------- po/psensor.pot | 66 ++++++++++++++++++++++++++++---------------------- po/tr.po | 66 ++++++++++++++++++++++++++++---------------------- po/zh_CN.po | 66 ++++++++++++++++++++++++++++---------------------- 8 files changed, 202 insertions(+), 150 deletions(-) diff --git a/configure b/configure index a0ef872..a73c5fd 100755 --- a/configure +++ b/configure @@ -4833,6 +4833,8 @@ fi done +# Detects whether the function sysinfo is available +# At least kfreebsd 6.0.3 does not provide it. SYSINFO_FCT= ac_fn_c_check_func "$LINENO" "sysinfo" "ac_cv_func_sysinfo" if test "x$ac_cv_func_sysinfo" = xyes; then : diff --git a/debian/changelog b/debian/changelog index dfe8805..980a315 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,53 +1,56 @@ -psensor (0.6.2.15-1ubuntu1) oneiric; urgency=low +psensor (0.6.2.15-1) unstable; urgency=low * New upstream release + - fct sysinfo is optional. (Closes: #650533) + * debian/control + - set priority to 'extra' instead of 'optional' due to dependence + on json-c lib which is using a priority 'extra'. - -- Jean-Philippe Orsini Tue, 25 Nov 2011 00:56:55 +0200 + -- Jean-Philippe Orsini Thu, 01 Dec 2011 01:57:00 +0100 -psensor (0.6.2.14-1ubuntu1) oneiric; urgency=low - - * New upstream release - * debian/copyright: fixed lintian warnings about copyright. - * debian/control: added libjs-jquery dependency. - * debian/psensor-server.links: used jquery.js in the libjs-query package. - - -- Jean-Philippe Orsini Tue, 22 Nov 2011 00:56:55 +0200 - -psensor (0.6.2.13-1ubuntu1) oneiric; urgency=low - - * New upstream release - - -- Jean-Philippe Orsini Tue, 04 Oct 2011 00:56:55 +0200 - -psensor (0.6.2.12-1ubuntu1) natty; urgency=low - - * New upstream release - - -- Jean-Philippe Orsini Tue, 04 Oct 2011 00:56:55 +0200 - -psensor (0.6.2.11-1ubuntu1) natty; urgency=low +psensor (0.6.2.14-1) unstable; urgency=low * New upstream release + - monochrome icons for Ubuntu themes. (Closes LP: #811003) + * debian/copyright: + - replaced email with my personnal one + - added license and copyright info for jqplot + * debian/control: + - removed useless dep to lua + - switch to Standards-Version 3.9.2 + - added build dep to libjs-query + - replaced email with my personnal one + - build dep to gtk3 instead of gtk2 + * debian/psensor.install: + - added icons directory to include ubuntu default icons theme + - added directories for glade files + - added directory for autostart file + * debian/psensor-server.links: + - linked query.js file from libjs-query package - -- Jean-Philippe Orsini Tue, 18 Sep 2011 23:48:00 +0200 + -- Jean-Philippe Orsini Fri, 25 Nov 2011 02:56:22 -0500 -psensor (0.6.2.10-1ubuntu1) natty; urgency=low +psensor (0.6.1.9-3) unstable; urgency=low - * New upstream release + * debian/copyright: + - Fixed Lintian error: helper-templates-in-copyright - -- Jean-Philippe Orsini Tue, 12 Jul 2011 22:20:47 +0200 + -- Jean-Philippe Orsini Mon, 12 Sep 2011 05:47:02 -0400 -psensor (0.6.2.9-1ubuntu1) natty; urgency=low +psensor (0.6.1.9-2) unstable; urgency=low - * New upstream release + * debian/psensor-server.install: + - Fixed missing www files. - -- Jean-Philippe Orsini Fri, 20 May 2011 11:14:24 +0200 + -- Jean-Philippe Orsini Fri, 20 May 2011 02:52:34 -0400 -psensor (0.6.2.8-1ubuntu1) natty; urgency=low +psensor (0.6.1.9-1) unstable; urgency=low * New upstream release + * debian/control: + - Fixed Lintian warning: newer-standards-version. - -- Jean-Philippe Orsini Mon, 25 Apr 2011 19:01:02 +0200 + -- Jean-Philippe Orsini Tue, 03 May 2011 11:26:03 +0200 psensor (0.6.1.8-1) unstable; urgency=low diff --git a/debian/control b/debian/control index c270d01..15f9fc6 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: psensor Section: utils -Priority: optional +Priority: extra Maintainer: Jean-Philippe Orsini Build-Depends: debhelper (>= 7.0.50~),autoconf,automake,gettext,autopoint,libgtk-3-dev,libgconf2-dev,libnotify-dev,libsensors4-dev,help2man,libcurl4-openssl-dev,libjson0-dev,libmicrohttpd-dev,libgtop2-dev,perl Standards-Version: 3.9.2 diff --git a/po/Makefile.in b/po/Makefile.in index 5ecddbf..d0cb6d5 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -21,7 +21,7 @@ srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} datarootdir = ${prefix}/share datadir = ${datarootdir} @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# ${SHELL} /mnt/nfs4/users/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /mnt/nfs4/users/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh -d -install_sh = $(SHELL) ${SHELL} /mnt/nfs4/users/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/po/fr.po b/po/fr.po index 339215a..bd74d79 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.9\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-11-18 09:11+0100\n" +"POT-Creation-Date: 2011-12-01 02:01+0100\n" "PO-Revision-Date: 2011-02-07 21:18+0100\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Oriya\n" @@ -16,13 +16,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/main.c:77 src/server/server.c:77 +#: src/main.c:77 #, fuzzy, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" "License GPLv2: GNU GPL version 2 or later \n" -"This is free software: you are free to change and redistribute it.\n" +"This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" "Copyright (C) %s wpitchoune@gmail.com\n" @@ -33,12 +33,12 @@ msgstr "" "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" "autorisees par la loi applicable.\n" -#: src/main.c:87 src/server/server.c:87 +#: src/main.c:88 src/server/server.c:86 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilisation: %s [OPTION]...\n" -#: src/main.c:89 +#: src/main.c:90 msgid "" "psensor is a GTK application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -46,11 +46,11 @@ msgstr "" "psensor est une application GTK pour surveiller les sondes matérielles " "thermiques et les ventilateurs." -#: src/main.c:93 +#: src/main.c:94 msgid "Options:" msgstr "Options:" -#: src/main.c:94 +#: src/main.c:95 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -65,31 +65,31 @@ msgid "" msgstr "" " -u, --url=URL l'URL de psensor-server, example: http://hostname:3131" -#: src/main.c:106 +#: src/main.c:105 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:112 src/server/server.c:107 +#: src/main.c:110 src/server/server.c:104 #, c-format msgid "Report bugs to: %s\n" msgstr "Signaler les bugs à: %s\n" -#: src/main.c:114 src/server/server.c:109 +#: src/main.c:112 src/server/server.c:106 #, c-format msgid "%s home page: <%s>\n" msgstr "%s page d'acceuil: <%s>\n" -#: src/main.c:413 +#: src/main.c:411 #, c-format msgid "Enables debug mode.\n" msgstr "" -#: src/main.c:423 src/server/server.c:353 +#: src/main.c:421 src/server/server.c:354 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez `%s --help' pour plus d'informations.\n" -#: src/main.c:450 +#: src/main.c:448 #, c-format msgid "ERROR: Not compiled with remote sensor support.\n" msgstr "" @@ -145,24 +145,24 @@ msgstr "Quitter" msgid "Quit" msgstr "Quitter" -#: src/ui.c:159 +#: src/ui.c:160 msgid "_About" msgstr "" -#: src/ui.c:160 +#: src/ui.c:161 msgid "About" msgstr "" -#: src/ui.c:182 src/ui_appindicator.c:176 +#: src/ui.c:183 src/ui_appindicator.c:176 #, c-format msgid "building menus failed: %s" msgstr "" -#: src/ui.c:230 +#: src/ui.c:231 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Surveillance Des Temperatures" -#: src/ui.c:247 +#: src/ui.c:248 #, fuzzy, c-format msgid "ERROR: Failed to load psensor icon.\n" msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n" @@ -233,14 +233,31 @@ msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:89 +#: src/server/server.c:76 +#, fuzzy, c-format +msgid "" +"Copyright (C) %s jeanfi@gmail.com\n" +"License GPLv2: GNU GPL version 2 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +msgstr "" +"Copyright (C) %s wpitchoune@gmail.com\n" +"License GPLv2: GNU GPL version 3 ou ultérieure\n" +"Ceci est un logiciel libre, vous êtes libre de le modifier et de le \n" +"redistribuer.\n" +"Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" +"autorisees par la loi applicable.\n" + +#: src/server/server.c:88 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server est un serveur HTTP pour surveiller à distance les sondes " "matérielles." -#: src/server/server.c:94 +#: src/server/server.c:93 #, fuzzy msgid "" " -h, --help\t\tdisplay this help and exit\n" @@ -249,7 +266,7 @@ msgstr "" " -h, --help afficher cette aide et quitter\n" " -v, --version afficher les informations de version et quitter" -#: src/server/server.c:100 +#: src/server/server.c:98 #, fuzzy msgid "" " -d,--debug\t\trun in debug mode\n" @@ -259,36 +276,36 @@ msgstr "" " -p,--port=PORT port du serveur Web\n" " -w,--wdir=DIR répertoire contenant les pages du serveur Web" -#: src/server/server.c:181 +#: src/server/server.c:177 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:291 +#: src/server/server.c:292 #, c-format msgid "HTTP Request: %s\n" msgstr "Requete HTTP: %s\n" -#: src/server/server.c:367 +#: src/server/server.c:368 #, c-format msgid "ERROR: no sensors detected\n" msgstr "ERREUR: Aucune sonde detectee\n" -#: src/server/server.c:374 +#: src/server/server.c:375 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "ERREUR: Echec de la creation du serveur Web\n" -#: src/server/server.c:378 +#: src/server/server.c:379 #, fuzzy, c-format msgid "Web server started on port: %d" msgstr "Server Web demarre sur le port: %d\n" -#: src/server/server.c:379 +#: src/server/server.c:380 #, fuzzy, c-format msgid "WWW directory: %s" msgstr "WWW repertoire: %s\n" -#: src/server/server.c:380 +#: src/server/server.c:381 #, fuzzy, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d\n" diff --git a/po/psensor.pot b/po/psensor.pot index 58ff5ae..5581bd1 100644 --- a/po/psensor.pot +++ b/po/psensor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-11-18 09:11+0100\n" +"POT-Creation-Date: 2011-12-01 02:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,32 +17,32 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/main.c:77 src/server/server.c:77 +#: src/main.c:77 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" "License GPLv2: GNU GPL version 2 or later \n" -"This is free software: you are free to change and redistribute it.\n" +"This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:87 src/server/server.c:87 +#: src/main.c:88 src/server/server.c:86 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:89 +#: src/main.c:90 msgid "" "psensor is a GTK application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:93 +#: src/main.c:94 msgid "Options:" msgstr "" -#: src/main.c:94 +#: src/main.c:95 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -54,31 +54,31 @@ msgid "" "hostname:3131" msgstr "" -#: src/main.c:106 +#: src/main.c:105 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:112 src/server/server.c:107 +#: src/main.c:110 src/server/server.c:104 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:114 src/server/server.c:109 +#: src/main.c:112 src/server/server.c:106 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:413 +#: src/main.c:411 #, c-format msgid "Enables debug mode.\n" msgstr "" -#: src/main.c:423 src/server/server.c:353 +#: src/main.c:421 src/server/server.c:354 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:450 +#: src/main.c:448 #, c-format msgid "ERROR: Not compiled with remote sensor support.\n" msgstr "" @@ -125,24 +125,24 @@ msgstr "" msgid "Quit" msgstr "" -#: src/ui.c:159 +#: src/ui.c:160 msgid "_About" msgstr "" -#: src/ui.c:160 +#: src/ui.c:161 msgid "About" msgstr "" -#: src/ui.c:182 src/ui_appindicator.c:176 +#: src/ui.c:183 src/ui_appindicator.c:176 #, c-format msgid "building menus failed: %s" msgstr "" -#: src/ui.c:230 +#: src/ui.c:231 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/ui.c:247 +#: src/ui.c:248 #, c-format msgid "ERROR: Failed to load psensor icon.\n" msgstr "" @@ -212,54 +212,64 @@ msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:89 +#: src/server/server.c:76 +#, c-format +msgid "" +"Copyright (C) %s jeanfi@gmail.com\n" +"License GPLv2: GNU GPL version 2 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +msgstr "" + +#: src/server/server.c:88 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:94 +#: src/server/server.c:93 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:100 +#: src/server/server.c:98 msgid "" " -d,--debug\t\trun in debug mode\n" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:181 +#: src/server/server.c:177 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:291 +#: src/server/server.c:292 #, c-format msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:367 +#: src/server/server.c:368 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:374 +#: src/server/server.c:375 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:378 +#: src/server/server.c:379 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:379 +#: src/server/server.c:380 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:380 +#: src/server/server.c:381 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/po/tr.po b/po/tr.po index bbf5fc1..c9c5b24 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-11-18 09:11+0100\n" +"POT-Creation-Date: 2011-12-01 02:01+0100\n" "PO-Revision-Date: 2011-04-10 13:11+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -18,32 +18,32 @@ msgstr "" "X-Launchpad-Export-Date: 2011-04-11 05:41+0000\n" "X-Generator: Launchpad (build 12735)\n" -#: src/main.c:77 src/server/server.c:77 +#: src/main.c:77 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" "License GPLv2: GNU GPL version 2 or later \n" -"This is free software: you are free to change and redistribute it.\n" +"This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:87 src/server/server.c:87 +#: src/main.c:88 src/server/server.c:86 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kullanım: %s [SEÇENEK]...\n" -#: src/main.c:89 +#: src/main.c:90 msgid "" "psensor is a GTK application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:93 +#: src/main.c:94 msgid "Options:" msgstr "" -#: src/main.c:94 +#: src/main.c:95 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -55,31 +55,31 @@ msgid "" "hostname:3131" msgstr "" -#: src/main.c:106 +#: src/main.c:105 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:112 src/server/server.c:107 +#: src/main.c:110 src/server/server.c:104 #, c-format msgid "Report bugs to: %s\n" msgstr "Hataları rapor et:%s\n" -#: src/main.c:114 src/server/server.c:109 +#: src/main.c:112 src/server/server.c:106 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfa: <%s>\n" -#: src/main.c:413 +#: src/main.c:411 #, c-format msgid "Enables debug mode.\n" msgstr "" -#: src/main.c:423 src/server/server.c:353 +#: src/main.c:421 src/server/server.c:354 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: src/main.c:450 +#: src/main.c:448 #, c-format msgid "ERROR: Not compiled with remote sensor support.\n" msgstr "" @@ -129,24 +129,24 @@ msgstr "" msgid "Quit" msgstr "" -#: src/ui.c:159 +#: src/ui.c:160 msgid "_About" msgstr "" -#: src/ui.c:160 +#: src/ui.c:161 msgid "About" msgstr "" -#: src/ui.c:182 src/ui_appindicator.c:176 +#: src/ui.c:183 src/ui_appindicator.c:176 #, c-format msgid "building menus failed: %s" msgstr "" -#: src/ui.c:230 +#: src/ui.c:231 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/ui.c:247 +#: src/ui.c:248 #, c-format msgid "ERROR: Failed to load psensor icon.\n" msgstr "" @@ -217,54 +217,64 @@ msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:89 +#: src/server/server.c:76 +#, c-format +msgid "" +"Copyright (C) %s jeanfi@gmail.com\n" +"License GPLv2: GNU GPL version 2 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +msgstr "" + +#: src/server/server.c:88 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:94 +#: src/server/server.c:93 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:100 +#: src/server/server.c:98 msgid "" " -d,--debug\t\trun in debug mode\n" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:181 +#: src/server/server.c:177 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:291 +#: src/server/server.c:292 #, c-format msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:367 +#: src/server/server.c:368 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:374 +#: src/server/server.c:375 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:378 +#: src/server/server.c:379 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:379 +#: src/server/server.c:380 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:380 +#: src/server/server.c:381 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5dbb0ce..4b93b45 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.10\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-11-18 09:11+0100\n" +"POT-Creation-Date: 2011-12-01 02:01+0100\n" "PO-Revision-Date: 2011-06-06 08:57+0000\n" "Last-Translator: royclark \n" "Language-Team: Chinese (simplified)\n" @@ -18,32 +18,32 @@ msgstr "" "X-Launchpad-Export-Date: 2011-06-06 09:00+0000\n" "X-Generator: Launchpad (build 13144)\n" -#: src/main.c:77 src/server/server.c:77 +#: src/main.c:77 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" "License GPLv2: GNU GPL version 2 or later \n" -"This is free software: you are free to change and redistribute it.\n" +"This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:87 src/server/server.c:87 +#: src/main.c:88 src/server/server.c:86 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [选项]...\n" -#: src/main.c:89 +#: src/main.c:90 msgid "" "psensor is a GTK application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温度和风扇转速。" -#: src/main.c:93 +#: src/main.c:94 msgid "Options:" msgstr "" -#: src/main.c:94 +#: src/main.c:95 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -57,31 +57,31 @@ msgid "" "hostname:3131" msgstr " -u, --url=URL psensor服务器的 URL ，比如：http://hostname:3131" -#: src/main.c:106 +#: src/main.c:105 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:112 src/server/server.c:107 +#: src/main.c:110 src/server/server.c:104 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:114 src/server/server.c:109 +#: src/main.c:112 src/server/server.c:106 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:413 +#: src/main.c:411 #, c-format msgid "Enables debug mode.\n" msgstr "" -#: src/main.c:423 src/server/server.c:353 +#: src/main.c:421 src/server/server.c:354 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:450 +#: src/main.c:448 #, c-format msgid "ERROR: Not compiled with remote sensor support.\n" msgstr "" @@ -129,24 +129,24 @@ msgstr "" msgid "Quit" msgstr "退出" -#: src/ui.c:159 +#: src/ui.c:160 msgid "_About" msgstr "" -#: src/ui.c:160 +#: src/ui.c:161 msgid "About" msgstr "" -#: src/ui.c:182 src/ui_appindicator.c:176 +#: src/ui.c:183 src/ui_appindicator.c:176 #, c-format msgid "building menus failed: %s" msgstr "" -#: src/ui.c:230 +#: src/ui.c:231 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/ui.c:247 +#: src/ui.c:248 #, c-format msgid "ERROR: Failed to load psensor icon.\n" msgstr "" @@ -216,12 +216,22 @@ msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:89 +#: src/server/server.c:76 +#, c-format +msgid "" +"Copyright (C) %s jeanfi@gmail.com\n" +"License GPLv2: GNU GPL version 2 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +msgstr "" + +#: src/server/server.c:88 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。" -#: src/server/server.c:94 +#: src/server/server.c:93 #, fuzzy msgid "" " -h, --help\t\tdisplay this help and exit\n" @@ -230,43 +240,43 @@ msgstr "" " -h, --help 显示这个帮助并退出\n" " -v, --version 显示版本信息并退出" -#: src/server/server.c:100 +#: src/server/server.c:98 msgid "" " -d,--debug\t\trun in debug mode\n" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:181 +#: src/server/server.c:177 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:291 +#: src/server/server.c:292 #, c-format msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:367 +#: src/server/server.c:368 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:374 +#: src/server/server.c:375 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:378 +#: src/server/server.c:379 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:379 +#: src/server/server.c:380 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:380 +#: src/server/server.c:381 #, c-format msgid "URL: http://localhost:%d" msgstr "" -- 2.7.4