[Goodies-commits] r5892 - in xfce4-sensors-plugin/trunk: . include lib panel-plugin po src
Fabian Nowak
timystery at xfce.org
Sat Nov 1 18:17:49 CET 2008
Author: timystery
Date: 2008-11-01 17:17:49 +0000 (Sat, 01 Nov 2008)
New Revision: 5892
Added:
xfce4-sensors-plugin/trunk/include/Makefile.am
Modified:
xfce4-sensors-plugin/trunk/Makefile.am
xfce4-sensors-plugin/trunk/configure.in.in
xfce4-sensors-plugin/trunk/lib/sensors-interface-common.c
xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am
xfce4-sensors-plugin/trunk/po/id.po
xfce4-sensors-plugin/trunk/po/ja.po
xfce4-sensors-plugin/trunk/po/pt_BR.po
xfce4-sensors-plugin/trunk/src/Makefile.am
Log:
- fixed makefiles for new folders and missing files and top-srcdir instead of top_builddir
- made make-distcheck work again
- ran update-po after fixing makefiles
Modified: xfce4-sensors-plugin/trunk/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/Makefile.am 2008-11-01 16:19:13 UTC (rev 5891)
+++ xfce4-sensors-plugin/trunk/Makefile.am 2008-11-01 17:17:49 UTC (rev 5892)
@@ -1,6 +1,7 @@
# $Id$
SUBDIRS = \
+ include \
lib \
panel-plugin \
src \
Modified: xfce4-sensors-plugin/trunk/configure.in.in
===================================================================
--- xfce4-sensors-plugin/trunk/configure.in.in 2008-11-01 16:19:13 UTC (rev 5891)
+++ xfce4-sensors-plugin/trunk/configure.in.in 2008-11-01 17:17:49 UTC (rev 5892)
@@ -291,6 +291,7 @@
AC_OUTPUT([
Makefile
xfce4-sensors-plugin.spec
+include/Makefile
lib/Makefile
lib/libxfce4sensors-1.0.pc
panel-plugin/Makefile
Added: xfce4-sensors-plugin/trunk/include/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/include/Makefile.am (rev 0)
+++ xfce4-sensors-plugin/trunk/include/Makefile.am 2008-11-01 17:17:49 UTC (rev 5892)
@@ -0,0 +1,14 @@
+# $Id: $
+
+EXTRA_DIST = \
+ acpi.h \
+ hddtemp.h \
+ Makefile.am \
+ sensors-interface-common.h \
+ types.h \
+ configuration.h \
+ lmsensors.h \
+ middlelayer.h \
+ sensors-interface.h
+
+# vi:set ts=4 sw=4 noet ai nocindent syntax=automake:
Modified: xfce4-sensors-plugin/trunk/lib/sensors-interface-common.c
===================================================================
--- xfce4-sensors-plugin/trunk/lib/sensors-interface-common.c 2008-11-01 16:19:13 UTC (rev 5891)
+++ xfce4-sensors-plugin/trunk/lib/sensors-interface-common.c 2008-11-01 17:17:49 UTC (rev 5892)
@@ -22,6 +22,7 @@
#endif
/* Xfce includes */
+// #include <libxfce4panel/xfce-panel-enums.h>
#include <libxfce4panel/xfce-panel-plugin.h>
/* Local/package includes */
Modified: xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am 2008-11-01 16:19:13 UTC (rev 5891)
+++ xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am 2008-11-01 17:17:49 UTC (rev 5892)
@@ -4,14 +4,15 @@
plugin_PROGRAMS = xfce4-sensors-plugin
INCLUDES = \
- -I$(top_builddir)/include \
- -I$(top_builddir)/lib
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/lib
# -DG_LOG_DOMAIN=\"xfce4-sensors-plugin\" \
# -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
xfce4_sensors_plugin_SOURCES = \
- sensors-plugin.c
+ sensors-plugin.c \
+ sensors-plugin.h
# types.h
# middlelayer.c \
@@ -52,7 +53,6 @@
EXTRA_DIST = \
$(desktop_in_in_files)
-
DISTCLEANFILES = \
$(desktop_DATA) $(desktop_in_files)
Modified: xfce4-sensors-plugin/trunk/po/id.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/id.po 2008-11-01 16:19:13 UTC (rev 5891)
+++ xfce4-sensors-plugin/trunk/po/id.po 2008-11-01 17:17:49 UTC (rev 5892)
@@ -15,8 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors-plugin.c:224
-#: ../panel-plugin/sensors-plugin.c:773
+#: ../panel-plugin/sensors-plugin.c:224 ../panel-plugin/sensors-plugin.c:773
msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\"><b>Sensor</b></span>"
@@ -118,31 +117,32 @@
msgid "Edit Properties"
msgstr "Sunting Properti"
-#: ../panel-plugin/sensors-plugin.c:1815
-#: ../panel-plugin/sensors-plugin.h:29
+#: ../panel-plugin/sensors-plugin.c:1815 ../panel-plugin/sensors-plugin.h:29
msgid "Sensors Plugin"
msgstr "Plugin Sensor"
#. #if GTK_VERSION < 2.11
#: ../panel-plugin/sensors-plugin.c:1846
-msgid "You can change a feature's properties such as name, colours, min/max value by double-clicking the entry, editing the content, and pressing \"Return\" or selecting a different field.."
-msgstr "Anda dapat mengubah properti fitur seperti nama, warna, nilai min/maks dengan klik ganda pada entri, sunting isi, dan menekan \"Kembali\" atau memilih bidang yang lain..."
+msgid ""
+"You can change a feature's properties such as name, colours, min/max value "
+"by double-clicking the entry, editing the content, and pressing \"Return\" "
+"or selecting a different field.."
+msgstr ""
+"Anda dapat mengubah properti fitur seperti nama, warna, nilai min/maks "
+"dengan klik ganda pada entri, sunting isi, dan menekan \"Kembali\" atau "
+"memilih bidang yang lain..."
#. only use this if no hddtemp sensor
#. or do only use this , if it is an lmsensors device. whatever.
#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
#. assert correctly saved file
-#: ../lib/configuration.c:151
-#: ../lib/configuration.c:331
-#: ../lib/configuration.c:338
-#: ../lib/hddtemp.c:266
-#: ../lib/hddtemp.c:307
+#: ../lib/configuration.c:151 ../lib/configuration.c:331
+#: ../lib/configuration.c:338 ../lib/hddtemp.c:266 ../lib/hddtemp.c:307
#: ../lib/hddtemp.c:312
msgid "Hard disks"
msgstr "Cakram keras"
-#: ../lib/acpi.c:416
-#: ../lib/acpi.c:424
+#: ../lib/acpi.c:416 ../lib/acpi.c:424
msgid "ACPI"
msgstr "ACPI"
@@ -168,24 +168,29 @@
#: ../lib/hddtemp.c:391
#, c-format
msgid ""
-"\"hddtemp\" was not executed correctly, although it is executable. This is most probably due to the disks requiring root privileges to read their temperatures, and \"hddtemp\" not being setuid root.\n"
+"\"hddtemp\" was not executed correctly, although it is executable. This is "
+"most probably due to the disks requiring root privileges to read their "
+"temperatures, and \"hddtemp\" not being setuid root.\n"
"\n"
-"An easy but dirty solution is to run \"chmod u+s %s\" as root user and restart this plugin or its panel.\n"
+"An easy but dirty solution is to run \"chmod u+s %s\" as root user and "
+"restart this plugin or its panel.\n"
"\n"
"Calling \"%s\" gave the following error:\n"
"%s\n"
"with a return value of %d.\n"
msgstr ""
-"\"hddtemp\" tak tereksekusi dengan benar, meskipun dapat dieksekusi. Ini mungkin karena cakram memerlukan hak akses root untuk membaca temperaturnya, dan \"hddtemp\" tidak diatur menggunakan uid root.\n"
+"\"hddtemp\" tak tereksekusi dengan benar, meskipun dapat dieksekusi. Ini "
+"mungkin karena cakram memerlukan hak akses root untuk membaca temperaturnya, "
+"dan \"hddtemp\" tidak diatur menggunakan uid root.\n"
"\n"
-"Cara yang mudah namun kotor adalah dengan menjalankan \"chmod u+s %s\" sebagai pengguna root kemudian start ulang plugin ini atau panelnya.\n"
+"Cara yang mudah namun kotor adalah dengan menjalankan \"chmod u+s %s\" "
+"sebagai pengguna root kemudian start ulang plugin ini atau panelnya.\n"
"\n"
"Memanggil \"%s\" memberikan galat berikut:\n"
"%s\n"
"dengan nilai kembali %d.\n"
-#: ../lib/hddtemp.c:401
-#: ../lib/hddtemp.c:427
+#: ../lib/hddtemp.c:401 ../lib/hddtemp.c:427
msgid "Suppress this message in future"
msgstr "Kecilkan pesan ini di masa depan"
@@ -202,8 +207,7 @@
#. cf->formatted_value = g_strdup_printf(_("%.1f °F"), (float) (value * 9/5 + 32) );
#. } else { // Celsius
#. Celsius
-#: ../lib/hddtemp.c:481
-#: ../lib/sensors-interface-common.c:137
+#: ../lib/hddtemp.c:481 ../lib/sensors-interface-common.c:137
#, c-format
msgid "%.1f °C"
msgstr "%.1f °C"
@@ -212,8 +216,7 @@
msgid "LM Sensors"
msgstr "Sensor LM"
-#: ../lib/lmsensors.c:362
-#: ../lib/lmsensors.c:409
+#: ../lib/lmsensors.c:362 ../lib/lmsensors.c:409
#, c-format
msgid "Error: Could not connect to sensors!"
msgstr "Galat: Tak dapat menghubungi sensor!"
@@ -355,4 +358,3 @@
#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
msgid "Show sensor values."
msgstr "Tampilkan nilai sensor."
-
Modified: xfce4-sensors-plugin/trunk/po/ja.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/ja.po 2008-11-01 16:19:13 UTC (rev 5891)
+++ xfce4-sensors-plugin/trunk/po/ja.po 2008-11-01 17:17:49 UTC (rev 5892)
@@ -16,8 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/sensors-plugin.c:224
-#: ../panel-plugin/sensors-plugin.c:773
+#: ../panel-plugin/sensors-plugin.c:224 ../panel-plugin/sensors-plugin.c:773
msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
msgstr "<span foreground=\"#000000\"><b>センサー</b></span>"
@@ -119,31 +118,32 @@
msgid "Edit Properties"
msgstr "プロパティの編集"
-#: ../panel-plugin/sensors-plugin.c:1815
-#: ../panel-plugin/sensors-plugin.h:29
+#: ../panel-plugin/sensors-plugin.c:1815 ../panel-plugin/sensors-plugin.h:29
msgid "Sensors Plugin"
msgstr "センサープラグイン"
#. #if GTK_VERSION < 2.11
#: ../panel-plugin/sensors-plugin.c:1846
-msgid "You can change a feature's properties such as name, colours, min/max value by double-clicking the entry, editing the content, and pressing \"Return\" or selecting a different field.."
-msgstr "エントリをダブルクリックして内容を編集し、「エンターキー」を押すか別のフィールドを選択する事で、名前、色、最小/最大値などの主要な機能のプロパティを変更できます。"
+msgid ""
+"You can change a feature's properties such as name, colours, min/max value "
+"by double-clicking the entry, editing the content, and pressing \"Return\" "
+"or selecting a different field.."
+msgstr ""
+"エントリをダブルクリックして内容を編集し、「エンターキー」を押すか別のフィー"
+"ルドを選択する事で、名前、色、最小/最大値などの主要な機能のプロパティを変更で"
+"きます。"
#. only use this if no hddtemp sensor
#. or do only use this , if it is an lmsensors device. whatever.
#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
#. assert correctly saved file
-#: ../lib/configuration.c:151
-#: ../lib/configuration.c:331
-#: ../lib/configuration.c:338
-#: ../lib/hddtemp.c:266
-#: ../lib/hddtemp.c:307
+#: ../lib/configuration.c:151 ../lib/configuration.c:331
+#: ../lib/configuration.c:338 ../lib/hddtemp.c:266 ../lib/hddtemp.c:307
#: ../lib/hddtemp.c:312
msgid "Hard disks"
msgstr "ハードディスク"
-#: ../lib/acpi.c:416
-#: ../lib/acpi.c:424
+#: ../lib/acpi.c:416 ../lib/acpi.c:424
msgid "ACPI"
msgstr "ACPI"
@@ -169,22 +169,27 @@
#: ../lib/hddtemp.c:391
#, c-format
msgid ""
-"\"hddtemp\" was not executed correctly, although it is executable. This is most probably due to the disks requiring root privileges to read their temperatures, and \"hddtemp\" not being setuid root.\n"
+"\"hddtemp\" was not executed correctly, although it is executable. This is "
+"most probably due to the disks requiring root privileges to read their "
+"temperatures, and \"hddtemp\" not being setuid root.\n"
"\n"
-"An easy but dirty solution is to run \"chmod u+s %s\" as root user and restart this plugin or its panel.\n"
+"An easy but dirty solution is to run \"chmod u+s %s\" as root user and "
+"restart this plugin or its panel.\n"
"\n"
"Calling \"%s\" gave the following error:\n"
"%s\n"
"with a return value of %d.\n"
msgstr ""
-"「hddtemp」 は実行可能ですが、正常に実行されませんでした。おそらく、それらの温度を読み込む root 権限を必要とするディスクか、hddtemp コマンドが root として setuidされていないからでしょう。\n"
-"簡単ではありますが、お勧めしない提案として、 root ユーザで、\"chmod u+s %s\"を実行し、本プラグインかパネルを再起動するという方法があります。\n"
+"「hddtemp」 は実行可能ですが、正常に実行されませんでした。おそらく、それらの"
+"温度を読み込む root 権限を必要とするディスクか、hddtemp コマンドが root とし"
+"て setuidされていないからでしょう。\n"
+"簡単ではありますが、お勧めしない提案として、 root ユーザで、\"chmod u+s %s"
+"\"を実行し、本プラグインかパネルを再起動するという方法があります。\n"
"「%s」 を呼んだ際に以下のエラーを受けとりました:\n"
"%s\n"
"返り値: %d です。\n"
-#: ../lib/hddtemp.c:401
-#: ../lib/hddtemp.c:427
+#: ../lib/hddtemp.c:401 ../lib/hddtemp.c:427
msgid "Suppress this message in future"
msgstr "今後このメッセージを抑制する"
@@ -201,8 +206,7 @@
#. cf->formatted_value = g_strdup_printf(_("%.1f °F"), (float) (value * 9/5 + 32) );
#. } else { // Celsius
#. Celsius
-#: ../lib/hddtemp.c:481
-#: ../lib/sensors-interface-common.c:137
+#: ../lib/hddtemp.c:481 ../lib/sensors-interface-common.c:137
#, c-format
msgid "%.1f °C"
msgstr "摂氏 %.1f 度"
@@ -211,8 +215,7 @@
msgid "LM Sensors"
msgstr "LM Sensors"
-#: ../lib/lmsensors.c:362
-#: ../lib/lmsensors.c:409
+#: ../lib/lmsensors.c:362 ../lib/lmsensors.c:409
#, c-format
msgid "Error: Could not connect to sensors!"
msgstr "エラー: センサーに接続できませんでした！"
@@ -365,10 +368,12 @@
#~ "Xfce ハードウェアセンサー・プラグイン: \n"
#~ "センサーの機能値の読み込みに問題があるようです。 \n"
#~ "正確な値は保証されません。\n"
+
#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>センサー</b></span>\n"
+
#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>センサー</b></span>"
+
#~ msgid "<b>View</b>"
#~ msgstr "<b>表示</b>"
-
Modified: xfce4-sensors-plugin/trunk/po/pt_BR.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/pt_BR.po 2008-11-01 16:19:13 UTC (rev 5891)
+++ xfce4-sensors-plugin/trunk/po/pt_BR.po 2008-11-01 17:17:49 UTC (rev 5892)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: xfce4-sensors-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-24 12:33-0400\n"
+"POT-Creation-Date: 2008-10-22 00:50+0200\n"
"PO-Revision-Date: 2008-10-24 12:33-0400\n"
"Last-Translator: Og Maciel <ogmaciel at gnome.org>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -39,101 +39,101 @@
"Parece ter ocorrido um problema durante a leitura de algum sensor.\n"
"Não é possível garantir o procedimento apropriado.\n"
-#: ../panel-plugin/sensors-plugin.c:1403
+#: ../panel-plugin/sensors-plugin.c:1398
msgid "UI style:"
msgstr "Estilo da interface:"
-#: ../panel-plugin/sensors-plugin.c:1404
+#: ../panel-plugin/sensors-plugin.c:1399
msgid "_text"
msgstr "_texto"
-#: ../panel-plugin/sensors-plugin.c:1406
+#: ../panel-plugin/sensors-plugin.c:1401
msgid "g_raphical"
msgstr "g_ráfico"
-#: ../panel-plugin/sensors-plugin.c:1443
+#: ../panel-plugin/sensors-plugin.c:1438
msgid "Show _labels in graphical UI"
msgstr "Mostrar rótu_los na interface gráfica"
-#: ../panel-plugin/sensors-plugin.c:1473
+#: ../panel-plugin/sensors-plugin.c:1468
msgid "Show colored _bars"
msgstr "Mostrar _barras coloridas"
-#: ../panel-plugin/sensors-plugin.c:1501
+#: ../panel-plugin/sensors-plugin.c:1496
msgid "_Show title"
msgstr "Mo_strar título"
-#: ../panel-plugin/sensors-plugin.c:1527
+#: ../panel-plugin/sensors-plugin.c:1522
msgid "F_ont size:"
msgstr "Tamanho de f_onte:"
#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors-plugin.c:1534
+#: ../panel-plugin/sensors-plugin.c:1529
msgid "x-small"
msgstr "muito pequena"
-#: ../panel-plugin/sensors-plugin.c:1535
+#: ../panel-plugin/sensors-plugin.c:1530
msgid "small"
msgstr "pequena"
-#: ../panel-plugin/sensors-plugin.c:1536
+#: ../panel-plugin/sensors-plugin.c:1531
msgid "medium"
msgstr "média"
-#: ../panel-plugin/sensors-plugin.c:1537
+#: ../panel-plugin/sensors-plugin.c:1532
msgid "large"
msgstr "grande"
-#: ../panel-plugin/sensors-plugin.c:1538
+#: ../panel-plugin/sensors-plugin.c:1533
msgid "x-large"
msgstr "muito grande"
-#: ../panel-plugin/sensors-plugin.c:1566
+#: ../panel-plugin/sensors-plugin.c:1561
msgid "Show _Units"
msgstr "Mostrar _unidades"
-#: ../panel-plugin/sensors-plugin.c:1587
+#: ../panel-plugin/sensors-plugin.c:1582
msgid "Small horizontal s_pacing"
msgstr "Pequeno es_paço horizontal"
-#: ../panel-plugin/sensors-plugin.c:1609
+#: ../panel-plugin/sensors-plugin.c:1604
msgid "Suppress messages"
msgstr "Suprimir mensagens"
-#: ../panel-plugin/sensors-plugin.c:1638
+#: ../panel-plugin/sensors-plugin.c:1633
msgid "U_pdate interval (seconds):"
msgstr "Intervalo de atualização (em segundos):"
-#: ../panel-plugin/sensors-plugin.c:1668
+#: ../panel-plugin/sensors-plugin.c:1663
msgid "E_xecute on double click:"
msgstr "E_xecutar com clique duplo:"
-#: ../panel-plugin/sensors-plugin.c:1711
+#: ../panel-plugin/sensors-plugin.c:1706
msgid "_View"
msgstr "_Ver"
-#: ../panel-plugin/sensors-plugin.c:1743
+#: ../panel-plugin/sensors-plugin.c:1738
msgid "_Miscellaneous"
msgstr "_Miscelâneo"
-#: ../panel-plugin/sensors-plugin.c:1813
+#: ../panel-plugin/sensors-plugin.c:1808
msgid "Edit Properties"
msgstr "Editar Propriedades"
-#: ../panel-plugin/sensors-plugin.c:1820 ../panel-plugin/sensors-plugin.h:29
+#: ../panel-plugin/sensors-plugin.c:1815 ../panel-plugin/sensors-plugin.h:29
msgid "Sensors Plugin"
msgstr "Miniaplicativo de Sensores"
#. #if GTK_VERSION < 2.11
-#: ../panel-plugin/sensors-plugin.c:1851
+#: ../panel-plugin/sensors-plugin.c:1846
msgid ""
"You can change a feature's properties such as name, colours, min/max value "
"by double-clicking the entry, editing the content, and pressing \"Return\" "
"or selecting a different field.."
msgstr ""
-"Você pode modificar as propriedades de um recurso como nome, cores, valor min/máx "
-"dando um clique duplo na entrada, editando o conteúdo, e pressionando \"Return\" "
-"ou selecionando um campo diferente."
+"Você pode modificar as propriedades de um recurso como nome, cores, valor "
+"min/máx dando um clique duplo na entrada, editando o conteúdo, e "
+"pressionando \"Return\" ou selecionando um campo diferente."
#. only use this if no hddtemp sensor
#. or do only use this , if it is an lmsensors device. whatever.
Modified: xfce4-sensors-plugin/trunk/src/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/src/Makefile.am 2008-11-01 16:19:13 UTC (rev 5891)
+++ xfce4-sensors-plugin/trunk/src/Makefile.am 2008-11-01 17:17:49 UTC (rev 5892)
@@ -1,7 +1,8 @@
# $Id:$
INCLUDES = \
- -I$(top_builddir)/include
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/lib
bin_PROGRAMS = \
xfce4-sensors
@@ -16,8 +17,11 @@
xfce4_sensors_SOURCES = \
main.c \
interface.c \
+ interface.h \
callbacks.c \
- actions.c
+ callbacks.h \
+ actions.c \
+ actions.h
xfce4_sensors_CFLAGS = \
@PLATFORM_CFLAGS@ \
More information about the Goodies-commits
mailing list