[Xfce4-commits] l10n: Updates to Japanese (ja) translation
Updating branch refs/heads/xfce-4.6 to d56a6e9b445dc1d7f8f369418e332f092210b128 (commit) from e1aa26d2149e831a99070339f012792423574242 (commit) commit d56a6e9b445dc1d7f8f369418e332f092210b128 Author: Masato Hashimoto Date: Tue Sep 29 02:23:49 2009 + l10n: Updates to Japanese (ja) translation Transmitted-via: Transifex (translations.xfce.org) po/ja.po | 363 +++-- 1 files changed, 161 insertions(+), 202 deletions(-) diff --git a/po/ja.po b/po/ja.po index 2b2eb12..fccd174 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,13 +5,12 @@ # HASHIMOTO Masato , 2008. # Nobuhiro Iwamatsu , 2008. # -#: ../xfsettingsd/main.c:127 msgid "" msgstr "" "Project-Id-Version: xfce 4-settings 4.5.90\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-16 23:37+0900\n" -"PO-Revision-Date: 2009-04-08 17:41+0900\n" +"POT-Creation-Date: 2009-01-25 20:50+0100\n" +"PO-Revision-Date: 2009-09-29 11:20+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -81,9 +80,7 @@ msgid "The amount of time, in milliseconds, required between keystrokes" msgstr "次ã®ãã¼å ¥åãåãä»ããããã¾ã§ã®æé (ms)" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16 -msgid "" -"The amount of time, in milliseconds, that must elapse before a keystroke " -"will be accepted" +msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted" msgstr "ãã¼ãæ¼ãã¦ãã確å®ãããã¾ã§æ¼ãã¤ã¥ããªããã°ãªããªãæé (ms)" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17 @@ -99,9 +96,7 @@ msgid "The time, in milliseconds, between repeated motion events" msgstr "ãã¼ãæ¼ããç¶ããã¨ãã®ãªãã¼ãåä½æééé (ms)" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20 -msgid "" -"The time, in milliseconds, between the initial key press and first repeated " -"motion event" +msgid "The time, in milliseconds, between the initial key press and first repeated motion event" msgstr "æåã«ãã¼ãæ¼ããã¦ããæ¼ããç¶ãã¦ããã¨èªèããã¾ã§ã®æé (ms)" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21 @@ -109,20 +104,12 @@ msgid "The time, in milliseconds, to get to maximum speed" msgstr "æ大é度ã«éããã¾ã§ã®æé (ms)" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22 -msgid "" -"To help prevent accidental keystrokes, slow keys requires that a key is held " -"for a certain minimum amount of time before the keystroke will be accepted" -msgstr "" -"ä¸æ ®ã®ãã¼å ¥åãé¿ãããã¨ãã«è¨å®ãã¾ããã¹ãã¼ãã¼ã¯æå®ãããæéãã¼ãæ¼" -"ãã¤ã¥ããªãã¨å ¥åã確å®ããªãããã«ãã¾ãã" +msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted" +msgstr "ä¸æ ®ã®ãã¼å ¥åãé¿ãããã¨ãã«è¨å®ãã¾ããã¹ãã¼ãã¼ã¯æå®ãããæéãã¼ãæ¼ãã¤ã¥ããªãã¨å ¥åã確å®ããªãããã«ãã¾ãã" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23 -msgid "" -"To help prevent accidental multiple keystrokes, bounce keys imposes a " -"minimum delay between keystrokes" -msgstr "" -"ä¸æ ®ã®è¤æ°ãã¼å ¥åãé¿ãããã¨ãã«è¨å®ãã¾ãããã¦ã³ã¹ãã¼ã¯ãã¼å ¥åå¾ãæå®" -"ãããæéãçµã¤ã¾ã§æ¬¡ã®ãã¼å ¥åãåãä»ããªãããã«ãã¾ãã" +msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes" +msgstr "ä¸æ ®ã®è¤æ°ãã¼å ¥åãé¿ãããã¨ãã«è¨å®ãã¾ãããã¦ã³ã¹ãã¼ã¯ãã¼å ¥åå¾ãæå®ãããæéãçµã¤ã¾ã§æ¬¡ã®ãã¼å ¥åãåãä»ããªãããã«ãã¾ãã" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 msgid "Use _bounce keys" @@ -137,36 +124,19 @@ msgid "Use slow _keys" msgstr "ã¹ãã¼ãã¼ã使ç¨ãã(_K)" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27 -msgid "" -"When selected, modifier keys (such as Control, Alt, and Shift) do not need " -"to be held down (they can be pressed and then released) when multiple keys " -"would normally need to be pressed at the same time" -msgstr "" -"ãã®ãªãã·ã§ã³ãè¨å®ããã¨ã修飾ãã¼ (CtrlãAltãããã³ Shift) ãæ¼ãã¦é¢ãã" -"å¾ãæ¼ããç¶æ ãç¶æããã修飾ãã¼ã¨ä»ã®ãã¼ãåæã«æ¼ãå¿ è¦ã®ããæä½ã§ãä¿®" -"飾ãã¼ãæ¼ããå¾ã«ä»ã®ãã¼ãæ¼ããã¨ã§åæã«æ¼ãããã®ã¨ãã¦åãä»ãããã¾" -"ãã" +msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released
[Xfce4-commits] Fix libxklavier API breakage
Updating branch refs/heads/master to 9a5096571c3e2fbe74e2ad8f7a89348c41cffef1 (commit) from 53c7e73900bdcec6ad8be2c9255d61fe9da6b4c9 (commit) commit 9a5096571c3e2fbe74e2ad8f7a89348c41cffef1 Author: Stephan Arts Date: Tue Sep 29 01:14:50 2009 +0200 Fix libxklavier API breakage configure.ac.in|2 ++ dialogs/keyboard-settings/Makefile.am |2 ++ dialogs/keyboard-settings/xfce-keyboard-settings.c |4 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index c71f424..1dd7626 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -135,6 +135,8 @@ dnl *** Optional support for Libxklavier *** dnl XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER], [libxklavier], [0.3.0], [libxklavier], [Keyboard layout selection]) +XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0], + [libxklavier], [Keyboard layout selection]) dnl dnl *** Xsettings daemon is optional *** diff --git a/dialogs/keyboard-settings/Makefile.am b/dialogs/keyboard-settings/Makefile.am index 85046c7..f72e7f5 100644 --- a/dialogs/keyboard-settings/Makefile.am +++ b/dialogs/keyboard-settings/Makefile.am @@ -23,6 +23,7 @@ xfce4_keyboard_settings_SOURCES = \ xfce4_keyboard_settings_CFLAGS = \ $(GTK_CFLAGS) \ $(LIBXKLAVIER_CFLAGS) \ + $(LIBXKLAVIER_0_4_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \ $(LIBXFCE4KBD_PRIVATE_CFLAGS) \ @@ -37,6 +38,7 @@ xfce4_keyboard_settings_LDFLAGS = \ xfce4_keyboard_settings_LDADD = \ $(GTK_LIBS) \ $(LIBXKLAVIER_LIBS) \ + $(LIBXKLAVIER_0_4_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ $(LIBXFCE4UI_LIBS) \ $(LIBXFCE4KBD_PRIVATE_LIBS) \ diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c index ddecc11..d4d07fe 100644 --- a/dialogs/keyboard-settings/xfce-keyboard-settings.c +++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c @@ -316,7 +316,11 @@ xfce_keyboard_settings_constructed (GObject *object) xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine); settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine); +#ifdef HAVE_LIBXKLAVIER4 + xkl_config_registry_load (settings->priv->xkl_registry, FALSE); +#else xkl_config_registry_load (settings->priv->xkl_registry); +#endif /* Tab */ xkb_tab_layout_vbox = gtk_builder_get_object (GTK_BUILDER (settings), "xkb_tab_layout_vbox"); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update version number
Updating branch refs/heads/xfce-4.6 to e1aa26d2149e831a99070339f012792423574242 (commit) from 968e311b96acea75fcddae0cce1274dfecec798c (commit) commit e1aa26d2149e831a99070339f012792423574242 Author: Stephan Arts Date: Tue Sep 29 00:56:21 2009 +0200 Update version number configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 0114194..8192299 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,7 +11,7 @@ dnl *** Version information *** dnl *** m4_define([xfce4_settings_version_major], [4]) m4_define([xfce4_settings_version_minor], [6]) -m4_define([xfce4_settings_version_micro], [1]) +m4_define([xfce4_settings_version_micro], [3]) m4_define([xfce4_settings_version_nano], []) m4_define([xfce4_settings_version_build], [...@revision@]) m4_define([xfce4_settings_version_tag], []) # Leave empty for releases ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce-4.6.3
Updating annotated tag refs/tags/xfce-4.6.3 as new annotated tag to fb700ddcef64ea52e6227187de98bf7f52ce4ff6 (tag) succeeds xfce-4.6.1 tagged by Stephan Arts on 2009-09-28 22:57 + Alexander Toresson (1): .: Brian Tarricone (2): avoid timing out xfce4-session on startup (bug 5040) add OnlyShowIn=XFCE; to xfce4-settings-helper autostart Denis Koryavov (1): l10n: Updates to Russian (ru) translation Dumitru Moldovan (1): Added initial xfce4-settings Romanian translation Gabor Kelemen (3): 2009-07-01 Gabor Kelemen 2009-07-10 Gabor Kelemen 2009-08-07 Gabor Kelemen Mike Massonnet (5): Merge strings from Xfce trunk to Xfce branch 4.6 update latvian translation update xfce-4-6 translations Drop svn:executable bit from po files Add Asturian translations Nick Schermer (4): Fix type in xfconf property name (debian bug #527238). Fix mnemonic widgets in accessibility dialog (bug #5550). Fix translation macros in settings helper (bug #5554). Always restore the default displa scheme on startup (bug #5311). Piarres Beobide (1): 4_6 xfce-settings basque translation update Stephan Arts (8): branch xfce 4.6 Use debug instead of version variable for --verbose cli option Update NEWS with info on previous commit Fix libxklavier API breakage Update NEWS Revert "l10n: Updates to Latvian (lv) translation" Revert "Revert "l10n: Updates to Latvian (lv) translation"" Update version number ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Count font names added to the list, to fix font combo boxes
Updating branch refs/heads/master to 7a5329a1e0467c87d62faa972c0138a67da39b00 (commit) from 6d31faecf3412b49663a08c2e3e7d453e9f87503 (commit) commit 7a5329a1e0467c87d62faa972c0138a67da39b00 Author: Christian Dywan Date: Mon Sep 28 23:54:39 2009 +0200 Count font names added to the list, to fix font combo boxes katze/katze-utils.c | 20 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index def1735..473d091 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -283,7 +283,7 @@ katze_property_proxy (gpointer object, || _hint == g_intern_string ("font-monospace"))) { GtkComboBox* combo; -int n_families, i; +gint n_families, i; PangoContext* context; PangoFontFamily** families; gboolean monospace = _hint == g_intern_string ("font-monospace"); @@ -296,14 +296,18 @@ katze_property_proxy (gpointer object, if (!string) string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); if (string) -for (i = 0; i < n_families; i++) { -const gchar* font = pango_font_family_get_name (families[i]); -if (monospace != pango_font_family_is_monospace (families[i])) -continue; -gtk_combo_box_append_text (combo, font); -if (!g_ascii_strcasecmp (font, string)) -gtk_combo_box_set_active (combo, i); +gint j = 0; +for (i = 0; i < n_families; i++) +{ +const gchar* font = pango_font_family_get_name (families[i]); +if (monospace != pango_font_family_is_monospace (families[i])) +continue; +gtk_combo_box_append_text (combo, font); +if (!g_ascii_strcasecmp (font, string)) +gtk_combo_box_set_active (combo, j); +j++; +} } gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE ( gtk_combo_box_get_model (combo)), 0, GTK_SORT_ASCENDING); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix libxklavier API breakage
Updating branch refs/heads/xfce-4.6 to f79784cce666abf810265747f1ab5f049cec2bd4 (commit) from 1772fa93f05331c040d4afded8d615f303a12e7a (commit) commit f79784cce666abf810265747f1ab5f049cec2bd4 Author: Stephan Arts Date: Mon Sep 28 23:00:28 2009 +0200 Fix libxklavier API breakage configure.ac.in|2 ++ dialogs/keyboard-settings/Makefile.am |2 ++ dialogs/keyboard-settings/xfce-keyboard-settings.c |4 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 38c0070..0114194 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -109,6 +109,8 @@ dnl *** Optional support for Libxklavier *** dnl XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER], [libxklavier], [0.3.0], [libxklavier], [Keyboard layout selection]) +XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0], + [libxklavier], [Keyboard layout selection]) dnl dnl *** Xsettings daemon is optional *** diff --git a/dialogs/keyboard-settings/Makefile.am b/dialogs/keyboard-settings/Makefile.am index 7bc7cbd..11c4ce1 100644 --- a/dialogs/keyboard-settings/Makefile.am +++ b/dialogs/keyboard-settings/Makefile.am @@ -26,6 +26,7 @@ xfce4_keyboard_settings_CFLAGS = \ $(GLADE_CFLAGS) \ $(DBUS_GLIB_CFLAGS) \ $(LIBXKLAVIER_CFLAGS) \ + $(LIBXKLAVIER_0_4_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(LIBXFCEGUI4_CFLAGS) \ $(LIBXFCE4KBD_PRIVATE_CFLAGS) \ @@ -42,6 +43,7 @@ xfce4_keyboard_settings_LDADD = \ $(GLADE_LIBS) \ $(DBUS_GLIB_LIBS) \ $(LIBXKLAVIER_LIBS) \ + $(LIBXKLAVIER_0_4_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ $(LIBXFCEGUI4_LIBS) \ $(LIBXFCE4KBD_PRIVATE_LIBS) \ diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c index d1cb69c..fe8251f 100644 --- a/dialogs/keyboard-settings/xfce-keyboard-settings.c +++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c @@ -378,7 +378,11 @@ xfce_keyboard_settings_constructed (GObject *object) xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine); settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine); +#ifdef HAVE_LIBXKLAVIER4 + xkl_config_registry_load (settings->priv->xkl_registry, FALSE); +#else xkl_config_registry_load (settings->priv->xkl_registry); +#endif /* Tab */ xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox"); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update NEWS
Updating branch refs/heads/xfce-4.6 to 31b414babbd3bc7936f51dceab7f5fd8331e9764 (commit) from f79784cce666abf810265747f1ab5f049cec2bd4 (commit) commit 31b414babbd3bc7936f51dceab7f5fd8331e9764 Author: Stephan Arts Date: Mon Sep 28 23:17:15 2009 +0200 Update NEWS NEWS |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 7b1663a..327e5b2 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ - Fix translation macros in settings helper (bug #5554). - Always restore the default displa scheme on startup (bug #5311). - Make sure --verbose is simmilar to --debug instead of --version +- Fix compile-issue with libxklavier >= 4 4.6.1 = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce-4.6.2
Updating annotated tag refs/tags/xfce-4.6.2 as new annotated tag to fe08a2eb5ab7076a1bf730943717e497ae715c6d (tag) succeeds xfce-4.6.1 tagged by Stephan Arts on 2009-09-28 22:02 + Alexander Toresson (1): .: Brian Tarricone (2): avoid timing out xfce4-session on startup (bug 5040) add OnlyShowIn=XFCE; to xfce4-settings-helper autostart Denis Koryavov (1): l10n: Updates to Russian (ru) translation Dumitru Moldovan (1): Added initial xfce4-settings Romanian translation Gabor Kelemen (3): 2009-07-01 Gabor Kelemen 2009-07-10 Gabor Kelemen 2009-08-07 Gabor Kelemen Mike Massonnet (5): Merge strings from Xfce trunk to Xfce branch 4.6 update latvian translation update xfce-4-6 translations Drop svn:executable bit from po files Add Asturian translations Nick Schermer (4): Fix type in xfconf property name (debian bug #527238). Fix mnemonic widgets in accessibility dialog (bug #5550). Fix translation macros in settings helper (bug #5554). Always restore the default displa scheme on startup (bug #5311). Piarres Beobide (1): 4_6 xfce-settings basque translation update Stephan Arts (5): branch xfce 4.6 Use debug instead of version variable for --verbose cli option Update NEWS with info on previous commit Fix compile issues with libxklavier >= 4 Update version number ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Only if a preriod follws is a typed number the start of an IP address
Updating branch refs/heads/master to 1d634247c7e013794a7d4c75843c0e926491b9d0 (commit) from 96093d906754a986ef9b6dae5eae0ba8411653d4 (commit) commit 1d634247c7e013794a7d4c75843c0e926491b9d0 Author: Christian Dywan Date: Mon Sep 28 23:01:48 2009 +0200 Only if a preriod follws is a typed number the start of an IP address midori/sokoke.c |4 ++-- tests/magic-uri.c |2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 0032aaf..bc16970 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -319,8 +319,8 @@ sokoke_magic_uri (const gchar* uri, if (g_strstr_len (uri, 8, "://")) return sokoke_idn_to_punycode (g_strdup (uri)); -/* Do we have a domain, ip address or localhost? */ -if (g_ascii_isdigit (uri[0])) +/* Do we have an IP address? */ +if (g_ascii_isdigit (uri[0]) && g_strstr_len (uri, 4, ".")) return g_strconcat ("http://";, uri, NULL); search = NULL; if (!strchr (uri, ' ') && diff --git a/tests/magic-uri.c b/tests/magic-uri.c index db9ea4e..38295f8 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -114,6 +114,8 @@ magic_uri_search (void) test_input ("gtk2.0", NULL); test_input ("pcre++", NULL); test_input ("sm pcre++", SM "pcre%2B%2B"); +test_input ("5580", NULL); +test_input ("sm 5580", SM "5580"); test_input ("midori0.1.0", NULL); test_input ("midori 0.1.0", NULL); test_input ("search:cats", NULL); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Default to Ctrl+Alt+U instead of Ctrl+U for View source
Updating branch refs/heads/master to 6d31faecf3412b49663a08c2e3e7d453e9f87503 (commit) from 1d634247c7e013794a7d4c75843c0e926491b9d0 (commit) commit 6d31faecf3412b49663a08c2e3e7d453e9f87503 Author: Christian Dywan Date: Mon Sep 28 23:10:31 2009 +0200 Default to Ctrl+Alt+U instead of Ctrl+U for View source midori/midori-browser.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4e7b6b8..3e722ab 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4433,7 +4433,7 @@ static const GtkActionEntry entries[] = { N_("Reset the zoom level"), G_CALLBACK (_action_zoom_normal_activate) }, { "Encoding", NULL, N_("_Encoding") }, { "SourceView", NULL, - N_("View So_urce"), "U", + N_("View So_urce"), "U", N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) }, { "SelectionSourceView", NULL, N_("View Selection Source"), "", ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updates to Spanish (Castilian) (es) translation
Updating branch refs/heads/master to bd128501c181c9e9115be42c1b05778180865b14 (commit) from dadc12e86641edb55e2e7b8317bf9d5a2411ff01 (commit) commit bd128501c181c9e9115be42c1b05778180865b14 Author: Ignacio Velasco Date: Mon Sep 28 20:37:43 2009 + l10n: Updates to Spanish (Castilian) (es) translation Transmitted-via: Transifex (translations.xfce.org) po/es.po | 236 -- 1 files changed, 92 insertions(+), 144 deletions(-) diff --git a/po/es.po b/po/es.po index 1b2b68d..5ddf6a0 100644 --- a/po/es.po +++ b/po/es.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" "POT-Creation-Date: 2009-09-27 23:47+0200\n" -"PO-Revision-Date: 2009-09-08 01:45-0300\n" +"PO-Revision-Date: 2009-09-28 17:43-0300\n" "Last-Translator: elega \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,11,-1,-1,-1\n" +"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,84,11,-1,-1,-1\n" #: ../src/main.c:59 msgid "Version information" @@ -35,8 +35,7 @@ msgid "" "Try %s --help to see a full list of available command line options.\n" msgstr "" "%s: %s\n" -"Pruebe %s --help para ver una lista completa de opciones de lÃnea de comando " -"disponibles.\n" +"Pruebe %s --help para ver una lista completa de opciones de lÃnea de comando disponibles.\n" #. File Menu #: ../src/main_window.c:264 @@ -45,69 +44,59 @@ msgstr "_Archivo" #: ../src/main_window.c:265 msgid "_Open" -msgstr "" +msgstr "_Abrir" #: ../src/main_window.c:265 -#, fuzzy msgid "Open an image" -msgstr "Abrir imagen" +msgstr "Abrir una imagen" #: ../src/main_window.c:266 -#, fuzzy msgid "Open _Folder" -msgstr "_Abrir carpeta" +msgstr "Abrir _carpeta" #: ../src/main_window.c:266 -#, fuzzy msgid "Open a folder" -msgstr "Abrir directorio" +msgstr "Abrir una carpeta" #: ../src/main_window.c:267 msgid "_Save copy" -msgstr "" +msgstr "_Guardar copia" #: ../src/main_window.c:267 msgid "Save a copy of the image" -msgstr "" +msgstr "Guardar una copia de la imagen" #: ../src/main_window.c:268 msgid "_Print" -msgstr "" +msgstr "_Imprimir" #: ../src/main_window.c:268 -#, fuzzy msgid "Print the image" -msgstr "_Precargar las imágenes" +msgstr "Imprimir esta imagen" #: ../src/main_window.c:269 -#, fuzzy msgid "_Close" -msgstr "Cerrar _todo" +msgstr "_Cerrar" #: ../src/main_window.c:269 -#, fuzzy msgid "Close this image" -msgstr "Cerrar _todo" +msgstr "Cerrar esta imagen" #: ../src/main_window.c:270 -#, fuzzy msgid "_Close All" -msgstr "Cerrar _todo" +msgstr "_Cerrar todo" #: ../src/main_window.c:270 -#, fuzzy msgid "Close all images" -msgstr "Cerrar _todo" +msgstr "Cerrar todas las imágenes" #: ../src/main_window.c:271 -#, fuzzy msgid "_Quit" -msgstr "_Editar" +msgstr "_Salir" #: ../src/main_window.c:271 -#, fuzzy msgid "Quit Ristretto" -msgstr "Ristretto" +msgstr "Salir de Ristretto" #. Edit Menu #: ../src/main_window.c:273 @@ -115,23 +104,20 @@ msgid "_Edit" msgstr "_Editar" #: ../src/main_window.c:274 -#, fuzzy msgid "_Open with..." -msgstr "Abrir con..." +msgstr "_Abrir con..." #: ../src/main_window.c:275 -#, fuzzy msgid "_Sorting" -msgstr "_Ampliar" +msgstr "_Ordenar" #: ../src/main_window.c:276 msgid "_Delete" -msgstr "" +msgstr "_Eliminar" #: ../src/main_window.c:277 -#, fuzzy msgid "_Preferences" -msgstr "Preferencias del visor de imágenes" +msgstr "_Preferencias" #. View Menu #: ../src/main_window.c:279 @@ -140,44 +126,39 @@ msgstr "_Ver" #: ../src/main_window.c:280 msgid "_Fullscreen" -msgstr "" +msgstr "_Pantalla completa" #: ../src/main_window.c:281 msgid "_Leave Fullscreen" -msgstr "" +msgstr "_Salir de pantalla completa" #: ../src/main_window.c:282 -#, fuzzy msgid "_Set as Wallpaper" msgstr "_Establecer como fondo de escritorio" #. Zoom submenu #: ../src/main_window.c:284 msgid "_Zooming" -msgstr "_Ampliar" +msgstr "_Zoom" #: ../src/main_window.c:285 -#, fuzzy msgid "Zoom _In" msgstr "_Ampliar" #: ../src/main_window.c:286 -#, fuzzy msgid "Zoom _Out" -msgstr "_Ampliar" +msgstr "_Reducir" #: ../src/main_window.c:287 -#, fuzzy msgid "Zoom _Fit" -msgstr "_Ampliar" +msgstr "_Ajustar" #: ../src/main_window.c:288 msgid "_Normal Size" -msgstr "" +msgstr "_Tamaño normal" #. Rotation submenu #: ../src/main_window.c:290 -#, fuzzy msgid "_Rotation" msgstr "_Rotar" @@ -196,19 +177,19 @@ msgstr "_Ir" #: ../src/main_window.c:295 msgid "_Forward" -msgstr "" +msgstr "_Avanzar" #: ../src/main_window.c:296 msgid "_Back" -msgstr "" +msgstr "_Retroceder" #: ../src/main_window.c:297 msgid "_First" -msgstr "" +msgstr "_Primera" #: ../src/main_window.c:298 msgid "_Last" -msgstr "" +msgstr "_Ultima" #. Help Menu #: ../src/main_window.c:300 @@ -217,96 +198,94 @@ msgstr "Ay_uda" #: ../s
[Xfce4-commits] Implement drag (finger) and kinetic scrolling with KatzeScrolled
Updating branch refs/heads/master to 96093d906754a986ef9b6dae5eae0ba8411653d4 (commit) from 7259066e20d982d98a554caf19c7c1134f4658eb (commit) commit 96093d906754a986ef9b6dae5eae0ba8411653d4 Author: Christian Dywan Date: Sun Sep 27 23:48:08 2009 +0200 Implement drag (finger) and kinetic scrolling with KatzeScrolled The feature is primarily interesting for mobile devices and by default enabled with gtk-touchscreen-mode. katze/katze-scrolled.c | 1086 +++ katze/katze-scrolled.h | 59 +++ katze/katze.h |1 + midori/midori-browser.c |3 - midori/midori-preferences.c | 17 +- midori/midori-view.c| 24 +- midori/midori-websettings.c | 25 + 7 files changed, 1203 insertions(+), 12 deletions(-) diff --git a/katze/katze-scrolled.c b/katze/katze-scrolled.c new file mode 100644 index 000..b7596f5 --- /dev/null +++ b/katze/katze-scrolled.c @@ -0,0 +1,1086 @@ +/* + Copyright (C) 2007 Henrik Hedberg + Copyright (C) 2009 Nadav Wiener + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "katze-scrolled.h" + +#define DEFAULT_INTERVAL 50 +#define DEFAULT_DECELERATION 0.7 +#define DEFAULT_DRAGGING_STOPPED_DELAY 100 + +/** + * SECTION:katze-scrolled + * @short_description: Implements drag scrolling and kinetic scrolling + * @see_also: #GtkScrolledWindow + * + * A scrolled window derived from #GtkScrolledWindow that implements + * drag scrolling and kinetic scrolling. Can be used as a drop-in replacement + * for the existing #GtkScrolledWindow. + * + * If a direct child of the #KatzeScrolled has its own window + * (InputOnly is enough for events), it is automatically activated when added + * as a child. All motion events in that area will be used to scroll. + * + * If some descendant widgets capture button press, button release and/ or + * motion nofity events, the user can not scroll the area by pressing those + * widgets (unless the widget is activated). #GtkButton is a typical example + * of that. Usually that is the desired behaviour. + * + * Any widget can be registered to provide pointer events for the + * #KatzeScrolled by using the + * #katze_scrolled_activate_scrolling function. + * + **/ + +G_DEFINE_TYPE (KatzeScrolled, katze_scrolled, GTK_TYPE_SCROLLED_WINDOW); + +enum +{ +PROP_0, + +PROP_DRAG_SCROLLING, +PROP_KINETIC_SCROLLING +}; + +static void +katze_scrolled_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +katze_scrolled_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +katze_scrolled_dispose (GObject* object); + +static void +katze_scrolled_activate_scrolling (KatzeScrolled* scrolled, + GtkWidget* widget); + +static void +katze_scrolled_set_drag_scrolling (KatzeScrolled* scrolled, + gboolean drag_scrolling); + +struct _KatzeScrolledPrivate +{ +/* Settings */ +guint interval; +gdouble deceleration; +gboolean drag_scrolling; +gboolean kinetic_scrolling; +guint32 dragging_stopped_delay; +gboolean scrolling_hints; + +/* Temporary variables */ +gboolean dragged; +gboolean press_received; +GdkWindow* synthetic_crossing_event_window; + +/* Disabling twice happening scrolling adjustment */ +GtkAdjustment* hadjustment; +GtkWidget* viewport; + +/* Motion scrolling */ +gint start_x; +gint start_y; +gint previous_x; +gint previous_y; +gint farest_x; +gint farest_y; +guint32 start_time; +guint32 previous_time; +guint32 farest_time; +gboolean going_right; +gboolean going_down; + +/* Kinetic scrolling */ +guint scrolling_timeout_id; +gdouble horizontal_speed; +gdouble vertical_speed; +gdouble horizontal_deceleration; +gdouble vertical_deceleration; + +/* Internal scrollbars */ +GdkWindow* vertical_scrollbar_window; +GdkWindow* horizontal_scrollbar_window; +gint vertical_scrollbar_size; +gint horizontal_scrollbar_size; +guint hide_scrollbars_timeout_id; +GdkGC* hilight_gc; +GdkGC* shadow_gc; +}; + +typedef struct _KatzeScrolledState KatzeScrolledState; +typedef gboolean (*KatzeScrolledEventHandler)(GdkEvent* event, + KatzeScrolledState* state, +
[Xfce4-commits] Apply the correct settings to source view tabs
Updating branch refs/heads/master to 7259066e20d982d98a554caf19c7c1134f4658eb (commit) from b70a2569dfbe82b8a5b36aca05418b5bce5c30b7 (commit) commit 7259066e20d982d98a554caf19c7c1134f4658eb Author: Christian Dywan Date: Sun Sep 27 23:37:08 2009 +0200 Apply the correct settings to source view tabs midori/midori-browser.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9949db0..1b7bc76 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3105,6 +3105,7 @@ _action_source_view_activate (GtkAction* action, GtkWidget* web_view; source = midori_view_new (browser->net); +midori_view_set_settings (MIDORI_VIEW (source), browser->settings); midori_view_set_uri (MIDORI_VIEW (source), ""); web_view = gtk_bin_get_child (GTK_BIN (source)); webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), TRUE); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Open source of local files directly with no temporary copy
Updating branch refs/heads/master to b70a2569dfbe82b8a5b36aca05418b5bce5c30b7 (commit) from f294d79a74b04dcef6fd7edfb14b2325022648a4 (commit) commit b70a2569dfbe82b8a5b36aca05418b5bce5c30b7 Author: Christian Dywan Date: Sat Sep 26 23:56:29 2009 +0200 Open source of local files directly with no temporary copy midori/midori-browser.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 042d856..9949db0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3147,6 +3147,13 @@ _action_source_view_activate (GtkAction* action, #endif } +if (g_str_has_prefix (uri, "file://")) +{ +gchar* filename = g_filename_from_uri (uri, NULL, NULL); +sokoke_spawn_program (text_editor, filename, TRUE); +g_free (filename); +return; +} katze_net_load_uri (browser->net, uri, NULL, (KatzeNetTransferCb)midori_browser_source_transfer_cb, browser); g_free (text_editor); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updates to Danish (da) translation
Updating branch refs/heads/master to dadc12e86641edb55e2e7b8317bf9d5a2411ff01 (commit) from 21a924b3ce5efbcd541919d6f219afdae1703d40 (commit) commit dadc12e86641edb55e2e7b8317bf9d5a2411ff01 Author: Per Kongstad Date: Mon Sep 28 16:42:46 2009 + l10n: Updates to Danish (da) translation Transmitted-via: Transifex (translations.xfce.org) po/da.po | 53 +++-- 1 files changed, 19 insertions(+), 34 deletions(-) diff --git a/po/da.po b/po/da.po index 7835d14..02d2878 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ristretto 0.0.22\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" "POT-Creation-Date: 2009-09-27 23:47+0200\n" -"PO-Revision-Date: 2009-09-20 17:59+0100\n" +"PO-Revision-Date: 2009-09-28 18:41+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -37,8 +37,7 @@ msgid "" "Try %s --help to see a full list of available command line options.\n" msgstr "" "%s: %s\n" -"Prøv %s --help for at se en fuld liste over tilgængelige " -"kommandolinjetilvalg.\n" +"Prøv %s --help for at se en fuld liste over tilgængelige kommandolinjetilvalg.\n" #. File Menu #: ../src/main_window.c:264 @@ -266,13 +265,15 @@ msgstr "Top" msgid "Bottom" msgstr "Bund" -#: ../src/main_window.c:514 ../src/main_window.c:780 +#: ../src/main_window.c:514 +#: ../src/main_window.c:780 msgid "Press open to select an image" msgstr "Tryk åbn for at vælge et billede" -#: ../src/main_window.c:767 ../src/main_window.c:772 +#: ../src/main_window.c:767 +#: ../src/main_window.c:772 msgid "Empty" -msgstr "" +msgstr "Tom" #: ../src/main_window.c:1545 msgid "Developer:" @@ -302,8 +303,10 @@ msgstr "Billeder" msgid ".jp(e)g" msgstr ".jp(e)g" -#: ../src/main_window.c:1917 ../src/main_window.c:1940 -#: ../src/main_window.c:2099 ../src/main_window.c:2114 +#: ../src/main_window.c:1917 +#: ../src/main_window.c:1940 +#: ../src/main_window.c:2099 +#: ../src/main_window.c:2114 msgid "Could not open file" msgstr "Kunne ikke åbne fil" @@ -342,7 +345,7 @@ msgstr "Maksimal renderingskvalitet:" #: ../src/preferences_dialog.c:269 msgid "Show preview when loading image" -msgstr "" +msgstr "Forhåndsvis ved indlæsning af billede" #: ../src/preferences_dialog.c:276 msgid "Best" @@ -426,19 +429,19 @@ msgstr "Undlad at skalere mere end 100%, når vindue maksimeres." #: ../src/preferences_dialog.c:421 msgid "Startup" -msgstr "" +msgstr "Opstart" #: ../src/preferences_dialog.c:423 msgid "Resize window to image on startup" -msgstr "" +msgstr "Tilpas vindue til billede ved opstart" #: ../src/preferences_dialog.c:427 msgid "Open entire folder on startup" -msgstr "" +msgstr "à bn hele mappen ved opstart" #: ../src/preferences_dialog.c:440 msgid "Memory" -msgstr "" +msgstr "Hukommelse" #: ../src/preferences_dialog.c:446 msgid "Image cache" @@ -469,70 +472,52 @@ msgid "Look at your photo's easily" msgstr "Se nemt dine billeder" #: ../ristretto.desktop.in.h:2 -#, fuzzy msgid "Photo Viewer" -msgstr "Ristretto billedviser" +msgstr "Billedfremviser" #: ../ristretto.desktop.in.h:3 -#, fuzzy msgid "Ristretto" -msgstr "Afslut ristretto" +msgstr "Ristretto" #~ msgid "_Thumbnail Bar" #~ msgstr "_Miniaturebjælke" - #~ msgid "Image Viewer" #~ msgstr "Billedfremviser" - #~ msgid "Opening file(s)..." #~ msgstr "à bne(r) fil(er)..." - #~ msgid "_Recently used" #~ msgstr "_Senest brugte" - #~ msgid "No applications available" #~ msgstr "Ingen tilgængelige programmer" - #~ msgid "Thumbnail _Viewer" #~ msgstr "Miniature_viser" - #~ msgid "Show _Horizontally" #~ msgstr "Vis _vandret" - #~ msgid "Show _Vertically" #~ msgstr "Vis _lodret" - #~ msgid "H_ide" #~ msgstr "S_kjul" - #~ msgid "" #~ "One or more images have been modified, do you want to save the changes?" #~ msgstr "" #~ "Et eller flere billeder er blevet ændret, ønsker du at gemme disse " #~ "ændringer?" - #~ msgid "Image viewer Preferences" #~ msgstr "Indstillinger for billedfremviser" - #~ msgid "_Preload images (GUI more responsive but more CPU-intensive)" #~ msgstr "" #~ "_Forindlæs billeder (Grafisk miljø reagerer hurtigere men vil bruge flere " #~ "processorresurser)" - #~ msgid "Hide the thumbnails bar during slideshow" #~ msgstr "Skjul miniaturebjælke under diasshow" - #~ msgid "Spacing" #~ msgstr "Mellemrum" - #~ msgid "The amount of space between the thumbnails" #~ msgstr "Hvor meget mellemrum der er mellem miniaturerne" - #~ msgid "Border Width" #~ msgstr "Kantbredde" - #~ msgid "The border width of the thumbnail-bar" #~ msgstr "Bredden af kanten rundt om miniaturebjælken" - #~ msgid "Xfce Image viewer" #~ msgstr "Billedfremviser til Xfce" + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add an XfcePanelTypeModule type for easier future expansion.
Updating branch refs/heads/devel to 741a69c403b2c6556536eb700f567951713eb99f (commit) from a89592ce7080a678e6aa3114508e3b7b21036e51 (commit) commit 741a69c403b2c6556536eb700f567951713eb99f Author: Nick Schermer Date: Mon Sep 28 15:56:26 2009 +0200 Add an XfcePanelTypeModule type for easier future expansion. libxfce4panel/libxfce4panel.h |6 +++- plugins/actions/actions.h |2 +- plugins/clock/clock-analog.h |2 +- plugins/clock/clock-binary.h |2 +- plugins/clock/clock-digital.h |2 +- plugins/clock/clock-fuzzy.h |2 +- plugins/clock/clock-lcd.h |2 +- plugins/clock/clock.h | 22 +- plugins/launcher/launcher.h |4 +- plugins/pager/pager.h |2 +- plugins/separator/separator.h |2 +- plugins/showdesktop/showdesktop.h |2 +- plugins/systray/systray-box.h | 42 ++-- plugins/systray/systray-manager.h | 18 plugins/systray/systray.h |2 +- plugins/tasklist/tasklist.c |2 +- plugins/windowmenu/windowmenu.h |2 +- 17 files changed, 59 insertions(+), 57 deletions(-) diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h index 057d764..c0715c4 100644 --- a/libxfce4panel/libxfce4panel.h +++ b/libxfce4panel/libxfce4panel.h @@ -61,7 +61,7 @@ G_BEGIN_DECLS } \ \ void \ - type_name##_register_type (GTypeModule *type_module) \ + type_name##_register_type (XfcePanelTypeModule *type_module) \ { \ GType plugin_define_type_id; \ static const GTypeInfo plugin_define_type_info = \ @@ -79,7 +79,7 @@ G_BEGIN_DECLS }; \ \ plugin_define_type_id = \ -g_type_module_register_type (type_module, TYPE_PARENT, \ +g_type_module_register_type (G_TYPE_MODULE (type_module), TYPE_PARENT, \ "Xfce" #TypeName, &plugin_define_type_info, 0); \ \ type_name##_type = plugin_define_type_id; \ @@ -115,6 +115,8 @@ typedef gboolean (*XfcePanelPluginPreInit) (gint argc, gchar **argv); typedef gboolean (*XfcePanelPluginCheck) (GdkScreen *screen); +typedef GTypeModule XfcePanelTypeModule; + /** * XFCE_PANEL_PLUGIN_REGISTER: * construct_func : name of the function that points to an diff --git a/plugins/actions/actions.h b/plugins/actions/actions.h index d4ba0f9..176629c 100644 --- a/plugins/actions/actions.h +++ b/plugins/actions/actions.h @@ -36,7 +36,7 @@ typedef struct _ActionsPlugin ActionsPlugin; GType actions_plugin_get_type (void) G_GNUC_CONST; -void actions_plugin_register_type (GTypeModule *type_module); +void actions_plugin_register_type (XfcePanelTypeModule *type_module); G_END_DECLS diff --git a/plugins/clock/clock-analog.h b/plugins/clock/clock-analog.h index 2be5da4..70b72f1 100644 --- a/plugins/clock/clock-analog.h +++ b/plugins/clock/clock-analog.h @@ -34,7 +34,7 @@ typedef struct _XfceClockAnalog XfceClockAnalog; GType xfce_clock_analog_get_type (void) G_GNUC_CONST; -void xfce_clock_analog_register_type (GTypeModule *type_module); +void xfce_clock_analog_register_type (XfcePanelTypeModule *type_module); GtkWidget *xfce_clock_analog_new (void) G_GNUC_MALLOC; diff --git a/plugins/clock/clock-binary.h b/plugins/clock/clock-binary.h index 9aea508..9bfef74 100644 --- a/plugins/clock/clock-binary.h +++ b/plugins/clock/clock-binary.h @@ -34,7 +34,7 @@ typedef struct _XfceClockBinary XfceClockBinary; GType xfce_clock_binary_get_type (void) G_GNUC_CONST; -void xfce_clock_binary_register_type (GTypeModule *type_module); +void xfce_clock_binary_register_type (XfcePanelTypeModule *type_module); GtkWidget *xfce_clock_binary_new (void) G_GNUC_MALLOC; diff --git a/plugins/clock/clock-digital.h b/plugins/clock/clock-digital.h index 814f0f3..0f90039 100644 --- a/plugins/clock/clock-digital.h +++ b/plugins/clock/clock-digital.h @@ -34,7 +34,7 @@ typedef struct _XfceClockDigital XfceClockDigital; GType xfce_clock_digital_get_type (void) G_GNUC_CONST; -void xfce_clock_digital_register_type (GTypeModule *type_module); +void xfce_clock_digital_register_type (XfcePanelTypeModule *type_module); GtkWidget *xfce_clock_digital_new (void) G_GNUC_MALLOC; diff --git a/plugins/clock/clock-fuzzy.h b/plugins/clock/clock-fuzzy.h index 7c308e0..5bca767 100644 --- a/plugins/clock/clock-fuzzy.h +++ b/plugins/clock/clock-fuzzy.h @@ -34,7 +34,7 @@ typedef struct _XfceClockFuzzy XfceClockFuzzy; GType xfce_clock_fuzzy_get_type (void) G_GNUC_CONST; -void xfce_clock_fuzzy_register_type (GTypeModule *type_module); +void xfce_clock_fuzzy_register_type (XfcePanelTypeModule *type_module); GtkWidget *xfce_clock_fuzzy_new (void) G_GNUC_MALLOC; diff --git a/plugins/clock/clock-lcd.h b/plugins/clock/clock-lcd.
[Xfce4-commits] Rename from common library to libpanel-common.la.
Updating branch refs/heads/devel to 1644b684282ea2fa36dac2c12797c901a36b345d (commit) from 0ef318f60296bf72f8e4a82221ec339839f8dd9d (commit) commit 1644b684282ea2fa36dac2c12797c901a36b345d Author: Nick Schermer Date: Mon Sep 28 15:44:24 2009 +0200 Rename from common library to libpanel-common.la. common/Makefile.am | 15 --- panel/Makefile.am |4 ++-- plugins/actions/Makefile.am|8 plugins/clock/Makefile.am |8 plugins/launcher/Makefile.am |4 ++-- plugins/pager/Makefile.am | 10 +- plugins/separator/Makefile.am |8 plugins/systray/Makefile.am|8 plugins/tasklist/Makefile.am |8 plugins/windowmenu/Makefile.am |8 10 files changed, 41 insertions(+), 40 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 3da0d91..e2dc649 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -2,28 +2,29 @@ INCLUDES = \ -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\"libpanel-xfconf\" \ + -DG_LOG_DOMAIN=\"libpanel-common\" \ -DLIBXFCE4PANEL_COMPILATION \ $(PLATFORM_CPPFLAGS) noinst_LTLIBRARIES = \ - libpanel-xfconf.la + libpanel-common.la -libpanel_xfconf_la_SOURCES = \ +libpanel_common_la_SOURCES = \ panel-builder.c \ panel-builder.h \ panel-xfconf.c \ panel-xfconf.h -libpanel_xfconf_la_CFLAGS = \ +libpanel_common_la_CFLAGS = \ $(XFCONF_CFLAGS) \ - $(GTK_CFLAGS) + $(GTK_CFLAGS) \ + $(PLATFORM_CFLAGS) -libpanel_xfconf_la_LDFLAGS = \ +libpanel_common_la_LDFLAGS = \ -no-undefined \ $(PLATFORM_LDFLAGS) -libpanel_xfconf_la_LIBADD = \ +libpanel_common_la_LIBADD = \ $(XFCONF_LIBS) \ $(GTK_LIBS) diff --git a/panel/Makefile.am b/panel/Makefile.am index 04e0452..c24cfac 100644 --- a/panel/Makefile.am +++ b/panel/Makefile.am @@ -67,7 +67,7 @@ xfce4_panel_LDFLAGS = \ xfce4_panel_LDADD = \ $(top_builddir)/libxfce4panel/libxfce4panel.la \ - $(top_builddir)/common/libpanel-xfconf.la \ + $(top_builddir)/common/libpanel-common.la \ $(GTK_LIBS) \ $(EXO_LIBS) \ $(GMODULE_LIBS) \ @@ -79,7 +79,7 @@ xfce4_panel_LDADD = \ xfce4_panel_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel.la \ - $(top_builddir)/common/libpanel-xfconf.la + $(top_builddir)/common/libpanel-common.la if MAINTAINER_MODE diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am index d1c7306..32336b5 100644 --- a/plugins/actions/Makefile.am +++ b/plugins/actions/Makefile.am @@ -23,9 +23,9 @@ libactions_la_CFLAGS = \ $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \ - $(PLATFORM_CFLAGS) \ $(EXO_CFLAGS) \ - $(XFCONF_CFLAGS) + $(XFCONF_CFLAGS) \ + $(PLATFORM_CFLAGS) libactions_la_LDFLAGS = \ -avoid-version \ @@ -36,7 +36,7 @@ libactions_la_LDFLAGS = \ libactions_la_LIBADD = \ $(top_builddir)/libxfce4panel/libxfce4panel.la \ - $(top_builddir)/common/libpanel-xfconf.la \ + $(top_builddir)/common/libpanel-common.la \ $(GTK_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ $(LIBXFCE4UI_LIBS) \ @@ -45,7 +45,7 @@ libactions_la_LIBADD = \ libactions_la_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel.la \ - $(top_builddir)/common/libpanel-xfconf.la + $(top_builddir)/common/libpanel-common.la # # .desktop file diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am index 360f1d7..9f3dcd3 100644 --- a/plugins/clock/Makefile.am +++ b/plugins/clock/Makefile.am @@ -34,9 +34,9 @@ libclock_la_CFLAGS = \ $(LIBXFCE4UTIL_CFLAGS) \ $(CAIRO_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \ - $(PLATFORM_CFLAGS) \ $(EXO_CFLAGS) \ - $(XFCONF_CFLAGS) + $(XFCONF_CFLAGS) \ + $(PLATFORM_CFLAGS) libclock_la_LDFLAGS = \ -avoid-version \ @@ -47,7 +47,7 @@ libclock_la_LDFLAGS = \ libclock_la_LIBADD = \ $(top_builddir)/libxfce4panel/libxfce4panel.la \ - $(top_builddir)/common/libpanel-xfconf.la \ + $(top_builddir)/common/libpanel-common.la \ $(GTK_LIBS) \ $(CAIRO_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ @@ -57,7 +57,7 @@ libclock_la_LIBADD = \ libclock_la_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel.la \ - $(top_builddir)/common/libpanel-xfconf.la + $(top_builddir)/common/libpanel-common.la # # .desktop file diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am index 13e6593..6a1a81a 100644 --- a/plugins/launcher/Makefile.am +++ b/plugins/launcher/Makefile.am @@ -44,7 +44,7 @@ liblauncher_la_LDFLAGS = \ liblauncher_la_LIBADD = \ $(top_builddir)/libxfce4panel/libxfce4panel.la \ - $(top_builddir)/common/libpanel-xfconf.la \ + $(top_builddi
[Xfce4-commits] Implement property saving during binding again.
Updating branch refs/heads/devel to a89592ce7080a678e6aa3114508e3b7b21036e51 (commit) from 1644b684282ea2fa36dac2c12797c901a36b345d (commit) commit a89592ce7080a678e6aa3114508e3b7b21036e51 Author: Nick Schermer Date: Mon Sep 28 15:56:00 2009 +0200 Implement property saving during binding again. common/panel-xfconf.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/common/panel-xfconf.c b/common/panel-xfconf.c index e3317c1..cd524d0 100644 --- a/common/panel-xfconf.c +++ b/common/panel-xfconf.c @@ -74,6 +74,10 @@ panel_properties_bind (XfconfChannel *channel, property = g_strconcat (property_base, "/", prop->property, NULL); xfconf_g_property_bind (channel, property, prop->type, object, prop->property); g_free (property); + + /* notify the property to it gets saved */ + if (save_properties) +g_object_notify (G_OBJECT (object), prop->property); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Drop support for the hour interval, minutes are idle enough.
Updating branch refs/heads/devel to ed0b56f8e7b8c1e8a2e2901beecced29f74e92c6 (commit) from db04e849bbcbc730562250a3df29d6704a251180 (commit) commit ed0b56f8e7b8c1e8a2e2901beecced29f74e92c6 Author: Nick Schermer Date: Mon Sep 28 13:11:42 2009 +0200 Drop support for the hour interval, minutes are idle enough. plugins/clock/clock.c | 15 --- plugins/clock/clock.h |1 - 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c index 74df604..8ba980f 100644 --- a/plugins/clock/clock.c +++ b/plugins/clock/clock.c @@ -638,6 +638,7 @@ clock_plugin_timeout_sync (gpointer user_data) } + ClockPluginTimeout * clock_plugin_timeout_new (guint interval, GSourceFunc function, @@ -687,9 +688,7 @@ clock_plugin_timeout_set_interval (ClockPluginTimeout *timeout, /* get the seconds to the next internal (+ 1 second)*/ g_get_current_time (&timeval); - if (interval == CLOCK_INTERVAL_HOUR) -next_interval = 3600 - timeval.tv_sec % 3600; - else if (interval == CLOCK_INTERVAL_MINUTE) + if (interval == CLOCK_INTERVAL_MINUTE) next_interval = 60 - timeval.tv_sec % 60; else next_interval = 0; @@ -778,10 +777,9 @@ guint clock_plugin_interval_from_format (const gchar *format) { const gchar *p; - guintinterval = CLOCK_INTERVAL_HOUR; if (G_UNLIKELY (!IS_STRING (format))) - return 0; + return CLOCK_INTERVAL_MINUTE; for (p = format; *p != '\0'; ++p) { @@ -797,14 +795,9 @@ clock_plugin_interval_from_format (const gchar *format) case 'T': case 'X': return CLOCK_INTERVAL_SECOND; - - case 'M': - case 'R': -interval = CLOCK_INTERVAL_MINUTE; -break; } } } - return interval; + return CLOCK_INTERVAL_MINUTE; } diff --git a/plugins/clock/clock.h b/plugins/clock/clock.h index 077fccf..cb2c3d0 100644 --- a/plugins/clock/clock.h +++ b/plugins/clock/clock.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #define CLOCK_INTERVAL_SECOND (1) #define CLOCK_INTERVAL_MINUTE (60) -#define CLOCK_INTERVAL_HOUR (3600) typedef struct _ClockPluginClockPlugin; typedef struct _ClockPluginClass ClockPluginClass; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Reschedule the timeout if the minute timer is not in sync with the system clock.
Updating branch refs/heads/devel to 0ef318f60296bf72f8e4a82221ec339839f8dd9d (commit) from ed0b56f8e7b8c1e8a2e2901beecced29f74e92c6 (commit) commit 0ef318f60296bf72f8e4a82221ec339839f8dd9d Author: Nick Schermer Date: Mon Sep 28 15:26:19 2009 +0200 Reschedule the timeout if the minute timer is not in sync with the system clock. plugins/clock/clock.c | 47 --- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c index 8ba980f..6dc6b2d 100644 --- a/plugins/clock/clock.c +++ b/plugins/clock/clock.c @@ -120,6 +120,7 @@ struct _ClockPluginTimeout GSourceFunc function; gpointerdata; guint timeout_id; + guint restart : 1; }; typedef struct @@ -600,8 +601,20 @@ static gboolean clock_plugin_timeout_running (gpointer user_data) { ClockPluginTimeout *timeout = user_data; + gbooleanresult; + struct tm tm; - return (timeout->function) (timeout->data); + result = (timeout->function) (timeout->data); + + /* check if the timeout still runs in time if updating once a minute */ + if (result && timeout->interval == CLOCK_INTERVAL_MINUTE) +{ + /* sync again when we don't run on time */ + clock_plugin_get_localtime (&tm); + timeout->restart = tm.tm_sec != 0; +} + + return result && !timeout->restart; } @@ -610,7 +623,11 @@ static void clock_plugin_timeout_destroyed (gpointer user_data) { ClockPluginTimeout *timeout = user_data; + timeout->timeout_id = 0; + + if (G_UNLIKELY (timeout->restart)) +clock_plugin_timeout_set_interval (timeout, timeout->interval); } @@ -654,6 +671,7 @@ clock_plugin_timeout_new (guint interval, timeout->function = function; timeout->data = data; timeout->timeout_id = 0; + timeout->restart = FALSE; clock_plugin_timeout_set_interval (timeout, interval); @@ -666,32 +684,38 @@ void clock_plugin_timeout_set_interval (ClockPluginTimeout *timeout, guint interval) { - GTimeVal timeval; - guintnext_interval; + struct tm tm; + guint next_interval; + gboolean restart = timeout->restart; panel_return_if_fail (timeout != NULL); panel_return_if_fail (interval > 0); - /* leave if nothing changed */ - if (G_UNLIKELY (timeout->interval == interval)) + /* leave if nothing changed and we're not restarting */ + if (!restart && timeout->interval == interval) return; timeout->interval = interval; + timeout->restart = FALSE; /* stop running timeout */ if (G_LIKELY (timeout->timeout_id != 0)) g_source_remove (timeout->timeout_id); timeout->timeout_id = 0; - /* run timeout, leave if it returns false */ - if (!(timeout->function) (timeout->data)) + /* run function when not restarting, leave if it returns false */ + if (!restart && !(timeout->function) (timeout->data)) return; - /* get the seconds to the next internal (+ 1 second)*/ - g_get_current_time (&timeval); + /* get the seconds to the next internal */ if (interval == CLOCK_INTERVAL_MINUTE) -next_interval = 60 - timeval.tv_sec % 60; +{ + clock_plugin_get_localtime (&tm); + next_interval = 60 - tm.tm_sec; +} else -next_interval = 0; +{ + next_interval = 0; +} if (next_interval > 0) { @@ -716,6 +740,7 @@ clock_plugin_timeout_free (ClockPluginTimeout *timeout) { panel_return_if_fail (timeout != NULL); + timeout->restart = FALSE; if (G_LIKELY (timeout->timeout_id != 0)) g_source_remove (timeout->timeout_id); g_slice_free (ClockPluginTimeout, timeout); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Only use { NULL } to end the array.
Updating branch refs/heads/devel to 658534e0764998b5ea9b42920578f2059e673055 (commit) from 91a6c5c9e5f9a52d3a12c07de94bc32651b50a97 (commit) commit 658534e0764998b5ea9b42920578f2059e673055 Author: Nick Schermer Date: Sat Sep 26 16:51:39 2009 +0200 Only use { NULL } to end the array. panel/panel-application.c |2 +- plugins/actions/actions.c |2 +- plugins/launcher/launcher.c |2 +- plugins/pager/pager.c |2 +- plugins/separator/separator.c |2 +- plugins/systray/systray.c |2 +- plugins/tasklist/tasklist.c |2 +- plugins/windowmenu/windowmenu.c |2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/panel/panel-application.c b/panel/panel-application.c index 9fbc0d7..4ce1dc2 100644 --- a/panel/panel-application.c +++ b/panel/panel-application.c @@ -255,7 +255,7 @@ panel_application_xfconf_window_bindings (PanelApplication *application, { "background-alpha", G_TYPE_UINT }, { "output-name", G_TYPE_STRING }, { "position", G_TYPE_STRING }, -{ NULL, G_TYPE_NONE } +{ NULL } }; panel_return_if_fail (XFCONF_IS_CHANNEL (application->xfconf)); diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c index 78268fc..3444646 100644 --- a/plugins/actions/actions.c +++ b/plugins/actions/actions.c @@ -296,7 +296,7 @@ actions_plugin_construct (XfcePanelPlugin *panel_plugin) { { "first-action", G_TYPE_UINT }, { "second-action", G_TYPE_UINT }, -{ NULL, G_TYPE_NONE } +{ NULL } }; /* show the properties dialog */ diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c index 743fc1f..548f9a0 100644 --- a/plugins/launcher/launcher.c +++ b/plugins/launcher/launcher.c @@ -645,7 +645,7 @@ launcher_plugin_construct (XfcePanelPlugin *panel_plugin) { "disable-tooltips", G_TYPE_BOOLEAN }, { "move-first", G_TYPE_BOOLEAN }, { "arrow-position", G_TYPE_UINT }, -{ NULL, G_TYPE_NONE } +{ NULL } }; /* show the configure menu item */ diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c index d70f50c..c381153 100644 --- a/plugins/pager/pager.c +++ b/plugins/pager/pager.c @@ -305,7 +305,7 @@ pager_plugin_construct (XfcePanelPlugin *panel_plugin) { "workspace-scrolling", G_TYPE_BOOLEAN }, { "show-names", G_TYPE_BOOLEAN }, { "rows", G_TYPE_UINT }, -{ NULL, G_TYPE_NONE } +{ NULL } }; /* show the properties dialog */ diff --git a/plugins/separator/separator.c b/plugins/separator/separator.c index 6bdcb6a..a2226b2 100644 --- a/plugins/separator/separator.c +++ b/plugins/separator/separator.c @@ -283,7 +283,7 @@ separator_plugin_construct (XfcePanelPlugin *panel_plugin) { { "style", G_TYPE_UINT }, { "expand", G_TYPE_BOOLEAN }, -{ NULL, G_TYPE_NONE } +{ NULL } }; /* show the properties dialog */ diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c index 839cd01..e591d9f 100644 --- a/plugins/systray/systray.c +++ b/plugins/systray/systray.c @@ -293,7 +293,7 @@ systray_plugin_construct (XfcePanelPlugin *panel_plugin) { { "rows", G_TYPE_UINT }, { "show-frame", G_TYPE_BOOLEAN }, -{ NULL, G_TYPE_NONE } +{ NULL } }; /* show configure */ diff --git a/plugins/tasklist/tasklist.c b/plugins/tasklist/tasklist.c index b93e9a0..125e8c2 100644 --- a/plugins/tasklist/tasklist.c +++ b/plugins/tasklist/tasklist.c @@ -127,7 +127,7 @@ tasklist_plugin_construct (XfcePanelPlugin *panel_plugin) { "show-only-minimized", G_TYPE_BOOLEAN }, { "show-wireframes", G_TYPE_BOOLEAN }, { "show-handle", G_TYPE_BOOLEAN }, -{ NULL, G_TYPE_NONE } +{ NULL } }; /* show configure */ diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c index 08a81d5..5f34209 100644 --- a/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c @@ -382,7 +382,7 @@ window_menu_plugin_construct (XfcePanelPlugin *panel_plugin) { "workspace-names", G_TYPE_BOOLEAN }, { "urgentcy-notification", G_TYPE_BOOLEAN }, { "all-workspaces", G_TYPE_BOOLEAN }, -{ NULL, G_TYPE_NONE } +{ NULL } }; /* show configure */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use defines in the enum to make things easier to understand.
Updating branch refs/heads/devel to 91a6c5c9e5f9a52d3a12c07de94bc32651b50a97 (commit) from bd95ce0f8ec9413274c9b20c7ba037810f0f1e9a (commit) commit 91a6c5c9e5f9a52d3a12c07de94bc32651b50a97 Author: Nick Schermer Date: Sat Sep 26 15:47:29 2009 +0200 Use defines in the enum to make things easier to understand. plugins/separator/separator.c | 15 ++- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/separator/separator.c b/plugins/separator/separator.c index 8475906..6bdcb6a 100644 --- a/plugins/separator/separator.c +++ b/plugins/separator/separator.c @@ -64,7 +64,12 @@ enum _SeparatorPluginStyle SEPARATOR_PLUGIN_STYLE_SEPARATOR, SEPARATOR_PLUGIN_STYLE_HANDLE, SEPARATOR_PLUGIN_STYLE_DOTS, - SEPARATOR_PLUGIN_STYLE_WRAP + SEPARATOR_PLUGIN_STYLE_WRAP, + + /* defines */ + SEPARATOR_PLUGIN_STYLE_MIN = SEPARATOR_PLUGIN_STYLE_TRANSPARENT, + SEPARATOR_PLUGIN_STYLE_MAX = SEPARATOR_PLUGIN_STYLE_WRAP, + SEPARATOR_PLUGIN_STYLE_DEFAULT = SEPARATOR_PLUGIN_STYLE_SEPARATOR }; struct _SeparatorPluginClass @@ -120,9 +125,9 @@ separator_plugin_class_init (SeparatorPluginClass *klass) PROP_STYLE, g_param_spec_uint ("style", NULL, NULL, - SEPARATOR_PLUGIN_STYLE_TRANSPARENT, - SEPARATOR_PLUGIN_STYLE_WRAP, - SEPARATOR_PLUGIN_STYLE_SEPARATOR, + SEPARATOR_PLUGIN_STYLE_MIN, + SEPARATOR_PLUGIN_STYLE_MAX, + SEPARATOR_PLUGIN_STYLE_DEFAULT, EXO_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -139,7 +144,7 @@ static void separator_plugin_init (SeparatorPlugin *plugin) { /* initialize */ - plugin->style = SEPARATOR_PLUGIN_STYLE_SEPARATOR; + plugin->style = SEPARATOR_PLUGIN_STYLE_DEFAULT; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Move the show configure function to the contruct function to avoid error.
Updating branch refs/heads/devel to bd95ce0f8ec9413274c9b20c7ba037810f0f1e9a (commit) from b2574d81573f3019be708ae927f880f19ebdb07d (commit) commit bd95ce0f8ec9413274c9b20c7ba037810f0f1e9a Author: Nick Schermer Date: Sat Sep 26 15:40:46 2009 +0200 Move the show configure function to the contruct function to avoid error. plugins/clock/clock.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c index 58b410c..e96bd59 100644 --- a/plugins/clock/clock.c +++ b/plugins/clock/clock.c @@ -162,9 +162,6 @@ clock_plugin_init (ClockPlugin *plugin) plugin->tooltip_interval = 0; plugin->clock_timeout_id = 0; - /* show configure */ - xfce_panel_plugin_menu_show_configure (XFCE_PANEL_PLUGIN (plugin)); - /* create frame widget */ plugin->frame = gtk_frame_new (NULL); gtk_container_add (GTK_CONTAINER (plugin), plugin->frame); @@ -216,6 +213,9 @@ clock_plugin_construct (XfcePanelPlugin *panel_plugin) gboolean show_frame; guint mode; + /* show configure */ + xfce_panel_plugin_menu_show_configure (XFCE_PANEL_PLUGIN (plugin)); + /* set the xfconf channel */ plugin->channel = xfce_panel_plugin_xfconf_channel_new (panel_plugin); g_signal_connect (G_OBJECT (plugin->channel), "property-changed", ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-power-manager
Updating branch refs/heads/master to 40b01c3a4993d0054f9d85b8869b4d7a457a1a48 (commit) from e031e0f91c40c44620c1224c79e5b60008a1ec82 (commit) commit 40b01c3a4993d0054f9d85b8869b4d7a457a1a48 Merge: e031e0f91c40c44620c1224c79e5b60008a1ec82 ee99de2ef97a58bdc63c5a35185ff54b518ed780 Author: Ali Abdallah Date: Mon Sep 28 15:13:36 2009 + Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-power-manager commit ee99de2ef97a58bdc63c5a35185ff54b518ed780 Author: Andhika Padmawan Date: Sun Sep 20 08:03:00 2009 + l10n: Updates to Indonesian (id) translation Transmitted-via: Transifex (translations.xfce.org) commit 0458addb7891e79112e21bf0d09f97c627c63265 Author: Evaggelos Balaskas Date: Wed Sep 9 21:28:35 2009 + l10n: Updates to Greek (el) translation Transmitted-via: Transifex (translations.xfce.org) po/el.po | 572 +++-- po/id.po | 22 +-- 2 files changed, 150 insertions(+), 444 deletions(-) diff --git a/po/el.po b/po/el.po index 8b9688c..ab23b0c 100644 --- a/po/el.po +++ b/po/el.po @@ -5,17 +5,20 @@ # Evaggelos Balaskas , 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: xfce4-power-manager\n" +"Project-Id-Version: xfce4-power-manager git\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-08-27 09:02+\n" -"PO-Revision-Date: 2009-04-21 21:28+0200\n" +"PO-Revision-Date: 2009-09-10 00:28+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Greek\n" +"X-Poedit-Country: GREECE\n" +"X-Poedit-SourceCharset: utf-8\n" #: ../data/interfaces/xfpm-settings.ui.h:1 msgid "Actions" @@ -38,24 +41,26 @@ msgid "Monitor" msgstr "ÎθÏνη" #: ../data/interfaces/xfpm-settings.ui.h:6 -#, fuzzy msgid "Actions" -msgstr "ÎνÎÏγειεÏ" +msgstr "ÎνÎÏγειεÏ" #: ../data/interfaces/xfpm-settings.ui.h:7 -#, fuzzy msgid "CPU frequency control" -msgstr "ÎνεÏγοÏοίηÏη ελÎγÏÎ¿Ï Î±Ï Î¾Î¿Î¼ÎµÎ¯ÏÏÎ·Ï ÏÏ ÏνÏÏηÏÎ±Ï ÎµÏεξεÏγαÏÏή" +msgstr "ΡÏθμιÏη ÏÎ·Ï ÏÏ ÏνÏÏηÏÎ±Ï CPU" #: ../data/interfaces/xfpm-settings.ui.h:8 msgid "Consider the computer on low power at:" msgstr "ÎεÏÏείÏÏε Ïον Ï ÏολογιÏÏή Ïε λίγο ÏεÏμα ÏÏο:" #. Hibernate menu option -#: ../data/interfaces/xfpm-settings.ui.h:9 ../settings/xfpm-settings.c:775 -#: ../settings/xfpm-settings.c:846 ../settings/xfpm-settings.c:970 -#: ../settings/xfpm-settings.c:1125 ../settings/xfpm-settings.c:1183 -#: ../settings/xfpm-settings.c:1238 ../src/xfpm-tray-icon.c:174 +#: ../data/interfaces/xfpm-settings.ui.h:9 +#: ../settings/xfpm-settings.c:775 +#: ../settings/xfpm-settings.c:846 +#: ../settings/xfpm-settings.c:970 +#: ../settings/xfpm-settings.c:1125 +#: ../settings/xfpm-settings.c:1183 +#: ../settings/xfpm-settings.c:1238 +#: ../src/xfpm-tray-icon.c:174 #: ../src/xfpm-tray-icon.c:266 msgid "Hibernate" msgstr "ÎδÏανοÏοίηÏη" @@ -65,18 +70,19 @@ msgid "Lock screen when going for suspend/hibernate" msgstr "ÎλείδÏμα οθÏÎ½Î·Ï ÏÏαν μεÏαβαίνει για αναÏÏολή/αδÏανοÏοίηÏη" #: ../data/interfaces/xfpm-settings.ui.h:11 -#, fuzzy msgid "Monitor" -msgstr "ÎθÏνη" +msgstr "ÎθÏνη" #: ../data/interfaces/xfpm-settings.ui.h:12 -#, fuzzy msgid "Monitor power management control" -msgstr "ÎνεÏγοÏοίηÏη ÏÏÎ¿Î²Î¿Î»Î®Ï ÎµÎ»ÎγÏÎ¿Ï Î´Î¹Î±ÏείÏιÏÎ·Ï ÏεÏμαÏοÏ" - -#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:764 -#: ../settings/xfpm-settings.c:835 ../settings/xfpm-settings.c:959 -#: ../settings/xfpm-settings.c:1114 ../settings/xfpm-settings.c:1172 +msgstr "ΠαÏακολοÏθηÏη ελÎγÏÎ¿Ï Î´Î¹Î±ÏείÏιÏÎ·Ï ÏεÏμαÏοÏ" + +#: ../data/interfaces/xfpm-settings.ui.h:13 +#: ../settings/xfpm-settings.c:764 +#: ../settings/xfpm-settings.c:835 +#: ../settings/xfpm-settings.c:959 +#: ../settings/xfpm-settings.c:1114 +#: ../settings/xfpm-settings.c:1172 #: ../settings/xfpm-settings.c:1227 msgid "Nothing" msgstr "ΤίÏοÏα" @@ -94,19 +100,16 @@ msgid "Put display to sleep when computer is inactive for:" msgstr "ÎλείÏιμο οθÏÎ½Î·Ï ÏÏαν ο Ï ÏολογιÏÏÎ®Ï ÎµÎ¯Î½Î±Î¹ ανενεÏγÏÏ Î³Î¹Î±:" #: ../data/interfaces/xfpm-settings.ui.h:17 -#, fuzzy msgid "Put the computer to sleep when inactive for:" -msgstr "ÎλείÏιμο οθÏÎ½Î·Ï ÏÏαν ο Ï ÏολογιÏÏÎ®Ï ÎµÎ¯Î½Î±Î¹ ανενεÏγÏÏ Î³Î¹Î±:" +msgstr "ÎλείÏιμο Ï ÏολογιÏÏή εάν είναι ανενεÏγÏÏ Î³Î¹Î±:" #: ../data/interfaces/xfpm-settings.ui.h:18 msgid "Reduce screen brightness when computer is inactive for:"
[Xfce4-commits] Fix on ac brightness dimming timeout
Updating branch refs/heads/master to e031e0f91c40c44620c1224c79e5b60008a1ec82 (commit) from 2b78e2cc4ff105c361722b88be36a19f475b3c38 (commit) commit e031e0f91c40c44620c1224c79e5b60008a1ec82 Author: Ali Abdallah Date: Mon Sep 28 15:13:17 2009 + Fix on ac brightness dimming timeout src/xfpm-brightness-hal.c | 18 +- src/xfpm-xfconf.c |6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/xfpm-brightness-hal.c b/src/xfpm-brightness-hal.c index 3df73d4..75a36b1 100644 --- a/src/xfpm-brightness-hal.c +++ b/src/xfpm-brightness-hal.c @@ -385,37 +385,37 @@ xfpm_brightness_hal_inhibit_changed_cb (XfpmScreenSaver *saver, gboolean inhibit } static void -xfpm_brightness_get_user_timeouts (XfpmBrightnessHal *brg, guint16 *on_ac, guint16 *on_battery) +xfpm_brightness_get_user_timeouts (XfpmBrightnessHal *brg, guint *timeout_on_ac, guint *timeout_on_battery) { g_object_get (G_OBJECT (brg->priv->conf), - BRIGHTNESS_ON_AC, on_ac, - BRIGHTNESS_ON_BATTERY, on_battery, + BRIGHTNESS_ON_AC, timeout_on_ac, + BRIGHTNESS_ON_BATTERY, timeout_on_battery, NULL); } static void xfpm_brightness_hal_set_timeouts (XfpmBrightnessHal *brg ) { -guint16 on_ac, on_battery; +guint timeout_on_ac, timeout_on_battery ; -xfpm_brightness_get_user_timeouts (brg, &on_ac, &on_battery); +xfpm_brightness_get_user_timeouts (brg, &timeout_on_ac, &timeout_on_battery); -if ( on_ac == ALARM_DISABLED ) +if ( timeout_on_ac == ALARM_DISABLED ) { xfpm_idle_free_alarm (brg->priv->idle, TIMEOUT_BRIGHTNESS_ON_AC ); } else { - xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_BRIGHTNESS_ON_AC, on_ac * 1000); + xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_BRIGHTNESS_ON_AC, timeout_on_ac * 1000); } -if ( on_battery == ALARM_DISABLED ) +if ( timeout_on_battery == ALARM_DISABLED ) { xfpm_idle_free_alarm (brg->priv->idle, TIMEOUT_BRIGHTNESS_ON_BATTERY ); } else { - xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_BRIGHTNESS_ON_BATTERY, on_battery * 1000); + xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_BRIGHTNESS_ON_BATTERY, timeout_on_battery * 1000); } xfpm_idle_alarm_reset_all (brg->priv->idle); diff --git a/src/xfpm-xfconf.c b/src/xfpm-xfconf.c index 6284e4c..6a7c601 100644 --- a/src/xfpm-xfconf.c +++ b/src/xfpm-xfconf.c @@ -124,7 +124,7 @@ xfpm_xfconf_get_property (GObject *object, conf = XFPM_XFCONF (object); src = conf->priv->values + prop_id; - + if ( G_VALUE_HOLDS (src, pspec->value_type) ) g_value_copy (src, value); else @@ -447,7 +447,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass) PROP_DIM_ON_AC_TIMEOUT, g_param_spec_uint (BRIGHTNESS_ON_AC, NULL, NULL, - 0, + 9, G_MAXUINT, 9, G_PARAM_READWRITE)); @@ -459,7 +459,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass) PROP_DIM_ON_BATTERY_TIMEOUT, g_param_spec_uint (BRIGHTNESS_ON_BATTERY, NULL, NULL, - 0, + 9, G_MAXUINT, 120, G_PARAM_READWRITE)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Portuguese translation added
Updating branch refs/heads/master to e6e9c2f47561081d3608f60f122250f5ba300b77 (commit) from 0c0494d37fe094f1b0a6b4749c8176cbc4da2a44 (commit) commit e6e9c2f47561081d3608f60f122250f5ba300b77 Author: Ali Abdallah Date: Mon Sep 28 09:09:19 2009 + Portuguese translation added po/LINGUAS |2 +- po/{es.po => pt.po} | 267 ++- 2 files changed, 136 insertions(+), 133 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS index fd765d6..bd0d6c1 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -da id ru sk tr uk +ast da es id ru sk tr uk diff --git a/po/es.po b/po/pt.po similarity index 75% copy from po/es.po copy to po/pt.po index e2ccc39..93a8692 100644 --- a/po/es.po +++ b/po/pt.po @@ -1,23 +1,24 @@ -# Spanish translation of Parole -# Copyright (C) 2009 the Parole COPYRIGHT HOLDER -# This file is distributed under the same license as Parole. -# Elega , 2009. -# +# Portuguese translation for parole package. +# Copyright (C) 2009 THE parole COPYRIGHT HOLDER +# This file is distributed under the same license as the parole package. +# Sérgio Marques ,2009. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: parole 0.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-08-16 16:02+0200\n" -"PO-Revision-Date: 2009-09-06 02:22-0300\n" -"Last-Translator: elega \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: \n" +"Last-Translator: Sérgio Marques \n" +"Language-Team: Portuguese\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Portuguese\n" +"X-Poedit-Country: Portugal\n" #: ../data/interfaces/parole.ui.h:1 msgid "16:9 (Widescreen)" -msgstr "16:9 (Panorámico)" +msgstr "16:9 (Ecrâ Panorâmico)" #: ../data/interfaces/parole.ui.h:2 msgid "20:9 (DVB)" @@ -29,7 +30,7 @@ msgstr "4:3 (TV)" #: ../data/interfaces/parole.ui.h:4 msgid "Aspect Ratio" -msgstr "Proporción" +msgstr "Rácio de Aspecto" #: ../data/interfaces/parole.ui.h:5 msgid "Auto" @@ -37,34 +38,34 @@ msgstr "Auto" #: ../data/interfaces/parole.ui.h:6 msgid "Chapter Menu" -msgstr "Menú del capÃtulo" +msgstr "Menu de CapÃtulos" #: ../data/interfaces/parole.ui.h:7 msgid "DVD Menu" -msgstr "Menú DVD" +msgstr "Menu de DVD" #: ../data/interfaces/parole.ui.h:8 #: ../parole/parole-player.c:288 msgid "Hide playlist" -msgstr "Ocultar lista de reproducción" +msgstr "Ocultar lista de reprodução" #: ../data/interfaces/parole.ui.h:9 msgid "Media player" -msgstr "Reproductor de medios" +msgstr "Reprodutor Multimédia" #: ../data/interfaces/parole.ui.h:10 msgid "Mute" -msgstr "Silencio" +msgstr "Silenciar" #: ../data/interfaces/parole.ui.h:11 #: ../parole/parole-player.c:1002 #: ../parole/parole-disc-menu.c:113 msgid "Next Chapter" -msgstr "CapÃtulo suguiente" +msgstr "Próximo CapÃtulo" #: ../data/interfaces/parole.ui.h:12 msgid "None" -msgstr "Ninguno" +msgstr "Nenhum" #: ../data/interfaces/parole.ui.h:13 #: ../data/desktop/parole.desktop.in.in.h:1 @@ -72,17 +73,17 @@ msgstr "Ninguno" #: ../parole/parole-about.c:51 #: ../plugins/window-title/window-title.c:40 msgid "Parole Media Player" -msgstr "Reporductor de medio Parole" +msgstr "Reprodutor Multimédia Parole" #: ../data/interfaces/parole.ui.h:14 msgid "Plugins" -msgstr "Complementos" +msgstr "Plugins" #: ../data/interfaces/parole.ui.h:15 #: ../parole/parole-player.c:1014 #: ../parole/parole-disc-menu.c:114 msgid "Previous Chapter" -msgstr "CapÃtulo anterior" +msgstr "ApÃtulo Anterior" #: ../data/interfaces/parole.ui.h:16 msgid "Repeat" @@ -90,27 +91,27 @@ msgstr "Repetir" #: ../data/interfaces/parole.ui.h:17 msgid "Select Track" -msgstr "Seleccionar pista" +msgstr "Seleccione a Faixa" #: ../data/interfaces/parole.ui.h:18 msgid "Shuffle" -msgstr "Aleatorio" +msgstr "Alternar" #: ../data/interfaces/parole.ui.h:19 msgid "Sound" -msgstr "Sonido" +msgstr "Som" #: ../data/interfaces/parole.ui.h:20 msgid "Square" -msgstr "" +msgstr "Quadrado" #: ../data/interfaces/parole.ui.h:21 msgid "Volume Down" -msgstr "Bajar volumen" +msgstr "Diminuir Volume" #: ../data/interfaces/parole.ui.h:22 msgid "Volume Up" -msgstr "Subir volumen" +msgstr "Aumentar Volume" #: ../data/interfaces/parole.ui.h:23 msgid "_Edit" @@ -118,19 +119,19 @@ msgstr "_Editar" #: ../data/interfaces/parole.ui.h:24 msgid "_Help" -msgstr "_Ayuda" +msgstr "_Ajuda" #: ../data/interfaces/parole.ui.h:25 msgid "_Media" -msgstr "" +msgstr "_Multimédia" #: ../data/interfaces/parole.ui.h:26 msgid "_View" -msgstr ":Ver" +msgstr "_Ver" #: ../data/interfaces/parole.ui.h:27 msgid "gtk-leave-fullscreen" -msgstr "" +msgstr "gtk-deixar-ecrã completo" #: ../data/interfaces/plugins.ui.h:1 msgid "Author:" @@ -138,43 +139,43 @@ msgstr "Autor:" #: ../d