[Pommed-commits] r295 - in trunk: . gpomme gpomme/po

Julien Blache jblache at alioth.debian.org
Thu Mar 8 18:48:00 CET 2007


Author: jblache
Date: 2007-03-08 17:48:00 +0000 (Thu, 08 Mar 2007)
New Revision: 295

Added:
   trunk/gpomme/gpomme.glade
Modified:
   trunk/AUTHORS
   trunk/INSTALL
   trunk/gpomme/Makefile
   trunk/gpomme/conffile.c
   trunk/gpomme/conffile.h
   trunk/gpomme/gpomme.c
   trunk/gpomme/po/de.po
   trunk/gpomme/po/es.po
   trunk/gpomme/po/fr.po
   trunk/gpomme/po/gpomme.pot
Log:
Add gpomme configuration GUI, courtesy of Daniel G. Siegel.


Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/AUTHORS	2007-03-08 17:48:00 UTC (rev 295)
@@ -22,7 +22,8 @@
 ------
 
 Soeren SONNENBURG <debian at nn7.de> provided the base for gpomme, based
-on code taken from gtkpbbuttons.
+on code taken from gtkpbbuttons. Daniel G. SIEGEL wrote the configuration
+GUI.
 
 Glue added by Julien BLACHE <jb at jblache.org>.
 
@@ -36,7 +37,7 @@
 
   i18n:
    - french translation by Julien BLACHE
-   - german translation by Soeren SONNENBURG
+   - german translation by Soeren SONNENBURG and Daniel G. SIEGEL
    - spanish translation by Eduardo BELLIDO BELLIDO
 
 

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/INSTALL	2007-03-08 17:48:00 UTC (rev 295)
@@ -22,6 +22,7 @@
  - libasound
  - libaudiofile
  - GTK+ 2.0
+ - glade 2.0
 
 wmpomme requires:
  - X11 libs
@@ -47,7 +48,8 @@
  - copy gpomme somewhere in your PATH (/usr/bin)
  - install gpomme/themes as /usr/share/gpomme/themes
  - install gpomme/po/$lang.mo as /usr/share/locale/$lang/LC_MESSAGES/gpomme.mo
- - copy gpomme/gpomme.desktop in /usr/share/applications
+ - copy gpomme/gpomme.desktop to /usr/share/applications
+ - copy gpomme/gpomme.glade to /usr/share/gpomme
 
 To install wmpomme:
  - copy wmpomme somewhere in your PATH (/usr/bin)

Modified: trunk/gpomme/Makefile
===================================================================
--- trunk/gpomme/Makefile	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/gpomme/Makefile	2007-03-08 17:48:00 UTC (rev 295)
@@ -3,6 +3,9 @@
 GTK_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
 GTK_LIBS = $(shell pkg-config --libs gtk+-2.0)
 
+GLADE_CFLAGS = $(shell pkg-config --cflags libglade-2.0)
+GLADE_LIBS = $(shell pkg-config --libs libglade-2.0)
+
 DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE
 DBUS_LIBS = $(shell pkg-config dbus-1 --libs)
 
@@ -15,8 +18,8 @@
 CONFUSE_CFLAGS = $(shell pkg-config libconfuse --cflags)
 CONFUSE_LIBS = $(shell pkg-config libconfuse --libs)
 
-CFLAGS = -g -O2 -Wall $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS)
-LDFLAGS = -lpthread $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(DBUS_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS)
+CFLAGS = -g -O2 -Wall $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS)
+LDFLAGS = -lpthread $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(DBUS_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
 
 SOURCES = gpomme.c theme.c audio.c conffile.c ../dbus-client/dbus-client.c
 POFILES = po/fr.po po/de.po po/es.po

Modified: trunk/gpomme/conffile.c
===================================================================
--- trunk/gpomme/conffile.c	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/gpomme/conffile.c	2007-03-08 17:48:00 UTC (rev 295)
@@ -4,6 +4,7 @@
  * $Id$
  *
  * Copyright (C) 2007 Julien BLACHE <jb at jblache.org>
+ * Copyright (C) 2007 daniel g. siegel <dgsiegel at gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +22,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <errno.h>
 #include <unistd.h>
@@ -28,6 +30,8 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#include <dirent.h>
+#include <libintl.h>
 
 #include <linux/inotify.h>
 #include "inotify-syscalls.h"
@@ -38,8 +42,16 @@
 #include "gpomme.h"
 #include "theme.h"
 
-#define CONFFILE        "/.gpommerc"
+#include <gtk/gtk.h>
+#include <glade/glade.h>
 
+
+#define _(str) gettext(str)
+
+#define GLADE_FILE  "/usr/share/gpomme/gpomme.glade" // FIXME: check for path
+#define CONFFILE    "/.gpommerc"
+
+
 static cfg_opt_t cfg_opts[] =
   {
     CFG_STR("theme", DEFAULT_THEME, CFGF_NONE),
@@ -47,7 +59,16 @@
     CFG_END()
   };
 
+GladeXML *gxml;     
+GtkWidget *app_window; 
 
+void
+on_gpomme_window_close_cb (GtkWidget *widget, gpointer user_data);
+
+void
+update_gui_config (void);
+
+
 cfg_t *cfg = NULL;
 static char *conffile = NULL;
 
@@ -240,3 +261,111 @@
 
   return fd;
 }
