[Xfce4-commits] thunar:master Don't allow starting multiple daemons (bug #3814).
Updating branch refs/heads/master to a05cae53be734fcb9c7ec7fa292ab4054d8c3ac0 (commit) from 4393f889f081f285c4cfd855bfd1bea730f28cf7 (commit) commit a05cae53be734fcb9c7ec7fa292ab4054d8c3ac0 Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 12:26:29 2012 +0200 Don't allow starting multiple daemons (bug #3814). Quit when the org.xfce.Thunar is already acquired. This is saver then quiting the running instance and take over, because the daemon could own windows or work on a transfer. In case things hang, the user can always run thunar -q and afterwards thunar --daemon. thunar/main.c| 13 --- thunar/thunar-dbus-service.c | 43 + thunar/thunar-dbus-service.h |4 ++- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/thunar/main.c b/thunar/main.c index 9de4bd3..b65c8e5 100644 --- a/thunar/main.c +++ b/thunar/main.c @@ -149,12 +149,12 @@ main (int argc, char **argv) { /* no error message, the GUI initialization failed */ const gchar *display_name = gdk_get_display_arg_name (); - g_fprintf (stderr, _(Thunar: Failed to open display: %s\n), (display_name != NULL) ? display_name : ); + g_printerr (_(Thunar: Failed to open display: %s\n), (display_name != NULL) ? display_name : ); } else { /* yep, there's an error, so print it */ - g_fprintf (stderr, _(Thunar: %s\n), error-message); + g_printerr (_(Thunar: %s\n), error-message); g_error_free (error); } return EXIT_FAILURE; @@ -187,7 +187,7 @@ main (int argc, char **argv) /* try to terminate whatever is running */ if (!thunar_dbus_client_terminate (error)) { - g_fprintf (stderr, Thunar: Failed to terminate running instance: %s\n, error-message); + g_printerr (Thunar: Failed to terminate running instance: %s\n, error-message); g_error_free (error); return EXIT_FAILURE; } @@ -259,7 +259,7 @@ main (int argc, char **argv) { /* we failed to process the filenames or the bulk rename failed */ error0: - g_fprintf (stderr, Thunar: %s\n, error-message); + g_printerr (Thunar: %s\n, error-message); g_object_unref (G_OBJECT (application)); g_error_free (error); return EXIT_FAILURE; @@ -278,6 +278,10 @@ error0: #ifdef HAVE_DBUS /* attach the D-Bus service */ dbus_service = g_object_new (THUNAR_TYPE_DBUS_SERVICE, NULL); + + /* check if the name was requested successfully */ + if (!thunar_dbus_service_has_connection (dbus_service)) +goto dbus_name_failed; #endif } else @@ -294,6 +298,7 @@ error0: gtk_main (); #ifdef HAVE_DBUS + dbus_name_failed: if (dbus_service != NULL) g_object_unref (G_OBJECT (dbus_service)); #endif diff --git a/thunar/thunar-dbus-service.c b/thunar/thunar-dbus-service.c index 33b9709..2e81061 100644 --- a/thunar/thunar-dbus-service.c +++ b/thunar/thunar-dbus-service.c @@ -258,7 +258,9 @@ thunar_dbus_service_class_init (ThunarDBusServiceClass *klass) static void thunar_dbus_service_init (ThunarDBusService *dbus_service) { - GError *error = NULL; + GError *error = NULL; + DBusConnection *dbus_connection; + gintresult; /* try to connect to the session bus */ dbus_service-connection = dbus_g_bus_get (DBUS_BUS_SESSION, error); @@ -268,10 +270,24 @@ thunar_dbus_service_init (ThunarDBusService *dbus_service) dbus_g_connection_register_g_object (dbus_service-connection, /org/xfce/FileManager, G_OBJECT (dbus_service)); /* request the org.xfce.Thunar name for Thunar */ - dbus_bus_request_name (dbus_g_connection_get_connection (dbus_service-connection), org.xfce.Thunar, DBUS_NAME_FLAG_REPLACE_EXISTING, NULL); + dbus_connection = dbus_g_connection_get_connection (dbus_service-connection); + result = dbus_bus_request_name (dbus_connection, org.xfce.Thunar, + DBUS_NAME_FLAG_ALLOW_REPLACEMENT | DBUS_NAME_FLAG_DO_NOT_QUEUE, NULL); + + /* check if we successfully acquired the name */ + if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) +{ + g_printerr (Thunar: D-BUS name org.xfce.Thunar already registered.\n); + + /* unset connection */ + dbus_g_connection_unref (dbus_service-connection); + dbus_service-connection = NULL; + + return; +} /* request the org.xfce.FileManager name for Thunar */ - dbus_bus_request_name (dbus_g_connection_get_connection (dbus_service-connection), org.xfce.FileManager, DBUS_NAME_FLAG_REPLACE_EXISTING, NULL); + dbus_bus_request_name (dbus_connection, org.xfce.FileManager, DBUS_NAME_FLAG_REPLACE_EXISTING, NULL); /* once we registered, unset dbus variables (bug #8800) */ g_unsetenv
[Xfce4-commits] thunar:master Make plugin warning non-fatal (bug #2604).
Updating branch refs/heads/master to 8b33ac5035afba919d656c7dc18b336a260a606d (commit) from a05cae53be734fcb9c7ec7fa292ab4054d8c3ac0 (commit) commit 8b33ac5035afba919d656c7dc18b336a260a606d Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 12:59:26 2012 +0200 Make plugin warning non-fatal (bug #2604). When compiler with low lever debugging, these warnings can result in an abort. Use g_printerr to avoid this, warnings are harmless anyway. thunarx/thunarx-provider-module.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c index 4f96ffd..5f998fb 100644 --- a/thunarx/thunarx-provider-module.c +++ b/thunarx/thunarx-provider-module.c @@ -184,7 +184,7 @@ thunarx_provider_module_load (GTypeModule *type_module) /* check if the load operation was successfull */ if (G_UNLIKELY (module-library == NULL)) { - g_warning (Failed to load plugin `%s': %s, type_module-name, g_module_error ()); + g_printerr (Thunar :Failed to load plugin `%s': %s\n, type_module-name, g_module_error ()); return FALSE; } @@ -193,7 +193,7 @@ thunarx_provider_module_load (GTypeModule *type_module) || !g_module_symbol (module-library, thunar_extension_initialize, (gpointer) module-initialize) || !g_module_symbol (module-library, thunar_extension_list_types, (gpointer) module-list_types)) { - g_warning (Plugin `%s' lacks required symbols., type_module-name); + g_printerr (Thunar :Plugin `%s' lacks required symbols.\n, type_module-name); g_module_close (module-library); return FALSE; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Directly popup menus on selected items (bug #3550).
Updating branch refs/heads/master to d0513de8a5faa8f2f9436a8b059e674a2deea103 (commit) from 8b33ac5035afba919d656c7dc18b336a260a606d (commit) commit d0513de8a5faa8f2f9436a8b059e674a2deea103 Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 13:49:28 2012 +0200 Directly popup menus on selected items (bug #3550). No need to delay this. It also resulted in no menu when gtk-menu-popup-delay = 0. thunar/thunar-details-view.c | 11 +++ 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c index 7bb2957..f0c3237 100644 --- a/thunar/thunar-details-view.c +++ b/thunar/thunar-details-view.c @@ -683,16 +683,11 @@ thunar_details_view_button_press_event (GtkTreeView *tree_view, gtk_tree_selection_select_path (selection, path); } gtk_tree_path_free (path); - - /* queue the menu popup */ - thunar_standard_view_queue_popup (THUNAR_STANDARD_VIEW (details_view), event); -} - else -{ - /* open the context menu */ - thunar_standard_view_context_menu (THUNAR_STANDARD_VIEW (details_view), event-button, event-time); } + /* open the context menu */ + thunar_standard_view_context_menu (THUNAR_STANDARD_VIEW (details_view), event-button, event-time); + return TRUE; } else if ((event-type == GDK_BUTTON_PRESS || event-type == GDK_2BUTTON_PRESS) event-button == 2) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Remove right-click drag possibility (bug #3549).
Updating branch refs/heads/master to edc8e5da5777813956cd8b30a4f64f586c97a3ee (commit) from d0513de8a5faa8f2f9436a8b059e674a2deea103 (commit) commit edc8e5da5777813956cd8b30a4f64f586c97a3ee Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 13:56:18 2012 +0200 Remove right-click drag possibility (bug #3549). This behaviour created conflicts with the previous commit and IMHO there is no reason to allow drags with the 3rd mouse button, only create for menu popup and 1st button for dragging. thunar/thunar-abstract-icon-view.c |2 +- thunar/thunar-standard-view.c | 145 2 files changed, 1 insertions(+), 146 deletions(-) diff --git a/thunar/thunar-abstract-icon-view.c b/thunar/thunar-abstract-icon-view.c index d244a79..301069f 100644 --- a/thunar/thunar-abstract-icon-view.c +++ b/thunar/thunar-abstract-icon-view.c @@ -496,7 +496,7 @@ thunar_abstract_icon_view_button_press_event (ExoIconView *view, gtk_tree_path_free (path); /* queue the menu popup */ - thunar_standard_view_queue_popup (THUNAR_STANDARD_VIEW (abstract_icon_view), event); + thunar_standard_view_context_menu (THUNAR_STANDARD_VIEW (abstract_icon_view), event-button, event-time); } else if ((event-state gtk_accelerator_get_default_mod_mask ()) == 0) { diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c index ebb2151..5b4c0a3 100644 --- a/thunar/thunar-standard-view.c +++ b/thunar/thunar-standard-view.c @@ -195,12 +195,6 @@ static GClosure *thunar_standard_view_new_files_closure (Thu GtkWidget*source_view); static void thunar_standard_view_new_files (ThunarStandardView *standard_view, GList*path_list); -static gboolean thunar_standard_view_button_release_event (GtkWidget*view, - GdkEventButton *event, - ThunarStandardView *standard_view); -static gboolean thunar_standard_view_motion_notify_event (GtkWidget*view, - GdkEventMotion *event, - ThunarStandardView *standard_view); static gboolean thunar_standard_view_key_press_event (GtkWidget*view, GdkEventKey *event, ThunarStandardView *standard_view); @@ -267,8 +261,6 @@ static void thunar_standard_view_sort_column_changed(Gtk static void thunar_standard_view_loading_unbound (gpointer user_data); static gboolean thunar_standard_view_drag_scroll_timer (gpointer user_data); static void thunar_standard_view_drag_scroll_timer_destroy (gpointer user_data); -static gboolean thunar_standard_view_drag_timer (gpointer user_data); -static void thunar_standard_view_drag_timer_destroy (gpointer user_data); static void thunar_standard_view_finished_thumbnailing (ThunarThumbnailer*thumbnailer, guint request, ThunarStandardView *standard_view); @@ -317,7 +309,6 @@ struct _ThunarStandardViewPrivate /* right-click drag/popup support */ GList *drag_g_file_list; gintdrag_scroll_timer_id; - gintdrag_timer_id; gintdrag_x; gintdrag_y; @@ -554,7 +545,6 @@ thunar_standard_view_init (ThunarStandardView *standard_view) { standard_view-priv = THUNAR_STANDARD_VIEW_GET_PRIVATE (standard_view); standard_view-priv-drag_scroll_timer_id = -1; - standard_view-priv-drag_timer_id = -1; standard_view-priv-selection_before_delete = NULL; @@ -742,10 +732,6 @@ thunar_standard_view_dispose (GObject *object) if (G_UNLIKELY (standard_view-priv-drag_scroll_timer_id = 0)) g_source_remove (standard_view-priv-drag_scroll_timer_id); - /* be sure to cancel any pending drag timer */ - if (G_UNLIKELY
[Xfce4-commits] exo:master Don't invert direction in RTL languages (bug #4285).
Updating branch refs/heads/master to 84efa47dcb615c7b8f4050f9db7c3b49167a0e32 (commit) from c7c5c3e531634d5717190f0dbdda2ec61060c2e9 (commit) commit 84efa47dcb615c7b8f4050f9db7c3b49167a0e32 Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 16:00:46 2012 +0200 Don't invert direction in RTL languages (bug #4285). exo/exo-icon-view.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c index 39bf93c..47b040d 100644 --- a/exo/exo-icon-view.c +++ b/exo/exo-icon-view.c @@ -4428,6 +4428,9 @@ exo_icon_view_move_cursor_left_right (ExoIconView *icon_view, if (!GTK_WIDGET_HAS_FOCUS (icon_view)) return; + if (gtk_widget_get_direction (GTK_WIDGET (icon_view)) == GTK_TEXT_DIR_RTL) +count *= -1; + direction = count 0 ? GTK_DIR_LEFT : GTK_DIR_RIGHT; if (!icon_view-priv-cursor_item) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskbar-plugin:master Removed whitespace from README.
Updating branch refs/heads/master to 5ae70547f78f225063f6845be07c87cac246c3e9 (commit) from 650c524ac9b9f3dd939e15975cebc2c96a7467e0 (commit) commit 5ae70547f78f225063f6845be07c87cac246c3e9 Author: Gearoid Murphy gear...@murphy.com Date: Sun Sep 30 15:02:47 2012 +0100 Removed whitespace from README. README |6 -- 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/README b/README index b0d9181..406855f 100644 --- a/README +++ b/README @@ -26,9 +26,3 @@ created if you pin something. The icon associated with the application is extracted and cached. This simple config file can be edited if the command line is not correct, as a simple workaround. - - - - - - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master l10n: Updated Serbian (sr) translation to 100%
Updating branch refs/heads/master to dfd361f2361c6f874c8533546dc2443aa1a10e34 (commit) from c2028dd2b89f4ec3d86dd1915f33225375cca592 (commit) commit dfd361f2361c6f874c8533546dc2443aa1a10e34 Author: Саша Петровић salepetron...@gmail.com Date: Sun Sep 30 16:21:43 2012 +0200 l10n: Updated Serbian (sr) translation to 100% New status: 185 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sr.po | 652 +++--- 1 files changed, 365 insertions(+), 287 deletions(-) diff --git a/po/sr.po b/po/sr.po index 03f838d..6544700 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2,20 +2,23 @@ # Copyright (C) 2012 # This file is distributed under the same license as the parole package. # salepetronije salepetron...@gmail.com, 2012. +# Саша Петровић salepetron...@gmail.com, 2012. +# msgid msgstr Project-Id-Version: parole.master\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-07-22 15:33+\n -PO-Revision-Date: 2012-07-22 22:36+0200\n -Last-Translator: salepetronije salepetron...@gmail.com\n +POT-Creation-Date: 2012-09-30 10:06+\n +PO-Revision-Date: 2012-09-30 16:20+0200\n +Last-Translator: Саша Петровић salepetron...@gmail.com\n Language-Team: српски xfce-i...@xfce.org\n Language: sr\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -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 +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 (n +%10010 || n%100=20) ? 1 : 2);\n +X-Generator: Gtranslator 2.91.5\n #: ../data/interfaces/parole.ui.h:1 msgid 16:9 (Widescreen) @@ -29,275 +32,333 @@ msgstr 20:9 (ДВБ) msgid 4:3 (TV) msgstr 4:3 (ТВ) -#: ../data/interfaces/parole.ui.h:4 -msgid Aspect Ratio -msgstr Размера +#: ../data/interfaces/parole.ui.h:4 ../src/misc/parole-filters.c:64 +msgid Audio +msgstr Звук #: ../data/interfaces/parole.ui.h:5 -msgid Auto -msgstr Самостално +msgid Audio Track: +msgstr Звучни запис: #: ../data/interfaces/parole.ui.h:6 -msgid Chapter Menu -msgstr Изборник поглавља - -#: ../data/interfaces/parole.ui.h:7 -msgid DVD -msgstr ДВД +msgid Auto +msgstr Самостално #: ../data/interfaces/parole.ui.h:8 -msgid DVD Menu -msgstr ДВД изборник +#, no-c-format +msgid Buffering (0%) +msgstr Смештам у међумеморију(0%) -#: ../data/interfaces/parole.ui.h:9 -msgid From ISO image -msgstr Из ИСО одраза +#: ../data/interfaces/parole.ui.h:9 ../src/parole-player.c:663 +msgid Empty +msgstr Празно -#: ../data/interfaces/parole.ui.h:10 -msgid Media player -msgstr Програм за пуштање звука и видеа +#: ../data/interfaces/parole.ui.h:10 ../src/parole-disc.c:125 +#: ../src/parole-disc.c:385 +msgid Insert Disc +msgstr Убаците диск #: ../data/interfaces/parole.ui.h:11 -msgid Mute -msgstr Утишај +msgid Languages +msgstr Језици -#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1215 -#: ../src/parole-disc-menu.c:113 -msgid Next Chapter -msgstr Следећe поглавље +#: ../data/interfaces/parole.ui.h:12 +msgid Media player +msgstr Програм за пуштање звука и видеа #: ../data/interfaces/parole.ui.h:13 msgid None msgstr Ништа -#: ../data/interfaces/parole.ui.h:14 ../src/parole-about.c:74 -#: ../plugins/window-title/window-title-provider.c:58 +#: ../data/interfaces/parole.ui.h:14 +msgid Open _location +msgstr Отвори _место + +#: ../data/interfaces/parole.ui.h:15 ../src/parole-about.c:55 msgid Parole Media Player msgstr Програм за пуштање звука и видеа Часноречац -#: ../data/interfaces/parole.ui.h:15 -msgid Plugins -msgstr Прикључци +#: ../data/interfaces/parole.ui.h:16 +msgid Pl_ugins +msgstr Пр_икључци -#: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1227 -#: ../src/parole-disc-menu.c:114 -msgid Previous Chapter -msgstr Претходно поглавље - -#: ../data/interfaces/parole.ui.h:17 ../src/parole-medialist.c:1264 -msgid Repeat -msgstr Понови +#: ../data/interfaces/parole.ui.h:17 +msgid Select Text Subtitles... +msgstr Одабери текстуални превод... #: ../data/interfaces/parole.ui.h:18 -msgid Select Track -msgstr Изабери нумеру +msgid Show _playlist +msgstr Прикажи списак нумера -#: ../data/interfaces/parole.ui.h:19 ../src/parole-medialist.c:1280 -msgid Shuffle -msgstr Насумично +#: ../data/interfaces/parole.ui.h:19 +msgid Square +msgstr Квадратни #: ../data/interfaces/parole.ui.h:20 -msgid Sound -msgstr Звук +msgid Subtitles +msgstr Преводи #: ../data/interfaces/parole.ui.h:21 -msgid Square -msgstr Квадратни +msgid Subtitles: +msgstr Преводи: #: ../data/interfaces/parole.ui.h:22 -msgid Volume Down -msgstr Утишај +msgid Volume _Down +msgstr У_тишај #: ../data/interfaces/parole.ui.h:23 -msgid Volume Up -msgstr Појачај +msgid Volume _Up +msgstr П_ојачај #: ../data/interfaces/parole.ui.h:24 +msgid _Aspect Ratio +msgstr _Однос ширине и висине + +#: ../data/interfaces/parole.ui.h:25 msgid
[Xfce4-commits] exo:master Check if uris also contain a slash (bug #9244).
Updating branch refs/heads/master to d11199bd3d543dd0575674531d91b208f64cc8cb (commit) from 84efa47dcb615c7b8f4050f9db7c3b49167a0e32 (commit) commit d11199bd3d543dd0575674531d91b208f64cc8cb Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 16:22:42 2012 +0200 Check if uris also contain a slash (bug #9244). Previously uris like http: passed the test, but in a lot of cases gio will hang on inpcomplete uris. So enforce :/, mailto: never works anyway. exo/exo-string.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/exo/exo-string.c b/exo/exo-string.c index 195c002..33f86f9 100644 --- a/exo/exo-string.c +++ b/exo/exo-string.c @@ -429,7 +429,7 @@ exo_str_looks_like_an_uri (const gchar *str) for (++s; g_ascii_isalnum (*s) || *s == '+' || *s == '-' || *s == '.'; ++s); /* scheme must be followed by : */ - return (*s == ':'); + return (*s == ':' *(s+1) == '/'); } return FALSE; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Make sure the dbus error is unset (bug #8046).
Updating branch refs/heads/master to 56d983d9387e3ea00feaaa3060a62383ccdf4ef9 (commit) from e121ed80d9bfba8b133ca1943f76ad48bcab9b76 (commit) commit 56d983d9387e3ea00feaaa3060a62383ccdf4ef9 Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 16:31:00 2012 +0200 Make sure the dbus error is unset (bug #8046). Shouldn't be needed, but better be sure. thunar/thunar-dbus-client.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/thunar/thunar-dbus-client.c b/thunar/thunar-dbus-client.c index 687eeb5..3d5a8a7 100644 --- a/thunar/thunar-dbus-client.c +++ b/thunar/thunar-dbus-client.c @@ -107,6 +107,7 @@ thunar_dbus_client_bulk_rename (const gchar *working_directory, g_free (display_name); /* send the message and release our references on connection and message */ + dbus_error_init (derror); result = dbus_connection_send_with_reply_and_block (connection, message, -1, derror); dbus_message_unref (message); @@ -210,6 +211,7 @@ thunar_dbus_client_launch_files (const gchar *working_directory, g_free (display_name); /* send the message and release our references on connection and message */ + dbus_error_init (derror); result = dbus_connection_send_with_reply_and_block (connection, message, -1, derror); dbus_message_unref (message); @@ -275,6 +277,7 @@ thunar_dbus_client_terminate (GError **error) dbus_message_set_auto_start (message, FALSE); /* send the message and release our references on connection and message */ + dbus_error_init (derror); result = dbus_connection_send_with_reply_and_block (connection, message, -1, derror); dbus_message_unref (message); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Show transfer rate in transfer dialog (bug #8250).
Updating branch refs/heads/master to f099302d60bbf463a8275d1be0547663b801a47d (commit) from 56d983d9387e3ea00feaaa3060a62383ccdf4ef9 (commit) commit f099302d60bbf463a8275d1be0547663b801a47d Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 18:29:36 2012 +0200 Show transfer rate in transfer dialog (bug #8250). Show transfer rate when copying/downloading a file. The rate is show after 10 seconds to be more reliable. The remaining time is also calculated with the transfer speed. This makes the time snappier when the transfer rate drops. thunar/thunar-pango-extensions.c | 20 thunar/thunar-pango-extensions.h |1 + thunar/thunar-progress-view.c| 98 ++--- thunar/thunar-transfer-job.c | 222 +++--- thunar/thunar-transfer-job.h |8 +- 5 files changed, 218 insertions(+), 131 deletions(-) diff --git a/thunar/thunar-pango-extensions.c b/thunar/thunar-pango-extensions.c index 6d4f301..391c27c 100644 --- a/thunar/thunar-pango-extensions.c +++ b/thunar/thunar-pango-extensions.c @@ -159,6 +159,26 @@ thunar_pango_attr_list_small_italic (void) /** + * thunar_pango_attr_list_small: + * + * Returns a #PangoAttrList for rendering small text. + * The returned list is owned by the callee and must + * not be freed or modified by the caller. + * + * Return value: a #PangoAttrList for rendering small text. + **/ +PangoAttrList* +thunar_pango_attr_list_small (void) +{ + static PangoAttrList *attr_list = NULL; + if (G_UNLIKELY (attr_list == NULL)) +attr_list = thunar_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_SMALL), NULL); + return attr_list; +} + + + +/** * thunar_pango_attr_list_underline_single: * * Returns a #PangoAttrList for underlining text using a single line. diff --git a/thunar/thunar-pango-extensions.h b/thunar/thunar-pango-extensions.h index 7c91e21..300d9af 100644 --- a/thunar/thunar-pango-extensions.h +++ b/thunar/thunar-pango-extensions.h @@ -29,6 +29,7 @@ PangoAttrList *thunar_pango_attr_list_big_bold (void) G_GNUC_CONST; PangoAttrList *thunar_pango_attr_list_bold (void) G_GNUC_CONST; PangoAttrList *thunar_pango_attr_list_italic(void) G_GNUC_CONST; PangoAttrList *thunar_pango_attr_list_small_italic (void) G_GNUC_CONST; +PangoAttrList *thunar_pango_attr_list_small (void) G_GNUC_CONST; PangoAttrList *thunar_pango_attr_list_underline_single (void) G_GNUC_CONST; G_END_DECLS; diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c index 60ab64c..d3461eb 100644 --- a/thunar/thunar-progress-view.c +++ b/thunar/thunar-progress-view.c @@ -30,6 +30,7 @@ #include thunar/thunar-pango-extensions.h #include thunar/thunar-private.h #include thunar/thunar-util.h +#include thunar/thunar-transfer-job.h #include thunar/thunar-progress-view.h @@ -91,11 +92,9 @@ struct _ThunarProgressView ThunarJob *job; - gint64 start_time; - gint64 last_update_time; - GtkWidget *progress_bar; GtkWidget *progress_label; + GtkWidget *message_label; gchar *icon_name; gchar *title; @@ -121,7 +120,7 @@ thunar_progress_view_class_init (ThunarProgressViewClass *klass) /** * ThunarProgressView:job: * - * The #ThunarJob, whose progress is displayed by this view, or + * The #ThunarJob, whose progress is displayed by this view, or * %NULL if no job is set. **/ g_object_class_install_property (gobject_class, @@ -177,11 +176,9 @@ thunar_progress_view_init (ThunarProgressView *view) GtkWidget *button; GtkWidget *vbox; GtkWidget *vbox2; + GtkWidget *vbox3; GtkWidget *hbox; - /* remember the current time as start time */ - view-start_time = g_get_real_time (); - vbox = gtk_vbox_new (FALSE, 6); gtk_container_add (GTK_CONTAINER (view), vbox); gtk_widget_show (vbox); @@ -205,27 +202,36 @@ thunar_progress_view_init (ThunarProgressView *view) gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE, TRUE, 0); gtk_widget_show (label); - view-progress_label = g_object_new (GTK_TYPE_LABEL, xalign, 0.0f, NULL); - gtk_label_set_ellipsize (GTK_LABEL (view-progress_label), PANGO_ELLIPSIZE_MIDDLE); - gtk_box_pack_start (GTK_BOX (vbox2), view-progress_label, TRUE, TRUE, 0); - gtk_widget_grab_focus (view-progress_label); - gtk_widget_show (view-progress_label); + view-message_label = g_object_new (GTK_TYPE_LABEL, xalign, 0.0f, NULL); + gtk_label_set_ellipsize (GTK_LABEL (view-message_label), PANGO_ELLIPSIZE_MIDDLE); + gtk_box_pack_start (GTK_BOX (vbox2), view-message_label, TRUE, TRUE, 0); + gtk_widget_show (view-message_label); hbox = gtk_hbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); - view-progress_bar = g_object_new (GTK_TYPE_PROGRESS_BAR, text, , NULL); - gtk_box_pack_start (GTK_BOX (hbox),
[Xfce4-commits] thunar:master Drop removed file from POTFILES.in.
Updating branch refs/heads/master to 9e0684eecacc7d6bc3c295f3910d0a4bfa761c21 (commit) from f099302d60bbf463a8275d1be0547663b801a47d (commit) commit 9e0684eecacc7d6bc3c295f3910d0a4bfa761c21 Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 18:32:40 2012 +0200 Drop removed file from POTFILES.in. po/POTFILES.in |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 74fb760..90b986a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,7 +14,6 @@ thunar/thunar-component.c thunar/thunar-create-dialog.c thunar/thunar-dbus-client.c thunar/thunar-dbus-service.c -thunar/thunar-debug.c thunar/thunar-deep-count-job.c thunar/thunar-details-view.c thunar/thunar-dialogs.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Set cancel message in progress label, not bar.
Updating branch refs/heads/master to 0901472b684d8621c50c04d95eb5783206f8 (commit) from 9e0684eecacc7d6bc3c295f3910d0a4bfa761c21 (commit) commit 0901472b684d8621c50c04d95eb5783206f8 Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 18:36:35 2012 +0200 Set cancel message in progress label, not bar. thunar/thunar-progress-view.c |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c index d3461eb..43a3afc 100644 --- a/thunar/thunar-progress-view.c +++ b/thunar/thunar-progress-view.c @@ -350,9 +350,8 @@ thunar_progress_view_cancel_job (ThunarProgressView *view) g_signal_handlers_disconnect_matched (view-job, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, thunar_progress_view_info_message, NULL); - /* update the progress bar text */ - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (view-progress_bar), - _(Cancelling...)); + /* update the status text */ + gtk_label_set_text (GTK_LABEL (view-progress_label), _(Cancelling...)); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Check free space before copying (bug #5658).
Updating branch refs/heads/master to ecad36219b96785e0549dd8ca133123a90c09a42 (commit) from 0901472b684d8621c50c04d95eb5783206f8 (commit) commit ecad36219b96785e0549dd8ca133123a90c09a42 Author: Nick Schermer n...@xfce.org Date: Sun Sep 30 21:36:40 2012 +0200 Check free space before copying (bug #5658). thunar/thunar-dialogs.c | 29 thunar/thunar-enum-types.c |1 + thunar/thunar-enum-types.h |2 + thunar/thunar-job.c | 28 +++ thunar/thunar-job.h |3 + thunar/thunar-transfer-job.c | 105 ++ 6 files changed, 159 insertions(+), 9 deletions(-) diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c index dc8b903..0021d2d 100644 --- a/thunar/thunar-dialogs.c +++ b/thunar/thunar-dialogs.c @@ -360,7 +360,8 @@ thunar_dialogs_show_job_ask (GtkWindow*parent, GString *secondary = g_string_sized_new (256); GString *primary = g_string_sized_new (256); gint response; - gint n, m; + gint n; + gboolean has_cancel = FALSE; _thunar_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), THUNAR_JOB_RESPONSE_CANCEL); _thunar_return_val_if_fail (g_utf8_validate (question, -1, NULL), THUNAR_JOB_RESPONSE_CANCEL); @@ -411,13 +412,10 @@ thunar_dialogs_show_job_ask (GtkWindow*parent, gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), %s, secondary-str); /* add the buttons based on the possible choices */ - for (n = 5; n = 0; --n) + for (n = 6; n = 0; --n) { - /* Cancel should be the last button, but Retry was added last */ - m = (n == 5) ? 3 : (n == 3) ? 5 : n; - /* check if the response is set */ - response = choices (1 m); + response = choices (1 n); if (response == 0) continue; @@ -443,11 +441,15 @@ thunar_dialogs_show_job_ask (GtkWindow*parent, mnemonic = _(_Retry); break; -case THUNAR_JOB_RESPONSE_CANCEL: - response = GTK_RESPONSE_CANCEL; - mnemonic = _(_Cancel); +case THUNAR_JOB_RESPONSE_FORCE: + mnemonic = _(Copy _Anyway); break; +case THUNAR_JOB_RESPONSE_CANCEL: + /* cancel is always the last option */ + has_cancel = TRUE; + continue; + default: g_assert_not_reached (); break; @@ -461,6 +463,15 @@ thunar_dialogs_show_job_ask (GtkWindow*parent, gtk_dialog_set_default_response (GTK_DIALOG (message), response); } + if (has_cancel) +{ + button = gtk_button_new_with_mnemonic (_(_Cancel)); + gtk_widget_set_can_default (button, TRUE); + gtk_dialog_add_action_widget (GTK_DIALOG (message), button, GTK_RESPONSE_CANCEL); + gtk_widget_show (button); + gtk_dialog_set_default_response (GTK_DIALOG (message), GTK_RESPONSE_CANCEL); +} + /* run the question dialog */ response = gtk_dialog_run (GTK_DIALOG (message)); gtk_widget_destroy (message); diff --git a/thunar/thunar-enum-types.c b/thunar/thunar-enum-types.c index d671338..35654a9 100644 --- a/thunar/thunar-enum-types.c +++ b/thunar/thunar-enum-types.c @@ -240,6 +240,7 @@ thunar_job_response_get_type (void) { THUNAR_JOB_RESPONSE_CANCEL, THUNAR_JOB_RESPONSE_CANCEL, cancel }, { THUNAR_JOB_RESPONSE_NO_ALL, THUNAR_JOB_RESPONSE_NO_ALL, no-all }, { THUNAR_JOB_RESPONSE_RETRY, THUNAR_JOB_RESPONSE_RETRY, retry }, + { THUNAR_JOB_RESPONSE_FORCE, THUNAR_JOB_RESPONSE_FORCE, force }, { 0, NULL, NULL } }; diff --git a/thunar/thunar-enum-types.h b/thunar/thunar-enum-types.h index 7df8ee8..b950052 100644 --- a/thunar/thunar-enum-types.h +++ b/thunar/thunar-enum-types.h @@ -204,6 +204,7 @@ GType thunar_zoom_level_get_type (void) G_GNUC_CONST; * @THUNAR_JOB_RESPONSE_NO_ALL : * @THUNAR_JOB_RESPONSE_CANCEL : * @THUNAR_JOB_RESPONSE_RETRY : + * @THUNAR_JOB_RESPONSE_FORCE : * * Possible responses for the ThunarJob::ask signal. **/ @@ -215,6 +216,7 @@ typedef enum /* flags */ THUNAR_JOB_RESPONSE_CANCEL = 1 3, THUNAR_JOB_RESPONSE_NO_ALL = 1 4, THUNAR_JOB_RESPONSE_RETRY = 1 5, + THUNAR_JOB_RESPONSE_FORCE = 1 6, } ThunarJobResponse; GType thunar_job_response_get_type (void) G_GNUC_CONST; diff --git a/thunar/thunar-job.c b/thunar/thunar-job.c index 0cd0389..0cd0c38 100644 --- a/thunar/thunar-job.c +++ b/thunar/thunar-job.c @@ -519,6 +519,34 @@ thunar_job_ask_skip (ThunarJob *job, gboolean +thunar_job_ask_no_size (ThunarJob *job, +const gchar *format, +...) +{ + ThunarJobResponse response; + va_list var_args; + + _thunar_return_val_if_fail (THUNAR_IS_JOB (job), THUNAR_JOB_RESPONSE_CANCEL); +
[Xfce4-commits] xfce4-datetime-plugin:master l10n: Updated Serbian (sr) translation to 100%
Updating branch refs/heads/master to fd6be33053cdeb6dc6f658e20db15c2db367f8fa (commit) from dc95f397e0988e0096f153975a4a38a0318fc02a (commit) commit fd6be33053cdeb6dc6f658e20db15c2db367f8fa Author: Саша Петровић salepetron...@gmail.com Date: Sun Sep 30 22:55:15 2012 +0200 l10n: Updated Serbian (sr) translation to 100% New status: 19 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sr.po | 16 +--- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/po/sr.po b/po/sr.po index ff31b09..611f869 100644 --- a/po/sr.po +++ b/po/sr.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR EMAIL@ADDRESS, YEAR. # Саша Петровић salepetron...@gmail.com, 2012. -# +# msgid msgstr Project-Id-Version: master\n @@ -15,8 +15,7 @@ msgstr MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 (n -%10010 || n%100=20) ? 1 : 2);\n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 (n%10010 || n%100=20) ? 1 : 2);\n X-Generator: Gtranslator 2.91.5\n #: ../panel-plugin/datetime.c:82 @@ -58,13 +57,11 @@ msgid Unable to open the following url: %s msgstr Не могу да отворим следећу адресу: %s #: ../panel-plugin/datetime-dialog.c:371 -#, fuzzy msgid Datetime msgstr Датум и време -#. #. * layout frame -#. +#. #: ../panel-plugin/datetime-dialog.c:391 msgid Layout msgstr Распоред @@ -76,9 +73,8 @@ msgstr Распоред msgid Format: msgstr Облик: -#. #. * Date frame -#. +#. #: ../panel-plugin/datetime-dialog.c:425 msgid Date msgstr Датум @@ -92,9 +88,8 @@ msgstr датум ће се јављати у облачићу. msgid Font: msgstr Словни лик: -#. #. * time frame -#. +#. #: ../panel-plugin/datetime-dialog.c:528 msgid Time msgstr Време @@ -108,6 +103,5 @@ msgid Date and Time plugin with a simple calendar msgstr Прикучак за датум и време са простим календаром #: ../panel-plugin/datetime.desktop.in.in.h:2 -#, fuzzy msgid DateTime msgstr Датум и време ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to d06ee0c270ca2ce1ca07da2a2bf311ff614f0fd2 (commit) from d11199bd3d543dd0575674531d91b208f64cc8cb (commit) commit d06ee0c270ca2ce1ca07da2a2bf311ff614f0fd2 Author: Sergio Marques smarque...@gmail.com Date: Mon Oct 1 00:12:25 2012 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 275 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 205 ++ 1 files changed, 112 insertions(+), 93 deletions(-) diff --git a/po/pt.po b/po/pt.po index 4069fe2..0d1f2a8 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,12 +2,12 @@ # Copyright (C) 2004-2006 os-cillation e.K. # This file is distributed under the same license as the exo package. # Nuno Miguel nunom...@gmail.com, 2007-2012. -# +# msgid msgstr Project-Id-Version: exo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-04-15 15:00+\n +POT-Creation-Date: 2012-09-30 20:09+\n PO-Revision-Date: 2012-04-26 23:16+0100\n Last-Translator: Nuno Miguel nunom...@gmail.com\n Language-Team: \n @@ -64,16 +64,18 @@ msgstr Falha ao ler o ficheiro \%s\: %s #: ../exo/exo-gdk-pixbuf-extensions.c:890 #, c-format -msgid Failed to load image \%s\: Unknown reason, probably a corrupt image file -msgstr Falha ao carregar a imagem \%s\: Motivo desconhecido, provavelmente um ficheiro de imagem corrompido +msgid +Failed to load image \%s\: Unknown reason, probably a corrupt image file +msgstr +Falha ao carregar a imagem \%s\: Motivo desconhecido, provavelmente um +ficheiro de imagem corrompido #: ../exo/exo-gtk-extensions.c:227 #, c-format msgid Failed to open \%s\. msgstr Falha ao abrir \%s\. -#: ../exo/exo-icon-bar.c:277 -#: ../exo/exo-icon-view.c:776 +#: ../exo/exo-icon-bar.c:277 ../exo/exo-icon-view.c:776 msgid Orientation msgstr Orientação @@ -81,23 +83,19 @@ msgstr Orientação msgid The orientation of the iconbar msgstr A orientação da barra de ícones -#: ../exo/exo-icon-bar.c:294 -#: ../exo/exo-icon-view.c:793 +#: ../exo/exo-icon-bar.c:294 ../exo/exo-icon-view.c:793 msgid Pixbuf column msgstr Coluna Pixbuf -#: ../exo/exo-icon-bar.c:295 -#: ../exo/exo-icon-view.c:794 +#: ../exo/exo-icon-bar.c:295 ../exo/exo-icon-view.c:794 msgid Model column used to retrieve the icon pixbuf from msgstr Coluna de modelo usada para retirar o ícone pixbuf -#: ../exo/exo-icon-bar.c:310 -#: ../exo/exo-icon-view.c:920 +#: ../exo/exo-icon-bar.c:310 ../exo/exo-icon-view.c:920 msgid Text column msgstr Coluna de texto -#: ../exo/exo-icon-bar.c:311 -#: ../exo/exo-icon-view.c:921 +#: ../exo/exo-icon-bar.c:311 ../exo/exo-icon-view.c:921 msgid Model column used to retrieve the text from msgstr Coluna de modelo usada para retirar o texto @@ -117,33 +115,27 @@ msgstr Ativo msgid Active item index msgstr Índice de item ativo -#: ../exo/exo-icon-bar.c:347 -#: ../exo/exo-icon-bar.c:348 +#: ../exo/exo-icon-bar.c:347 ../exo/exo-icon-bar.c:348 msgid Active item fill color msgstr Cor de preenchimento de item ativo -#: ../exo/exo-icon-bar.c:354 -#: ../exo/exo-icon-bar.c:355 +#: ../exo/exo-icon-bar.c:354 ../exo/exo-icon-bar.c:355 msgid Active item border color msgstr Cor de contorno de item ativo -#: ../exo/exo-icon-bar.c:361 -#: ../exo/exo-icon-bar.c:362 +#: ../exo/exo-icon-bar.c:361 ../exo/exo-icon-bar.c:362 msgid Active item text color msgstr Cor de texto de item ativo -#: ../exo/exo-icon-bar.c:368 -#: ../exo/exo-icon-bar.c:369 +#: ../exo/exo-icon-bar.c:368 ../exo/exo-icon-bar.c:369 msgid Cursor item fill color msgstr Cor de preenchimento do cursor -#: ../exo/exo-icon-bar.c:375 -#: ../exo/exo-icon-bar.c:376 +#: ../exo/exo-icon-bar.c:375 ../exo/exo-icon-bar.c:376 msgid Cursor item border color msgstr Cor de contorno do cursor -#: ../exo/exo-icon-bar.c:382 -#: ../exo/exo-icon-bar.c:383 +#: ../exo/exo-icon-bar.c:382 ../exo/exo-icon-bar.c:383 msgid Cursor item text color msgstr Cor de texto do cursor @@ -213,8 +205,7 @@ msgid All Icons msgstr Todos os ícones #. EXO_ICON_CHOOSER_CONTEXT_FILE -#: ../exo/exo-icon-chooser-dialog.c:139 -#: ../exo/exo-icon-chooser-dialog.c:285 +#: ../exo/exo-icon-chooser-dialog.c:139 ../exo/exo-icon-chooser-dialog.c:285 msgid Image Files msgstr Ficheiros de imagens @@ -286,7 +277,9 @@ msgstr Coluna de marcação #: ../exo/exo-icon-view.c:748 msgid Model column used to retrieve the text if using Pango markup -msgstr A coluna do modelo utilizada para retirar o texto se estiver a usar marcação Pango +msgstr +A coluna do modelo utilizada para retirar o texto se estiver a usar marcação +Pango #: ../exo/exo-icon-view.c:762 msgid Icon View Model @@ -297,8 +290,10 @@ msgid The model for the icon view msgstr O modelo para a visualização de ícone #: ../exo/exo-icon-view.c:777 -msgid How the text and icon of each item are positioned relative to each other -msgstr Como o texto e o ícone de cada
[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 4c4efe90497763eb8fff29a659f57cfb163df0ff (commit) from 62ced46be1b5d0afd0f1e9ac2799747541cfc42e (commit) commit 4c4efe90497763eb8fff29a659f57cfb163df0ff Author: Sergio Marques smarque...@gmail.com Date: Mon Oct 1 00:13:34 2012 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 336 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 138 ++ 1 files changed, 67 insertions(+), 71 deletions(-) diff --git a/po/pt.po b/po/pt.po index 0223679..39dba49 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-05-15 13:27+\n +POT-Creation-Date: 2012-09-30 18:27+\n PO-Revision-Date: 2012-04-27 15:49+0100\n Last-Translator: Nuno Miguel nunom...@gmail.com\n Language-Team: \n @@ -254,7 +254,7 @@ msgstr Informações da versão #: ../dialogs/display-settings/main.c:1043 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60 +#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60 #, c-format msgid Type '%s --help' for usage. msgstr Digite '%s --help' para informações de utilização. @@ -264,7 +264,7 @@ msgstr Digite '%s --help' para informações de utilização. #: ../dialogs/display-settings/main.c:1062 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76 +#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76 msgid The Xfce development team. All rights reserved. msgstr A equipa de desenvolvimento do Xfce. Todos os direitos reservados. @@ -273,7 +273,7 @@ msgstr A equipa de desenvolvimento do Xfce. Todos os direitos reservados. #: ../dialogs/display-settings/main.c:1063 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77 +#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77 #, c-format msgid Please report bugs to %s. msgstr Por favor, reporte os erros em %s. @@ -768,62 +768,82 @@ msgstr _Comportamento msgid Blink _delay: msgstr Intervalo _de intermitência: +# Automatically copied. Please review and remove fuzzy flag. #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:4 +msgid Change layout option +msgstr Alterar opção de esquema + +# Automatically copied. Please review and remove fuzzy flag. +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5 +msgid Compose key +msgstr Chave composta + +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6 msgid Cursor msgstr Cursor -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7 msgid Define _shortcuts for launching applications: msgstr Definir atal_hos para iniciar as aplicações: -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1 msgid Edit keyboard settings and application shortcuts msgstr Editar definições do teclado e atalhos das aplicações -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16 msgid General msgstr Geral -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2 msgid Keyboard msgstr Teclado -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11 msgid Keyboard layout msgstr Esquema do teclado -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 msgid Keyboard layout selection msgstr Seleção do esquema do teclado -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13 msgid Keyboard model msgstr Modelo do teclado -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 +# Automatically copied. Please review and remove fuzzy flag. +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14 +msgid Move currently selected item down by one row +msgstr Mover o item atualmente selecionado uma linha para baixo + +# Automatically copied. Please review and remove fuzzy flag. +#:
[Xfce4-commits] xfce4-mixer:master l10n: Updated Croatian (hr) translation to 30%
Updating branch refs/heads/master to 1e20447cbaf997bc1171cefffa3e8d1ce5ae5117 (commit) from 7c2d345dd099b73402dd41189f229f6e55a98d7c (commit) commit 1e20447cbaf997bc1171cefffa3e8d1ce5ae5117 Author: Ivica Kolić ik...@yahoo.com Date: Mon Oct 1 00:52:12 2012 +0200 l10n: Updated Croatian (hr) translation to 30% New status: 11 messages complete with 0 fuzzies and 25 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 18 +++--- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/po/hr.po b/po/hr.po index 121ec7d..de5ccfa 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-mixer package. # Ivica Kolić ik...@yahoo.com, 2011. -# +# msgid msgstr Project-Id-Version: xfce4-mixer\n @@ -11,15 +11,14 @@ msgstr PO-Revision-Date: 2011-10-31 00:38+0100\n Last-Translator: Ivica Kolić ik...@yahoo.com\n Language-Team: Croatian ik...@yahoo.com\n -Language: hr\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -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 +Language: hr\n +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 X-Poedit-Language: Croatian\n -X-Poedit-Country: CROATIA\n X-Poedit-SourceCharset: utf-8\n +X-Poedit-Country: CROATIA\n #. Add menu item for muting #: ../panel-plugin/xfce-mixer-plugin.c:306 @@ -37,9 +36,8 @@ msgid msgstr #: ../panel-plugin/xfce-mixer-plugin.c:931 -#, fuzzy msgid No command defined -msgstr Nijedna naredba lijevim klikom nije definirana +msgstr Nijedna naredba nije definirana #. Generate error message and insert the current command #: ../panel-plugin/xfce-mixer-plugin.c:939 @@ -60,9 +58,8 @@ msgstr #: ../panel-plugin/xfce-plugin-dialog.c:165 #: ../xfce4-mixer/xfce-mixer-window.c:185 -#, fuzzy msgid Sound _card: -msgstr Zvučna kartica: +msgstr Zvučna _kartica: #: ../panel-plugin/xfce-plugin-dialog.c:174 msgid Mixer _track: @@ -127,9 +124,8 @@ msgid S_witches msgstr #: ../xfce4-mixer/xfce-mixer-container.c:218 -#, fuzzy msgid _Options -msgstr Opcije +msgstr _Opcije #: ../xfce4-mixer/xfce-mixer-container.c:390 msgid No controls visible ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-places-plugin:master l10n: Updated Croatian (hr) translation to 75%
Updating branch refs/heads/master to e543dd54b8ae4328a87232115efa0be03181 (commit) from 6fc16d60a29a228e229cd02069bda1072b650931 (commit) commit e543dd54b8ae4328a87232115efa0be03181 Author: Ivica Kolić ik...@yahoo.com Date: Mon Oct 1 01:08:41 2012 +0200 l10n: Updated Croatian (hr) translation to 75% New status: 33 messages complete with 0 fuzzies and 11 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 10 -- 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/hr.po b/po/hr.po index d7f200c..b10daff 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,7 +2,7 @@ # Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-places-plugin package. # Ivica Kolićik...@yahoo.com, 2010. -# +# msgid msgstr Project-Id-Version: xfce4-places-plugin\n @@ -11,12 +11,11 @@ msgstr PO-Revision-Date: 2010-06-12 02:20+0200\n Last-Translator: Ivica Kolićik...@yahoo.com\n Language-Team: Croatian\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -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 +Language: \n +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 #. vim: set ai et tabstop=4: #: ../panel-plugin/places.desktop.in.h:1 ../panel-plugin/cfg.c:102 @@ -214,9 +213,8 @@ msgid Popup menu at current mouse position msgstr #: ../panel-plugin/xfce4-popup-places.sh:33 -#, fuzzy msgid Show help options -msgstr Pokaži op_ciju čisti +msgstr Pokaži opcije pomoći #: ../panel-plugin/xfce4-popup-places.sh:34 msgid Print version information and exit ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits