[Xfce4-commits] xfdesktop:eric/Port-to-GApplication Use the GApplication API
Updating branch refs/heads/eric/Port-to-GApplication to f4fa63b92f0ee07268f0af8b0bccb39a03c0e0e5 (commit) from c014cb3231259ea4ffc4477f7ce7c7531f1c5d12 (commit) commit f4fa63b92f0ee07268f0af8b0bccb39a03c0e0e5 Author: Eric Koegel eric.koe...@gmail.com Date: Sat Sep 21 09:57:11 2013 +0300 Use the GApplication API Uses the GApplication API to handle process uniqueness, message passing, and lifecycle management. This eliminates the need to check if xfdesktop is already running and using X to forward events to the running instance of xfdesktop making it eaiser to port to GTK3 in the future (as well as GTKApplication). common/xfdesktop-common.c | 47 common/xfdesktop-common.h |3 - src/Makefile.am |4 +- src/main.c | 359 + src/xfdesktop-application.c | 628 +++ src/xfdesktop-application.h | 47 6 files changed, 692 insertions(+), 396 deletions(-) diff --git a/common/xfdesktop-common.c b/common/xfdesktop-common.c index 65f0214..f97f9d6 100644 --- a/common/xfdesktop-common.c +++ b/common/xfdesktop-common.c @@ -254,53 +254,6 @@ xfdesktop_image_file_is_valid(const gchar *filename) return image_valid; } -gboolean -xfdesktop_check_is_running(Window *xid) -{ -const gchar *display = g_getenv(DISPLAY); -gchar *p; -gint xscreen = -1; -gchar selection_name[100]; -Atom selection_atom; - -if(display) { -if((p=g_strrstr(display, .))) -xscreen = atoi(p); -} -if(xscreen == -1) -xscreen = 0; - -g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen); -selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False); - -if((*xid = XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom))) -return TRUE; - -return FALSE; -} - -void -xfdesktop_send_client_message(Window xid, const gchar *msg) -{ -GdkEventClient gev; -GtkWidget *win; - -win = gtk_invisible_new(); -gtk_widget_realize(win); - -gev.type = GDK_CLIENT_EVENT; -gev.window = gtk_widget_get_window(win); -gev.send_event = TRUE; -gev.message_type = gdk_atom_intern(STRING, FALSE); -gev.data_format = 8; -strcpy(gev.data.b, msg); - -gdk_event_send_client_message((GdkEvent *)gev, (GdkNativeWindow)xid); -gdk_flush(); - -gtk_widget_destroy(win); -} - guint xfce_grab_cursor(GtkWidget *w, GdkEventButton *evt) diff --git a/common/xfdesktop-common.h b/common/xfdesktop-common.h index 1d6db85..903875d 100644 --- a/common/xfdesktop-common.h +++ b/common/xfdesktop-common.h @@ -83,9 +83,6 @@ gboolean xfdesktop_image_file_is_valid(const gchar *filename); gchar *xfdesktop_get_file_mimetype(const gchar *file); -gboolean xfdesktop_check_is_running(Window *xid); -void xfdesktop_send_client_message(Window xid, const gchar *msg); - guint xfce_grab_cursor(GtkWidget *w, GdkEventButton *evt); gboolean xfdesktop_popup_grab_available(GdkWindow *win, guint32 timestamp); diff --git a/src/Makefile.am b/src/Makefile.am index 4d73dad..42667a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,9 @@ xfdesktop_SOURCES = \ xfce-workspace.c \ xfce-workspace.h \ xfce-desktop.c \ - xfce-desktop.h + xfce-desktop.h \ + xfdesktop-application.c \ + xfdesktop-application.h desktop_icon_sources = \ xfdesktop-icon.c \ diff --git a/src/main.c b/src/main.c index d0f24bc..db6 100644 --- a/src/main.c +++ b/src/main.c @@ -48,207 +48,27 @@ #include unistd.h #endif -#include X11/Xlib.h - -#include gdk/gdkx.h -#include gtk/gtk.h - -#include xfconf/xfconf.h -#include libxfce4ui/libxfce4ui.h - #ifdef ENABLE_FILE_ICONS #include dbus/dbus-glib.h #endif -#include xfdesktop-common.h -#include xfce-backdrop.h -#include xfce-desktop.h -#include menu.h -#include windowlist.h - -#ifdef HAVE_LIBNOTIFY -#include xfdesktop-notify.h -#endif - -static XfceSMClient *sm_client = NULL; - -static void -session_logout(void) -{ -xfce_sm_client_request_shutdown(sm_client, XFCE_SM_CLIENT_SHUTDOWN_HINT_ASK); -} - -static void -session_die(gpointer user_data) -{ -gtk_main_quit(); -} - -static void -event_forward_to_rootwin(GdkScreen *gscreen, GdkEvent *event) -{ -XButtonEvent xev, xev2; -Display *dpy = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(gscreen)); - -if(event-type == GDK_BUTTON_PRESS || event-type == GDK_BUTTON_RELEASE) { -if(event-type == GDK_BUTTON_PRESS) { -xev.type = ButtonPress; -/* - * rox has an option to disable the next - * instruction. it is called blackbox_hack. Does - * anyone know why exactly it is needed? - */ -XUngrabPointer(dpy, event-button.time); -} else -xev.type = ButtonRelease; - -xev.button =
[Xfce4-commits] xfdesktop:eric/Port-to-GApplication Creating branch eric/Port-to-GApplication
Updating branch refs/heads/eric/Port-to-GApplication as new branch to f4fa63b92f0ee07268f0af8b0bccb39a03c0e0e5 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/eric/Port-to-GApplication 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] xfdesktop:eric/Port-to-GApplication Workaround g_action_map being too new
Updating branch refs/heads/eric/Port-to-GApplication to 1d9dca11efbc9ac7f416d9c9dccb2049be2b5997 (commit) from f4fa63b92f0ee07268f0af8b0bccb39a03c0e0e5 (commit) commit 1d9dca11efbc9ac7f416d9c9dccb2049be2b5997 Author: Eric Koegel eric.koe...@gmail.com Date: Sat Sep 21 10:50:39 2013 +0300 Workaround g_action_map being too new This adds in code for g_simple_action_group stuff so that it will work with glib versions earlier than 2.32. src/xfdesktop-application.c | 30 ++ 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/xfdesktop-application.c b/src/xfdesktop-application.c index f1b2944..f52c821 100644 --- a/src/xfdesktop-application.c +++ b/src/xfdesktop-application.c @@ -99,6 +99,10 @@ struct _XfdesktopApplication { GApplication parent; +#if !GLIB_CHECK_VERSION (2, 32, 0) +GSimpleActionGroup *actions; +#endif + GtkWidget **desktops; XfconfChannel *channel; gint nscreens; @@ -130,33 +134,51 @@ xfdesktop_application_class_init(XfdesktopApplicationClass *klass) } static void +xfdesktop_application_add_action(XfdesktopApplication *app, GAction *action) +{ +#if GLIB_CHECK_VERSION (2, 32, 0) +g_action_map_add_action(G_ACTION_MAP(app), action); +#else +g_simple_action_group_insert(app-actions, action); +#endif +} + +static void xfdesktop_application_init(XfdesktopApplication *app) { GSimpleAction *action; +#if !GLIB_CHECK_VERSION (2, 32, 0) +app-actions = g_simple_action_group_new(); +#endif + /* reload action */ action = g_simple_action_new(reload, NULL); g_signal_connect(action, activate, G_CALLBACK(cb_xfdesktop_application_reload), app); -g_action_map_add_action(G_ACTION_MAP(app), G_ACTION(action)); +xfdesktop_application_add_action(app, G_ACTION(action)); g_object_unref(action); /* quit action */ action = g_simple_action_new(quit, NULL); g_signal_connect(action, activate, G_CALLBACK(cb_xfdesktop_application_quit), app); -g_action_map_add_action(G_ACTION_MAP(app), G_ACTION(action)); +xfdesktop_application_add_action(app, G_ACTION(action)); g_object_unref(action); /* menu action, parameter pops up primary (TRUE) or windowlist menu */ action = g_simple_action_new(menu, G_VARIANT_TYPE_BOOLEAN); g_signal_connect(action, activate, G_CALLBACK(cb_xfdesktop_application_menu), app); -g_action_map_add_action(G_ACTION_MAP(app), G_ACTION(action)); +xfdesktop_application_add_action(app, G_ACTION(action)); g_object_unref(action); /* arrange action */ action = g_simple_action_new(arrange, NULL); g_signal_connect(action, activate, G_CALLBACK(cb_xfdesktop_application_arrange), app); -g_action_map_add_action(G_ACTION_MAP(app), G_ACTION(action)); +xfdesktop_application_add_action(app, G_ACTION(action)); g_object_unref(action); + +#if !GLIB_CHECK_VERSION (2, 32, 0) +g_application_set_action_group(G_APPLICATION(app), (GActionGroup*)app-actions); +#endif } static void ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:bluesabre/gtk3 Remove/clear auto-saved-playlist file upon using the clear-playlist button
Updating branch refs/heads/bluesabre/gtk3 to 8cb12d45f65f64ee68991b23907114e9d9372db7 (commit) from 071acfe9893612c7a498029993e311fa358b61c5 (commit) commit 8cb12d45f65f64ee68991b23907114e9d9372db7 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sat Sep 21 09:57:12 2013 +0200 Remove/clear auto-saved-playlist file upon using the clear-playlist button src/parole-medialist.c |8 1 file changed, 8 insertions(+) diff --git a/src/parole-medialist.c b/src/parole-medialist.c index f309d47..618d2f8 100644 --- a/src/parole-medialist.c +++ b/src/parole-medialist.c @@ -572,7 +572,15 @@ parole_media_list_add_clicked_cb (GtkButton *button, ParoleMediaList *list) void parole_media_list_clear_clicked_cb (GtkButton *button, ParoleMediaList *list) { +gchar *playlist_filename; +GFile *playlist_file; parole_media_list_clear_list (list); +playlist_filename = xfce_resource_save_location (XFCE_RESOURCE_DATA, + PAROLE_AUTO_SAVED_PLAYLIST, + FALSE); +playlist_file = g_file_new_for_path(playlist_filename); +g_file_delete(playlist_file, NULL, NULL); +g_free(playlist_filename); } /** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/Port-to-GApplication Wait for the window manager (Bug 7769)
Updating branch refs/heads/eric/Port-to-GApplication to f8204f77cf48452b7021ee707369f6b69f322928 (commit) from 1d9dca11efbc9ac7f416d9c9dccb2049be2b5997 (commit) commit f8204f77cf48452b7021ee707369f6b69f322928 Author: Eric Koegel eric.koe...@gmail.com Date: Sat Sep 21 11:34:48 2013 +0300 Wait for the window manager (Bug 7769) When xfdesktop starts before the window manager the wallpaper images and icons won't appear on all the screens. This patch waits for the window manager to start up or 5 seconds before loading the desktops. Most of the actual checking if the wm is ready is based on a patch in xfce4-panel, commit-id cabbdfd1c04caf20a71e0af773accf809135a03d src/xfdesktop-application.c | 108 ++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/src/xfdesktop-application.c b/src/xfdesktop-application.c index f52c821..8d528db 100644 --- a/src/xfdesktop-application.c +++ b/src/xfdesktop-application.c @@ -23,6 +23,9 @@ * Copyright (C) 2003 Benedikt Meurer benedikt.meu...@unix-ag.uni-siegen.de * X event forwarding code: * Copyright (c) 2004 Nils Rennebarth + * Additional portions taken from https://bugzilla.xfce.org/attachment.cgi?id=3751 + * which is in xfce4-panel git commit id 2a8de2b1b019eaef543e34764c999a409fe2bef9 + * and adapted for xfdesktop. */ #ifdef HAVE_CONFIG_H @@ -85,6 +88,9 @@ static void cb_xfdesktop_application_arrange(GAction *action, GVariant *parameter, gpointer data); +static gboolean cb_wait_for_window_manager(gpointer data); +static void cb_wait_for_window_manager_destroyed(gpointer data); + static void xfdesktop_application_startup(GApplication *g_application); static void xfdesktop_application_start(XfdesktopApplication *app); static void xfdesktop_application_shutdown(GApplication *g_application); @@ -95,6 +101,18 @@ static gboolean xfdesktop_application_local_command_line(GApplication *g_applica static gint xfdesktop_application_command_line(GApplication *g_application, GApplicationCommandLine *command_line); +typedef struct +{ +XfdesktopApplication *app; + +Display *dpy; +Atom *atoms; +guint atom_count; +guint have_wm : 1; +guint counter; +guint wait_for_wm_timeout_id; +} WaitForWM; + struct _XfdesktopApplication { GApplication parent; @@ -106,7 +124,10 @@ struct _XfdesktopApplication GtkWidget **desktops; XfconfChannel *channel; gint nscreens; +guint wait_for_wm_timeout_id; XfceSMClient *sm_client; + +gboolean opt_disable_wm_check; }; struct _XfdesktopApplicationClass @@ -405,16 +426,95 @@ cb_xfdesktop_application_arrange(GAction *action, xfce_desktop_arrange_icons(XFCE_DESKTOP(app-desktops[screen_num])); } +static gboolean +cb_wait_for_window_manager(gpointer data) +{ +WaitForWM *wfwm = data; +guint i; +gboolean have_wm = TRUE; + +for(i = 0; i wfwm-atom_count; i++) { +if(XGetSelectionOwner(wfwm-dpy, wfwm-atoms[i]) == None) { +DBG(window manager not ready on screen %d, i); +have_wm = FALSE; +break; +} +} + +wfwm-have_wm = have_wm; + +/* abort if a window manager is found or 5 seconds expired */ +return wfwm-counter++ 20 * 5 !wfwm-have_wm; +} + +static void +cb_wait_for_window_manager_destroyed(gpointer data) +{ +WaitForWM *wfwm = data; + +g_return_if_fail(wfwm-app != NULL); + +wfwm-app-wait_for_wm_timeout_id = 0; + +if(!wfwm-have_wm) { +g_printerr(No window manager registered on screen 0. + To start the xfdesktop without this check, run with --disable-wm-check.\n); +} else { +DBG(found window manager after %d tries, wfwm-counter); +} + +/* start loading the desktop, hopefully a window manager is found, but it + * also works without it */ +xfdesktop_application_start(wfwm-app); + +g_free(wfwm-atoms); +XCloseDisplay(wfwm-dpy); +g_slice_free(WaitForWM, wfwm); +} + static void xfdesktop_application_startup(GApplication *g_application) { XfdesktopApplication *app = XFDESKTOP_APPLICATION(g_application); +WaitForWM *wfwm; +guint i; +gchar **atom_names; TRACE(entering); g_application_hold(g_application); -xfdesktop_application_start(app); +if(!app-opt_disable_wm_check) { +/* setup data for wm checking */ +wfwm = g_slice_new0(WaitForWM); +wfwm-dpy = XOpenDisplay(NULL); +wfwm-have_wm = FALSE; +wfwm-counter = 0; +wfwm-app = app; + +/* preload wm atoms for all screens */ +wfwm-atom_count = XScreenCount(wfwm-dpy); +wfwm-atoms = g_new(Atom, wfwm-atom_count); +atom_names = g_new0(gchar *, wfwm-atom_count + 1); + +for(i = 0; i wfwm-atom_count;
[Xfce4-commits] xfce4-notifyd:master Fix build: don't mix code and declarations.
Updating branch refs/heads/master to 6b8af8b62e684b4c75c6f1317e949bbe999cfa6d (commit) from 9b814e99d10791d672c48c49216b322bd1b3a3fc (commit) commit 6b8af8b62e684b4c75c6f1317e949bbe999cfa6d Author: Jérôme Guelfucci jero...@xfce.org Date: Sat Sep 21 11:15:08 2013 +0200 Fix build: don't mix code and declarations. xfce4-notifyd/xfce-notify-window.c | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c index 6c820e2..f8ffdf6 100644 --- a/xfce4-notifyd/xfce-notify-window.c +++ b/xfce4-notifyd/xfce-notify-window.c @@ -626,11 +626,11 @@ xfce_notify_window_configure_event(GtkWidget *widget, static gboolean xfce_notify_window_expire_timeout(gpointer data) { -g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE); - XfceNotifyWindow *window = data; gboolean fade_transparent; +g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE); + window-expire_id = 0; fade_transparent = @@ -652,11 +652,12 @@ xfce_notify_window_expire_timeout(gpointer data) static gboolean xfce_notify_window_fade_timeout(gpointer data) { -g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE); - XfceNotifyWindow *window = data; -gdouble op = gtk_window_get_opacity(GTK_WINDOW(window)); +gdouble op; +g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE); + +op = gtk_window_get_opacity(GTK_WINDOW(window)); op -= window-op_change_delta; if(op 0.0) op = 0.0; @@ -677,10 +678,12 @@ static void xfce_notify_window_button_clicked(GtkWidget *widget, gpointer user_data) { +XfceNotifyWindow *window; +gchar *action_id; + g_return_if_fail(XFCE_IS_NOTIFY_WINDOW(user_data)); -XfceNotifyWindow *window = XFCE_NOTIFY_WINDOW(user_data); -gchar *action_id; +window = XFCE_NOTIFY_WINDOW(user_data); action_id = g_object_get_data(G_OBJECT(widget), --action-id); g_assert(action_id); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-notifyd:master Added type checks to prevent crashes.
Updating branch refs/heads/master to 9b814e99d10791d672c48c49216b322bd1b3a3fc (commit) from 699cba5558b1a6b4f3d5b4c83d5bca43f1d3798a (commit) commit 9b814e99d10791d672c48c49216b322bd1b3a3fc Author: Andrzej ndrwr...@gmail.com Date: Wed Sep 18 02:21:08 2013 +0100 Added type checks to prevent crashes. xfce4-notifyd/xfce-notify-window.c |6 ++ 1 file changed, 6 insertions(+) diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c index 285a70e..6c820e2 100644 --- a/xfce4-notifyd/xfce-notify-window.c +++ b/xfce4-notifyd/xfce-notify-window.c @@ -626,6 +626,8 @@ xfce_notify_window_configure_event(GtkWidget *widget, static gboolean xfce_notify_window_expire_timeout(gpointer data) { +g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE); + XfceNotifyWindow *window = data; gboolean fade_transparent; @@ -650,6 +652,8 @@ xfce_notify_window_expire_timeout(gpointer data) static gboolean xfce_notify_window_fade_timeout(gpointer data) { +g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE); + XfceNotifyWindow *window = data; gdouble op = gtk_window_get_opacity(GTK_WINDOW(window)); @@ -673,6 +677,8 @@ static void xfce_notify_window_button_clicked(GtkWidget *widget, gpointer user_data) { +g_return_if_fail(XFCE_IS_NOTIFY_WINDOW(user_data)); + XfceNotifyWindow *window = XFCE_NOTIFY_WINDOW(user_data); gchar *action_id; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Drop unneeded message.
Updating branch refs/heads/master to 6e6bcf428090adb79eaf556e5381be771567cf6a (commit) from 25c8e5c8acb50e915610b324d9d82afe5d123a88 (commit) commit 6e6bcf428090adb79eaf556e5381be771567cf6a Author: Nick Schermer n...@xfce.org Date: Sat Sep 21 11:49:17 2013 +0200 Drop unneeded message. src/compositor.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compositor.c b/src/compositor.c index 03607d0..b834dc1 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1357,7 +1357,7 @@ get_refresh_rate (ScreenInfo* screen_info) if (refresh_rate != screen_info-refresh_rate) { -g_message (Detected refreshrate:%i hertz, refresh_rate); +DBG (Detected refreshrate: %i hertz, refresh_rate); screen_info-refresh_rate = refresh_rate; } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-volman:master I18n: Update translation bg (100%).
Updating branch refs/heads/master to edcfe892226609be33facf7b80dfafc08885a98b (commit) from 1321aa637c18e9f93e8114af81feac53d398bd2f (commit) commit edcfe892226609be33facf7b80dfafc08885a98b Author: cybercop cybercop_mont...@abv.bg Date: Sat Sep 21 12:30:24 2013 +0200 I18n: Update translation bg (100%). 113 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/bg.po | 64 +++--- 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/po/bg.po b/po/bg.po index 67ecfbd..111b259 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,30 +1,29 @@ # SOME DESCRIPTIVE TITLE. # 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. -# +# +# Translators: +# cybercop cybercop_mont...@abv.bg, 2013 msgid msgstr -Project-Id-Version: thunar-volman\n +Project-Id-Version: Thunar-volman\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-01-27 06:21+\n -PO-Revision-Date: 2013-01-27 13:39+0200\n -Last-Translator: Cybercop cybercop_mont...@abv.bg\n -Language-Team: BULGARIAN\n -Language: \n +POT-Creation-Date: 2013-09-21 00:30+0200\n +PO-Revision-Date: 2013-09-21 05:46+\n +Last-Translator: cybercop cybercop_mont...@abv.bg\n +Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce/language/bg/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Poedit-Language: BULGARIAN\n -X-Poedit-Country: BULGARIA\n -X-Poedit-SourceCharset: utf-8\n +Language: bg\n +Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../thunar-volman/main.c:59 -msgid The syfs path of the newly added device +msgid The sysfs path of the newly added device msgstr Sysfs пътя на ново добавено устройство #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid Configure management of removable drives and media msgstr Конфигуриране на управлението на преносими устройства и медии @@ -75,8 +74,7 @@ msgstr Искате да внесете снимките или да редак #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 -#: ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid Ig_nore msgstr Пропусни @@ -100,7 +98,9 @@ msgid A photo card has been detected msgstr Засечена е карта със снимки #: ../thunar-volman/tvm-block-device.c:275 -msgid There are photos on the card. Would you like to add these photos to your album? +msgid +There are photos on the card. Would you like to add these photos to your +album? msgstr Има снимки на картата. Искате ли да ги добавите към Вашия албум? #. prompt the user to execute the file @@ -263,8 +263,7 @@ msgstr Вкаран е празен DVD диск msgid You have inserted a blank DVD. msgstr Вкарали сте празно DVD. -#: ../thunar-volman/tvm-run.c:191 -#: ../thunar-volman/tvm-run.c:202 +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid What would you like to do? msgstr Какво искате да направите? @@ -324,7 +323,7 @@ msgstr Неподдържано USB устройство тип \%s\ msgid Thunar Volume Manager Settings msgstr Настройки на управлението на устройства в Thunar -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid Removable Drives and Media msgstr Преносими устройства и медии @@ -357,9 +356,8 @@ msgstr Ruby скриптове msgid Shell Scripts msgstr Shell скриптове -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid Storage msgstr Система за съхраняване на данни @@ -404,9 +402,8 @@ msgstr Команда за дискове с данни: msgid Command for A_udio CDs: msgstr Команда за аудио дискове: -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid Multimedia msgstr Мултимедия @@ -450,9 +447,8 @@ msgstr Портативни музикални плейъри msgid Play _music files when connected msgstr Пусни музикалните файлове при свързване -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid Cameras msgstr Камери @@ -465,9 +461,8 @@ msgstr Цифрови камери msgid Import digital photographs when connected msgstr Внеси цифрови снимки при свързване -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid PDAs msgstr PDA-та @@ -488,9 +483,8 @@ msgstr Pocket PC-та msgid Sync Pocket P_C devices when connected msgstr Синхронизирай PocketPC устройства при свързване -#. #. Printers
[Xfce4-commits] xfce4-mailwatch-plugin:master I18n: Update translation ko (100%).
Updating branch refs/heads/master to 4c67727869f0d050cefe006c79eaf75338e0acc6 (commit) from 18ac7b68c8593f5e3bad64d265937462a216bbdd (commit) commit 4c67727869f0d050cefe006c79eaf75338e0acc6 Author: Darkcircle darkcircle.0...@gmail.com Date: Sat Sep 21 12:31:16 2013 +0200 I18n: Update translation ko (100%). 108 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/ko.po | 310 ++ 1 file changed, 148 insertions(+), 162 deletions(-) diff --git a/po/ko.po b/po/ko.po index dbad5ea..8f08c01 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,24 +1,22 @@ -# Korean translation for the xfce4-mailwatch-plugin package. -# Copyright (C) 2005-2012 Brian Tarricone et al. -# This file is distributed under the same license as the xfce4-mailwatch-plugin package. -# Seong-ho Cho darkcircle.0...@gmail.com -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Darkcircle darkcircle.0...@gmail.com, 2013 msgid msgstr -Project-Id-Version: xfce4-mailwatch-plugin.master\n -Report-Msgid-Bugs-To: xfce4-users-kr-i18n xfce4-users-kr-i...@lists.sourceforge.net\n -POT-Creation-Date: 2012-02-28 10:00+\n -PO-Revision-Date: 2012-02-29 03:28+0900\n -Last-Translator: Seong-ho, Cho darkcircle.0...@gmail.com\n -Language-Team: xfce4-users-kr-i18n xfce4-users-kr-i...@lists.sourceforge.net\n -Language: ko\n +Project-Id-Version: Xfce Panel Plugins\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2013-09-01 00:31+0200\n +PO-Revision-Date: 2013-09-21 06:25+\n +Last-Translator: Darkcircle darkcircle.0...@gmail.com\n +Language-Team: Korean (http://www.transifex.com/projects/p/xfce/language/ko/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: ko\n Plural-Forms: nplurals=1; plural=0;\n -X-Poedit-Language: Korean\n -X-Poedit-Country: KOREA, REPUBLIC OF\n -X-Poedit-SourceCharset: utf-8\n #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:399 @@ -29,12 +27,17 @@ msgstr TLS 교환 실패: %s #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255 #, c-format -msgid Received HTTP response code %d. The most likely reason for this is that your GMail username or password is incorrect. +msgid +Received HTTP response code %d. The most likely reason for this is that +your GMail username or password is incorrect. msgstr HTTP 응답 코드 %d을(를) 받았습니다. 대부분의 이유는 GMail 사용자이름 또는 암호가 잘못되었기 때문입니다. #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261 #, c-format -msgid Received HTTP response code %d, which should be 200. There may be a problem with GMail's servers, or they have incompatibly changed their authentication method or location of the new messages feed. +msgid +Received HTTP response code %d, which should be 200. There may be a problem + with GMail's servers, or they have incompatibly changed their +authentication method or location of the new messages feed. msgstr 200이어야 할 HTTP 응답 코드를 %d(으)로 받았습니다. 아마도 GMail 서버에 문제가 있거나, 호환되지 않은 인증 방식 또는 새 메시지 저장 위치가 바뀌었기 때문일지도 모릅니다. #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394 @@ -47,25 +50,25 @@ msgid Previous thread hasn't exited yet, not checking mail this time. msgstr 이전 스레드를 끝내지 않아, 지금은 메일을 확인하지 않습니다. #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535 -#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748 +#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1723 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863 msgid _Username: msgstr 사용자이름(_U): #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555 -#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768 +#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1743 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883 msgid _Password: msgstr 암호(_P): #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576 -#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807 +#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1782 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915 msgid Check for _new messages every msgstr 새 메시지 확인 시간 간격(_N) #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591 -#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821 +#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796 #: ../libmailwatch-core/mailwatch-mailbox-maildir.c:374 #: ../libmailwatch-core/mailwatch-mailbox-mbox.c:412 #: ../libmailwatch-core/mailwatch-mailbox-mh.c:605 @@ -78,18 +81,23 @@ msgid Remote GMail Mailbox msgstr 원격 GMail 메일함 #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669 -msgid The GMail plugin can connect to Google's mail service and securely retrieve the number of new messages. +msgid +The GMail plugin can connect to Google's mail service and securely retrieve +the number of new messages. msgstr GMail 플러그인은 구글 메일 서비스에 연결하고 새로운 메시지를 안전하게 전송할 수 있습니다. #:
[Xfce4-commits] xfce4-indicator-plugin:master I18n: Update translation ko (100%).
Updating branch refs/heads/master to 833616f1ee6991941c1a7743a7d2b71060a1d8ad (commit) from 243049c116fb8e239580dac0bbaa9bfeb3545ce6 (commit) commit 833616f1ee6991941c1a7743a7d2b71060a1d8ad Author: Darkcircle darkcircle.0...@gmail.com Date: Sat Sep 21 12:31:14 2013 +0200 I18n: Update translation ko (100%). 37 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/ko.po | 40 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/po/ko.po b/po/ko.po index a534d9c..349505e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # kentarch bkrh...@aol.com, 2013 # Darkcircle darkcircle.0...@gmail.com, 2012-2013 @@ -9,15 +9,14 @@ msgid msgstr Project-Id-Version: Xfce Panel Plugins\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-09-06 01:59+0100\n -PO-Revision-Date: 2013-09-05 08:18+\n +POT-Creation-Date: 2013-09-06 00:31+0200\n +PO-Revision-Date: 2013-09-21 06:31+\n Last-Translator: Darkcircle darkcircle.0...@gmail.com\n -Language-Team: Korean (http://www.transifex.com/projects/p/xfce/language/; -ko/)\n -Language: ko\n +Language-Team: Korean (http://www.transifex.com/projects/p/xfce/language/ko/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: ko\n Plural-Forms: nplurals=1; plural=0;\n #: ../panel-plugin/indicator.desktop.in.in.h:1 @@ -28,9 +27,7 @@ msgstr 표시기 플러그인 msgid Provides a panel area for Unity indicators. Indicators allow applications and system services to display their status and interact with the user. -msgstr -유니티 표시기 전용 패널 영역을 제공합니다. 표시기에서는 프로그램과 시스템 서 -비스의 상태를 표시하고, 사용자와 상호작용할 수 있도록 합니다. +msgstr 유니티 표시기 전용 패널 영역을 제공합니다. 표시기에서는 프로그램과 시스템 서비스의 상태를 표시하고, 사용자와 상호작용할 수 있도록 합니다. #: ../panel-plugin/indicator.c:176 msgid Copyright (c) 2009-2013\n @@ -40,7 +37,8 @@ msgstr Copyright (c) 2009-2013\n msgid No Indicators msgstr 표시기 없음 -#. raw name, pretty name, icon-name(?) +#. raw name, pretty name, +#. icon-name(?) #: ../panel-plugin/indicator-dialog.c:57 msgid Application Indicators msgstr 프로그램 표시기 @@ -112,13 +110,13 @@ msgstr 표시기 #: ../panel-plugin/indicator-dialog.glade.h:2 msgid Arrange indicators in a single row -msgstr +msgstr 1행으로 표시기 정렬 #: ../panel-plugin/indicator-dialog.glade.h:3 msgid If enabled, ensure that the indicators are laid out in a single row or column. -msgstr +msgstr 이 옵션을 켜면, 표시기가 1행 또는 1열로 놓입니다. #: ../panel-plugin/indicator-dialog.glade.h:4 msgid Align left in deskbar mode @@ -128,9 +126,7 @@ msgstr 데스크 표시줄 모드에서 왼쪽으로 정렬 msgid Controls the indicator button layout when the panel is in a Deskbar mode. Possible choices are \centered\ or \aligned left\. -msgstr -패널이 데스크 표시줄 모드일 때 표시기 단추 배치를 다룹니다. 가능한 선택은 -\가운데 정렬\과 \왼쪽 정렬\이 있습니다. +msgstr 패널이 데스크 표시줄 모드일 때 표시기 단추 배치를 다룹니다. 가능한 선택은 \가운데 정렬\과 \왼쪽 정렬\이 있습니다. #: ../panel-plugin/indicator-dialog.glade.h:6 msgid Appearance @@ -144,9 +140,7 @@ msgstr 표시기 기본적으로 숨김 msgid When enabled, only indicators marked \Visible\ are shown. Otherwise, all indicators not marked \Hidden\ are displayed. -msgstr -활성화 하면 \보임\으로 설정한 표시기만 보입니다. 그렇지 않으면 \숨김\으 -로 표시하지 않은 모든 표시기가 나타납니다. +msgstr 활성화 하면 \보임\으로 설정한 표시기만 보입니다. 그렇지 않으면 \숨김\으로 표시하지 않은 모든 표시기가 나타납니다. #: ../panel-plugin/indicator-dialog.glade.h:9 msgid Indicator @@ -183,13 +177,3 @@ msgstr 표시기 목록과 가시성 설정을 초기화합니다. #: ../panel-plugin/indicator-dialog.glade.h:17 msgid Known Indicators msgstr 알려진 표시기 - -#~ msgid _Maximum row size (px): -#~ msgstr 최대 행 높이(px)(_M): - -#~ msgid -#~ Icons are scaled to fit a single row of the panel. Use this option to -#~ restrict the maximum size of the row. -#~ msgstr -#~ 패널 한 줄에 맞추려 아이콘의 크기를 조절했습니다. 행의 최대 높이를 제한하 -#~ 려면 이 옵션을 사용하십시오. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master I18n: Update translation ko (100%).
Updating branch refs/heads/master to 7fe97f3537add86b4e013b3206af1987583453a6 (commit) from 6e6bcf428090adb79eaf556e5381be771567cf6a (commit) commit 7fe97f3537add86b4e013b3206af1987583453a6 Author: Darkcircle darkcircle.0...@gmail.com Date: Sat Sep 21 12:31:53 2013 +0200 I18n: Update translation ko (100%). 170 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/ko.po | 762 ++ 1 file changed, 271 insertions(+), 491 deletions(-) diff --git a/po/ko.po b/po/ko.po index 815e1fa..8cc735a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,31 +1,28 @@ -# Korean translations for xfwm4 package. -# Copyright(C) 2002-2006 The Xfce development team -# This file is distributed under the same license as the xfwm4 package. -# ByungHyun Choi byunghyun.c...@gmail.com, 2005. -# Seong-ho Cho darkcircle.0...@gmail.com, 2011-2013. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# ByungHyun Choi byunghyun.c...@gmail.com, 2005 msgid msgstr -Project-Id-Version: xfwm4 4.4.0\n +Project-Id-Version: Xfwm4\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-05-12 06:33+\n -PO-Revision-Date: 2013-05-12 15:49+0900\n -Last-Translator: Seong-ho Cho darkcircle.0...@gmail.com\n -Language-Team: xfce-i18n xfce-i...@xfce.org\n -Language: ko\n +POT-Creation-Date: 2013-07-02 22:21+0200\n +PO-Revision-Date: 2013-09-21 06:49+\n +Last-Translator: Darkcircle darkcircle.0...@gmail.com\n +Language-Team: Korean (http://www.transifex.com/projects/p/xfce/language/ko/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: ko\n Plural-Forms: nplurals=1; plural=0;\n -X-Generator: Poedit 1.5.5\n #: ../helper-dialog/helper-dialog.c:84 msgid This window might be busy and is not responding.\n Do you want to terminate the application? -msgstr -이 창은 사용중이며 응답이 없는 것 같습니다.\n -이 프로그램을 중단하시렵니까? +msgstr 이 창은 사용중이며 응답이 없는 것 같습니다.\n이 프로그램을 중단하시렵니까? #: ../helper-dialog/helper-dialog.c:89 msgid Warning @@ -43,7 +40,7 @@ msgstr 세션 관리자 소켓 #: ../settings-dialogs/workspace-settings.c:381 #: ../settings-dialogs/xfwm4-settings.c:241 msgid SOCKET ID -msgstr SOCKET ID +msgstr 소켓 ID #: ../settings-dialogs/tweaks-settings.c:464 #: ../settings-dialogs/workspace-settings.c:382 @@ -64,9 +61,7 @@ msgstr . msgid %s: %s\n Try %s --help to see a full list of available command line options.\n -msgstr -%s: %s\n -사용가능한 명령줄 옵션의 전체 목록을 보시려면 %s --help를 입력해 보십시오.\n +msgstr %s: %s\n사용가능한 명령줄 옵션의 전체 목록을 보시려면 %s --help를 입력하십시오.\n #: ../settings-dialogs/workspace-settings.c:74 #: ../settings-dialogs/workspace-settings.c:89 @@ -84,237 +79,237 @@ msgid Settings manager socket msgstr 관리자 소켓을 설정합니다 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1 -#: ../settings-dialogs/xfwm4-dialog.glade.h:28 -msgid Configure window behavior and shortcuts -msgstr 창 동작 및 바로 가기를 설정합니다 - -#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2 -#: ../settings-dialogs/xfwm4-dialog.glade.h:47 +#: ../settings-dialogs/xfwm4-dialog.glade.h:1 msgid Window Manager msgstr 창 관리자 -#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16 -msgid Fine-tune window behaviour and effects -msgstr 창 동작 및 효과 최적화 +#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2 +#: ../settings-dialogs/xfwm4-dialog.glade.h:2 +msgid Configure window behavior and shortcuts +msgstr 창 동작 및 바로 가기를 설정합니다 -#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39 +#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1 msgid Window Manager Tweaks msgstr 창 관리자 기능향상 +#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2 +msgid Fine-tune window behaviour and effects +msgstr 창 동작 및 효과 최적화 + #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1 -msgid Configure layout, names and margins -msgstr 배치, 이름, 여백을 설정합니다 - -#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2 -#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5 msgid Workspaces msgstr 작업 공간 -#: ../settings-dialogs/xfwm4-dialog.glade.h:1 -msgid bButton layout/b -msgstr b단추 배치/b - -#: ../settings-dialogs/xfwm4-dialog.glade.h:2 -msgid bDouble click _action/b -msgstr b두 번 누르기 동작(_A)/b +#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2 +#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2 +msgid Configure layout, names and margins +msgstr 배치, 이름, 여백을 설정합니다 #: ../settings-dialogs/xfwm4-dialog.glade.h:3 -msgid bFocus model/b -msgstr b창 활성 방법/b +msgid bThe_me/b +msgstr b테마(_M)/b #:
[Xfce4-commits] thunar-volman:master I18n: Update translation ko (100%).
Updating branch refs/heads/master to 93a26bc24fb2dd53013ac97c53a855eaf2563a25 (commit) from edcfe892226609be33facf7b80dfafc08885a98b (commit) commit 93a26bc24fb2dd53013ac97c53a855eaf2563a25 Author: Darkcircle darkcircle.0...@gmail.com Date: Sat Sep 21 12:30:24 2013 +0200 I18n: Update translation ko (100%). 113 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/ko.po | 154 +- 1 file changed, 72 insertions(+), 82 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0507239..7242bd3 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,39 +1,36 @@ -# Korean translations for thunar-volman package. -# Copyright (C) 2006-2011 The Xfce development team. -# This file is distributed under the same license as the thunar-volman package. -# -# Seong-ho Cho darkcircle.0...@gmail.com, 2011, 2012. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Darkcircle darkcircle.0...@gmail.com, 2011-2013 msgid msgstr -Project-Id-Version: thunar-volman.master\n +Project-Id-Version: Thunar-volman\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-12 08:15+\n -PO-Revision-Date: 2012-12-12 19:03+0900\n -Last-Translator: Seong-ho Cho darkcircle.0...@gmail.com\n -Language-Team: xfce-i18n xfce-i...@xfce.org\n -Language: ko\n +POT-Creation-Date: 2013-09-21 00:30+0200\n +PO-Revision-Date: 2013-09-21 06:22+\n +Last-Translator: Darkcircle darkcircle.0...@gmail.com\n +Language-Team: Korean (http://www.transifex.com/projects/p/xfce/language/ko/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: ko\n Plural-Forms: nplurals=1; plural=0;\n -X-Poedit-Language: Korean\n -X-Poedit-Country: KOREA, REPUBLIC OF\n -X-Poedit-SourceCharset: utf-8\n #: ../thunar-volman/main.c:59 -msgid The syfs path of the newly added device -msgstr 새롭게 추가된 장치의 sysfs 경로 +msgid The sysfs path of the newly added device +msgstr 새로 추가한 장치의 sysfs 경로입니다 #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid Configure management of removable drives and media -msgstr 이동식 드라이브와 미디어에 대한 관리를 설정합니다 +msgstr 이동식 드라이브와 미디어의 관리요소를 설정합니다 #: ../thunar-volman/main.c:61 msgid Print version information and exit -msgstr 버전 정보를 출력하고 끝냅니다 +msgstr 버전 정보를 출력하고 나갑니다 #. setup application name #: ../thunar-volman/main.c:93 @@ -47,17 +44,17 @@ msgstr All rights reserved. #: ../thunar-volman/main.c:122 #, c-format msgid Please report bugs to %s. -msgstr %s로 버그를 알려주십시오. +msgstr %s(으)로 버그를 알려주십시오. #: ../thunar-volman/main.c:176 #, c-format msgid There is no device with the sysfs path \%s\ -msgstr sysfs 경로 \%s\에 장치가 없습니다 +msgstr \%s\ sysfs 경로에 장치가 없습니다 #: ../thunar-volman/main.c:188 #, c-format msgid Must specify the sysfs path of new devices with --device-added -msgstr --device-added로 새 장치의 sysfs 경로를 지정하여야 합니다 +msgstr --device-added 옵션으로 새 장치의 sysfs 경로를 지정해야 합니다 #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -77,8 +74,7 @@ msgstr 사진을 가져오거나 음악을 관리하시렵니까? #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 -#: ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid Ig_nore msgstr 무시(_N) @@ -90,7 +86,7 @@ msgstr 사진 가져오기(_P) #: ../thunar-volman/tvm-block-device.c:210 msgid Manage _Music -msgstr 음악 관리하기(_M) +msgstr 음악 관리(_M) #. ask the user to import photos #: ../thunar-volman/tvm-block-device.c:273 @@ -102,8 +98,10 @@ msgid A photo card has been detected msgstr 사진 카드를 감지했습니다 #: ../thunar-volman/tvm-block-device.c:275 -msgid There are photos on the card. Would you like to add these photos to your album? -msgstr 카드에 사진이 들어있습니다. 앨범에 이 사진을 더하시렵니까? +msgid +There are photos on the card. Would you like to add these photos to your +album? +msgstr 카드에 사진이 들어있습니다. 앨범에 이 사진을 추가하시렵니까? #. prompt the user to execute the file #. prompt the user to execute this file @@ -111,7 +109,7 @@ msgstr 카드에 사진이 들어있습니다. 앨범에 이 사진을 더하 #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid Would you like to allow \%s\ to run? -msgstr 실행을 위해 \%s\을(를) 허용하시렵니까? +msgstr \%s\ 실행을 허용하시렵니까? #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -121,7 +119,7 @@ msgstr 자동 실행 확인 #: ../thunar-volman/tvm-block-device.c:377 #: ../thunar-volman/tvm-block-device.c:424 msgid Auto-Run capability detected -msgstr 자동 실행 가능성 감지함 +msgstr 자동 실행 기능 감지함 #: ../thunar-volman/tvm-block-device.c:379 #:
[Xfce4-commits] thunar:nick/1.8 Patiently wait for screen to realize on startup.
Updating branch refs/heads/nick/1.8 to 65530142f3d933613321c560f0ec0cb1732d2d65 (commit) from 93a7a18fb43536d04e818e91730e3d428e39265d (commit) commit 65530142f3d933613321c560f0ec0cb1732d2d65 Author: Nick Schermer n...@xfce.org Date: Sat Sep 21 13:10:16 2013 +0200 Patiently wait for screen to realize on startup. No background was drawn during login because thunar was too hard trying to update the yet-to-be-initialized screens. Esp on multi screen desktops this was a problem. thunar/thunar-desktop-window.c | 45 +--- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/thunar/thunar-desktop-window.c b/thunar/thunar-desktop-window.c index c3b8f50..384613e 100644 --- a/thunar/thunar-desktop-window.c +++ b/thunar/thunar-desktop-window.c @@ -62,6 +62,8 @@ struct _ThunarDesktopWindow GtkWindow __parent__; ThunarDesktopBackground *background; + + guintscreen_changed_idle_id; }; @@ -115,14 +117,11 @@ thunar_desktop_window_size_request (GtkWidget *widget, -static void -thunar_desktop_window_screen_changed (GdkScreen *screen, - ThunarDesktopWindow *window) +static gboolean +thunar_desktop_window_screen_changed_idle (gpointer data) { - GdkWindow *gdk_window; - - _thunar_return_if_fail (GDK_IS_SCREEN (screen)); - _thunar_return_if_fail (THUNAR_DESKTOP_WINDOW (window)); + ThunarDesktopWindow *window = THUNAR_DESKTOP_WINDOW (data); + GdkWindow *gdk_window; /* release background */ if (window-background != NULL) @@ -134,6 +133,34 @@ thunar_desktop_window_screen_changed (GdkScreen *screen, /* allocate bg and set it on the window */ gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); window-background = thunar_desktop_background_new (gdk_window); + + return FALSE; +} + + + +static void +thunar_desktop_window_screen_changed_idle_destoyed (gpointer data) +{ + THUNAR_DESKTOP_WINDOW (data)-screen_changed_idle_id = 0; +} + + + +static void +thunar_desktop_window_screen_changed (GdkScreen *screen, + ThunarDesktopWindow *window) +{ + _thunar_return_if_fail (GDK_IS_SCREEN (screen)); + _thunar_return_if_fail (THUNAR_DESKTOP_WINDOW (window)); + + if (window-screen_changed_idle_id == 0) +{ + /* avoid multiple calls of screen changed during session startup */ + window-screen_changed_idle_id = + g_idle_add_full (G_PRIORITY_LOW, thunar_desktop_window_screen_changed_idle, + window, thunar_desktop_window_screen_changed_idle_destoyed); +} } @@ -180,6 +207,10 @@ thunar_desktop_window_unrealize (GtkWidget *widget) GdkScreen *screen; GdkWindow *root; + /* no more new backgrounds */ + if (window-screen_changed_idle_id != 0) +g_source_remove (window-screen_changed_idle_id); + /* drop background */ if (window-background != NULL) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:nick/1.8 Add no-desktop command line option.
Updating branch refs/heads/nick/1.8 to 85088df8925adcc26b117166a17ba6a5cc33c4e5 (commit) from befaaf94ea00c5f2f14286776d99d01322e3fa9a (commit) commit 85088df8925adcc26b117166a17ba6a5cc33c4e5 Author: Nick Schermer n...@xfce.org Date: Tue Aug 13 18:04:43 2013 +0200 Add no-desktop command line option. A way to bypass the desktop xfconf settings check when manually starting Thunar in daemon mode. thunar/main.c |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/thunar/main.c b/thunar/main.c index 21d90cb..5a148fe 100644 --- a/thunar/main.c +++ b/thunar/main.c @@ -53,6 +53,7 @@ static gboolean opt_bulk_rename = FALSE; static gboolean opt_daemon = FALSE; static gchar *opt_sm_client_id = NULL; static gboolean opt_quit = FALSE; +static gboolean opt_no_desktop = FALSE; static gboolean opt_version = FALSE; @@ -63,8 +64,10 @@ static GOptionEntry option_entries[] = { bulk-rename, 'B', 0, G_OPTION_ARG_NONE, opt_bulk_rename, N_ (Open the bulk rename dialog), NULL, }, #ifdef HAVE_DBUS { daemon, 0, 0, G_OPTION_ARG_NONE, opt_daemon, N_ (Run in daemon mode), NULL, }, + { no-desktop, 0, 0, G_OPTION_ARG_NONE, opt_no_desktop, N_ (Do not try to control the desktop in daemon mode), NULL, }, #else { daemon, 0, 0, G_OPTION_ARG_NONE, opt_daemon, N_ (Run in daemon mode (not supported)), NULL, }, + { no-desktop, 0, 0, G_OPTION_ARG_NONE, opt_no_desktop, N_ (Do not try to control the desktop (not supported)), NULL, }, #endif { sm-client-id, 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, opt_sm_client_id, NULL, NULL, }, #ifdef HAVE_DBUS @@ -299,13 +302,14 @@ error0: thunar_application_set_daemon (application, FALSE); /* ask the running instance to manage the desktop */ - if (!thunar_dbus_client_manage_desktop (error)) + if (!opt_no_desktop + !thunar_dbus_client_manage_desktop (error)) { g_printerr (Thunar: %s\n, error-message); g_clear_error (error); } } - else + else if (!opt_no_desktop) { /* yeey, this instance is the active daemon, start the * desktop (if enabled and not already taken by another ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:nick/1.8 Fix crash in screen changed signal.
Updating branch refs/heads/nick/1.8 to 93a7a18fb43536d04e818e91730e3d428e39265d (commit) from 85088df8925adcc26b117166a17ba6a5cc33c4e5 (commit) commit 93a7a18fb43536d04e818e91730e3d428e39265d Author: Nick Schermer n...@xfce.org Date: Sat Sep 21 11:44:19 2013 +0200 Fix crash in screen changed signal. thunar/thunar-desktop-background.c |2 +- thunar/thunar-desktop-window.c |7 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/thunar/thunar-desktop-background.c b/thunar/thunar-desktop-background.c index cab42b1..37719f6 100644 --- a/thunar/thunar-desktop-background.c +++ b/thunar/thunar-desktop-background.c @@ -453,9 +453,9 @@ thunar_desktop_background_expose (ThunarDesktopBackground *background, gdk_atom_intern_static_string (_XROOTPMAP_ID), atom_pixmap, 32, GDK_PROP_MODE_REPLACE, (guchar *) pixmap_xid, 1); +#endif gdk_flush (); -#endif gdk_error_trap_pop (); } diff --git a/thunar/thunar-desktop-window.c b/thunar/thunar-desktop-window.c index 129a6f8..c3b8f50 100644 --- a/thunar/thunar-desktop-window.c +++ b/thunar/thunar-desktop-window.c @@ -121,6 +121,9 @@ thunar_desktop_window_screen_changed (GdkScreen *screen, { GdkWindow *gdk_window; + _thunar_return_if_fail (GDK_IS_SCREEN (screen)); + _thunar_return_if_fail (THUNAR_DESKTOP_WINDOW (window)); + /* release background */ if (window-background != NULL) { @@ -159,9 +162,9 @@ thunar_desktop_window_realize (GtkWidget *widget) GDK_PROP_MODE_REPLACE, (gpointer) xid, 1); /* watch screen changes */ - g_signal_connect_swapped (G_OBJECT (screen), size-changed, + g_signal_connect (G_OBJECT (screen), size-changed, G_CALLBACK (thunar_desktop_window_screen_changed), widget); - g_signal_connect_swapped (G_OBJECT (screen), monitors-changed, + g_signal_connect (G_OBJECT (screen), monitors-changed, G_CALLBACK (thunar_desktop_window_screen_changed), widget); /* prepare bg */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-volman:master I18n: Update translation sr (100%).
Updating branch refs/heads/master to 3c338ffa35d28b005fff3850aec645c48c9a655d (commit) from 93a26bc24fb2dd53013ac97c53a855eaf2563a25 (commit) commit 3c338ffa35d28b005fff3850aec645c48c9a655d Author: salepetronije salepetron...@gmail.com Date: Sun Sep 22 00:30:22 2013 +0200 I18n: Update translation sr (100%). 113 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/sr.po | 27 ++- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/po/sr.po b/po/sr.po index 5f560ba..d91f8eb 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,15 +1,18 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Мирослав Николић miroslavniko...@rocketmail.com, 2012. +# +# Translators: +# MirosNik miroslavniko...@rocketmail.com, 2012 +# salepetronije salepetron...@gmail.com, 2013 msgid msgstr -Project-Id-Version: thunar-volman.master\n +Project-Id-Version: Thunar-volman\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-03-24 05:12+\n -PO-Revision-Date: 2012-07-05 11:31+0200\n -Last-Translator: Мирослав Николић miroslavniko...@rocketmail.com\n -Language-Team: српски xfce-i...@xfce.org\n +POT-Creation-Date: 2013-09-21 00:30+0200\n +PO-Revision-Date: 2013-09-21 21:28+\n +Last-Translator: salepetronije salepetron...@gmail.com\n +Language-Team: Serbian (http://www.transifex.com/projects/p/xfce/language/sr/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n @@ -17,11 +20,11 @@ msgstr Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n #: ../thunar-volman/main.c:59 -msgid The syfs path of the newly added device -msgstr Путања ново придодатог уређаја на систему датотека +msgid The sysfs path of the newly added device +msgstr Путања новог придодатог уређаја на систему датотека #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid Configure management of removable drives and media msgstr Подесите управљање измењивим уређајима и дисковима @@ -99,9 +102,7 @@ msgstr Откривена је картица са фотографијама msgid There are photos on the card. Would you like to add these photos to your album? -msgstr -Постоје фотографије на картици. Да ли бисте желели да их додате у ваш -фотоалбум? +msgstr Постоје фотографије на картици. Да ли бисте желели да их додате у ваш фотоалбум? #. prompt the user to execute the file #. prompt the user to execute this file @@ -323,7 +324,7 @@ msgstr Неподржана врста УСБ диска „%s“ msgid Thunar Volume Manager Settings msgstr Подешавања Тунаровог управника волуменима -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid Removable Drives and Media msgstr Измењиви дискови и медији ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:xfce-4.10 I18n: Update translation es (81%).
Updating branch refs/heads/xfce-4.10 to 4037995764c046d929ffe8115f523d66bb19b429 (commit) from 5c2a43df45438f01f83d39ab1f8a9c91edf0cac7 (commit) commit 4037995764c046d929ffe8115f523d66bb19b429 Author: Pablo Lezaeta prfl...@gmail.com Date: Sun Sep 22 06:30:35 2013 +0200 I18n: Update translation es (81%). 314 translated messages, 73 untranslated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/es.po | 91 +++--- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/po/es.po b/po/es.po index f773940..5b5026c 100644 --- a/po/es.po +++ b/po/es.po @@ -4,13 +4,14 @@ # # Translators: # MC correomc2000-...@yahoo.es, 2013 +# Pablo Lezaeta prfl...@gmail.com, 2013 msgid msgstr Project-Id-Version: Xfce4-panel\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-07-02 23:10+0200\n -PO-Revision-Date: 2013-08-25 11:02+\n -Last-Translator: MC correomc2000-...@yahoo.es\n +PO-Revision-Date: 2013-09-22 03:01+\n +Last-Translator: Pablo Lezaeta prfl...@gmail.com\n Language-Team: Spanish (http://www.transifex.com/projects/p/xfce/language/es/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -57,22 +58,22 @@ msgstr _Mover #: ../libxfce4panel/xfce-panel-plugin.c:1236 msgid Pane_l -msgstr +msgstr Pane_l #. add new items #: ../libxfce4panel/xfce-panel-plugin.c:1244 ../panel/panel-window.c:2365 msgid Add _New Items... -msgstr +msgstr Agregar _nuevos objetos... #. customize panel #: ../libxfce4panel/xfce-panel-plugin.c:1255 ../panel/panel-window.c:2376 msgid Panel Pr_eferences... -msgstr +msgstr Pr_eferencias del panel #. logout item #: ../libxfce4panel/xfce-panel-plugin.c:1272 ../panel/panel-window.c:2404 msgid Log _Out -msgstr +msgstr Salir de la_sesión #: ../panel/main.c:79 msgid Show the 'Panel Preferences' dialog @@ -171,7 +172,7 @@ msgstr Fallo al cerrar el panel #: ../panel/main.c:389 msgid Failed to send D-Bus message -msgstr +msgstr Error al enviar el mensaje a D-Bus #: ../panel/main.c:400 msgid @@ -190,7 +191,7 @@ msgstr Fallo al ejecutar la aplicación de migración #: ../panel/panel-application.c:982 msgid Create _Launcher -msgstr +msgstr Crear_lanzador #: ../panel/panel-application.c:983 msgid @@ -287,7 +288,7 @@ msgstr Añadir nuevos complementos al panel #: ../panel/panel-item-dialog.c:216 #: ../plugins/launcher/launcher-dialog.glade.h:28 msgid _Search: -msgstr +msgstr _Búsqueda: #: ../panel/panel-item-dialog.c:224 msgid Enter search phrase here @@ -388,11 +389,11 @@ msgstr Eliminar panel seleccionado #: ../panel/panel-preferences-dialog.glade.h:10 msgid M_ode: -msgstr +msgstr M_odo: #: ../panel/panel-preferences-dialog.glade.h:11 msgid O_utput: -msgstr +msgstr S_alida: #: ../panel/panel-preferences-dialog.glade.h:12 msgid Span mo_nitors @@ -404,7 +405,7 @@ msgstr Seleccione esta opción para extender el panel sobre multiple monitores. #: ../panel/panel-preferences-dialog.glade.h:14 msgid _Lock panel -msgstr +msgstr _Bloquear panel #: ../panel/panel-preferences-dialog.glade.h:15 msgid @@ -444,11 +445,11 @@ msgstr #: ../panel/panel-preferences-dialog.glade.h:23 #, no-c-format msgid L_ength (%): -msgstr +msgstr L_ongitud (%): #: ../panel/panel-preferences-dialog.glade.h:24 msgid Num_ber of rows: -msgstr +msgstr Númer_o de filas: #: ../panel/panel-preferences-dialog.glade.h:25 msgid A_utomatically increase the length @@ -473,11 +474,11 @@ msgstr #: ../panel/panel-preferences-dialog.glade.h:30 #: ../plugins/separator/separator-dialog.glade.h:2 msgid _Style: -msgstr +msgstr _Estilo: #: ../panel/panel-preferences-dialog.glade.h:31 msgid _Alpha: -msgstr +msgstr _Alfa: #: ../panel/panel-preferences-dialog.glade.h:32 msgid @@ -487,7 +488,7 @@ msgstr Valor alpha del fondo del panel, siendo 0 completamente transparente y 1 #: ../panel/panel-preferences-dialog.glade.h:33 msgid C_olor: -msgstr +msgstr C_olor: #: ../panel/panel-preferences-dialog.glade.h:34 msgid Pick a Panel Color @@ -508,12 +509,12 @@ msgstr Fondo #. I18N: label for the enter transparency slider #: ../panel/panel-preferences-dialog.glade.h:39 msgid _Enter: -msgstr +msgstr _Entrada: #. I18N: label for the leave transparency slider #: ../panel/panel-preferences-dialog.glade.h:41 msgid _Leave: -msgstr +msgstr _Rastro: #: ../panel/panel-preferences-dialog.glade.h:42 msgid @@ -538,7 +539,7 @@ msgstr Habilitar la composición en el administrador de ventanas para las opcio #: ../panel/panel-preferences-dialog.glade.h:46 msgid Appeara_nce -msgstr +msgstr Apari_encia #: ../panel/panel-preferences-dialog.glade.h:47 #: ../plugins/launcher/launcher-dialog.glade.h:13 @@ -569,7 +570,7 @@ msgstr Mostrar informacion acerc del objeto seeccionado #: ../panel/panel-preferences-dialog.glade.h:53 msgid Ite_ms -msgstr +msgstr Obj_etos #: ../panel/panel-tic-tac-toe.c:123