+
+
+
+void 
+config_gui(void)
+{
+  GtkWidget *cb_theme;
+  GtkWidget *hs_timeout;
+  struct dirent **namelist; 
+  int n; 
+
+  glade_init();
+
+  /* initialize glade and the window */
+  gxml = glade_xml_new(GLADE_FILE, NULL, NULL);
+  app_window = glade_xml_get_widget(gxml, "gpomme_window");
+
+  /* setting the strings (for translation) */
+  gtk_window_set_title(GTK_WINDOW(app_window), _("gpomme preferences"));
+
+  GtkWidget *s;
+  s = glade_xml_get_widget(gxml, "lb_theme");
+  gtk_label_set_text(GTK_LABEL(s), _("Theme:"));
+
+  s = glade_xml_get_widget(gxml, "lb_timeout");
+  gtk_label_set_text(GTK_LABEL(s), _("Timeout (seconds):"));
+
+  /* set the default settings */
+  hs_timeout = glade_xml_get_widget(gxml, "hs_timeout");
+  gtk_range_set_value(GTK_RANGE(hs_timeout), (gdouble)cfg_getint(cfg, "timeout") / 1000.0);
+
+  /* TODO: check for theme-previews */
+  cb_theme = glade_xml_get_widget(gxml, "cb_theme");
+  gtk_combo_box_remove_text(GTK_COMBO_BOX(cb_theme), 0); /* remove dummy-text */
+
+  gtk_combo_box_append_text(GTK_COMBO_BOX(cb_theme), cfg_getstr(cfg, "theme"));
+  gtk_combo_box_set_active(GTK_COMBO_BOX(cb_theme), 0);
+
+  n = scandir(THEME_BASE, &namelist, 0, alphasort); 
+
+  if (n < 0)
+    {
+      fprintf(stderr, "Could not open theme directory: %s\n", strerror(errno));
+
+      exit(1);
+    }
+
+  while(n--)
+    {
+      if (strcmp(namelist[n]->d_name, cfg_getstr(cfg, "theme"))
+	  && (namelist[n]->d_name[0] != '.'))
+	{
+	  /* printf("%s\n", namelist[n]->d_name); */
+	  gtk_combo_box_append_text(GTK_COMBO_BOX(cb_theme), namelist[n]->d_name); 
+	}
+    }
+
+  /* signals... */
+  glade_xml_signal_connect(gxml, "on_bt_close_clicked",         
+			   G_CALLBACK(on_gpomme_window_close_cb));
+
+  glade_xml_signal_connect(gxml, "on_gpomme_window_close",         
+			   G_CALLBACK(on_gpomme_window_close_cb));
+
+  glade_xml_signal_connect(gxml, "on_gpomme_window_destroy",         
+			   G_CALLBACK(on_gpomme_window_close_cb));
+
+  glade_xml_signal_connect(gxml, "on_hs_timeout_value_changed",         
+			   G_CALLBACK(update_gui_config));
+
+  glade_xml_signal_connect(gxml, "on_cb_theme_changed",         
+			   G_CALLBACK(update_gui_config));
+
+  gtk_widget_show(app_window);
+
+  gtk_main();
+}
+
+/* window is closed, so write the settings to the config-file */
+void
+on_gpomme_window_close_cb (GtkWidget *widget, gpointer user_data)
+{
+  update_gui_config();
+  
+  gtk_widget_hide(app_window);
+  gtk_main_quit();
+}
+
+void
+update_gui_config(void)
+{
+  GtkWidget *cb_themes;
+  GtkWidget *hs_timeout;
+
+  /* get the actual settings */
+  hs_timeout = glade_xml_get_widget(gxml, "hs_timeout");
+  cb_themes = glade_xml_get_widget(gxml, "cb_theme");
+
+  gdouble timeout = gtk_range_get_value(GTK_RANGE(hs_timeout)) * 1000.0;
+  //g_print("setting timeout to %gs\n", timeout);
+  cfg_setint(cfg, "timeout", timeout);
+
+  //g_print("setting theme to %s\n", gtk_combo_box_get_active_text(GTK_COMBO_BOX(cb_themes)));
+  cfg_setstr(cfg, "theme", gtk_combo_box_get_active_text(GTK_COMBO_BOX(cb_themes)));
+
+  /* actually write them */
+  config_write();
+}

Modified: trunk/gpomme/conffile.h
===================================================================
--- trunk/gpomme/conffile.h	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/gpomme/conffile.h	2007-03-08 17:48:00 UTC (rev 295)
@@ -14,4 +14,7 @@
 int
 config_monitor(void);
 
+void
+config_gui(void);
+
 #endif /* !__CONFFILE_H__ */

Modified: trunk/gpomme/gpomme.c
===================================================================
--- trunk/gpomme/gpomme.c	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/gpomme/gpomme.c	2007-03-08 17:48:00 UTC (rev 295)
@@ -5,6 +5,7 @@
  *
  * Copyright (C) 2006 Soeren SONNENBURG <debian at nn7.de>
  * Copyright (C) 2006-2007 Julien BLACHE <jb at jblache.org>
+ * Copyright (C) 2007 daniel g. siegel <dgsiegel at gmail.com>
  *
  * Portions of the GTK code below were shamelessly
  * stolen from pbbuttonsd. Thanks ! ;-)
@@ -450,6 +451,7 @@
 
   printf("Usage:\n");
   printf("\tgpomme\t\t-- start gpomme\n");
+  printf("\tgpomme -c\t-- open the configuration panel\n");
   printf("\tgpomme -v\t-- print version and exit\n");
 }
 
@@ -466,6 +468,9 @@
 
   gtk_init(&argc, &argv);
 
+  bindtextdomain("gpomme", "/usr/share/locale");
+  textdomain("gpomme");
+
   ret = config_load();
   if (ret < 0)
     {
@@ -474,10 +479,16 @@
       exit(1);
     }
 
