[Xfce4-commits] midori:master Work-around icon being activatable by default
Updating branch refs/heads/master to b6469de5e6b0cccee451561ad0607c99dd0ac06c (commit) from 30f4225cd9a88cfc9cbf8bb8eab77d65412876eb (commit) commit b6469de5e6b0cccee451561ad0607c99dd0ac06c Author: Peter Hatina phat...@redhat.com Date: Thu Oct 20 09:14:33 2011 +0200 Work-around icon being activatable by default Fixes: https://bugs.launchpad.net/midori/+bug/770521 midori/midori-locationaction.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 77bf402..7969101 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -731,6 +731,9 @@ midori_location_action_create_tool_item (GtkAction* action) entry = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FILE); +/* Work-around icon being activatable by default */ +gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, FALSE); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_SECONDARY, TRUE); #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Error out if Vala 0.13.2, GTK+ 3 and extensions
Updating branch refs/heads/master
to ac5eb28d499234c7379adabc7771ab8a509c13f3 (commit)
from b6469de5e6b0cccee451561ad0607c99dd0ac06c (commit)
commit ac5eb28d499234c7379adabc7771ab8a509c13f3
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Oct 20 09:47:11 2011 +0200
Error out if Vala 0.13.2, GTK+ 3 and extensions
See https://bugs.launchpad.net/midori/+bug/871579
wscript |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/wscript b/wscript
index 8d66022..d8abd15 100644
--- a/wscript
+++ b/wscript
@@ -196,6 +196,15 @@ def configure (conf):
includes='/usr/X11R6/include', mandatory=False)
conf.check (lib='Xss', libpath='/usr/X11R6/lib', mandatory=False)
if option_enabled ('gtk3'):
+if option_enabled ('addons') and ( not ( \
+ conf.env['VALAC_VERSION'] = 0 \
+ and conf.env['VALAC_VERSION'][1] = 13 \
+ and conf.env['VALAC_VERSION'][2] = 2)):
+Utils.pprint ('RED', 'Vala 0.13.2 or later is required ' \
+'to build with GTK+ 3 and extensions.\n' \
+'Pass --disable-addons to build without extensions.\n' \
+'Pass --disable-gtk3 to build with extensions and GTK+ 2.')
+sys.exit (1)
check_pkg ('gtk+-3.0', '3.0.0', var='GTK', mandatory=False)
check_pkg ('webkitgtk-3.0', '1.1.17', var='WEBKIT', mandatory=False)
if not conf.env['HAVE_GTK'] or not conf.env['HAVE_WEBKIT']:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master Update code responsible to open website URL and manual
Updating branch refs/heads/master
to 62c39364f83f10d42c874054662cfc8f3f2f6a3f (commit)
from fca96054a1eafb0c5dc9db5e4d40c17b4f7ba255 (commit)
commit 62c39364f83f10d42c874054662cfc8f3f2f6a3f
Author: Mike Massonnet mmasson...@xfce.org
Date: Mon Oct 17 21:28:46 2011 +0200
Update code responsible to open website URL and manual
panel-plugin/actions.c|1 -
panel-plugin/plugin.c | 15 +--
panel-plugin/xfce4-clipman-settings.c | 15 ---
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/panel-plugin/actions.c b/panel-plugin/actions.c
index f67cd01..ccebe81 100644
--- a/panel-plugin/actions.c
+++ b/panel-plugin/actions.c
@@ -35,7 +35,6 @@
#endif
#include gio/gio.h
-#include exo/exo.h
#include gtk/gtk.h
#include libxfce4util/libxfce4util.h
#include libxfce4ui/libxfce4ui.h
diff --git a/panel-plugin/plugin.c b/panel-plugin/plugin.c
index 47cb088..2dccfea 100644
--- a/panel-plugin/plugin.c
+++ b/panel-plugin/plugin.c
@@ -291,16 +291,19 @@ cb_about_dialog_url_hook (GtkAboutDialog *dialog,
const gchar *uri,
gpointer user_data)
{
- gchar *command;
+ gchar *command = NULL;
- command = g_strdup_printf (exo-open %s, uri);
- if (!g_spawn_command_line_async (command, NULL))
+ if (!gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL))
{
+ command = g_strdup_printf (exo-open --launch %s, uri);
+ if (!g_spawn_command_line_async (command, NULL))
+{
+ g_free (command);
+ command = g_strdup_printf (firefox %s, uri);
+ g_spawn_command_line_async (command, NULL);
+}
g_free (command);
- command = g_strdup_printf (firefox %s, uri);
- g_spawn_command_line_async (command, NULL);
}
- g_free (command);
}
void
diff --git a/panel-plugin/xfce4-clipman-settings.c
b/panel-plugin/xfce4-clipman-settings.c
index c1921fb..b201a46 100644
--- a/panel-plugin/xfce4-clipman-settings.c
+++ b/panel-plugin/xfce4-clipman-settings.c
@@ -187,40 +187,41 @@ cb_show_help (GtkButton *button)
locale = g_strdup (C);
#endif
- filename = g_strdup_printf (DATAROOTDIR/xfce4/doc/%s/PACKAGE.html,
locale);
+ filename = g_strdup_printf
(file://DATAROOTDIR/xfce4/doc/%s/PACKAGE.html, locale);
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
{
offset = g_strrstr (locale, _);
if (offset == NULL)
{
g_free (filename);
- filename = g_strdup (DATAROOTDIR/xfce4/doc/C/PACKAGE.html);
+ filename = g_strdup
(file://DATAROOTDIR/xfce4/doc/C/PACKAGE.html);
}
else
{
*offset = '\0';
g_free (filename);
- filename = g_strdup_printf
(DATAROOTDIR/xfce4/doc/%s/PACKAGE.html, locale);
+ filename = g_strdup_printf
(file://DATAROOTDIR/xfce4/doc/%s/PACKAGE.html, locale);
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
{
g_free (filename);
- filename = g_strdup (DATAROOTDIR/xfce4/doc/C/PACKAGE.html);
+ filename = g_strdup
(file://DATAROOTDIR/xfce4/doc/C/PACKAGE.html);
}
}
}
g_free (locale);
#else
- filename = g_strdup (DATAROOTDIR/xfce4/doc/C/PACKAGE.html);
+ filename = g_strdup (file://DATAROOTDIR/xfce4/doc/C/PACKAGE.html);
#endif
screen = gtk_widget_get_screen (GTK_WIDGET (button));
- command = g_strdup_printf (exo-open file://%s, filename);
+
+ command = g_strdup_printf (exo-open --launch WebBrowser %s, filename);
if (gdk_spawn_command_line_on_screen (screen, command, NULL))
goto out;
g_free (command);
- command = g_strdup_printf (firefox file://%s, filename);
+ command = g_strdup_printf (firefox %s, filename);
if (gdk_spawn_command_line_on_screen (screen, command, NULL))
goto out;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master Add option Reverse menu order inside the settings dialog
Updating branch refs/heads/master to aaeab388d4c53ca6133ad1f96144a9e286953423 (commit) from 62c39364f83f10d42c874054662cfc8f3f2f6a3f (commit) commit aaeab388d4c53ca6133ad1f96144a9e286953423 Author: Mike Massonnet mmasson...@xfce.org Date: Mon Oct 17 22:04:16 2011 +0200 Add option Reverse menu order inside the settings dialog Add a checkbox inside the settings dialog for /tweaks/reverse-menu-order panel-plugin/common.h |1 + panel-plugin/settings-dialog.ui | 52 ++-- panel-plugin/xfce4-clipman-settings.c |4 ++ 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/panel-plugin/common.h b/panel-plugin/common.h index 75bd8ce..633f019 100644 --- a/panel-plugin/common.h +++ b/panel-plugin/common.h @@ -26,6 +26,7 @@ #define DEFAULT_MAX_TEXTS_IN_HISTORY10 #define DEFAULT_MAX_IMAGES_IN_HISTORY 1 #define DEFAULT_SAVE_ON_QUITTRUE +#define DEFAULT_REVERSE_ORDER FALSE /* Collector */ #define DEFAULT_ADD_PRIMARY_CLIPBOARD FALSE diff --git a/panel-plugin/settings-dialog.ui b/panel-plugin/settings-dialog.ui index 52f9136..4880b2e 100644 --- a/panel-plugin/settings-dialog.ui +++ b/panel-plugin/settings-dialog.ui @@ -1,19 +1,18 @@ ?xml version=1.0? interface + requires lib=gtk+ version=2.16/ + !-- interface-requires libxfce4ui 4.5 -- + !-- interface-naming-policy toplevel-contextual -- object class=GtkAdjustment id=adjustment1 -property name=upper1000/property +property name=value5/property property name=lower5/property -property name=page_increment10/property +property name=upper1000/property property name=step_increment5/property -property name=page_size0/property -property name=value5/property +property name=page_increment10/property /object object class=GtkTextBuffer id=textbuffer1 property name=textType here your custom text, for example an URL, a filename, etc./property /object - !-- interface-requires gtk+ 2.16 -- - !-- interface-requires xfce4 2335.53032 -- - !-- interface-naming-policy toplevel-contextual -- object class=XfceTitledDialog id=settings-dialog property name=titleClipman/property property name=window_positioncenter/property @@ -63,7 +62,7 @@ property name=can_focusTrue/property property name=receives_defaultFalse/property property name=has_tooltipTrue/property -property name=tooltip-text translatable=yesIf checked, the selections will be synced with the default clipboard in a way that you can paste what you select/property +property name=tooltip_text translatable=yesIf checked, the selections will be synced with the default clipboard in a way that you can paste what you select/property property name=use_underlineTrue/property property name=draw_indicatorTrue/property /object @@ -111,7 +110,7 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=tooltip-text translatable=yesIf checked, this option will restore the history on every new Xfce session/property +property name=tooltip_text translatable=yesIf checked, this option will restore the history on every new Xfce session/property property name=use_underlineTrue/property property name=draw_indicatorTrue/property /object @@ -121,11 +120,11 @@ /child child object class=GtkCheckButton id=store-an-image -property name=label translatable=yesStore an _image/property +property name=label translatable=yesStore last copied _image/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=tooltip-text translatable=yesIf checked, this option allows to store one image inside the history/property +property name=tooltip_text translatable=yesIf checked, this option allows to store one image inside the history/property property name=use_underlineTrue/property property name=draw_indicatorTrue/property
[Xfce4-commits] xfce4-clipman-plugin:master autoconf: Bump exo-0.3 to exo-1 0.6.0
Updating branch refs/heads/master to fca96054a1eafb0c5dc9db5e4d40c17b4f7ba255 (commit) from d8e5f24fee8f9a0918cb5681e9d92c122334a485 (commit) commit fca96054a1eafb0c5dc9db5e4d40c17b4f7ba255 Author: Mike Massonnet mmasson...@xfce.org Date: Wed Aug 10 21:40:50 2011 +0200 autoconf: Bump exo-0.3 to exo-1 0.6.0 configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 77124ed..72d3fec 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -54,7 +54,7 @@ dnl *** dnl *** Check for required packages *** dnl *** XDT_CHECK_LIBX11_REQUIRE() -XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.0]) +XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0]) XDT_CHECK_PACKAGE([GDKX], [gdk-x11-2.0], [2.14.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master Remove deprecated CHECK_VERSION precompilation code
Updating branch refs/heads/master
to 9c3e50458e90eed6c6ce1edda384f398ea7a50db (commit)
from c239358133414d0207ec38403755fc07c853655a (commit)
commit 9c3e50458e90eed6c6ce1edda384f398ea7a50db
Author: Mike Massonnet mmasson...@xfce.org
Date: Wed Oct 19 11:00:12 2011 +0200
Remove deprecated CHECK_VERSION precompilation code
panel-plugin/actions.c| 60 -
panel-plugin/main-panel-plugin.c |2 -
panel-plugin/xfce4-clipman-settings.c | 33 +-
3 files changed, 1 insertions(+), 94 deletions(-)
diff --git a/panel-plugin/actions.c b/panel-plugin/actions.c
index ccebe81..06da812 100644
--- a/panel-plugin/actions.c
+++ b/panel-plugin/actions.c
@@ -71,14 +71,6 @@ static gint __clipman_actions_entry_compare
(gpointer a,
static gint __clipman_actions_entry_compare_name (gpointer a,
gpointer b);
static void __clipman_actions_entry_free
(ClipmanActionsEntry *entry);
-#if !GLIB_CHECK_VERSION (2,16,0)
-static void __foreach_command_create_mi (gpointer key,
- gpointer value,
- gpointer
user_data);
-static void __foreach_command_write_xml (gpointer key,
- gpointer value,
- gpointer
user_data);
-#endif
/*
* Callbacks declarations
@@ -430,49 +422,6 @@ __clipman_actions_entry_free (ClipmanActionsEntry *entry)
g_slice_free (ClipmanActionsEntry, entry);
}
-#if !GLIB_CHECK_VERSION (2,16,0)
-static void
-__foreach_command_create_mi (gpointer key,
- gpointer value,
- gpointer user_data)
-{
- gchar *command_name = key;
- gchar *command = value;
- GtkWidget *menu = user_data;
- GtkWidget *mi;
-
- mi = gtk_menu_item_new_with_label (command_name);
- g_object_set_data (G_OBJECT (mi), text, g_object_get_data (G_OBJECT
(menu), text));
- g_object_set_data (G_OBJECT (mi), command, command);
- g_object_set_data (G_OBJECT (mi), regex, g_object_get_data (G_OBJECT
(menu), regex));
- gtk_container_add (GTK_CONTAINER (menu), mi);
- g_signal_connect (mi, activate, G_CALLBACK (cb_entry_activated), NULL);
-}
-
-static void
-__foreach_command_write_xml (gpointer key,
- gpointer value,
- gpointer user_data)
-{
- gchar *command_name = key;
- gchar *command = value;
- GString *output = user_data;
- gchar *tmp;
-
- g_string_append (output, \t\t\tcommand\n);
-
- tmp = g_markup_escape_text (command_name, -1);
- g_string_append_printf (output, \t\t\t\tname%s/name\n, tmp);
- g_free (tmp);
-
- tmp = g_markup_escape_text (command, -1);
- g_string_append_printf (output, \t\t\t\texec%s/exec\n, tmp);
- g_free (tmp);
-
- g_string_append (output, \t\t\t/command\n);
-}
-#endif
-
/*
* Public methods
*/
@@ -750,7 +699,6 @@ clipman_actions_match_with_menu (ClipmanActions *actions,
mi = gtk_separator_menu_item_new ();
gtk_container_add (GTK_CONTAINER (actions-priv-menu), mi);
-#if GLIB_CHECK_VERSION (2,16,0)
{
GHashTableIter iter;
gpointer key, value;
@@ -765,10 +713,6 @@ clipman_actions_match_with_menu (ClipmanActions *actions,
g_signal_connect (mi, activate, G_CALLBACK
(cb_entry_activated), NULL);
}
}
-#else
- g_object_set_data (G_OBJECT (actions-priv-menu), regex,
entry-regex);
- g_hash_table_foreach (entry-commands,
(GHFunc)__foreach_command_create_mi, actions-priv-menu);
-#endif
mi = gtk_separator_menu_item_new ();
gtk_container_add (GTK_CONTAINER (actions-priv-menu), mi);
@@ -864,7 +808,6 @@ clipman_actions_save (ClipmanActions *actions)
g_string_append (output, \t\tcommands\n);
-#if GLIB_CHECK_VERSION (2,16,0)
{
GHashTableIter iter;
gpointer key, value;
@@ -884,9 +827,6 @@ clipman_actions_save (ClipmanActions *actions)
g_string_append (output, \t\t\t/command\n);
}
}
-#else
- g_hash_table_foreach (entry-commands,
(GHFunc)__foreach_command_write_xml, output);
-#endif
g_string_append (output, \t\t/commands\n);
diff --git a/panel-plugin/main-panel-plugin.c b/panel-plugin/main-panel-plugin.c
index d5cfb77..98ea080 100644
--- a/panel-plugin/main-panel-plugin.c
+++ b/panel-plugin/main-panel-plugin.c
@@ -67,9 +67,7 @@ panel_plugin_register (XfcePanelPlugin *panel_plugin)
/* Panel Plugin */
plugin-panel_plugin = panel_plugin;
-#if GTK_CHECK_VERSION (2,12,0)
gtk_widget_set_tooltip_text (GTK_WIDGET (panel_plugin), _(Clipman));
-#endif
/* Panel Button */
plugin-button = xfce_create_panel_toggle_button ();
diff --git
[Xfce4-commits] xfce4-clipman-plugin:master Remove Glade package requirement from autoconf script
Updating branch refs/heads/master to d97d667412dc240909891b98b69e7c8ff89bd6c5 (commit) from 9c3e50458e90eed6c6ce1edda384f398ea7a50db (commit) commit d97d667412dc240909891b98b69e7c8ff89bd6c5 Author: Mike Massonnet mmasson...@xfce.org Date: Wed Oct 19 11:01:51 2011 +0200 Remove Glade package requirement from autoconf script configure.ac.in |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 93adc1c..647b46d 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -59,7 +59,6 @@ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0]) XDT_CHECK_PACKAGE([GDKX], [gdk-x11-2.0], [2.14.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) -XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master collector: Check instance types of GtkClipboard (bug 6323)
Updating branch refs/heads/master
to a21833e6eb4e942d6eec5b52efb8309d2f42c048 (commit)
from 6167c3a5bae9dfcce3710127ae28d14b66e02f46 (commit)
commit a21833e6eb4e942d6eec5b52efb8309d2f42c048
Author: Mike Massonnet mmasson...@xfce.org
Date: Wed Oct 19 22:01:39 2011 +0200
collector: Check instance types of GtkClipboard (bug 6323)
panel-plugin/collector.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/collector.c b/panel-plugin/collector.c
index a2705d0..10aa7b5 100644
--- a/panel-plugin/collector.c
+++ b/panel-plugin/collector.c
@@ -93,6 +93,8 @@ cb_clipboard_owner_change (ClipmanCollector *collector,
gchar *text;
GdkPixbuf *image;
+ g_return_if_fail (GTK_IS_CLIPBOARD (collector-priv-default_clipboard)
GTK_IS_CLIPBOARD (collector-priv-primary_clipboard));
+
/* Jump over if collector is inhibited */
if (collector-priv-inhibit)
{
@@ -151,6 +153,8 @@ cb_check_primary_clipboard (ClipmanCollector *collector)
GdkModifierType state;
gchar *text;
+ g_return_if_fail (GTK_IS_CLIPBOARD (collector-priv-default_clipboard)
GTK_IS_CLIPBOARD (collector-priv-primary_clipboard));
+
/* Postpone until the selection is done */
gdk_window_get_pointer (NULL, NULL, NULL, state);
if (state (GDK_BUTTON1_MASK|GDK_SHIFT_MASK))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master Replace gdk_spawn against g_spawn
Updating branch refs/heads/master
to 5b38c4ee7b44682949b11f5ba3dcb4da6c98624a (commit)
from a21833e6eb4e942d6eec5b52efb8309d2f42c048 (commit)
commit 5b38c4ee7b44682949b11f5ba3dcb4da6c98624a
Author: Mike Massonnet mmasson...@xfce.org
Date: Thu Oct 20 00:20:31 2011 +0200
Replace gdk_spawn against g_spawn
panel-plugin/actions.c|3 ++-
panel-plugin/plugin.c |2 +-
panel-plugin/xfce4-clipman-settings.c |7 ++-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/panel-plugin/actions.c b/panel-plugin/actions.c
index 06da812..a01fb35 100644
--- a/panel-plugin/actions.c
+++ b/panel-plugin/actions.c
@@ -350,7 +350,8 @@ cb_entry_activated (GtkMenuItem *mi,
DBG (Execute command `%s', real_command);
- if (!gdk_spawn_command_line_on_screen (NULL, real_command, error))
+ g_spawn_command_line_async (real_command, error);
+ if (error != NULL)
{
xfce_dialog_show_error (NULL, error, _(Unable to execute the command
\%s\\n\n%s), real_command, error-message);
g_error_free (error);
diff --git a/panel-plugin/plugin.c b/panel-plugin/plugin.c
index 64132e1..12c9d4d 100644
--- a/panel-plugin/plugin.c
+++ b/panel-plugin/plugin.c
@@ -349,7 +349,7 @@ plugin_configure (MyPlugin *plugin)
GError *error = NULL;
GtkWidget *error_dialog;
- gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
xfce4-clipman-settings, error);
+ g_spawn_command_line_async (xfce4-clipman-settings, error);
if (error != NULL)
{
error_dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
diff --git a/panel-plugin/xfce4-clipman-settings.c
b/panel-plugin/xfce4-clipman-settings.c
index a9958c9..d796d57 100644
--- a/panel-plugin/xfce4-clipman-settings.c
+++ b/panel-plugin/xfce4-clipman-settings.c
@@ -165,7 +165,6 @@ prop_dialog_run (void)
static void
cb_show_help (GtkButton *button)
{
- GdkScreen *screen;
gchar *locale = NULL;
gchar *offset;
gchar *filename = NULL;
@@ -213,15 +212,13 @@ cb_show_help (GtkButton *button)
filename = g_strdup (file://DATAROOTDIR/xfce4/doc/C/PACKAGE.html);
#endif
- screen = gtk_widget_get_screen (GTK_WIDGET (button));
-
command = g_strdup_printf (exo-open --launch WebBrowser %s, filename);
- if (gdk_spawn_command_line_on_screen (screen, command, NULL))
+ if (g_spawn_command_line_async (command, NULL))
goto out;
g_free (command);
command = g_strdup_printf (firefox %s, filename);
- if (gdk_spawn_command_line_on_screen (screen, command, NULL))
+ if (g_spawn_command_line_async (command, NULL))
goto out;
xfce_dialog_show_error (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET
(button))),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master actions: show the actions menu only once for the same text (bug 6633)
Updating branch refs/heads/master
to 9a64642cb20b220a21f033cac551c81793175a7a (commit)
from 5b38c4ee7b44682949b11f5ba3dcb4da6c98624a (commit)
commit 9a64642cb20b220a21f033cac551c81793175a7a
Author: Mike Massonnet mmasson...@xfce.org
Date: Thu Oct 20 11:24:08 2011 +0200
actions: show the actions menu only once for the same text (bug 6633)
panel-plugin/collector.c |9 +++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/collector.c b/panel-plugin/collector.c
index 10aa7b5..256f274 100644
--- a/panel-plugin/collector.c
+++ b/panel-plugin/collector.c
@@ -152,6 +152,7 @@ cb_check_primary_clipboard (ClipmanCollector *collector)
{
GdkModifierType state;
gchar *text;
+ static gchar *prev_text = NULL;
g_return_if_fail (GTK_IS_CLIPBOARD (collector-priv-default_clipboard)
GTK_IS_CLIPBOARD (collector-priv-primary_clipboard));
@@ -177,8 +178,12 @@ cb_check_primary_clipboard (ClipmanCollector *collector)
gtk_clipboard_set_text (collector-priv-default_clipboard, text,
-1);
/* Match for actions */
- if (collector-priv-enable_actions)
-clipman_actions_match_with_menu (collector-priv-actions,
ACTION_GROUP_SELECTION, text);
+ if (collector-priv-enable_actions g_strcmp0 (text, prev_text))
+{
+ clipman_actions_match_with_menu (collector-priv-actions,
ACTION_GROUP_SELECTION, text);
+ g_free (prev_text);
+ prev_text = g_strdup (text);
+}
}
g_free (text);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master New feature paste-on-activate
Updating branch refs/heads/master
to 6167c3a5bae9dfcce3710127ae28d14b66e02f46 (commit)
from d97d667412dc240909891b98b69e7c8ff89bd6c5 (commit)
commit 6167c3a5bae9dfcce3710127ae28d14b66e02f46
Author: Mike Massonnet mmasson...@xfce.org
Date: Wed Oct 19 19:39:09 2011 +0200
New feature paste-on-activate
There is a new property in the ClipmanMenu class paste-on-activate that
is bound to the xfconf property /tweaks/paste-on-activate. This new
property gives the possibility to paste a content that has been selected
in the history.
Currently the default value is off, there are two possible values to
paste the content with Ctrl+V or Shift+Insert.
panel-plugin/Makefile.am |4 ++
panel-plugin/collector.c |1 -
panel-plugin/common.h|7 +++
panel-plugin/menu.c | 102 +++---
panel-plugin/plugin.c|2 +
5 files changed, 109 insertions(+), 7 deletions(-)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 88fef2d..75c354b 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -95,6 +95,7 @@ xfce4_clipman_CFLAGS =
\
@GIO_CFLAGS@\
@EXO_CFLAGS@\
@LIBX11_CFLAGS@ \
+ @LIBXTST_CFLAGS@\
@GDKX_CFLAGS@ \
@GTK_CFLAGS@\
@LIBXFCE4UTIL_CFLAGS@ \
@@ -107,6 +108,7 @@ xfce4_clipman_LDADD =
\
@GIO_LIBS@ \
@EXO_LIBS@ \
@LIBX11_LIBS@ \
+ @LIBXTST_LIBS@ \
@GDKX_LIBS@ \
@GTK_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
@@ -136,6 +138,7 @@ xfce4_clipman_plugin_CFLAGS =
\
@GIO_CFLAGS@\
@EXO_CFLAGS@\
@LIBX11_CFLAGS@ \
+ @LIBXTST_CFLAGS@\
@GDKX_CFLAGS@ \
@GTK_CFLAGS@\
@LIBXFCE4UTIL_CFLAGS@ \
@@ -149,6 +152,7 @@ xfce4_clipman_plugin_LDADD =
\
@GIO_LIBS@ \
@EXO_LIBS@ \
@LIBX11_LIBS@ \
+ @LIBXTST_LIBS@ \
@GDKX_LIBS@ \
@GTK_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
diff --git a/panel-plugin/collector.c b/panel-plugin/collector.c
index e758cfa..a2705d0 100644
--- a/panel-plugin/collector.c
+++ b/panel-plugin/collector.c
@@ -22,7 +22,6 @@
#include gtk/gtk.h
#include libxfce4util/libxfce4util.h
-#include xfconf/xfconf.h
#include common.h
#include actions.h
diff --git a/panel-plugin/common.h b/panel-plugin/common.h
index 633f019..76fa9c5 100644
--- a/panel-plugin/common.h
+++ b/panel-plugin/common.h
@@ -34,6 +34,13 @@
#define DEFAULT_ENABLE_ACTIONS FALSE
/*
+ * Modes for paste-on-activate
+ */
+#define PASTE_INACTIVE 0
+#define PASTE_CTRL_V1
+#define PASTE_SHIFT_INS 2
+
+/*
* Selection for the popup command
*/
diff --git a/panel-plugin/menu.c b/panel-plugin/menu.c
index 0b0596f..1d11593 100644
--- a/panel-plugin/menu.c
+++ b/panel-plugin/menu.c
@@ -24,6 +24,13 @@
#include libxfce4ui/libxfce4ui.h
#include libxfce4util/libxfce4util.h
+#ifdef HAVE_LIBXTST
+#include X11/Xlib.h
+#include X11/extensions/XTest.h
+#include X11/keysym.h
+#endif
+
+#include common.h
#include collector.h
#include history.h
@@ -44,12 +51,18 @@ struct _ClipmanMenuPrivate
ClipmanHistory *history;
GSList *list;
gboolean reverse_order;
+#ifdef HAVE_LIBXTST
+ guint paste_on_activate;
+#endif
};
enum
{
REVERSE_ORDER = 1,
INHIBIT_MENU_ITEM,
[Xfce4-commits] xfce4-clipman-plugin:master Add optional build dependency for XTEST extension
Updating branch refs/heads/master
to c239358133414d0207ec38403755fc07c853655a (commit)
from aaeab388d4c53ca6133ad1f96144a9e286953423 (commit)
commit c239358133414d0207ec38403755fc07c853655a
Author: Mike Massonnet mmasson...@xfce.org
Date: Wed Oct 19 10:30:39 2011 +0200
Add optional build dependency for XTEST extension
Include a test program that uses XTestFakeKeyEvent() to emulate Shift+Insert
in order to paste content, works also for Ctrl+v.
XTEST extension will be optional until an option is included in the settings
dialog, then it will be a hard-dependency.
configure.ac.in | 12 +++-
tests/Makefile.am |6 ++-
tests/test_xfakekey.c | 77 +
3 files changed, 92 insertions(+), 3 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 72d3fec..93adc1c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -65,6 +65,16 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
+dnl
+dnl *** Check for xtst (XTEST extension) ***
+dnl
+XDT_CHECK_OPTIONAL_PACKAGE([LIBXTST], [xtst], [1.0.0])
+if test x$LIBXTST_FOUND = xyes; then
+ enable_libxtst=yes
+else
+ enable_libxtst=no
+fi
+
dnl ***
dnl *** Check for libunique ***
dnl ***
@@ -164,6 +174,6 @@ echo
echo Build Configuration:
echo
echo * Debug Support:$enable_debug
+echo * XTEST extension: $enable_libxtst
echo * Unique: $enable_unique
echo
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 96c9589..b63eb2d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES =
\
-DLOCALEDIR=\$(localedir)\\
$(NULL)
-check_PROGRAMS = test-actions test-daemon test-targets
+check_PROGRAMS = test-actions test-daemon test-targets test-xfakekey
test_actions_SOURCES = test_actions.c ../panel-plugin/actions.c
../panel-plugin/actions.h ../panel-plugin/common.h
test_actions_CFLAGS = @GTK_CFLAGS@ @EXO_CFLAGS@ @LIBXFCE4UTIL_CFLAGS@
@LIBXFCE4UI_CFLAGS@
test_actions_LDADD = @GTK_LIBS@ @EXO_LIBS@ @LIBXFCE4UTIL_LIBS@
@LIBXFCE4UI_LIBS@
@@ -19,4 +19,6 @@ test_daemon_LDADD = $(top_builddir)/daemon/libdaemon.la
@GTK_LIBS@
test_targets_SOURCES = test_targets.c
test_targets_CFLAGS = @GTK_CFLAGS@
test_targets_LDADD = @GTK_LIBS@
-
+test_xfakekey_SOURCES = test_xfakekey.c
+test_xfakekey_CFLAGS = @GTK_CFLAGS@ @LIBX11_CFLAGS@ @LIBXTST_CFLAGS@
+test_xfakekey_LDADD = @GTK_LIBS@ @LIBX11_LIBS@ @LIBXTST_LIBS@
diff --git a/tests/test_xfakekey.c b/tests/test_xfakekey.c
new file mode 100644
index 000..6891804
--- /dev/null
+++ b/tests/test_xfakekey.c
@@ -0,0 +1,77 @@
+#include config.h
+#ifdef HAVE_LIBXTST
+#include X11/Xlib.h
+#include X11/extensions/XTest.h
+#include X11/keysym.h
+#include stdio.h
+
+int main () {
+Display *display = XOpenDisplay (NULL);
+int dummyi;
+if (display == NULL)
+return 1;
+printf (XTest: %d\n, XQueryExtension (display, XTEST, dummyi,
dummyi, dummyi));
+
+int ret = -1;
+KeySym key_sym;
+KeyCode key_code;
+key_sym = XStringToKeysym (1);
+key_code = XKeysymToKeycode (display, key_sym);
+XTestFakeKeyEvent (display, key_code, True, CurrentTime);
+ret = XTestFakeKeyEvent (display, key_code, False, CurrentTime);
+key_sym = XStringToKeysym (2);
+key_code = XKeysymToKeycode (display, key_sym);
+XTestFakeKeyEvent (display, key_code, True, CurrentTime);
+ret = XTestFakeKeyEvent (display, key_code, False, CurrentTime);
+key_sym = XStringToKeysym (3);
+key_code = XKeysymToKeycode (display, key_sym);
+XTestFakeKeyEvent (display, key_code, True, CurrentTime);
+ret = XTestFakeKeyEvent (display, key_code, False, CurrentTime);
+key_sym = XK_Return;
+key_code = XKeysymToKeycode (display, key_sym);
+XTestFakeKeyEvent (display, key_code, True, CurrentTime);
+ret = XTestFakeKeyEvent (display, key_code, False, CurrentTime);
+
+printf (XTestFakeKeyEvent: %d\n, ret);
+
+/*key_sym = XK_Control_L;
+key_code = XKeysymToKeycode (display, key_sym);
+XTestFakeKeyEvent (display, key_code, True, CurrentTime);
+key_sym = XK_v;
+key_code = XKeysymToKeycode (display, key_sym);
+XTestFakeKeyEvent (display, key_code, True, CurrentTime);
+ret = XTestFakeKeyEvent (display, key_code, False, CurrentTime);
+key_sym = XK_Control_L;
+key_code = XKeysymToKeycode (display, key_sym);
+ret = XTestFakeKeyEvent (display, key_code, False, CurrentTime);
+
+
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to a4e7dd070dc0b39f482029c4c1be30b2136bafe8 (commit) from 280df128dc45d1c5d148da550260fc0ee21fb2e9 (commit) commit a4e7dd070dc0b39f482029c4c1be30b2136bafe8 Author: Mike Massonnet mmasson...@gmail.com Date: Thu Oct 20 12:11:10 2011 +0200 l10n: Updated French (fr) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index b168429..8ec7eb6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the xfce4-clipman-plugin package. # Maximilian Schleiss maximil...@xfce.org, 2006. # Mike Massonnet mmasson...@xfce.org, 2009. -# +# msgid msgstr Project-Id-Version: xfce4-clipman-plugin 0.8.0\n @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2009-12-12 19:14+0100\n Last-Translator: Mike Massonnet mmasson...@xfce.org\n Language-Team: French xfce-i...@xfce.org\n -Language: fr\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: fr\n Plural-Forms: nplurals=1; plural=0;\n #: ../xfce4-clipman-plugin.desktop.in.h:1 @@ -185,7 +185,7 @@ msgstr Expression régulière #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr Ordre inversé #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated German (de) translation to 91%
Updating branch refs/heads/master to 169a9e831574d533e1e984566e671f6dae930545 (commit) from a4e7dd070dc0b39f482029c4c1be30b2136bafe8 (commit) commit 169a9e831574d533e1e984566e671f6dae930545 Author: Johannes Lips johannes.l...@googlemail.com Date: Thu Oct 20 12:14:37 2011 +0200 l10n: Updated German (de) translation to 91% New status: 45 messages complete with 4 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 126ca90..b146919 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ # Enrico Tröger enrico.troe...@uvena.de, 2006. # Fabian Nowak timyst...@arcor.de, 2007, 2009. # Simon Schneider si...@schneiderimtal.de, 2009 -# +# msgid msgstr Project-Id-Version: xfce4-clipman-plugin 0.8.0\n @@ -13,10 +13,10 @@ msgstr PO-Revision-Date: 2009-07-04 07:43+0200\n Last-Translator: Fabian Nowak timyst...@arcor.de\n Language-Team: German xfce-i...@xfce.org\n -Language: de\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: de\n Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../xfce4-clipman-plugin.desktop.in.h:1 @@ -189,8 +189,9 @@ msgid Regular expression msgstr Regulärer Ausdruck #: ../panel-plugin/settings-dialog.ui.h:23 +#, fuzzy msgid Reverse order -msgstr +msgstr Umgekehrte Reihenfolge #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 47b218ff9e845aae5ddfa6605869c96dc22b79f0 (commit) from 169a9e831574d533e1e984566e671f6dae930545 (commit) commit 47b218ff9e845aae5ddfa6605869c96dc22b79f0 Author: Per Kongstad p_kongs...@op.pl Date: Thu Oct 20 12:25:58 2011 +0200 l10n: Updated Danish (da) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 13 + 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/po/da.po b/po/da.po index 31ffb73..8dd93bd 100644 --- a/po/da.po +++ b/po/da.po @@ -11,13 +11,13 @@ msgstr PO-Revision-Date: 2009-12-12 20:21+0100\n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Danish da...@dansk-gruppen.dk\n -Language: da\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: da\n X-Poedit-Language: Danish\n -X-Poedit-Country: DENMARK\n X-Poedit-SourceCharset: utf-8\n +X-Poedit-Country: DENMARK\n #: ../xfce4-clipman-plugin.desktop.in.h:1 #: ../panel-plugin/xfce4-clipman-plugin.desktop.in.in.h:1 @@ -130,7 +130,6 @@ msgid General msgstr Generel #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu msgstr Hvis afkrydset, vil denne indstilling gendanne historikken ved enhver ny @@ -191,7 +190,7 @@ msgstr Regulært udtryk #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr Omvendt rækkefølge #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -202,9 +201,8 @@ msgid Size of the _history: msgstr Størrelse af _historikken: #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr Gem et _billede +msgstr Gem sideste kopierede _billede #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -247,9 +245,8 @@ msgid Clipboard is empty msgstr Udklipsholder er tomt #: ../panel-plugin/menu.c:372 -#, fuzzy msgid _Disable -msgstr _Slå til +msgstr _Slå fra #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-indicator-plugin:master fix some {gtk, GLib}-critical messages
Updating branch refs/heads/master
to 33523445089c67717ffae6f86eb21c4cb0a8eea1 (commit)
from f2c6cacb157070e7ccef1f31115ebf0317cd3285 (commit)
commit 33523445089c67717ffae6f86eb21c4cb0a8eea1
Author: Mark Trompell m...@foresightlinux.org
Date: Thu Oct 20 12:32:27 2011 +0200
fix some {gtk,GLib}-critical messages
panel-plugin/indicator.c | 16
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index ca591c6..1809b2c 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -130,7 +130,7 @@ indicator_new (XfcePanelPlugin *plugin)
/* Init some theme/icon stuff */
gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
INDICATOR_ICONS_DIR);
- gtk_widget_set_name(GTK_WIDGET (indicator), indicator-plugin);
+ /*gtk_widget_set_name(GTK_WIDGET (indicator-plugin), indicator-plugin);*/
indicator-buttonbox = gtk_hbox_new(FALSE,0);
gtk_widget_set_can_focus(GTK_WIDGET(indicator-buttonbox), TRUE);
@@ -157,8 +157,8 @@ indicator_new (XfcePanelPlugin *plugin)
const gchar * name;
guint i, length;
gboolean match = FALSE;
-
-length = g_strv_length (indicator-excluded_modules);
+
+length = (indicator-excluded_modules != NULL) ? g_strv_length
(indicator-excluded_modules) : 0;
while ((name = g_dir_read_name(dir)) != NULL) {
for (i = 0; i length; ++i) {
if (match = (g_strcmp0 (name, indicator-excluded_modules[i]) == 0))
@@ -181,7 +181,9 @@ indicator_new (XfcePanelPlugin *plugin)
indicator-item = xfce_create_panel_button();
gtk_button_set_label(GTK_BUTTON(indicator-item), _(No Indicators));
gtk_container_add (GTK_CONTAINER (plugin), indicator-item);
-gtk_widget_show(indicator-item);
+gtk_widget_show(indicator-item);
+/* show the panel's right-click menu on this menu */
+xfce_panel_plugin_add_action_widget (plugin, indicator-item);
} else {
indicator-ebox = gtk_event_box_new();
gtk_widget_set_can_focus(GTK_WIDGET(indicator-ebox), TRUE);
@@ -189,6 +191,8 @@ indicator_new (XfcePanelPlugin *plugin)
gtk_container_add (GTK_CONTAINER (plugin), GTK_WIDGET(indicator-ebox));
gtk_widget_show(GTK_WIDGET(indicator-buttonbox));
gtk_widget_show(GTK_WIDGET(indicator-ebox));
+/* show the panel's right-click menu on this menu */
+xfce_panel_plugin_add_action_widget (plugin, indicator-ebox);
}
return indicator;
}
@@ -282,10 +286,6 @@ indicator_construct (XfcePanelPlugin *plugin)
/* create the plugin */
indicator = indicator_new (plugin);
- /* show the panel's right-click menu on this menu */
- xfce_panel_plugin_add_action_widget (plugin, indicator-ebox);
- xfce_panel_plugin_add_action_widget (plugin, indicator-item);
-
/* connect plugin signals */
g_signal_connect (G_OBJECT (plugin), free-data,
G_CALLBACK (indicator_free), indicator);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Galician (gl) translation to 100%
Updating branch refs/heads/master to 3bc3bb4935b92386b7ba7a51491f21f96304cf7d (commit) from 47b218ff9e845aae5ddfa6605869c96dc22b79f0 (commit) commit 3bc3bb4935b92386b7ba7a51491f21f96304cf7d Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Oct 20 12:34:25 2011 +0200 l10n: Updated Galician (gl) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po | 17 +++-- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/po/gl.po b/po/gl.po index 54f2a85..4ef95df 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,12 +1,12 @@ # Galician translation of xfce4-clipman-plugin # Copyright (C) 2008-2009 Leandro Regueiro # This file is distributed under the same license as the xfce package. -# +# # Leandro Regueiro leandro.regue...@gmail.com, 2008, 2009. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en http://trasno.net -# +# msgid msgstr Project-Id-Version: PACKAGE VERSION\n @@ -15,10 +15,10 @@ msgstr PO-Revision-Date: 2009-12-18 17:56+0100\n Last-Translator: Leandro Regueiro leandro.regue...@gmail.com\n Language-Team: Galician proxe...@trasno.net\n -Language: gl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: gl\n Plural-Forms: nplurals=2; plural=(n!=1);\n #: ../xfce4-clipman-plugin.desktop.in.h:1 @@ -131,7 +131,6 @@ msgid General msgstr Xeral #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu msgstr Se está marcado, esta opción restablecerá o historial en cada vez que se @@ -189,7 +188,7 @@ msgstr Expresión regular #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr Inverter a orde #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -200,9 +199,8 @@ msgid Size of the _history: msgstr Tamaño do _historial: #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr Almacenar unha _imaxe +msgstr Almacenar a última _imaxe copiada #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -245,9 +243,8 @@ msgid Clipboard is empty msgstr O portarretallos está baleiro #: ../panel-plugin/menu.c:372 -#, fuzzy msgid _Disable -msgstr _Activar +msgstr _Desactivar #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:xfce-4.8 l10n: Updated Galician (gl) translation to 100%
Updating branch refs/heads/xfce-4.8 to dc68b00ef397521a29d04509514aa3caec4a635f (commit) from e9f66bd89099030f2c6a705d759a7dc8842c3fb5 (commit) commit dc68b00ef397521a29d04509514aa3caec4a635f Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Oct 20 12:35:17 2011 +0200 l10n: Updated Galician (gl) translation to 100% New status: 679 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po | 173 ++ 1 files changed, 84 insertions(+), 89 deletions(-) diff --git a/po/gl.po b/po/gl.po index a8ab26e..5d9b932 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,25 +1,25 @@ # Galician translation of thunar # Copyright (C) 2008-2009 Leandro Regueiro # This file is distributed under the same license as the xfce package. -# +# # Iván Seoane Pardo talivan.i...@gmail.com, 2006. # Leandro Regueiro leandro.regue...@gmail.com, 2008, 2009. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en http://trasno.net -# +# msgid msgstr Project-Id-Version: Thunar 0.9.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-05-26 23:58+0200\n +POT-Creation-Date: 2011-10-20 10:17+\n PO-Revision-Date: 2010-10-19 18:14+0100\n Last-Translator: Leandro Regueiro leandro.regue...@gmail.com\n Language-Team: Galician proxe...@trasno.net\n -Language: gl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: gl\n Plural-Forms: nplurals=2; plural=(n!=1);\n #: ../thunar/main.c:62 @@ -141,7 +141,7 @@ msgstr Non se puido iniciar a operación #: ../thunar/thunar-application.c:1040 ../thunar/thunar-application.c:1166 #: ../thunar/thunar-launcher.c:1065 ../thunar/thunar-location-entry.c:394 #: ../thunar/thunar-location-entry.c:422 -#: ../thunar/thunar-shortcuts-view.c:1277 ../thunar/thunar-window.c:1507 +#: ../thunar/thunar-shortcuts-view.c:1277 ../thunar/thunar-window.c:1508 #, c-format msgid Failed to open \%s\ msgstr Non se puido abrir «%s» @@ -522,7 +522,7 @@ msgstr _Expandir automaticamente as columnas cando sexa necesario #. tell the user that we're unable to determine the file info #: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:682 #: ../thunar/thunar-list-model.c:710 -#: ../thunar/thunar-permissions-chooser.c:240 ../thunar/thunar-util.c:269 +#: ../thunar/thunar-permissions-chooser.c:240 ../thunar/thunar-util.c:271 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:458 #: ../plugins/thunar-apr/thunar-apr-image-page.c:285 #: ../plugins/thunar-apr/thunar-apr-image-page.c:286 @@ -697,9 +697,8 @@ msgstr Desexa substituír o cartafol existente msgid ReplaceDialogPart1|Do you want to replace the existing file msgstr Desexa substituír o ficheiro existente -#. #. Fourth box (size, volume, free space) -#. +#. #: ../thunar/thunar-dialogs.c:651 ../thunar/thunar-dialogs.c:682 #: ../thunar/thunar-properties-dialog.c:408 msgid Size: @@ -780,9 +779,8 @@ msgstr Nome msgid Owner msgstr Dono -#. #. Permissions chooser -#. +#. #: ../thunar/thunar-enum-types.c:121 ../thunar/thunar-properties-dialog.c:481 msgid Permissions msgstr Permisos @@ -803,32 +801,32 @@ msgstr Ficheiro msgid File Name msgstr Nome de ficheiro -#: ../thunar/thunar-file.c:867 ../thunar/thunar-shortcuts-view.c:279 +#: ../thunar/thunar-file.c:870 ../thunar/thunar-shortcuts-view.c:279 #: ../thunar/thunar-window.c:312 msgid File System msgstr Sistema de ficheiros -#: ../thunar/thunar-file.c:946 +#: ../thunar/thunar-file.c:949 #, c-format msgid The root folder has no parent msgstr O cartafol raíz non ten cartafol superior -#: ../thunar/thunar-file.c:1009 ../thunar/thunar-file.c:1278 +#: ../thunar/thunar-file.c:1012 ../thunar/thunar-file.c:1281 #, c-format msgid Failed to parse the desktop file: %s msgstr Produciuse un erro ao analizar o ficheiro desktop: %s -#: ../thunar/thunar-file.c:1047 +#: ../thunar/thunar-file.c:1050 #, c-format msgid No Exec field specified msgstr Campo Exec non especificado -#: ../thunar/thunar-file.c:1068 +#: ../thunar/thunar-file.c:1071 #, c-format msgid No URL field specified msgstr Campo URL non especificado -#: ../thunar/thunar-file.c:1074 +#: ../thunar/thunar-file.c:1077 #, c-format msgid Invalid desktop file msgstr O ficheiro desktop non é válido @@ -1172,10 +1170,12 @@ msgstr \%s\ montable msgid \%s\ (%s) %s msgstr «%s» (%s) %s -#. TRANSLATORS: Try to come up with a short translation of Original Path (which is the path -#. * where the trashed file/folder was located before it was moved to the trash), otherwise the +#. TRANSLATORS: Try to come up with a short translation of Original Path +#. (which is the path +#. * where the trashed file/folder was located before it was moved to the +#. trash), otherwise the #. * properties dialog width will be messed
[Xfce4-commits] garcon:master l10n: Updated Galician (gl) translation to 100%
Updating branch refs/heads/master to 210460ecd4f45b7f4c6dc69c57807d15242bfffa (commit) from 8e95f081954a520cb5920cc52b570af2e2b5ce70 (commit) commit 210460ecd4f45b7f4c6dc69c57807d15242bfffa Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Oct 20 12:35:58 2011 +0200 l10n: Updated Galician (gl) translation to 100% New status: 27 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po | 44 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/po/gl.po b/po/gl.po index 8c35d26..e35bf56 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,24 +1,24 @@ # Galician translation of garcon # Copyright (C) 2008, 2009 Leandro Regueiro # This file is distributed under the same license as the xfce package. -# +# # Leandro Regueiro leandro.regue...@gmail.com, 2008, 2009. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en http://trasno.net -# +# msgid msgstr Project-Id-Version: Transifex master\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 14:36+0100\n +POT-Creation-Date: 2011-10-20 10:03+\n PO-Revision-Date: 2010-10-19 18:01+0100\n Last-Translator: Leandro Regueiro leandro.regue...@gmail.com\n Language-Team: Galician proxe...@trasno.net\n -Language: gl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: gl\n Plural-Forms: nplurals=2; plural=(n!=1);\n #: ../data/xfce/xfce-accessories.directory.in.h:1 @@ -70,12 +70,12 @@ msgid Multimedia msgstr Multimedia #: ../data/xfce/xfce-network.directory.in.h:1 -msgid Network -msgstr Rede +msgid Applications for Internet access +msgstr Aplicativos para acceder á Internet #: ../data/xfce/xfce-network.directory.in.h:2 -msgid Network applications and utilities -msgstr Utilidades e aplicativos para as redes +msgid Internet +msgstr Internet #: ../data/xfce/xfce-office.directory.in.h:1 msgid Office @@ -93,14 +93,6 @@ msgstr Aplicativos que non entran en outras categorías msgid Other msgstr Outro -#: ../data/xfce/xfce-science.directory.in.h:1 -msgid Science -msgstr Ciencia - -#: ../data/xfce/xfce-science.directory.in.h:2 -msgid Scientific software -msgstr Software científico - #: ../data/xfce/xfce-screensavers.directory.in.h:1 msgid Screensaver applets msgstr Miniaplicativos de protectores de pantalla @@ -125,21 +117,33 @@ msgstr Sistema msgid System tools and utilities msgstr Utilidades e ferramentas do sistema -#: ../garcon/garcon-menu.c:698 +#: ../garcon/garcon-menu.c:706 #, c-format msgid File \%s\ not found msgstr Non se atopou o ficheiro \%s\ -#: ../garcon/garcon-menu-parser.c:278 +#: ../garcon/garcon-menu-parser.c:280 #, c-format msgid Could not load menu file data from %s: %s msgstr Non foi posible cargar os datos do ficheiro de menú %s: %s -#: ../garcon/garcon-menu-parser.c:284 +#: ../garcon/garcon-menu-parser.c:287 #, c-format msgid Could not load menu file data from %s msgstr Non foi posible cargar os datos do ficheiro de menú dende %s +#~ msgid Network +#~ msgstr Rede + +#~ msgid Network applications and utilities +#~ msgstr Utilidades e aplicativos para as redes + +#~ msgid Science +#~ msgstr Ciencia + +#~ msgid Scientific software +#~ msgstr Software científico + #~ msgid No suitable application menu file found #~ msgstr Non se atopou ningún ficheiro de menú de aplicativo axeitado ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 08bcea7a305b2c7f0fc620d4c9787f962b34cee0 (commit) from 3bc3bb4935b92386b7ba7a51491f21f96304cf7d (commit) commit 08bcea7a305b2c7f0fc620d4c9787f962b34cee0 Author: Bauzhan Muftakhidinov baurthefi...@gmail.com Date: Thu Oct 20 12:58:13 2011 +0200 l10n: Updated Kazakh (kk) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 14 ++ 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/po/kk.po b/po/kk.po index 3c3e759..40ba2bb 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,7 +2,7 @@ # Copyright (C) 2010 Xfce team # This file is distributed under the same license as the Xfce package. # Baurzhan Muftakhidinov baurthefi...@gmail.com, 2010. -# +# msgid msgstr Project-Id-Version: master\n @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2010-08-13 15:07+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n -Language: kk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: kk\n Plural-Forms: nplurals=2; plural= (n != 1);\n X-Poedit-Language: Kazakh\n X-Poedit-Country: KAZAKHSTAN\n @@ -128,9 +128,8 @@ msgid General msgstr Жалпы #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu -msgstr Таңдалған болса, әр Xfce сессиясында тарих қалпына келтіріледі +msgstr Белгіленген болса, мәзірде тарих кері ретте көрсетіледі #: ../panel-plugin/settings-dialog.ui.h:14 msgid @@ -181,7 +180,7 @@ msgstr Тұрақты өрнек #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr Кері ретпен #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -192,9 +191,8 @@ msgid Size of the _history: msgstr Тар_их өлшемі: #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr Суре_тті сақтау +msgstr Соңғы көшірілген суре_тті сақтау #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -237,7 +235,7 @@ msgstr Алмасу буфері бос #: ../panel-plugin/menu.c:372 msgid _Disable -msgstr +msgstr Сө_ндіру #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to a7c1d310ff55266b9cd0863f365649d7688f75ca (commit) from 08bcea7a305b2c7f0fc620d4c9787f962b34cee0 (commit) commit a7c1d310ff55266b9cd0863f365649d7688f75ca Author: Sergio Marques smarque...@gmail.com Date: Thu Oct 20 12:59:26 2011 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 26 -- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/po/pt.po b/po/pt.po index 966519b..fc979b1 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,7 +2,7 @@ # Copyright (C) 2005-2009 THE Xfce development team. # This file is distributed under the same license as the xfce4-clipman-plugin package. # Nuno Miguel nu...@netcabo.pt, 2007, 2008, 2009. -# +# msgid msgstr Project-Id-Version: xfce4-clipman-plugin\n @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2009-12-14 15:56+0100\n Last-Translator: Nuno Miguel nu...@netcabo.pt\n Language-Team: \n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../xfce4-clipman-plugin.desktop.in.h:1 #: ../panel-plugin/xfce4-clipman-plugin.desktop.in.in.h:1 @@ -70,7 +70,7 @@ msgstr bRepor acções/b #: ../panel-plugin/xfce4-clipman-settings.c:458 msgid Are you sure you want to reset the actions to the system default values? -msgstr Tem certeza que pretende repor as acções para as omissão do sistema? +msgstr Tem certeza que pretende repor as acções para as omissões do sistema? #: ../panel-plugin/settings-dialog.ui.h:1 msgid bAction/b @@ -125,7 +125,6 @@ msgid General msgstr Geral #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu msgstr Se activa, esta opção irá restaurar o histórico em cada nova sessão do Xfce @@ -178,11 +177,11 @@ msgstr Padrão: #: ../panel-plugin/settings-dialog.ui.h:22 msgid Regular expression -msgstr Expressão regular +msgstr Expressão normal #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr Ordem inversa #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -190,12 +189,11 @@ msgstr Gravar ao sai_r #: ../panel-plugin/settings-dialog.ui.h:25 msgid Size of the _history: -msgstr Tamanho do _histórico: +msgstr Dimensão do _histórico: #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr Armazenar uma _imagem +msgstr Guardar última _imagem copiada #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -230,24 +228,24 @@ msgstr #: ../panel-plugin/menu.c:198 msgid Are you sure you want to clear the history? -msgstr Tem certeza que pretende limpar o histórico? +msgstr Tem certeza de que pretende apagar o histórico? #. Insert empty menu item #: ../panel-plugin/menu.c:283 msgid Clipboard is empty -msgstr Área de transferência vazia +msgstr A área de transferência está vazia #: ../panel-plugin/menu.c:372 msgid _Disable -msgstr +msgstr _Desactivar #: ../panel-plugin/plugin.c:319 msgid Contributors: -msgstr Colaboradores: +msgstr Contributos: #: ../panel-plugin/plugin.c:333 msgid Clipboard Manager for Xfce -msgstr Gestor de área de transferência para Xfce +msgstr Gestor de área de transferência do Xfce #: ../panel-plugin/plugin.c:342 msgid translator-credits ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Basque (eu) translation to 100%
Updating branch refs/heads/master to f3c595f7c7a1655c6368640f4f8473a44803dd53 (commit) from a7c1d310ff55266b9cd0863f365649d7688f75ca (commit) commit f3c595f7c7a1655c6368640f4f8473a44803dd53 Author: Piarres Beobide p...@beobide.net Date: Thu Oct 20 13:07:24 2011 +0200 l10n: Updated Basque (eu) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/eu.po | 12 +--- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/po/eu.po b/po/eu.po index e00540a..40c564e 100644 --- a/po/eu.po +++ b/po/eu.po @@ -2,7 +2,7 @@ # Basque translation of the xfce4-clipman-plugin package. # Copyright (C) 2005-2007 The Xfce development team. # This file is distributed under the same license as the xfce4-clipman-plugin package. -# +# # Piarres Beobide p...@beobide.net, 2006, 2009. msgid msgstr @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2009-04-18 12:27+0200\n Last-Translator: Piarres Beobide p...@beobide.net\n Language-Team: Euskara debian-l10n-bas...@lists.debian.org\n -Language: eu\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: eu\n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Generator: KBabel 1.11.4\n @@ -129,7 +129,6 @@ msgid General msgstr Orokorra #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu msgstr Hautatuaz historia garbitu egingo da xfce saioa abiarazten den bakoitzean @@ -184,7 +183,7 @@ msgstr Espresio erregularra #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr Alderantzizko ordena #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -195,9 +194,8 @@ msgid Size of the _history: msgstr _Historiaren tamaina: #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr Gorde _irudia +msgstr Gorde azken kopiaturiko _irudia #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -241,7 +239,7 @@ msgstr Arbela hutsa dago #: ../panel-plugin/menu.c:372 msgid _Disable -msgstr +msgstr _Desgaitu #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-appfinder:master l10n: Updated Basque (eu) translation to 97%
Updating branch refs/heads/master to 3c9ba0efddbe6f771971c9d1400a8dc07a5a8391 (commit) from cf5f350207009591f343864a635b7eaaad1c0d6c (commit) commit 3c9ba0efddbe6f771971c9d1400a8dc07a5a8391 Author: Piarres Beobide p...@beobide.net Date: Thu Oct 20 13:30:27 2011 +0200 l10n: Updated Basque (eu) translation to 97% New status: 43 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/eu.po | 54 +- 1 files changed, 25 insertions(+), 29 deletions(-) diff --git a/po/eu.po b/po/eu.po index d3d77a9..a537f50 100644 --- a/po/eu.po +++ b/po/eu.po @@ -2,20 +2,20 @@ # Euskara translations for xfce4-appfinder package. # Copyright (C) 2004-2005 Eduard Roccatello. # This file is distributed under the same license as the xfce4-appfinder package. -# +# # Piarres Beobide Egaña p...@beobide.net, 2004, 2005, 2008, 2009. msgid msgstr Project-Id-Version: eu\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-09-21 20:43+0200\n +POT-Creation-Date: 2011-10-20 10:06+\n PO-Revision-Date: 2009-10-21 13:53+0200\n Last-Translator: Piarres Beobide p...@beobide.net\n Language-Team: Basque debian-l10n...@debian.lists.org\n -Language: eu\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: eu\n Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n X-Generator: Lokalize 1.0\n @@ -49,24 +49,24 @@ msgstr Komando historia #: ../src/appfinder-preferences.c:175 msgid C_lear -msgstr +msgstr Ga_rbitu #: ../src/appfinder-preferences.c:176 msgid This will permanently clear the custom command history. -msgstr +msgstr Honek pertsonalizatutako komando historia betirako ezabatuko du. #: ../src/appfinder-preferences.c:177 msgid Are you sure you want to clear the command history? -msgstr +msgstr Ziur zaude komando historia ezabatu nahi duzula? #: ../src/appfinder-preferences.c:287 msgid The custom action will be deleted permanently. -msgstr +msgstr Ekintza pertsonalizatua betirako ezabatuko da. #: ../src/appfinder-preferences.c:288 #, c-format msgid Are you sure you want to delete pattern \%s\? -msgstr +msgstr Ziur zaude \%s\ patroia ezabatu nahi duzula? #: ../src/appfinder-window.c:183 ../src/main.c:344 #: ../src/appfinder-preferences.glade.h:3 @@ -79,9 +79,8 @@ msgid Toggle view mode msgstr Txandakatu ikuste modua #: ../src/main.c:70 -#, fuzzy msgid Start in collapsed mode -msgstr Abiatu irekitako moduan +msgstr Abiatu bildutako moduan #: ../src/main.c:71 msgid Print version information and exit @@ -124,38 +123,35 @@ msgstr Erroreen berri eman %s-ra. #: ../src/appfinder-preferences.glade.h:1 msgid Add a new custom action. -msgstr +msgstr Gehitu ekintza pertsonalizatua. #: ../src/appfinder-preferences.glade.h:2 msgid Always c_enter the window -msgstr +msgstr Beti _erdiratu leihoa #: ../src/appfinder-preferences.glade.h:4 msgid Behaviour -msgstr +msgstr Poramoldea #: ../src/appfinder-preferences.glade.h:5 -#, fuzzy msgid C_lear Custom Command History -msgstr Komando historia +msgstr Ga_rbitu pertsonalizatutako komando historia #: ../src/appfinder-preferences.glade.h:6 msgid Center the window on startup. -msgstr +msgstr Erdiratu leihoa abioan. #: ../src/appfinder-preferences.glade.h:7 -#, fuzzy msgid Co_mmand: -msgstr Komandoa +msgstr Ko_mandoa: #: ../src/appfinder-preferences.glade.h:8 msgid Custom _Actions -msgstr +msgstr Ekintz_a pertsonalizatuak #: ../src/appfinder-preferences.glade.h:9 -#, fuzzy msgid History -msgstr Komando historia +msgstr Historia #: ../src/appfinder-preferences.glade.h:11 #, no-c-format @@ -167,35 +163,35 @@ msgstr #: ../src/appfinder-preferences.glade.h:12 msgid Patte_rn: -msgstr +msgstr Pat_roia: #: ../src/appfinder-preferences.glade.h:13 msgid Pattern -msgstr +msgstr Patroia #: ../src/appfinder-preferences.glade.h:14 msgid Prefix -msgstr +msgstr Aurrizkia #: ../src/appfinder-preferences.glade.h:15 msgid Regular Expression -msgstr +msgstr Espresio erregularra #: ../src/appfinder-preferences.glade.h:16 msgid Remember last _selected category -msgstr +msgstr Gogoratu azken _hautatutako kategoria #: ../src/appfinder-preferences.glade.h:17 msgid Remove the currently selected action. -msgstr +msgstr Ezabatu hautatuko ekintza. #: ../src/appfinder-preferences.glade.h:18 msgid _General -msgstr +msgstr _Orokorra #: ../src/appfinder-preferences.glade.h:19 msgid _Type: -msgstr +msgstr Mo_ta: #: ../data/xfce4-appfinder.desktop.in.h:2 msgid Find and launch applications installed on your system ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-appfinder:master l10n: Updated Basque (eu) translation to 100%
Updating branch refs/heads/master to 282f649bc3166382ddf96864b0527be6689cd023 (commit) from 3c9ba0efddbe6f771971c9d1400a8dc07a5a8391 (commit) commit 282f649bc3166382ddf96864b0527be6689cd023 Author: Piarres Beobide p...@beobide.net Date: Thu Oct 20 13:32:30 2011 +0200 l10n: Updated Basque (eu) translation to 100% New status: 44 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/eu.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/eu.po b/po/eu.po index a537f50..013927a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -159,7 +159,7 @@ msgid If the type is set to prefix, %s will be replaced with the string after the pattern, %S with the complete entry text. For regular expressions you can use \\0 and \\num. -msgstr +msgstr Mota aurrizkira ezartzen bada, %s patroiaren ondoko kateaz ordeztuko da, %S testu sarrera osoarekin. Espresio erregularrentzat \\0 eta \\zenb erabili ditzakezu. #: ../src/appfinder-preferences.glade.h:12 msgid Patte_rn: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 70ac1056db3077ee09e5afc5829495b0f5f77029 (commit) from f3c595f7c7a1655c6368640f4f8473a44803dd53 (commit) commit 70ac1056db3077ee09e5afc5829495b0f5f77029 Author: Cristian Marchi cri.pe...@gmail.com Date: Thu Oct 20 14:34:48 2011 +0200 l10n: Updated Italian (it) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 16 +++- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/po/it.po b/po/it.po index 7d45338..6403d82 100644 --- a/po/it.po +++ b/po/it.po @@ -2,13 +2,13 @@ # Copyright (C) 2009 THE CLIPMAN PLUGIN'S COPYRIGHT HOLDER # This file is distributed under the same license as the CLIPMAN PLUGIN package. # Gianluca Foddis gianluca.fod...@gmail.com, Cristian Marchi cri.pe...@gmail.com, 2009. -# , fuzzy +#, fuzzy # GLOSSARIO # clipboard = appunti # history = cronologia # regex = espressione regolare # pattern = schema -# +# msgid msgstr Project-Id-Version: CLIPMAN PLUGIN TRUNK\n @@ -17,10 +17,10 @@ msgstr PO-Revision-Date: 2009-12-13 10:44+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n Language-Team: Italian Translation Team xfce-it-translators@googlegroups.\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../xfce4-clipman-plugin.desktop.in.h:1 #: ../panel-plugin/xfce4-clipman-plugin.desktop.in.in.h:1 @@ -131,7 +131,6 @@ msgid General msgstr Generale #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu msgstr Se abilitata, questa opzione ripristinerà la cronologia a ogni nuova @@ -175,7 +174,7 @@ msgstr #: ../panel-plugin/settings-dialog.ui.h:19 msgid Ignore s_elections -msgstr Ignora _selezioni +msgstr I_gnora selezioni #: ../panel-plugin/settings-dialog.ui.h:20 msgid Name: @@ -192,7 +191,7 @@ msgstr Espressione regolare #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr Inverti ordine #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -203,9 +202,8 @@ msgid Size of the _history: msgstr Dimensione della _cronologia: #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr Memorizza un'_immagine +msgstr Memorizza l'ultima i_mmagine copiata #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -249,7 +247,7 @@ msgstr Gli appunti sono vuoti #: ../panel-plugin/menu.c:372 msgid _Disable -msgstr +msgstr _Disabilita #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Slovak (sk) translation to 100%
Updating branch refs/heads/master to 98d4af572d82493f149dc4c784fa698a6a86320c (commit) from 70ac1056db3077ee09e5afc5829495b0f5f77029 (commit) commit 98d4af572d82493f149dc4c784fa698a6a86320c Author: Tomáš Vadina kyber...@gmail.com Date: Thu Oct 20 14:45:02 2011 +0200 l10n: Updated Slovak (sk) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sk.po | 14 ++ 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/po/sk.po b/po/sk.po index 695e99d..ee7f684 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the xfce4-clipman-plugin package. # Robert Hartl hartl.rob...@gmail.com, 2009, 2010. # Tomáš Vadina kyber...@gmail.com, 2011. -# +# msgid msgstr Project-Id-Version: 1.1.0\n @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2011-10-07 11:41+0200\n Last-Translator: Tomáš Vadina kyber...@gmail.com\n Language-Team: Slovak sk-i...@lists.linux.sk\n -Language: sk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: sk\n Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n=2 n=4) ? 2 : 0;\n #: ../xfce4-clipman-plugin.desktop.in.h:1 @@ -127,9 +127,8 @@ msgid General msgstr Všeobecné #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu -msgstr Ak je zapnuté, história bude obnovená pri každom novom sedení Xfce +msgstr Ak je zaškrtnuté, tak bude v ponuke zobrazené obrátené poradie histórie #: ../panel-plugin/settings-dialog.ui.h:14 msgid @@ -179,7 +178,7 @@ msgstr Regulárne výrazy #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr Obrátené poradie #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -190,9 +189,8 @@ msgid Size of the _history: msgstr Veľkosť _histórie: #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr Uložiť _obrázok +msgstr Uložiť naposledy kopírovaný _obrázok #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -236,7 +234,7 @@ msgstr Schránka je prázdna #: ../panel-plugin/menu.c:372 msgid _Disable -msgstr +msgstr _Zakázať #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 5ed1d75864f1ef7ee42fbcdf648c537002b6fe6f (commit) from 98d4af572d82493f149dc4c784fa698a6a86320c (commit) commit 5ed1d75864f1ef7ee42fbcdf648c537002b6fe6f Author: Aleksandr Ponomarenko davian...@gmail.com Date: Thu Oct 20 14:46:14 2011 +0200 l10n: Updated Russian (ru) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 14 ++ 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index 483daf3..c7e338b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR EMAIL@ADDRESS, YEAR. -# +# msgid msgstr Project-Id-Version: xfce4-clipman-plugin\n @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2009-11-28 01:37+0600\n Last-Translator: Urmas dwqwt3...@sneakemail.com\n Language-Team: Russian xfce-i18n...@xfce.org\n -Language: ru\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: ru\n X-Poedit-Language: Russian\n X-Poedit-Country: RUSSIAN FEDERATION\n @@ -127,9 +127,8 @@ msgid General msgstr Основные настройки #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu -msgstr Хранить журнал между сессиями Xfce +msgstr Показывать содержимое журнала в обратном порядке #: ../panel-plugin/settings-dialog.ui.h:14 msgid @@ -176,7 +175,7 @@ msgstr Регулярное выражение #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr В обратном порядке #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -187,9 +186,8 @@ msgid Size of the _history: msgstr Размер _журнала: #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr Хранить _изображение +msgstr Хранить последнее _изображение #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -232,7 +230,7 @@ msgstr Буфер обмена пуст #: ../panel-plugin/menu.c:372 msgid _Disable -msgstr +msgstr Отклю_чить #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to a29090cf9e754d90c79d8a55ec328abf2704868c (commit) from 5ed1d75864f1ef7ee42fbcdf648c537002b6fe6f (commit) commit a29090cf9e754d90c79d8a55ec328abf2704868c Author: Pjotr Anon pliniusmi...@gmail.com Date: Thu Oct 20 14:51:03 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 14 ++ 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/po/nl.po b/po/nl.po index e4cf98d..09c0360 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,10 +1,10 @@ # Dutch translation of the xfce4-clipman-plugin package. # Copyright (C) The Xfce development team. -# This file is distributed under the same license as the +# This file is distributed under the same license as the # xfce4-clipman-plugin package. # Vincent Tunru proje...@vinnl.nl # Pjotr, 2011. -# +# msgid msgstr Project-Id-Version: xfce4-clipman-plugin\n @@ -13,10 +13,10 @@ msgstr PO-Revision-Date: 2011-06-15 10:28+0200\n Last-Translator: Pjotr\n Language-Team: \n -Language: nl (Dutch)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: nl (Dutch)\n Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../xfce4-clipman-plugin.desktop.in.h:1 @@ -128,7 +128,6 @@ msgid General msgstr Algemeen #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu msgstr De optie biedt de mogelijkheid de geschiedenis te herstellen bij elke nieuwe @@ -188,7 +187,7 @@ msgstr Reguliere uitdrukking #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr Keer de volgorde om #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -199,9 +198,8 @@ msgid Size of the _history: msgstr Grootte van de _geschiedenis #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr _Afbeelding opslaan +msgstr Laatst gekopieerde afbeelding opslaan #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -245,7 +243,7 @@ msgstr Klembord is leeg #: ../panel-plugin/menu.c:372 msgid _Disable -msgstr +msgstr Uitschakelen #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to c5dfb9c81161eb1bb7553e31eb56160459a776f8 (commit) from a29090cf9e754d90c79d8a55ec328abf2704868c (commit) commit c5dfb9c81161eb1bb7553e31eb56160459a776f8 Author: Masato Hashimoto hash...@xfce.org Date: Thu Oct 20 15:45:43 2011 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 13 + 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/po/ja.po b/po/ja.po index 25c4be5..291b06c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the xfce4-clipman-plugin package. # Daichi Kawahata dai...@xfce.org, 2006. # Nobuhiro Iwamatsu iwama...@nigauri.org, 2008. -# +# msgid msgstr Project-Id-Version: xfce4-clipman-plugin 0.8.0\n @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2009-12-19 22:36+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese xfce-users...@ml.fdiary.net\n -Language: ja\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: ja\n Plural-Forms: nplurals=1; plural=0;\n #: ../xfce4-clipman-plugin.desktop.in.h:1 @@ -128,7 +128,6 @@ msgid General msgstr 一般 #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu msgstr チェックマークをつけると、新しい Xfce セッション開始時に履歴が復元されます @@ -184,7 +183,7 @@ msgstr 正規表現 #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr 表示順を逆にする #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -195,9 +194,8 @@ msgid Size of the _history: msgstr 履歴のサイズ(_H): #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr 画像を格納する(_I) +msgstr 最後にコピーした画像を格納する(_I) #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -239,9 +237,8 @@ msgid Clipboard is empty msgstr クリップボードは空です #: ../panel-plugin/menu.c:372 -#, fuzzy msgid _Disable -msgstr 有効(_E) +msgstr 無効(_D) #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master Creating branch xfce4-clipman-plugin-master
Updating branch refs/heads/xfce4-clipman-plugin-master as new branch to fcbc5c88aa422b27c1896bf7acebd3be9c40a81a (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/xfce4-clipman-plugin-master for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master Import xfce4-clipman-plugin documentation
Updating branch refs/heads/xfce4-clipman-plugin-master to fcbc5c88aa422b27c1896bf7acebd3be9c40a81a (commit) from fcbc5c88aa422b27c1896bf7acebd3be9c40a81a^1 () ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-radio-plugin:master l10n: Updated French (fr) translation to 97%
Updating branch refs/heads/master to 597e38c50551eb210d4ffe19131cbd41610dbcba (commit) from 09d91359089056c3fa0997fd503d0d6215898fae (commit) commit 597e38c50551eb210d4ffe19131cbd41610dbcba Author: Mario Gervais gervais.ma...@ymail.com Date: Thu Oct 20 18:28:10 2011 +0200 l10n: Updated French (fr) translation to 97% New status: 33 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 48 1 files changed, 20 insertions(+), 28 deletions(-) diff --git a/po/fr.po b/po/fr.po index 8a1bd24..045c972 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,33 +14,33 @@ msgstr MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: fr\n #: ../panel-plugin/radio.desktop.in.in.h:1 msgid Radio Plugin -msgstr +msgstr Greffon Radio #: ../panel-plugin/radio.desktop.in.in.h:2 msgid V4l radio plugin -msgstr +msgstr Greffon Radio V4I #: ../panel-plugin/xfce4-radio.c:191 #, c-format msgid Tuned to station %s -msgstr +msgstr Syntonisé à la station %s #: ../panel-plugin/xfce4-radio.c:196 #, c-format msgid Tuned to %s MHz -msgstr +msgstr Syntonisé à %s MHz #: ../panel-plugin/xfce4-radio.c:241 msgid - off - msgstr - off - #: ../panel-plugin/xfce4-radio.c:248 -#, fuzzy msgid Radio is off -msgstr Quand la radio est éteinte +msgstr La radio est éteinte #: ../panel-plugin/xfce4-radio.c:321 msgid Error opening radio device @@ -73,11 +73,11 @@ msgstr anonyme #: ../panel-plugin/xfce4-radio.c:1001 msgid Select command -msgstr +msgstr Commande de sélection #: ../panel-plugin/xfce4-radio.c:1058 msgid Radio -msgstr +msgstr Radio #: ../panel-plugin/xfce4-radio.c:1067 msgid Configure the radio plugin @@ -88,9 +88,8 @@ msgid User interface msgstr Interface utilisateur #: ../panel-plugin/xfce4-radio.c:1162 -#, fuzzy msgid Radio device -msgstr Périphérique V4L +msgstr Périphérique radio #: ../panel-plugin/xfce4-radio.c:1163 msgid Commands @@ -98,37 +97,34 @@ msgstr Commandes #. - Signal strength #: ../panel-plugin/xfce4-radio.c:1185 -#, fuzzy msgid Signal strength -msgstr Afficher la puissance du signal +msgstr Puissance du signal #: ../panel-plugin/xfce4-radio.c:1201 -#, fuzzy msgid Show the signal strength indicator -msgstr Afficher la puissance du signal +msgstr Afficher l'indicateur de puissance du signal #: ../panel-plugin/xfce4-radio.c:1207 msgid Use graphics instead of text labels and progress bars -msgstr +msgstr Utiliser des graphiques au lieu d'étiquettes texte et des barres de progression #. - Current station #: ../panel-plugin/xfce4-radio.c:1212 msgid Current station -msgstr +msgstr Station actuelle #: ../panel-plugin/xfce4-radio.c:1228 msgid Show the current station -msgstr +msgstr Afficher la station actuelle #: ../panel-plugin/xfce4-radio.c:1234 -#, fuzzy msgid Show preset names instead of frequencies -msgstr Afficher le nom du préréglage dans l'étiquette +msgstr Afficher les noms préréglés au lieu des fréquences #. - Mouse #: ../panel-plugin/xfce4-radio.c:1239 msgid Mouse interaction -msgstr +msgstr Interaction de la souris #: ../panel-plugin/xfce4-radio.c:1255 msgid Mouse scrolling changes @@ -139,14 +135,12 @@ msgid frequency msgstr fréquence #: ../panel-plugin/xfce4-radio.c:1277 -#, fuzzy msgid station preset -msgstr Effacer la fréquence active +msgstr Préréglage de station #: ../panel-plugin/xfce4-radio.c:1298 -#, fuzzy msgid Radio device: -msgstr Périphérique V4L +msgstr Périphérique radio #: ../panel-plugin/xfce4-radio.c:1312 msgid Synchronize state with the card @@ -160,14 +154,12 @@ msgid msgstr #: ../panel-plugin/xfce4-radio.c:1351 -#, fuzzy msgid Command to run after startup -msgstr Exécuter après le démarrage +msgstr Commande pour exécution après le démarrage #: ../panel-plugin/xfce4-radio.c:1385 -#, fuzzy msgid Command to run after shutdown -msgstr Exécuter après extinction +msgstr Commande pour exécution après l'arrêt #~ msgid Properties #~ msgstr Propriétés ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to 5cda3553629afa3428a0c3ac448005966612d477 (commit) from c5ec49dec91935cff336d123a024baf1b1f70e92 (commit) commit 5cda3553629afa3428a0c3ac448005966612d477 Author: Mario Gervais gervais.ma...@ymail.com Date: Thu Oct 20 18:30:51 2011 +0200 l10n: Updated French (fr) translation to 100% New status: 19 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 32 ++-- 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5886c4a..fc82a69 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,24 +2,35 @@ # Copyright (C) 2006 THE xfce4-genmon-plugin'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-genmon-plugin package. # Julien Devemy jujuc...@gmail.com, 2006. -# +# msgid msgstr Project-Id-Version: xfce4-genmon-plugin 2.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-09-10 21:29+0200\n +POT-Creation-Date: 2011-10-20 16:04+\n PO-Revision-Date: 2006-08-26 22:36+0100\n Last-Translator: Julien Devemy jujuc...@gmail.com\n Language-Team: French translation-team...@lists.sourceforge.net\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: fr\n + +#: ../panel-plugin/cmdspawn.c:174 +#, c-format +msgid Error in command \%s\ +msgstr Erreur dans la commande \%s\ + +#: ../panel-plugin/cmdspawn.c:177 ../panel-plugin/main.c:105 +msgid Xfce Panel +msgstr Panneau Xfce #: ../panel-plugin/config_gui.c:87 msgid About... msgstr A propos -#: ../panel-plugin/config_gui.c:103 ../panel-plugin/main.c:644 +#: ../panel-plugin/config_gui.c:103 ../panel-plugin/main.c:677 +#: ../panel-plugin/genmon.desktop.in.in.h:1 msgid Generic Monitor msgstr Moniteur Générique @@ -63,7 +74,12 @@ msgstr Presser pour changer la fonte msgid (Default font) msgstr (Fonte par defaut) -#: ../panel-plugin/main.c:569 +#: ../panel-plugin/main.c:104 +#, c-format +msgid Could not run \%s\ +msgstr Impossible d'exécuter \%s\ + +#: ../panel-plugin/main.c:602 #, c-format msgid %s %s - Generic Monitor\n @@ -80,10 +96,14 @@ msgstr (c) 2004 Roger Seguin roger_seg...@msn.com\n (c) 2006 Julien Devemy jujuc...@gmail.com -#: ../panel-plugin/main.c:587 +#: ../panel-plugin/main.c:620 msgid Font Selection msgstr Selection de la fonte -#: ../panel-plugin/main.c:632 +#: ../panel-plugin/main.c:665 msgid Configuration msgstr Configuration + +#: ../panel-plugin/genmon.desktop.in.in.h:2 +msgid Show output of a command. +msgstr Afficher la sortie d'une commande ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to 7fb5bd5fd92c4c58ad6056eee833afdd6618e3a3 (commit) from 2fc6c636bf56d1911107ab9854755eee0c392adc (commit) commit 7fb5bd5fd92c4c58ad6056eee833afdd6618e3a3 Author: Mario Gervais gervais.ma...@ymail.com Date: Thu Oct 20 18:36:32 2011 +0200 l10n: Updated French (fr) translation to 100% New status: 258 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 84 + 1 files changed, 40 insertions(+), 44 deletions(-) diff --git a/po/fr.po b/po/fr.po index ff87765..b33e453 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the xfce-weather-plugin package. # Stephane Roy s...@j2n.net, 2005. # Maximilian Schleiss maximil...@xfce.org, 2006-2007. -# +# msgid msgstr Project-Id-Version: xfce-weather-plugin 0.6.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-02-02 21:29+0100\n +POT-Creation-Date: 2011-01-14 08:46+0900\n PO-Revision-Date: 2009-07-21 08:37+0100\n Last-Translator: Colin Leroy co...@colino.net\n Language-Team: French xfce-i...@xfce.org\n -Language: fr\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: fr\n #: ../panel-plugin/weather.c:110 msgid V @@ -57,22 +57,23 @@ msgstr VV msgid WG msgstr B -#: ../panel-plugin/weather.c:260 ../panel-plugin/weather.c:760 +#: ../panel-plugin/weather.c:262 ../panel-plugin/weather.c:764 msgid Cannot update weather data msgstr Échec à la mise à jour des données météo -#: ../panel-plugin/weather.c:693 +#: ../panel-plugin/weather.c:697 #, c-format msgid Unable to open the following url: %s msgstr Échec à l'ouverture du lien : %s -#: ../panel-plugin/weather.c:721 ../panel-plugin/weather-summary.c:611 +#: ../panel-plugin/weather.c:725 ../panel-plugin/weather-summary.c:611 #: ../panel-plugin/weather.desktop.in.in.h:2 msgid Weather Update msgstr Mise-à-jour météo -#. add refresh button to right click menu, for people who missed the middle mouse click feature -#: ../panel-plugin/weather.c:843 +#. add refresh button to right click menu, for people who missed the middle +#. mouse click feature +#: ../panel-plugin/weather.c:847 msgid _Forecast msgstr _Prévision @@ -120,56 +121,56 @@ msgstr Indice UV (UV) msgid Dewpoint (DP) msgstr Point de rosée (PR) -#: ../panel-plugin/weather-config.c:239 +#: ../panel-plugin/weather-config.c:236 msgid Please enter proxy settings msgstr Veuillez entrer les paramètres du proxy -#: ../panel-plugin/weather-config.c:295 +#: ../panel-plugin/weather-config.c:289 msgid Unset msgstr Non spécifié -#: ../panel-plugin/weather-config.c:303 +#: ../panel-plugin/weather-config.c:297 msgid Detecting... msgstr Détection... -#: ../panel-plugin/weather-config.c:356 +#: ../panel-plugin/weather-config.c:350 msgid Measurement unit: msgstr Unité de mesure : -#: ../panel-plugin/weather-config.c:362 +#: ../panel-plugin/weather-config.c:356 msgid Imperial msgstr Impérial -#: ../panel-plugin/weather-config.c:364 +#: ../panel-plugin/weather-config.c:358 msgid Metric msgstr Métrique -#: ../panel-plugin/weather-config.c:379 +#: ../panel-plugin/weather-config.c:373 msgid Location: msgstr Lieu : -#: ../panel-plugin/weather-config.c:415 +#: ../panel-plugin/weather-config.c:409 msgid Change... msgstr Changer... #. proxy -#: ../panel-plugin/weather-config.c:428 +#: ../panel-plugin/weather-config.c:422 msgid Proxy server: msgstr Serveur proxy : -#: ../panel-plugin/weather-config.c:431 +#: ../panel-plugin/weather-config.c:425 msgid Use proxy server msgstr Utiliser un serveur proxy -#: ../panel-plugin/weather-config.c:433 +#: ../panel-plugin/weather-config.c:427 msgid Auto-detect from environment msgstr Détection automatique à partir de l'environnement -#: ../panel-plugin/weather-config.c:505 +#: ../panel-plugin/weather-config.c:499 msgid Labels to display msgstr Étiquettes à afficher -#: ../panel-plugin/weather-config.c:554 +#: ../panel-plugin/weather-config.c:548 msgid Animate transitions between labels msgstr Animer les transitions entre étiquettes. @@ -198,45 +199,45 @@ msgid mi msgstr mi #. display error -#: ../panel-plugin/weather-http.c:203 +#: ../panel-plugin/weather-http.c:204 #, c-format msgid Failed to get the hostname %s. Retry in %d seconds. msgstr Impossible de résoudre le nom d'hôte %s. Réessai dans %d secondes. #. display warning -#: ../panel-plugin/weather-http.c:244 +#: ../panel-plugin/weather-http.c:245 #, c-format msgid Failed to open the socket (%s). msgstr Impossible d'ouvrir la connexion (%s). #. display warning -#: ../panel-plugin/weather-http.c:255 +#: ../panel-plugin/weather-http.c:256 #, c-format msgid Failed to create a connection with the host (%s). msgstr Impossible de se connecter à l'hôte (%s). #. display warning -#:
[Xfce4-commits] midori:master Find Firefox profiles for import
Updating branch refs/heads/master
to 2e203e746b0a77b19172dbd9e122d0fb9a05fc22 (commit)
from 8521d98ed0589daa5499507dfe11b2ccc59c89ec (commit)
commit 2e203e746b0a77b19172dbd9e122d0fb9a05fc22
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Oct 20 18:19:43 2011 +0200
Find Firefox profiles for import
midori/midori-browser.c | 45 ++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index fbcfcdb..66cfcc6 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4210,6 +4210,7 @@ _action_bookmarks_import_activate (GtkAction* action,
{ .opera/bookmarks.adr, N_(Opera), opera },
{ .kde/share/apps/konqueror/bookmarks.xml, N_(Konqueror),
konqueror },
{ .gnome2/epiphany/bookmarks.rdf, N_(Epiphany), epiphany },
+{ .mozilla/firefox/*/bookmarks.html, N_(Firefox (%s)), firefox },
};
GtkWidget* dialog;
@@ -4270,14 +4271,52 @@ _action_bookmarks_import_activate (GtkAction*
action,
GTK_ICON_SIZE_MENU, icon_width, NULL);
for (i = 0; i G_N_ELEMENTS (bookmark_clients); i++)
{
-gchar* path = g_build_filename (g_get_home_dir (),
-bookmark_clients[i].path, NULL);
+const gchar* location = bookmark_clients[i].path;
+const gchar* client = bookmark_clients[i].name;
+gchar* path;
+
+/* Interpret * as 'any folder' */
+if (strchr (location, '*') != NULL)
+{
+gchar** parts = g_strsplit (location, *, 2);
+GDir* dir;
+path = g_build_filename (g_get_home_dir (), parts[0], NULL);
+if ((dir = g_dir_open (path, 0, NULL)))
+{
+const gchar* name;
+while ((name = g_dir_read_name (dir)))
+{
+gchar* file = g_build_filename (path, name, parts[1],
NULL);
+if (g_access (file, F_OK) == 0)
+{
+/* If name is XYZ.Name, we use Name only */
+gchar* real_name = strchr (name, '.');
+gchar* display = strstr (_(client), %s)
+? g_strdup_printf (_(client),
+ real_name ? real_name + 1 : name)
+: g_strdup (_(client));
+gtk_list_store_insert_with_values (model, NULL,
G_MAXINT,
+0, display, 1, bookmark_clients[i].icon,
+2, path, 3, icon_width, -1);
+g_free (display);
+}
+g_free (file);
+}
+g_dir_close (dir);
+}
+g_free (path);
+g_strfreev (parts);
+continue;
+}
+
+path = g_build_filename (g_get_home_dir (), path, NULL);
if (g_access (path, F_OK) == 0)
gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
-0, _(bookmark_clients[i].name), 1, bookmark_clients[i].icon,
+0, _(client), 1, bookmark_clients[i].icon,
2, path, 3, icon_width, -1);
g_free (path);
}
+
gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
0, _(Import from XBEL or HTML file), 1, NULL, 2, NULL, 3,
icon_width, -1);
gtk_combo_box_set_active (combobox, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Fix dialing with keyboard after some recent changes
Updating branch refs/heads/master
to 06620d014bc4201f2c11dfe0c1cf306f07f50ba7 (commit)
from 2e203e746b0a77b19172dbd9e122d0fb9a05fc22 (commit)
commit 06620d014bc4201f2c11dfe0c1cf306f07f50ba7
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Tue Oct 18 18:59:44 2011 +0200
Fix dialing with keyboard after some recent changes
data/speeddial-head.html |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/speeddial-head.html b/data/speeddial-head.html
index 27303cf..201fc9c 100644
--- a/data/speeddial-head.html
+++ b/data/speeddial-head.html
@@ -120,8 +120,8 @@
var getAction = function (id)
{
-var host =
document.getElementById(id).childNodes[0].childNodes[0].host;
-if (host)
+var s = document.getElementById(id).childNodes[0];
+if (s.className == 'preview')
return true;
var url = prompt ({enter_shortcut_address}, http://;);
@@ -169,11 +169,11 @@
if (key_id.substr(1) 9)
{
if (getAction (key_id))
-document.location = div.childNodes[0].childNodes[0].href;
+document.location = div.childNodes[0].childNodes[1].href;
key_id = 's';
}
else
-key_timeout = setTimeout ('if (getAction (key_id))
document.location =
document.getElementById(key_id).childNodes[0].childNodes[0].href; key_id =
\'s\'', 1000);
+key_timeout = setTimeout ('if (getAction (key_id))
document.location =
document.getElementById(key_id).childNodes[0].childNodes[1].href; key_id =
\'s\'', 1000);
}
else
key_id = 's';
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Re-add enter_shortcut_name placeholder in speeddial-head.html
Updating branch refs/heads/master
to a12a8e26d616901c6fba3b21726ee75e2aea9176 (commit)
from 06620d014bc4201f2c11dfe0c1cf306f07f50ba7 (commit)
commit a12a8e26d616901c6fba3b21726ee75e2aea9176
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Tue Oct 18 19:04:14 2011 +0200
Re-add enter_shortcut_name placeholder in speeddial-head.html
It is used in renaming dialog
midori/midori-view.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 448e804..eb1acc3 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3715,6 +3715,7 @@ prepare_speed_dial_html (MidoriView* view)
{title}, _(Speed Dial),
{click_to_add}, _(Click to add a shortcut),
{enter_shortcut_address}, _(Enter shortcut address),
+{enter_shortcut_name}, _(Enter shortcut title),
{are_you_sure}, _(Are you sure you want to delete this
shortcut?),
NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Merge GLib and GTK+ compatibility in gtk3-compat.h
Updating branch refs/heads/master
to 52de747198ab38ed8ce7774ea648c9b78fe37e6c (commit)
from c06fbee023798cfed102be951d2d907b4cc11b6f (commit)
commit 52de747198ab38ed8ce7774ea648c9b78fe37e6c
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Oct 20 22:46:43 2011 +0200
Merge GLib and GTK+ compatibility in gtk3-compat.h
katze/gtk3-compat.h | 72 +
katze/katze-preferences.c |4 --
katze/katze-scrolled.c| 20
katze/katze-throbber.c|7
katze/katze-utils.c |8 -
midori/sokoke.c | 39
midori/sokoke.h | 49 +--
7 files changed, 73 insertions(+), 126 deletions(-)
diff --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h
index ac774eb..c40aca2 100644
--- a/katze/gtk3-compat.h
+++ b/katze/gtk3-compat.h
@@ -4,6 +4,76 @@
#ifndef H_GTK3_COMPAT_20110110
#define H_GTK3_COMPAT_20110110
+G_BEGIN_DECLS
+
+#if !GLIB_CHECK_VERSION (2, 32, 0)
+#define G_SOURCE_REMOVE FALSE
+#define G_SOURCE_CONTINUE TRUE
+#endif
+
+#if !GLIB_CHECK_VERSION (2, 30, 0)
+#define g_format_size(sz) g_format_size_for_display ((goffset)sz)
+#endif
+
+#if !GTK_CHECK_VERSION (2, 14, 0)
+#define gtk_dialog_get_content_area(dlg) dlg-vbox
+#define gtk_dialog_get_action_area(dlg) dlg-action_area
+#define gtk_widget_get_window(wdgt) wdgt-window
+#define gtk_adjustment_get_page_size(adj) adj-page_size
+#define gtk_adjustment_get_upper(adj) adj-upper
+#define gtk_adjustment_get_lower(adj) adj-lower
+#define gtk_adjustment_get_value(adj) adj-value
+#endif
+
+#if !GTK_CHECK_VERSION (2, 16, 0)
+#define GTK_ACTIVATABLE GTK_WIDGET
+#define gtk_activatable_get_related_action gtk_widget_get_action
+#define gtk_menu_item_set_label(menuitem, label) \
+gtk_label_set_label (GTK_LABEL (GTK_BIN (menuitem)-child), \
+ label ? label : );
+#endif
+
+#if !GTK_CHECK_VERSION (2, 18, 0)
+#define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL (widget)
+#define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS (widget)
+#define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE (widget)
+#define gtk_widget_get_sensitive(widget) GTK_WIDGET_IS_SENSITIVE (widget)
+#define gtk_widget_set_can_focus(widget,flag) \
+GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS)
+#define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt-allocation
+#define gtk_widget_get_has_window(wdgt) !GTK_WIDGET_NO_WINDOW (wdgt)
+#define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt-allocation
+#define gtk_widget_set_window(wdgt, wndw) wdgt-window = wndw
+#define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE
+#define gtk_widget_get_drawable GTK_WIDGET_VISIBLE
+#define gtk_widget_set_has_window(wdgt, wnd) \
+if (wnd) GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_NO_WINDOW); \
+else GTK_WIDGET_SET_FLAGS (wdgt, GTK_NO_WINDOW)
+#endif
+
+#if !GTK_CHECK_VERSION (2, 20, 0)
+#define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED (widget)
+#define gtk_widget_set_realized(wdgt, real) \
+if (real) GTK_WIDGET_SET_FLAGS (wdgt, GTK_REALIZED); \
+else GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_REALIZED)
+#endif
+
+#if !GTK_CHECK_VERSION(2, 12, 0)
+
+void
+gtk_widget_set_has_tooltip (GtkWidget* widget,
+gboolean has_tooltip);
+
+void
+gtk_widget_set_tooltip_text(GtkWidget* widget,
+const gchar* text);
+
+void
+gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem,
+const gchar* text);
+
+#endif
+
#if !GTK_CHECK_VERSION (2, 24 ,0)
#define gtk_combo_box_text_append_text gtk_combo_box_append_text
#define gtk_combo_box_text_new gtk_combo_box_new_text
@@ -43,4 +113,6 @@
#define GDK_KEY_Return GDK_Return
#endif
+G_END_DECLS
+
#endif
diff --git a/katze/katze-preferences.c b/katze/katze-preferences.c
index c700c27..6c05f63 100644
--- a/katze/katze-preferences.c
+++ b/katze/katze-preferences.c
@@ -23,10 +23,6 @@
#include string.h
#include glib/gi18n.h
-#if !GTK_CHECK_VERSION (2, 14, 0)
-#define gtk_dialog_get_content_area(dialog) dialog-vbox
-#endif
-
struct _KatzePreferencesPrivate
{
#if HAVE_HILDON
diff --git a/katze/katze-scrolled.c b/katze/katze-scrolled.c
index d9ed5ad..4fe090b 100644
--- a/katze/katze-scrolled.c
+++ b/katze/katze-scrolled.c
@@ -18,26 +18,6 @@
#include katze-scrolled.h
#include katze-utils.h
-#if !GTK_CHECK_VERSION (2, 14, 0)
-#define gtk_adjustment_get_page_size(adj) adj-page_size
-#define gtk_adjustment_get_upper(adj) adj-upper
-#define gtk_adjustment_get_lower(adj) adj-lower
-#define gtk_adjustment_get_value(adj) adj-value
-#define gtk_widget_get_window(wdgt) wdgt-window
-#endif
-#if
[Xfce4-commits] midori:master Merge bookmark folder combo into helper functions
Updating branch refs/heads/master
to c06fbee023798cfed102be951d2d907b4cc11b6f (commit)
from a12a8e26d616901c6fba3b21726ee75e2aea9176 (commit)
commit c06fbee023798cfed102be951d2d907b4cc11b6f
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Oct 20 22:19:41 2011 +0200
Merge bookmark folder combo into helper functions
Fixes: https://bugs.launchpad.net/midori/+bug/874592
midori/midori-browser.c | 163 ---
1 files changed, 83 insertions(+), 80 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 66cfcc6..6ee7942 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -674,6 +674,67 @@ midori_view_notify_statusbar_text_cb (GtkWidget* view,
}
}
+static GtkWidget*
+midori_bookmark_folder_button_new (KatzeArray* array,
+ gboolean new_bookmark,
+ const gchar* selected)
+{
+GtkListStore* model;
+GtkWidget* combo;
+GtkCellRenderer* renderer;
+guint n;
+sqlite3* db;
+sqlite3_stmt* statement;
+gint result;
+const gchar* sqlcmd = SELECT title from bookmarks where uri='';
+
+model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
+renderer = gtk_cell_renderer_text_new ();
+gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, text,
0);
+gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer,
ellipsize, 1);
+gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
+0, _(Toplevel folder), 1, PANGO_ELLIPSIZE_END, -1);
+gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
+
+db = g_object_get_data (G_OBJECT (array), db);
+g_return_val_if_fail (db != NULL, NULL);
+n = 1;
+result = sqlite3_prepare_v2 (db, sqlcmd, -1, statement, NULL);
+while ((result = sqlite3_step (statement)) == SQLITE_ROW)
+{
+const unsigned char* name = sqlite3_column_text (statement, 0);
+gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
+0, name, 1, PANGO_ELLIPSIZE_END, -1);
+if (!new_bookmark !g_strcmp0 (selected, (gchar*)name))
+gtk_combo_box_set_active (GTK_COMBO_BOX (combo), n);
+n++;
+}
+if (n 2)
+gtk_widget_set_sensitive (combo, FALSE);
+return combo;
+}
+
+static gchar*
+midori_bookmark_folder_button_get_active (GtkWidget* combo)
+{
+gchar* selected = NULL;
+GtkTreeIter iter;
+
+g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), NULL);
+
+if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), iter))
+{
+GtkTreeModel* model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+gtk_tree_model_get (GTK_TREE_MODEL (model), iter, 0, selected, -1);
+if (g_str_equal (selected, _(Toplevel folder)))
+katze_assign (selected, g_strdup ());
+}
+
+return selected;
+}
+
static void
midori_browser_edit_bookmark_title_changed_cb (GtkEntry* entry,
GtkDialog* dialog)
@@ -802,51 +863,16 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser*
browser,
gtk_widget_show_all (hbox);
}
-combo_folder = NULL;
-if (1)
-{
-GtkListStore* model;
-GtkCellRenderer* renderer;
-guint n;
-sqlite3_stmt* statement;
-gint result;
-const gchar* sqlcmd;
-
-hbox = gtk_hbox_new (FALSE, 8);
-gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
-label = gtk_label_new_with_mnemonic (_(_Folder:));
-gtk_size_group_add_widget (sizegroup, label);
-gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-combo_folder = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
-renderer = gtk_cell_renderer_text_new ();
-gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_folder), renderer,
TRUE);
-gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_folder),
renderer, text, 0);
-gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_folder),
renderer, ellipsize, 1);
-gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
-0, _(Toplevel folder), 1, PANGO_ELLIPSIZE_END, -1);
-gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0);
-
-n = 1;
-sqlcmd = SELECT title from bookmarks where uri='';
-result = sqlite3_prepare_v2 (db, sqlcmd, -1, statement, NULL);
-while ((result = sqlite3_step (statement)) == SQLITE_ROW)
-{
-const unsigned char* name = sqlite3_column_text (statement, 0);
-gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
-0, name, 1, PANGO_ELLIPSIZE_END, -1);
[Xfce4-commits] midori:master Use gtk_combo_box_text_new_with_entry in Statusbar Features
Updating branch refs/heads/master to ee85789fc493309a50ce110388dd5ddc94b5ba46 (commit) from 52de747198ab38ed8ce7774ea648c9b78fe37e6c (commit) commit ee85789fc493309a50ce110388dd5ddc94b5ba46 Author: Christian Dywan christ...@twotoasts.de Date: Thu Oct 20 22:47:27 2011 +0200 Use gtk_combo_box_text_new_with_entry in Statusbar Features Fixes: https://bugs.launchpad.net/midori/+bug/878449 extensions/statusbar-features.c |4 ++-- katze/gtk3-compat.h |1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index b3d2c1c..a6b8acc 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -154,10 +154,10 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); button = katze_property_proxy (settings, identify-as, custom-user-agent); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); -button = gtk_combo_box_entry_new_text (); +button = gtk_combo_box_text_new_with_entry (); gtk_entry_set_width_chars (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (button))), 4); for (i = 0; i G_N_ELEMENTS (zoom_levels); i++) -gtk_combo_box_append_text (GTK_COMBO_BOX (button), zoom_levels[i].label); +gtk_combo_box_text_append_text (GTK_COMBO_BOX (button), zoom_levels[i].label); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); g_signal_connect (button, changed, G_CALLBACK (statusbar_features_zoom_level_changed_cb), browser); diff --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h index c40aca2..b1b3b10 100644 --- a/katze/gtk3-compat.h +++ b/katze/gtk3-compat.h @@ -77,6 +77,7 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, #if !GTK_CHECK_VERSION (2, 24 ,0) #define gtk_combo_box_text_append_text gtk_combo_box_append_text #define gtk_combo_box_text_new gtk_combo_box_new_text +#define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text #define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX #define GtkComboBoxText GtkComboBox ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Use find_property for has-separator in History List
Updating branch refs/heads/master
to 8f421d6cfc0b6942c1fcbc25779bf302f004c6be (commit)
from ee85789fc493309a50ce110388dd5ddc94b5ba46 (commit)
commit 8f421d6cfc0b6942c1fcbc25779bf302f004c6be
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Oct 20 23:35:37 2011 +0200
Use find_property for has-separator in History List
So we can avoid compile-time warnings.
extensions/history-list.vala |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/extensions/history-list.vala b/extensions/history-list.vala
index c3d962a..fc677a4 100644
--- a/extensions/history-list.vala
+++ b/extensions/history-list.vala
@@ -233,9 +233,8 @@ namespace HistoryList {
this.hl_manager = manager;
this.title = _(Preferences for %s).printf( _(History-List));
-#if !HAVE_GTK3
-this.has_separator = false;
-#endif
+if (this.get_class ().find_property (has-separator) != null)
+this.set (has-separator, false);
this.border_width = 5;
this.set_modal (true);
this.set_default_size (350, 100);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Use GTK_COMBO_BOX_TEXT with Statusbar Features
Updating branch refs/heads/master to b29ee13da66591fa3129015855f8957e30daa78a (commit) from 8f421d6cfc0b6942c1fcbc25779bf302f004c6be (commit) commit b29ee13da66591fa3129015855f8957e30daa78a Author: Christian Dywan christ...@twotoasts.de Date: Thu Oct 20 23:36:34 2011 +0200 Use GTK_COMBO_BOX_TEXT with Statusbar Features extensions/statusbar-features.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index a6b8acc..be47b9d 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -157,7 +157,7 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, button = gtk_combo_box_text_new_with_entry (); gtk_entry_set_width_chars (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (button))), 4); for (i = 0; i G_N_ELEMENTS (zoom_levels); i++) -gtk_combo_box_text_append_text (GTK_COMBO_BOX (button), zoom_levels[i].label); +gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (button), zoom_levels[i].label); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); g_signal_connect (button, changed, G_CALLBACK (statusbar_features_zoom_level_changed_cb), browser); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Introduce Midori.URI to unitfy all URI logic
Updating branch refs/heads/master
to 77428fe44cece896019be5ce5c6f409f21298931 (commit)
from 3f77b9f300a918a598536e22987128f8458ab054 (commit)
commit 77428fe44cece896019be5ce5c6f409f21298931
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Oct 19 09:53:18 2011 +0200
Introduce Midori.URI to unitfy all URI logic
sokoke_hostname_from_uri, sokoke_search_uri,
sokoke_hostname_to_ascii and sokoke_unescape_uri_string
are merged into Midori.URI.
midori-core.h is the official API header for Vala now.
katze/katze-utils.c| 10 +--
katze/midori-uri.vala | 126
midori/main.c |7 +-
midori/midori-browser.c| 15 ++--
midori/midori-locationaction.c |6 +-
midori/midori-searchaction.c |5 +-
midori/midori-view.c | 29 +++---
midori/midori.h|1 +
midori/sokoke.c| 206 +---
midori/sokoke.h| 16 ---
panels/midori-extensions.c |3 +-
tests/magic-uri.c |7 +-
12 files changed, 171 insertions(+), 260 deletions(-)
diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index 27366f2..687b728 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -13,6 +13,7 @@
#include katze-utils.h
#include katze-array.h
+#include midori-core.h
#include glib/gstdio.h
#include glib/gi18n.h
@@ -1518,12 +1519,7 @@ katze_uri_entry_changed_cb (GtkWidget* entry,
GtkWidget* other_widget)
{
const gchar* uri = gtk_entry_get_text (GTK_ENTRY (entry));
-gboolean valid = g_str_has_prefix (uri, http://;)
- || g_str_has_prefix (uri, https://;)
- || g_str_has_prefix (uri, file://)
- || g_str_has_prefix (uri, data:)
- || g_str_has_prefix (uri, about:)
- || g_str_has_prefix (uri, javascript:);
+gboolean valid = midori_uri_is_location (uri);
if (*uri !valid)
{
GdkColor bg_color = { 0 };
@@ -1540,7 +1536,7 @@ katze_uri_entry_changed_cb (GtkWidget* entry,
}
if (other_widget != NULL)
-gtk_widget_set_sensitive (other_widget, *uri valid);
+gtk_widget_set_sensitive (other_widget, valid);
}
/**
diff --git a/katze/midori-uri.vala b/katze/midori-uri.vala
new file mode 100644
index 000..2653fbc
--- /dev/null
+++ b/katze/midori-uri.vala
@@ -0,0 +1,126 @@
+/*
+ Copyright (C) 2011 Christian Dywan christ...@twotoasts.de
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace GLib {
+extern static string hostname_to_unicode (string hostname);
+extern static string hostname_to_ascii (string hostname);
+}
+
+namespace Midori {
+public class URI : Object {
+public static string parse (string? uri, out string path) {
+/* path may be null.
+ If there's no hostname, the original URI is returned */
+if (uri == null)
+return uri;
+unowned string? hostname = uri.chr (-1, '/');
+if (hostname == null || hostname[1] != '/')
+return uri;
+hostname = hostname.offset (2);
+if (path != null) {
+if ((path = hostname.chr (-1, '/')) != null)
+return hostname.split (/)[0];
+}
+return hostname;
+}
+public static string to_ascii (string uri) {
+/* Convert hostname to ASCII. */
+string? proto = null;
+if (uri.chr (-1, '/') != null uri.chr (-1, ':') != null)
+proto = uri.split (://)[0];
+string? path = null;
+string hostname = parse (uri, out path);
+string encoded = hostname_to_ascii (hostname);
+if (encoded != null) {
+return (proto ?? )
+ + (proto != null ? :// : )
+ + encoded + path;
+}
+return uri;
+}
+public static string unescape (string uri) {
+/* Unescape, pass through + and %20 */
+if (uri.chr (-1, '%') != null || uri.chr (-1, ' ') != null) {
+/* Preserve %20 for pasting URLs into other windows */
+string? unescaped = GLib.Uri.unescape_string (uri, +);
+if (unescaped == null)
+return uri;
+return unescaped.replace ( , %20);
+}
+return uri;
+}
+public static string format_for_display (string? uri) {
+/* Percent-decode and decode puniycode for user display */
+if (uri != null uri.has_prefix
[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to b8f022a262f3dc1226846021ae6a59558b83fa6b (commit) from c5dfb9c81161eb1bb7553e31eb56160459a776f8 (commit) commit b8f022a262f3dc1226846021ae6a59558b83fa6b Author: Hunt Xu mhun...@gmail.com Date: Fri Oct 21 02:36:01 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 49 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 15 ++- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index d451b40..6255d90 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ # the xfce4-clipman-plugin package. # Hydonsingore Cia hydonsing...@educities.edu.tw, 2006. # Hunt Xu hun...@live.cn, 2009. -# +# msgid msgstr Project-Id-Version: xfce4-clipman-plugin 0.8.1\n @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2009-12-13 20:25+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese(Simplified) xfce-i...@xfce.org\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n Plural-Forms: nplurals=1; plural=0;\n #: ../xfce4-clipman-plugin.desktop.in.h:1 @@ -127,9 +127,8 @@ msgid General msgstr 一般 #: ../panel-plugin/settings-dialog.ui.h:13 -#, fuzzy msgid If checked, reverse order of the history shown in the menu -msgstr 选中该项将在每次Xfce会话启动时恢复历史记录 +msgstr 选中该项将在菜单中将历史倒序排列 #: ../panel-plugin/settings-dialog.ui.h:14 msgid @@ -177,7 +176,7 @@ msgstr 正则表达式 #: ../panel-plugin/settings-dialog.ui.h:23 msgid Reverse order -msgstr +msgstr 倒序排列 #: ../panel-plugin/settings-dialog.ui.h:24 msgid Save on _quit @@ -188,9 +187,8 @@ msgid Size of the _history: msgstr 历史文件大小(_H): #: ../panel-plugin/settings-dialog.ui.h:26 -#, fuzzy msgid Store last copied _image -msgstr 保存一幅图像(_I) +msgstr 保存最近复制的一幅图像(_I) #: ../panel-plugin/settings-dialog.ui.h:27 msgid Sync _selections @@ -231,9 +229,8 @@ msgid Clipboard is empty msgstr 历史记录为空 #: ../panel-plugin/menu.c:372 -#, fuzzy msgid _Disable -msgstr 允许(_E) +msgstr 禁用(_D) #: ../panel-plugin/plugin.c:319 msgid Contributors: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfmpc:master l10n: Updated Chinese (China) (zh_CN) translation to 96%
Updating branch refs/heads/master to 77edf6dc929e40c230a3c10a858dc075047158e5 (commit) from 20f69ec0370314873347d65738d91b8f3fa84dc5 (commit) commit 77edf6dc929e40c230a3c10a858dc075047158e5 Author: Hunt Xu mhun...@gmail.com Date: Fri Oct 21 02:43:26 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 96% New status: 60 messages complete with 1 fuzzy and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 4da51c4..14b9a22 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Hunt Xu hun...@live.cn, 2009. -# +# msgid msgstr Project-Id-Version: xfmpc\n @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2009-12-13 20:28+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n -Language: zh_CN\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: zh_CN\n #: ../src/dbbrowser.c:863 msgid Replace @@ -44,7 +44,7 @@ msgstr 消耗 #: ../src/extended-interface.c:354 msgid _Shortcuts -msgstr +msgstr 快捷方式(_S) #: ../src/extended-interface.c:467 ../xfmpc.desktop.in.h:2 msgid MPD client written in GTK+ for Xfce @@ -115,7 +115,7 @@ msgstr Xfmpc 首选项 #: ../src/preferences-dialog.c:370 msgid Customize your MPD client -msgstr +msgstr 自定义您的 MPD 客户端 #: ../src/preferences-dialog.c:377 msgid MPD @@ -157,7 +157,7 @@ msgstr #: ../src/preferences-dialog.c:425 msgid Close window into notification area -msgstr +msgstr 当关闭窗口时，最小化至通知区域 #: ../src/preferences-dialog.c:429 msgid Show _stastusbar ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to a38d9717ad53976e7bc8cb75ea1eb5546ff7c99b (commit) from 217eb34f7bb09855dff833a0dcd4448943f8635b (commit) commit a38d9717ad53976e7bc8cb75ea1eb5546ff7c99b Author: Hunt Xu mhun...@gmail.com Date: Fri Oct 21 02:45:21 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 230 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 141 +++ 1 files changed, 103 insertions(+), 38 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 1e2cc36..27c9728 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,7 +11,7 @@ msgid msgstr Project-Id-Version: xfce4-session\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-04-30 10:11+\n +POT-Creation-Date: 2011-10-20 22:07+\n PO-Revision-Date: 2010-04-06 13:28+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese/Simplified xfce-i...@xfce.org\n @@ -20,6 +20,14 @@ msgstr Content-Transfer-Encoding: 8bit\n Language: \n +#: ../xfce.desktop.in.h:1 +msgid Use this session to run Xfce as your desktop environment +msgstr 使用这个会话将 Xfce 作为您的桌面环境 + +#: ../xfce.desktop.in.h:2 +msgid Xfce Session +msgstr Xfce 会话 + #: ../engines/balou/balou-theme.c:110 msgid No description given msgstr 未提供描述 @@ -297,7 +305,9 @@ msgid Are you sure you want to empty the session cache? msgstr 您确实要清除会话缓存吗？ #: ../settings/session-editor.c:172 -msgid The saved states of your applications will not be restored during your next login. +msgid +The saved states of your applications will not be restored during your next +login. msgstr 已保存的程序状态在您下次登录时不会恢复。 #: ../settings/session-editor.c:174 @@ -322,7 +332,9 @@ msgid Terminate Program msgstr 终止程序 #: ../settings/session-editor.c:255 -msgid The application will lose any unsaved state and will not be restarted in your next session. +msgid +The application will lose any unsaved state and will not be restarted in +your next session. msgstr 该应用程序中任何没有保存的东西都会丢失，而且您下次登入时不会启动它。 #: ../settings/session-editor.c:257 @@ -410,7 +422,10 @@ msgid Failed to open %s for writing msgstr 打开要写入的 %s 失败 #: ../settings/xfae-window.c:101 -msgid Below is the list of applications that will be started automatically when you login to your Xfce desktop, in addition to the applications that were saved when you logged out last time: +msgid +Below is the list of applications that will be started automatically when +you login to your Xfce desktop, in addition to the applications that were +saved when you logged out last time: msgstr 除了您上次退出 Xfce 桌面时保存的应用程序外，下面列出的应用程序会在您登入\n 时自动启动: @@ -425,7 +440,9 @@ msgid Failed to remove item msgstr 移除项目失败 #: ../settings/xfae-window.c:326 -msgid This will permanently remove the application from the list of automatically started applications +msgid +This will permanently remove the application from the list of automatically +started applications msgstr 这将把该应用程序从自动启动应用程序的列表中永久移除 #: ../settings/xfae-window.c:328 @@ -468,11 +485,11 @@ msgid Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d msgstr 使用 Gtk+-%d.%d.%d 进行编译，现在运行于 Gtk+-%d.%d.%d 之上 #. verify that the DNS settings are ok -#: ../xfce4-session/main.c:251 +#: ../xfce4-session/main.c:253 msgid Verifying DNS settings msgstr 正在确认 DNS 设置 -#: ../xfce4-session/main.c:254 +#: ../xfce4-session/main.c:257 msgid Loading session data msgstr 正在读取会话数据 @@ -510,7 +527,9 @@ msgid bAn error occurred/b msgstr b出现一个错误/b #: ../xfce4-session/shutdown.c:714 -msgid Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account. +msgid +Either the password you entered is invalid, or the system administrator +disallows shutting down this computer with your user account. msgstr 您所输入的密码不正确，或者系统管理员不允许您的帐户关闭该计算机。 #: ../xfce4-session/shutdown.c:833 ../xfce4-session/xfsm-manager.c:1122 @@ -527,7 +546,9 @@ msgid Last accessed: %s msgstr 最后访问: %s #: ../xfce4-session/xfsm-chooser.c:172 -msgid Choose the session you want to restore. You can simply double-click the session name to restore it. +msgid +Choose the session you want to restore. You can simply double-click the +session name to restore it. msgstr 选择您希望恢复的会话。您可以简单地双击会话名称来选择。 #. Logout button @@ -587,15 +608,20 @@ msgstr 重试 #: ../xfce4-session/xfsm-manager.c:604 #, c-format -msgid Unable to determine failsafe session name. Possible causes: xfconfd isn't running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set incorrectly (must include \%s\), or xfce4-session is installed incorrectly. +msgid +Unable to determine failsafe session name. Possible causes: xfconfd isn't +running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set +incorrectly (must include \%s\), or xfce4-session is installed incorrectly. msgstr 无法确定应急会话的名称。可能的原因有:
[Xfce4-commits] midori:master Use CSS style fixup to tweak tab size with GTK+ 3
Updating branch refs/heads/master
to b360541552c543827844095428301782ed1d43f8 (commit)
from c2af8376eb53c73c67afbae6e116bc6fb5e66e67 (commit)
commit b360541552c543827844095428301782ed1d43f8
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Oct 21 02:40:19 2011 +0200
Use CSS style fixup to tweak tab size with GTK+ 3
For consistency, an analogous GtkRc snippet is used with GTK+ 2.
Based on a patch by Lucas Baudin.
Fixes: https://bugs.launchpad.net/midori/+bug/871085
midori/midori-view.c | 46 ++
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 73b35d4..8d94a6e 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4443,6 +4443,7 @@ midori_view_tab_close_clicked (GtkWidget* tab_close,
gtk_widget_destroy (widget);
}
+#if !GTK_CHECK_VERSION (3, 0, 0)
static void
midori_view_tab_icon_style_set_cb (GtkWidget* tab_close,
GtkStyle* previous_style)
@@ -4451,6 +4452,7 @@ midori_view_tab_icon_style_set_cb (GtkWidget* tab_close,
gtk_widget_size_request (gtk_bin_get_child (GTK_BIN (tab_close)), size);
gtk_widget_set_size_request (tab_close, size.width, size.height);
}
+#endif
static void
midori_view_update_tab_title (GtkWidget* label,
@@ -4625,7 +4627,28 @@ midori_view_get_proxy_tab_label (MidoriView* view)
{
GtkWidget* event_box;
GtkWidget* hbox;
-GtkRcStyle* rcstyle;
+static const gchar style_fixup[] =
+#if GTK_CHECK_VERSION (3, 0, 0)
+* {\n
+-GtkButton-default-border : 0;\n
+-GtkButton-default-outside-border : 0;\n
+-GtkButton-inner-border: 0;\n
+-GtkWidget-focus-line-width : 0;\n
+-GtkWidget-focus-padding : 0;\n
+padding: 0;\n
+};
+GtkStyleContext* context;
+GtkCssProvider* css_provider;
+#else
+style \midori-close-button-style\\n
+{\n
+GtkWidget::focus-padding = 0\n
+GtkWidget::focus-line-width = 0\n
+xthickness = 0\n
+ythickness = 0\n
+}\n
+widget \*.midori-close-button\ style \midori-close-button-style\;
+#endif
GtkWidget* image;
GtkWidget* align;
@@ -4639,6 +4662,7 @@ midori_view_get_proxy_tab_label (MidoriView* view)
view-tab_title = gtk_label_new (midori_view_get_display_title (view));
gtk_misc_set_alignment (GTK_MISC (view-tab_title), 0.0, 0.5);
+gtk_misc_set_padding (GTK_MISC (view-tab_title), 0, 0);
event_box = gtk_event_box_new ();
gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
@@ -4649,13 +4673,21 @@ midori_view_get_proxy_tab_label (MidoriView* view)
view-tab_close = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (view-tab_close), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (view-tab_close), FALSE);
-rcstyle = gtk_rc_style_new ();
-rcstyle-xthickness = rcstyle-ythickness = 0;
-gtk_widget_modify_style (view-tab_close, rcstyle);
-g_object_unref (rcstyle);
+#if GTK_CHECK_VERSION (3, 0, 0)
+context = gtk_widget_get_style_context (view-tab_close);
+css_provider = gtk_css_provider_new ();
+gtk_css_provider_load_from_data (css_provider, style_fixup, -1, NULL);
+gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER
(css_provider),
+
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+#else
+gtk_rc_parse_string (style_fixup);
+gtk_widget_set_name (view-tab_close, midori-close-button);
+g_signal_connect (view-tab_close, style-set,
+G_CALLBACK (midori_view_tab_icon_style_set_cb), NULL);
+#endif
image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (view-tab_close), image);
-align = gtk_alignment_new (1.0, 0.0, 0.0, 0.0);
+align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), view-tab_close);
if (katze_object_get_boolean (view-settings, close-buttons-left))
@@ -4679,8 +4711,6 @@ midori_view_get_proxy_tab_label (MidoriView* view)
g_signal_connect (event_box, button-press-event,
G_CALLBACK (midori_view_tab_label_button_press_event), view);
-g_signal_connect (view-tab_close, style-set,
-G_CALLBACK (midori_view_tab_icon_style_set_cb), NULL);
g_signal_connect (view-tab_close, clicked,
G_CALLBACK (midori_view_tab_close_clicked), view);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Properly check versions of Vala/ WebKitGTK+ in wscript
Updating branch refs/heads/master
to 85eeb6d8d1de5f71ea1b09459d3ced1a0f20868b (commit)
from b360541552c543827844095428301782ed1d43f8 (commit)
commit 85eeb6d8d1de5f71ea1b09459d3ced1a0f20868b
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Oct 21 02:51:33 2011 +0200
Properly check versions of Vala/ WebKitGTK+ in wscript
wscript | 21 ++---
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/wscript b/wscript
index 36051a8..7ff2a29 100644
--- a/wscript
+++ b/wscript
@@ -164,6 +164,15 @@ def configure (conf):
atleast_version=version, mandatory=mandatory)
return conf.env['HAVE_' + var]
+def check_version (given_version, major, minor, micro):
+if '.' in given_version:
+given_major, given_minor, given_micro = given_version.split ('.')
+else:
+given_major, given_minor, given_micro = given_version
+return int(given_major) major or \
+ int(given_major) == major and int(given_minor) minor or \
+ int(given_major) == major and int(given_minor) == minor and
int(given_micro) = micro
+
if option_enabled ('unique') and not option_enabled('gtk3'):
check_pkg ('unique-1.0', '0.9', False)
unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1]
@@ -196,10 +205,7 @@ def configure (conf):
includes='/usr/X11R6/include', mandatory=False)
conf.check (lib='Xss', libpath='/usr/X11R6/lib', mandatory=False)
if option_enabled ('gtk3'):
-if option_enabled ('addons') and ( not ( \
- conf.env['VALAC_VERSION'] = 0 \
- and conf.env['VALAC_VERSION'][1] = 13 \
- and conf.env['VALAC_VERSION'][2] = 2)):
+if option_enabled ('addons') and not check_version
(conf.env['VALAC_VERSION'], 0, 13, 2):
Utils.pprint ('RED', 'Vala 0.13.2 or later is required ' \
'to build with GTK+ 3 and extensions.\n' \
'Pass --disable-addons to build without extensions.\n' \
@@ -211,14 +217,15 @@ def configure (conf):
Utils.pprint ('RED', 'GTK+3 was not found.\n' \
'Pass --disable-gtk3 to build without GTK+3.')
sys.exit (1)
+if check_version (conf.check_cfg (modversion='webkitgtk-3.0'), 1, 5,
1):
+check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args)
conf.env.append_value ('VALAFLAGS', '-D HAVE_GTK3')
else:
check_pkg ('gtk+-2.0', '2.10.0', var='GTK')
check_pkg ('webkit-1.0', '1.1.17', args=args)
+if check_version (conf.check_cfg (modversion='webkit-1.0'), 1, 5, 1):
+check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args)
conf.env['HAVE_GTK3'] = option_enabled ('gtk3')
-webkit_version = conf.check_cfg (modversion='webkit-1.0').split ('.')
-if int(webkit_version[0]) = 1 and int(webkit_version[1]) = 5 and
int(webkit_version[2]) = 1:
-check_pkg ('javascriptcoregtk-1.0', '1.1.17', args=args)
check_pkg ('libsoup-2.4', '2.27.90')
conf.define ('HAVE_LIBSOUP_2_25_2', 1)
conf.define ('HAVE_LIBSOUP_2_27_90', 1)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
