[Goodies-commits] r2867 - in xfce4-cddrive-plugin/trunk: . panel-plugin po
Sylvain Reynal
syl at xfce.org
Wed Jun 27 10:16:35 CEST 2007
Author: syl
Date: 2007-06-27 08:16:35 +0000 (Wed, 27 Jun 2007)
New Revision: 2867
Modified:
xfce4-cddrive-plugin/trunk/README
xfce4-cddrive-plugin/trunk/acinclude.m4
xfce4-cddrive-plugin/trunk/configure.in.in
xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-cddb.c
xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-cddb.h
xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-dialogs.c
xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-monitor.c
xfce4-cddrive-plugin/trunk/panel-plugin/cddrive.c
xfce4-cddrive-plugin/trunk/po/fr.po
xfce4-cddrive-plugin/trunk/po/xfce4-cddrive-plugin.pot
Log:
CD-TEXT systematically supported. libcdio becomes a required library, cleaning the configure.in.in file at the same time.
Modified: xfce4-cddrive-plugin/trunk/README
===================================================================
--- xfce4-cddrive-plugin/trunk/README 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/README 2007-06-27 08:16:35 UTC (rev 2867)
@@ -10,21 +10,34 @@
when a disc is in the drive).
-Requirements & limitations
-==========================
+Dependencies
+============
-- This plugin is based on HAL, and will not work if 'hald' is not running.
+To build the plugin, the following packages are required:
+- libxfcegui4 >= 4.3.99.2
+- libxfce4panel >= 4.3.99.2
+- exo >= 0.3.1.12rc2
+- hal-storage >= 0.5.8.1
+- dbus-glib >= 0.71
+- libcdio >= 0.76
+The plugin can query the freedb.org servers for audio CD titles. To compile
+with this feature enabled, you need:
+- libcddb >= 1.2.1
+- gthread >= 2.12.4 (optionnal, prevent the plugin from hanging while waiting
+ for freedb.org response)
+
+
+Limitations
+===========
+
- This release only works correctly with Linux.
+- This plugin is based on HAL, and will not work if 'hald' is not running.
+
- The icons used to reports the content of the drive are the one of the theme
currently in use (it becomes a limitation if your theme does not provide icons
for cdrom drive and disc).
-
-- The plugin can query the freedb.org servers for audio CD titles. To compile
- with this feature enabled, you need libcdio and libcddb. The gthread-2.0
- library is also recommanded in this case to prevent the plugin from hanging
- while waiting for freedb.org response, but is not mandatory.
Installation
@@ -39,5 +52,5 @@
===================
Bugs should be reported to the Xfce bug tracking system
-(http://bugzilla.xfce.org, product 'Xfce Panel Plugins', Component
-'cddrive'). You will need to create an account for yourself.
+(http://bugzilla.xfce.org, product 'Xfce Panel Plugins', Component 'cddrive').
+You will need to create an account for yourself.
Modified: xfce4-cddrive-plugin/trunk/acinclude.m4
===================================================================
--- xfce4-cddrive-plugin/trunk/acinclude.m4 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/acinclude.m4 2007-06-27 08:16:35 UTC (rev 2867)
@@ -19,22 +19,6 @@
dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
dnl Place, Suite 330, Boston, MA 02111-1307 USA
-dnl SYL_CHECK_PACKAGE(varname, package, version, [action-if], [action-if-not])
-dnl
-dnl Same as XDT_CHECK_PACKAGE, except it store "package" and "version"
-dnl in "syl_pkg_name" and "syl_pkg_required_version" variables respectively,
-dnl so these infos can be used in "action-if-not".
-dnl
-AC_DEFUN([SYL_CHECK_PACKAGE],
-[
- syl_pkg_name=$2
- syl_pkg_required_version=$3
-
- XDT_CHECK_PACKAGE([$1], [$2], [$3], [$4], [$5])
- AC_DEFINE([HAVE_$1], [1], [Define if $2 >= $3 present])
-])
-
-
dnl SYL_DEBUG_SUPPORT()
dnl
dnl Modified BM_DEBUG_SUPPORT so that assertions are disabled when building
@@ -42,7 +26,7 @@
dnl is debug only.
AC_DEFUN([SYL_DEBUG_SUPPORT],
[
- AC_ARG_ENABLE([final], AC_HELP_STRING([--enable-final], [Build final version]),
+ AC_ARG_ENABLE([final], AC_HELP_STRING([--enable-final], [Build optimized final version]),
[enable_final=yes], [])
AC_MSG_CHECKING([whether to build final version])
if test x"$enable_final" = x"yes"; then
Modified: xfce4-cddrive-plugin/trunk/configure.in.in
===================================================================
--- xfce4-cddrive-plugin/trunk/configure.in.in 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/configure.in.in 2007-06-27 08:16:35 UTC (rev 2867)
@@ -78,38 +78,12 @@
XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.12rc2])
XDT_CHECK_PACKAGE([HALSTORAGE], [hal-storage], [0.5.8.1])
XDT_CHECK_PACKAGE([DBUSGLIB], [dbus-glib-1], [0.71])
+XDT_CHECK_PACKAGE([LIBCDIO], [libcdio], [0.76])
dnl ***********************************
dnl *** Check for optional packages ***
dnl ***********************************
XDT_CHECK_OPTIONAL_PACKAGE([LIBCDDB], [libcddb], [1.2.1], [cddb], [CD Data Base support])
-if test x"$LIBCDDB_FOUND" = x"yes"; then
- SYL_CHECK_PACKAGE([LIBCDIO], [libcdio], [0.76], ,
- [
- if test x"$xdg_cv_version" = x; then
- echo "*** The package $syl_pkg_name (required for CDDB support) was not found"
- echo "*** on your system."
- echo "*** To fix this, you can either:"
- echo "*** - install $syl_pkg_name (at least version $syl_pkg_required_version)."
- echo "*** - adjust the PKG_CONFIG_PATH environment variable"
- echo "*** if you installed the new version of the package"
- echo "*** in a nonstandard prefix so pkg-config is able to find it."
- echo "*** - disable the CDDB support (with --disable-cddb switch)."
- exit 1
- else
- echo "*** The package $syl_pkg_name (required for CDDB support)"
- echo "*** was found on your system, but the installed version ($xdg_cv_version)"
- echo "*** is too old."
- echo "*** To fix this, you can either:"
- echo "*** - upgrade $syl_pkg_name to at least version $syl_pkg_required_version."
- echo "*** - adjust the PKG_CONFIG_PATH environment variable"
- echo "*** if you installed the new version of the package"
- echo "*** in a nonstandard prefix so pkg-config is able to find it."
- echo "*** - disable the CDDB support (with --disable-cddb switch)."
- exit 1
- fi
- ])
-fi
XDT_CHECK_OPTIONAL_PACKAGE([GTHREAD], [gthread-2.0], [2.12.4], [thread], [threaded CDDB queries support])
dnl ************************************************
Modified: xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-cddb.c
===================================================================
--- xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-cddb.c 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-cddb.c 2007-06-27 08:16:35 UTC (rev 2867)
@@ -22,14 +22,13 @@
#endif
#include "cddrive-cddb.h"
+#include <cdio/cdio.h>
-#if defined (HAVE_LIBCDIO) && defined (HAVE_LIBCDDB)
+#ifdef HAVE_LIBCDDB
-#include <cdio/cdio.h>
#include <cddb/cddb.h>
#include <libxfce4util/libxfce4util.h>
-
#ifndef PACKAGE
#define PACKAGE "xfce4-cddrive-plugin"
#endif
@@ -40,10 +39,55 @@
#define CDDRIVE_CDDB_CACHE_PATH "xfce4/panel/cddrive"
#define CDDRIVE_CDDB_CACHE_GROUP "Cddb"
#define CDDRIVE_CDDB_CACHE_SIZE 20
-#define cddrive_cddb_get_key_for_id(id) g_strdup_printf ("%08x", id)
+#define cddrive_audio_get_key_for_id(id) g_strdup_printf ("%08x", id)
+#endif
+/* Create a read access on the CD */
+static CdIo_t*
+cddrive_audio_new_cdio (const gchar* device)
+{
+ CdIo_t *res;
+
+ res = cdio_open (device, DRIVER_DEVICE);
+ if (res == NULL)
+ g_warning ("unable to open audio CD in drive '%s'.", device);
+
+ else
+ {
+ if (cdio_get_discmode (res) == CDIO_DISC_MODE_ERROR ||
+ cdio_get_discmode (res) == CDIO_DISC_MODE_NO_INFO)
+ {
+ cdio_destroy (res);
+ res = NULL;
+ }
+ }
+
+ return res;
+}
+
+
+
+/* Return the title of the CD from the CD-TEXT info it contains,
+ or NULL if the CD does not contain such CD-TEXT info. */
+static gchar*
+cddrive_audio_get_cdtext_title (CdIo_t *cdio)
+{
+ gchar *res;
+ cdtext_t *cdtxt;
+
+ cdtxt = cdio_get_cdtext (cdio, 0);
+ res = cdtext_get (CDTEXT_TITLE, cdtxt);
+ cdtext_destroy (cdtxt);
+
+ return res;
+}
+
+
+
+#ifdef HAVE_LIBCDDB /* ---------- CDDB SUPPORT ---------- */
+
/* Save a pair (CDDB id, CD title) in the cache file only if it is not already
stored. Do nothing otherwise.
@@ -54,7 +98,7 @@
and a CD title as the value.
*/
static void
-cddrive_cddb_cache_save (guint id, const gchar *title)
+cddrive_audio_cache_save (guint id, const gchar *title)
{
XfceRc *cache;
gchar* *keys;
@@ -72,7 +116,7 @@
xfce_rc_set_group (cache, CDDRIVE_CDDB_CACHE_GROUP);
- k = cddrive_cddb_get_key_for_id (id);
+ k = cddrive_audio_get_key_for_id (id);
if (! xfce_rc_has_entry (cache, k))
{
/* check if the cache limit is reached. If so, remove the first entry. */
@@ -97,7 +141,7 @@
/* Return the title corresponding to the CDDB id 'id' in the cache, or NULL
if not found. */
gchar*
-cddrive_cddb_cache_read (guint id)
+cddrive_audio_cache_read (guint id)
{
XfceRc *cache;
gchar *k, *res;
@@ -112,7 +156,7 @@
}
xfce_rc_set_group (cache, CDDRIVE_CDDB_CACHE_GROUP);
- k = cddrive_cddb_get_key_for_id (id);
+ k = cddrive_audio_get_key_for_id (id);
res = g_strdup (xfce_rc_read_entry (cache, k, NULL));
xfce_rc_close (cache);
g_free (k);
@@ -122,50 +166,11 @@
-static CdIo_t*
-cddrive_cddb_new_cdio (const gchar* device)
-{
- CdIo_t *res;
-
- res = cdio_open (device, DRIVER_DEVICE);
- if (res == NULL)
- g_warning ("unable to open CDDA in drive '%s'.", device);
-
- else
- {
- if (cdio_get_discmode (res) == CDIO_DISC_MODE_ERROR ||
- cdio_get_discmode (res) == CDIO_DISC_MODE_NO_INFO)
- {
- cdio_destroy (res);
- res = NULL;
- }
- }
-
- return res;
-}
-
-
-
-static gchar*
-cddrive_cddb_get_cdtext_title (CdIo_t *cdio)
-{
- gchar *res;
- cdtext_t *cdtxt;
-
- cdtxt = cdio_get_cdtext (cdio, 0);
- res = cdtext_get (CDTEXT_TITLE, cdtxt);
- cdtext_destroy (cdtxt);
-
- return res;
-}
-
-
-
/* Set the cddb id and the length of the audio CD in 'cdda', as well as each
track and its frame offset.
Return TRUE on success, FALSE otherwise. */
static gboolean
-cddrive_cddb_fill_cdda (CdIo_t *cdio, cddb_disc_t *cdda)
+cddrive_audio_fill_cdda (CdIo_t *cdio, cddb_disc_t *cdda)
{
track_t first, last, i; /* first, last and current track numbers */
lba_t lba;
@@ -230,7 +235,7 @@
static cddb_disc_t*
-cddrive_cddb_new_cdda (CdIo_t *cdio)
+cddrive_audio_new_cdda (CdIo_t *cdio)
{
cddb_disc_t *res;
@@ -239,7 +244,7 @@
g_warning ("not enough memory to get CDDA title.");
else
{
- if (! cddrive_cddb_fill_cdda (cdio, res))
+ if (! cddrive_audio_fill_cdda (cdio, res))
{
cddb_disc_destroy (res);
res = NULL;
@@ -252,7 +257,7 @@
static cddb_conn_t*
-cddrive_cddb_new_connection ()
+cddrive_audio_new_connection ()
{
cddb_conn_t *res;
@@ -278,7 +283,7 @@
static gpointer
-cddrive_cddb_cache_title_from_server (gpointer data)
+cddrive_audio_cache_title_from_server (gpointer data)
{
cddb_disc_t *cdda = (cddb_disc_t*) data;
cddb_conn_t *conn;
@@ -288,7 +293,7 @@
nor we want two thread writing in the cache together; hence the mutex. */
if (g_static_mutex_trylock (&mutex))
{
- conn = cddrive_cddb_new_connection ();
+ conn = cddrive_audio_new_connection ();
if (conn != NULL)
{
if (cddb_query (conn, cdda) == -1)
@@ -298,8 +303,8 @@
else
{
if (cddb_disc_get_title (cdda) != NULL)
- cddrive_cddb_cache_save (cddb_disc_get_discid (cdda),
- cddb_disc_get_title (cdda));
+ cddrive_audio_cache_save (cddb_disc_get_discid (cdda),
+ cddb_disc_get_title (cdda));
}
cddb_destroy (conn);
@@ -315,7 +320,7 @@
gchar*
-cddrive_cddb_get_title (const gchar* device, gboolean connection_allowed)
+cddrive_audio_get_title (const gchar* device, gboolean connection_allowed)
{
gchar *res = NULL;
cddb_disc_t *cdda;
@@ -323,17 +328,17 @@
g_assert (device != NULL);
- cdio = cddrive_cddb_new_cdio (device);
+ cdio = cddrive_audio_new_cdio (device);
if (cdio != NULL)
{
- cdda = cddrive_cddb_new_cdda (cdio);
+ cdda = cddrive_audio_new_cdda (cdio);
if (cdda != NULL)
{
- res = cddrive_cddb_cache_read (cddb_disc_get_discid (cdda));
+ res = cddrive_audio_cache_read (cddb_disc_get_discid (cdda));
if (res == NULL)
{
- res = cddrive_cddb_get_cdtext_title (cdio);
+ res = cddrive_audio_get_cdtext_title (cdio);
if (res == NULL && connection_allowed)
{
@@ -342,7 +347,7 @@
#ifdef HAVE_GTHREAD
/* if possible, fetch the title in a thread, so the plugin do not freeze
while attempting to connect to the server */
- g_thread_create (cddrive_cddb_cache_title_from_server,
+ g_thread_create (cddrive_audio_cache_title_from_server,
cdda,
FALSE,
NULL);
@@ -350,7 +355,7 @@
#else
/* no thread support, plugin freeze will depend on the connection quality */
- cddrive_cddb_cache_title_from_server (cdda);
+ cddrive_audio_cache_title_from_server (cdda);
res = g_strdup (cddb_disc_get_title (cdda));
#endif
}
@@ -366,7 +371,7 @@
void
-cddrive_cddb_init_globals ()
+cddrive_audio_init_globals ()
{
#ifdef HAVE_GTHREAD
if (! g_thread_supported ())
@@ -377,7 +382,7 @@
void
-cddrive_cddb_free_globals ()
+cddrive_audio_free_globals ()
{
libcddb_shutdown ();
}
@@ -387,22 +392,34 @@
#else /* ---------- NO CDDB SUPPORT ---------- */
gchar*
-cddrive_cddb_get_title (const gchar* device, gboolean connection_allowed)
+cddrive_audio_get_title (const gchar* device, gboolean connection_allowed)
{
- return NULL;
+ gchar *res = NULL;
+ CdIo_t *cdio;
+
+ g_assert (device != NULL);
+
+ cdio = cddrive_audio_new_cdio (device);
+ if (cdio != NULL)
+ {
+ res = cddrive_audio_get_cdtext_title (cdio);
+ cdio_destroy (cdio);
+ }
+
+ return res;
}
void
-cddrive_cddb_init_globals ()
+cddrive_audio_init_globals ()
{
}
void
-cddrive_cddb_free_globals ()
+cddrive_audio_free_globals ()
{
}
Modified: xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-cddb.h
===================================================================
--- xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-cddb.h 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-cddb.h 2007-06-27 08:16:35 UTC (rev 2867)
@@ -30,24 +30,30 @@
/* To call at program start */
void
-cddrive_cddb_init_globals ();
+cddrive_audio_init_globals ();
/* Free cddb global resources.
To call at program termination. */
void
-cddrive_cddb_free_globals ();
+cddrive_audio_free_globals ();
/* Return the title of the audio CD in the drive of device path 'device',
or NULL if the drive have no audio CD, or if the operation failed.
- If 'connection_allowed' is FALSE, the function looks for the title in the
- cache only.
+
+ If compiled without CDDB support, the function looks for the title using
+ CD-TEXT only.
+ If compiled with CDDB support and 'connection_allowed' is FALSE, the function
+ looks for the title using the cache and CD-TEXT only.
+ Otherwise, the function connects to one of the freedb.org server if cache
+ or CD-TEXT methods failed.
+
The result must be freed after use. */
gchar*
-cddrive_cddb_get_title (const gchar* device, gboolean connection_allowed);
+cddrive_audio_get_title (const gchar* device, gboolean connection_allowed);
G_END_DECLS
#endif
Modified: xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-dialogs.c
===================================================================
--- xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-dialogs.c 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-dialogs.c 2007-06-27 08:16:35 UTC (rev 2867)
@@ -293,7 +293,7 @@
-#if defined (HAVE_LIBCDIO) && defined (HAVE_LIBCDDB)
+#ifdef HAVE_LIBCDDB
static void
cddrive_configure_toggle_cddb (GtkButton *toggle,
CddrivePlugin *cddrive)
@@ -447,14 +447,15 @@
*label, *entry, *button, *spin_button;
GtkDialog *dialog;
GtkBox *section_vbox, *vbox;
-#if defined (HAVE_LIBCDIO) && defined (HAVE_LIBCDDB)
- GtkTooltips *tip;
-#endif
CddriveDriveInfo* *drv_infos;
gint i;
gchar *combo_txt;
GError *err = NULL;
+#ifdef HAVE_LIBCDDB
+ GtkTooltips *tip;
+#endif
+
xfce_panel_plugin_block_menu (plugin);
dialog = GTK_DIALOG (xfce_titled_dialog_new_with_buttons (CDDRIVE_TITLE,
@@ -639,7 +640,7 @@
cddrive_toggle_button_set_widget (GTK_TOGGLE_BUTTON (button), spin_button);
-#if defined (HAVE_LIBCDIO) && defined (HAVE_LIBCDDB)
+#ifdef HAVE_LIBCDDB
/* --- Network section --- */
section_vbox = cddrive_create_section_vbox (cddrive, dialog, _("Network"));
Modified: xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-monitor.c
===================================================================
--- xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-monitor.c 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-monitor.c 2007-06-27 08:16:35 UTC (rev 2867)
@@ -1043,7 +1043,7 @@
/* title has been previously cached */
return monitor->audio_title;
- monitor->audio_title = cddrive_cddb_get_title (monitor->dev, monitor->use_cddb);
+ monitor->audio_title = cddrive_audio_get_title (monitor->dev, monitor->use_cddb);
return monitor->audio_title;
}
Modified: xfce4-cddrive-plugin/trunk/panel-plugin/cddrive.c
===================================================================
--- xfce4-cddrive-plugin/trunk/panel-plugin/cddrive.c 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/panel-plugin/cddrive.c 2007-06-27 08:16:35 UTC (rev 2867)
@@ -593,7 +593,7 @@
if (G_LIKELY (cddrive->monitor != NULL))
cddrive_monitor_free (cddrive->monitor);
- cddrive_cddb_free_globals ();
+ cddrive_audio_free_globals ();
cddrive_error_free_globals ();
/* free the plugin structure */
@@ -1056,7 +1056,7 @@
CddrivePlugin *res;
cddrive_error_init_globals ();
- cddrive_cddb_init_globals ();
+ cddrive_audio_init_globals ();
res = panel_slice_new0 (CddrivePlugin);
Modified: xfce4-cddrive-plugin/trunk/po/fr.po
===================================================================
--- xfce4-cddrive-plugin/trunk/po/fr.po 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/po/fr.po 2007-06-27 08:16:35 UTC (rev 2867)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-22 15:37+0200\n"
+"POT-Creation-Date: 2007-06-27 10:23+0200\n"
"PO-Revision-Date: 2007-05-22 14:50+0200\n"
"Last-Translator: Sylvain Reynal <sreynal at nerim.net>\n"
"Language-Team: \n"
@@ -16,154 +16,154 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/cddrive.c:183
+#: ../panel-plugin/cddrive.c:185
msgid "Drive status is unavailable... is HAL installed and hald running ?"
msgstr ""
"L'état du lecteur n'est pas disponible... HAL est-il installé et hald lancé ?"
-#: ../panel-plugin/cddrive.c:192
+#: ../panel-plugin/cddrive.c:194
msgid "Close tray"
msgstr "Fermer le lecteur"
-#: ../panel-plugin/cddrive.c:194
+#: ../panel-plugin/cddrive.c:196
msgid "Open tray"
msgstr "Ouvrir le lecteur"
#. drive is not ejectable
-#: ../panel-plugin/cddrive.c:198
+#: ../panel-plugin/cddrive.c:200
msgid "No disc in the drive"
msgstr "Aucun disque dans le lecteur"
#. translation note: "Eject blank <disc type>" (e.g. "Eject blank cd-rw")
-#: ../panel-plugin/cddrive.c:211
+#: ../panel-plugin/cddrive.c:213
#, c-format
msgid "Eject blank %s"
msgstr "Éjecter le %s vierge"
#. translation note: "Eject \"<disc title>\""
-#: ../panel-plugin/cddrive.c:215
+#: ../panel-plugin/cddrive.c:217
#, c-format
msgid "Eject \"%s\""
msgstr "Éjecter \"%s\""
#. translation note: "Eject audio <disc type>"
-#: ../panel-plugin/cddrive.c:219
+#: ../panel-plugin/cddrive.c:221
#, c-format
msgid "Eject audio %s"
msgstr "Éjecter le %s audio"
#. translation note: "Eject <disc type>" (e.g. "Eject dvd")
-#: ../panel-plugin/cddrive.c:222
+#: ../panel-plugin/cddrive.c:224
#, c-format
msgid "Eject %s"
msgstr "Éjecter le %s"
#. translation note: "Blank <disc type>" (e.g. "Blank cd-rw")
-#: ../panel-plugin/cddrive.c:229
+#: ../panel-plugin/cddrive.c:231
#, c-format
msgid "Blank %s"
msgstr "%s vierge"
#. translation note: "\"<disc title>\" (made translatable in case translation
#. do not use the '"' character to enclose the title)
-#: ../panel-plugin/cddrive.c:234
+#: ../panel-plugin/cddrive.c:236
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
#. translation note: "Audio <disc type>"
-#: ../panel-plugin/cddrive.c:238
+#: ../panel-plugin/cddrive.c:240
#, c-format
msgid "Audio %s"
msgstr "%s audio"
-#: ../panel-plugin/cddrive.c:258
+#: ../panel-plugin/cddrive.c:260
#, c-format
msgid "%s status is unavailable... is HAL installed and hald running ?"
msgstr ""
"L'état de %s n'est pas disponible... HAL est-il installé et hald lancé ?"
#. translation note: "Close <drive name>"
-#: ../panel-plugin/cddrive.c:269
+#: ../panel-plugin/cddrive.c:271
#, c-format
msgid "Close %s"
msgstr "Fermer %s"
#. translation note: "Open <drive name>"
-#: ../panel-plugin/cddrive.c:272
+#: ../panel-plugin/cddrive.c:274
#, c-format
msgid "Open %s"
msgstr "Ouvrir %s"
#. drive is not ejectable
#. translation note: "No disc in <drive name>"
-#: ../panel-plugin/cddrive.c:278
+#: ../panel-plugin/cddrive.c:280
#, c-format
msgid "No disc in %s"
msgstr "Aucun disque dans %s"
#. translation note: "Eject blank <disc type> from <drive name>" (e.g. "Eject blank cd-rw from cdrom1")
-#: ../panel-plugin/cddrive.c:291
+#: ../panel-plugin/cddrive.c:293
#, c-format
msgid "Eject blank %s from %s"
msgstr "Éjecter le %s vierge de %s"
#. translation note: "Eject \"<disc title>\" from <drive name>"
-#: ../panel-plugin/cddrive.c:295
+#: ../panel-plugin/cddrive.c:297
#, c-format
msgid "Eject \"%s\" from %s"
msgstr "Éjecter \"%s\" de %s"
#. translation note: "Eject audio <disc type> from <drive name>"
-#: ../panel-plugin/cddrive.c:299
+#: ../panel-plugin/cddrive.c:301
#, c-format
msgid "Eject audio %s from %s"
msgstr "Éjecter le %s audio de %s"
#. translation note: "Eject <disc type> from <drive name>" (e.g. "Eject dvd from my-dvd-drive")
-#: ../panel-plugin/cddrive.c:302
+#: ../panel-plugin/cddrive.c:304
#, c-format
msgid "Eject %s from %s"
msgstr "Éjecter le %s de %s"
#. translation note: "Blank <disc type> in <drive name>" (e.g. "Blank cd-rw in cdrom1")
-#: ../panel-plugin/cddrive.c:309
+#: ../panel-plugin/cddrive.c:311
#, c-format
msgid "Blank %s in %s"
msgstr "%s vierge dans %s"
#. translation note: "\"<disc title>\" in <drive name>" (e.g. ""Backup #36" in cdrom1")
-#: ../panel-plugin/cddrive.c:313
+#: ../panel-plugin/cddrive.c:315
#, c-format
msgid "\"%s\" in %s"
msgstr "\"%s\" dans %s"
#. translation note: "Audio <disc type> in <drive name>"
-#: ../panel-plugin/cddrive.c:317
+#: ../panel-plugin/cddrive.c:319
#, c-format
msgid "Audio %s in %s"
msgstr "%s audio dans %s"
#. translation note: "<disc type> in <drive name>" (e.g. "dvd in cdrom1")
-#: ../panel-plugin/cddrive.c:320
+#: ../panel-plugin/cddrive.c:322
#, c-format
msgid "%s in %s"
msgstr "%s dans %s"
-#: ../panel-plugin/cddrive.c:422
+#: ../panel-plugin/cddrive.c:424
msgid "Unmount disc"
msgstr "Démonter le disque"
-#: ../panel-plugin/cddrive.c:424
+#: ../panel-plugin/cddrive.c:426
msgid "Mount disc"
msgstr "Monter le disque"
-#: ../panel-plugin/cddrive.c:429
+#: ../panel-plugin/cddrive.c:431
#, c-format
msgid "Unmount \"%s\""
msgstr "Démonter \"%s\""
-#: ../panel-plugin/cddrive.c:431
+#: ../panel-plugin/cddrive.c:433
#, c-format
msgid "Mount \"%s\""
msgstr "Monter \"%s\""
@@ -205,27 +205,27 @@
msgid "CD Drive Monitor"
msgstr "Contrôle de lecteur CD"
-#: ../panel-plugin/cddrive-dialogs.c:343
+#: ../panel-plugin/cddrive-dialogs.c:356
msgid "Mounting"
msgstr "Montage"
-#: ../panel-plugin/cddrive-dialogs.c:344
+#: ../panel-plugin/cddrive-dialogs.c:357
msgid "Enter a command to use if HAL system fails to mount the disc."
msgstr ""
"Entrez une commande à utiliser si le système HAL ne réussit pas à monter le "
"disque."
-#: ../panel-plugin/cddrive-dialogs.c:351
+#: ../panel-plugin/cddrive-dialogs.c:364
msgid "Unmounting"
msgstr "Démontage"
-#: ../panel-plugin/cddrive-dialogs.c:352
+#: ../panel-plugin/cddrive-dialogs.c:365
msgid "Enter a command to use if the HAL system fails to unmount the disc."
msgstr ""
"Entrez une commande à utiliser si le système HAL ne réussit pas à démonter "
"le disque."
-#: ../panel-plugin/cddrive-dialogs.c:370
+#: ../panel-plugin/cddrive-dialogs.c:383
#, c-format
msgid ""
"You can use \"%d\", \"%m\" and \"%u\" character sequences as arguments for "
@@ -237,83 +237,79 @@
"respectivement par le chemin du périphérique, le point de montage du disque "
"et l'UDI du disque."
-#: ../panel-plugin/cddrive-dialogs.c:394
+#: ../panel-plugin/cddrive-dialogs.c:407
msgid "Mounted disc icon color"
msgstr "Couleur de l'icône du disque monté"
-#: ../panel-plugin/cddrive-dialogs.c:403
+#: ../panel-plugin/cddrive-dialogs.c:416
msgid "Unmounted disc icon color"
msgstr "Couleur de l'icône du disque démonté"
#. --- "Drive" section ---
-#: ../panel-plugin/cddrive-dialogs.c:468
+#: ../panel-plugin/cddrive-dialogs.c:482
msgid "Drive"
msgstr "Lecteur"
-#: ../panel-plugin/cddrive-dialogs.c:474
+#: ../panel-plugin/cddrive-dialogs.c:490
msgid "CD-ROM drive detection failed !"
msgstr "La détection du lecteur CD-ROM a échoué !"
-#: ../panel-plugin/cddrive-dialogs.c:479
+#: ../panel-plugin/cddrive-dialogs.c:497
msgid "No CD-ROM drive detected"
msgstr "Aucun lecteur de CD-ROM détecté"
#. if some drives have been detected...
#. --- "Commands" section ---
-#: ../panel-plugin/cddrive-dialogs.c:528
+#: ../panel-plugin/cddrive-dialogs.c:547
msgid "Fallback Commands"
msgstr "Commandes de rechange"
#. --- "Display" section ---
#. -- name config --
-#: ../panel-plugin/cddrive-dialogs.c:539
+#: ../panel-plugin/cddrive-dialogs.c:558
msgid "Display"
msgstr "Affichage"
-#: ../panel-plugin/cddrive-dialogs.c:544
+#: ../panel-plugin/cddrive-dialogs.c:563
msgid "Name to display"
msgstr "Nom à afficher"
-#: ../panel-plugin/cddrive-dialogs.c:568
+#: ../panel-plugin/cddrive-dialogs.c:587
msgid "display in panel"
msgstr "afficher dans le panneau"
-#: ../panel-plugin/cddrive-dialogs.c:579
+#: ../panel-plugin/cddrive-dialogs.c:598
msgid "use in tooltip"
msgstr "utiliser dans la bulle d'aide"
-#: ../panel-plugin/cddrive-dialogs.c:601
+#: ../panel-plugin/cddrive-dialogs.c:620
msgid "Unmounted disc icon opacity"
msgstr "Opacité de l'icône du disque démonté"
#. --- Network section ---
-#: ../panel-plugin/cddrive-dialogs.c:626
+#: ../panel-plugin/cddrive-dialogs.c:645
msgid "Network"
msgstr "Réseau"
#. -- CDDB config --
-#: ../panel-plugin/cddrive-dialogs.c:629
+#: ../panel-plugin/cddrive-dialogs.c:648
msgid "Allow freedb.org connections"
msgstr "Autoriser les connections à freedb.org"
-#: ../panel-plugin/cddrive-dialogs.c:634
+#: ../panel-plugin/cddrive-dialogs.c:653
msgid ""
"Enabling this option allows the plugin to query the freedb.org servers in "
"order to get the title of an audio CD."
msgstr ""
-"Activer cette option permet au plugin d'interroger les serveurs freedb.org de "
-"manière à récupérer le titre d'un CD audio."
+"Activer cette option permet au plugin d'interroger les serveurs freedb.org "
+"de manière à récupérer le titre d'un CD audio."
-#: ../panel-plugin/cddrive-dialogs.c:662
+#: ../panel-plugin/cddrive-dialogs.c:681
#: ../panel-plugin/cddrive.desktop.in.in.h:2
msgid "CD-ROM drive tray and content control"
msgstr "Contrôle du plateau et du contenu d'un lecteur CD."
-#: ../panel-plugin/cddrive-dialogs.c:685
-msgid "Error"
-msgstr "Erreur"
-
-#: ../panel-plugin/cddrive-dialogs.c:705
+#: ../panel-plugin/cddrive-dialogs.c:724
msgid "No error description available."
msgstr "Pas de description d'erreur disponible."
@@ -397,36 +393,37 @@
msgid "Failed to set the D-BUS connection of HAL context."
msgstr "L'affectation de la connection D-BUS du contexte HAL a échoué."
-#: ../panel-plugin/cddrive-monitor.c:317
+#: ../panel-plugin/cddrive-monitor.c:318
#, c-format
msgid "Failed to retrieve drive from device path '%s'."
msgstr "Échec de la récupération du lecteur pour le périphérique '%s'."
-#: ../panel-plugin/cddrive-monitor.c:343
+#: ../panel-plugin/cddrive-monitor.c:344
#, c-format
msgid "Failed to retrieve disc from UDI '%s'."
msgstr "Échec de la récupération du disque d'UDI '%s'."
-#: ../panel-plugin/cddrive-monitor.c:400
+#: ../panel-plugin/cddrive-monitor.c:401
msgid "Failed to set drive's status change callback."
msgstr "Échec de l'affectation du callback de changement d'état du lecteur."
-#: ../panel-plugin/cddrive-monitor.c:518
+#: ../panel-plugin/cddrive-monitor.c:505
msgid "Failed to register drive addition callback."
msgstr "Échec de l'enregistrement du callback d'ajout du lecteur."
-#: ../panel-plugin/cddrive-monitor.c:527
+#: ../panel-plugin/cddrive-monitor.c:514
msgid "Failed to register drive removal callback."
msgstr "Échec de l'enregistrement du callback d'enlèvement du lecteur."
-#: ../panel-plugin/cddrive-monitor.c:550
-msgid "Failed to unregister drive addition callback."
-msgstr "Échec du désenregistrement du callback d'ajout du lecteur."
-
-#: ../panel-plugin/cddrive-monitor.c:558
-msgid "Failed to unregister drive removal callback."
-msgstr "Échec du désenregistrement du callback d'enlèvement du lecteur."
-
-#: ../panel-plugin/cddrive-monitor.c:692
+#: ../panel-plugin/cddrive-monitor.c:624
msgid "Failed to store monitor in HAL context."
msgstr "Le stockage du moniteur dans le contexte HAL a échoué."
+
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
+#~ msgid "Failed to unregister drive addition callback."
+#~ msgstr "Échec du désenregistrement du callback d'ajout du lecteur."
+
+#~ msgid "Failed to unregister drive removal callback."
+#~ msgstr "Échec du désenregistrement du callback d'enlèvement du lecteur."
Modified: xfce4-cddrive-plugin/trunk/po/xfce4-cddrive-plugin.pot
===================================================================
--- xfce4-cddrive-plugin/trunk/po/xfce4-cddrive-plugin.pot 2007-06-27 03:33:01 UTC (rev 2866)
+++ xfce4-cddrive-plugin/trunk/po/xfce4-cddrive-plugin.pot 2007-06-27 08:16:35 UTC (rev 2867)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-22 15:37+0200\n"
+"POT-Creation-Date: 2007-06-27 10:23+0200\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,152 +16,152 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/cddrive.c:183
+#: ../panel-plugin/cddrive.c:185
msgid "Drive status is unavailable... is HAL installed and hald running ?"
msgstr ""
-#: ../panel-plugin/cddrive.c:192
+#: ../panel-plugin/cddrive.c:194
msgid "Close tray"
msgstr ""
-#: ../panel-plugin/cddrive.c:194
+#: ../panel-plugin/cddrive.c:196
msgid "Open tray"
msgstr ""
#. drive is not ejectable
-#: ../panel-plugin/cddrive.c:198
+#: ../panel-plugin/cddrive.c:200
msgid "No disc in the drive"
msgstr ""
#. translation note: "Eject blank <disc type>" (e.g. "Eject blank cd-rw")
-#: ../panel-plugin/cddrive.c:211
+#: ../panel-plugin/cddrive.c:213
#, c-format
msgid "Eject blank %s"
msgstr ""
#. translation note: "Eject \"<disc title>\""
-#: ../panel-plugin/cddrive.c:215
+#: ../panel-plugin/cddrive.c:217
#, c-format
msgid "Eject \"%s\""
msgstr ""
#. translation note: "Eject audio <disc type>"
-#: ../panel-plugin/cddrive.c:219
+#: ../panel-plugin/cddrive.c:221
#, c-format
msgid "Eject audio %s"
msgstr ""
#. translation note: "Eject <disc type>" (e.g. "Eject dvd")
-#: ../panel-plugin/cddrive.c:222
+#: ../panel-plugin/cddrive.c:224
#, c-format
msgid "Eject %s"
msgstr ""
#. translation note: "Blank <disc type>" (e.g. "Blank cd-rw")
-#: ../panel-plugin/cddrive.c:229
+#: ../panel-plugin/cddrive.c:231
#, c-format
msgid "Blank %s"
msgstr ""
#. translation note: "\"<disc title>\" (made translatable in case translation
#. do not use the '"' character to enclose the title)
-#: ../panel-plugin/cddrive.c:234
+#: ../panel-plugin/cddrive.c:236
#, c-format
msgid "\"%s\""
msgstr ""
#. translation note: "Audio <disc type>"
-#: ../panel-plugin/cddrive.c:238
+#: ../panel-plugin/cddrive.c:240
#, c-format
msgid "Audio %s"
msgstr ""
-#: ../panel-plugin/cddrive.c:258
+#: ../panel-plugin/cddrive.c:260
#, c-format
msgid "%s status is unavailable... is HAL installed and hald running ?"
msgstr ""
#. translation note: "Close <drive name>"
-#: ../panel-plugin/cddrive.c:269
+#: ../panel-plugin/cddrive.c:271
#, c-format
msgid "Close %s"
msgstr ""
#. translation note: "Open <drive name>"
-#: ../panel-plugin/cddrive.c:272
+#: ../panel-plugin/cddrive.c:274
#, c-format
msgid "Open %s"
msgstr ""
#. drive is not ejectable
#. translation note: "No disc in <drive name>"
-#: ../panel-plugin/cddrive.c:278
+#: ../panel-plugin/cddrive.c:280
#, c-format
msgid "No disc in %s"
msgstr ""
#. translation note: "Eject blank <disc type> from <drive name>" (e.g. "Eject blank cd-rw from cdrom1")
-#: ../panel-plugin/cddrive.c:291
+#: ../panel-plugin/cddrive.c:293
#, c-format
msgid "Eject blank %s from %s"
msgstr ""
#. translation note: "Eject \"<disc title>\" from <drive name>"
-#: ../panel-plugin/cddrive.c:295
+#: ../panel-plugin/cddrive.c:297
#, c-format
msgid "Eject \"%s\" from %s"
msgstr ""
#. translation note: "Eject audio <disc type> from <drive name>"
-#: ../panel-plugin/cddrive.c:299
+#: ../panel-plugin/cddrive.c:301
#, c-format
msgid "Eject audio %s from %s"
msgstr ""
#. translation note: "Eject <disc type> from <drive name>" (e.g. "Eject dvd from my-dvd-drive")
-#: ../panel-plugin/cddrive.c:302
+#: ../panel-plugin/cddrive.c:304
#, c-format
msgid "Eject %s from %s"
msgstr ""
#. translation note: "Blank <disc type> in <drive name>" (e.g. "Blank cd-rw in cdrom1")
-#: ../panel-plugin/cddrive.c:309
+#: ../panel-plugin/cddrive.c:311
#, c-format
msgid "Blank %s in %s"
msgstr ""
#. translation note: "\"<disc title>\" in <drive name>" (e.g. ""Backup #36" in cdrom1")
-#: ../panel-plugin/cddrive.c:313
+#: ../panel-plugin/cddrive.c:315
#, c-format
msgid "\"%s\" in %s"
msgstr ""
#. translation note: "Audio <disc type> in <drive name>"
-#: ../panel-plugin/cddrive.c:317
+#: ../panel-plugin/cddrive.c:319
#, c-format
msgid "Audio %s in %s"
msgstr ""
#. translation note: "<disc type> in <drive name>" (e.g. "dvd in cdrom1")
-#: ../panel-plugin/cddrive.c:320
+#: ../panel-plugin/cddrive.c:322
#, c-format
msgid "%s in %s"
msgstr ""
-#: ../panel-plugin/cddrive.c:422
+#: ../panel-plugin/cddrive.c:424
msgid "Unmount disc"
msgstr ""
-#: ../panel-plugin/cddrive.c:424
+#: ../panel-plugin/cddrive.c:426
msgid "Mount disc"
msgstr ""
-#: ../panel-plugin/cddrive.c:429
+#: ../panel-plugin/cddrive.c:431
#, c-format
msgid "Unmount \"%s\""
msgstr ""
-#: ../panel-plugin/cddrive.c:431
+#: ../panel-plugin/cddrive.c:433
#, c-format
msgid "Mount \"%s\""
msgstr ""
@@ -203,23 +203,23 @@
msgid "CD Drive Monitor"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:343
+#: ../panel-plugin/cddrive-dialogs.c:356
msgid "Mounting"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:344
+#: ../panel-plugin/cddrive-dialogs.c:357
msgid "Enter a command to use if HAL system fails to mount the disc."
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:351
+#: ../panel-plugin/cddrive-dialogs.c:364
msgid "Unmounting"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:352
+#: ../panel-plugin/cddrive-dialogs.c:365
msgid "Enter a command to use if the HAL system fails to unmount the disc."
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:370
+#: ../panel-plugin/cddrive-dialogs.c:383
#, c-format
msgid ""
"You can use \"%d\", \"%m\" and \"%u\" character sequences as arguments for "
@@ -227,81 +227,77 @@
"disc mount point and the disc UDI."
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:394
+#: ../panel-plugin/cddrive-dialogs.c:407
msgid "Mounted disc icon color"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:403
+#: ../panel-plugin/cddrive-dialogs.c:416
msgid "Unmounted disc icon color"
msgstr ""
#. --- "Drive" section ---
-#: ../panel-plugin/cddrive-dialogs.c:468
+#: ../panel-plugin/cddrive-dialogs.c:482
msgid "Drive"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:474
+#: ../panel-plugin/cddrive-dialogs.c:490
msgid "CD-ROM drive detection failed !"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:479
+#: ../panel-plugin/cddrive-dialogs.c:497
msgid "No CD-ROM drive detected"
msgstr ""
#. if some drives have been detected...
#. --- "Commands" section ---
-#: ../panel-plugin/cddrive-dialogs.c:528
+#: ../panel-plugin/cddrive-dialogs.c:547
msgid "Fallback Commands"
msgstr ""
#. --- "Display" section ---
#. -- name config --
-#: ../panel-plugin/cddrive-dialogs.c:539
+#: ../panel-plugin/cddrive-dialogs.c:558
msgid "Display"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:544
+#: ../panel-plugin/cddrive-dialogs.c:563
msgid "Name to display"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:568
+#: ../panel-plugin/cddrive-dialogs.c:587
msgid "display in panel"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:579
+#: ../panel-plugin/cddrive-dialogs.c:598
msgid "use in tooltip"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:601
+#: ../panel-plugin/cddrive-dialogs.c:620
msgid "Unmounted disc icon opacity"
msgstr ""
#. --- Network section ---
-#: ../panel-plugin/cddrive-dialogs.c:626
+#: ../panel-plugin/cddrive-dialogs.c:645
msgid "Network"
msgstr ""
#. -- CDDB config --
-#: ../panel-plugin/cddrive-dialogs.c:629
+#: ../panel-plugin/cddrive-dialogs.c:648
msgid "Allow freedb.org connections"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:634
+#: ../panel-plugin/cddrive-dialogs.c:653
msgid ""
"Enabling this option allows the plugin to query the freedb.org servers in "
"order to get the title of an audio CD."
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:662
+#: ../panel-plugin/cddrive-dialogs.c:681
#: ../panel-plugin/cddrive.desktop.in.in.h:2
msgid "CD-ROM drive tray and content control"
msgstr ""
-#: ../panel-plugin/cddrive-dialogs.c:685
-msgid "Error"
-msgstr ""
-
-#: ../panel-plugin/cddrive-dialogs.c:705
+#: ../panel-plugin/cddrive-dialogs.c:724
msgid "No error description available."
msgstr ""
@@ -385,36 +381,28 @@
msgid "Failed to set the D-BUS connection of HAL context."
msgstr ""
-#: ../panel-plugin/cddrive-monitor.c:317
+#: ../panel-plugin/cddrive-monitor.c:318
#, c-format
msgid "Failed to retrieve drive from device path '%s'."
msgstr ""
-#: ../panel-plugin/cddrive-monitor.c:343
+#: ../panel-plugin/cddrive-monitor.c:344
#, c-format
msgid "Failed to retrieve disc from UDI '%s'."
msgstr ""
-#: ../panel-plugin/cddrive-monitor.c:400
+#: ../panel-plugin/cddrive-monitor.c:401
msgid "Failed to set drive's status change callback."
msgstr ""
-#: ../panel-plugin/cddrive-monitor.c:518
+#: ../panel-plugin/cddrive-monitor.c:505
msgid "Failed to register drive addition callback."
msgstr ""
-#: ../panel-plugin/cddrive-monitor.c:527
+#: ../panel-plugin/cddrive-monitor.c:514
msgid "Failed to register drive removal callback."
msgstr ""
-#: ../panel-plugin/cddrive-monitor.c:550
-msgid "Failed to unregister drive addition callback."
-msgstr ""
-
-#: ../panel-plugin/cddrive-monitor.c:558
-msgid "Failed to unregister drive removal callback."
-msgstr ""
-
-#: ../panel-plugin/cddrive-monitor.c:692
+#: ../panel-plugin/cddrive-monitor.c:624
msgid "Failed to store monitor in HAL context."
msgstr ""
More information about the Goodies-commits
mailing list