-  while ((c = getopt(argc, argv, "v")) != -1)
+  while ((c = getopt(argc, argv, "cv")) != -1)
     {
       switch (c)
 	{
+	  case 'c':
+	    config_gui();
+
+	    exit(0);
+	    break;
+
 	  case 'v':
 	    printf("gpomme v" M_VERSION " ($Rev$) graphical client for pommed\n");
 	    printf("Copyright (C) 2006-2007 Julien BLACHE <jb at jblache.org> and others\n");
@@ -500,9 +511,6 @@
   signal(SIGINT, sig_int_term_handler);
   signal(SIGTERM, sig_int_term_handler);
 
-  bindtextdomain("gpomme", "/usr/share/locale");
-  textdomain("gpomme");
-
   ret = audio_init_thread();
   if (ret < 0)
     printf("Failed to create audio thread\n");

Added: trunk/gpomme/gpomme.glade
===================================================================
--- trunk/gpomme/gpomme.glade	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/gpomme/gpomme.glade	2007-03-08 17:48:00 UTC (rev 295)
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.1.5 on Wed Mar  7 18:24:41 2007 by dgsiegel at gmail.com-->
+<glade-interface>
+  <widget class="GtkDialog" id="gpomme_window">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">gpomme Configuration</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_MOUSE</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+    <property name="urgency_hint">True</property>
+    <property name="has_separator">False</property>
+    <signal name="close" handler="on_gpomme_window_close"/>
+    <signal name="destroy" handler="on_gpomme_window_destroy"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox2">
+        <property name="width_request">390</property>
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <child>
+          <widget class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="spacing">13</property>
+            <child>
+              <widget class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="lb_theme">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">1</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Theme:&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <property name="spacing">10</property>
+                    <child>
+                      <widget class="GtkImage" id="image1">
+                        <property name="visible">True</property>
+                        <property name="icon_size">6</property>
+                        <property name="icon_name">gnome-settings-theme</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment1">
+                        <property name="visible">True</property>
+                        <property name="yscale">0</property>
+                        <child>
+                          <widget class="GtkComboBox" id="cb_theme">
+                            <property name="visible">True</property>
+                            <property name="tooltip" translatable="yes">Set the theme of gpomme</property>
+                            <property name="items" translatable="yes">&lt;item1&gt;</property>
+                            <signal name="changed" handler="on_cb_theme_changed"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="padding">10</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox3">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="lb_timeout">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">1</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Timeout (in seconds):&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <property name="spacing">10</property>
+                    <child>
+                      <widget class="GtkImage" id="image2">
+                        <property name="visible">True</property>
+                        <property name="icon_size">6</property>
+                        <property name="icon_name">appointment</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHScale" id="hs_timeout">
+                        <property name="visible">True</property>
+                        <property name="adjustment">0 0 5 0.10000000000000001 0.10000000000000001 0</property>
+                        <property name="value_pos">GTK_POS_LEFT</property>
+                        <signal name="value_changed" handler="on_hs_timeout_value_changed"/>
+                      </widget>
+                      <packing>
+                        <property name="padding">10</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">1</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="padding">10</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="bt_close">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">gtk-close</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_bt_close_clicked"/>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>

Modified: trunk/gpomme/po/de.po
===================================================================
--- trunk/gpomme/po/de.po	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/gpomme/po/de.po	2007-03-08 17:48:00 UTC (rev 295)
@@ -1,45 +1,58 @@
 # gpomme - graphical client for pommed
 # Copyright (C) 2006 Soeren SONNENBURG <debian at nn7.de>
 # Copyright (C) 2006, Julien BLACHE <jb at jblache.org>
+# Copyright (C) 2007, daniel g. siegel <dgsiegel at gmail.com>
 # This file is distributed under the same license as the PACKAGE package.
 # Julien BLACHE <jb at jblache.org>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mbpgtk 0.3\n"
+"Project-Id-Version: gpomme 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-24 12:29+0100\n"
-"PO-Revision-Date: 2006-12-24 13:15+0100\n"
-"Last-Translator: Soeren SONNENBURG <debian at nn7.de>\n"
+"POT-Creation-Date: 2007-03-08 18:42+0100\n"
+"PO-Revision-Date: 2007-03-08 18:44+0100\n"
+"Last-Translator: daniel g. siegel <dgsiegel at gmail.com>\n"
 "Language-Team: german <de at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gpomme.c:287
+#: gpomme.c:343
 msgid "LCD backlight level"
 msgstr "Helligkeit"
 
-#: gpomme.c:299
+#: gpomme.c:358
 msgid "Keyboard backlight level"
 msgstr "Tastatur Beleuchtung"
 
-#: gpomme.c:313
+#: gpomme.c:373
 msgid "Sound volume"
 msgstr "Lautstärke"
 
-#: gpomme.c:317
+#: gpomme.c:377
 msgid "Sound volume (muted)"
 msgstr "Lautstärke (Ton aus)"
 
-#: gpomme.c:326
+#: gpomme.c:386
 msgid "Sound muted"
 msgstr "Ton aus"
 
-#: gpomme.c:328
+#: gpomme.c:388
 msgid "Sound unmuted"
 msgstr "Ton an"
 
-#: gpomme.c:332
+#: gpomme.c:392
 msgid "Eject"
 msgstr "CD Auswerfen"
+
+#: conffile.c:282
+msgid "gpomme preferences"
+msgstr "gpomme Einstellungen"
+
+#: conffile.c:286
+msgid "Theme:"
+msgstr "Thema:"
+
+#: conffile.c:289
+msgid "Timeout (seconds):"
+msgstr "Timeout (Sekunden):"

Modified: trunk/gpomme/po/es.po
===================================================================
--- trunk/gpomme/po/es.po	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/gpomme/po/es.po	2007-03-08 17:48:00 UTC (rev 295)
@@ -2,44 +2,54 @@
 # Copyright (C) 2006, Eduardo Bellido Bellido <edubxb at gmail.com>
 # This file is distributed under the same license as the mbpgtk package.
 # Eduardo Bellido Bellido <edubxb at gmail.com>, 2007.
- 
 msgid ""
 msgstr ""
 "Project-Id-Version: mbpgtk 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-24 12:29+0100\n"
+"POT-Creation-Date: 2007-03-08 18:42+0100\n"
 "PO-Revision-Date: 2007-01-07 08:27+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: \n"
 
-#: gpomme.c:287
+#: gpomme.c:343
 msgid "LCD backlight level"
 msgstr "Nivel de brillo de la pantalla"
 
-#: gpomme.c:299
+#: gpomme.c:358
 msgid "Keyboard backlight level"
 msgstr "Nivel de brillo del teclado"
 
-#: gpomme.c:313
+#: gpomme.c:373
 msgid "Sound volume"
 msgstr "Control de volúmen"
 
-#: gpomme.c:317
+#: gpomme.c:377
 msgid "Sound volume (muted)"
 msgstr "Control de volúmen (silenciado)"
 
-#: gpomme.c:326
+#: gpomme.c:386
 msgid "Sound muted"
 msgstr "Sonido silenciado"
 
-#: gpomme.c:328
+#: gpomme.c:388
 msgid "Sound unmuted"
 msgstr "Sonido normal"
 
-#: gpomme.c:332
+#: gpomme.c:392
 msgid "Eject"
 msgstr "Expulsando CD/DVD"
 
+#: conffile.c:282
+msgid "gpomme preferences"
+msgstr ""
+
+#: conffile.c:286
+msgid "Theme:"
+msgstr ""
+
+#: conffile.c:289
+msgid "Timeout (seconds):"
+msgstr ""

Modified: trunk/gpomme/po/fr.po
===================================================================
--- trunk/gpomme/po/fr.po	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/gpomme/po/fr.po	2007-03-08 17:48:00 UTC (rev 295)
@@ -5,40 +5,52 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mbpgtk 0.3\n"
+"Project-Id-Version: gpomme 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-24 12:29+0100\n"
-"PO-Revision-Date: 2006-12-24 13:15+0100\n"
+"POT-Creation-Date: 2007-03-08 18:42+0100\n"
+"PO-Revision-Date: 2007-03-08 18:43+0100\n"
 "Last-Translator: Julien BLACHE <jb at jblache.org>\n"
 "Language-Team: french <fr at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gpomme.c:287
+#: gpomme.c:343
 msgid "LCD backlight level"
 msgstr "Luminosité écran"
 
-#: gpomme.c:299
+#: gpomme.c:358
 msgid "Keyboard backlight level"
 msgstr "Éclairage clavier"
 
-#: gpomme.c:313
+#: gpomme.c:373
 msgid "Sound volume"
 msgstr "Volume sonore"
 
-#: gpomme.c:317
+#: gpomme.c:377
 msgid "Sound volume (muted)"
 msgstr "Volume sonore (muet)"
 
-#: gpomme.c:326
+#: gpomme.c:386
 msgid "Sound muted"
 msgstr "Son désactivé"
 
-#: gpomme.c:328
+#: gpomme.c:388
 msgid "Sound unmuted"
 msgstr "Son activé"
 
-#: gpomme.c:332
+#: gpomme.c:392
 msgid "Eject"
 msgstr "Éjection"
+
+#: conffile.c:282
+msgid "gpomme preferences"
+msgstr "Préférences gpomme"
+
+#: conffile.c:286
+msgid "Theme:"
+msgstr "Thème :"
+
+#: conffile.c:289
+msgid "Timeout (seconds):"
+msgstr "Délai (secondes) :"

Modified: trunk/gpomme/po/gpomme.pot
===================================================================
--- trunk/gpomme/po/gpomme.pot	2007-03-07 20:04:27 UTC (rev 294)
+++ trunk/gpomme/po/gpomme.pot	2007-03-08 17:48:00 UTC (rev 295)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-24 12:29+0100\n"
+"POT-Creation-Date: 2007-03-08 18:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,30 +16,42 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gpomme.c:287
+#: gpomme.c:343
 msgid "LCD backlight level"
 msgstr ""
 
-#: gpomme.c:299
+#: gpomme.c:358
 msgid "Keyboard backlight level"
 msgstr ""
 
-#: gpomme.c:313
+#: gpomme.c:373
 msgid "Sound volume"
 msgstr ""
 
-#: gpomme.c:317
+#: gpomme.c:377
 msgid "Sound volume (muted)"
 msgstr ""
 
-#: gpomme.c:326
+#: gpomme.c:386
 msgid "Sound muted"
 msgstr ""
 
-#: gpomme.c:328
+#: gpomme.c:388
 msgid "Sound unmuted"
 msgstr ""
 
-#: gpomme.c:332
+#: gpomme.c:392
 msgid "Eject"
 msgstr ""
+
+#: conffile.c:282
+msgid "gpomme preferences"
+msgstr ""
+
+#: conffile.c:286
+msgid "Theme:"
+msgstr ""
+
+#: conffile.c:289
+msgid "Timeout (seconds):"
+msgstr ""




More information about the Pommed-commits mailing list