[Xfce4-commits] l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to a22e3d3da5e2dc60a6f05ea6cb46258c31fb4bd1 (commit) from bd73123012b00bc9e3467e354abbb18d3b059698 (commit) commit a22e3d3da5e2dc60a6f05ea6cb46258c31fb4bd1 Author: Bauzhan Muftakhidinov Date: Mon Jan 31 04:22:38 2011 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 273 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 333 -- 1 files changed, 149 insertions(+), 184 deletions(-) diff --git a/po/kk.po b/po/kk.po index 68a9a52..4341eb7 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Baurzhan Muftakhidinov , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-23 05:01+\n" +"POT-Creation-Date: 2011-01-30 23:01+\n" "PO-Revision-Date: 2010-11-23 15:41+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" @@ -30,15 +30,13 @@ msgstr "Жалпы опциялар" #. parameter of --default-display #. parameter of --display -#: ../terminal/main.c:59 -#: ../terminal/main.c:85 +#: ../terminal/main.c:59 ../terminal/main.c:85 msgid "display" msgstr "көрсету" #. parameter of --default-working-directory #. parameter of --working-directory -#: ../terminal/main.c:61 -#: ../terminal/main.c:76 +#: ../terminal/main.c:61 ../terminal/main.c:76 msgid "directory" msgstr "бума" @@ -89,39 +87,29 @@ msgstr "таңбаша" msgid "See the %s man page for full explanation of the options above." msgstr "Төмендегі опциялардың толық анықтамасы үшін %s man парағын оқыңыз." -#: ../terminal/main.c:126 -#: ../terminal/terminal-preferences.c:1262 -#: ../terminal/terminal-shortcut-editor.c:119 -#: ../Terminal.desktop.in.in.h:1 +#: ../terminal/main.c:126 ../terminal/terminal-preferences.c:1262 +#: ../terminal/terminal-shortcut-editor.c:119 ../Terminal.desktop.in.in.h:1 msgid "Terminal" msgstr "Терминал" -#: ../terminal/main.c:144 +#: ../terminal/main.c:147 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce өндіру тобы. Барлық құқықтары қорғалған." + +#: ../terminal/main.c:148 +msgid "Written by Benedikt Meurer " +msgstr "Жазғандар: Benedikt Meurer " + +#: ../terminal/main.c:149 +msgid "and Nick Schermer ." +msgstr "және Nick Schermer ." + +#: ../terminal/main.c:150 #, c-format -msgid "" -"%s %s (Xfce %s)\n" -"\n" -"Copyright (c) %s\n" -"os-cillation e.K. All rights reserved.\n" -"\n" -"Written by Benedikt Meurer .\n" -"\n" -"Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d.\n" -"\n" -"Please report bugs to <%s>.\n" -msgstr "" -"%s %s (Xfce %s)\n" -"\n" -"Copyright (c) %s\n" -"os-cillation e.K. Барлық құқықтары қорғалған.\n" -"\n" -"Benedikt Meurer жасаған.\n" -"\n" -"Gtk+-%d.%d.%d нұсқасымен жиналған, қазір Gtk+-%d.%d.%d орындалуда.\n" -"\n" -"Ақаулықтар жөнінде хабарласыңыз: <%s>.\n" - -#: ../terminal/main.c:254 +msgid "Please report bugs to <%s>." +msgstr "Ақаулықтар жөнінде хабарлаңыз: <%s>." + +#: ../terminal/main.c:249 #, c-format msgid "Unable to register terminal service: %s\n" msgstr "Терминал қызметін тіркеу мүмкін емес: %s\n" @@ -149,8 +137,7 @@ msgstr "D-BUS хабарлама қызметімен байланыс үзіл msgid "Unable to register object %s" msgstr "%s объектісін тіркеу мүмкін емес" -#: ../terminal/terminal-dialogs.c:95 -#: ../Terminal-default-apps.xml.in.in.h:1 +#: ../terminal/terminal-dialogs.c:95 ../Terminal-default-apps.xml.in.in.h:1 msgid "Xfce Terminal Emulator" msgstr "Xfce терминал эмуляторы" @@ -309,8 +296,7 @@ msgstr "Толық экранға" msgid "Set Title" msgstr "Атауын орнату" -#: ../terminal/terminal-preferences.c:463 -#: ../terminal/terminal-window.c:236 +#: ../terminal/terminal-preferences.c:463 ../terminal/terminal-window.c:232 msgid "Reset" msgstr "Тастау" @@ -366,23 +352,22 @@ msgstr "9-шы бетке ауысу" msgid "Contents" msgstr "Құрамасы" -#: ../terminal/terminal-screen.c:397 -#: ../terminal/terminal-screen.c:629 -#: ../terminal/terminal-screen.c:1598 +#: ../terminal/terminal-screen.c:399 ../terminal/terminal-screen.c:631 +#: ../terminal/terminal-screen.c:1665 msgid "Untitled" msgstr "Атаусыз" -#: ../terminal/terminal-screen.c:529 +#: ../terminal/terminal-screen.c:531 #, c-format msgid "Unable to determine your login shell." msgstr "Тіркелгіңіздің командалық қоршауын анықтау мүмкін емес." #. tell the user that we were unable to execute the command -#: ../terminal/terminal-screen.c:1339 +#: ../terminal/terminal-screen.c:1374 ../terminal/terminal-screen.c:1403 msgid "Failed to execute child" msgstr "Ұрпақ үрдісін жөнелту қатемен аяқталды" -#: ../terminal/terminal-screen.c:1920 +#: ../terminal/terminal-screen.c:1987 msgid "Close this tab" msgstr "Бұл бетті жабу" @@ -407,8 +392,7 @@ msgid "Help" msgst
[Xfce4-commits] l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to fa1cd7bf02f4d4d29f3d6b2be7a8503b417fd4b2 (commit) from a9b44b2de2dace5b9eee4010212ac44120f04f00 (commit) commit fa1cd7bf02f4d4d29f3d6b2be7a8503b417fd4b2 Author: Bauzhan Muftakhidinov Date: Mon Jan 31 04:20:03 2011 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 57 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 67 +- 1 files changed, 40 insertions(+), 27 deletions(-) diff --git a/po/kk.po b/po/kk.po index 95eb4b4..47cf502 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-27 05:03+\n" +"POT-Creation-Date: 2011-01-30 23:04+\n" "PO-Revision-Date: 2009-09-20 20:50+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" @@ -19,117 +19,130 @@ msgstr "" #: ../src/xfce4-notes.desktop.in.h:1 #: ../src/xfce4-notes-autostart.desktop.in.h:1 #: ../src/xfce4-notes-plugin.desktop.in.in.h:1 -#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:611 +#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:741 msgid "Ideal for your quick notes" msgstr "Жылдам жазбаларыңыз үшін жарайды" #: ../src/xfce4-notes.desktop.in.h:2 #: ../src/xfce4-notes-autostart.desktop.in.h:2 #: ../src/xfce4-notes-plugin.desktop.in.in.h:2 -#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:183 -#: ../lib/application.vala:210 ../lib/application.vala:609 -#: ../lib/window.vala:84 ../lib/window.vala:159 ../lib/window.vala:884 +#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:184 +#: ../lib/application.vala:211 ../lib/application.vala:739 +#: ../lib/window.vala:85 ../lib/window.vala:176 ../lib/window.vala:913 #: ../src/xfce4-notes-settings.c:99 ../src/main-panel-plugin-47.vala:46 #: ../src/main-panel-plugin.vala:45 ../src/main-status-icon.vala:34 #: ../src/main-status-icon.vala:115 msgid "Notes" msgstr "Жазбалар" -#: ../lib/application.vala:118 ../lib/application.vala:133 +#: ../lib/application.vala:119 ../lib/application.vala:134 #: ../src/xfce4-notes-settings.c:223 ../src/xfce4-notes-settings.c:231 msgid "Select notes path" msgstr "Жазбалар орнын таңдау" -#: ../lib/application.vala:119 +#: ../lib/application.vala:120 #, c-format msgid "The selected directory (%s) for the new notes path already contains files. You must select or create an empty directory." msgstr "Жаңа жазбалар үшін бума (%s) ішінде файлдар бар. Сізге бос буманы таңдау не жасау керек." -#: ../lib/application.vala:134 +#: ../lib/application.vala:135 #, c-format msgid "Unable to select directory for new notes path: %s" msgstr "Жаңа жазбалар үшін буманы таңдау мүмкін емес, орны: %s" -#: ../lib/application.vala:187 ../lib/window.vala:887 +#: ../lib/application.vala:188 ../lib/window.vala:916 #, c-format msgid "Notes %d" msgstr "Жазба %d" -#: ../lib/application.vala:411 +#: ../lib/application.vala:428 msgid "Rename group" msgstr "Топтың атын ауыстыру" -#: ../lib/application.vala:432 ../lib/window.vala:1009 +#: ../lib/application.vala:449 ../lib/window.vala:1038 #, c-format msgid "The name %s is already in use" msgstr "%s аты қазір қоланылып тұр" -#: ../lib/application.vala:458 +#: ../lib/application.vala:478 msgid "Are you sure you want to delete this group?" msgstr "Осы топты өшіруді шынымен қалайсыз ба?" -#: ../lib/application.vala:515 +#: ../lib/application.vala:522 +#, c-format +msgid "The group \"%s\" has been modified on the disk" +msgstr "\"%s\" тобы дискте өзгертілген" + +#: ../lib/application.vala:525 +msgid "Do you want to reload the group?" +msgstr "Осы топты қайта жүктеуді шынымен қалайсыз ба?" + +#: ../lib/application.vala:645 #, c-format msgid "The name \"%s\" is invalid." msgstr "\"%s\" аты қате." -#: ../lib/application.vala:516 +#: ../lib/application.vala:646 #, c-format msgid "The invalid characters are: %s" msgstr "Дұрыс емес таңбалар: %s" -#: ../lib/application.vala:573 +#: ../lib/application.vala:703 msgid "Unable to open the settings dialog" msgstr "Баптаулар терез сұзбатын ашу мүмкін емес" -#: ../lib/application.vala:618 +#: ../lib/application.vala:748 msgid "translator-credits" msgstr "Baurzhan Muftakhidinov 2010" -#: ../lib/application.vala:653 ../lib/window.vala:751 +#: ../lib/application.vala:783 ../lib/window.vala:780 msgid "_Add a new group" msgstr "Ж_аңа топты қосу" -#: ../lib/window.vala:209 +#: ../lib/window.vala:226 msgid "Menu" msgstr "Мәзір" -#: ../lib/window.vala:246 +#: ../lib/window.vala:255 +msgid "Refresh notes" +msgstr "Жазбаларды жаңарту" + +#: ../lib/window.vala:268 #, c-format msgid "Hide (%s)" msgstr "Жасыру (%s)" -#: ../lib/window.vala:618 ../src/main-panel-plugin-47.vala:50 +#: ../lib/window.vala:647 ../src/main-panel-pl
[Xfce4-commits] l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 9ea1eabbd98d0f0ea1617dac9318a067c2baf1cf (commit) from c76e638a989e236bb4e4a2873eb96592ab0e0252 (commit) commit 9ea1eabbd98d0f0ea1617dac9318a067c2baf1cf Author: Bauzhan Muftakhidinov Date: Mon Jan 31 04:18:44 2011 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 116 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 61 ++--- 1 files changed, 22 insertions(+), 39 deletions(-) diff --git a/po/kk.po b/po/kk.po index 558fdc4..9180a2b 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Baurzhan Muftakhidinov , 2010. -# +# msgid "" msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" +"POT-Creation-Date: 2010-11-07 14:39+0100\n" "PO-Revision-Date: 2010-10-19 09:08+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" -"Language: kk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: kk\n" "Plural-Forms: nplurals=1; plural=0\n" #: ../thunar-volman/main.c:59 @@ -32,25 +32,25 @@ msgid "Print version information and exit" msgstr "Нұсқа ақпаратын шығару мен шығу" #. setup application name -#: ../thunar-volman/main.c:93 +#: ../thunar-volman/main.c:96 msgid "Thunar Volume Manager" msgstr "Thunar тасушылар басқарушысы" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:135 msgid "All rights reserved." msgstr "Барлық құқықтары қорғалған." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:136 #, c-format msgid "Please report bugs to <%s>." msgstr "Ақаулықтар жөнінде хабарласыңыз: <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:190 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "sysfs жолы \"%s\" болатын құрылғы жоқ" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:202 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Жаңа құрылғылар үшін syfs жолын --device-added көмегімен көрсету керек" @@ -97,12 +97,8 @@ msgid "A photo card has been detected" msgstr "Фото картасы табылды" #: ../thunar-volman/tvm-block-device.c:275 -msgid "" -"There are photos on the card. Would you like to add these photos to your " -"album?" -msgstr "" -"Картадан фотосуреттер табылды. Осы суреттерді альбомыңызға қосуды қалайсыз " -"ба?" +msgid "There are photos on the card. Would you like to add these photos to your album?" +msgstr "Картадан фотосуреттер табылды. Осы суреттерді альбомыңызға қосуды қалайсыз ба?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -370,9 +366,8 @@ msgstr "Ruby скриптері" msgid "Shell Scripts" msgstr "Қоршам скриптері" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Сақтау құрылғылары" @@ -417,9 +412,8 @@ msgstr "Мә_лімет CD үшін команда:" msgid "Command for A_udio CDs:" msgstr "_Аудио CD үшін команда:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Мультимедиа" @@ -463,9 +457,8 @@ msgstr "Тасымалданатын медиа плеерлер" msgid "Play _music files when connected" msgstr "Қосы_лғанда, музыканы ойнату" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Камералар" @@ -478,9 +471,8 @@ msgstr "Цифрлық камералар" msgid "Import digital photographs when connected" msgstr "Қосылғанда, цифрлық фотоларды импорттау" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA" @@ -501,9 +493,8 @@ msgstr "Pocket PC" msgid "Sync Pocket P_C devices when connected" msgstr "Pocket PC құрылғылары қо_сылғанда синхрондау" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -513,9 +504,8 @@ msgstr "Принтерлер" msgid "Automatically run a program when a _printer is connected" msgstr "Принтер қосылғанда бағдарламаны а_вто жөнелту" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Енгізу құрылғылары" @@ -525,8 +515,7 @@ msgid "Keyboards" msgstr "Пернетақталар" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy -msgid "Automatically run a program when a USB _keyboard is connected" +msgid "Automatically run a program when an USB _keyboard is connected" msgstr "USB _пернетақта қосылғанда бағдарламаны автожөнелту" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 @@ -534,8 +523,7 @@ msgid "Mice
[Xfce4-commits] l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/xfce-4.8 to fb0435fb7910a312c321bdd1be85e758c240 (commit) from 34c592f5e8720375c969afd46b3add5d22cd0e1f (commit) commit fb0435fb7910a312c321bdd1be85e758c240 Author: Bauzhan Muftakhidinov Date: Mon Jan 31 04:15:40 2011 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 110 ++ 1 files changed, 32 insertions(+), 78 deletions(-) diff --git a/po/kk.po b/po/kk.po index aa29374..2bd2528 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Baurzhan Muftakhidinov , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-30 19:22+0100\n" +"POT-Creation-Date: 2011-01-30 23:30+\n" "PO-Revision-Date: 2010-08-03 10:24+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" -"Language: kk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: kk\n" "Plural-Forms: nplurals=1; plural=0\n" #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200 @@ -64,10 +64,8 @@ msgstr "Фон суреттер тізімі файлын жасау/жүкте #: ../settings/main.c:528 #, c-format -msgid "" -"File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" -msgstr "" -"\"%s\" фон суреттер тізімі бар дұрыс файл емес. Оны үстінен жазамыз ба?" +msgid "File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" +msgstr "\"%s\" фон суреттер тізімі бар дұрыс файл емес. Оны үстінен жазамыз ба?" #: ../settings/main.c:533 msgid "Invalid List File" @@ -263,8 +261,7 @@ msgid "Specifies the \"right\" or \"bottom\" color of the gradient" msgstr "Градиент үшін \"оң\" мен \"төменгі\" түстерін анықтайды" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:24 -msgid "" -"Specifies the solid color, or the \"left\" or \"top\" color of the gradient" +msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient" msgstr "Градиент үшін \"сол\" мен \"үстіңгі\" түстерін анықтайды" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 @@ -421,11 +418,8 @@ msgid "Show workspace _names in list" msgstr "Тізімде жұмыс оры_н атауын көрсету" #: ../settings/xfdesktop-settings-ui.glade.h:33 -msgid "" -"Specify the transparency level for the rounded label drawn behind the icon " -"text" -msgstr "" -"Таңбаша мәтіні астында орналасқан домалақша белгінің мөлдірлігін анықтайды" +msgid "Specify the transparency level for the rounded label drawn behind the icon text" +msgstr "Таңбаша мәтіні астында орналасқан домалақша белгінің мөлдірлігін анықтайды" #: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use _submenus for the windows in each workspace" @@ -581,10 +575,8 @@ msgid "Desktop Folder Error" msgstr "Жұмыс үстел бумасының қатесі" #: ../src/xfdesktop-file-icon-manager.c:489 -msgid "" -"A normal file with the same name already exists. Please delete or rename it." -msgstr "" -"Ондай атауы бар файл бар болып тұр. Алдымен оны өшіріңіз не атын өзгертіңіз." +msgid "A normal file with the same name already exists. Please delete or rename it." +msgstr "Ондай атауы бар файл бар болып тұр. Алдымен оны өшіріңіз не атын өзгертіңіз." #: ../src/xfdesktop-file-icon-manager.c:592 #: ../src/xfdesktop-file-icon-manager.c:636 ../src/xfdesktop-file-utils.c:879 @@ -605,12 +597,8 @@ msgstr "Ерекшеленген файлдарды қоқыс шелегіне #: ../src/xfdesktop-file-utils.c:1101 ../src/xfdesktop-file-utils.c:1151 #: ../src/xfdesktop-file-utils.c:1228 ../src/xfdesktop-file-utils.c:1289 #: ../src/xfdesktop-file-utils.c:1362 ../src/xfdesktop-file-utils.c:1440 -msgid "" -"This feature requires a file manager service to be present (such as the one " -"supplied by Thunar)." -msgstr "" -"Бұл мүмкіндік бар болып тұрған файлдар басқарушы қызметін талап етеді " -"(Thunar ұсынатын қызмет сияқты)." +msgid "This feature requires a file manager service to be present (such as the one supplied by Thunar)." +msgstr "Бұл мүмкіндік бар болып тұрған файлдар басқарушы қызметін талап етеді (Thunar ұсынатын қызмет сияқты)." #. printf is to be translator-friendly #: ../src/xfdesktop-file-icon-manager.c:738 @@ -640,12 +628,8 @@ msgid "Open With \"%s\"" msgstr "\"%s\" көмегімен ашу" #: ../src/xfdesktop-file-icon-manager.c:986 -msgid "" -"Unable to launch \"exo-desktop-item-edit\", which is required to create and " -"edit launchers and links on the desktop." -msgstr "" -"\"exo-desktop-item-edit\" жөнелту қатесі, ол жұмыс үстелінде жөнелткіштерді " -"мен сілтемелерді жасау үшін керек." +msgid "Unable to launch \"exo-desktop-item-edit\", which is require
[Xfce4-commits] l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to f2588b4302c1ccdb8abc2866c6b5337d1419c4bd (commit) from 2f3f61c00acebe99520d3127d50dca3cacd7948e (commit) commit f2588b4302c1ccdb8abc2866c6b5337d1419c4bd Author: Bauzhan Muftakhidinov Date: Mon Jan 31 04:13:45 2011 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 294 +++--- 1 files changed, 126 insertions(+), 168 deletions(-) diff --git a/po/kk.po b/po/kk.po index d3edb03..fb1a1ee 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Baurzhan Muftakhidinov , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:44+0100\n" +"POT-Creation-Date: 2011-01-30 23:12+\n" "PO-Revision-Date: 2010-08-03 10:24+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" -"Language: kk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: kk\n" "Plural-Forms: nplurals=1; plural=0\n" #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200 @@ -23,7 +23,7 @@ msgid "Backdrop list file is not valid" msgstr "Фон суреттер тізімі бар файлы қате" #. no need to escape markup; it's already done for us -#: ../settings/main.c:162 +#: ../settings/main.c:163 #, c-format msgid "" "%s\n" @@ -32,128 +32,126 @@ msgstr "" "%s\n" "Өлшемі: %dx%d" -#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247 -#: ../src/xfdesktop-special-file-icon.c:413 +#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256 +#: ../src/xfdesktop-special-file-icon.c:419 msgid "Home" msgstr "Үй бумасы" -#: ../settings/main.c:274 +#: ../settings/main.c:291 msgid "Filesystem" msgstr "Файлдық жүйе" -#: ../settings/main.c:276 +#: ../settings/main.c:293 msgid "Trash" msgstr "Қоқыс шелегі" -#: ../settings/main.c:278 +#: ../settings/main.c:295 msgid "Removable Devices" msgstr "Ауыстырмалы құрылғылар" -#: ../settings/main.c:458 +#: ../settings/main.c:475 #, c-format msgid "Cannot create backdrop list \"%s\"" msgstr "\"%s\" фон сурет тізімі файлын жасау мүмкін емес" -#: ../settings/main.c:462 ../settings/main.c:779 +#: ../settings/main.c:479 ../settings/main.c:802 msgid "Backdrop List Error" msgstr "Фон суреттер тізімі файлы қате" -#: ../settings/main.c:487 +#: ../settings/main.c:504 msgid "Create/Load Backdrop List" msgstr "Фон суреттер тізімі файлын жасау/жүктеу" -#: ../settings/main.c:511 +#: ../settings/main.c:528 #, c-format -msgid "" -"File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" -msgstr "" -"\"%s\" фон суреттер тізімі бар дұрыс файл емес. Оны үстінен жазамыз ба?" +msgid "File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" +msgstr "\"%s\" фон суреттер тізімі бар дұрыс файл емес. Оны үстінен жазамыз ба?" -#: ../settings/main.c:516 +#: ../settings/main.c:533 msgid "Invalid List File" msgstr "Қате тізім файлы" -#: ../settings/main.c:519 +#: ../settings/main.c:536 msgid "Overwriting the file will cause its contents to be lost." msgstr "Файлды үстінен жазу құрамасының жоғалуына әкеп соғады." -#: ../settings/main.c:521 +#: ../settings/main.c:538 msgid "Replace" msgstr "Алмастыру" -#: ../settings/main.c:775 +#: ../settings/main.c:798 #, c-format msgid "Failed to write backdrop list to \"%s\"" msgstr "Фон суреттер тізімі бар файлды \"%s\" ішіне жазу сәтсіз" -#: ../settings/main.c:802 +#: ../settings/main.c:825 msgid "Add Image File(s)" msgstr "Сурет файл(дар)ды қосу" -#: ../settings/main.c:811 +#: ../settings/main.c:834 msgid "Image files" msgstr "Сурет файлдары" -#: ../settings/main.c:816 +#: ../settings/main.c:839 msgid "All files" msgstr "Барлық файлдар" -#: ../settings/main.c:1248 +#: ../settings/main.c:1271 #, c-format msgid "Screen %d, Monitor %d (%s)" msgstr "Экран %d, Монитор %d (%s)" -#: ../settings/main.c:1252 +#: ../settings/main.c:1275 #, c-format msgid "Screen %d, Monitor %d" msgstr "Экран %d, Монитор %d" -#: ../settings/main.c:1255 +#: ../settings/main.c:1278 #, c-format msgid "Screen %d" msgstr "Экран %d" -#: ../settings/main.c:1260 +#: ../settings/main.c:1283 #, c-format msgid "Monitor %d (%s)" msgstr "Монитор %d (%s)" -#: ../settings/main.c:1264 +#: ../settings/main.c:1287 #, c-format msgid "Monitor %d" msgstr "Монитор %d" -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid "Settings manager socket" msgstr "Баптаулар басқарушысының сокеті" -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:1478 +#: ../settings/main.c:1501
[Xfce4-commits] Wait for a grace period before sending
Updating branch refs/heads/master to 357bc34a1db8804c944fa8ddc5f68e0483147bbf (commit) from 8c38cb47553b5b693e81389575a197cc28e7dbb6 (commit) commit 357bc34a1db8804c944fa8ddc5f68e0483147bbf Author: Christian Dywan Date: Mon Jan 31 03:07:04 2011 +0100 Wait for a grace period before sending A progressbar shows up when hitting Send, all widgets become insensitive and Cancel appears. To give the user a chance to cancel in case he realises he didn't want to send yet. postler/postler-composer.vala | 61 +++- 1 files changed, 59 insertions(+), 2 deletions(-) diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala index c15db6c..a49b2a1 100644 --- a/postler/postler-composer.vala +++ b/postler/postler-composer.vala @@ -19,12 +19,15 @@ public class Postler.Composer : Gtk.Window { Gtk.VBox shelf; Gtk.Toolbar toolbar; +Gtk.ProgressBar progressbar; Postler.Content content; Postler.Attachments attachments; Gtk.ComboBox combo_from; Gtk.Entry entry_to; Gtk.Entry entry_copy; Gtk.Entry entry_subject; +Gtk.Button button_send; +uint grace_period_timer = 0; public string subject { get { return entry_subject.text; } } int part = 0; @@ -73,7 +76,50 @@ public class Postler.Composer : Gtk.Window { return null; } +void toggle_sensitivity (bool state) { +combo_from.sensitive = state; +entry_to.sensitive = state; +entry_copy.sensitive = state; +entry_subject.sensitive = state; +content.sensitive = state; +attachments.sensitive = state; +foreach (var child in toolbar.get_children ()) +child.sensitive = state; + +if (state) { +button_send.label = STOCK_MAIL_SEND; +progressbar.hide (); +grace_period_timer = 0; +} +else { +button_send.label = Gtk.STOCK_CANCEL; +button_send.parent.sensitive = true; +} +} + +bool send_grace_period_timer () { +progressbar.fraction += 0.2; +if (progressbar.fraction == 1.0) { +send_message (); +return false; +} +return true; +} + void action_mail_send () { +if (grace_period_timer > 0) { +GLib.Source.remove (grace_period_timer); +toggle_sensitivity (true); +return; +} + +toggle_sensitivity (false); +progressbar.fraction = 0.0; +progressbar.show (); +grace_period_timer = GLib.Timeout.add_seconds (1, send_grace_period_timer); +} + +void send_message () { if (entry_subject.text == "") { var dialog = new Gtk.MessageDialog (this, 0, Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE, @@ -238,6 +284,7 @@ public class Postler.Composer : Gtk.Window { destroy (); } catch (GLib.Error error) { GLib.critical (_("Failed to send message: %s"), error.message); +toggle_sensitivity (true); } } @@ -457,6 +504,16 @@ public class Postler.Composer : Gtk.Window { toolbar = ui.get_widget ("/toolbar") as Gtk.Toolbar; toolbar.set_icon_size (Gtk.IconSize.BUTTON); +/* Grace period progress after activating Send */ +var toolitem = new Gtk.ToolItem (); +var align = new Gtk.Alignment (0.0f, 0.5f, 1.0f, 0.1f); +align.left_padding = 8; +progressbar = new Gtk.ProgressBar (); +progressbar.set_no_show_all (true); +align.add (progressbar); +toolitem.add (align); +toolbar.insert (toolitem, toolbar.get_n_items () - 1); + Gtk.rc_parse_string (""" style "postler-widebutton" { @@ -466,7 +523,7 @@ public class Postler.Composer : Gtk.Window { """ ); -var toolitem = new Gtk.ToolItem (); +toolitem = new Gtk.ToolItem (); toolitem.set_border_width (4); var button = new Gtk.Button.from_stock (Gtk.STOCK_SAVE); button.name = "PostlerWideButton"; @@ -479,7 +536,7 @@ public class Postler.Composer : Gtk.Window { toolbar.insert (toolitem, -1); toolitem = new Gtk.ToolItem (); toolitem.set_border_width (4); -var button_send = new Gtk.Button.from_stock (STOCK_MAIL_SEND); +button_send = new Gtk.Button.from_stock (STOCK_MAIL_SEND); button_send.name = "PostlerWideButton"; toolitem.add (button_send); var send = actions.get_action ("MessageSend"); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Don't mix up account and display name in the store
Updating branch refs/heads/master to fa9c0a6357c71b6219255201cdfa4690b6da1367 (commit) from 357bc34a1db8804c944fa8ddc5f68e0483147bbf (commit) commit fa9c0a6357c71b6219255201cdfa4690b6da1367 Author: Christian Dywan Date: Mon Jan 31 03:09:48 2011 +0100 Don't mix up account and display name in the store postler/postler-folders.vala |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala index cc99362..4250ea1 100644 --- a/postler/postler-folders.vala +++ b/postler/postler-folders.vala @@ -248,7 +248,7 @@ public class Postler.Folders : Gtk.TreeView { }); store.insert_with_values (out account_iter, null, -1, Columns.ICON, Gtk.STOCK_DIALOG_ERROR, -Columns.NAME, account_info.display_name, +Columns.NAME, account_info.name, Columns.DISPLAY_NAME, account_info.display_name, Columns.ELLIPSIZE, Pango.EllipsizeMode.MIDDLE, Columns.LOCATION, null, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make Save and Send buttons in composer wider
Updating branch refs/heads/master to 8c38cb47553b5b693e81389575a197cc28e7dbb6 (commit) from 262f0e1003d60662801169277f48e58f5e45c2f5 (commit) commit 8c38cb47553b5b693e81389575a197cc28e7dbb6 Author: Christian Dywan Date: Mon Jan 31 02:52:17 2011 +0100 Make Save and Send buttons in composer wider postler/postler-composer.vala | 12 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala index 8bf1709..c15db6c 100644 --- a/postler/postler-composer.vala +++ b/postler/postler-composer.vala @@ -456,9 +456,20 @@ public class Postler.Composer : Gtk.Window { shelf.pack_start (menubar, false, false, 0); toolbar = ui.get_widget ("/toolbar") as Gtk.Toolbar; toolbar.set_icon_size (Gtk.IconSize.BUTTON); + +Gtk.rc_parse_string (""" +style "postler-widebutton" +{ + GtkButton::inner-border = { 16, 16, 0, 0 } +} +widget "*PostlerWideButton" style "postler-widebutton" +""" +); + var toolitem = new Gtk.ToolItem (); toolitem.set_border_width (4); var button = new Gtk.Button.from_stock (Gtk.STOCK_SAVE); +button.name = "PostlerWideButton"; toolitem.add (button); actions.get_action ("MessageSave").connect_proxy (button); button.sensitive = false; @@ -469,6 +480,7 @@ public class Postler.Composer : Gtk.Window { toolitem = new Gtk.ToolItem (); toolitem.set_border_width (4); var button_send = new Gtk.Button.from_stock (STOCK_MAIL_SEND); +button_send.name = "PostlerWideButton"; toolitem.add (button_send); var send = actions.get_action ("MessageSend"); send.connect_proxy (button_send); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 0.3.0
Updating annotated tag refs/tags/0.3.0 as new annotated tag to 41d6dc2d1b3d3422c0ac22bacbf95744c4897174 (tag) succeeds 0.2.9-161-g26873b0 tagged by Christian Dywan on 2011-01-31 01:05 + Christian Dywan (1): Bump version to 0.3.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bump version to 0.3.0
Updating branch refs/heads/master to 43f1e55411d21d5127e32a820dd7a5acc2adde0f (commit) from 26873b0f97bc7406204356b7f86c93e7e31b0293 (commit) commit 43f1e55411d21d5127e32a820dd7a5acc2adde0f Author: Christian Dywan Date: Mon Jan 31 02:04:53 2011 +0100 Bump version to 0.3.0 ChangeLog | 17 + wscript |4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce121a1..53a9dbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,22 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.3.0 + + Support libnotify 0.7 + + Copy-friendly URIs with %20 + + No blocking of typed URLs with adblock + + Import from Netscape HTML + + Bookmark im- and export fixes + + Unit tests cleaned up and updated + + Correct bookmark and search icon names + + Better link menu handling + + Certificate location on FreeBSD + + Fix Russian keyboard issues + + Stylesheet parsing improvements + + Simplify language and panel options + + Default to DuckDuckGo search + + No Netscape plugins in extension panel + + Easy user addon install infobar + v0.2.9 + Add 'Identify As' to Statusbar Features + Don't restrict length of HTTP login passwords diff --git a/wscript b/wscript index a23d3e6..2c53f48 100644 --- a/wscript +++ b/wscript @@ -28,8 +28,8 @@ import misc from Configure import find_program_impl major = 0 -minor = 2 -micro = 9 +minor = 3 +micro = 0 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Conditionally support libnotify 0.7 API
Updating branch refs/heads/master to 26873b0f97bc7406204356b7f86c93e7e31b0293 (commit) from 5acdb5516d5d6960b91a404a4431f56698cc9c16 (commit) commit 26873b0f97bc7406204356b7f86c93e7e31b0293 Author: Samuli Suominen Date: Mon Jan 31 01:46:19 2011 +0100 Conditionally support libnotify 0.7 API Fixes: https://bugs.launchpad.net/midori/+bug/710352 midori/midori-app.c |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index d3b7583..4440de7 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -42,6 +42,9 @@ #if HAVE_LIBNOTIFY #include +#ifndef NOTIFY_CHECK_VERSION +#define NOTIFY_CHECK_VERSION(x,y,z) 0 +#endif #endif struct _MidoriApp @@ -1203,8 +1206,11 @@ midori_app_send_notification (MidoriApp* app, if (notify_is_initted ()) { NotifyNotification* note; - +#if NOTIFY_CHECK_VERSION (0, 7, 0) +note = notify_notification_new (title, message, "midori"); +#else note = notify_notification_new (title, message, "midori", NULL); +#endif notify_notification_show (note, NULL); g_object_unref (note); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Allow attachments to shrink, instead of only growing
Updating branch refs/heads/master to 262f0e1003d60662801169277f48e58f5e45c2f5 (commit) from 868ac426cdc25208aa590f1b88db5e52a4899cc7 (commit) commit 262f0e1003d60662801169277f48e58f5e45c2f5 Author: Christian Dywan Date: Sun Jan 30 21:39:56 2011 +0100 Allow attachments to shrink, instead of only growing postler/postler-attachments.vala |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/postler/postler-attachments.vala b/postler/postler-attachments.vala index bde2c96..58de2f3 100644 --- a/postler/postler-attachments.vala +++ b/postler/postler-attachments.vala @@ -16,8 +16,9 @@ public class Postler.Attachments : Gtk.IconView { model = new Gtk.ListStore (1, typeof (MessagePart)); selection_mode = Gtk.SelectionMode.BROWSE; -columns = 3; set ("item-orientation", Gtk.Orientation.HORIZONTAL); +/* Allow the icon view to shrink, instead of only growing larger */ +set_size_request (128, -1); set_no_show_all (true); var renderer_pixbuf = new Gtk.CellRendererPixbuf (); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Unescape URLs with spaces, not only with %
Updating branch refs/heads/master to 5acdb5516d5d6960b91a404a4431f56698cc9c16 (commit) from adf1f3c25b831d267df7ed3f1253658d434bac16 (commit) commit 5acdb5516d5d6960b91a404a4431f56698cc9c16 Author: Paweł Forysiuk Date: Sun Jan 30 21:37:06 2011 +0100 Unescape URLs with spaces, not only with % midori/sokoke.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 0e39ce8..61ff935 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -835,7 +835,7 @@ sokoke_magic_uri (const gchar* uri) gchar* sokoke_uri_unescape_string (const gchar* uri) { -if (strchr (uri,'%')) +if (strchr (uri,'%') || strchr (uri, ' ')) { /* Preserve %20 for pasting URLs into other windows */ gchar* unescaped = g_uri_unescape_string (uri, "+"); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Correct typo 'registerS' in HACKING
Updating branch refs/heads/master to adf1f3c25b831d267df7ed3f1253658d434bac16 (commit) from 2e35f1718be40d0f1f9b90475ef959d9964f24ac (commit) commit adf1f3c25b831d267df7ed3f1253658d434bac16 Author: Christian Dywan Date: Sun Jan 30 21:35:39 2011 +0100 Correct typo 'registerS' in HACKING HACKING |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/HACKING b/HACKING index 0b97d05..0a18479 100644 --- a/HACKING +++ b/HACKING @@ -13,7 +13,7 @@ There are several ways to contribute to the project: For translating, have a look at the file TRANSLATE. -For helping with testing and triaging bug reports, you should registers with the bug tracker at https://bugs.launchpad.net/midori and join #midori on irc.freenode.net where a lot of problems are discussed. You can start right away by trying to reproduce bug reports and comment with your findings. +For helping with testing and triaging bug reports, you should register with the bug tracker at https://bugs.launchpad.net/midori and join #midori on irc.freenode.net where a lot of problems are discussed. You can start right away by trying to reproduce bug reports and comment with your findings. If you are interested in contributing code, there are a few options. You can join #midori to discuss a particular problem you would like to look into, or a feature you would want to implement. Opening a bug report or feature request if there isn't already one is the next step. To attract some attention, if you attached a patch or have questions, ask in #midori. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Polish (pl) translation to 100%
Updating branch refs/heads/master to bd73123012b00bc9e3467e354abbb18d3b059698 (commit) from fd89453d4b0f72ff6d024f3ec0dbaaec864e8405 (commit) commit bd73123012b00bc9e3467e354abbb18d3b059698 Author: Piotr Sokół Date: Sun Jan 30 20:14:05 2011 +0100 l10n: Updated Polish (pl) translation to 100% New status: 273 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 196 + 1 files changed, 106 insertions(+), 90 deletions(-) diff --git a/po/pl.po b/po/pl.po index 29742e1..54cf9be 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: terminal 0.4.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-30 11:01+\n" -"PO-Revision-Date: 2011-01-30 20:03+0100\n" +"POT-Creation-Date: 2011-01-30 17:01+\n" +"PO-Revision-Date: 2011-01-30 20:13+0100\n" "Last-Translator: Piotr Sokół \n" "Language-Team: Polish <>\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -95,33 +96,24 @@ msgstr "" msgid "Terminal" msgstr "Terminal" -#: ../terminal/main.c:144 +#: ../terminal/main.c:147 +msgid "The Xfce development team. All rights reserved." +msgstr "Zespół twórców Xfce. Wszystkie prawa zastrzeżone." + +#: ../terminal/main.c:148 +msgid "Written by Benedikt Meurer " +msgstr "Autor: Benedikt Meurer " + +#: ../terminal/main.c:149 +msgid "and Nick Schermer ." +msgstr "i Nick Schermer ." + +#: ../terminal/main.c:150 #, c-format -msgid "" -"%s %s (Xfce %s)\n" -"\n" -"Copyright (c) %s\n" -"os-cillation e.K. All rights reserved.\n" -"\n" -"Written by Benedikt Meurer .\n" -"\n" -"Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d.\n" -"\n" -"Please report bugs to <%s>.\n" -msgstr "" -"%s %s (Xfce %s)\n" -"\n" -"Copyright (c) %s\n" -"os-cillation e.K. Wszelkie prawa zastrzeżone.\n" -"\n" -"Autor: Benedikt Meurer .\n" -"\n" -"Skompilowano przy użyciu Gtk+-%d.%d.%d, uruchomiono przy użyciu Gtk+-%d.%d." -"%d.\n" -"\n" -"Proszę zgłaszać błędy na adres <%s>.\n" - -#: ../terminal/main.c:254 +msgid "Please report bugs to <%s>." +msgstr "Proszę zgłaszać błędy na adres <%s>." + +#: ../terminal/main.c:249 #, c-format msgid "Unable to register terminal service: %s\n" msgstr "Nie udało się zarejestrować usługi terminala: %s.\n" @@ -343,7 +335,7 @@ msgstr "Pełny ekran" msgid "Set Title" msgstr "Ustaw tytuł" -#: ../terminal/terminal-preferences.c:463 ../terminal/terminal-window.c:236 +#: ../terminal/terminal-preferences.c:463 ../terminal/terminal-window.c:232 msgid "Reset" msgstr "Zresetuj" @@ -400,7 +392,7 @@ msgid "Contents" msgstr "Spis treści" #: ../terminal/terminal-screen.c:397 ../terminal/terminal-screen.c:629 -#: ../terminal/terminal-screen.c:1598 +#: ../terminal/terminal-screen.c:1635 msgid "Untitled" msgstr "Bez tytułu" @@ -410,11 +402,11 @@ msgid "Unable to determine your login shell." msgstr "Nie udało się określić powłoki logowania." #. tell the user that we were unable to execute the command -#: ../terminal/terminal-screen.c:1339 +#: ../terminal/terminal-screen.c:1344 ../terminal/terminal-screen.c:1373 msgid "Failed to execute child" msgstr "Nie udało się wywołać procesu potomnego." -#: ../terminal/terminal-screen.c:1920 +#: ../terminal/terminal-screen.c:1957 msgid "Close this tab" msgstr "Zamyka kartę" @@ -527,215 +519,215 @@ msgstr "" msgid "Failed to open the URL `%s'" msgstr "Nie udało się otworzyć adresu URL „%s”." -#: ../terminal/terminal-window.c:221 +#: ../terminal/terminal-window.c:217 msgid "_File" msgstr "_Plik" -#: ../terminal/terminal-window.c:222 +#: ../terminal/terminal-window.c:218 msgid "Open _Tab" msgstr "Nowa _karta" -#: ../terminal/terminal-window.c:222 +#: ../terminal/terminal-window.c:218 msgid "Open a new terminal tab" msgstr "Otwiera nową kartę terminala" -#: ../terminal/terminal-window.c:223 +#: ../terminal/terminal-window.c:219 msgid "Open T_erminal" msgstr "_Nowe okno" -#: ../terminal/terminal-window.c:223 +#: ../terminal/terminal-window.c:219 msgid "Open a new terminal window" msgstr "Otwiera nowe okno terminala" -#: ../terminal/terminal-window.c:224 +#: ../terminal/terminal-window.c:220 msgid "_Detach Tab" msgstr "_Odłącz kartę" -#: ../terminal/terminal-window.c:224 +#: ../terminal/terminal-window.c:220 msgid "Open a new window for the current terminal tab" msgstr "Otwórz nowe okno z bieżącą kartą terminala" -#: ../terminal/terminal-window.c:225 +#: ../terminal/terminal-window.c:221 msgid "C_lose Tab" msgstr "Zamknij k_artę" -#: ../terminal/terminal-window.c:225 +#: ../terminal/terminal-window.c:221 msgid "Close the current terminal tab" msgstr "Zamyka bieżącą kartę" -#: ../terminal/terminal-window.c:226 +#: ../terminal/terminal-window.c:222 msgid "_Close Window" msgstr "_Zamknij " -#: ../terminal/terminal
[Xfce4-commits] l10n: Updated Polish (pl) translation to 100%
Updating branch refs/heads/master to fd89453d4b0f72ff6d024f3ec0dbaaec864e8405 (commit) from db2c5a54d7007eccbd2b39c4811cbbde7cf89eb7 (commit) commit fd89453d4b0f72ff6d024f3ec0dbaaec864e8405 Author: Piotr Sokół Date: Sun Jan 30 20:05:02 2011 +0100 l10n: Updated Polish (pl) translation to 100% New status: 270 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 166 ++--- 1 files changed, 71 insertions(+), 95 deletions(-) diff --git a/po/pl.po b/po/pl.po index 0118cef..29742e1 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: terminal 0.4.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-01-30 11:01+\n" -"PO-Revision-Date: 2011-01-30 15:15+0100\n" +"PO-Revision-Date: 2011-01-30 20:03+0100\n" "Last-Translator: Piotr Sokół \n" "Language-Team: Polish <>\n" "MIME-Version: 1.0\n" @@ -28,14 +28,13 @@ msgstr "OPCJA" #: ../terminal/main.c:57 msgid "General Options" -msgstr "Ogólne" +msgstr "Ogólne opcje" #. parameter of --default-display #. parameter of --display #: ../terminal/main.c:59 ../terminal/main.c:85 -#, fuzzy msgid "display" -msgstr "Brak" +msgstr "EKRAN" #. parameter of --default-working-directory #. parameter of --working-directory @@ -45,7 +44,7 @@ msgstr "KATALOG" #: ../terminal/main.c:65 msgid "Window or Tab Separators" -msgstr "" +msgstr "Separatory okien lub kart" #: ../terminal/main.c:70 msgid "Tab Options" @@ -58,9 +57,8 @@ msgstr "POLECENIE" #. parameter of --title #: ../terminal/main.c:74 -#, fuzzy msgid "title" -msgstr "Tytuł" +msgstr "TYTUŁ" #: ../terminal/main.c:83 msgid "Window Options" @@ -69,29 +67,28 @@ msgstr "Opcje okien" #. parameter of --geometry #: ../terminal/main.c:87 msgid "geometry" -msgstr "" +msgstr "GEOMETRIA" #. parameter of --role #: ../terminal/main.c:89 msgid "role" -msgstr "" +msgstr "ROLA" #. parameter of --startup-id #: ../terminal/main.c:91 -#, fuzzy msgid "string" -msgstr "Ostrzeżenie" +msgstr "CIĄG" #. parameter of --icon #: ../terminal/main.c:93 -#, fuzzy msgid "icon" -msgstr "IKONA" +msgstr "PLIK" #: ../terminal/main.c:95 #, c-format msgid "See the %s man page for full explanation of the options above." msgstr "" +"Dokładny opis opcji programu %s znajduje się w podręczniku użytkownika." #: ../terminal/main.c:126 ../terminal/terminal-preferences.c:1262 #: ../terminal/terminal-shortcut-editor.c:119 ../Terminal.desktop.in.in.h:1 @@ -139,9 +136,8 @@ msgid "User id mismatch" msgstr "Niezgodny identyfikator użytkownika." #: ../terminal/terminal-dbus.c:119 -#, fuzzy msgid "Display mismatch" -msgstr "Niezgodny identyfikator użytkownika." +msgstr "Niezgodny ekran" #: ../terminal/terminal-dbus.c:145 #, c-format @@ -155,7 +151,7 @@ msgstr "Nie udało się zarejestrować obiektu %s." #: ../terminal/terminal-dialogs.c:95 ../Terminal-default-apps.xml.in.in.h:1 msgid "Xfce Terminal Emulator" -msgstr "Emulator terminala X dla środowiska Xfce" +msgstr "Emuluje działanie terminala X w środowisku Xfce" #: ../terminal/terminal-dialogs.c:102 msgid "translator-credits" @@ -170,7 +166,7 @@ msgstr "Strona główna" #: ../terminal/terminal-dialogs.c:215 #, c-format msgid "The %s user manual is not installed on your computer" -msgstr "" +msgstr "Nie zainstalowano podręcznika użytkownika programu %s." #: ../terminal/terminal-dialogs.c:218 #, c-format @@ -200,7 +196,7 @@ msgid "" "Option \"--default-display\" requires specifying the default X display as " "its parameter" msgstr "" -"Opcja „--default-display” wymaga wprowadzenia domyślnego ekranu X jako " +"Opcja „--default-display” wymaga określenia domyślnego ekranu X jako jej " "parametru." #: ../terminal/terminal-options.c:225 @@ -209,8 +205,8 @@ msgid "" "Option \"--default-working-directory\" requires specifying the default " "working directory as its parameter" msgstr "" -"Opcja „--default-working-directory” wymaga wprowadzenia domyślnego katalogu " -"roboczego jako parametru." +"Opcja „--default-working-directory” wymaga określenia domyślnego katalogu " +"roboczego jako jej parametru." #: ../terminal/terminal-options.c:241 #, c-format @@ -218,8 +214,8 @@ msgid "" "Option \"--execute/-x\" requires specifying the command to run on the rest " "of the command line" msgstr "" -"Opcja „--execute/-x” wymaga wprowadzenia polecenia do uruchomienia w dalszej " -"części wiersza poleceń." +"Opcja „--execute/-x” wymaga określenia polecenia do uruchomienia jako jej " +"parametru." #: ../terminal/terminal-options.c:258 #, c-format @@ -227,7 +223,7 @@ msgid "" "Option \"--command/-e\" requires specifying the command to run as its " "parameter" msgstr "" -"Opcja „--command/-e” wymaga wprowadzenia polecenia do uruchomienia jako " +"Opcja „--command/-e” wymaga określenia polecenia do uruchomienia jako jej " "parametru." #: ../terminal/te
[Xfce4-commits] Signal id's are gulong not guint.
Updating branch refs/heads/master to db2c5a54d7007eccbd2b39c4811cbbde7cf89eb7 (commit) from 58bb05c399cfe327301a48a8b84ab1144a04c754 (commit) commit db2c5a54d7007eccbd2b39c4811cbbde7cf89eb7 Author: Nick Schermer Date: Sun Jan 30 19:51:20 2011 +0100 Signal id's are gulong not guint. terminal/terminal-screen.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c index 091b22f..fb447bb 100644 --- a/terminal/terminal-screen.c +++ b/terminal/terminal-screen.c @@ -142,7 +142,7 @@ struct _TerminalScreen guintsession_id; - guintbackground_signal_id; + gulong background_signal_id; GPid pid; gchar *working_directory; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Drop test messages left in the previous commit.
Updating branch refs/heads/master to 58bb05c399cfe327301a48a8b84ab1144a04c754 (commit) from ec22089c8a5eed30e6991e18c5049ab5e2da8ce9 (commit) commit 58bb05c399cfe327301a48a8b84ab1144a04c754 Author: Nick Schermer Date: Sun Jan 30 19:46:38 2011 +0100 Drop test messages left in the previous commit. terminal/terminal-screen.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c index 1cd69ed..091b22f 100644 --- a/terminal/terminal-screen.c +++ b/terminal/terminal-screen.c @@ -1218,7 +1218,7 @@ terminal_screen_timer_background (gpointer user_data) gdouble background_darkness; gdouble saturation = 1.0; guint16 opacity = 0x; -g_message ("update bg"); + terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE); terminal_return_val_if_fail (VTE_IS_TERMINAL (screen->terminal), FALSE); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Post-release version bump.
Updating branch refs/heads/xfce-4.8 to 0ac42b8923834b33309586e599d3a412cd037d5b (commit) from eb6162dc5b97493af1930012f174e014408e2a26 (commit) commit 0ac42b8923834b33309586e599d3a412cd037d5b Author: Jannis Pohlmann Date: Sun Jan 30 19:36:56 2011 +0100 Post-release version bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 6cbe28a..ab12af7 100644 --- a/configure.in.in +++ b/configure.in.in @@ -28,7 +28,7 @@ m4_define([thunar_version_minor], [2]) m4_define([thunar_version_micro], [1]) m4_define([thunar_version_nano], []) m4_define([thunar_version_build], [@REVISION@]) -m4_define([thunar_version_tag], []) +m4_define([thunar_version_tag], [git]) m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(), [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [git], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update NEWS.
Updating branch refs/heads/master to cc468f4b3f33c298c33942ee0ce64000a920c8ed (commit) from e5d3231c6ca5b52cdf6d1f89d8c0d45d5b4f69cf (commit) commit cc468f4b3f33c298c33942ee0ce64000a920c8ed Author: Jannis Pohlmann Date: Sun Jan 30 19:36:16 2011 +0100 Update NEWS. NEWS |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index e3625da..2d91ec7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ 1.3.x = +- Paste files in correct order (bug #6504). - Fix truncated strings when loading and storing emblems (bug #7171). - Only erase top-level items from trash (bug #7147). - Don't interpret file display names as format strings (bug #7128). ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag thunar-1.2.1
Updating annotated tag refs/tags/thunar-1.2.1 as new annotated tag to 59234c49919e8f3c07e433e2d12636509d5d84c4 (tag) succeeds thunar-1.2.0 tagged by Jannis Pohlmann on 2011-01-30 18:34 + Daniel Nylander (1): l10n: Updated Swedish (sv) translation to 19% Jannis Pohlmann (11): Post-release version bump. Paste files in the correct order (bug #6504). Fix truncated strings when loading and storing emblems (bug #7171). Only erase top-level items from trash (bug #7147). Don't interpret file display names as format strings (bug #7128). Ship stock_folder-{copy,move}.png with Thunar itself (bug #6851). Fix segfault when calling strcasecmp with NULL parameters (bug #7206). Only change the Name field when renaming desktop files (bug #7155). Force desktop file reload after changing the Name field. Fix memory leak caused by not destroying the rename job. Release 1.2.1! Leandro Regueiro (5): l10n: Updated Galician (gl) translation to 98% l10n: Updated Galician (gl) translation to 98% l10n: Updated Galician (gl) translation to 100% l10n: Updated Galician (gl) translation to 100% l10n: Updated Galician (gl) translation to 100% Mișu Moldovan (1): l10n: Updated Romanian (ro) translation to 100% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update NEWS.
Updating branch refs/heads/master to 2f3f61c00acebe99520d3127d50dca3cacd7948e (commit) from 653ab409a1028a2f343139df2e8fd6ee373669f9 (commit) commit 2f3f61c00acebe99520d3127d50dca3cacd7948e Author: Jannis Pohlmann Date: Sun Jan 30 19:29:01 2011 +0100 Update NEWS. NEWS |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index a7c9be3..940bbe7 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ Xfdesktop 4.x.y * Implement open and empty actions for the trash. * Fix crash when cancelling a file download (bug #6876). * Properly invalidate tooltips on file changes. + * Make sure the background is reloaded on compositing changes. Xfdesktop 4.8.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Post-release version bump.
Updating branch refs/heads/xfce-4.8 to 34c592f5e8720375c969afd46b3add5d22cd0e1f (commit) from 2a15743dd3d91f8b466ad786d5cda471dc4128ea (commit) commit 34c592f5e8720375c969afd46b3add5d22cd0e1f Author: Jannis Pohlmann Date: Sun Jan 30 19:27:35 2011 +0100 Post-release version bump. configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 9193128..8ba0a0c 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,7 +9,7 @@ m4_define([xfdesktop_version_minor], [8]) m4_define([xfdesktop_version_micro], [1]) m4_define([xfdesktop_version_nano], []) m4_define([xfdesktop_version_build], [@REVISION@]) -m4_define([xfdesktop_version_tag],[]) +m4_define([xfdesktop_version_tag],[git]) m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])]) dnl minimum required versions ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Never filter the main page itself with adblock
Updating branch refs/heads/master to 2e35f1718be40d0f1f9b90475ef959d9964f24ac (commit) from aeccc9e9ac22bb9fe2be164b58fdd0150bad9ecf (commit) commit 2e35f1718be40d0f1f9b90475ef959d9964f24ac Author: Christian Dywan Date: Sun Jan 30 19:25:50 2011 +0100 Never filter the main page itself with adblock Fixes: https://bugs.launchpad.net/midori/+bug/706862 extensions/adblock.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/extensions/adblock.c b/extensions/adblock.c index 12a68e5..6ae7adc 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -752,6 +752,10 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view, const gchar* req_uri; const char *page_uri; +/* Never filter the main page itself */ +if (web_frame == webkit_web_view_get_main_frame (web_view)) +return; + req_uri = webkit_network_request_get_uri (request); if (!req_uri) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfdesktop-4.8.1
Updating annotated tag refs/tags/xfdesktop-4.8.1 as new annotated tag to 65178aaeccbbb54435db0b8ecc603a2ba80bd8e8 (tag) succeeds xfdesktop-4.8.0 tagged by Jannis Pohlmann on 2011-01-30 18:24 + Aleksandr Ponomarenko (1): l10n: Updated Russian (ru) translation to 93% Carles Muñoz Gorriz (1): l10n: Updated Catalan (Valencian) (ca) translation to 100% Christoph Wickert (1): l10n: Updated German (de) translation to 100% Cristian Marchi (1): l10n: Updated Italian (it) translation to 100% Daniel Nylander (1): l10n: Updated Swedish (sv) translation to 31% Gabor Kelemen (1): l10n: Updated Hungarian (hu) translation to 100% Jannis Pohlmann (11): Post-release version bump. Drop the XfdesktopFileIconPrivate struct as it is empty anyway. Use Name field as display name of desktop files (bug #6896). Support absolute icon paths in desktop files (bug #7160). Scroll to the selected background in the settings (bug #7087). Handle volume changes in a timeout (bug #7025). Implement monitoring for special file icons like the trash (bug #6986). Implement open and empty actions for the trash. Fix crash when cancelling a file download (bug #6876). Properly invalidate tooltips on file changes. Release 4.8.1! Jari Rahkonen (1): l10n: Updated Finnish (fi) translation to 100% Jeff Bailes (1): l10n: Updated English (United Kingdom) (en_GB) translation to 100% Leandro Regueiro (3): l10n: Updated Galician (gl) translation to 98% l10n: Updated Galician (gl) translation to 99% l10n: Updated Galician (gl) translation to 99% Masato Hashimoto (1): l10n: Updated Japanese (ja) translation to 100% Mike Massonnet (1): l10n: Updated French (fr) translation to 100% Mișu Moldovan (1): l10n: Updated Romanian (ro) translation to 100% Nick Schermer (2): Remove unused variable. Make sure the background is reloaded on compositing changes. Nuno Miguel (1): l10n: Updated Portuguese (pt) translation to 100% Stavros Giannouris (1): l10n: Updated Greek (el) translation to 100% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make sure the background is reloaded on compositing changes.
Updating branch refs/heads/xfce-4.8 to a9105314b1b40856795c8339a85718ca4b33c7a3 (commit) from a092b2bc1e4a4e227e6e82bf9635c96266197afd (commit) commit a9105314b1b40856795c8339a85718ca4b33c7a3 Author: Nick Schermer Date: Wed Jan 19 12:14:53 2011 +0100 Make sure the background is reloaded on compositing changes. When enabling or disabling the compositor in xfwm4, the background was grey most of the time, so make sure the background is reloaded when compositing changes by triggering a screen size changed signal (which does all we want). src/xfce-desktop.c | 12 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c index 0dab00d..f507132 100644 --- a/src/xfce-desktop.c +++ b/src/xfce-desktop.c @@ -400,6 +400,14 @@ screen_size_changed_cb(GdkScreen *gscreen, gpointer user_data) } static void +screen_composited_changed_cb(GdkScreen *gscreen, + gpointer user_data) +{ +/* fake a screen size changed, so the background is properly set */ +screen_size_changed_cb(gscreen, user_data); +} + +static void xfce_desktop_monitors_changed(GdkScreen *gscreen, gpointer user_data) { @@ -757,6 +765,8 @@ xfce_desktop_realize(GtkWidget *widget) g_signal_connect(G_OBJECT(desktop->priv->gscreen), "size-changed", G_CALLBACK(screen_size_changed_cb), desktop); +g_signal_connect(G_OBJECT(desktop->priv->gscreen), "composited-changed", +G_CALLBACK(screen_composited_changed_cb), desktop); gtk_widget_add_events(GTK_WIDGET(desktop), GDK_EXPOSURE_MASK); @@ -795,6 +805,8 @@ xfce_desktop_unrealize(GtkWidget *widget) g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen), G_CALLBACK(screen_size_changed_cb), desktop); +g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen), +G_CALLBACK(screen_composited_changed_cb), desktop); groot = gdk_screen_get_root_window(desktop->priv->gscreen); gdk_property_delete(groot, gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove unused variable.
Updating branch refs/heads/xfce-4.8 to a092b2bc1e4a4e227e6e82bf9635c96266197afd (commit) from 36d58868ce6ce7c303aba908aa902b5b6d111361 (commit) commit a092b2bc1e4a4e227e6e82bf9635c96266197afd Author: Nick Schermer Date: Wed Jan 19 12:07:03 2011 +0100 Remove unused variable. src/xfdesktop-regular-file-icon.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c index 840a098..e14256a 100644 --- a/src/xfdesktop-regular-file-icon.c +++ b/src/xfdesktop-regular-file-icon.c @@ -540,7 +540,6 @@ xfdesktop_regular_file_icon_update_file_info(XfdesktopFileIcon *icon, XfdesktopRegularFileIcon *regular_file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon); const gchar *old_display_name; gchar *new_display_name; -gboolean label_changed = FALSE; g_return_if_fail(XFDESKTOP_IS_REGULAR_FILE_ICON(icon)); g_return_if_fail(G_IS_FILE_INFO(info)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Avoid racing on the size-changed signal (bug #6921).
Updating branch refs/heads/master to ec22089c8a5eed30e6991e18c5049ab5e2da8ce9 (commit) from 5a14360a46f6d1260fdad15a5ea803607a809ebf (commit) commit ec22089c8a5eed30e6991e18c5049ab5e2da8ce9 Author: Nick Schermer Date: Sun Jan 30 19:17:01 2011 +0100 Avoid racing on the size-changed signal (bug #6921). Some internals in vte changed, which causes size-allocate signals on background changes, resulting in the terminal allocating and leaking (because there is still a leak in vte) backgrounds. Fix this my doing the background update in an idle, which seems to resolve the problem and to be sure, don't watch size changes when a transparent or plain background is used. terminal/terminal-screen.c | 36 +--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c index 42801c4..1cd69ed 100644 --- a/terminal/terminal-screen.c +++ b/terminal/terminal-screen.c @@ -90,6 +90,7 @@ static gchar *terminal_screen_parse_title (TerminalScreen const gchar *title); static gchar**terminal_screen_get_child_environment (TerminalScreen*screen); static void terminal_screen_update_background (TerminalScreen*screen); +static void terminal_screen_update_background_fast (TerminalScreen*screen); static void terminal_screen_update_binding_backspace (TerminalScreen*screen); static void terminal_screen_update_binding_delete (TerminalScreen*screen); static void terminal_screen_update_colors (TerminalScreen*screen); @@ -141,6 +142,8 @@ struct _TerminalScreen guintsession_id; + guintbackground_signal_id; + GPid pid; gchar *working_directory; @@ -243,7 +246,6 @@ terminal_screen_init (TerminalScreen *screen) "signal::selection-changed", G_CALLBACK (terminal_screen_vte_selection_changed), screen, "signal::window-title-changed", G_CALLBACK (terminal_screen_vte_window_title_changed), screen, "signal::resize-window", G_CALLBACK (terminal_screen_vte_resize_window), screen, -"swapped-signal::size-allocate", G_CALLBACK (terminal_screen_timer_background), screen, "swapped-signal::style-set", G_CALLBACK (terminal_screen_update_colors), screen, NULL); gtk_box_pack_start (GTK_BOX (screen), screen->terminal, TRUE, TRUE, 0); @@ -712,6 +714,18 @@ terminal_screen_get_child_environment (TerminalScreen *screen) static void +terminal_screen_update_background_fast (TerminalScreen *screen) +{ + if (G_UNLIKELY (screen->background_timer_id == 0)) +{ + screen->background_timer_id = g_idle_add_full (G_PRIORITY_LOW, terminal_screen_timer_background, + screen, terminal_screen_timer_background_destroy); +} +} + + + +static void terminal_screen_update_background (TerminalScreen *screen) { if (G_UNLIKELY (screen->background_timer_id != 0)) @@ -1204,7 +1218,7 @@ terminal_screen_timer_background (gpointer user_data) gdouble background_darkness; gdouble saturation = 1.0; guint16 opacity = 0x; - +g_message ("update bg"); terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE); terminal_return_val_if_fail (VTE_IS_TERMINAL (screen->terminal), FALSE); @@ -1222,9 +1236,25 @@ terminal_screen_timer_background (gpointer user_data) if (G_LIKELY (image != NULL)) g_object_unref (G_OBJECT (image)); g_object_unref (G_OBJECT (loader)); + + /* refresh background on size changes */ + if (screen->background_signal_id == 0) +{ + screen->background_signal_id = + g_signal_connect_swapped (G_OBJECT (screen->terminal), "size-allocate", + G_CALLBACK (terminal_screen_update_background_fast), screen); +} } else { + /* stop updating on size changes */ + if (screen->background_signal_id != 0) +{ + g_signal_handler_disconnect (G_OBJECT (screen->terminal), screen->background_signal_id); + screen->background_signal_id = 0; +} + + /* WARNING: the causes a resize too! */ vte_terminal_set_background_image (VTE_TERMINAL (screen->terminal), NULL); } @@ -1365,7 +1395,7 @@ terminal_screen_launch_child (TerminalScreen *screen) if (!vte_terminal_fork_command_full (VTE_TERMINAL (screen->terminal), update ? VTE_PTY_DEFAULT : VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP, - screen->w
[Xfce4-commits] Use midori_browser_add_tab for tab on tab bar click
Updating branch refs/heads/master to aeccc9e9ac22bb9fe2be164b58fdd0150bad9ecf (commit) from 07ffc279b2dae47cad0754db904acf7a4d5f9641 (commit) commit aeccc9e9ac22bb9fe2be164b58fdd0150bad9ecf Author: Christian Dywan Date: Sun Jan 30 19:11:38 2011 +0100 Use midori_browser_add_tab for tab on tab bar click So we get speed dial if it is enabled like on new tab button. midori/midori-browser.c |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a3bd405..86ddf6a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4756,9 +4756,7 @@ midori_browser_notebook_button_press_event_after_cb (GtkNotebook*notebook, if (/*(event->type == GDK_2BUTTON_PRESS && event->button == 1) || */(event->type == GDK_BUTTON_PRESS && event->button == 2)) { -gint n; -GtkWidget* view = midori_view_new_with_title (NULL, browser->settings, TRUE); -n = midori_browser_add_tab (browser, view); +gint n = midori_browser_add_uri (browser, ""); midori_browser_set_current_page (browser, n); return TRUE; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Don't support 'review' pages on userstyles.org for now
Updating branch refs/heads/master to 57d529d309cfdfa3ff4e1bc8564f1b8d57256429 (commit) from 7368ca00c16fe298e62d61dade09a516794903ba (commit) commit 57d529d309cfdfa3ff4e1bc8564f1b8d57256429 Author: Christian Dywan Date: Sun Jan 30 18:27:59 2011 +0100 Don't support 'review' pages on userstyles.org for now extensions/addons.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extensions/addons.c b/extensions/addons.c index 746ac6d..7604ab3 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -262,7 +262,7 @@ addons_notify_load_status_cb (MidoriBrowser* browser, gchar* subpage = split_uri[4]; /* userscripts.org script main (with desc) and "source view" pages */ - if (!g_strcmp0 (subpage, "show") || !g_strcmp0 (subpage, "review")) + if (!g_strcmp0 (subpage, "show") /* || !g_strcmp0 (subpage, "review") */) addons_uri_install (browser, MIDORI_VIEW (view), ADDONS_USER_SCRIPTS); g_strfreev (split_uri); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Refer to Launchpad rather than Flyspray for bug tracking
Updating branch refs/heads/master to 07ffc279b2dae47cad0754db904acf7a4d5f9641 (commit) from 1f08629a4f6a7e38568710bbfc3191d36aa649bf (commit) commit 07ffc279b2dae47cad0754db904acf7a4d5f9641 Author: Christian Dywan Date: Sun Jan 30 18:47:17 2011 +0100 Refer to Launchpad rather than Flyspray for bug tracking Fixes: https://bugs.launchpad.net/midori/+bug/706241 HACKING |2 +- README |2 +- midori/midori-browser.c |2 +- wscript |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/HACKING b/HACKING index 3b35489..0b97d05 100644 --- a/HACKING +++ b/HACKING @@ -13,7 +13,7 @@ There are several ways to contribute to the project: For translating, have a look at the file TRANSLATE. -For helping with testing and triaging bug reports, you should registers with the bug tracker at http://www.twotoasts.de/bugs and join #midori on irc.freenode.net where a lot of problems are discussed. You can start right away by trying to reproduce bug reports and comment with your findings. +For helping with testing and triaging bug reports, you should registers with the bug tracker at https://bugs.launchpad.net/midori and join #midori on irc.freenode.net where a lot of problems are discussed. You can start right away by trying to reproduce bug reports and comment with your findings. If you are interested in contributing code, there are a few options. You can join #midori to discuss a particular problem you would like to look into, or a feature you would want to implement. Opening a bug report or feature request if there isn't already one is the next step. To attract some attention, if you attached a patch or have questions, ask in #midori. diff --git a/README b/README index 7f46fc8..36f5ac6 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ Optional: Unique 0.9, libidn, docutils, libnotify, Vala For installation instructions read INSTALL. Please report comments, suggestions and bugs to: -http://www.twotoasts.de/bugs +https://bugs.launchpad.net/midori And join the IRC channel #midori on irc.freenode.net diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 519b815..a3bd405 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4541,7 +4541,7 @@ _action_help_link_activate (GtkAction* action, else if (!strncmp ("HelpFAQ", action_name, 7)) uri = "http://wiki.xfce.org/midori/faq";; else if (!strncmp ("HelpBugs", action_name, 8)) -uri = "http://www.twotoasts.de/bugs/";; +uri = PACKAGE_BUGREPORT; else uri = NULL; diff --git a/wscript b/wscript index 4da15d0..a23d3e6 100644 --- a/wscript +++ b/wscript @@ -277,7 +277,7 @@ def configure (conf): conf.define ('PACKAGE_VERSION', VERSION) conf.define ('PACKAGE_NAME', APPNAME) -conf.define ('PACKAGE_BUGREPORT', 'http://www.twotoasts.de/bugs') +conf.define ('PACKAGE_BUGREPORT', 'https://bugs.launchpad.net/midori') conf.define ('GETTEXT_PACKAGE', APPNAME) conf.define ('MIDORI_MAJOR_VERSION', major) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove unneeded check in HTML import function.
Updating branch refs/heads/master to 7368ca00c16fe298e62d61dade09a516794903ba (commit) from 1efabca2b1b12b0bf724bd84a65ac9d8ee683499 (commit) commit 7368ca00c16fe298e62d61dade09a516794903ba Author: Paweł Forysiuk Date: Sun Jan 30 12:18:39 2011 +0100 Remove unneeded check in HTML import function. It was triggering a missleading warning at the last line of file giving the impression of interrupted and broken import. midori/midori-array.c |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/midori/midori-array.c b/midori/midori-array.c index 7e5f0f9..021afff 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -347,8 +347,6 @@ katze_array_from_netscape_file (KatzeArray* array, { if (folder != array) folder = katze_item_get_parent ((KatzeItem*)folder); -else -g_warning ("A level-up although we are at the top level"); continue; } g_strfreev (element); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Rename HTML import function from mozilla to netscape to be more consistent.
Updating branch refs/heads/master to 74bb09b8c7f4909ef5b6e04630d3f117e57bb90e (commit) from 1b5d01241c35bff4fbb7c331996c786d730e4589 (commit) commit 74bb09b8c7f4909ef5b6e04630d3f117e57bb90e Author: Paweł Forysiuk Date: Sun Jan 30 11:16:34 2011 +0100 Rename HTML import function from mozilla to netscape to be more consistent. midori/midori-array.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/midori-array.c b/midori/midori-array.c index f6495e5..7e5f0f9 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -294,7 +294,7 @@ katze_array_from_xmlDocPtr (KatzeArray* array, } static gboolean -katze_array_from_mozilla_file (KatzeArray* array, +katze_array_from_netscape_file (KatzeArray* array, const gchar* filename) { gchar* line = NULL; @@ -489,7 +489,7 @@ midori_array_from_file (KatzeArray* array, if (!format) format = ""; -/* mozilla html */ +/* netscape html */ if (!*format && g_str_has_suffix (filename, ".html")) { FILE* file; @@ -501,7 +501,7 @@ midori_array_from_file (KatzeArray* array, g_strstrip (line); if (katze_str_equal (line, "")) { -if (!katze_array_from_mozilla_file (array, filename)) +if (!katze_array_from_netscape_file (array, filename)) { /* Parsing failed */ fclose (file); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Don't use GtkInfoBar api explicitly in user style/script infobar installer
Updating branch refs/heads/master to 1efabca2b1b12b0bf724bd84a65ac9d8ee683499 (commit) from 11ac3fe1574011584a004b0b28193445eee7bcf1 (commit) commit 1efabca2b1b12b0bf724bd84a65ac9d8ee683499 Author: Paweł Forysiuk Date: Sun Jan 30 12:29:48 2011 +0100 Don't use GtkInfoBar api explicitly in user style/script infobar installer extensions/addons.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extensions/addons.c b/extensions/addons.c index 6839ed4..746ac6d 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -94,7 +94,7 @@ struct AddonsList }; static void -addons_install_response (GtkInfoBar* infobar, +addons_install_response (GtkWidget* infobar, gintresponse_id, MidoriView* view) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Preserve %20 for pasting URLs into other windows
Updating branch refs/heads/master to 1f08629a4f6a7e38568710bbfc3191d36aa649bf (commit) from 57d529d309cfdfa3ff4e1bc8564f1b8d57256429 (commit) commit 1f08629a4f6a7e38568710bbfc3191d36aa649bf Author: Christian Dywan Date: Sun Jan 30 18:43:28 2011 +0100 Preserve %20 for pasting URLs into other windows midori/sokoke.c | 11 +-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 4e4aa09..0e39ce8 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -828,7 +828,7 @@ sokoke_magic_uri (const gchar* uri) * sokoke_uri_unescape_string: * @uri: an URI string * - * Unescape @uri if needed, and pass through '+'. + * Unescape @uri if needed, and pass through '+' and '%20'. * * Return value: a newly allocated URI **/ @@ -836,7 +836,14 @@ gchar* sokoke_uri_unescape_string (const gchar* uri) { if (strchr (uri,'%')) -return g_uri_unescape_string (uri, "+"); +{ +/* Preserve %20 for pasting URLs into other windows */ +gchar* unescaped = g_uri_unescape_string (uri, "+"); +gchar* spaced = sokoke_replace_variables (unescaped, " ", "%20", NULL); +g_free (unescaped); +return spaced; +} + return g_strdup (uri); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make bookmark import button label show supported formats when importing from a file.
Updating branch refs/heads/master to 11ac3fe1574011584a004b0b28193445eee7bcf1 (commit) from 74bb09b8c7f4909ef5b6e04630d3f117e57bb90e (commit) commit 11ac3fe1574011584a004b0b28193445eee7bcf1 Author: Paweł Forysiuk Date: Sun Jan 30 11:35:54 2011 +0100 Make bookmark import button label show supported formats when importing from a file. 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 16bb9ee..519b815 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4054,7 +4054,7 @@ _action_bookmarks_import_activate (GtkAction* action, g_free (path); } gtk_list_store_insert_with_values (model, NULL, G_MAXINT, -0, _("Import from a file"), 1, NULL, 2, NULL, 3, icon_width, -1); +0, _("Import from XBEL or HTML file"), 1, NULL, 2, NULL, 3, icon_width, -1); gtk_combo_box_set_active (combobox, 0); gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 653ab409a1028a2f343139df2e8fd6ee373669f9 (commit) from 7a95914827ef2c42640363801d12e603fa66e4a0 (commit) commit 653ab409a1028a2f343139df2e8fd6ee373669f9 Author: Claque Date: Sun Jan 30 18:55:46 2011 +0100 l10n: Updated Russian (ru) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9485401..2334ad4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -766,9 +766,8 @@ msgid "This feature requires a trash service to be present (such as the one supp msgstr "Эта функция требует наличия службы корзины (например, предоставляемой Thunar)." #: ../src/xfdesktop-file-utils.c:927 ../src/xfdesktop-file-utils.c:941 -#, fuzzy msgid "Could not empty the trash" -msgstr "Не удалось создать каталог Рабочего стола \"%s\"." +msgstr "Невозможно очистить корзину" #: ../src/xfdesktop-file-utils.c:978 ../src/xfdesktop-file-utils.c:993 msgid "Create File Error" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Russian (ru) translation to 99%
Updating branch refs/heads/master to 7a95914827ef2c42640363801d12e603fa66e4a0 (commit) from 9b9d48293cb779da3de4a9aa287da1e9b532bc57 (commit) commit 7a95914827ef2c42640363801d12e603fa66e4a0 Author: Claque Date: Sun Jan 30 18:52:17 2011 +0100 l10n: Updated Russian (ru) translation to 99% New status: 198 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 407 +- 1 files changed, 161 insertions(+), 246 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5cff02c..9485401 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,21 +5,20 @@ # Anthony Ivanoff , 2004, 2005. # Andrey Fedoseev , 2006. # Denis Koryavov , 2010. -# +# msgid "" msgstr "" "Project-Id-Version: xfdesktop 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:44+0100\n" +"POT-Creation-Date: 2011-01-30 17:12+\n" "PO-Revision-Date: 2010-01-26 13:02+0300\n" "Last-Translator: Denis Koryavov \n" "Language-Team: Russian \n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200 #, c-format @@ -27,7 +26,7 @@ msgid "Backdrop list file is not valid" msgstr "Неправильный файл со списком фоновых картинок" #. no need to escape markup; it's already done for us -#: ../settings/main.c:162 +#: ../settings/main.c:163 #, c-format msgid "" "%s\n" @@ -36,129 +35,126 @@ msgstr "" "%s\n" "Размер: %dx%d" -#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247 -#: ../src/xfdesktop-special-file-icon.c:413 +#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256 +#: ../src/xfdesktop-special-file-icon.c:419 msgid "Home" msgstr "Домашний каталог" -#: ../settings/main.c:274 +#: ../settings/main.c:291 msgid "Filesystem" msgstr "Файловая система" -#: ../settings/main.c:276 +#: ../settings/main.c:293 msgid "Trash" msgstr "Корзина" -#: ../settings/main.c:278 +#: ../settings/main.c:295 msgid "Removable Devices" msgstr "Съёмные устройства" -#: ../settings/main.c:458 +#: ../settings/main.c:475 #, c-format msgid "Cannot create backdrop list \"%s\"" msgstr "Невозможно создать список фоновых изображений \"%s\"" -#: ../settings/main.c:462 ../settings/main.c:779 +#: ../settings/main.c:479 ../settings/main.c:802 msgid "Backdrop List Error" msgstr "Ошибка списка изображений" -#: ../settings/main.c:487 +#: ../settings/main.c:504 msgid "Create/Load Backdrop List" msgstr "Создать/Загрузить список фоновых изображений" -#: ../settings/main.c:511 +#: ../settings/main.c:528 #, c-format -msgid "" -"File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" -msgstr "" -"Файл \"%s\" не является правильным файлом списка фоновых изображений. " -"Перезаписать его?" +msgid "File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" +msgstr "Файл \"%s\" не является правильным файлом списка фоновых изображений. Перезаписать его?" -#: ../settings/main.c:516 +#: ../settings/main.c:533 msgid "Invalid List File" msgstr "Неправильный файл списка" -#: ../settings/main.c:519 +#: ../settings/main.c:536 msgid "Overwriting the file will cause its contents to be lost." msgstr "Перезапись файла приведёт к утрате его содержимого." -#: ../settings/main.c:521 +#: ../settings/main.c:538 msgid "Replace" msgstr "Заменить" -#: ../settings/main.c:775 +#: ../settings/main.c:798 #, c-format msgid "Failed to write backdrop list to \"%s\"" msgstr "Не удалось записать список изображений в \"%s\":" -#: ../settings/main.c:802 +#: ../settings/main.c:825 msgid "Add Image File(s)" msgstr "Добавить файл(ы) изображений" -#: ../settings/main.c:811 +#: ../settings/main.c:834 msgid "Image files" msgstr "Файлы изображений" -#: ../settings/main.c:816 +#: ../settings/main.c:839 msgid "All files" msgstr "Все файлы" -#: ../settings/main.c:1248 +#: ../settings/main.c:1271 #, c-format msgid "Screen %d, Monitor %d (%s)" msgstr "Экран %d, монитор %d (%s)" -#: ../settings/main.c:1252 +#: ../settings/main.c:1275 #, c-format msgid "Screen %d, Monitor %d" msgstr "Экран %d, монитор %d" -#: ../settings/main.c:1255 +#: ../settings/main.c:1278 #, c-format msgid "Screen %d" msgstr "Экран %d" -#: ../settings/main.c:1260 +#: ../settings/main.c:1283 #, c-format msgid "Monitor %d (%s)" msgstr "Монитор %d (%s)" -#: ../settings/main.c:1264 +#: ../settings/main.c:1287 #, c-format msgid "Monitor %d" msgstr "Монитор %d" -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid "Settings manager socket" msgstr "Сок
[Xfce4-commits] Force desktop file reload after changing the Name field.
Updating branch refs/heads/xfce-4.8 to b70c4abab3503eb4d3682e3ff619a2c5336e8247 (commit) from 3c1227aa1232bf9d6009d6d34ea281468e070642 (commit) commit b70c4abab3503eb4d3682e3ff619a2c5336e8247 Author: Jannis Pohlmann Date: Sun Jan 30 18:19:38 2011 +0100 Force desktop file reload after changing the Name field. NEWS |1 + thunar/thunar-file.c | 13 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 4b550c6..7535d6c 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ Thunar itself (bug #6851). - Fix segfault when calling strcasecmp with NULL parameters (bug #7206). - Only change the Name field when renaming desktop files (bug #7155). +- Force desktop file reload after changing the Name field. 1.2.0 = diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c index bda7669..1281841 100644 --- a/thunar/thunar-file.c +++ b/thunar/thunar-file.c @@ -1285,8 +1285,17 @@ thunar_file_rename (ThunarFile *file, /* write the changes back to the file */ if (thunar_g_file_write_key_file (file->gfile, key_file, cancellable, &err)) { - /* notify everybody that the file has changed */ - thunar_file_changed (file); + /* reload file information */ + thunar_file_load (file, NULL, NULL); + + if (!called_from_job) +{ + /* tell the associated folder that the file was renamed */ + thunarx_file_info_renamed (THUNARX_FILE_INFO (file)); + + /* notify everybody that the file has changed */ + thunar_file_changed (file); +} /* release the key file and return with success */ g_key_file_free (key_file); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix memory leak caused by not destroying the rename job.
Updating branch refs/heads/xfce-4.8 to 402dd4831fabe607c98365b415f117b2f619d3f0 (commit) from b70c4abab3503eb4d3682e3ff619a2c5336e8247 (commit) commit 402dd4831fabe607c98365b415f117b2f619d3f0 Author: Jannis Pohlmann Date: Sun Jan 30 18:28:17 2011 +0100 Fix memory leak caused by not destroying the rename job. NEWS|1 + thunar/thunar-application.c | 16 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 7535d6c..91c8f10 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ - Fix segfault when calling strcasecmp with NULL parameters (bug #7206). - Only change the Name field when renaming desktop files (bug #7155). - Force desktop file reload after changing the Name field. +- Fix memory leak caused by not destroying the rename job. 1.2.0 = diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c index c65d5b2..4490105 100644 --- a/thunar/thunar-application.c +++ b/thunar/thunar-application.c @@ -1237,6 +1237,18 @@ thunar_application_rename_file_error (ExoJob *job, +static void +thunar_application_rename_file_finished (ExoJob *job, + gpointer user_data) +{ + _thunar_return_if_fail (EXO_IS_JOB (job)); + + /* destroy the job object */ + g_object_unref (job); +} + + + /** * thunar_application_rename_file: * @application : a #ThunarApplication. @@ -1275,6 +1287,10 @@ thunar_application_rename_file (ThunarApplication *application, /* handle rename errors */ g_signal_connect (job, "error", G_CALLBACK (thunar_application_rename_file_error), application); + + /* destroy the job when it has finished */ + g_signal_connect (job, "finished", +G_CALLBACK (thunar_application_rename_file_finished), NULL); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix memory leak caused by not destroying the rename job.
Updating branch refs/heads/master to e5d3231c6ca5b52cdf6d1f89d8c0d45d5b4f69cf (commit) from 4eeef3ead20203f33eb6a96519f4f118f592c539 (commit) commit e5d3231c6ca5b52cdf6d1f89d8c0d45d5b4f69cf Author: Jannis Pohlmann Date: Sun Jan 30 18:28:17 2011 +0100 Fix memory leak caused by not destroying the rename job. NEWS|1 + thunar/thunar-application.c | 16 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 1accf91..e3625da 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ - Fix segfault when calling strcasecmp with NULL parameters (bug #7206). - Only change the Name field when renaming desktop files (bug #7155). - Force desktop file reload after changing the Name field. +- Fix memory leak caused by not destroying the rename job. 1.2.0 = diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c index c65d5b2..4490105 100644 --- a/thunar/thunar-application.c +++ b/thunar/thunar-application.c @@ -1237,6 +1237,18 @@ thunar_application_rename_file_error (ExoJob *job, +static void +thunar_application_rename_file_finished (ExoJob *job, + gpointer user_data) +{ + _thunar_return_if_fail (EXO_IS_JOB (job)); + + /* destroy the job object */ + g_object_unref (job); +} + + + /** * thunar_application_rename_file: * @application : a #ThunarApplication. @@ -1275,6 +1287,10 @@ thunar_application_rename_file (ThunarApplication *application, /* handle rename errors */ g_signal_connect (job, "error", G_CALLBACK (thunar_application_rename_file_error), application); + + /* destroy the job when it has finished */ + g_signal_connect (job, "finished", +G_CALLBACK (thunar_application_rename_file_finished), NULL); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Force desktop file reload after changing the Name field.
Updating branch refs/heads/master to 4eeef3ead20203f33eb6a96519f4f118f592c539 (commit) from 0222f08e2dbb1f0964fe3ba293a31301af3e3fc9 (commit) commit 4eeef3ead20203f33eb6a96519f4f118f592c539 Author: Jannis Pohlmann Date: Sun Jan 30 18:19:38 2011 +0100 Force desktop file reload after changing the Name field. NEWS |1 + thunar/thunar-file.c | 13 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 111d2ac..1accf91 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ Thunar itself (bug #6851). - Fix segfault when calling strcasecmp with NULL parameters (bug #7206). - Only change the Name field when renaming desktop files (bug #7155). +- Force desktop file reload after changing the Name field. 1.2.0 = diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c index bda7669..1281841 100644 --- a/thunar/thunar-file.c +++ b/thunar/thunar-file.c @@ -1285,8 +1285,17 @@ thunar_file_rename (ThunarFile *file, /* write the changes back to the file */ if (thunar_g_file_write_key_file (file->gfile, key_file, cancellable, &err)) { - /* notify everybody that the file has changed */ - thunar_file_changed (file); + /* reload file information */ + thunar_file_load (file, NULL, NULL); + + if (!called_from_job) +{ + /* tell the associated folder that the file was renamed */ + thunarx_file_info_renamed (THUNARX_FILE_INFO (file)); + + /* notify everybody that the file has changed */ + thunar_file_changed (file); +} /* release the key file and return with success */ g_key_file_free (key_file); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfwm4-4.8.1
Updating annotated tag refs/tags/xfwm4-4.8.1 as new annotated tag to dca5a46a71ac2cbefd0b81ca95563ed824844aed (tag) succeeds xfwm4-4.8.0 tagged by Nick Schermer on 2011-01-30 16:46 + Claque (1): l10n: Updated Russian (ru) translation to 100% Daniel Nylander (1): l10n: Updated Swedish (sv) translation to 10% Nick Schermer (2): Post release tag bump. Updates for release. Olivier Fourdan (2): Restore the release keyboard events. Allow images without an alpha channel to be used in themes as well Piarres Beobide (1): l10n: Updated Basque (eu) translation to 100% Özgür Kuru (1): l10n: Updated Turkish (tr) translation to 100% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updates for release.
Updating branch refs/heads/xfce-4.8 to 5b41921903f74f5026eac5dd9811f026cc6a5264 (commit) from 61541d1dbcc6b67a692b0a8d96ad9a323ce6df3b (commit) commit 5b41921903f74f5026eac5dd9811f026cc6a5264 Author: Nick Schermer Date: Sun Jan 30 17:43:17 2011 +0100 Updates for release. NEWS|7 +++ configure.ac.in |4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index df024c9..44dbe37 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +4.8.1 += +- Allow images without an alpha channel to be used in themes as well. +- Restore the release keyboard events. +- Updated translations: Russian, Basque, Swedish, Turkish. + + 4.8.0 = - Update copyright year. diff --git a/configure.ac.in b/configure.ac.in index f52ea7f..faf4338 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,9 +5,9 @@ dnl m4_define([xfwm4_version_major], [4]) m4_define([xfwm4_version_minor], [8]) -m4_define([xfwm4_version_micro], [0]) +m4_define([xfwm4_version_micro], [1]) m4_define([xfwm4_version_build], [@REVISION@]) -m4_define([xfwm4_version_tag], [git]) +m4_define([xfwm4_version_tag], []) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) m4_define([gtk_minimum_version], [2.14.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Post release tag bump.
Updating branch refs/heads/xfce-4.8 to 15c1f960f6682303466d3e123603b0a51df081e3 (commit) from 5b41921903f74f5026eac5dd9811f026cc6a5264 (commit) commit 15c1f960f6682303466d3e123603b0a51df081e3 Author: Nick Schermer Date: Sun Jan 30 17:43:48 2011 +0100 Post release tag bump. configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index faf4338..d23b552 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -7,7 +7,7 @@ m4_define([xfwm4_version_major], [4]) m4_define([xfwm4_version_minor], [8]) m4_define([xfwm4_version_micro], [1]) m4_define([xfwm4_version_build], [@REVISION@]) -m4_define([xfwm4_version_tag], []) +m4_define([xfwm4_version_tag], [git]) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) m4_define([gtk_minimum_version], [2.14.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-settings-4.8.1
Updating annotated tag refs/tags/xfce4-settings-4.8.1 as new annotated tag to 8f3fe776ef1d9f8e2182052ebf30c78e985f206e (tag) succeeds xfce4-settings-4.8.0 tagged by Nick Schermer on 2011-01-30 16:35 + Jérôme Guelfucci (2): Don't test for "default" output in xfce_randr_populate (bug #7092). Fix double free when setting workspace names (bug #7174). Nick Schermer (3): Post release tag bump. Fix compilation. Updates for release. Özgür Kuru (1): l10n: Updated Turkish (tr) translation to 78% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 9b9d48293cb779da3de4a9aa287da1e9b532bc57 (commit) from c9762228739c1030408a60fb837562ccdb2aa026 (commit) commit 9b9d48293cb779da3de4a9aa287da1e9b532bc57 Author: Sergio Marques Date: Sun Jan 30 17:41:02 2011 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 148 +- 1 files changed, 98 insertions(+), 50 deletions(-) diff --git a/po/pt.po b/po/pt.po index 021f3fd..27c7acc 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the xfdesktop package. # Nuno Donato , 2004. # Nuno Miguel , 2007, 2008, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfdesktop 4.6.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-01-30 11:11+\n" -"PO-Revision-Date: 2010-12-30 16:11+0100\n" -"Last-Translator: Nuno Miguel \n" +"PO-Revision-Date: 2011-01-30 16:40-\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,8 @@ msgstr "" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" -#: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200 +#: ../common/xfdesktop-common.c:96 +#: ../common/xfdesktop-common.c:200 #, c-format msgid "Backdrop list file is not valid" msgstr "O ficheiro de lista de fundos é inválido" @@ -34,7 +35,8 @@ msgstr "" "%s\n" "Tamanho: %dx%d" -#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256 +#: ../settings/main.c:289 +#: ../src/xfdesktop-special-file-icon.c:256 #: ../src/xfdesktop-special-file-icon.c:419 msgid "Home" msgstr "Pasta pessoal" @@ -56,7 +58,8 @@ msgstr "Dispositivos amovíveis" msgid "Cannot create backdrop list \"%s\"" msgstr "Não é possível criar lista de fundos \"%s\"" -#: ../settings/main.c:479 ../settings/main.c:802 +#: ../settings/main.c:479 +#: ../settings/main.c:802 msgid "Backdrop List Error" msgstr "Erro na lista de fundos" @@ -339,7 +342,8 @@ msgstr "_Botão:" msgid "Control" msgstr "Control" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:737 +#: ../settings/xfdesktop-settings-ui.glade.h:10 +#: ../src/xfce-desktop.c:737 msgid "Desktop" msgstr "Ambiente de trabalho" @@ -496,11 +500,15 @@ msgstr "Opções de compilação:\n" msgid "Desktop Menu:%s\n" msgstr "Menu do ambiente de trabalho: %s\n" -#: ../src/main.c:279 ../src/main.c:286 ../src/main.c:293 +#: ../src/main.c:279 +#: ../src/main.c:286 +#: ../src/main.c:293 msgid "enabled" msgstr "activado" -#: ../src/main.c:281 ../src/main.c:288 ../src/main.c:295 +#: ../src/main.c:281 +#: ../src/main.c:288 +#: ../src/main.c:295 msgid "disabled" msgstr "desactivado" @@ -542,7 +550,8 @@ msgstr "Área de trabalho %d" msgid "Workspace %d" msgstr "Área de trabalho %d" -#: ../src/windowlist.c:368 ../src/windowlist.c:371 +#: ../src/windowlist.c:368 +#: ../src/windowlist.c:371 msgid "_Add Workspace" msgstr "_Adicionar área de trabalho" @@ -581,8 +590,10 @@ msgid "A normal file with the same name already exists. Please delete or rename msgstr "Já existe um ficheiro com o mesmo nome. Por favor, dê-lhe outro nome ou apague-o." #: ../src/xfdesktop-file-icon-manager.c:592 -#: ../src/xfdesktop-file-icon-manager.c:636 ../src/xfdesktop-file-utils.c:879 -#: ../src/xfdesktop-file-utils.c:894 ../src/xfdesktop-file-utils.c:926 +#: ../src/xfdesktop-file-icon-manager.c:636 +#: ../src/xfdesktop-file-utils.c:879 +#: ../src/xfdesktop-file-utils.c:894 +#: ../src/xfdesktop-file-utils.c:926 #: ../src/xfdesktop-file-utils.c:940 msgid "Trash Error" msgstr "Erro no lixo" @@ -593,12 +604,18 @@ msgid "The selected files could not be trashed" msgstr "Os ficheiros seleccionados não foram eliminados" #: ../src/xfdesktop-file-icon-manager.c:594 -#: ../src/xfdesktop-file-icon-manager.c:638 ../src/xfdesktop-file-utils.c:728 -#: ../src/xfdesktop-file-utils.c:778 ../src/xfdesktop-file-utils.c:837 -#: ../src/xfdesktop-file-utils.c:995 ../src/xfdesktop-file-utils.c:1051 -#: ../src/xfdesktop-file-utils.c:1101 ../src/xfdesktop-file-utils.c:1151 -#: ../src/xfdesktop-file-utils.c:1228 ../src/xfdesktop-file-utils.c:1289 -#: ../src/xfdesktop-file-utils.c:1362 ../src/xfdesktop-file-utils.c:1440 +#: ../src/xfdesktop-file-icon-manager.c:638 +#: ../src/xfdesktop-file-utils.c:728 +#: ../src/xfdesktop-file-utils.c:778 +#: ../src/xfdesktop-file-utils.c:837 +#: ../src/xfdesktop-file-utils.c:995 +#: ../src/xfdesktop-file-utils.c:1051 +#: ../src/xfdesktop-file-utils.c:1101 +#: ../src/xfdesktop-file-utils.c:1151 +#: ../src/xfdesktop-file-utils.c:1228 +#: ../src/xfdesktop-file-utils.c:1289 +#: ../src/xfdesktop-file-utils.c:1362 +#: ../src/xfdesktop-file-utils.c:1440 msgid "This feature requires a file manager service to be present (suc
[Xfce4-commits] Creating annotated tag xfce-utils-4.8.1
Updating annotated tag refs/tags/xfce-utils-4.8.1 as new annotated tag to 11d30ad43fd5008da2b867683f64a14cf111e248 (tag) succeeds xfce-utils-4.8.0 tagged by Nick Schermer on 2011-01-30 16:39 + Aleksandr Ponomarenko (1): l10n: Updated Russian (ru) translation to 93% Daniel Nylander (1): l10n: Updated Swedish (sv) translation to 39% Jannis Pohlmann (1): Post-release version bump. Nick Schermer (3): Make sure XDG_CONFIG_DIRS contains the installed xdg dir. Merge branch 'master' into xfce-4.8 Updates for release. Transifex (2): Update translators, week 03. Update translators, week 04. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Post release tag bump.
Updating branch refs/heads/xfce-4.8 to c92f8d75378eac9b591d700b56d154b1169083b1 (commit) from f2e64009119afdea27d4cd378ac602fdaa6e09b5 (commit) commit c92f8d75378eac9b591d700b56d154b1169083b1 Author: Nick Schermer Date: Sun Jan 30 17:40:36 2011 +0100 Post release tag bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index a732f2a..ad20359 100644 --- a/configure.in.in +++ b/configure.in.in @@ -14,7 +14,7 @@ m4_define([xfce_utils_version_minor], [8]) m4_define([xfce_utils_version_micro], [1]) m4_define([xfce_utils_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce_utils_version_build], [@REVISION@]) -m4_define([xfce_utils_version_tag], []) +m4_define([xfce_utils_version_tag], [git]) m4_define([xfce_utils_version], [xfce_utils_version_major().xfce_utils_version_minor().xfce_utils_version_micro()ifelse(xfce_utils_version_nano(), [], [], [.xfce_utils_version_nano()])ifelse(xfce_utils_version_tag(), [git], [xfce_utils_version_tag()-xfce_utils_version_build()], [xfce_utils_version_tag()])]) dnl Debugging support for GIT snapshots ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' into xfce-4.8
Updating branch refs/heads/xfce-4.8 to d8535c7219a77cf656662823658cf1a21eea3484 (commit) from d9d2f93ab7db80f1c59471f0a0a0f2fbf0bdd613 (commit) commit d8535c7219a77cf656662823658cf1a21eea3484 Merge: d9d2f93 b630b5e Author: Nick Schermer Date: Sun Jan 30 17:37:50 2011 +0100 Merge branch 'master' into xfce-4.8 commit b630b5e2c1d6ba4f7d3205605152b8421d678281 Author: Transifex Date: Sun Jan 30 00:00:05 2011 +0100 Update translators, week 04. commit ea60e6609de81bd0f8b8700dfb70437bac253001 Author: Transifex Date: Sun Jan 23 00:00:07 2011 +0100 Update translators, week 03. commit 10f3b44e89c81d40b6cf37824b7fa42caea178ac Author: Nick Schermer Date: Thu Jan 20 11:22:03 2011 +0100 Make sure XDG_CONFIG_DIRS contains the installed xdg dir. scripts/startxfce4.in | 12 xfce4-about/translators.h | 10 +- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in index 2268dbe..7a871d2 100644 --- a/scripts/startxfce4.in +++ b/scripts/startxfce4.in @@ -38,6 +38,18 @@ else fi export XDG_DATA_DIRS +if test "x$XDG_CONFIG_DIRS" = "x" +then + if test "x@_sysconfdir_@" = "x/etc"; then +XDG_CONFIG_DIRS="/etc/xdg" + else +XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg" + fi +else + XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg" +fi +export XDG_CONFIG_DIRS + if test "x$DISPLAY" = "x" then echo "$0: Starting X server" diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h index 6641db1..bbade5a 100644 --- a/xfce4-about/translators.h +++ b/xfce4-about/translators.h @@ -24,7 +24,7 @@ #include #include -#define TRANSLATORS_H_STAMP "2011-01-16 00:00:06" +#define TRANSLATORS_H_STAMP "2011-01-30 00:00:04" #define ATSIGN "@" #define DOTSIGN "." @@ -249,6 +249,13 @@ static const TranslatorInfo xfce_translators_kk[] = { NULL, NULL } }; +static const TranslatorInfo xfce_translators_kn[] = +{ + { "shankar", "prasad" DOTSIGN "mvs" ATSIGN "gmail" DOTSIGN "com", TRUE }, + { "Vasudev Kamath", "kamathvasudev" ATSIGN "gmail" DOTSIGN "com", TRUE }, + { NULL, NULL } +}; + static const TranslatorInfo xfce_translators_lt[] = { { "Ričardas Vasiulis", "ricardas" DOTSIGN "v" ATSIGN "inbox" DOTSIGN "lt", TRUE }, @@ -488,6 +495,7 @@ static const TranslatorTeam xfce_translators[] = { "Italian", "it", xfce_translators_it }, { "Japanese", "ja", xfce_translators_ja }, { "Kazakh", "kk", xfce_translators_kk }, + { "Kannada", "kn", xfce_translators_kn }, { "Lithuanian", "lt", xfce_translators_lt }, { "Latvian", "lv", xfce_translators_lv }, { "Norwegian Bokmal", "nb", xfce_translators_nb }, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updates for release.
Updating branch refs/heads/xfce-4.8 to f2e64009119afdea27d4cd378ac602fdaa6e09b5 (commit) from d8535c7219a77cf656662823658cf1a21eea3484 (commit) commit f2e64009119afdea27d4cd378ac602fdaa6e09b5 Author: Nick Schermer Date: Sun Jan 30 17:39:21 2011 +0100 Updates for release. NEWS|7 +++ configure.in.in |4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2fa8607..2fddc76 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +4.8.1 += +- Make sure XDG_CONFIG_DIRS contains the installed xdg dir. +- Update translator credits. +- Translation updates: Russian. Swedish. + + 4.8.0 = - Set DESKTOP_SESSION to "xfce" in xinitrc (bug #6376). diff --git a/configure.in.in b/configure.in.in index 387423a..a732f2a 100644 --- a/configure.in.in +++ b/configure.in.in @@ -11,10 +11,10 @@ dnl dnl Version information m4_define([xfce_utils_version_major], [4]) m4_define([xfce_utils_version_minor], [8]) -m4_define([xfce_utils_version_micro], [0]) +m4_define([xfce_utils_version_micro], [1]) m4_define([xfce_utils_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce_utils_version_build], [@REVISION@]) -m4_define([xfce_utils_version_tag], [git]) +m4_define([xfce_utils_version_tag], []) m4_define([xfce_utils_version], [xfce_utils_version_major().xfce_utils_version_minor().xfce_utils_version_micro()ifelse(xfce_utils_version_nano(), [], [], [.xfce_utils_version_nano()])ifelse(xfce_utils_version_tag(), [git], [xfce_utils_version_tag()-xfce_utils_version_build()], [xfce_utils_version_tag()])]) dnl Debugging support for GIT snapshots ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update translators, week 04.
Updating branch refs/heads/xfce-4.8 to b630b5e2c1d6ba4f7d3205605152b8421d678281 (commit) from ea60e6609de81bd0f8b8700dfb70437bac253001 (commit) commit b630b5e2c1d6ba4f7d3205605152b8421d678281 Author: Transifex Date: Sun Jan 30 00:00:05 2011 +0100 Update translators, week 04. xfce4-about/translators.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h index 019bdad..bbade5a 100644 --- a/xfce4-about/translators.h +++ b/xfce4-about/translators.h @@ -24,7 +24,7 @@ #include #include -#define TRANSLATORS_H_STAMP "2011-01-23 00:00:07" +#define TRANSLATORS_H_STAMP "2011-01-30 00:00:04" #define ATSIGN "@" #define DOTSIGN "." ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update translators, week 03.
Updating branch refs/heads/xfce-4.8 to ea60e6609de81bd0f8b8700dfb70437bac253001 (commit) from 10f3b44e89c81d40b6cf37824b7fa42caea178ac (commit) commit ea60e6609de81bd0f8b8700dfb70437bac253001 Author: Transifex Date: Sun Jan 23 00:00:07 2011 +0100 Update translators, week 03. xfce4-about/translators.h | 10 +- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h index 6641db1..019bdad 100644 --- a/xfce4-about/translators.h +++ b/xfce4-about/translators.h @@ -24,7 +24,7 @@ #include #include -#define TRANSLATORS_H_STAMP "2011-01-16 00:00:06" +#define TRANSLATORS_H_STAMP "2011-01-23 00:00:07" #define ATSIGN "@" #define DOTSIGN "." @@ -249,6 +249,13 @@ static const TranslatorInfo xfce_translators_kk[] = { NULL, NULL } }; +static const TranslatorInfo xfce_translators_kn[] = +{ + { "shankar", "prasad" DOTSIGN "mvs" ATSIGN "gmail" DOTSIGN "com", TRUE }, + { "Vasudev Kamath", "kamathvasudev" ATSIGN "gmail" DOTSIGN "com", TRUE }, + { NULL, NULL } +}; + static const TranslatorInfo xfce_translators_lt[] = { { "Ričardas Vasiulis", "ricardas" DOTSIGN "v" ATSIGN "inbox" DOTSIGN "lt", TRUE }, @@ -488,6 +495,7 @@ static const TranslatorTeam xfce_translators[] = { "Italian", "it", xfce_translators_it }, { "Japanese", "ja", xfce_translators_ja }, { "Kazakh", "kk", xfce_translators_kk }, + { "Kannada", "kn", xfce_translators_kn }, { "Lithuanian", "lt", xfce_translators_lt }, { "Latvian", "lv", xfce_translators_lv }, { "Norwegian Bokmal", "nb", xfce_translators_nb }, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make sure XDG_CONFIG_DIRS contains the installed xdg dir.
Updating branch refs/heads/xfce-4.8 to 10f3b44e89c81d40b6cf37824b7fa42caea178ac (commit) from 76d8b1038274b62c2e7487f4f69b1643388ee313 (commit) commit 10f3b44e89c81d40b6cf37824b7fa42caea178ac Author: Nick Schermer Date: Thu Jan 20 11:22:03 2011 +0100 Make sure XDG_CONFIG_DIRS contains the installed xdg dir. scripts/startxfce4.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in index 2268dbe..7a871d2 100644 --- a/scripts/startxfce4.in +++ b/scripts/startxfce4.in @@ -38,6 +38,18 @@ else fi export XDG_DATA_DIRS +if test "x$XDG_CONFIG_DIRS" = "x" +then + if test "x@_sysconfdir_@" = "x/etc"; then +XDG_CONFIG_DIRS="/etc/xdg" + else +XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg" + fi +else + XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg" +fi +export XDG_CONFIG_DIRS + if test "x$DISPLAY" = "x" then echo "$0: Starting X server" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updates for release.
Updating branch refs/heads/xfce-4.8 to 87172d2ae066b7b5798e9ef5753bc94e90714552 (commit) from 03ff865a0a917cea54a7af0ccde59fabd410c464 (commit) commit 87172d2ae066b7b5798e9ef5753bc94e90714552 Author: Nick Schermer Date: Sun Jan 30 17:33:52 2011 +0100 Updates for release. NEWS|6 ++ configure.ac.in |4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 94f4e36..d66d30f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +4.8.1 += +- Don't test for "default" output in xfce_randr_populate (bug #7092). +- Fix double free when setting workspace names (bug #7174). +- Updated translations: Turkish. + 4.8.0 = - Dispatch primary clipboard restoration (bug #6819). diff --git a/configure.ac.in b/configure.ac.in index 8f50f80..379e2b9 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,10 +11,10 @@ dnl *** Version information *** dnl *** m4_define([xfce4_settings_version_major], [4]) m4_define([xfce4_settings_version_minor], [8]) -m4_define([xfce4_settings_version_micro], [0]) +m4_define([xfce4_settings_version_micro], [1]) m4_define([xfce4_settings_version_nano], []) m4_define([xfce4_settings_version_build], [@REVISION@]) -m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases +m4_define([xfce4_settings_version_tag], []) # Leave empty for releases m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Post release tag bump.
Updating branch refs/heads/xfce-4.8 to d041e37c97173ce97b6cd906407849ba8a956df0 (commit) from 87172d2ae066b7b5798e9ef5753bc94e90714552 (commit) commit d041e37c97173ce97b6cd906407849ba8a956df0 Author: Nick Schermer Date: Sun Jan 30 17:35:36 2011 +0100 Post release tag bump. configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 379e2b9..3c158aa 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -14,7 +14,7 @@ m4_define([xfce4_settings_version_minor], [8]) m4_define([xfce4_settings_version_micro], [1]) m4_define([xfce4_settings_version_nano], []) m4_define([xfce4_settings_version_build], [@REVISION@]) -m4_define([xfce4_settings_version_tag], []) # Leave empty for releases +m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix compilation. (cherry picked from commit 4efa1867a4b5d794b0dc56b7ec794b954f12c75a)
Updating branch refs/heads/xfce-4.8 to f1893d3636960910eee4f61fd3cca3e944956d6f (commit) from 52877bbe9c18dec778a3421650063f93eb4d169a (commit) commit f1893d3636960910eee4f61fd3cca3e944956d6f Author: Nick Schermer Date: Sun Jan 23 20:02:26 2011 +0100 Fix compilation. (cherry picked from commit 4efa1867a4b5d794b0dc56b7ec794b954f12c75a) dialogs/display-settings/xfce-randr.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dialogs/display-settings/xfce-randr.c b/dialogs/display-settings/xfce-randr.c index cd16c95..c40f50d 100644 --- a/dialogs/display-settings/xfce-randr.c +++ b/dialogs/display-settings/xfce-randr.c @@ -153,8 +153,8 @@ xfce_randr_populate (XfceRandr *randr, gint n; guint m; -g_return_val_if_fail (randr != NULL, FALSE); -g_return_val_if_fail (randr->resources != NULL, FALSE); +g_return_if_fail (randr != NULL); +g_return_if_fail (randr->resources != NULL); /* prepare the temporary cache */ outputs = g_ptr_array_new (); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix double free when setting workspace names (bug #7174). (cherry picked from commit 6c5b2bdd6fd5d733ba3deb968ea3d9193a1038f8)
Updating branch refs/heads/xfce-4.8 to 03ff865a0a917cea54a7af0ccde59fabd410c464 (commit) from f1893d3636960910eee4f61fd3cca3e944956d6f (commit) commit 03ff865a0a917cea54a7af0ccde59fabd410c464 Author: Jérôme Guelfucci Date: Thu Jan 27 21:48:57 2011 +0100 Fix double free when setting workspace names (bug #7174). (cherry picked from commit 6c5b2bdd6fd5d733ba3deb968ea3d9193a1038f8) xfce4-settings-helper/workspaces.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xfce4-settings-helper/workspaces.c b/xfce4-settings-helper/workspaces.c index 1c66e81..42eb9ac 100644 --- a/xfce4-settings-helper/workspaces.c +++ b/xfce4-settings-helper/workspaces.c @@ -343,6 +343,10 @@ xfce_workspaces_helper_set_names (XfceWorkspacesHelper *helper) if (name != NULL && *name != '\0') { /* use the existing name */ +val = g_new0 (GValue, 1); +g_value_init (val, G_TYPE_STRING); +new_name = g_strdup (name); +g_value_take_string (val, new_name); g_ptr_array_add (names, val); continue; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Don't test for "default" output in xfce_randr_populate (bug #7092).
Updating branch refs/heads/xfce-4.8 to 52877bbe9c18dec778a3421650063f93eb4d169a (commit) from cf5d907726604b5aeef938a7422a88cff73d (commit) commit 52877bbe9c18dec778a3421650063f93eb4d169a Author: Jérôme Guelfucci Date: Fri Jan 21 19:57:55 2011 +0100 Don't test for "default" output in xfce_randr_populate (bug #7092). We thought this would allow us to detect only the proprietary drivers but it also 'blacklists' the nv and prlvideo. Also remove the code to detect nvidia-settings, as the dialog allows the user to at least set the resolutions. (cherry picked from commit 7700656c757fcc8e32470a8609a574974a12e1a7) dialogs/display-settings/main.c | 16 dialogs/display-settings/xfce-randr.c | 25 ++--- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c index 76bf6e8..1706964 100644 --- a/dialogs/display-settings/main.c +++ b/dialogs/display-settings/main.c @@ -1103,20 +1103,12 @@ main (gint argc, gchar **argv) if (!xfce_randr) { -command = g_find_program_in_path ("nvidia-settings"); +command = g_find_program_in_path ("amdcccle"); + if (command != NULL) { -alternative = _("NVIDIA Settings"); -alternative_icon = "nvidia-settings"; -} -else -{ -command = g_find_program_in_path ("amdcccle"); -if (command != NULL) -{ -alternative = _("ATI Settings"); -alternative_icon = "ccc_small"; -} +alternative = _("ATI Settings"); +alternative_icon = "ccc_small"; } response = xfce_message_dialog (NULL, NULL, GTK_STOCK_DIALOG_ERROR, diff --git a/dialogs/display-settings/xfce-randr.c b/dialogs/display-settings/xfce-randr.c index 45b8646..cd16c95 100644 --- a/dialogs/display-settings/xfce-randr.c +++ b/dialogs/display-settings/xfce-randr.c @@ -142,7 +142,7 @@ xfce_randr_list_supported_modes (XRRScreenResources *resources, -static gboolean +static void xfce_randr_populate (XfceRandr *randr, Display *xdisplay, GdkWindow *root_window) @@ -175,15 +175,6 @@ xfce_randr_populate (XfceRandr *randr, /* cache it */ g_ptr_array_add (outputs, output_info); - -/* check if the device is really a randr 1.2 device */ -if (n == 0 && strcmp (output_info->name, "default") == 0) -{ -/* free the cache */ -g_ptr_array_foreach (outputs, (GFunc) XRRFreeOutputInfo, NULL); -g_ptr_array_free (outputs, TRUE); -return FALSE; -} } /* migrate the temporary cache */ @@ -234,8 +225,6 @@ xfce_randr_populate (XfceRandr *randr, /* clone modes: same RRModes present for all outputs */ xfce_randr_list_clone_modes (randr); - -return TRUE; } @@ -285,17 +274,7 @@ xfce_randr_new (GdkDisplay *display, /* get the screen resource */ randr->resources = XRRGetScreenResources (xdisplay, GDK_WINDOW_XID (root_window)); -if (!xfce_randr_populate (randr, xdisplay, root_window)) -{ -/* cleanup */ -xfce_randr_free (randr); - -/* set error */ -g_set_error (error, 0, 0, _("The video driver does not support video outputs")); - -/* return nothing */ -return NULL; -} +xfce_randr_populate (randr, xdisplay, root_window); return randr; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Post release tag bump.
Updating branch refs/heads/xfce-4.8 to f100d692d97428f6fafaa7bffdc2fedd61d6778f (commit) from e8b5b84371bc9f5f5f09f8665b9bf3855b618387 (commit) commit f100d692d97428f6fafaa7bffdc2fedd61d6778f Author: Nick Schermer Date: Sun Jan 30 17:32:06 2011 +0100 Post release tag bump. configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 8bee5ce..7d7c8eb 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -15,7 +15,7 @@ m4_define([xfce4_panel_version_minor], [8]) m4_define([xfce4_panel_version_micro], [1]) m4_define([xfce4_panel_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_panel_version_build], [@REVISION@]) -m4_define([xfce4_panel_version_tag], []) +m4_define([xfce4_panel_version_tag], [git]) m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-panel-4.8.1
Updating annotated tag refs/tags/xfce4-panel-4.8.1 as new annotated tag to 505653088b3b3baaa3d446c8aa42e4728e2160b7 (tag) succeeds xfce4-panel-4.8.0 tagged by Nick Schermer on 2011-01-30 16:28 + Daniel Nylander (1): l10n: Updated Swedish (sv) translation to 82% Masato Hashimoto (2): l10n: Updated Japanese (ja) translation to 100% l10n: Updated Japanese (ja) translation to 100% Nick Schermer (30): Post release tag bump. Make the panels sticky for some window managers (bug #7130). Fix assert when storing property values in xfconf (bug #7117). Migrate monitor information (bug #7135). Move some systray code around without functionality changes. Improve systray debugging messages. Cache launcher menu tooltip pixbuf (bug #7146). Reverse menu item insert order (bug #7102). Set and restore a unique role name for windows (bug #7094). Don't return a critical on a NULL dbus session. Again allocate 1x1 requests offscreen in the systray (bug #7143 and #7057). Popup window menu under cursor when on a popup menu. Remove too new Gtk+ functions. Directly start the panel on the correct screen (bug #7161). Move the panel menu to the correct screen. Remove screen var from panel_application_plugin_insert. Fix dragging a window to another screen. Open plugin dialogs on same screen as plugin. Sync hidden window and panel screen. Show launcher add dialog on the same screen as parent. Fix autohide direction based on orientation and edge. Deactivate menu button if loading menu failed. Don't double expose the panel's child widget (bug #6872). Improve window debug messages. Remove unneeded check (bug #7149). Don't disappear when wm restarts with compositing (bug #7194). Properly update the plugin background when moving to other panel. Unset visible event window in 4.6 plugins. Merge branch 'master' into xfce-4.8 Updates for release. Piarres Beobide (1): l10n: Updated Basque (eu) translation to 100% Ričardas Vasiulis (1): l10n: Updated Lithuanian (lt) translation to 48% Xavier Devlamynck (1): l10n: Updated French (fr) translation to 100% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updates for release.
Updating branch refs/heads/xfce-4.8 to e8b5b84371bc9f5f5f09f8665b9bf3855b618387 (commit) from ee0924e491cb5eb17851fde5763d60d888d712fd (commit) commit e8b5b84371bc9f5f5f09f8665b9bf3855b618387 Author: Nick Schermer Date: Sun Jan 30 17:27:54 2011 +0100 Updates for release. NEWS| 27 +++ configure.ac.in |4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2593138..12b40f2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,30 @@ +4.8.1 += +- Make the panels sticky for some window managers (bug #7130). +- Fix assert when storing property values in xfconf (bug #7117). +- Migrate monitor information (bug #7135). +- Cache launcher menu tooltip pixbuf (bug #7146). +- Reverse menu item insert order (bug #7102). +- Set and restore a unique role name for windows (bug #7094). +- Don't return a critical on a NULL dbus session. +- Allocate 1x1 requests offscreen in the systray (bug #7143 and #7057). +- Popup window menu under cursor on window button group menus. +- Directly start the panel on the correct screen (bug #7161). +- Move the panel menu to the correct screen (bug #7203). +- Fix dragging panels to another screen. +- Open plugin dialogs on same screen as plugin. +- Sync hidden window and panel screen. +- Show launcher add dialog on the same screen as parent. +- Fix autohide direction based on orientation and edge. +- Deactivate menu button if loading menu failed. +- Don't double expose the panel's child widget (bug #6872). +- Remove unneeded check (bug #7149). +- Don't disappear when wm restarts with compositing (bug #7194). +- Properly update the plugin background when moving to other panel. +- Unset visible event window in 4.6 plugins. +- Various small code cleanups and improved debug messages. +- Translation updates (eu, fr, ja, lt, sv). + 4.8.0 = - Restart tray allocation if number of rows overflows (bug #7055). diff --git a/configure.ac.in b/configure.ac.in index 9529bd2..8bee5ce 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -12,10 +12,10 @@ m4_define([libxfce4panel_verinfo], [3:0:0]) dnl current:revision:age m4_define([libxfce4panel_version_api], [1.0]) m4_define([xfce4_panel_version_major], [4]) m4_define([xfce4_panel_version_minor], [8]) -m4_define([xfce4_panel_version_micro], [0]) +m4_define([xfce4_panel_version_micro], [1]) m4_define([xfce4_panel_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_panel_version_build], [@REVISION@]) -m4_define([xfce4_panel_version_tag], [git]) +m4_define([xfce4_panel_version_tag], []) m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 868ac426cdc25208aa590f1b88db5e52a4899cc7 (commit) from 03de26c33123ef610185208227db9bc244e54063 (commit) commit 868ac426cdc25208aa590f1b88db5e52a4899cc7 Author: Sergio Marques Date: Sun Jan 30 17:30:10 2011 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 228 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 277 +- 1 files changed, 146 insertions(+), 131 deletions(-) diff --git a/po/pt.po b/po/pt.po index 0063bb9..14bb1f8 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: postler\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-26 11:17+\n" +"POT-Creation-Date: 2011-01-30 11:16+\n" "PO-Revision-Date: 2011-01-25 00:39-\n" "Last-Translator: Sérgio Marques \n" "Language-Team: \n" @@ -31,6 +31,7 @@ msgid "Postler" msgstr "Postler" #: ../postler/postler-accounts.vala:70 ../postler/postler-accounts.vala:195 +#: ../postler/postler-service.vala:165 msgid "Inbox" msgstr "Caixa de entrada" @@ -205,6 +206,10 @@ msgstr "Arqui_vo" msgid "_Forward" msgstr "Reenca_minhar" +#: ../postler/postler-app.vala:90 +msgid "Mark as _Important" +msgstr "Marcar como _importante" + #: ../postler/postler-app.vala:91 msgid "Mark as Junk" msgstr "Lixo eletrónico" @@ -226,8 +231,8 @@ msgid "Reply to _All" msgstr "Responder a _todos" #: ../postler/postler-app.vala:98 -msgid "_Send Message" -msgstr "_Enviar mensagem" +msgid "S_end" +msgstr "_Enviar" #: ../postler/postler-app.vala:99 msgid "_Receive Mail" @@ -279,7 +284,7 @@ msgstr "Responder à _lista" msgid "translator-credits" msgstr "Sérgio Marques " -#: ../postler/postler-bureau.vala:368 ../postler/postler-composer.vala:375 +#: ../postler/postler-bureau.vala:368 ../postler/postler-composer.vala:353 msgid "_Mail" msgstr "_Correio" @@ -327,7 +332,7 @@ msgstr "Apagar mensagem" msgid "Quit the application" msgstr "Sair da aplicação" -#: ../postler/postler-bureau.vala:391 ../postler/postler-composer.vala:384 +#: ../postler/postler-bureau.vala:391 ../postler/postler-composer.vala:362 msgid "_Edit" msgstr "_Editar" @@ -347,7 +352,7 @@ msgstr "Gravar a pesquisa atual" msgid "_View" msgstr "_Ver" -#: ../postler/postler-bureau.vala:398 ../postler/postler-content.vala:262 +#: ../postler/postler-bureau.vala:398 ../postler/postler-content.vala:263 msgid "_Enlarge Text" msgstr "Aum_entar texto" @@ -355,7 +360,7 @@ msgstr "Aum_entar texto" msgid "Enlarge message text" msgstr "Aumentar o texto da mensagem" -#: ../postler/postler-bureau.vala:400 ../postler/postler-content.vala:269 +#: ../postler/postler-bureau.vala:400 ../postler/postler-content.vala:270 msgid "Sh_rink Text" msgstr "Diminui_r texto" @@ -367,7 +372,7 @@ msgstr "Diminuir o texto da mensagem" msgid "View the message in fullscreen" msgstr "Ver mensagem em ecrã completo" -#: ../postler/postler-bureau.vala:404 ../postler/postler-content.vala:282 +#: ../postler/postler-bureau.vala:404 ../postler/postler-content.vala:283 msgid "View _Source" msgstr "Ver _fonte" @@ -427,7 +432,7 @@ msgstr "Te_xto integral" msgid "Search the full message text" msgstr "Pesquisar texto integral da mensagem" -#: ../postler/postler-bureau.vala:465 ../postler/postler-composer.vala:463 +#: ../postler/postler-bureau.vala:465 ../postler/postler-composer.vala:447 #, c-format msgid "Failed to create window: %s" msgstr "Falha ao criar a janela: %s" @@ -457,160 +462,160 @@ msgstr "O Postler precisa de algumas informações para obter o correio." msgid "_Continue" msgstr "_Continuar" -#: ../postler/postler-composer.vala:79 +#: ../postler/postler-composer.vala:80 msgid "You did not enter a subject." msgstr "Não indicou o assunto." -#: ../postler/postler-composer.vala:81 +#: ../postler/postler-composer.vala:82 msgid "Do you want to send the message without a subject?" msgstr "Pretende enviar a mensagem sem assunto?" -#: ../postler/postler-composer.vala:83 +#: ../postler/postler-composer.vala:84 msgid "_Send message without subject" msgstr "Enviar men_sagem sem assunto" -#: ../postler/postler-composer.vala:95 +#: ../postler/postler-composer.vala:96 msgid "You have not configured any accounts for sending." msgstr "Ainda não configurou quaisquer contas para envio." -#: ../postler/postler-composer.vala:110 +#: ../postler/postler-composer.vala:111 msgid "Folders for sent messages and outbox can't be created. " msgstr "As pastas \"Enviadas\" e \"Caixa de saída\" não foram criadas." #. i18n: A warning is displayed when writing a new message #. and there are no attachments but the text mentions #. attachments. Words are separated by |. -#: ../postler/postler-composer.vala:151 +#: ../postler/postler-composer.vala:159 msgid "attachment|attach" msgstr "anexo|anexar" -#: ../postler/postler-compose
[Xfce4-commits] l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to a9b44b2de2dace5b9eee4010212ac44120f04f00 (commit) from 455d79828ee646b8c811cdb6be72bc177113124d (commit) commit a9b44b2de2dace5b9eee4010212ac44120f04f00 Author: Sergio Marques Date: Sun Jan 30 17:31:20 2011 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 57 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 67 +- 1 files changed, 40 insertions(+), 27 deletions(-) diff --git a/po/pt.po b/po/pt.po index 52a26d5..f003c16 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-notes-plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-17 05:03+\n" +"POT-Creation-Date: 2011-01-30 11:03+\n" "PO-Revision-Date: 2010-03-16 11:10-\n" "Last-Translator: Sérgio Marques \n" "Language-Team: \n" @@ -18,117 +18,130 @@ msgstr "" #: ../src/xfce4-notes.desktop.in.h:1 #: ../src/xfce4-notes-autostart.desktop.in.h:1 #: ../src/xfce4-notes-plugin.desktop.in.in.h:1 -#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:611 +#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:741 msgid "Ideal for your quick notes" msgstr "Ideal para as suas notas rápidas" #: ../src/xfce4-notes.desktop.in.h:2 #: ../src/xfce4-notes-autostart.desktop.in.h:2 #: ../src/xfce4-notes-plugin.desktop.in.in.h:2 -#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:183 -#: ../lib/application.vala:210 ../lib/application.vala:609 -#: ../lib/window.vala:84 ../lib/window.vala:159 ../lib/window.vala:884 +#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:184 +#: ../lib/application.vala:211 ../lib/application.vala:739 +#: ../lib/window.vala:85 ../lib/window.vala:176 ../lib/window.vala:913 #: ../src/xfce4-notes-settings.c:99 ../src/main-panel-plugin-47.vala:46 #: ../src/main-panel-plugin.vala:45 ../src/main-status-icon.vala:34 #: ../src/main-status-icon.vala:115 msgid "Notes" msgstr "Notas" -#: ../lib/application.vala:118 ../lib/application.vala:133 +#: ../lib/application.vala:119 ../lib/application.vala:134 #: ../src/xfce4-notes-settings.c:223 ../src/xfce4-notes-settings.c:231 msgid "Select notes path" msgstr "Seleccione o caminho das notas" -#: ../lib/application.vala:119 +#: ../lib/application.vala:120 #, c-format msgid "The selected directory (%s) for the new notes path already contains files. You must select or create an empty directory." msgstr "O directório escolhido (%s) para as notas já possui ficheiros. tem que escolher ou criar um directório vazio." -#: ../lib/application.vala:134 +#: ../lib/application.vala:135 #, c-format msgid "Unable to select directory for new notes path: %s" msgstr "Não foi possível seleccionar o directório das novas notas: %s" -#: ../lib/application.vala:187 ../lib/window.vala:887 +#: ../lib/application.vala:188 ../lib/window.vala:916 #, c-format msgid "Notes %d" msgstr "Notas %d" -#: ../lib/application.vala:411 +#: ../lib/application.vala:428 msgid "Rename group" msgstr "Renomear grupo" -#: ../lib/application.vala:432 ../lib/window.vala:1009 +#: ../lib/application.vala:449 ../lib/window.vala:1038 #, c-format msgid "The name %s is already in use" msgstr "O nome %s já é utilizado" -#: ../lib/application.vala:458 +#: ../lib/application.vala:478 msgid "Are you sure you want to delete this group?" msgstr "Tem a certeza que quer apagar este grupo?" -#: ../lib/application.vala:515 +#: ../lib/application.vala:522 +#, c-format +msgid "The group \"%s\" has been modified on the disk" +msgstr "O grupo \"%s\" foi modificado no disco" + +#: ../lib/application.vala:525 +msgid "Do you want to reload the group?" +msgstr "Tem a certeza que quer actualizar o grupo?" + +#: ../lib/application.vala:645 #, c-format msgid "The name \"%s\" is invalid." msgstr "O nome \"%s\" é inválido." -#: ../lib/application.vala:516 +#: ../lib/application.vala:646 #, c-format msgid "The invalid characters are: %s" msgstr "Os caracteres inválidos são: %s" -#: ../lib/application.vala:573 +#: ../lib/application.vala:703 msgid "Unable to open the settings dialog" msgstr "Incapaz de abrir a janela de definições" -#: ../lib/application.vala:618 +#: ../lib/application.vala:748 msgid "translator-credits" msgstr "Nuno Miguel" -#: ../lib/application.vala:653 ../lib/window.vala:751 +#: ../lib/application.vala:783 ../lib/window.vala:780 msgid "_Add a new group" msgstr "_Adicionar um novo grupo" -#: ../lib/window.vala:209 +#: ../lib/window.vala:226 msgid "Menu" msgstr "Menu" -#: ../lib/window.vala:246 +#: ../lib/window.vala:255 +msgid "Refresh notes" +msgstr "Actualizar notas" + +#: ../lib/window.vala:268 #, c-format msgid "Hide (%s)" msgstr "Ocultar (%s)" -#: ../lib/window.vala:618 ../src/main-panel-plugin-47.vala:50 +#: ../lib/wi
[Xfce4-commits] l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to c9762228739c1030408a60fb837562ccdb2aa026 (commit) from 857cb8a6f420f0f5cf6cf7fece7301c9351dca09 (commit) commit c9762228739c1030408a60fb837562ccdb2aa026 Author: Sergio Marques Date: Sun Jan 30 17:26:30 2011 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 320 ++ 1 files changed, 132 insertions(+), 188 deletions(-) diff --git a/po/pt.po b/po/pt.po index 944e869..021f3fd 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the xfdesktop package. # Nuno Donato , 2004. # Nuno Miguel , 2007, 2008, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfdesktop 4.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:44+0100\n" +"POT-Creation-Date: 2011-01-30 11:11+\n" "PO-Revision-Date: 2010-12-30 16:11+0100\n" "Last-Translator: Nuno Miguel \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" @@ -25,7 +25,7 @@ msgid "Backdrop list file is not valid" msgstr "O ficheiro de lista de fundos é inválido" #. no need to escape markup; it's already done for us -#: ../settings/main.c:162 +#: ../settings/main.c:163 #, c-format msgid "" "%s\n" @@ -34,127 +34,126 @@ msgstr "" "%s\n" "Tamanho: %dx%d" -#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247 -#: ../src/xfdesktop-special-file-icon.c:413 +#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256 +#: ../src/xfdesktop-special-file-icon.c:419 msgid "Home" msgstr "Pasta pessoal" -#: ../settings/main.c:274 +#: ../settings/main.c:291 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: ../settings/main.c:276 +#: ../settings/main.c:293 msgid "Trash" msgstr "Lixo" -#: ../settings/main.c:278 +#: ../settings/main.c:295 msgid "Removable Devices" msgstr "Dispositivos amovíveis" -#: ../settings/main.c:458 +#: ../settings/main.c:475 #, c-format msgid "Cannot create backdrop list \"%s\"" msgstr "Não é possível criar lista de fundos \"%s\"" -#: ../settings/main.c:462 ../settings/main.c:779 +#: ../settings/main.c:479 ../settings/main.c:802 msgid "Backdrop List Error" msgstr "Erro na lista de fundos" -#: ../settings/main.c:487 +#: ../settings/main.c:504 msgid "Create/Load Backdrop List" msgstr "Criar/carregar lista de fundos" -#: ../settings/main.c:511 +#: ../settings/main.c:528 #, c-format -msgid "" -"File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" +msgid "File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" msgstr "O ficheiro \"%s\" não é um ficheiro válido. Deseja sobrescrevê-lo?" -#: ../settings/main.c:516 +#: ../settings/main.c:533 msgid "Invalid List File" msgstr "O ficheiro da lista e inválido" -#: ../settings/main.c:519 +#: ../settings/main.c:536 msgid "Overwriting the file will cause its contents to be lost." msgstr "Sobrescrever o ficheiro provocará a perda do conteúdo. " -#: ../settings/main.c:521 +#: ../settings/main.c:538 msgid "Replace" msgstr "Substituir" -#: ../settings/main.c:775 +#: ../settings/main.c:798 #, c-format msgid "Failed to write backdrop list to \"%s\"" msgstr "Falhou ao escrever a lista de fundos para \"%s\"" -#: ../settings/main.c:802 +#: ../settings/main.c:825 msgid "Add Image File(s)" msgstr "Adicionar ficheiro(s) de imagem" -#: ../settings/main.c:811 +#: ../settings/main.c:834 msgid "Image files" msgstr "Ficheiros de imagem" -#: ../settings/main.c:816 +#: ../settings/main.c:839 msgid "All files" msgstr "Todos os ficheiros" -#: ../settings/main.c:1248 +#: ../settings/main.c:1271 #, c-format msgid "Screen %d, Monitor %d (%s)" msgstr "Ecrã %d, Monitor %d (%s)" -#: ../settings/main.c:1252 +#: ../settings/main.c:1275 #, c-format msgid "Screen %d, Monitor %d" msgstr "Ecrã %d, Monitor %d" -#: ../settings/main.c:1255 +#: ../settings/main.c:1278 #, c-format msgid "Screen %d" msgstr "Ecrã %d" -#: ../settings/main.c:1260 +#: ../settings/main.c:1283 #, c-format msgid "Monitor %d (%s)" msgstr "Monitor %d (%s)" -#: ../settings/main.c:1264 +#: ../settings/main.c:1287 #, c-format msgid "Monitor %d" msgstr "Monitor %d" -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid "Settings manager socket" msgstr "Gestor de definições" -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid "SOCKET ID" msgstr "ID de \"SOCKET\"" -#: ../settings/main.c:1478 +#: ../settings/main.c:1501 msgid "Version information" msgstr "Informações de versão" -#: ../settings/main.c:1498 +#: ../settings/main.c:1521 #, c-format msgid "Type '%s --help' for usage.
[Xfce4-commits] Creating annotated tag terminal-0.4.6
Updating annotated tag refs/tags/terminal-0.4.6 as new annotated tag to c33b9cc196ab8ec1c61a7f67633fd3d4eafca6f8 (tag) succeeds terminal-0.4.5 tagged by Nick Schermer on 2011-01-30 16:10 + Abel Martín (3): l10n: Updated Spanish (Castilian) (es) translation to 100% l10n: Updated Spanish (Castilian) (es) translation to 81% l10n: Updated Spanish (Castilian) (es) translation to 100% Andhika Padmawan (2): l10n: Updated Indonesian (id) translation to 100% l10n: Updated Indonesian (id) translation to 100% Andres Kovtunos (1): l10n: Updated Russian (ru) translation to 100% Bauzhan Muftakhidinov (2): l10n: Updated Kazakh (kk) translation to 100% l10n: Updated Kazakh (kk) translation to 100% Daniel Nylander (1): l10n: Added Swedish translation Dmitry Nikitin (1): l10n: Updated Ukrainian (uk) translation to 100% Fabian Nowak (1): l10n: Updated German (de) translation to 100% Gheyret Kenji (4): l10n: Updated Uyghur (ug) translation to 34% l10n: Updated Uyghur (ug) translation to 16% l10n: Updated Uyghur (ug) translation to 80% l10n: Updated Uyghur (ug) translation to 65% Ivica Kolić (10): l10n: Updates to Croatian (hr)translation l10n: Updated Croatian (hr) translation to 69% l10n: Updated Croatian (hr) translation to None% l10n: Updates to Croatian (hr) translation l10n: Updates to Croatian (hr) translation l10n: Updated Croatian (hr) translation to 78% l10n: Updated Croatian (hr) translation to 78% l10n: Updated Croatian (hr) translation to 77% l10n: Updated Croatian (hr) translation to 80% l10n: Updated Croatian (hr) translation to 84% Jeff Bailes (1): l10n: Updated English (United Kingdom) (en_GB) translation to 100% Leandro Regueiro (6): l10n: Updated Galician (gl) translation to 99% l10n: Updated Galician (gl) translation to 99% l10n: Updated Galician (gl) translation to 99% l10n: Updated Galician (gl) translation to 99% l10n: Updated Galician (gl) translation to 99% l10n: Updated Galician (gl) translation to 99% Masato Hashimoto (2): l10n: Updated Japanese (ja) translation to 100% l10n: Updated Japanese (ja) translation to 100% Michal Várady (1): l10n: Updated Czech (cs) translation to 100% Mișu Moldovan (1): l10n: Updated Romanian (ro) translation to 100% Nick Schermer (15): Post release tag bump. Parse the tab title if dynamic title is hidden. Small code cleanup. Plug small memory leak. Abort if validating the xml file fails. l10n: Updated Dutch (Flemish) (nl) translation to 100% Drop invalid Croatian manual translation. Try to fix distcheck on the buildbot. Recognize sftp in urls. Fix compiler warnings. Work around deprecated API in vte 0.26. Unbind title dialog binding before destroy. Protect against NULL border values (bug #7120). Set colormap on window init. Updates for release. Nuno Miguel (1): l10n: Updated Portuguese (pt) translation to 100% Piarres Beobide (3): l10n: Updated Basque (eu) translation to 99% l10n: Updated Basque (eu) translation to 99% l10n: Updated Basque (eu) translation to 100% Piotr Sokół (1): l10n: Updated Polish (pl) translation to 88% Sergio Marques (1): l10n: Updated Portuguese (pt) translation to 100% Spiros Georgaras (1): l10n: Updated Greek (el) translation to 100% Terje Uriansrud (2): l10n: Updated Norwegian Bokmal (nb) translation to 97% l10n: Updated Norwegian Bokmal (nb) translation to 100% Xavier (1): l10n: Updated French (fr) translation to 99% Xavier Devlamynck (5): l10n: Updated French (fr) translation to 88% l10n: Updated French (fr) translation to 94% l10n: Updated French (fr) translation to 96% l10n: Updated French (fr) translation to 100% l10n: Updated French (fr) translation to 100% forfolias (2): l10n: add greek translation l10n: Updated Greek (el) translation to 100% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Change --version strings.
Updating branch refs/heads/master to 5a14360a46f6d1260fdad15a5ea803607a809ebf (commit) from df0c4b4f38024f30f922c9493ba1e26ece07bdd8 (commit) commit 5a14360a46f6d1260fdad15a5ea803607a809ebf Author: Nick Schermer Date: Sun Jan 30 17:14:42 2011 +0100 Change --version strings. terminal/main.c | 19 +++ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/terminal/main.c b/terminal/main.c index 50daa03..66567e2 100644 --- a/terminal/main.c +++ b/terminal/main.c @@ -141,19 +141,14 @@ main (int argc, char **argv) gtk_set_locale (); name = g_get_prgname (); - g_print (_("%s %s (Xfce %s)\n\n" - "Copyright (c) %s\n" - "os-cillation e.K. All rights reserved.\n\n" - "Written by Benedikt Meurer .\n\n" - "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d.\n\n" - "Please report bugs to <%s>.\n"), - name, PACKAGE_VERSION, - xfce_version_string (), - "2003-2011", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, - gtk_major_version, gtk_minor_version, gtk_micro_version, - PACKAGE_BUGREPORT); + g_print ("%s %s (Xfce %s)\n\n", name, PACKAGE_VERSION, xfce_version_string ()); g_free (name); + g_print ("%s\n", "Copyright (c) 2003-2011"); + g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved.")); + g_print ("%s\n", _("Written by Benedikt Meurer ")); + g_print ("%s\n\n", _("and Nick Schermer .")); + g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT); + g_print ("\n"); return EXIT_SUCCESS; } else if (G_UNLIKELY (show_help)) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updates for release.
Updating branch refs/heads/master to 7abbb22a5431b41679ba4d3aad5976c94ccac42d (commit) from 0ec25381f3ea9fcafbc3dc9ac3ba5c32d256a9c5 (commit) commit 7abbb22a5431b41679ba4d3aad5976c94ccac42d Author: Nick Schermer Date: Sun Jan 30 17:09:46 2011 +0100 Updates for release. NEWS| 15 +++ configure.ac.in |4 ++-- terminal/main.c |2 +- terminal/terminal-dialogs.c |2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 36028f2..e56f55c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +0.4.6 += +- Parse the tab title if dynamic title is hidden. +- Abort doc generation if validating the xml file fails. +- Plug small memory leak and fix some compiler warnings. +- Recognize sftp in urls. +- Work around deprecated API in vte 0.26. +- Unbind title dialog binding before destroy. +- Protect against NULL border values (bug #7120). +- Set colormap on window init. +- Translation updates (cs, de, el, en_GB, es, eu, fr, gl, hr, id, ja, + kk, nb, nl, pl, pt, ro, ru, ug, uk). +- Manual translation updates (el, es, fr, gl, hr, ja, pt, sv, ug). + + 0.4.5 = - Improve support for --program-transform-name. diff --git a/configure.ac.in b/configure.ac.in index fd763ee..b0b6ad1 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -10,10 +10,10 @@ dnl *** Version information *** dnl *** m4_define([terminal_version_major], [0]) m4_define([terminal_version_minor], [4]) -m4_define([terminal_version_micro], [5]) +m4_define([terminal_version_micro], [6]) m4_define([terminal_version_nano], []) m4_define([terminal_version_build], [@REVISION@]) -m4_define([terminal_version_tag], [git]) +m4_define([terminal_version_tag], []) m4_define([terminal_version_dbus], [4]) m4_define([terminal_version], [terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(), [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], [terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])]) diff --git a/terminal/main.c b/terminal/main.c index 80e0155..50daa03 100644 --- a/terminal/main.c +++ b/terminal/main.c @@ -149,7 +149,7 @@ main (int argc, char **argv) "Please report bugs to <%s>.\n"), name, PACKAGE_VERSION, xfce_version_string (), - "2003-2010", + "2003-2011", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, gtk_major_version, gtk_minor_version, gtk_micro_version, PACKAGE_BUGREPORT); diff --git a/terminal/terminal-dialogs.c b/terminal/terminal-dialogs.c index 3ac122b..45dadd2 100644 --- a/terminal/terminal-dialogs.c +++ b/terminal/terminal-dialogs.c @@ -95,7 +95,7 @@ terminal_dialogs_show_about (GtkWindow *parent) "comments", _("Xfce Terminal Emulator"), "documenters", documenters, "copyright", "Copyright \302\251 2003-2008 Benedikt Meurer\n" - "Copyright \302\251 2007-2010 Nick Schermer", + "Copyright \302\251 2007-2011 Nick Schermer", "license", XFCE_LICENSE_GPL, "logo", logo, "program-name", g_get_application_name (), ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Post release tag bump.
Updating branch refs/heads/master to df0c4b4f38024f30f922c9493ba1e26ece07bdd8 (commit) from 7abbb22a5431b41679ba4d3aad5976c94ccac42d (commit) commit df0c4b4f38024f30f922c9493ba1e26ece07bdd8 Author: Nick Schermer Date: Sun Jan 30 17:10:39 2011 +0100 Post release tag bump. configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index b0b6ad1..1d11a0d 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -13,7 +13,7 @@ m4_define([terminal_version_minor], [4]) m4_define([terminal_version_micro], [6]) m4_define([terminal_version_nano], []) m4_define([terminal_version_build], [@REVISION@]) -m4_define([terminal_version_tag], []) +m4_define([terminal_version_tag], [git]) m4_define([terminal_version_dbus], [4]) m4_define([terminal_version], [terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(), [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], [terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set colormap on window init.
Updating branch refs/heads/master to 0ec25381f3ea9fcafbc3dc9ac3ba5c32d256a9c5 (commit) from 31ff48ddba363b3df3832d7d3504ead6f5bd35de (commit) commit 0ec25381f3ea9fcafbc3dc9ac3ba5c32d256a9c5 Author: Nick Schermer Date: Sun Jan 30 16:46:22 2011 +0100 Set colormap on window init. No need to set it during realize, screen dependend anyway. terminal/terminal-window.c | 41 - 1 files changed, 8 insertions(+), 33 deletions(-) diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c index 7f584a4..f580a39 100644 --- a/terminal/terminal-window.c +++ b/terminal/terminal-window.c @@ -77,7 +77,6 @@ enum static voidterminal_window_dispose (GObject *object); static voidterminal_window_finalize (GObject *object); -static voidterminal_window_realize (GtkWidget *widget); static gbooleanterminal_window_delete_event (GtkWidget *widget, GdkEventAny*event); static gbooleanterminal_window_state_event (GtkWidget *widget, @@ -203,9 +202,6 @@ struct _TerminalWindow GtkWidget *notebook; TerminalScreen *active; - - /* whether this window has an rgba colormap */ - guintis_composited : 1; }; @@ -270,7 +266,6 @@ terminal_window_class_init (TerminalWindowClass *klass) gobject_class->finalize = terminal_window_finalize; gtkwidget_class = GTK_WIDGET_CLASS (klass); - gtkwidget_class->realize = terminal_window_realize; gtkwidget_class->window_state_event = terminal_window_state_event; gtkwidget_class->delete_event = terminal_window_delete_event; gtkwidget_class->style_set = terminal_window_style_set; @@ -315,9 +310,17 @@ terminal_window_init (TerminalWindow *window) gbooleanalways_show_tabs; gchar *role; GtkRcStyle *style; + GdkScreen *screen; + GdkColormap*colormap; window->preferences = terminal_preferences_get (); + /* try to set the rgba colormap so vte can use real transparency */ + screen = gtk_window_get_screen (GTK_WINDOW (window)); + colormap = gdk_screen_get_rgba_colormap (screen); + if (colormap != NULL) +gtk_widget_set_colormap (GTK_WIDGET (window), colormap); + /* The Terminal size needs correction when the font name or the scrollbar * visibility is changed. */ @@ -438,34 +441,6 @@ terminal_window_finalize (GObject *object) -static void -terminal_window_realize (GtkWidget *widget) -{ - TerminalWindow *window = TERMINAL_WINDOW (widget); - GdkScreen *screen; - GdkColormap*colormap; - - /* unset rgba */ - window->is_composited = FALSE; - - /* try to set the rgba colormap so vte can use real transparency */ - screen = gtk_widget_get_screen (widget); - if (gdk_screen_is_composited (screen)) -{ - colormap = gdk_screen_get_rgba_colormap (screen); - if (G_LIKELY (colormap != NULL)) -window->is_composited = TRUE; - else -colormap = gdk_screen_get_default_colormap (screen); - - gtk_widget_set_colormap (widget, colormap); -} - - (*GTK_WIDGET_CLASS (terminal_window_parent_class)->realize) (widget); -} - - - static gboolean terminal_window_delete_event (GtkWidget *widget, GdkEventAny *event) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Init Greek Translation
Updating branch refs/heads/nick/gettext to ebda36243c0674ee73e542f07c767adfdc58 (commit) from 15784f8f25ff92cf790cce4dbee8163c6a49f948 (commit) commit ebda36243c0674ee73e542f07c767adfdc58 Author: Stavros Giannouris Date: Sun Jan 30 16:54:47 2011 +0100 l10n: Init Greek Translation New status: 11 messages complete with 0 fuzzies and 653 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/{www.pot => el.po} | 39 --- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/lib/po/www.pot b/lib/po/el.po similarity index 99% copy from lib/po/www.pot copy to lib/po/el.po index b54adb7..1b2353a 100644 --- a/lib/po/www.pot +++ b/lib/po/el.po @@ -1,21 +1,21 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Greek translations for www.xfce.org package. +# Copyright (C) 2011 The Xfce Development Team. +# This file is distributed under the same license as the www.xfce.org package. +# Stavros Giannouris , 2011. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: www.xfce.org\n" "Report-Msgid-Bugs-To: http://bugzilla.xfce.org\n"; "POT-Creation-Date: 2011-01-25 18:50+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"PO-Revision-Date: 2011-01-30 17:48+0200\n" +"Last-Translator: Stavros Giannouris \n" +"Language-Team: Greek\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: header.php:6 msgid "Xfce Desktop Environment" @@ -23,23 +23,23 @@ msgstr "" #: header.php:57 msgid "Categories" -msgstr "" +msgstr "Κατηγορίες" #: header.php:59 msgid "Home" -msgstr "" +msgstr "Αρχική σελίδα" #: header.php:60 about/nav.php:4 about/index.php:1 msgid "About" -msgstr "" +msgstr "Σχετικά με" #: header.php:61 download/nav.php:6 download/index.php:5 msgid "Download" -msgstr "" +msgstr "Λήψη" #: header.php:62 community/nav.php:4 community/index.php:3 msgid "Community" -msgstr "" +msgstr "Κοινότητα" #: header.php:63 getinvolved/nav.php:4 getinvolved/index.php:1 msgid "Get Involved" @@ -47,28 +47,29 @@ msgstr "" #: header.php:64 projects/nav.php:4 projects/index.php:3 msgid "Projects" -msgstr "" +msgstr "Έργα" #: header.php:71 header.php:85 msgid "Change language" -msgstr "" +msgstr "Αλλαγή γλώσσας" #: header.php:100 msgid "Category Pages" -msgstr "" +msgstr "Κατηγορίες" #: header.php:121 msgid "Related Sites" -msgstr "" +msgstr "Σχετικές ιστοσελίδες" #: 404.php:1 msgid "Page not found" -msgstr "" +msgstr "Η σελίδα δεν βρθηκε" #: 404.php:5 msgid "" "We're sorry, the page or file you requested was not found on this server." msgstr "" +"Λυπούμαστε, αλλά η σελίδα ή το αρχείο που ζητήσατε δεν βρέθηκε." #: 404.php:7 msgid "" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 5c80fc324d5d568548490cbfc4e24772bc9378b5 (commit) from 67944881a32d0b219559a4b021c49b23fd5e4dc4 (commit) commit 5c80fc324d5d568548490cbfc4e24772bc9378b5 Author: Claque Date: Sun Jan 30 16:52:12 2011 +0100 l10n: Updated Russian (ru) translation to 100% New status: 230 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 54 +++--- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/po/ru.po b/po/ru.po index 98eb194..768d305 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,19 +6,19 @@ # Andrey Fedoseev , 2006. # Dmitriy Kudryashov , 2009. # Denis Koryavov , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:27+0100\n" +"POT-Creation-Date: 2011-01-30 11:12+\n" "PO-Revision-Date: 2009-05-13 12:02+0400\n" "Last-Translator: Denis Koryavov \n" "Language-Team: Russian\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: KBabel 1.11.4\n" #: ../helper-dialog/helper-dialog.c:84 @@ -627,12 +627,8 @@ msgid "Reset to Defaults" msgstr "Сбросить на стандартные настройки " #: ../settings-dialogs/xfwm4-settings.c:1871 -msgid "" -"This will reset all shortcuts to their default values. Do you really want to " -"do this?" -msgstr "" -"Данное действие сбросит все значения горячих клавиш к их первоначальным " -"значениям. Вы действительно хотите продолжить? " +msgid "This will reset all shortcuts to their default values. Do you really want to do this?" +msgstr "Данное действие сбросит все значения горячих клавиш к их первоначальным значениям. Вы действительно хотите продолжить? " #. Smart placement size #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2 @@ -749,9 +745,7 @@ msgstr "Использовать сопротивление границ окн #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33 msgid "Use the _mouse wheel on the desktop to switch workspaces" -msgstr "" -"Переключать рабочие места с помощью прокручивания колесика мыши над рабочим " -"столом " +msgstr "Переключать рабочие места с помощью прокручивания колесика мыши над рабочим столом " #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34 msgid "When a window raises itself:" @@ -801,17 +795,13 @@ msgstr "_Поднимать окна при нажатии любой клави msgid "" "_Remember and recall previous workspace\n" "when switching via keyboard shortcuts" -msgstr "" -"Запоминать и возвращаться к предыдущему рабочему месту при переключении " -"горячими клавишами " +msgstr "Запоминать и возвращаться к предыдущему рабочему месту при переключении горячими клавишами " #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49 msgid "" "_Skip windows that have \"skip pager\"\n" "or \"skip taskbar\" properties set" -msgstr "" -"Пропускать окна, у которых установлено свойство \"не показывать в " -"переключателе рабочих мест\" или \"не показывать на панели задач\" " +msgstr "Пропускать окна, у которых установлено свойство \"не показывать в переключателе рабочих мест\" или \"не показывать на панели задач\" " #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 msgid "_Workspaces" @@ -830,8 +820,7 @@ msgid "Change workspace name" msgstr "Изменить название рабочего места " #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4 -msgid "" -"Margins are areas on the edges of the screen where no window will be placed" +msgid "Margins are areas on the edges of the screen where no window will be placed" msgstr "Поля - это области экрана, где невозможно размещать окна " #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7 @@ -855,37 +844,36 @@ msgstr "%s: Нарушение сегментации " #: ../src/main.c:534 msgid "Fork to the background" -msgstr "" +msgstr "Перевести в фоновый режим" #: ../src/main.c:536 msgid "Fork to the background (not supported)" -msgstr "" +msgstr "Перевести в фоновый режим (не поддерживается)" #: ../src/main.c:539 msgid "Set the compositor mode" -msgstr "" +msgstr "Установить композитный режим" #: ../src/main.c:541 msgid "Set the compositor mode (not supported)" -msgstr "" +msgstr "Установить композитный режим (не поддерживается)" #: ../src/main.c:543 msgid "Replace the existing window manager" -msgstr "" +msgstr "Заменить существующий оконный менеджер" #: ../src/main.c:544 -#, fuzzy msgid "Print version information and exit" -msgstr "Информация о версии " +msgstr "Информация о версии" #: ../src/main.c:552 msgid "[ARGUMENTS...]" -msgstr "" +msgstr "[АРГУМЕНТЫ…]" #: ../src/main.c:559 #, c-format msgid "Type \"%s --help\" for usage." -msgstr "" +msgstr "Выполните \"%s --help\" для показа полного списка опций командной строки." #: ../src/menu.c:44 msgid "Ma_ximize" @@ -992,9 +980,7 @@ msgstr "%s: Ошибка выделения цвета %s\n" #: ../src/settings.c:
[Xfce4-commits] l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/xfce-4.8 to 61541d1dbcc6b67a692b0a8d96ad9a323ce6df3b (commit) from 4451351603a55f43b6656697e269d2c25da52d46 (commit) commit 61541d1dbcc6b67a692b0a8d96ad9a323ce6df3b Author: Claque Date: Sun Jan 30 15:44:52 2011 +0100 l10n: Updated Russian (ru) translation to 100% New status: 230 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 54 +++--- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/po/ru.po b/po/ru.po index 98eb194..bf2ee5f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,19 +6,19 @@ # Andrey Fedoseev , 2006. # Dmitriy Kudryashov , 2009. # Denis Koryavov , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:27+0100\n" +"POT-Creation-Date: 2011-01-30 11:27+\n" "PO-Revision-Date: 2009-05-13 12:02+0400\n" "Last-Translator: Denis Koryavov \n" "Language-Team: Russian\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: KBabel 1.11.4\n" #: ../helper-dialog/helper-dialog.c:84 @@ -627,12 +627,8 @@ msgid "Reset to Defaults" msgstr "Сбросить на стандартные настройки " #: ../settings-dialogs/xfwm4-settings.c:1871 -msgid "" -"This will reset all shortcuts to their default values. Do you really want to " -"do this?" -msgstr "" -"Данное действие сбросит все значения горячих клавиш к их первоначальным " -"значениям. Вы действительно хотите продолжить? " +msgid "This will reset all shortcuts to their default values. Do you really want to do this?" +msgstr "Данное действие сбросит все значения горячих клавиш к их первоначальным значениям. Вы действительно хотите продолжить? " #. Smart placement size #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2 @@ -749,9 +745,7 @@ msgstr "Использовать сопротивление границ окн #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33 msgid "Use the _mouse wheel on the desktop to switch workspaces" -msgstr "" -"Переключать рабочие места с помощью прокручивания колесика мыши над рабочим " -"столом " +msgstr "Переключать рабочие места с помощью прокручивания колесика мыши над рабочим столом " #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34 msgid "When a window raises itself:" @@ -801,17 +795,13 @@ msgstr "_Поднимать окна при нажатии любой клави msgid "" "_Remember and recall previous workspace\n" "when switching via keyboard shortcuts" -msgstr "" -"Запоминать и возвращаться к предыдущему рабочему месту при переключении " -"горячими клавишами " +msgstr "Запоминать и возвращаться к предыдущему рабочему месту при переключении горячими клавишами " #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49 msgid "" "_Skip windows that have \"skip pager\"\n" "or \"skip taskbar\" properties set" -msgstr "" -"Пропускать окна, у которых установлено свойство \"не показывать в " -"переключателе рабочих мест\" или \"не показывать на панели задач\" " +msgstr "Пропускать окна, у которых установлено свойство \"не показывать в переключателе рабочих мест\" или \"не показывать на панели задач\" " #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 msgid "_Workspaces" @@ -830,8 +820,7 @@ msgid "Change workspace name" msgstr "Изменить название рабочего места " #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4 -msgid "" -"Margins are areas on the edges of the screen where no window will be placed" +msgid "Margins are areas on the edges of the screen where no window will be placed" msgstr "Поля - это области экрана, где невозможно размещать окна " #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7 @@ -855,37 +844,36 @@ msgstr "%s: Нарушение сегментации " #: ../src/main.c:534 msgid "Fork to the background" -msgstr "" +msgstr "Перевести в фоновый режим" #: ../src/main.c:536 msgid "Fork to the background (not supported)" -msgstr "" +msgstr "Перевести в фоновый режим (не поддерживается)" #: ../src/main.c:539 msgid "Set the compositor mode" -msgstr "" +msgstr "Установить композитный режим" #: ../src/main.c:541 msgid "Set the compositor mode (not supported)" -msgstr "" +msgstr "Установить композитный режим (не поддерживается)" #: ../src/main.c:543 msgid "Replace the existing window manager" -msgstr "" +msgstr "Заменить существующий оконный менеджер" #: ../src/main.c:544 -#, fuzzy msgid "Print version information and exit" -msgstr "Информация о версии " +msgstr "Информация о версии" #: ../src/main.c:552 msgid "[ARGUMENTS...]" -msgstr "" +msgstr "[АРГУМЕНТЫ...]" #: ../src/main.c:559 #, c-format msgid "Type \"%s --help\" for usage." -msgstr "" +msgstr "Выполните \"%s --help\" для показа полного списка опций командной строки." #: ../src/menu.c:44 msgid "Ma_ximize" @@ -992,9 +980,7 @@ msgstr "%s: Ошибка выделения цвета %s\n" #: ../src/setting
[Xfce4-commits] l10n: Updated Catalan (Valencian) (ca) translation to 100%
Updating branch refs/heads/xfce-4.8 to 36d58868ce6ce7c303aba908aa902b5b6d111361 (commit) from e0fa75600471bc83b7b3049f9a2d53aa355cd109 (commit) commit 36d58868ce6ce7c303aba908aa902b5b6d111361 Author: Carles Muñoz Gorriz Date: Sun Jan 30 15:33:21 2011 +0100 l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ca.po | 199 +++-- 1 files changed, 101 insertions(+), 98 deletions(-) diff --git a/po/ca.po b/po/ca.po index a79c80f..10a3d83 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,14 +3,14 @@ # Copyright (C) 2003-2006 The Xfce development team. # This file is distributed under the same license as the xfdesktop package. # -# Carles Muñoz Gorriz , 2003-2004, 2006, 2008-2009. +# Carles Muñoz Gorriz , 2003-2004, 2006, 2008-2011. # Pau Ruŀlan Ferragut , 2005-2007. msgid "" msgstr "" "Project-Id-Version: xfdesktop 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:44+0100\n" -"PO-Revision-Date: 2010-08-31 17:29+0100\n" +"POT-Creation-Date: 2011-01-30 11:29+\n" +"PO-Revision-Date: 2011-01-30 15:30+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -28,7 +28,7 @@ msgid "Backdrop list file is not valid" msgstr "El fitxer amb la llista d'imatges no és vàlid" #. no need to escape markup; it's already done for us -#: ../settings/main.c:162 +#: ../settings/main.c:163 #, c-format msgid "" "%s\n" @@ -37,128 +37,128 @@ msgstr "" "%s\n" "Mida: %dx%d" -#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247 -#: ../src/xfdesktop-special-file-icon.c:413 +#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256 +#: ../src/xfdesktop-special-file-icon.c:419 msgid "Home" msgstr "Inici" -#: ../settings/main.c:274 +#: ../settings/main.c:291 msgid "Filesystem" msgstr "Sistema de fitxers" -#: ../settings/main.c:276 +#: ../settings/main.c:293 msgid "Trash" msgstr "Paperera" -#: ../settings/main.c:278 +#: ../settings/main.c:295 msgid "Removable Devices" msgstr "Dispositius extractables" -#: ../settings/main.c:458 +#: ../settings/main.c:475 #, c-format msgid "Cannot create backdrop list \"%s\"" msgstr "No es por crear la llista d'imatges de fons «%s»" -#: ../settings/main.c:462 ../settings/main.c:779 +#: ../settings/main.c:479 ../settings/main.c:802 msgid "Backdrop List Error" msgstr "Error en la llista d'imatges de fons" -#: ../settings/main.c:487 +#: ../settings/main.c:504 msgid "Create/Load Backdrop List" msgstr "Crea/carrega un llistat d'imatges de fons" -#: ../settings/main.c:511 +#: ../settings/main.c:528 #, c-format msgid "" "File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" msgstr "" "El fitxer «%s» no és una llista d'imatges vàlida. Voleu sobreescriure'l?" -#: ../settings/main.c:516 +#: ../settings/main.c:533 msgid "Invalid List File" msgstr "Llista de fitxers invàlida" -#: ../settings/main.c:519 +#: ../settings/main.c:536 msgid "Overwriting the file will cause its contents to be lost." msgstr "Sobreescriure el fitxer farà que es perdi el seu contingut." -#: ../settings/main.c:521 +#: ../settings/main.c:538 msgid "Replace" msgstr "Substitueix" -#: ../settings/main.c:775 +#: ../settings/main.c:798 #, c-format msgid "Failed to write backdrop list to \"%s\"" msgstr "No s'ha pogut escriure la llista d'imatges de fons a «%s»" -#: ../settings/main.c:802 +#: ../settings/main.c:825 msgid "Add Image File(s)" msgstr "Afegiu fitxers d'imatges" -#: ../settings/main.c:811 +#: ../settings/main.c:834 msgid "Image files" msgstr "Fitxers d'imatge" -#: ../settings/main.c:816 +#: ../settings/main.c:839 msgid "All files" msgstr "Tots els fitxers" -#: ../settings/main.c:1248 +#: ../settings/main.c:1271 #, c-format msgid "Screen %d, Monitor %d (%s)" msgstr "Pantalla %d, Monitor %d (%s)" -#: ../settings/main.c:1252 +#: ../settings/main.c:1275 #, c-format msgid "Screen %d, Monitor %d" msgstr "Pantalla %d, Monitor %d" -#: ../settings/main.c:1255 +#: ../settings/main.c:1278 #, c-format msgid "Screen %d" msgstr "Pantalla %d" -#: ../settings/main.c:1260 +#: ../settings/main.c:1283 #, c-format msgid "Monitor %d (%s)" msgstr "Monitor %d (%s)" -#: ../settings/main.c:1264 +#: ../settings/main.c:1287 #, c-format msgid "Monitor %d" msgstr "Monitor %d" -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid "Settings manager socket" msgstr "Sòcol del gestor d'akustaments" -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid "SOCKET ID" msgstr "SÒCOL ID" -#: ../settings/main.c:1478 +#: ../settings/main.c:1501 msgid "Version information" msgstr "Informació de la versió" -#: ../settings/main.c:1498 +#: ../settings/main.c:1521 #, c-format msgid "Type '%s --help' for usage." msgstr "Feu
[Xfce4-commits] l10n: Updated Polish (pl) translation to 88%
Updating branch refs/heads/master to 31ff48ddba363b3df3832d7d3504ead6f5bd35de (commit) from bfe5fd39bf96c0d39c0a85cd2ccc171253b1e54a (commit) commit 31ff48ddba363b3df3832d7d3504ead6f5bd35de Author: Piotr Sokół Date: Sun Jan 30 15:15:49 2011 +0100 l10n: Updated Polish (pl) translation to 88% New status: 239 messages complete with 25 fuzzies and 6 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 215 ++ 1 files changed, 90 insertions(+), 125 deletions(-) diff --git a/po/pl.po b/po/pl.po index def924d..0118cef 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,32 +2,31 @@ # Copyright (C) 2003-2006 Benedikt Meurer # This file is distributed under the same license as the Terminal package. # Szymon Kałasz , 2006. -# Piotr Sokół , 2009. +# Piotr Sokół , 2009, 2011. # msgid "" msgstr "" -"Project-Id-Version: Terminal 0.2.8.3\n" +"Project-Id-Version: terminal 0.4.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 19:57+0200\n" -"PO-Revision-Date: 2009-03-25 12:17+0100\n" -"Last-Translator: Piotr Sokół \n" -"Language-Team: Polish\n" +"POT-Creation-Date: 2011-01-30 11:01+\n" +"PO-Revision-Date: 2011-01-30 15:15+0100\n" +"Last-Translator: Piotr Sokół \n" +"Language-Team: Polish <>\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" -"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%" -"100<10 || n%100>=20)) ? 1 : 2));\n" +"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n" +"%100<10 || n%100>=20)) ? 1 : 2));\n" #: ../terminal/main.c:52 msgid "Usage:" -msgstr "" +msgstr "Użycie:" #: ../terminal/main.c:52 msgid "OPTION" -msgstr "" +msgstr "OPCJA" #: ../terminal/main.c:57 -#, fuzzy msgid "General Options" msgstr "Ogólne" @@ -42,22 +41,20 @@ msgstr "Brak" #. parameter of --working-directory #: ../terminal/main.c:61 ../terminal/main.c:76 msgid "directory" -msgstr "" +msgstr "KATALOG" #: ../terminal/main.c:65 msgid "Window or Tab Separators" msgstr "" #: ../terminal/main.c:70 -#, fuzzy msgid "Tab Options" -msgstr "Pozycja zakładki" +msgstr "Opcje kart" #. parameter of --command #: ../terminal/main.c:72 -#, fuzzy msgid "command" -msgstr "Polecenie" +msgstr "POLECENIE" #. parameter of --title #: ../terminal/main.c:74 @@ -66,9 +63,8 @@ msgid "title" msgstr "Tytuł" #: ../terminal/main.c:83 -#, fuzzy msgid "Window Options" -msgstr "Nieznana opcja „%s”" +msgstr "Opcje okien" #. parameter of --geometry #: ../terminal/main.c:87 @@ -90,7 +86,7 @@ msgstr "Ostrzeżenie" #: ../terminal/main.c:93 #, fuzzy msgid "icon" -msgstr "Akcja" +msgstr "IKONA" #: ../terminal/main.c:95 #, c-format @@ -119,15 +115,16 @@ msgstr "" "%s %s (Xfce %s)\n" "\n" "Copyright (c) %s\n" -"os-cillation e.K. Wszelkie prawa zastrzeżone.\n" +"os-cillation e.K. Wszelkie prawa zastrzeżone.\n" "\n" -"Napisano przez Benedikta Meurera .\n" +"Autor: Benedikt Meurer .\n" "\n" -"Zbudowany z Gtk+-%d.%d.%d, używam Gtk+-%d.%d.%d.\n" +"Skompilowano przy użyciu Gtk+-%d.%d.%d, uruchomiono przy użyciu Gtk+-%d.%d." +"%d.\n" "\n" -"Błędy proszę zgłaszać do <%s>.\n" +"Proszę zgłaszać błędy na adres <%s>.\n" -#: ../terminal/main.c:250 +#: ../terminal/main.c:254 #, c-format msgid "Unable to register terminal service: %s\n" msgstr "Nie udało się zarejestrować usługi terminala: %s.\n" @@ -135,18 +132,23 @@ msgstr "Nie udało się zarejestrować usługi terminala: %s.\n" #: ../terminal/terminal-app.c:516 #, c-format msgid "Invalid geometry string \"%s\"\n" -msgstr "Niepoprawna geometria „%s”.\n" +msgstr "Nieprawidłowa geometria „%s”.\n" -#: ../terminal/terminal-dbus.c:107 +#: ../terminal/terminal-dbus.c:113 msgid "User id mismatch" msgstr "Niezgodny identyfikator użytkownika." -#: ../terminal/terminal-dbus.c:133 +#: ../terminal/terminal-dbus.c:119 +#, fuzzy +msgid "Display mismatch" +msgstr "Niezgodny identyfikator użytkownika." + +#: ../terminal/terminal-dbus.c:145 #, c-format msgid "D-BUS message bus disconnected, exiting...\n" msgstr "Szyna wymiany informacji D-BUS rozłączyła się, kończenie...\n" -#: ../terminal/terminal-dbus.c:195 +#: ../terminal/terminal-dbus.c:207 #, c-format msgid "Unable to register object %s" msgstr "Nie udało się zarejestrować obiektu %s." @@ -158,12 +160,12 @@ msgstr "Emulator terminala X dla środowiska Xfce" #: ../terminal/terminal-dialogs.c:102 msgid "translator-credits" msgstr "" -"Szymon Kałasz \n" -"Piotr Sokół " +"Szymon Kałasz , 2006.\n" +"Piotr Sokół , 2009, 2011." #: ../terminal/terminal-dialogs.c:105 msgid "Visit Terminal website" -msgstr "" +msgstr "Strona główna" #: ../terminal/terminal-dialogs.c:215 #, c-format @@ -176,14 +178,16 @@ msgid "" "You can read the user manual online. This manual may however not exactly " "match your %s version."
[Xfce4-commits] Only change the Name field when renaming desktop files (bug #7155).
Updating branch refs/heads/xfce-4.8 to 3c1227aa1232bf9d6009d6d34ea281468e070642 (commit) from 9c67fe4bd38530cb169b50339bf5fb846e2a6f67 (commit) commit 3c1227aa1232bf9d6009d6d34ea281468e070642 Author: Jannis Pohlmann Date: Sun Jan 30 15:01:10 2011 +0100 Only change the Name field when renaming desktop files (bug #7155). This fixes a regression introduced in 4.8. In thunar-vfs we did the same thing we do now: when a desktop entry is to be renamed we only replace the Name field instead of renaming the file itself. This also affects xfdesktop which uses Thunar's rename feature through D-Bus. NEWS |1 + thunar/thunar-file.c | 163 +++--- 2 files changed, 103 insertions(+), 61 deletions(-) diff --git a/NEWS b/NEWS index 208c349..4b550c6 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ - Ship stock_folder-copy.png and stock_folder-move.png icons with Thunar itself (bug #6851). - Fix segfault when calling strcasecmp with NULL parameters (bug #7206). +- Only change the Name field when renaming desktop files (bug #7155). 1.2.0 = diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c index 1171527..bda7669 100644 --- a/thunar/thunar-file.c +++ b/thunar/thunar-file.c @@ -1,21 +1,22 @@ -/* $Id$ */ +/* vi:set et ai sw=2 sts=2 ts=2: */ /*- * Copyright (c) 2005-2007 Benedikt Meurer - * Copyright (c) 2009-2010 Jannis Pohlmann - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (c) 2009-2011 Jannis Pohlmann + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the Free + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H @@ -1253,76 +1254,116 @@ thunar_file_rename (ThunarFile *file, gboolean called_from_job, GError **error) { - GFile *previous_file; - GFile *renamed_file; - gint watch_count; + GKeyFile *key_file; + GError *err = NULL; + GFile*previous_file; + GFile*renamed_file; + gint watch_count; _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE); _thunar_return_val_if_fail (g_utf8_validate (name, -1, NULL), FALSE); _thunar_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE); _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE); - /* remember the previous file */ - previous_file = g_object_ref (file->gfile); - - /* try to rename the file */ - renamed_file = g_file_set_display_name (file->gfile, name, cancellable, error); - - /* check if we succeeded */ - if (renamed_file != NULL) + /* check if this file is a desktop entry */ + if (thunar_file_is_desktop_file (file)) { - /* set the new file */ - file->gfile = renamed_file; + /* try to load the desktop entry into a key file */ + key_file = thunar_g_file_query_key_file (file->gfile, cancellable, &err); + if (key_file == NULL) +{ + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, + _("Failed to parse the desktop file: %s"), err->message); + g_error_free (err); + return FALSE; +} - /* reload file information */ - thunar_file_load (file, NULL, NULL); + /* change the Name field of the desktop entry */ + g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_NAME, name); - /* need to re-register the monitor handle for the new uri */ - watch_count = THUNAR_FILE_GET_WATCH_COUNT (file); - if (G_LIKELY (watch_count > 0)) + /* write the changes back to the file */ +
[Xfce4-commits] Only change the Name field when renaming desktop files (bug #7155).
Updating branch refs/heads/master to f6bbdf98bae707b71c529d86e5896302c5119476 (commit) from aabb332fb07aa7b86c74eae518cadd9764c296ed (commit) commit f6bbdf98bae707b71c529d86e5896302c5119476 Author: Jannis Pohlmann Date: Sun Jan 30 15:01:10 2011 +0100 Only change the Name field when renaming desktop files (bug #7155). This fixes a regression introduced in 4.8. In thunar-vfs we did the same thing we do now: when a desktop entry is to be renamed we only replace the Name field instead of renaming the file itself. This also affects xfdesktop which uses Thunar's rename feature through D-Bus. NEWS |1 + thunar/thunar-file.c | 163 +++--- 2 files changed, 103 insertions(+), 61 deletions(-) diff --git a/NEWS b/NEWS index 8439901..111d2ac 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ - Ship stock_folder-copy.png and stock_folder-move.png icons with Thunar itself (bug #6851). - Fix segfault when calling strcasecmp with NULL parameters (bug #7206). +- Only change the Name field when renaming desktop files (bug #7155). 1.2.0 = diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c index 1171527..bda7669 100644 --- a/thunar/thunar-file.c +++ b/thunar/thunar-file.c @@ -1,21 +1,22 @@ -/* $Id$ */ +/* vi:set et ai sw=2 sts=2 ts=2: */ /*- * Copyright (c) 2005-2007 Benedikt Meurer - * Copyright (c) 2009-2010 Jannis Pohlmann - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (c) 2009-2011 Jannis Pohlmann + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the Free + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H @@ -1253,76 +1254,116 @@ thunar_file_rename (ThunarFile *file, gboolean called_from_job, GError **error) { - GFile *previous_file; - GFile *renamed_file; - gint watch_count; + GKeyFile *key_file; + GError *err = NULL; + GFile*previous_file; + GFile*renamed_file; + gint watch_count; _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE); _thunar_return_val_if_fail (g_utf8_validate (name, -1, NULL), FALSE); _thunar_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE); _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE); - /* remember the previous file */ - previous_file = g_object_ref (file->gfile); - - /* try to rename the file */ - renamed_file = g_file_set_display_name (file->gfile, name, cancellable, error); - - /* check if we succeeded */ - if (renamed_file != NULL) + /* check if this file is a desktop entry */ + if (thunar_file_is_desktop_file (file)) { - /* set the new file */ - file->gfile = renamed_file; + /* try to load the desktop entry into a key file */ + key_file = thunar_g_file_query_key_file (file->gfile, cancellable, &err); + if (key_file == NULL) +{ + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, + _("Failed to parse the desktop file: %s"), err->message); + g_error_free (err); + return FALSE; +} - /* reload file information */ - thunar_file_load (file, NULL, NULL); + /* change the Name field of the desktop entry */ + g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_NAME, name); - /* need to re-register the monitor handle for the new uri */ - watch_count = THUNAR_FILE_GET_WATCH_COUNT (file); - if (G_LIKELY (watch_count > 0)) + /* write the changes back to the file */ +
[Xfce4-commits] l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/squeeze-0.2 to def946eea47b39a7cc2ce25c11417310309d706d (commit) from 80a8a7eb731c6537dc08b0969179ee2ec1f1a27d (commit) commit def946eea47b39a7cc2ce25c11417310309d706d Author: Claque Date: Sun Jan 30 14:52:12 2011 +0100 l10n: Updated Russian (ru) translation to 100% New status: 98 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 81 + 1 files changed, 33 insertions(+), 48 deletions(-) diff --git a/po/ru.po b/po/ru.po index c12ff74..51341bd 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# -# +# +# msgid "" msgstr "" "Project-Id-Version: squeeze 0.2.1\n" "Report-Msgid-Bugs-To: step...@xfce.org\n" -"POT-Creation-Date: 2007-11-04 23:04+0200\n" +"POT-Creation-Date: 2007-04-24 23:59+0200\n" "PO-Revision-Date: 2007-01-20 04:24+0300\n" "Last-Translator: Veshtort Aleksey \n" "Language-Team: Rusian \n" @@ -17,9 +17,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../libsqueeze/archive.c:268 -#, fuzzy msgid "Name" -msgstr "Имя:" +msgstr "Имя" #: ../libsqueeze/archive.c:270 msgid "Mime type" @@ -31,7 +30,6 @@ msgstr "Выполнить" #: ../libsqueeze/command-builder-zip.c:116 #: ../libsqueeze/command-builder-rar.c:127 -#, fuzzy msgid "Compressed" msgstr "Сжатый" @@ -41,7 +39,7 @@ msgid "Method" msgstr "Метод" #: ../libsqueeze/command-builder-zip.c:120 -#: ../libsqueeze/command-builder-gnu-tar.c:149 +#: ../libsqueeze/command-builder-gnu-tar.c:148 #: ../libsqueeze/command-builder-rar.c:129 msgid "Size" msgstr "Размер" @@ -52,83 +50,77 @@ msgid "Ratio" msgstr "Отношение" #: ../libsqueeze/command-builder-zip.c:124 -#: ../libsqueeze/command-builder-gnu-tar.c:151 +#: ../libsqueeze/command-builder-gnu-tar.c:150 #: ../libsqueeze/command-builder-rar.c:133 msgid "Date" msgstr "Дата" #: ../libsqueeze/command-builder-zip.c:126 -#: ../libsqueeze/command-builder-gnu-tar.c:153 +#: ../libsqueeze/command-builder-gnu-tar.c:152 #: ../libsqueeze/command-builder-rar.c:135 msgid "Time" msgstr "Время" #: ../libsqueeze/command-builder-zip.c:166 #: ../libsqueeze/command-builder-rar.c:181 -#, fuzzy msgid "Adding" msgstr "Добавить" #: ../libsqueeze/command-builder-zip.c:183 #: ../libsqueeze/command-builder-zip.c:185 -#: ../libsqueeze/command-builder-gnu-tar.c:370 -#: ../libsqueeze/command-builder-gnu-tar.c:392 +#: ../libsqueeze/command-builder-gnu-tar.c:375 +#: ../libsqueeze/command-builder-gnu-tar.c:397 #: ../libsqueeze/command-builder-rar.c:197 #: ../libsqueeze/command-builder-rar.c:199 msgid "Removing" msgstr "Удалить" #: ../libsqueeze/command-builder-zip.c:203 -#: ../libsqueeze/command-builder-gnu-tar.c:413 -#: ../libsqueeze/command-builder-gnu-tar.c:415 +#: ../libsqueeze/command-builder-gnu-tar.c:418 +#: ../libsqueeze/command-builder-gnu-tar.c:420 #: ../libsqueeze/command-builder-rar.c:216 -#, fuzzy msgid "Extracting" msgstr "Распаковать" #: ../libsqueeze/command-builder-zip.c:214 -#: ../libsqueeze/command-builder-gnu-tar.c:428 -#: ../libsqueeze/command-builder-gnu-tar.c:430 +#: ../libsqueeze/command-builder-gnu-tar.c:433 +#: ../libsqueeze/command-builder-gnu-tar.c:435 #: ../libsqueeze/command-builder-rar.c:226 #: ../libsqueeze/command-builder-compr.c:253 msgid "Refresh" msgstr "Обновить" -#: ../libsqueeze/command-builder-gnu-tar.c:145 +#: ../libsqueeze/command-builder-gnu-tar.c:144 #: ../libsqueeze/command-builder-rar.c:137 msgid "Rights" msgstr "Права" -#: ../libsqueeze/command-builder-gnu-tar.c:147 -#, fuzzy +#: ../libsqueeze/command-builder-gnu-tar.c:146 msgid "Owner/Group" -msgstr "Просмотр владельца/группы" +msgstr "Владелец/группа" -#: ../libsqueeze/command-builder-gnu-tar.c:236 -#: ../libsqueeze/command-builder-gnu-tar.c:356 +#: ../libsqueeze/command-builder-gnu-tar.c:235 +#: ../libsqueeze/command-builder-gnu-tar.c:359 #: ../libsqueeze/command-builder-compr.c:198 -#, fuzzy msgid "Compressing" -msgstr "Сжатый размер" +msgstr "Сжатие" #: ../libsqueeze/command-builder-gnu-tar.c:269 -#: ../libsqueeze/command-builder-gnu-tar.c:347 +#: ../libsqueeze/command-builder-gnu-tar.c:350 #: ../libsqueeze/command-builder-compr.c:222 msgid "Decompressing" msgstr "Распаковка" #: ../libsqueeze/command-builder-gnu-tar.c:283 -#, fuzzy msgid "Adding files" msgstr "Добавить файлы" -#: ../libsqueeze/command-builder-gnu-tar.c:303 -#: ../libsqueeze/command-builder-gnu-tar.c:374 +#: ../libsqueeze/command-builder-gnu-tar.c:305 +#: ../libsqueeze/command-builder-gnu-tar.c:379 msgid "Cleanup" msgstr "Очистка" -#: ../libsqueeze/command-builder-gnu-tar.c:334 -#, fuzzy +#: ../libsqueeze/command-builder-gnu-tar.c:336 msgid "Removing files" msgstr "Удалить файлы" @@ -136,20 +128,20 @@ msgstr "Удалить файлы"
[Xfce4-commits] Unbind title dialog binding before destroy.
Updating branch refs/heads/master to 715a78dc3cc93ab3a49d9c59a88ca34a88824206 (commit) from ef462b1a24384045dc815d602e006b8040b2b382 (commit) commit 715a78dc3cc93ab3a49d9c59a88ca34a88824206 Author: Nick Schermer Date: Sun Jan 30 14:27:45 2011 +0100 Unbind title dialog binding before destroy. Some versions of Gtk emit a properly change when destroying, resulting in an empty title. So unbind before closing the dialog. terminal/terminal-window.c | 36 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c index 6294ef2..7f584a4 100644 --- a/terminal/terminal-window.c +++ b/terminal/terminal-window.c @@ -1520,8 +1520,9 @@ terminal_window_action_goto_tab (GtkRadioAction *action, static void -title_dialog_response (GtkWidget *dialog, - gint response) +title_dialog_response (GtkWidget *dialog, + gint response, + ExoMutualBinding *title_binding) { /* check if we should open the user manual */ if (response == GTK_RESPONSE_HELP) @@ -1532,6 +1533,7 @@ title_dialog_response (GtkWidget *dialog, else { /* close the dialog */ + exo_mutual_binding_unbind (title_binding); gtk_widget_destroy (dialog); } } @@ -1539,16 +1541,25 @@ title_dialog_response (GtkWidget *dialog, static void +title_dialog_quit (GtkWidget *dialog) +{ + gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); +} + + + +static void terminal_window_action_set_title (GtkAction *action, TerminalWindow *window) { - AtkRelationSet *relations; - AtkRelation*relation; - AtkObject *object; - GtkWidget *dialog; - GtkWidget *box; - GtkWidget *label; - GtkWidget *entry; + AtkRelationSet *relations; + AtkRelation *relation; + AtkObject*object; + GtkWidget*dialog; + GtkWidget*box; + GtkWidget*label; + GtkWidget*entry; + ExoMutualBinding *title_binding; if (G_LIKELY (window->active != NULL)) { @@ -1572,7 +1583,7 @@ terminal_window_action_set_title (GtkAction *action, entry = gtk_entry_new (); gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0); g_signal_connect_swapped (G_OBJECT (entry), "activate", -G_CALLBACK (gtk_widget_destroy), dialog); +G_CALLBACK (title_dialog_quit), dialog); gtk_widget_show (entry); /* set Atk description and label relation for the entry */ @@ -1583,10 +1594,11 @@ terminal_window_action_set_title (GtkAction *action, atk_relation_set_add (relations, relation); g_object_unref (G_OBJECT (relation)); - exo_mutual_binding_new (G_OBJECT (window->active), "custom-title", G_OBJECT (entry), "text"); + title_binding = exo_mutual_binding_new (G_OBJECT (window->active), "custom-title", + G_OBJECT (entry), "text"); g_signal_connect (G_OBJECT (dialog), "response", -G_CALLBACK (title_dialog_response), NULL); +G_CALLBACK (title_dialog_response), title_binding); gtk_widget_show (dialog); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Work around deprecated API in vte 0.26.
Updating branch refs/heads/master to ef462b1a24384045dc815d602e006b8040b2b382 (commit) from f636a4bd8f8035bc339892854790bdb8aad20564 (commit) commit ef462b1a24384045dc815d602e006b8040b2b382 Author: Nick Schermer Date: Sun Jan 30 13:41:39 2011 +0100 Work around deprecated API in vte 0.26. terminal/terminal-screen.c | 42 -- 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c index 7e80461..7298425 100644 --- a/terminal/terminal-screen.c +++ b/terminal/terminal-screen.c @@ -1320,11 +1320,16 @@ terminal_screen_update_label_orientation (TerminalScreen *screen) void terminal_screen_launch_child (TerminalScreen *screen) { - gboolean update; - GError *error = NULL; - gchar *command; - gchar **argv; - gchar **env; + gboolean update; + GError *error = NULL; + gchar*command; + gchar **argv; + gchar **env; +#if VTE_CHECK_VERSION (0, 26, 0) + gchar **argv2; + guint i; + GSpawnFlags spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH; +#endif terminal_return_if_fail (TERMINAL_IS_SCREEN (screen)); @@ -1344,13 +1349,38 @@ terminal_screen_launch_child (TerminalScreen *screen) g_object_get (G_OBJECT (screen->preferences), "command-update-records", &update, NULL); - env = terminal_screen_get_child_environment (screen); +#if VTE_CHECK_VERSION (0, 26, 0) + argv2 = g_new0 (gchar *, g_strv_length (argv) + 2); + argv2[0] = command; + + if (argv != NULL) +{ + for (i = 0; argv[i] != NULL; i++) +argv2[i + 1] = argv[i]; + + spawn_flags |= G_SPAWN_FILE_AND_ARGV_ZERO; +} + + if (!vte_terminal_fork_command_full (VTE_TERMINAL (screen->terminal), + update ? VTE_PTY_DEFAULT : VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP, + screen->working_directory, argv2, env, + spawn_flags, + NULL, NULL, + &screen->pid, &error)) +{ + terminal_dialogs_show_error (GTK_WIDGET (screen), error, _("Failed to execute child")); + g_error_free (error); +} + + g_free (argv2); +#else screen->pid = vte_terminal_fork_command (VTE_TERMINAL (screen->terminal), command, argv, env, screen->working_directory, update, update, update); +#endif g_strfreev (argv); g_strfreev (env); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Protect against NULL border values (bug #7120).
Updating branch refs/heads/master to bfe5fd39bf96c0d39c0a85cd2ccc171253b1e54a (commit) from 715a78dc3cc93ab3a49d9c59a88ca34a88824206 (commit) commit bfe5fd39bf96c0d39c0a85cd2ccc171253b1e54a Author: Nick Schermer Date: Sun Jan 30 14:33:50 2011 +0100 Protect against NULL border values (bug #7120). terminal/terminal-screen.c | 13 ++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c index 7298425..42801c4 100644 --- a/terminal/terminal-screen.c +++ b/terminal/terminal-screen.c @@ -1497,9 +1497,16 @@ terminal_screen_set_window_geometry_hints (TerminalScreen *screen, #if VTE_CHECK_VERSION (0, 24, 0) gtk_widget_style_get (GTK_WIDGET (screen->terminal), "inner-border", &border, NULL); - xpad = border->left + border->right; - ypad = border->top + border->bottom; - gtk_border_free (border); + if (border != NULL) +{ + xpad = border->left + border->right; + ypad = border->top + border->bottom; + gtk_border_free (border); +} + else +{ + xpad = ypad = 0; +} #else vte_terminal_get_padding (VTE_TERMINAL (screen->terminal), &xpad, &ypad); #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Properly invalidate tooltips on file changes.
Updating branch refs/heads/xfce-4.8 to e0fa75600471bc83b7b3049f9a2d53aa355cd109 (commit) from dde9240481e70a2b63dc16b0f3afe353448f60ae (commit) commit e0fa75600471bc83b7b3049f9a2d53aa355cd109 Author: Jannis Pohlmann Date: Sun Jan 30 14:34:52 2011 +0100 Properly invalidate tooltips on file changes. NEWS |1 + src/xfdesktop-regular-file-icon.c |4 src/xfdesktop-special-file-icon.c |1 + 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 6e686c8..bfe9fd5 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ Xfdesktop 4.x.y * Implement monitoring for special file icons (bug #6986). * Implement open and empty actions for the trash. * Fix crash when cancelling a file download (bug #6876). + * Properly invalidate tooltips on file changes. Xfdesktop 4.8.0 diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c index b360f7f..840a098 100644 --- a/src/xfdesktop-regular-file-icon.c +++ b/src/xfdesktop-regular-file-icon.c @@ -577,6 +577,10 @@ xfdesktop_regular_file_icon_update_file_info(XfdesktopFileIcon *icon, /* no change, release the new display name */ g_free (new_display_name); } + +/* invalidate the tooltip */ +g_free(regular_file_icon->priv->tooltip); +regular_file_icon->priv->tooltip = NULL; /* not really easy to check if this changed or not, so just invalidate it */ xfdesktop_regular_file_icon_invalidate_pixbuf(regular_file_icon); diff --git a/src/xfdesktop-special-file-icon.c b/src/xfdesktop-special-file-icon.c index 8f0990c..1226adf 100644 --- a/src/xfdesktop-special-file-icon.c +++ b/src/xfdesktop-special-file-icon.c @@ -583,6 +583,7 @@ xfdesktop_special_file_icon_changed(GFileMonitor *monitor, } /* invalidate the tooltip */ +g_free(special_file_icon->priv->tooltip); special_file_icon->priv->tooltip = NULL; /* update the icon */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix compiler warnings.
Updating branch refs/heads/master to f636a4bd8f8035bc339892854790bdb8aad20564 (commit) from c8cec03bec86e342778dd0fab4e1ca563c69cdc4 (commit) commit f636a4bd8f8035bc339892854790bdb8aad20564 Author: Nick Schermer Date: Sun Jan 30 13:41:18 2011 +0100 Fix compiler warnings. terminal/terminal-widget.c | 32 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c index e672d11..dac2df8 100644 --- a/terminal/terminal-widget.c +++ b/terminal/terminal-widget.c @@ -229,21 +229,21 @@ terminal_widget_context_menu_copy (TerminalWidget *widget, GtkWidget *item) { GtkClipboard *clipboard; - const gchar *link; + const gchar *wlink; GdkDisplay *display; - link = g_object_get_data (G_OBJECT (item), "terminal-widget-link"); - if (G_LIKELY (link != NULL)) + wlink = g_object_get_data (G_OBJECT (item), "terminal-widget-link"); + if (G_LIKELY (wlink != NULL)) { display = gtk_widget_get_display (GTK_WIDGET (widget)); /* copy the URI to "CLIPBOARD" */ clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text (clipboard, link, -1); + gtk_clipboard_set_text (clipboard, wlink, -1); /* copy the URI to "PRIMARY" */ clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_PRIMARY); - gtk_clipboard_set_text (clipboard, link, -1); + gtk_clipboard_set_text (clipboard, wlink, -1); } } @@ -253,14 +253,14 @@ static void terminal_widget_context_menu_open (TerminalWidget *widget, GtkWidget *item) { - const gchar *link; + const gchar *wlink; gint*tag; - link = g_object_get_data (G_OBJECT (item), "terminal-widget-link"); + wlink = g_object_get_data (G_OBJECT (item), "terminal-widget-link"); tag = g_object_get_data (G_OBJECT (item), "terminal-widget-tag"); - if (G_LIKELY (link != NULL && tag != NULL)) -terminal_widget_open_uri (widget, link, *tag); + if (G_LIKELY (wlink != NULL && tag != NULL)) +terminal_widget_open_uri (widget, wlink, *tag); } @@ -656,7 +656,7 @@ terminal_widget_key_press_event (GtkWidget*widget, static void terminal_widget_open_uri (TerminalWidget *widget, - const gchar*link, + const gchar*wlink, ginttag) { GError*error = NULL; @@ -674,18 +674,18 @@ terminal_widget_open_uri (TerminalWidget *widget, switch (regex_patterns[i].type) { case PATTERN_TYPE_FULL_HTTP: -uri = g_strdup (link); +uri = g_strdup (wlink); break; case PATTERN_TYPE_HTTP: -uri = g_strconcat ("http://";, link, NULL); +uri = g_strconcat ("http://";, wlink, NULL); break; case PATTERN_TYPE_EMAIL: -if (strncmp (link, "mailto:";, 7) == 0) - uri = g_strdup (link); +if (strncmp (wlink, "mailto:";, 7) == 0) + uri = g_strdup (wlink); else - uri = g_strconcat ("mailto:";, link, NULL); + uri = g_strconcat ("mailto:";, wlink, NULL); break; default: @@ -713,7 +713,7 @@ terminal_widget_open_uri (TerminalWidget *widget, invalid_tag: - g_warning ("Invalid tag specified while trying to open link \"%s\".", link); + g_warning ("Invalid tag specified while trying to open link \"%s\".", wlink); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Properly invalidate tooltips on file changes.
Updating branch refs/heads/master to 857cb8a6f420f0f5cf6cf7fece7301c9351dca09 (commit) from 171e0d79266b1ad6faedb7e7aee8dffb89b684e5 (commit) commit 857cb8a6f420f0f5cf6cf7fece7301c9351dca09 Author: Jannis Pohlmann Date: Sun Jan 30 14:34:52 2011 +0100 Properly invalidate tooltips on file changes. NEWS |1 + src/xfdesktop-regular-file-icon.c |4 src/xfdesktop-special-file-icon.c |1 + 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index b6f919b..a7c9be3 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ Xfdesktop 4.x.y * Implement monitoring for special file icons (bug #6986). * Implement open and empty actions for the trash. * Fix crash when cancelling a file download (bug #6876). + * Properly invalidate tooltips on file changes. Xfdesktop 4.8.0 diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c index 8f30c2c..e14256a 100644 --- a/src/xfdesktop-regular-file-icon.c +++ b/src/xfdesktop-regular-file-icon.c @@ -576,6 +576,10 @@ xfdesktop_regular_file_icon_update_file_info(XfdesktopFileIcon *icon, /* no change, release the new display name */ g_free (new_display_name); } + +/* invalidate the tooltip */ +g_free(regular_file_icon->priv->tooltip); +regular_file_icon->priv->tooltip = NULL; /* not really easy to check if this changed or not, so just invalidate it */ xfdesktop_regular_file_icon_invalidate_pixbuf(regular_file_icon); diff --git a/src/xfdesktop-special-file-icon.c b/src/xfdesktop-special-file-icon.c index 8f0990c..1226adf 100644 --- a/src/xfdesktop-special-file-icon.c +++ b/src/xfdesktop-special-file-icon.c @@ -583,6 +583,7 @@ xfdesktop_special_file_icon_changed(GFileMonitor *monitor, } /* invalidate the tooltip */ +g_free(special_file_icon->priv->tooltip); special_file_icon->priv->tooltip = NULL; /* update the icon */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix crash when cancelling a file download (bug #6876).
Updating branch refs/heads/xfce-4.8 to dde9240481e70a2b63dc16b0f3afe353448f60ae (commit) from 2753cf8f17085e17e40004436b382fc6478d8c51 (commit) commit dde9240481e70a2b63dc16b0f3afe353448f60ae Author: Jannis Pohlmann Date: Sun Jan 30 14:19:08 2011 +0100 Fix crash when cancelling a file download (bug #6876). Apparently, there are situations where a G_FILE_MONITOR_EVENT_CHANGED event is triggered for an existing file that has no GFileInfo any more. This commits removes an assertion that the GFileInfo is valid in those situations and instead, destroys the file icon when it's not. Also, this commit switches from G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT to G_FILE_MONITOR_EVENT_CHANGED although it shouldn't really matter which one we use. NEWS |1 + src/xfdesktop-file-icon-manager.c | 19 --- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index f8ada79..6e686c8 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ Xfdesktop 4.x.y * Handle volume changes in a timeout (bug #7025). * Implement monitoring for special file icons (bug #6986). * Implement open and empty actions for the trash. + * Fix crash when cancelling a file download (bug #6876). Xfdesktop 4.8.0 diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c index 7362c52..c85c08d 100644 --- a/src/xfdesktop-file-icon-manager.c +++ b/src/xfdesktop-file-icon-manager.c @@ -2135,19 +2135,24 @@ xfdesktop_file_icon_manager_file_changed(GFileMonitor *monitor, GFileInfo *file_info; switch(event) { -case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -DBG("got changes done hint event: %s", g_file_get_path(file)); +case G_FILE_MONITOR_EVENT_CHANGED: +DBG("got changed event: %s", g_file_get_path(file)); icon = g_hash_table_lookup(fmanager->priv->icons, file); if(icon) { file_info = g_file_query_info(file, XFDESKTOP_FILE_INFO_NAMESPACE, G_FILE_QUERY_INFO_NONE, NULL, NULL); -/* the file info query HAS to succeed because the file still exists */ -g_assert(file_info); - -xfdesktop_file_icon_update_file_info(icon, file_info); -g_object_unref(file_info); +if(file_info) { +/* update the icon if the file still exists */ +xfdesktop_file_icon_update_file_info(icon, file_info); +g_object_unref(file_info); +} else { +/* remove the icon as the file no longer seems to be existing */ +xfdesktop_icon_view_remove_item(fmanager->priv->icon_view, +XFDESKTOP_ICON(icon)); +g_hash_table_remove(fmanager->priv->icons, file); +} } break; case G_FILE_MONITOR_EVENT_CREATED: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix crash when cancelling a file download (bug #6876).
Updating branch refs/heads/master to 171e0d79266b1ad6faedb7e7aee8dffb89b684e5 (commit) from 731cf29b105b3251f2bfdfb50d2aa55bce1f2c36 (commit) commit 171e0d79266b1ad6faedb7e7aee8dffb89b684e5 Author: Jannis Pohlmann Date: Sun Jan 30 14:19:08 2011 +0100 Fix crash when cancelling a file download (bug #6876). Apparently, there are situations where a G_FILE_MONITOR_EVENT_CHANGED event is triggered for an existing file that has no GFileInfo any more. This commits removes an assertion that the GFileInfo is valid in those situations and instead, destroys the file icon when it's not. Also, this commit switches from G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT to G_FILE_MONITOR_EVENT_CHANGED although it shouldn't really matter which one we use. NEWS |1 + src/xfdesktop-file-icon-manager.c | 19 --- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 21c455d..b6f919b 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ Xfdesktop 4.x.y * Scroll to the selected background in the settings (bug #7087). * Implement monitoring for special file icons (bug #6986). * Implement open and empty actions for the trash. + * Fix crash when cancelling a file download (bug #6876). Xfdesktop 4.8.0 diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c index 7362c52..c85c08d 100644 --- a/src/xfdesktop-file-icon-manager.c +++ b/src/xfdesktop-file-icon-manager.c @@ -2135,19 +2135,24 @@ xfdesktop_file_icon_manager_file_changed(GFileMonitor *monitor, GFileInfo *file_info; switch(event) { -case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -DBG("got changes done hint event: %s", g_file_get_path(file)); +case G_FILE_MONITOR_EVENT_CHANGED: +DBG("got changed event: %s", g_file_get_path(file)); icon = g_hash_table_lookup(fmanager->priv->icons, file); if(icon) { file_info = g_file_query_info(file, XFDESKTOP_FILE_INFO_NAMESPACE, G_FILE_QUERY_INFO_NONE, NULL, NULL); -/* the file info query HAS to succeed because the file still exists */ -g_assert(file_info); - -xfdesktop_file_icon_update_file_info(icon, file_info); -g_object_unref(file_info); +if(file_info) { +/* update the icon if the file still exists */ +xfdesktop_file_icon_update_file_info(icon, file_info); +g_object_unref(file_info); +} else { +/* remove the icon as the file no longer seems to be existing */ +xfdesktop_icon_view_remove_item(fmanager->priv->icon_view, +XFDESKTOP_ICON(icon)); +g_hash_table_remove(fmanager->priv->icons, file); +} } break; case G_FILE_MONITOR_EVENT_CREATED: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Add Japanese translation
Updating branch refs/heads/master to 03de26c33123ef610185208227db9bc244e54063 (commit) from 0c16898998cbd74ab6cab6428c2d1eddab8dbeec (commit) commit 03de26c33123ef610185208227db9bc244e54063 Author: Masato Hashimoto Date: Sun Jan 30 14:15:38 2011 +0100 l10n: Add Japanese translation New status: 228 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/{fi.po => ja.po} | 609 ++- 1 files changed, 312 insertions(+), 297 deletions(-) diff --git a/po/fi.po b/po/ja.po similarity index 55% copy from po/fi.po copy to po/ja.po index 9b48c6b..1e86e53 100644 --- a/po/fi.po +++ b/po/ja.po @@ -1,28 +1,30 @@ -# Finnish translation of Postler. -# Copyright (C) Christian Dywan and the Elementary Team 2010-2011 +# Japanese translations for Postler package +# Postler パッケージに対する英訳. +# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Postler package. -# Jari Rahkonen , 2011. +# Masato HASHIMOTO , 2011. # msgid "" msgstr "" -"Project-Id-Version: Postler 0.x\n" +"Project-Id-Version: Postler 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-29 05:17+\n" -"PO-Revision-Date: 2011-01-29 13:01+0200\n" -"Last-Translator: Jari Rahkonen \n" -"Language-Team: Finnish \n" +"POT-Creation-Date: 2011-01-30 22:14+0900\n" +"PO-Revision-Date: 2011-01-30 22:12+0900\n" +"Last-Translator: Masato Hashimoto \n" +"Language-Team: Japanese\n" +"Language: ja\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" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../data/postler.desktop.in.h:1 msgid "Lean mail interface" -msgstr "Kevyt sähköpostiohjelma" +msgstr "すっきりとムダのないメールインターフェイスです" #: ../data/postler.desktop.in.h:2 msgid "Mail reader" -msgstr "Sähköposti" +msgstr "メールリーダ" #: ../data/postler.desktop.in.h:3 ../postler/postler-reader.vala:40 msgid "Postler" @@ -31,907 +33,918 @@ msgstr "Postler" #: ../postler/postler-accounts.vala:70 ../postler/postler-accounts.vala:195 #: ../postler/postler-service.vala:165 msgid "Inbox" -msgstr "Saapuvat" +msgstr "受信箱" #: ../postler/postler-accounts.vala:71 msgid "Sent" -msgstr "Lähetetyt" +msgstr "送信控" #: ../postler/postler-accounts.vala:72 msgid "Drafts" -msgstr "Luonnokset" +msgstr "下書き" #: ../postler/postler-accounts.vala:73 msgid "Outbox" -msgstr "Lähtevät" +msgstr "送信待ち" #: ../postler/postler-accounts.vala:74 msgid "Trash" -msgstr "Roskakori" +msgstr "ゴミ箱" #: ../postler/postler-accounts.vala:75 msgid "Archive" -msgstr "Arkisto" +msgstr "書庫" #. i18n: Junk, unsolicited bulk mail, spam #: ../postler/postler-accounts.vala:77 msgid "Junk" -msgstr "Roskaposti" +msgstr "迷惑メール" #: ../postler/postler-accounts.vala:166 msgid "Failed to find a root certificate file." -msgstr "Pääsertifikaattitiedostoa ei löydy." +msgstr "ルート認証ファイルを見つけることができませんでした。" #: ../postler/postler-accounts.vala:200 msgid "Config folder couldn't be created." -msgstr "Asetuskansion luominen epäonnistui." +msgstr "設定フォルダを作成できませんでした。" #: ../postler/postler-accounts.vala:360 #, c-format msgid "Invalid type \"%s\"" -msgstr "Tyyppi \"%s\" ei kelpaa" +msgstr "不正なタイプ \"%s\"" #. i18n: File was found but can't contains invalid values #: ../postler/postler-accounts.vala:364 #, c-format msgid "Failed to parse account in \"%s\": %s" -msgstr "Tilin jäsennys epäonnistui kohteessa \"%s\": %s" +msgstr "\"%s\" 内のアカウントの解析に失敗しました: %s" #: ../postler/postler-accounts.vala:401 msgid "Cache folder couldn't be created." -msgstr "Välimuistikansion luominen epäonnistui." +msgstr "キャッシュフォルダを作成できませんでした。" #: ../postler/postler-accounts.vala:411 msgid "This type can't receive mail." -msgstr "Tämä tyyppi ei voi vastaanottaa postia." +msgstr "このタイプはメールを受信できません。" #: ../postler/postler-accounts.vala:421 msgid "No SSL certificates available" -msgstr "SSL-sertifikaatteja ei saatavilla" +msgstr "SSL 認証が利用できません" #: ../postler/postler-accounts.vala:426 msgid "Invalid address" -msgstr "Osoite ei kelpaa" +msgstr "不正なアドレス" #: ../postler/postler-accounts.vala:436 ../postler/postler-accounts.vala:438 msgid "Hostname is missing" -msgstr "Isäntänimi puuttuu" +msgstr "ホスト名が不足しています" #: ../postler/postler-accounts.vala:440 msgid "Username is missing" -msgstr "Käyttäjänimi puuttuu" +msgstr "ユーザ名が不足しています" #: ../postler/postler-accounts.vala:442 msgid "Password is missing" -msgstr "Salasana puuttuu" +msgstr "パスワードが不足しています" #: ../postler/postler-accounts.vala:536 ../postler/postler-accounts.vala:554 #: ../postler/postler-accounts.vala:574 #, c-format msgid "Account \"%s\" can't receive mail." -msgstr "Tili \"%s\" ei voi vastaanottaa postia." +msgstr "アカウント \"%s\" はメールを受信できません。" #: ../postler/postler-accounts.vala:557 ../postler/postler-accounts.val
[Xfce4-commits] l10n: Updated German (de) translation to 100%
Updating branch refs/heads/master to f403bd11ad9d6385d8ec4d90ca12d1c71a10a2b1 (commit) from 201b4e19e98b658ebaecb127b4a5dadbe6497b2a (commit) commit f403bd11ad9d6385d8ec4d90ca12d1c71a10a2b1 Author: Fabian Nowak Date: Sun Jan 30 13:20:57 2011 +0100 l10n: Updated German (de) translation to 100% New status: 283 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 146 ++ 1 files changed, 52 insertions(+), 94 deletions(-) diff --git a/po/de.po b/po/de.po index 07457c6..64673f6 100644 --- a/po/de.po +++ b/po/de.po @@ -15,10 +15,10 @@ msgstr "" "PO-Revision-Date: 2011-01-30 13:09+0100\n" "Last-Translator: David Mohr \n" "Language-Team: de <>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: \n" +"Language: \n" #: ../xfburn/xfburn-adding-progress.c:111 msgid "Adding files to the composition" @@ -95,7 +95,8 @@ msgstr "CD aus_werfen" msgid "_Blank" msgstr "_Löschen" -#. blanking can only be performed on blank discs, format and deformat are allowed to be blank ones +#. blanking can only be performed on blank discs, format and deformat are +#. allowed to be blank ones #: ../xfburn/xfburn-blank-dialog.c:355 msgid "The inserted disc is already blank." msgstr "Das Medium ist schon leer." @@ -160,8 +161,7 @@ msgstr "Zusammenstellungsname" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:211 msgid "Would you like to change the default composition name?" -msgstr "" -"Möchten Sie den Standardnamen der Zusammenstellung ändern?" +msgstr "Möchten Sie den Standardnamen der Zusammenstellung ändern?" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:236 #: ../xfburn/xfburn-burn-image-dialog.c:208 @@ -262,25 +262,16 @@ msgid "Burning image..." msgstr "Brenne Abbild..." #: ../xfburn/xfburn-burn-image-dialog.c:445 -msgid "" -"Please " -"select an image to burn" -msgstr "" -"Bitte " -"wählen Sie ein CD-Abbild aus" +msgid "Please select an image to burn" +msgstr "Bitte wählen Sie ein CD-Abbild aus" #: ../xfburn/xfburn-burn-image-dialog.c:483 -msgid "" -"Cannot append data to multisession disc in this write mode (use TAO instead)" -msgstr "" -"Konnte die Daten nicht an das Mehrfachsitzungs-Medium anhängen (probieren Sie " -"TAO)" +msgid "Cannot append data to multisession disc in this write mode (use TAO instead)" +msgstr "Konnte die Daten nicht an das Mehrfachsitzungs-Medium anhängen (probieren Sie TAO)" #: ../xfburn/xfburn-burn-image-dialog.c:487 msgid "Closed disc with data detected. Need blank or appendable disc" -msgstr "" -"Abgeschlossenes Medium mit Daten erkannt. Leeres oder anhängfähiges Medium " -"erforderlich" +msgstr "Abgeschlossenes Medium mit Daten erkannt. Leeres oder anhängfähiges Medium erforderlich" #: ../xfburn/xfburn-burn-image-dialog.c:489 msgid "No disc detected in drive" @@ -299,12 +290,8 @@ msgid "Failed to get image size" msgstr "Konnte Abbildgröße nicht ermitteln" #: ../xfburn/xfburn-burn-image-dialog.c:536 -msgid "" -"Make sure you selected a valid file and you have the proper permissions to " -"access it." -msgstr "" -"Stellen Sie sicher, dass eine gültige Datei ausgewählt ist und Sie die " -"erforderlichen Zugriffsrechte haben." +msgid "Make sure you selected a valid file and you have the proper permissions to access it." +msgstr "Stellen Sie sicher, dass eine gültige Datei ausgewählt ist und Sie die erforderlichen Zugriffsrechte haben." #: ../xfburn/xfburn-compositions-notebook.c:174 msgid "Audio composition" @@ -403,7 +390,8 @@ msgstr "Leeren" msgid "Clear the content of the composition" msgstr "Inhalt der Zusammenstellung leeren" -#. {"import-session", "xfburn-import-session", N_("Import"), NULL, N_("Import existing session"),}, +#. {"import-session", "xfburn-import-session", N_("Import"), NULL, N_("Import +#. existing session"),}, #: ../xfburn/xfburn-data-composition.c:195 msgid "Rename" msgstr "Umbenennen" @@ -437,9 +425,7 @@ msgstr "Sie müssen der Datei einen Namen geben." #: ../xfburn/xfburn-data-composition.c:1123 #: ../xfburn/xfburn-audio-composition.c:1146 msgid "A file with the same name is already present in the composition." -msgstr "" -"Eine Datei mit demselben Dateinamen ist in der Zusammenstellung bereits " -"vorhanden." +msgstr "Eine Datei mit demselben Dateinamen ist in der Zusammenstellung bereits vorhanden." #: ../xfburn/xfburn-data-composition.c:795 #: ../xfburn/xfburn-data-composition.c:796 @@ -447,7 +433,8 @@ msgstr "" msgid "New directory" msgstr "Neues Verzeichnis" -#. Note to translators: first %s is the date in "i18n" format (year-month-day), %d is a running number of compositions +#. Note to translators: first %s is the date in "i18n" format (year-month- +#. day), %d is a running number of compositions #: ../xfburn/xfburn-data-composition.c:966 #, c-format msg
[Xfce4-commits] l10n: Updated German (de) translation to 100%
Updating branch refs/heads/master to 201b4e19e98b658ebaecb127b4a5dadbe6497b2a (commit) from c235abdf95603892a2d59314c73b828d0ec7d659 (commit) commit 201b4e19e98b658ebaecb127b4a5dadbe6497b2a Author: Fabian Nowak Date: Sun Jan 30 13:11:58 2011 +0100 l10n: Updated German (de) translation to 100% New status: 283 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 213 +- 1 files changed, 128 insertions(+), 85 deletions(-) diff --git a/po/de.po b/po/de.po index 5f80e6e..07457c6 100644 --- a/po/de.po +++ b/po/de.po @@ -2,7 +2,7 @@ # Copyright (C) 2005-2006 Jean-François Wauthy. # This file is distributed under the same license as the xfburn package. # David Mohr , 2008 -# Fabian Nowak , 2005-2007. +# Fabian Nowak , 2005-2007,2011. # Enrico Tröger , 2006-2008. # Nico Schümann , 2007. # David Mohr , 2010. @@ -11,10 +11,11 @@ msgid "" msgstr "" "Project-Id-Version: xfburn 0.3.0svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-28 12:01+0200\n" -"PO-Revision-Date: 2010-02-04 18:44-0700\n" +"POT-Creation-Date: 2011-01-30 12:52+0100\n" +"PO-Revision-Date: 2011-01-30 13:09+0100\n" "Last-Translator: David Mohr \n" "Language-Team: de <>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: \n" @@ -37,7 +38,7 @@ msgstr "Schnell formatieren" #: ../xfburn/xfburn-blank-dialog.c:74 msgid "Full Format" -msgstr "vollständig formatieren" +msgstr "Vollständig formatieren" #: ../xfburn/xfburn-blank-dialog.c:75 msgid "Quick Deformat" @@ -94,8 +95,7 @@ msgstr "CD aus_werfen" msgid "_Blank" msgstr "_Löschen" -#. blanking can only be performed on blank discs, format and deformat are -#. allowed to be blank ones +#. blanking can only be performed on blank discs, format and deformat are allowed to be blank ones #: ../xfburn/xfburn-blank-dialog.c:355 msgid "The inserted disc is already blank." msgstr "Das Medium ist schon leer." @@ -115,7 +115,7 @@ msgstr "Medium nicht löschbar." #: ../xfburn/xfburn-blank-dialog.c:413 msgid "Blanking disc..." -msgstr "Medium leeren..." +msgstr "Leere Medium..." #: ../xfburn/xfburn-blank-dialog.c:440 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:512 @@ -147,7 +147,7 @@ msgstr "Volumennamen anzeigen" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:157 msgid "Show a text entry for the name of the volume" -msgstr "Texteingabefeld für den Volumennamen anzeigen" +msgstr "Texteingabefeld für den Volumennamen zeigen" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:183 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:148 @@ -160,7 +160,8 @@ msgstr "Zusammenstellungsname" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:211 msgid "Would you like to change the default composition name?" -msgstr "Möchten Sie den Standardnamen der Zusammenstellung ändern?" +msgstr "" +"Möchten Sie den Standardnamen der Zusammenstellung ändern?" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:236 #: ../xfburn/xfburn-burn-image-dialog.c:208 @@ -195,7 +196,7 @@ msgstr "Konnte Ziel-ISO-Datei »%s« nicht anlegen" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:477 msgid "Writing ISO..." -msgstr "ISO-Datei schreiben..." +msgstr "Schreibe ISO-Datei..." #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:494 #, c-format @@ -258,19 +259,28 @@ msgstr "Öffnen des Abbilds fehlgeschlagen." #: ../xfburn/xfburn-burn-image-dialog.c:379 msgid "Burning image..." -msgstr "Abbild brennen..." +msgstr "Brenne Abbild..." #: ../xfburn/xfburn-burn-image-dialog.c:445 -msgid "Please select an image to burn" -msgstr "Bitte wählen Sie ein CD-Abbild aus" +msgid "" +"Please " +"select an image to burn" +msgstr "" +"Bitte " +"wählen Sie ein CD-Abbild aus" #: ../xfburn/xfburn-burn-image-dialog.c:483 -msgid "Cannot append data to multisession disc in this write mode (use TAO instead)" -msgstr "Konnte die Daten nicht an das Multisession-Medium anhängen (probieren Sie TAO)" +msgid "" +"Cannot append data to multisession disc in this write mode (use TAO instead)" +msgstr "" +"Konnte die Daten nicht an das Mehrfachsitzungs-Medium anhängen (probieren Sie " +"TAO)" #: ../xfburn/xfburn-burn-image-dialog.c:487 msgid "Closed disc with data detected. Need blank or appendable disc" -msgstr "Abgeschlossenes Medium mit Daten erkannt. Leeres oder anhängfähiges Medium erforderlich" +msgstr "" +"Abgeschlossenes Medium mit Daten erkannt. Leeres oder anhängfähiges Medium " +"erforderlich" #: ../xfburn/xfburn-burn-image-dialog.c:489 msgid "No disc detected in drive" @@ -289,8 +299,12 @@ msgid "Failed to get image size" msgstr "Konnte Abbildgröße nicht ermitteln" #: ../xfburn/xfburn-burn-image-dialog.c:536 -msgid "Make sure you selected a valid file and you have the proper permissions to access it." -msg
[Xfce4-commits] l10n: Updated Galician (gl) translation to 99%
Updating branch refs/heads/xfce-4.8 to 7073d76de763ae906b8777c3934d4773c83e0650 (commit) from 42ca9bb24fe4d72528b448a2f19cdf0decc49e99 (commit) commit 7073d76de763ae906b8777c3934d4773c83e0650 Author: Leandro Regueiro Date: Sun Jan 30 12:42:36 2011 +0100 l10n: Updated Galician (gl) translation to 99% New status: 198 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po | 192 +++-- 1 files changed, 98 insertions(+), 94 deletions(-) diff --git a/po/gl.po b/po/gl.po index 2ddf293..4341e2d 100644 --- a/po/gl.po +++ b/po/gl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: xfdesktop 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-18 11:29+\n" +"POT-Creation-Date: 2011-01-30 11:29+\n" "PO-Revision-Date: 2010-10-19 18:44+0100\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galician \n" @@ -28,7 +28,7 @@ msgid "Backdrop list file is not valid" msgstr "O ficheiro de lista de fondos de escritorio non é válido" #. no need to escape markup; it's already done for us -#: ../settings/main.c:162 +#: ../settings/main.c:163 #, c-format msgid "" "%s\n" @@ -37,131 +37,131 @@ msgstr "" "%s\n" "Tamaño: %dx%d" -#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247 -#: ../src/xfdesktop-special-file-icon.c:413 +#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256 +#: ../src/xfdesktop-special-file-icon.c:419 msgid "Home" msgstr "Inicio" -#: ../settings/main.c:274 +#: ../settings/main.c:291 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: ../settings/main.c:276 +#: ../settings/main.c:293 msgid "Trash" msgstr "Lixo" -#: ../settings/main.c:278 +#: ../settings/main.c:295 msgid "Removable Devices" msgstr "Dispositivos extraíbles" # backdrop=fondo de escritorio -#: ../settings/main.c:458 +#: ../settings/main.c:475 #, c-format msgid "Cannot create backdrop list \"%s\"" msgstr "Non se puido crear a lista de fondos de escritorio \"%s\"" # backdrop=fondo de escritorio -#: ../settings/main.c:462 ../settings/main.c:779 +#: ../settings/main.c:479 ../settings/main.c:802 msgid "Backdrop List Error" msgstr "Erro na lista de fondos de escritorio" # backdrop=fondo de escritorio -#: ../settings/main.c:487 +#: ../settings/main.c:504 msgid "Create/Load Backdrop List" msgstr "Crear/cargar lista de fondos de escritorio" # backdrop=fondo de escritorio -#: ../settings/main.c:511 +#: ../settings/main.c:528 #, c-format msgid "File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" msgstr "O ficheiro \"%s\" non é un ficheiro de lista de fondos de escritorio correcto. Desexa sobrescribilo?" -#: ../settings/main.c:516 +#: ../settings/main.c:533 msgid "Invalid List File" msgstr "Ficheiro de lista incorrecto" -#: ../settings/main.c:519 +#: ../settings/main.c:536 msgid "Overwriting the file will cause its contents to be lost." msgstr "A sobrescritura do ficheiro fará que se perda o seu contido." -#: ../settings/main.c:521 +#: ../settings/main.c:538 msgid "Replace" msgstr "Substituír" # backdrop=fondo de escritorio -#: ../settings/main.c:775 +#: ../settings/main.c:798 #, c-format msgid "Failed to write backdrop list to \"%s\"" msgstr "Produciuse un erro ao escribir a lista de fondos de escritorio en \"%s\"" -#: ../settings/main.c:802 +#: ../settings/main.c:825 msgid "Add Image File(s)" msgstr "Engadir ficheiros de imaxe" -#: ../settings/main.c:811 +#: ../settings/main.c:834 msgid "Image files" msgstr "Ficheiros de imaxe" -#: ../settings/main.c:816 +#: ../settings/main.c:839 msgid "All files" msgstr "Tódolos ficheiros" -#: ../settings/main.c:1248 +#: ../settings/main.c:1271 #, c-format msgid "Screen %d, Monitor %d (%s)" msgstr "Pantalla %d, Monitor %d (%s)" -#: ../settings/main.c:1252 +#: ../settings/main.c:1275 #, c-format msgid "Screen %d, Monitor %d" msgstr "Pantalla %d, Monitor %d" -#: ../settings/main.c:1255 +#: ../settings/main.c:1278 #, c-format msgid "Screen %d" msgstr "Pantalla %d" -#: ../settings/main.c:1260 +#: ../settings/main.c:1283 #, c-format msgid "Monitor %d (%s)" msgstr "Monitor %d (%s)" -#: ../settings/main.c:1264 +#: ../settings/main.c:1287 #, c-format msgid "Monitor %d" msgstr "Monitor %d" -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid "Settings manager socket" msgstr "Conectador do xestor de configuración" -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid "SOCKET ID" msgstr "ID CONECTADOR" -#: ../settings/main.c:1478 +#: ../settings/main.c:1501 msgid "Version information" msgstr "Información da versión" -#: ../settings/main.c:1498 +#: ../settings/main.c:1521 #, c-format msgid "Type '%s --help' for usage." msgstr "Introduza '%s --help' para ver a información de uso." -#: ../settings/main.c:1510 +#: ../settings/main.c:1533 msgid "The
[Xfce4-commits] l10n: Updated Galician (gl) translation to 99%
Updating branch refs/heads/xfce-4.8 to 2753cf8f17085e17e40004436b382fc6478d8c51 (commit) from 7073d76de763ae906b8777c3934d4773c83e0650 (commit) commit 2753cf8f17085e17e40004436b382fc6478d8c51 Author: Leandro Regueiro Date: Sun Jan 30 12:43:42 2011 +0100 l10n: Updated Galician (gl) translation to 99% New status: 198 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/gl.po b/po/gl.po index 4341e2d..ccb4802 100644 --- a/po/gl.po +++ b/po/gl.po @@ -268,11 +268,11 @@ msgstr "Cor sólida" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:23 msgid "Specifies the \"right\" or \"bottom\" color of the gradient" -msgstr "Especifica a cor da \"dereita\" ou do \"fondo\" do degradado" +msgstr "Especifica a cor da \"dereita\" ou do \"inferior\" do degradado" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:24 msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient" -msgstr "Especifica a cor sólida, ou a cor da \"esquerda\" ou da \"cima\" do degradado" +msgstr "Especifica a cor sólida, ou a cor da \"esquerda\" ou da \"superior\" do degradado" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 msgid "Specify how the image will be resized to fit the screen" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to 3316d8e6c7dc7fc38b8c474f595fc9ba68f859ac (commit) from aed0d6d9f371dec88f5b8bc61752f9368672 (commit) commit 3316d8e6c7dc7fc38b8c474f595fc9ba68f859ac Author: Xavier Devlamynck Date: Sun Jan 30 10:39:42 2011 +0100 l10n: Updated French (fr) translation to 100% New status: 198 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 108 +++--- 1 files changed, 47 insertions(+), 61 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0c15dee..a719cce 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,16 +9,16 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-power-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 04:02+\n" +"POT-Creation-Date: 2011-01-30 05:03+\n" "PO-Revision-Date: 2010-02-08 18:17+0100\n" "Last-Translator: Douart Patrick \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: FRANCE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: French\n" -"X-Poedit-Country: FRANCE\n" #: ../data/interfaces/xfpm-settings.ui.h:1 msgid "Actions" @@ -155,7 +155,7 @@ msgstr "Appui sur le bouton de mise en veille :" #: ../data/interfaces/xfpm-settings.ui.h:31 #: ../settings/xfpm-settings-main.c:121 ../src/xfpm-power.c:520 -#: ../src/xfpm-power.c:691 ../src/xfpm-main.c:415 +#: ../src/xfpm-power.c:691 ../src/xfpm-main.c:410 #: ../src/xfce4-power-manager.desktop.in.h:2 msgid "Xfce Power Manager" msgstr "Gestionnaire d'alimentation" @@ -197,9 +197,8 @@ msgstr "Secondes" #: ../settings/xfpm-settings.c:761 ../settings/xfpm-settings.c:948 #: ../settings/xfpm-settings.c:1410 -#, fuzzy msgid "Hibernate and suspend operations not supported" -msgstr "Opérations de mise en veille prolongée et de mise en veille non autorisées" +msgstr "Opérations de mise en veille prolongée et de mise en veille non supportées" #: ../settings/xfpm-settings.c:766 ../settings/xfpm-settings.c:953 #: ../settings/xfpm-settings.c:1415 @@ -245,18 +244,16 @@ msgid "Disable Display Power Management Signaling (DPMS), e.g don't attempt to s msgstr "Désactiver le DPMS, e.g. pour ne pas tenter l'extinction de l'écran ou sa mise en veille" #: ../settings/xfpm-settings.c:1319 -#, fuzzy msgid "Suspend operation not supported" -msgstr "Opération de mise en veille non autorisée" +msgstr "Opération de mise en veille non supportée" #: ../settings/xfpm-settings.c:1325 msgid "Suspend operation not permitted" msgstr "Opération de mise en veille non autorisée" #: ../settings/xfpm-settings.c:1331 -#, fuzzy msgid "Hibernate operation not supported" -msgstr "Opération de mise en veille prolongée non autorisée" +msgstr "Opération de mise en veille prolongée non supportée" #: ../settings/xfpm-settings.c:1336 msgid "Hibernate operation not permitted" @@ -294,7 +291,7 @@ msgstr "Socket du gestionnaire de paramètres" msgid "SOCKET ID" msgstr "ID SOCKET" -#: ../settings/xfpm-settings-main.c:89 ../src/xfpm-main.c:291 +#: ../settings/xfpm-settings-main.c:89 ../src/xfpm-main.c:286 #: ../src/xfpm-power-info.c:948 #, c-format msgid "Type '%s --help' for usage." @@ -308,7 +305,7 @@ msgstr "Impossible de charger la configuration, les paramètres par défauts ser msgid "Unable to connect to Xfce Power Manager" msgstr "Échec au chargement du gestionnaire d'alimentation Xfce" -#: ../settings/xfpm-settings-main.c:190 ../src/xfpm-main.c:331 +#: ../settings/xfpm-settings-main.c:190 ../src/xfpm-main.c:326 #, c-format msgid "Xfce power manager is not running" msgstr "Le gestionnaire d'alimentation Xfce n'est pas lancé" @@ -355,9 +352,8 @@ msgid "Quit" msgstr "Quitter" #: ../src/xfpm-power.c:422 -#, fuzzy msgid "All running instances of the power manager will exit" -msgstr "Gestionnaire d'alimentation Xfce" +msgstr "Toutes les instances en fonctionnement du gestionnaire d'énergie vont quitter" #: ../src/xfpm-power.c:424 msgid "Quit Xfce power manager?" @@ -365,7 +361,6 @@ msgstr "Quitter le gestionnaire d'alimentation Xfce" #. Power information #: ../src/xfpm-power.c:494 ../src/xfpm-power-info.c:818 -#, fuzzy msgid "Power Information" msgstr "Information de la batterie" @@ -456,9 +451,8 @@ msgid "Lithium polymer" msgstr "Lithium polymère" #: ../src/xfpm-power-common.c:159 -#, fuzzy msgid "Lithium iron phosphate" -msgstr "Lithium ion" +msgstr "Lithium phosphate de fer" #: ../src/xfpm-power-common.c:161 msgid "Lead acid" @@ -644,133 +638,119 @@ msgstr "Faux" #: ../src/xfpm-main.c:113 #, c-format -msgid "With HAL support\n" -msgstr "Avec le support de HAL\n" - -#: ../src/xfpm-main.c:115 -#, c-format -msgid "Without HAL support\n" -msgstr "Sans support de HAL\n" - -#: ../src/xfpm-main.c:118 -#, c-format msgid "With policykit support\n" msgstr "Avec le support de po
[Xfce4-commits] l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to c07ba78d750e994ada61336c314df1003abb5694 (commit) from 3be02d94c84c3b541dc94c0056f5ccbf8a96e9f1 (commit) commit c07ba78d750e994ada61336c314df1003abb5694 Author: Xavier Devlamynck Date: Sun Jan 30 10:34:20 2011 +0100 l10n: Updated French (fr) translation to 100% New status: 133 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 166 - 1 files changed, 87 insertions(+), 79 deletions(-) diff --git a/po/fr.po b/po/fr.po index da26edf..4e32602 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 04:04+\n" +"POT-Creation-Date: 2011-01-30 05:05+\n" "PO-Revision-Date: 2010-02-11 15:08+0100\n" "Last-Translator: Douart Patrick \n" "Language-Team: French \n" @@ -70,7 +70,7 @@ msgstr "WebDAV" msgid "WebDAV (secure)" msgstr "WebDAV (sécurisé)" -#: ../src/common.c:93 ../src/window.c:1371 +#: ../src/common.c:93 ../src/window.c:1395 msgid "Network" msgstr "Réseau" @@ -96,8 +96,8 @@ msgid "A simple frontend to easily connect/mount to local and remote filesystems msgstr "Une interface simple pour facilement connecter/monter des systèmes de fichiers locaux et distants" #: ../src/window.c:430 -msgid "Copyright 2008-2010 Enrico Tröger" -msgstr "Copyright 2008-2009 Enrico Tröger" +msgid "Copyright 2008-2011 Enrico Tröger" +msgstr "Copyright 2008-2011 Enrico Tröger" #: ../src/window.c:433 msgid "translator-credits" @@ -112,131 +112,135 @@ msgstr "Gigolo peut utiliser les protocoles suivants fournis par GVfs :" msgid "The command '%s' failed" msgstr "La commande '%s' a échoué." -#: ../src/window.c:563 ../src/window.c:690 ../src/bookmarkeditdialog.c:214 -#: ../src/bookmarkeditdialog.c:233 ../src/bookmarkeditdialog.c:246 -#: ../src/bookmarkeditdialog.c:257 ../src/bookmarkeditdialog.c:268 +#: ../src/window.c:563 ../src/window.c:700 ../src/bookmarkeditdialog.c:220 +#: ../src/bookmarkeditdialog.c:239 ../src/bookmarkeditdialog.c:252 +#: ../src/bookmarkeditdialog.c:263 ../src/bookmarkeditdialog.c:274 msgid "Error" msgstr "Erreur" -#: ../src/window.c:1157 +#: ../src/window.c:613 +msgid "Edit _Bookmark" +msgstr "Modifier un _Favori" + +#: ../src/window.c:615 ../src/window.c:1189 ../src/browsenetworkpanel.c:453 +#: ../src/browsenetworkpanel.c:497 +msgid "Create _Bookmark" +msgstr "Créer un _signet" + +#: ../src/window.c:1181 msgid "_File" msgstr "_Fichier" -#: ../src/window.c:1158 +#: ../src/window.c:1182 msgid "_Edit" msgstr "_Éditer" -#: ../src/window.c:1159 +#: ../src/window.c:1183 msgid "_Actions" msgstr "_Actions" -#: ../src/window.c:1160 +#: ../src/window.c:1184 msgid "_View" msgstr "Affi_chage" -#: ../src/window.c:1161 +#: ../src/window.c:1185 msgid "_Help" msgstr "A_ide" -#: ../src/window.c:1165 ../src/browsenetworkpanel.c:453 -#: ../src/browsenetworkpanel.c:497 -msgid "Create _Bookmark" -msgstr "Créer un _signet" - -#: ../src/window.c:1167 +#: ../src/window.c:1191 msgid "_Edit Bookmarks" msgstr "_Modifier les signets" -#: ../src/window.c:1168 +#: ../src/window.c:1192 msgid "Open the bookmark manager to add, edit or delete bookmarks" msgstr "Ouvrir le gestionnaire de signets pour ajouter, modifier ou supprimer des signets" -#: ../src/window.c:1172 +#: ../src/window.c:1196 msgid "Disconnect the selected resource" msgstr "Déconnecter la ressource sélectionnée" -#: ../src/window.c:1174 +#: ../src/window.c:1198 msgid "Open the selected resource with a file manager" msgstr "Ouvrir la ressource sélectionnée avec un gestionnaire de fichiers" -#: ../src/window.c:1175 +#: ../src/window.c:1199 msgid "Copy _URI" msgstr "Copier l'_URI" -#: ../src/window.c:1176 +#: ../src/window.c:1200 msgid "Quit Gigolo" msgstr "Quitter Gigolo" -#: ../src/window.c:1177 +#: ../src/window.c:1201 msgid "Online Help" msgstr "Aide en ligne" -#: ../src/window.c:1178 +#: ../src/window.c:1202 msgid "Supported Protocols" msgstr "Protocoles pris en charge" -#: ../src/window.c:1184 +#: ../src/window.c:1208 msgid "Side _Panel" msgstr "_Panneau latéral" -#: ../src/window.c:1186 +#: ../src/window.c:1210 msgid "_Toolbar" msgstr "Barre d'ou_tils" -#: ../src/window.c:1188 +#: ../src/window.c:1212 msgid "Status _Icon" msgstr "_Icône d'état" -#: ../src/window.c:1194 +#: ../src/window.c:1218 msgid "View as _Symbols" msgstr "Vue en _icônes" -#: ../src/window.c:1195 +#: ../src/window.c:1219 msgid "View as _Detailed List" msgstr "Vue en liste _détaillée" -#: ../src/window.c:1201 +#: ../src/window.c:1225 msgid "_Bookmarks" msgstr "_Signets" -#: ../src/window.c:1201 +#: ../src/window.c:1225 msgid "Choose a bookmark to connect to" msgstr "Choisissez un signet auquel se connecter" -#: ../src/window.c:1275 +#: ../src/window.c:1299 msgid "Connected"
[Xfce4-commits] l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to e328866cc38c150cfaa5db06f98c0e6f106b7d65 (commit) from c8bd312b0a8576d5dccfa30f3f4160945499723a (commit) commit e328866cc38c150cfaa5db06f98c0e6f106b7d65 Author: Xavier Devlamynck Date: Sun Jan 30 10:32:34 2011 +0100 l10n: Updated French (fr) translation to 100% New status: 25 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 62 +++--- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/po/fr.po b/po/fr.po index 58545b0..0af5f0c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,63 +2,64 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-cpufreq-plugin 0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-31 14:25+0900\n" +"POT-Creation-Date: 2011-01-30 05:06+\n" "PO-Revision-Date: 2006-09-19 21:19+0100\n" "Last-Translator: Florian Rivoal \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "X-Poedit-Language: French\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../panel-plugin/xfce4-cpufreq-configure.c:103 +#: ../panel-plugin/xfce4-cpufreq-configure.c:110 msgid "Configure CPU Frequency Monitor" msgstr "Moniteur de la fréquence du processeur" -#: ../panel-plugin/xfce4-cpufreq-configure.c:105 +#: ../panel-plugin/xfce4-cpufreq-configure.c:112 msgid "Configure the CPU frequency plugin" msgstr "Configurer le plugin de fréquence du processeur" -#: ../panel-plugin/xfce4-cpufreq-configure.c:122 +#: ../panel-plugin/xfce4-cpufreq-configure.c:129 msgid "Monitor" msgstr "Moniteur" -#: ../panel-plugin/xfce4-cpufreq-configure.c:137 +#: ../panel-plugin/xfce4-cpufreq-configure.c:144 msgid "Timeout Interval:" msgstr "Intervalle de rafraichissement :" -#: ../panel-plugin/xfce4-cpufreq-configure.c:153 +#: ../panel-plugin/xfce4-cpufreq-configure.c:160 msgid "Panel" msgstr "Tableau de bord" -#: ../panel-plugin/xfce4-cpufreq-configure.c:170 +#: ../panel-plugin/xfce4-cpufreq-configure.c:177 msgid "Display CPU:" msgstr "Afficher le processeur :" #. check buttons for display widgets in panel -#: ../panel-plugin/xfce4-cpufreq-configure.c:189 +#: ../panel-plugin/xfce4-cpufreq-configure.c:196 msgid "Show frame" msgstr "Afficher le cadre" -#: ../panel-plugin/xfce4-cpufreq-configure.c:194 +#: ../panel-plugin/xfce4-cpufreq-configure.c:201 msgid "Show CPU icon" msgstr "Afficher l'icône" -#: ../panel-plugin/xfce4-cpufreq-configure.c:199 +#: ../panel-plugin/xfce4-cpufreq-configure.c:206 msgid "Show CPU frequency" msgstr "Afficher la fréquence du processeur" -#: ../panel-plugin/xfce4-cpufreq-configure.c:204 +#: ../panel-plugin/xfce4-cpufreq-configure.c:211 msgid "Show CPU governor" msgstr "Afficher le profil de processeur" -#: ../panel-plugin/xfce4-cpufreq-linux.c:412 +#: ../panel-plugin/xfce4-cpufreq-linux.c:413 msgid "" "Your system does not support cpufreq.\n" "The applet only shows the current cpu frequency" @@ -66,56 +67,55 @@ msgstr "" "Votre système ne prend pas en charge cpufreq.\n" "Affichage de la fréquence du processeur uniquement" -#: ../panel-plugin/xfce4-cpufreq-overview.c:64 +#: ../panel-plugin/xfce4-cpufreq-overview.c:65 msgid "Scaling driver:" -msgstr "" +msgstr "Pilote d'ajustement:" -#: ../panel-plugin/xfce4-cpufreq-overview.c:70 +#: ../panel-plugin/xfce4-cpufreq-overview.c:71 #, c-format msgid "No scaling driver available" -msgstr "" +msgstr "Aucun pilote d'ajustement disponible" -#: ../panel-plugin/xfce4-cpufreq-overview.c:81 +#: ../panel-plugin/xfce4-cpufreq-overview.c:82 msgid "Available frequencies:" msgstr "Fréquences disponibles :" -#: ../panel-plugin/xfce4-cpufreq-overview.c:136 +#: ../panel-plugin/xfce4-cpufreq-overview.c:137 msgid "Available governors:" msgstr "Profils disponibles :" -#: ../panel-plugin/xfce4-cpufreq-overview.c:159 +#: ../panel-plugin/xfce4-cpufreq-overview.c:160 msgid "Current governor:" msgstr "Profil actuel :" -#: ../panel-plugin/xfce4-cpufreq-overview.c:194 +#: ../panel-plugin/xfce4-cpufreq-overview.c:195 msgid "CPU Information" msgstr "Information sur le processeur" -#: ../panel-plugin/xfce4-cpufreq-overview.c:201 +#: ../panel-plugin/xfce4-cpufreq-overview.c:202 msgid "An overview of all the CPUs in the system" msgstr "Un aperçu de tous les processeurs dans le système" -#: ../panel-plugin/xfce4-cpufreq-plugin.c:77 +#: ../panel-plugin/xfce4-cpufreq-plugin.c:97 #, c-format msgid "%d cpu available" msgid_plural "%d cpus available" msgstr[0] "%d processeur disponible" msgstr[1] "%d processeurs disponibles" -#: ../panel-plugin/xfce4-cpufreq-plugin.c:79 +#: ../panel-plugin/xfce4-cpufreq-plugin.c:99 msgid "
[Xfce4-commits] l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to c4d8e6b690f301762da0076e6d6c522012a3e23d (commit) from 7c5e6380ad8b47165baf57a977f9912ebb753a71 (commit) commit c4d8e6b690f301762da0076e6d6c522012a3e23d Author: Xavier Devlamynck Date: Sun Jan 30 10:23:48 2011 +0100 l10n: Updated French (fr) translation to 100% New status: 258 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index ccc16b0..57a9955 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the xfce-weather-plugin package. # Stephane Roy , 2005. # Maximilian Schleiss , 2006-2007. -# +# msgid "" msgstr "" "Project-Id-Version: xfce-weather-plugin 0.6.0\n" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2009-07-21 08:37+0100\n" "Last-Translator: Colin Leroy \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" #: ../panel-plugin/weather.c:110 msgid "V" @@ -71,7 +71,8 @@ msgstr "Échec à l'ouverture du lien : %s" msgid "Weather Update" msgstr "Mise-à-jour météo" -#. add refresh button to right click menu, for people who missed the middle mouse click feature +#. add refresh button to right click menu, for people who missed the middle +#. mouse click feature #: ../panel-plugin/weather.c:847 msgid "_Forecast" msgstr "_Prévision" @@ -229,7 +230,7 @@ msgstr "Impossible de recevoir des données (%s)" #: ../panel-plugin/weather-http.c:376 msgid "Negative content length" -msgstr "" +msgstr "Longueur du contenu négative" #. display warning #: ../panel-plugin/weather-http.c:401 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 455d79828ee646b8c811cdb6be72bc177113124d (commit) from 5710a6b0666040c20ba3d74d471624a1736b4069 (commit) commit 455d79828ee646b8c811cdb6be72bc177113124d Author: Cristian Marchi Date: Sun Jan 30 10:21:42 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 57 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 67 +- 1 files changed, 40 insertions(+), 27 deletions(-) diff --git a/po/it.po b/po/it.po index f95418b..6b4bb4e 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.6.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-23 17:03+\n" +"POT-Creation-Date: 2011-01-30 05:04+\n" "PO-Revision-Date: 2010-04-01 16:40+0100\n" "Last-Translator: Gianluca Foddis \n" "Language-Team: Italian \n" @@ -19,7 +19,7 @@ msgstr "" #: ../src/xfce4-notes.desktop.in.h:1 #: ../src/xfce4-notes-autostart.desktop.in.h:1 #: ../src/xfce4-notes-plugin.desktop.in.in.h:1 -#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:611 +#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:741 msgid "Ideal for your quick notes" msgstr "Ideale per le proprie annotazioni" @@ -27,111 +27,124 @@ msgstr "Ideale per le proprie annotazioni" #: ../src/xfce4-notes.desktop.in.h:2 #: ../src/xfce4-notes-autostart.desktop.in.h:2 #: ../src/xfce4-notes-plugin.desktop.in.in.h:2 -#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:183 -#: ../lib/application.vala:210 ../lib/application.vala:609 -#: ../lib/window.vala:84 ../lib/window.vala:159 ../lib/window.vala:884 +#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:184 +#: ../lib/application.vala:211 ../lib/application.vala:739 +#: ../lib/window.vala:85 ../lib/window.vala:176 ../lib/window.vala:913 #: ../src/xfce4-notes-settings.c:99 ../src/main-panel-plugin-47.vala:46 #: ../src/main-panel-plugin.vala:45 ../src/main-status-icon.vala:34 #: ../src/main-status-icon.vala:115 msgid "Notes" msgstr "Nota" -#: ../lib/application.vala:118 ../lib/application.vala:133 +#: ../lib/application.vala:119 ../lib/application.vala:134 #: ../src/xfce4-notes-settings.c:223 ../src/xfce4-notes-settings.c:231 msgid "Select notes path" msgstr "Selezione del percorso per le note" -#: ../lib/application.vala:119 +#: ../lib/application.vala:120 #, c-format msgid "The selected directory (%s) for the new notes path already contains files. You must select or create an empty directory." msgstr "La cartella «%s» selezionata per il percorso delle nuove note contiene già dei file. È necessario creare o selezionare una cartella vuota." -#: ../lib/application.vala:134 +#: ../lib/application.vala:135 #, c-format msgid "Unable to select directory for new notes path: %s" msgstr "Impossibile selezionare la cartella per il percorso delle nuove note: %s" # messo al singolare dopo aver visto sull'interfaccia -#: ../lib/application.vala:187 ../lib/window.vala:887 +#: ../lib/application.vala:188 ../lib/window.vala:916 #, c-format msgid "Notes %d" msgstr "Nota %d" -#: ../lib/application.vala:411 +#: ../lib/application.vala:428 msgid "Rename group" msgstr "Rinomina gruppo" -#: ../lib/application.vala:432 ../lib/window.vala:1009 +#: ../lib/application.vala:449 ../lib/window.vala:1038 #, c-format msgid "The name %s is already in use" msgstr "Il nome %s è già in uso" -#: ../lib/application.vala:458 +#: ../lib/application.vala:478 msgid "Are you sure you want to delete this group?" msgstr "Cancellare davvero questo gruppo?" -#: ../lib/application.vala:515 +#: ../lib/application.vala:522 +#, c-format +msgid "The group \"%s\" has been modified on the disk" +msgstr "Il gruppo \"%s\" è stato modificato sul disco" + +#: ../lib/application.vala:525 +msgid "Do you want to reload the group?" +msgstr "Ricaricare il gruppo?" + +#: ../lib/application.vala:645 #, c-format msgid "The name \"%s\" is invalid." msgstr "Il nome %s non è valido." -#: ../lib/application.vala:516 +#: ../lib/application.vala:646 #, c-format msgid "The invalid characters are: %s" msgstr "I caratteri non validi sono: %s" -#: ../lib/application.vala:573 +#: ../lib/application.vala:703 msgid "Unable to open the settings dialog" msgstr "Impossibile aprire la finestra delle impostazioni" -#: ../lib/application.vala:618 +#: ../lib/application.vala:748 msgid "translator-credits" msgstr "Cristian Marchi , 2009" -#: ../lib/application.vala:653 ../lib/window.vala:751 +#: ../lib/application.vala:783 ../lib/window.vala:780 msgid "_Add a new group" msgstr "_Aggiungi un nuovo gruppo" -#: ../lib/window.vala:209 +#: ../lib/window.vala:226 msgid "Menu" msgstr "Menu" -#: ../lib/window.vala:246 +#: ../lib/window.vala:255 +msgid "Refresh notes" +msgstr "Aggiorna note" + +#: ../lib
[Xfce4-commits] l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to 2bd24477bc37ef3428ad5b168344fa577f885e2c (commit) from fee9c755c0263386f2a10c3b0b9b192c7a0e (commit) commit 2bd24477bc37ef3428ad5b168344fa577f885e2c Author: Xavier Devlamynck Date: Sun Jan 30 10:21:39 2011 +0100 l10n: Updated French (fr) translation to 100% New status: 110 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 24 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/po/fr.po b/po/fr.po index b91f3ae..5e46a98 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-dict\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 10:02+\n" +"POT-Creation-Date: 2011-01-30 05:03+\n" "PO-Revision-Date: 2010-07-27 21:13+0100\n" "Last-Translator: Durand-Favreau Arnaud \n" "Language-Team: French \n" @@ -246,8 +246,8 @@ msgstr "Erreur" msgid "warning" msgstr "avertissement" -#: ../lib/dictd.c:379 ../lib/dictd.c:685 ../lib/dictd.c:694 ../lib/dictd.c:777 -#: ../lib/dictd.c:786 +#: ../lib/dictd.c:379 ../lib/dictd.c:698 ../lib/dictd.c:707 ../lib/dictd.c:795 +#: ../lib/dictd.c:804 msgid "Could not connect to server." msgstr "Impossible de se connecter au serveur." @@ -259,9 +259,9 @@ msgstr "Le serveur n'est pas prêt." msgid "Invalid dictionary specified. Please check your preferences." msgstr "Dictionnaire incorrect. Veuillez vérifier les préférences." -#: ../lib/dictd.c:400 ../lib/dictd.c:456 ../lib/dictd.c:808 -msgid "Unknown error while quering the server." -msgstr "Erreur inconnue pendant la requête au serveur." +#: ../lib/dictd.c:400 ../lib/dictd.c:456 ../lib/dictd.c:829 +msgid "Unknown error while querying the server." +msgstr "Erreur inconnue lors d'une requête au serveur." #: ../lib/dictd.c:415 msgid "Dictionary Results:" @@ -290,21 +290,21 @@ msgid_plural "%d definitions found." msgstr[0] "%d définition trouvée." msgstr[1] "%d définitions trouvées." -#: ../lib/dictd.c:656 +#: ../lib/dictd.c:669 #, c-format msgid "Querying %s..." msgstr "Requête à %s..." -#: ../lib/dictd.c:712 +#: ../lib/dictd.c:728 msgid "An error occured while querying server information." msgstr "Une erreur est survenue lors de la demande d'informations au serveur." -#: ../lib/dictd.c:723 +#: ../lib/dictd.c:741 #, c-format msgid "Server Information for \"%s\"" msgstr "Informations pour le serveur \"%s\"" -#: ../lib/dictd.c:803 +#: ../lib/dictd.c:824 msgid "The server doesn't offer any databases." msgstr "Le serveur ne fournit aucune base de données." @@ -341,8 +341,8 @@ msgid "Xfce4 Dictionary" msgstr "Dictionnaire Xfce4" #: ../lib/gui.c:852 -msgid "Copyright © 2006-2010 Enrico Tröger" -msgstr "Copyright © 2006-2010 Enrico Tröger" +msgid "Copyright © 2006-2011 Enrico Tröger" +msgstr "Copyright © 2006-2011 Enrico Tröger" #: ../lib/gui.c:855 msgid "translator-credits" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to c76e638a989e236bb4e4a2873eb96592ab0e0252 (commit) from 4bd2f0a32faf47f7f0ee1ece743ec07519a0debc (commit) commit c76e638a989e236bb4e4a2873eb96592ab0e0252 Author: Xavier Devlamynck Date: Sun Jan 30 10:17:05 2011 +0100 l10n: Updated French (fr) translation to 100% New status: 116 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 74 ++--- 1 files changed, 27 insertions(+), 47 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7f6a985..306bb6d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,19 +2,19 @@ # Copyright (C) 2007 Benedikt Meurer. # This file is distributed under the same license as the thunar-volman package. # Maximilian Schleiss , 2007-2008. -# +# msgid "" msgstr "" "Project-Id-Version: thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" +"POT-Creation-Date: 2010-11-07 14:39+0100\n" "PO-Revision-Date: 2008-11-29 23:50+0100\n" "Last-Translator: Maximilian Schleiss \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" #: ../thunar-volman/main.c:59 msgid "The syfs path of the newly added device" @@ -31,30 +31,28 @@ msgid "Print version information and exit" msgstr "Afficher la version et quitter" #. setup application name -#: ../thunar-volman/main.c:93 +#: ../thunar-volman/main.c:96 msgid "Thunar Volume Manager" msgstr "Gestionnaire de volume Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:135 msgid "All rights reserved." msgstr "Tous droits réservés." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:136 #, c-format msgid "Please report bugs to <%s>." msgstr "Veuillez envoyer vos rapports de bogues à <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:190 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Il n'y a pas de périphérique correspondant au chemin sysfs \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:202 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" -"Spécifier le chemin sysfs des nouveaux périphériques avec l'iption --device-" -"added" +msgstr "Spécifier le chemin sysfs des nouveaux périphériques avec l'iption --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -98,11 +96,8 @@ msgid "A photo card has been detected" msgstr "Une carte mémoire a été détectée." #: ../thunar-volman/tvm-block-device.c:275 -msgid "" -"There are photos on the card. Would you like to add these photos to your " -"album?" -msgstr "" -"Des photos se trouvent sur la carte. Voulez-vous les ajouter à votre album ?" +msgid "There are photos on the card. Would you like to add these photos to your album?" +msgstr "Des photos se trouvent sur la carte. Voulez-vous les ajouter à votre album ?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -370,9 +365,8 @@ msgstr "Scripts ruby" msgid "Shell Scripts" msgstr "Scripts shell" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Stockage" @@ -417,9 +411,8 @@ msgstr "Commande pour les CDs _données :" msgid "Command for A_udio CDs:" msgstr "Commande pour les CDs A_udio :" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimédia" @@ -463,9 +456,8 @@ msgstr "Lecteurs de musique portables" msgid "Play _music files when connected" msgstr "Écouter la _musique à la connexion" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Caméras" @@ -478,9 +470,8 @@ msgstr "Caméras digitales" msgid "Import digital photographs when connected" msgstr "Importer les photos numériques à la connexion" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDAs" @@ -501,9 +492,8 @@ msgstr "Pocket PCs" msgid "Sync Pocket P_C devices when connected" msgstr "Synchroniser les périphériques Pocket PC une fois connectés" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -513,9 +503,8 @@ msgstr "Imprimantes" msgid "Automatically run a program when a _printer is connected" msgstr "Exécuter une application à la connexion d'une imprimante" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Périphériques d'entrée" @@ -525,18 +514,16 @@ msgid "Keyboards" msgstr "Clavier" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy -msgid "Automatically r
[Xfce4-commits] l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to 334c9848e683b04ec491d0f1f0bf3435a947e144 (commit) from bf0b286de8fba72745e8b7906d48449ba967835c (commit) commit 334c9848e683b04ec491d0f1f0bf3435a947e144 Author: Xavier Devlamynck Date: Sun Jan 30 10:15:43 2011 +0100 l10n: Updated French (fr) translation to 100% New status: 279 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index fa9034a..2b7791d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -817,9 +817,8 @@ msgid "Execute properties action" msgstr "Exécuter une propriété" #: ../tvp-svn-helper/main.c:196 -#, fuzzy msgid "Execute resolved action" -msgstr "Exécuter une extraction" +msgstr "Marquer comme résolu" #: ../tvp-svn-helper/main.c:202 msgid "Execute relocate action" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/xfce-4.8 to ee0924e491cb5eb17851fde5763d60d888d712fd (commit) from fe309fcd3e3cdf2ffe533e53bd092e52ff5ed74f (commit) commit ee0924e491cb5eb17851fde5763d60d888d712fd Author: Xavier Devlamynck Date: Sun Jan 30 10:13:20 2011 +0100 l10n: Updated French (fr) translation to 100% New status: 344 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 250 +++--- 1 files changed, 76 insertions(+), 174 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6a6c15d..c575004 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,26 +5,23 @@ # Collet Etienne , 2005. # Maximilian Schleiss , 2006-2009. # Jérôme Guelfucci , 2009 -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-panel 4.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:01+0100\n" +"POT-Creation-Date: 2011-01-30 05:29+\n" "PO-Revision-Date: 2011-01-16 12:45+0100\n" "Last-Translator: Durand-Favreau Arnaud \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" #: ../panel-desktop-handler.desktop.in.h:1 -msgid "" -"Add a new launcher to the panel based on the information of this desktop file" -msgstr "" -"Ajouter un nouveau lanceur dans le tableau de bord avec les informations de " -"ce fichier desktop" +msgid "Add a new launcher to the panel based on the information of this desktop file" +msgstr "Ajouter un nouveau lanceur dans le tableau de bord avec les informations de ce fichier desktop" #: ../panel-desktop-handler.desktop.in.h:2 msgid "Create Launcher on the panel" @@ -35,7 +32,7 @@ msgid "Customize the panel" msgstr "Modifier le tableau de bord" #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2247 #: ../migrate/main.c:84 msgid "Panel" msgstr "Tableau de bord" @@ -45,12 +42,8 @@ msgid "_Read Online" msgstr "_Lire en ligne" #: ../common/panel-utils.c:156 -msgid "" -"You can read the user manual online. This manual may however not exactly " -"match your panel version." -msgstr "" -"Vous pouvez lire le manuel en ligne. Cependant le manuel ne correspond pas " -"forcément à la version de votre tableau de bord." +msgid "You can read the user manual online. This manual may however not exactly match your panel version." +msgstr "Vous pouvez lire le manuel en ligne. Cependant le manuel ne correspond pas forcément à la version de votre tableau de bord." #: ../common/panel-utils.c:158 msgid "The user manual is not installed on your computer" @@ -71,9 +64,7 @@ msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?" #: ../libxfce4panel/xfce-panel-plugin.c:894 #: ../panel/panel-preferences-dialog.c:1051 msgid "If you remove the item from the panel, it is permanently lost." -msgstr "" -"Si vous supprimer le greffon du tableau de bord, il le sera de manière " -"permanente." +msgstr "Si vous supprimer le greffon du tableau de bord, il le sera de manière permanente." #. move item #: ../libxfce4panel/xfce-panel-plugin.c:1054 @@ -85,17 +76,17 @@ msgid "Pane_l" msgstr "Tableau de _bord" #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2259 msgid "Add _New Items..." msgstr "Ajouter des _greffons..." #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2270 msgid "Panel Pr_eferences..." msgstr "Pr_éférences du tableau de bord..." #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2286 msgid "Log _Out" msgstr "Dé_connexion" @@ -104,7 +95,6 @@ msgid "Show the 'Panel Preferences' dialog" msgstr "Afficher la fenêtre de préférences du tableau de bord" #: ../panel/main.c:78 ../panel/main.c:79 -#, fuzzy msgid "PANEL-NUMBER" msgstr "PANEL-NUMBER" @@ -121,7 +111,6 @@ msgid "Add a new plugin to the panel" msgstr "Ajouter un nouveau greffon au tableau de bord" #: ../panel/main.c:81 -#, fuzzy msgid "PLUGIN-NAME" msgstr "PLUGIN-NAME" @@ -143,12 +132,12 @@ msgstr "Afficher les informations sur la version et quitter" #. parse context options #: ../panel/main.c:240 msgid "[ARGUMENTS...]" -msgstr "" +msgstr "[ARGUMENTS...]" #: ../panel/main.c:247 #, c-format msgid "Type \"%s --help\" for usage." -msgstr "" +msgstr "Taper \"%s --help\" pour l'aide." #: ../panel/main.c:266 msgid "The Xfce development team. All rights reserved." @@ -197,50 +186,39 @@ msgid "Failed to send D-Bus message" msgstr "Échec à l'envoi d'un message D-Bus"