[Xfce4-commits] midori:master l10n: Updated German (de) translation to 100%
Updating branch refs/heads/master to 98bcbdfbaeda8659d5303b9c90234d48b89ff9f2 (commit) from 1deed9804f7603638fa71ccc4cb45c583a4e03ba (commit) commit 98bcbdfbaeda8659d5303b9c90234d48b89ff9f2 Author: Christoph Wickert christoph.wick...@googlemail.com Date: Mon Sep 19 09:31:56 2011 +0200 l10n: Updated German (de) translation to 100% New status: 674 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 201 +++--- 1 files changed, 100 insertions(+), 101 deletions(-) diff --git a/po/de.po b/po/de.po index f84f8e6..fbf6d93 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: midori 0.3.3\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-08-23 16:18+\n +POT-Creation-Date: 2011-09-19 04:19+\n PO-Revision-Date: 2009-04-30 00:15+0100\n Last-Translator: Christian Dywan christ...@twotoasts.de\n Language-Team: German d...@li.org\n @@ -22,8 +22,8 @@ msgstr msgid Lightweight web browser msgstr Schlanker Internetbetrachter -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1431 ../midori/main.c:2005 -#: ../midori/main.c:2029 ../midori/main.c:2045 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1432 ../midori/main.c:2006 +#: ../midori/main.c:2030 ../midori/main.c:2046 #: ../midori/midori-websettings.c:293 msgid Midori msgstr Midori @@ -139,167 +139,167 @@ msgstr Letzte Reiter zeigen ohne sie zu laden msgid Show last open tabs msgstr Zuletzt geöffnete Reiter anzeigen -#: ../midori/main.c:1310 ../midori/main.c:2366 +#: ../midori/main.c:1311 ../midori/main.c:2367 #, c-format msgid The session couldn't be loaded: %s\n msgstr Die Sitzung konnte nicht geladen werden: %s\n -#: ../midori/main.c:1431 +#: ../midori/main.c:1432 msgid No filename specified msgstr Kein Dateiname angegeben -#: ../midori/main.c:1450 +#: ../midori/main.c:1451 msgid An unknown error occured. msgstr Ein unbekannter Fehler ist aufgetreten. -#: ../midori/main.c:1479 +#: ../midori/main.c:1480 #, c-format msgid Snapshot saved to: %s\n msgstr Schnappschuss gespeichert: %s\n -#: ../midori/main.c:1889 +#: ../midori/main.c:1890 msgid Run ADDRESS as a web application msgstr ADRESSE als Internetanwendung starten -#: ../midori/main.c:1889 +#: ../midori/main.c:1890 msgid ADDRESS msgstr ADRESSE -#: ../midori/main.c:1892 +#: ../midori/main.c:1893 msgid Use FOLDER as configuration folder msgstr ORDNER als Konfigurationsordner benutzen -#: ../midori/main.c:1892 +#: ../midori/main.c:1893 msgid FOLDER msgstr ORDNER -#: ../midori/main.c:1895 +#: ../midori/main.c:1896 msgid Private browsing, no changes are saved msgstr Privat surfen, Änderungen werden nicht gespeichert -#: ../midori/main.c:1897 +#: ../midori/main.c:1898 msgid Show a diagnostic dialog msgstr Diagnosedialog anzeigen -#: ../midori/main.c:1899 +#: ../midori/main.c:1900 msgid Run the specified filename as javascript msgstr Angegebenen Dateinamen als Javaskript ausführen -#: ../midori/main.c:1901 +#: ../midori/main.c:1902 msgid Take a snapshot of the specified URI msgstr Schnappschuss der angegebenen URI aufnehmen -#: ../midori/main.c:1903 +#: ../midori/main.c:1904 msgid Execute the specified command msgstr Den angegebenen Befehl ausführen -#: ../midori/main.c:1905 +#: ../midori/main.c:1906 msgid List available commands to execute with -e/ --execute msgstr Alle Befehle auflisten, die mit -e/ --execute ausgeführt werden können -#: ../midori/main.c:1907 +#: ../midori/main.c:1908 msgid Display program version msgstr Programmversion anzeigen -#: ../midori/main.c:1909 +#: ../midori/main.c:1910 msgid Addresses msgstr Adressen -#: ../midori/main.c:1911 +#: ../midori/main.c:1912 msgid Block URIs according to regular expression PATTERN msgstr URIs anhand des regulären Ausdrucks MUSTER blockieren -#: ../midori/main.c:1911 +#: ../midori/main.c:1912 msgid PATTERN msgstr MUSTER #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1915 +#: ../midori/main.c:1916 msgid Reset Midori after SECONDS seconds of inactivity msgstr Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen -#: ../midori/main.c:1915 +#: ../midori/main.c:1916 msgid SECONDS msgstr SEKUNDEN -#: ../midori/main.c:1918 +#: ../midori/main.c:1919 msgid Redirects console warnings to the specified FILENAME msgstr Konsolenwarnungen in DATEINAME umleiten -#: ../midori/main.c:1918 +#: ../midori/main.c:1919 msgid FILENAME msgstr Dateiname -#: ../midori/main.c:2002 +#: ../midori/main.c:2003 msgid [Addresses] msgstr [Adressen] -#: ../midori/main.c:2016 +#: ../midori/main.c:2017 msgid The specified configuration folder is invalid. msgstr Der angegebene Konfigurationsordner konnte nicht geladen werden. -#: ../midori/main.c:2046 +#: ../midori/main.c:2047 msgid Please report comments, suggestions and bugs to: msgstr
[Xfce4-commits] orage:master l10n: Updated German (de) translation to 99%
Updating branch refs/heads/master to 86163af7ddd3b4169b28e62aaa90ee4cc4777deb (commit) from 1a98146749b69c815b046df197a7e999f653147a (commit) commit 86163af7ddd3b4169b28e62aaa90ee4cc4777deb Author: Christoph Wickert christoph.wick...@googlemail.com Date: Mon Sep 19 09:39:05 2011 +0200 l10n: Updated German (de) translation to 99% New status: 798 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 206 + 1 files changed, 58 insertions(+), 148 deletions(-) diff --git a/po/de.po b/po/de.po index 8270ae9..e73e7b8 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ # Fabian Nowak timyst...@arcor.de, 2005-2008, 2010. # Nico Schümann n...@prog.nico22.de, 2007. # Simon Schneider si...@schneiderimtal.de, 2009 -# +# msgid msgstr Project-Id-Version: Orage 4.5.9.6-svn\n @@ -14,10 +14,10 @@ msgstr PO-Revision-Date: 2010-02-18 15:49+0100\n Last-Translator: Fabian Nowak timyst...@arcor.de\n Language-Team: German xfce-i...@xfce.org\n -Language: de\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: de\n #: ../globaltime/globaltime.c:100 msgid Raising GlobalTime window... @@ -54,10 +54,8 @@ msgid adjust to change hour msgstr Einstellen, um Stunde zu ändern #: ../globaltime/globaltime.c:496 -msgid -adjust to change minute. Click arrows with button 2 to change only 1 minute. -msgstr -Minuten einstellen. Klicken Sie die Pfeile mit Taste 2 an, um nur 1 Minute +msgid adjust to change minute. Click arrows with button 2 to change only 1 minute. +msgstr Minuten einstellen. Klicken Sie die Pfeile mit Taste 2 an, um nur 1 Minute #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266 msgid NEW @@ -472,19 +470,8 @@ msgid fix time after suspend/hibernate msgstr Zeit korrigieren nach Ruhemodus/Tiefschlaf #: ../panel-plugin/oc_config.c:415 -msgid -You only need this if you do short term (less than 5 hours) suspend or -hibernate and your visible time does not include seconds. Under these -circumstances it is possible that Orageclock shows time inaccurately unless -you have this selected. (Selecting this prevents cpu and interrupt saving -features from working.) -msgstr -Sie benötigen dies nur, wenn Sie für eine relativ kurze Zeitspanne (weniger -als 5 Stunden) in den Ruhemodus oder Tiefschlaf gehen und Ihre sichtbare -Zeit keine Sekunden enthält. Unter diesen Umständen ist es nämlich möglich, -dass die Uhr von Orage die Zeit etwas verfälscht wiedergibt, wenn Sie dies -nicht ausgewählt haben. (Wählt man dies aus, werden einige Fähigkeiten der -CPU und das Vermeiden von Interrupts nicht mehr funktionieren.) +msgid You only need this if you do short term (less than 5 hours) suspend or hibernate and your visible time does not include seconds. Under these circumstances it is possible that Orageclock shows time inaccurately unless you have this selected. (Selecting this prevents cpu and interrupt saving features from working.) +msgstr Sie benötigen dies nur, wenn Sie für eine relativ kurze Zeitspanne (weniger als 5 Stunden) in den Ruhemodus oder Tiefschlaf gehen und Ihre sichtbare Zeit keine Sekunden enthält. Unter diesen Umständen ist es nämlich möglich, dass die Uhr von Orage die Zeit etwas verfälscht wiedergibt, wenn Sie dies nicht ausgewählt haben. (Wählt man dies aus, werden einige Fähigkeiten der CPU und das Vermeiden von Interrupts nicht mehr funktionieren.) #: ../panel-plugin/oc_config.c:432 msgid @@ -498,8 +485,7 @@ msgid \t%X = local time\t\t\t%x = local date msgstr Diese Programm verwendet die Funktion »strftime«, um die Zeit zu erhalten.\n -Verwenden Sie beliebigen gültigen Code, um die Zeit in dem Format zu -erhalten, das Sie bevorzugen.\n +Verwenden Sie beliebigen gültigen Code, um die Zeit in dem Format zu erhalten, das Sie bevorzugen.\n Einige häufig verwendete Codes sind:\n \t%A = Wochentag\t\t\t%B = Monat\n \t%c = Datum und Zeit\t\t%R = Stunde und Minuten\n @@ -520,7 +506,7 @@ msgstr Uhrzeiteinstellungen für Orage #. * %B : full month name #. * %Y : four digit year #. * %V : ISO week number -#. +#. #: ../panel-plugin/xfce4-orageclock-plugin.c:627 msgid %A %d %B %Y/%V msgstr %A, %d. %B %Y (KW %V) @@ -588,8 +574,7 @@ msgstr Dieser Termin existiert nicht. #: ../src/appointment.c:1671 msgid It was probably removed, please refresh your screen. -msgstr -Er wurde wahrscheinlich entfernt, bitte klicken Sie auf »Aktualisieren«. +msgstr Er wurde wahrscheinlich entfernt, bitte klicken Sie auf »Aktualisieren«. #: ../src/appointment.c:1973 msgid Current categories @@ -758,12 +743,8 @@ msgid Categories msgstr Rubriken #: ../src/appointment.c:2758 -msgid -This is special category, which can be used to color this appointment in -list views. -msgstr -Dies ist die besondere Kategorie, die dazu genutzt werden kann,
[Xfce4-commits] thunar:master Add missing NEWS entry.
Updating branch refs/heads/master to 1c4c7f92f30d50712d57c9ab4ed56e23c30f7255 (commit) from 594aa7b5be815a84f31a12d8ec49052865734855 (commit) commit 1c4c7f92f30d50712d57c9ab4ed56e23c30f7255 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Sep 19 15:17:26 2011 +0200 Add missing NEWS entry. Sigh... I forget this too often. NEWS |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 104bccd..cfbcae4 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,8 @@ - Fix segfaults in case icons are missing or not found (bug #7880). - Allow exec bit of MS-DOS executables and MSI to be changed (bug #3545). +- Prevent falling back to an unexpected locale (bug #4746). + Patch by Martin Jürgens and Mark Trompell. 1.3.0 = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Prevent falling back to an unexpected locale (bug #4746).
Updating branch refs/heads/master to 594aa7b5be815a84f31a12d8ec49052865734855 (commit) from cfab3c6a3b7ad714fc3fe67e84bf0d3b1fc6d4b1 (commit) commit 594aa7b5be815a84f31a12d8ec49052865734855 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Sep 19 15:11:01 2011 +0200 Prevent falling back to an unexpected locale (bug #4746). setlocale() returns a pointer to its internal locale string, so if we want to store the returned string for later use, we need to duplicate it. Patch by Martin Jürgensmartin.accou...@gmx.de and Mark Trompellm...@foresightlinux.org. plugins/thunar-uca/thunar-uca-model.c |5 +++-- thunar/thunar-shortcuts-model.c |6 +++--- thunar/thunar-window.c|3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/thunar-uca/thunar-uca-model.c b/plugins/thunar-uca/thunar-uca-model.c index d5cb8e4..1f54bb1 100644 --- a/plugins/thunar-uca/thunar-uca-model.c +++ b/plugins/thunar-uca/thunar-uca-model.c @@ -176,7 +176,7 @@ typedef struct { ParserStack*stack; ThunarUcaModel *model; - const gchar*locale; + gchar *locale; GString*name; gbooleanname_use; guint name_match; @@ -553,7 +553,7 @@ thunar_uca_model_load_from_file (ThunarUcaModel *uca_model, /* initialize the parser */ parser.stack = xfce_stack_new (ParserStack); parser.model = uca_model; - parser.locale = setlocale (LC_MESSAGES, NULL); + parser.locale = g_strdup (setlocale (LC_MESSAGES, NULL)); parser.name = g_string_new (NULL); parser.icon = g_string_new (NULL); parser.command = g_string_new (NULL); @@ -574,6 +574,7 @@ thunar_uca_model_load_from_file (ThunarUcaModel *uca_model, g_string_free (parser.command, TRUE); g_string_free (parser.icon, TRUE); g_string_free (parser.name, TRUE); + g_free (parser.locale); xfce_stack_free (parser.stack); g_free (content); diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c index 2aae575..8944461 100644 --- a/thunar/thunar-shortcuts-model.c +++ b/thunar/thunar-shortcuts-model.c @@ -869,7 +869,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model) { /* ~/.gtk-bookmarks wasn't there or it was unreadable. * here we recreate it with some useful xdg user special dirs */ - const char *old_locale = NULL; + gchar *old_locale = NULL; gchar *locale = NULL; bindtextdomain (XDG_USER_DIRS_PACKAGE, PACKAGE_LOCALE_DIR); @@ -878,7 +878,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model) #endif /* HAVE_BIND_TEXTDOMAIN_CODESET */ /* save the old locale */ - old_locale = setlocale (LC_MESSAGES, NULL); + old_locale = g_strdup(setlocale (LC_MESSAGES, NULL)); /* set the new locale */ locale = _thunar_get_xdg_user_dirs_locale (); @@ -938,7 +938,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model) /* restore the old locale */ setlocale (LC_MESSAGES, old_locale); - + g_free(old_locale); gtk_tree_path_free (path); /* we try to save the obtained new model */ diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c index a6375c2..a42d982 100644 --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -618,7 +618,7 @@ thunar_window_setup_user_dir_menu_entries (ThunarWindow *window) #endif /* HAVE_BIND_TEXTDOMAIN_CODESET */ /* save the old locale */ - old_locale = setlocale (LC_MESSAGES, NULL); + old_locale = g_strdup(setlocale (LC_MESSAGES, NULL)); /* set the new locale */ locale = _thunar_get_xdg_user_dirs_locale (); @@ -656,6 +656,7 @@ thunar_window_setup_user_dir_menu_entries (ThunarWindow *window) g_object_unref (home_dir); setlocale (LC_MESSAGES, old_locale); + g_free (old_locale); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:xfce-4.8 Prevent falling back to an unexpected locale (bug #4746).
Updating branch refs/heads/xfce-4.8 to 970a5fdc1fa28524a085fe678bb0550f532f8d29 (commit) from 57bf9e5088cf7ac6e7989541889544637e20a89d (commit) commit 970a5fdc1fa28524a085fe678bb0550f532f8d29 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Sep 19 15:11:01 2011 +0200 Prevent falling back to an unexpected locale (bug #4746). setlocale() returns a pointer to its internal locale string, so if we want to store the returned string for later use, we need to duplicate it. Patch by Martin Jürgensmartin.accou...@gmx.de and Mark Trompellm...@foresightlinux.org. NEWS |2 ++ plugins/thunar-uca/thunar-uca-model.c |5 +++-- thunar/thunar-shortcuts-model.c |6 +++--- thunar/thunar-window.c|3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index fa93294..bdb764a 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,8 @@ - Fix segfaults in case icons are missing or not found (bug #7880). - Allow exec bit of MS-DOS executables and MSI to be changed (bug #3545). +- Prevent falling back to an unexpected locale (bug #4746). + Patch by Martin Jürgens and Mark Trompell. 1.2.2 = diff --git a/plugins/thunar-uca/thunar-uca-model.c b/plugins/thunar-uca/thunar-uca-model.c index d5cb8e4..1f54bb1 100644 --- a/plugins/thunar-uca/thunar-uca-model.c +++ b/plugins/thunar-uca/thunar-uca-model.c @@ -176,7 +176,7 @@ typedef struct { ParserStack*stack; ThunarUcaModel *model; - const gchar*locale; + gchar *locale; GString*name; gbooleanname_use; guint name_match; @@ -553,7 +553,7 @@ thunar_uca_model_load_from_file (ThunarUcaModel *uca_model, /* initialize the parser */ parser.stack = xfce_stack_new (ParserStack); parser.model = uca_model; - parser.locale = setlocale (LC_MESSAGES, NULL); + parser.locale = g_strdup (setlocale (LC_MESSAGES, NULL)); parser.name = g_string_new (NULL); parser.icon = g_string_new (NULL); parser.command = g_string_new (NULL); @@ -574,6 +574,7 @@ thunar_uca_model_load_from_file (ThunarUcaModel *uca_model, g_string_free (parser.command, TRUE); g_string_free (parser.icon, TRUE); g_string_free (parser.name, TRUE); + g_free (parser.locale); xfce_stack_free (parser.stack); g_free (content); diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c index 2aae575..8944461 100644 --- a/thunar/thunar-shortcuts-model.c +++ b/thunar/thunar-shortcuts-model.c @@ -869,7 +869,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model) { /* ~/.gtk-bookmarks wasn't there or it was unreadable. * here we recreate it with some useful xdg user special dirs */ - const char *old_locale = NULL; + gchar *old_locale = NULL; gchar *locale = NULL; bindtextdomain (XDG_USER_DIRS_PACKAGE, PACKAGE_LOCALE_DIR); @@ -878,7 +878,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model) #endif /* HAVE_BIND_TEXTDOMAIN_CODESET */ /* save the old locale */ - old_locale = setlocale (LC_MESSAGES, NULL); + old_locale = g_strdup(setlocale (LC_MESSAGES, NULL)); /* set the new locale */ locale = _thunar_get_xdg_user_dirs_locale (); @@ -938,7 +938,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model) /* restore the old locale */ setlocale (LC_MESSAGES, old_locale); - + g_free(old_locale); gtk_tree_path_free (path); /* we try to save the obtained new model */ diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c index fe76be6..33eaa1b 100644 --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -618,7 +618,7 @@ thunar_window_setup_user_dir_menu_entries (ThunarWindow *window) #endif /* HAVE_BIND_TEXTDOMAIN_CODESET */ /* save the old locale */ - old_locale = setlocale (LC_MESSAGES, NULL); + old_locale = g_strdup(setlocale (LC_MESSAGES, NULL)); /* set the new locale */ locale = _thunar_get_xdg_user_dirs_locale (); @@ -656,6 +656,7 @@ thunar_window_setup_user_dir_menu_entries (ThunarWindow *window) g_object_unref (home_dir); setlocale (LC_MESSAGES, old_locale); + g_free (old_locale); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Show translated names of desktop files (bug #7393).
Updating branch refs/heads/master to fd2b39686f53fcdb1cf37bb9b7a89a2658dc2f67 (commit) from 1c4c7f92f30d50712d57c9ab4ed56e23c30f7255 (commit) commit fd2b39686f53fcdb1cf37bb9b7a89a2658dc2f67 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Sep 19 15:51:41 2011 +0200 Show translated names of desktop files (bug #7393). Fix by Lionel Le Folgoclio...@lefolgoc.net. NEWS |2 ++ thunar/thunar-file.c |8 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index cfbcae4..7c1609e 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,8 @@ (bug #3545). - Prevent falling back to an unexpected locale (bug #4746). Patch by Martin Jürgens and Mark Trompell. +- Show translated names of desktop files (bug #7393). + Fix by Lionel Le Folgoclio...@lefolgoc.net. 1.3.0 = diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c index 2731ca9..9e5393c 100644 --- a/thunar/thunar-file.c +++ b/thunar/thunar-file.c @@ -825,10 +825,10 @@ thunar_file_load (ThunarFile *file, /* read the display name from the .desktop file (will be overwritten later * if it's undefined here) */ - file-display_name = g_key_file_get_string (key_file, - G_KEY_FILE_DESKTOP_GROUP, - G_KEY_FILE_DESKTOP_KEY_NAME, - NULL); + file-display_name = g_key_file_get_locale_string (key_file, + G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_NAME, + NULL, NULL); /* check if we have a display name now */ if (file-display_name != NULL) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:xfce-4.8 Show translated names of desktop files (bug #7393).
Updating branch refs/heads/xfce-4.8 to 5e3b25c4020d8b2ba8acebc748e873316c87885f (commit) from 970a5fdc1fa28524a085fe678bb0550f532f8d29 (commit) commit 5e3b25c4020d8b2ba8acebc748e873316c87885f Author: Jannis Pohlmann jan...@xfce.org Date: Mon Sep 19 15:51:41 2011 +0200 Show translated names of desktop files (bug #7393). Fix by Lionel Le Folgoclio...@lefolgoc.net. NEWS |2 ++ thunar/thunar-file.c |8 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index bdb764a..a759046 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,8 @@ (bug #3545). - Prevent falling back to an unexpected locale (bug #4746). Patch by Martin Jürgens and Mark Trompell. +- Show translated names of desktop files (bug #7393). + Fix by Lionel Le Folgoclio...@lefolgoc.net. 1.2.2 = diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c index 12e1556..909da25 100644 --- a/thunar/thunar-file.c +++ b/thunar/thunar-file.c @@ -825,10 +825,10 @@ thunar_file_load (ThunarFile *file, /* read the display name from the .desktop file (will be overwritten later * if it's undefined here) */ - file-display_name = g_key_file_get_string (key_file, - G_KEY_FILE_DESKTOP_GROUP, - G_KEY_FILE_DESKTOP_KEY_NAME, - NULL); + file-display_name = g_key_file_get_locale_string (key_file, + G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_NAME, + NULL, NULL); /* check if we have a display name now */ if (file-display_name != NULL) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 8c2e529e8ab79aeacec669545dcf4e84dbe00bfa (commit) from 6c95ad51d0e27ba7abd3ef29ee963c6a987adb42 (commit) commit 8c2e529e8ab79aeacec669545dcf4e84dbe00bfa Author: Bauzhan Muftakhidinov baurthefi...@gmail.com Date: Mon Sep 19 17:58:46 2011 +0200 l10n: Updated Kazakh (kk) translation to 100% New status: 351 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 138 +- 1 files changed, 73 insertions(+), 65 deletions(-) diff --git a/po/kk.po b/po/kk.po index fd25d7f..c0841dd 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-06-25 10:12+\n +POT-Creation-Date: 2011-09-19 10:13+\n PO-Revision-Date: 2010-08-03 09:46+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n @@ -30,7 +30,7 @@ msgid Customize the panel msgstr Панельді баптау #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:25 ../panel/panel-window.c:2275 +#: ../panel/panel-preferences-dialog.glade.h:26 ../panel/panel-window.c:2275 #: ../migrate/main.c:100 msgid Panel msgstr Панель @@ -54,13 +54,13 @@ msgstr Құжаттама шолушысын ашу сәтсіз аяқталд #. I18N: %s is the name of the plugin #: ../libxfce4panel/xfce-panel-plugin.c:919 -#: ../panel/panel-preferences-dialog.c:1049 +#: ../panel/panel-preferences-dialog.c:1056 #, c-format msgid Are you sure that you want to remove \%s\? msgstr \%s\ өшіруді шынымен қалайсыз ба? #: ../libxfce4panel/xfce-panel-plugin.c:924 -#: ../panel/panel-preferences-dialog.c:1052 +#: ../panel/panel-preferences-dialog.c:1059 msgid If you remove the item from the panel, it is permanently lost. msgstr Элементті панельден өшірсеңіз, ол толығымен жойылады. @@ -196,19 +196,19 @@ msgstr Панельді іске қосуды қалайсыз ба? Олай msgid No running instance of %s was found msgstr %s үшін қосулы тұрған нұсқалары табылмады -#: ../panel/panel-application.c:216 +#: ../panel/panel-application.c:217 msgid Failed to launch the migration application msgstr Көшу қолданбасын жөнелту сәтсіз аяқталды -#: ../panel/panel-application.c:1567 ../plugins/actions/actions.c:421 +#: ../panel/panel-application.c:1595 ../plugins/actions/actions.c:421 msgid You have started X without session manager. Clicking Quit will close the X server. msgstr X серверін сессия басқарушысыз іске қосқансыз. Шығу басылған кезде X сервері өз жұмысын аяқтайды. -#: ../panel/panel-application.c:1568 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1596 ../plugins/actions/actions.c:422 msgid Are you sure you want to quit the panel? msgstr Панельдің жұмысын аяқтауды шынымен қалайсыз ба? -#: ../panel/panel-application.c:1576 ../plugins/actions/actions.c:430 +#: ../panel/panel-application.c:1604 ../plugins/actions/actions.c:430 #, c-format msgid Failed to execute command \%s\ msgstr \%s\ командасын орындау сәтсіз аяқталды @@ -240,7 +240,7 @@ msgid Please choose a panel for the new plugin: msgstr Жаңа плагин үшін панельді тандаңыз: #. I18N: panel combo box in the preferences dialog -#: ../panel/panel-dialogs.c:147 ../panel/panel-preferences-dialog.c:768 +#: ../panel/panel-dialogs.c:147 ../panel/panel-preferences-dialog.c:775 #, c-format msgid Panel %d msgstr Панель %d @@ -280,41 +280,41 @@ msgstr \%s\ плагині күтпегенде панельден кетті msgid The plugin restarted more than once in the last %d seconds. If you press Execute the panel will try to restart the plugin otherwise it will be permanently removed from the panel. msgstr Плагин соңғы %d секундта бірден көп рет қайта қосылған. Орындау батырмасын бассаңыз, панель ол плагинді қайта қосып көреді, олай болмаса, ол плагин панельден өшіріледі. -#: ../panel/panel-preferences-dialog.c:454 +#: ../panel/panel-preferences-dialog.c:460 msgid Automatic msgstr Авто #. I18N: screen name in the output selector -#: ../panel/panel-preferences-dialog.c:473 +#: ../panel/panel-preferences-dialog.c:479 #, c-format msgid Screen %d msgstr Экран %d #. I18N: monitor name in the output selector -#: ../panel/panel-preferences-dialog.c:499 +#: ../panel/panel-preferences-dialog.c:505 #, c-format msgid Monitor %d msgstr Монитор %d -#: ../panel/panel-preferences-dialog.c:829 +#: ../panel/panel-preferences-dialog.c:836 msgid The panel and plugin configurations will be permanently removed msgstr Панель мен плагиндер баптаулары толығымен өшіріледі. -#: ../panel/panel-preferences-dialog.c:830 +#: ../panel/panel-preferences-dialog.c:837 #, c-format msgid Are you sure you want to remove panel %d? msgstr %d панелін өшіруді шынымен қалайсыз ба? #. I18N: append (external) in the preferences dialog if the plugin #. * runs external -#:
[Xfce4-commits] ristretto:master Remove deprecated function gtk_about_dialog_set_name
Updating branch refs/heads/master to 7aec524c649e0169c115e15e39585bb09a157c80 (commit) from 4f66c110e6c823028332ec830e09d4a16a81a78e (commit) commit 7aec524c649e0169c115e15e39585bb09a157c80 Author: Stephan Arts step...@xfce.org Date: Sun Sep 18 20:24:41 2011 +0200 Remove deprecated function gtk_about_dialog_set_name src/main_window.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index cb9a302..41fadcd 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -1699,7 +1699,6 @@ cb_rstto_main_window_about (GtkWidget *widget, RsttoMainWindow *window) GtkWidget *about_dialog = gtk_about_dialog_new(); -gtk_about_dialog_set_name((GtkAboutDialog *)about_dialog, PACKAGE_NAME); gtk_about_dialog_set_version((GtkAboutDialog *)about_dialog, PACKAGE_VERSION); gtk_about_dialog_set_comments((GtkAboutDialog *)about_dialog, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Remove gtk_combo_box_text new, which only exists since gtk 2.24
Updating branch refs/heads/master to 3247a82229852994685e5884e8cac1898f698842 (commit) from 7aec524c649e0169c115e15e39585bb09a157c80 (commit) commit 3247a82229852994685e5884e8cac1898f698842 Author: Stephan Arts step...@xfce.org Date: Sun Sep 18 21:27:23 2011 +0200 Remove gtk_combo_box_text new, which only exists since gtk 2.24 src/xfce_wallpaper_manager.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c index 8837ef8..90087d8 100644 --- a/src/xfce_wallpaper_manager.c +++ b/src/xfce_wallpaper_manager.c @@ -344,7 +344,7 @@ rstto_xfce_wallpaper_manager_init (GObject *object) GtkWidget *image_prop_table = gtk_table_new (3, 2, FALSE); manager-priv-monitor_chooser = rstto_monitor_chooser_new (); -manager-priv-style_combo = gtk_combo_box_text_new(); +manager-priv-style_combo = gtk_combo_box_new_text(); gtk_table_set_row_spacing (GTK_TABLE(image_prop_table), 1, 4); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-appfinder:nick/properties-dialog Fix default item loading.
Updating branch refs/heads/nick/properties-dialog to 489fb9cf40cf0e4dc708f040dbf3539fc134a874 (commit) from 710bf82fbb6e7e28d44e6bae2811f99fc0ccbcd0 (commit) commit 489fb9cf40cf0e4dc708f040dbf3539fc134a874 Author: Nick Schermer n...@xfce.org Date: Mon Sep 19 21:25:36 2011 +0200 Fix default item loading. src/appfinder-actions.c | 19 +++ src/appfinder-preferences.c |5 + src/appfinder-window.c | 37 +++-- 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/src/appfinder-actions.c b/src/appfinder-actions.c index cfb5b46..01c1feb 100644 --- a/src/appfinder-actions.c +++ b/src/appfinder-actions.c @@ -145,9 +145,10 @@ xfce_appfinder_actions_load_defaults (XfceAppfinderActions *actions) XfceAppfinderAction *action; XfceAppfinderAction defaults[] = { -{ XFCE_APPFINDER_ACTION_TYPE_PREFIX, 0, - #, - exo-open --launch TerminalEmulator man %s, +/* default actions, sorted */ +{ XFCE_APPFINDER_ACTION_TYPE_REGEX, 0, + ^(file|http|https):\\/\\/(.*)$, + exo-open \\0, NULL }, { XFCE_APPFINDER_ACTION_TYPE_PREFIX, 0, !, @@ -157,9 +158,9 @@ xfce_appfinder_actions_load_defaults (XfceAppfinderActions *actions) !w, exo-open --launch WebBrowser http://en.wikipedia.org/wiki/%s;, NULL }, -{ XFCE_APPFINDER_ACTION_TYPE_REGEX, 0, - ^(file|http|https):\\/\\/(.*)$, - exo-open \\0, +{ XFCE_APPFINDER_ACTION_TYPE_PREFIX, 0, + #, + exo-open --launch TerminalEmulator man %s, NULL } }; @@ -274,7 +275,8 @@ xfce_appfinder_actions_save (XfceAppfinderActions *actions, GPtrArray *array; gcharprop[32]; - g_signal_handler_block (actions-channel, actions-property_watch_id); + if (actions-property_watch_id 0) +g_signal_handler_block (actions-channel, actions-property_watch_id); array = g_ptr_array_new (); @@ -304,7 +306,8 @@ xfce_appfinder_actions_save (XfceAppfinderActions *actions, xfconf_array_free (array); - g_signal_handler_unblock (actions-channel, actions-property_watch_id); + if (actions-property_watch_id 0) +g_signal_handler_unblock (actions-channel, actions-property_watch_id); } diff --git a/src/appfinder-preferences.c b/src/appfinder-preferences.c index a277f0f..e48f424 100644 --- a/src/appfinder-preferences.c +++ b/src/appfinder-preferences.c @@ -131,6 +131,7 @@ xfce_appfinder_preferences_init (XfceAppfinderPreferences *preferences) object = gtk_builder_get_object (GTK_BUILDER (preferences), actions-treeview); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (object)); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); g_signal_connect (G_OBJECT (selection), changed, G_CALLBACK (xfce_appfinder_preferences_selection_changed), preferences); @@ -375,6 +376,10 @@ xfce_appfinder_preferences_selection_changed (GtkTreeSelection *selectio objects[i].prop_type, object, objects[i].prop_name); } + else if (GTK_IS_ENTRY (object)) +{ + gtk_entry_set_text (GTK_ENTRY (object), ); +} } object = gtk_builder_get_object (GTK_BUILDER (preferences), button-remove); diff --git a/src/appfinder-window.c b/src/appfinder-window.c index 5f50b73..c2135a5 100644 --- a/src/appfinder-window.c +++ b/src/appfinder-window.c @@ -72,7 +72,8 @@ static void xfce_appfinder_window_drag_data_get (GtkWidget static void xfce_appfinder_window_category_changed (GtkTreeSelection*selection, XfceAppfinderWindow *window); static void xfce_appfinder_window_category_set_categories (XfceAppfinderWindow *window); -static void xfce_appfinder_window_preferences (GtkWidget *button); +static void xfce_appfinder_window_preferences (GtkWidget *button, + XfceAppfinderWindow *window); static gboolean xfce_appfinder_window_item_visible (GtkTreeModel*model, GtkTreeIter *iter, gpointer data); @@ -96,6 +97,8 @@ struct _XfceAppfinderWindow XfceAppfinderCategoryModel *category_model; + XfceAppfinderActions *actions; + GtkEntryCompletion *completion; XfconfChannel *channel; @@ -327,7 +330,7 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window) window-button_preferences = button = gtk_button_new_from_stock
[Xfce4-commits] ristretto:master Remove set_double_buffered call
Updating branch refs/heads/master to 62b72d3ac3a509cbd8e115fc12909372f5c75fb5 (commit) from f9093216aa7febb04a7c36cbdbd851edc85805db (commit) commit 62b72d3ac3a509cbd8e115fc12909372f5c75fb5 Author: Stephan Arts step...@xfce.org Date: Mon Sep 19 22:19:03 2011 +0200 Remove set_double_buffered call src/image_viewer.c |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 2fccef8..ed56f5c 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -235,8 +235,6 @@ rstto_image_viewer_init(RsttoImageViewer *viewer) g_signal_connect (G_OBJECT(viewer-priv-settings), notify::bgcolor-override, G_CALLBACK (cb_rstto_image_viewer_bgcolor_changed), viewer); g_signal_connect (G_OBJECT(viewer-priv-settings), notify::revert-zoom-direction, G_CALLBACK (cb_rstto_image_viewer_zoom_direction_changed), viewer); -gtk_widget_set_double_buffered (GTK_WIDGET(viewer), TRUE); - /* Set to false, experimental... * improves performance, but I am not sure what will give. */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Update dependency-versions
Updating branch refs/heads/master to f5fe9e8ee318d168765b661fd735e3e5e6d63fae (commit) from 62b72d3ac3a509cbd8e115fc12909372f5c75fb5 (commit) commit f5fe9e8ee318d168765b661fd735e3e5e6d63fae Author: Stephan Arts step...@xfce.org Date: Mon Sep 19 22:37:06 2011 +0200 Update dependency-versions configure.in.in | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.in.in b/configure.in.in index eb7e256..e876b82 100644 --- a/configure.in.in +++ b/configure.in.in @@ -52,16 +52,16 @@ dnl Check for i18n support XDT_I18N([@LINGUAS@]) XDT_CHECK_PACKAGE([LIBEXIF], [libexif], [0.6.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) -XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0]) -XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.18.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) +XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) +XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0]) +XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.24.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0]) XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) -XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0]) +XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0]) XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.8.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-dict:master Explicitly link against libm.
Updating branch refs/heads/master to bf2a1dd4fcbad99e2de50c55f07c9c76e09805ed (commit) from 7bf27e8bca4df0fa0d44235b7b6425a5e45d9529 (commit) commit bf2a1dd4fcbad99e2de50c55f07c9c76e09805ed Author: Guido Berhoerster g...@opensuse.org Date: Mon Sep 19 23:37:51 2011 +0200 Explicitly link against libm. configure.ac.in |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 0c4ea81..baec65c 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -39,6 +39,8 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0.0]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0]) XDT_CHECK_PACKAGE([X11], [x11]) +AC_SEARCH_LIBS(floor, m) + dnl check for debugging support XDT_FEATURE_DEBUG() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits