[Xfce4-commits] exo:master Rename Terminal to xfce4-terminal.
Updating branch refs/heads/master to 9806c7304386ac77350867f3759366ebcf39c1b4 (commit) from 11e0b9d472b26cd1df0f286f5c4431b146636108 (commit) commit 9806c7304386ac77350867f3759366ebcf39c1b4 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 09:05:11 2012 +0100 Rename Terminal to xfce4-terminal. exo-helper/helpers/Makefile.am |3 ++- desktop.in.in = xfce4-terminal.desktop.in.in} |4 ++-- po/POTFILES.in |2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am index f49ccbc..a0139cb 100644 --- a/exo-helper/helpers/Makefile.am +++ b/exo-helper/helpers/Makefile.am @@ -4,7 +4,6 @@ defaults_DATA = helpers.rc desktopdir = $(datadir)/xfce4/helpers desktop_in_in_files = \ - Terminal.desktop.in.in \ Thunar.desktop.in.in\ aterm.desktop.in.in \ balsa.desktop.in.in \ @@ -39,7 +38,9 @@ desktop_in_in_files = \ thunderbird.desktop.in.in \ urxvt.desktop.in.in \ w3m.desktop.in.in \ + xfce4-terminal.desktop.in.in\ xterm.desktop.in.in + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) %.desktop.in: %.desktop.in.in diff --git a/exo-helper/helpers/Terminal.desktop.in.in b/exo-helper/helpers/xfce4-terminal.desktop.in.in similarity index 70% rename from exo-helper/helpers/Terminal.desktop.in.in rename to exo-helper/helpers/xfce4-terminal.desktop.in.in index 1979f59..b1c776f 100644 --- a/exo-helper/helpers/Terminal.desktop.in.in +++ b/exo-helper/helpers/xfce4-terminal.desktop.in.in @@ -1,10 +1,10 @@ [Desktop Entry] Version=1.0 -Icon=Terminal +Icon=utility-terminal Type=X-XFCE-Helper _Name=Xfce Terminal StartupNotify=true -X-XFCE-Binaries=Terminal;xterminal;xfce4-terminal; +X-XFCE-Binaries=xfce4-terminal;Terminal;xterminal; X-XFCE-Category=TerminalEmulator X-XFCE-Commands=%B; X-XFCE-CommandsWithParameter=%B -x %s; diff --git a/po/POTFILES.in b/po/POTFILES.in index 524f728..3f0e561 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -42,7 +42,6 @@ exo-helper/exo-helper-utils.c exo-helper/exo-helper.c exo-helper/exo-preferred-applications.desktop.in exo-helper/main.c -exo-helper/helpers/Terminal.desktop.in.in exo-helper/helpers/Thunar.desktop.in.in exo-helper/helpers/aterm.desktop.in.in exo-helper/helpers/balsa.desktop.in.in @@ -77,6 +76,7 @@ exo-helper/helpers/sylpheed.desktop.in.in exo-helper/helpers/thunderbird.desktop.in.in exo-helper/helpers/urxvt.desktop.in.in exo-helper/helpers/w3m.desktop.in.in +exo-helper/helpers/xfce4-terminal.desktop.in.in exo-helper/helpers/xterm.desktop.in.in exo-open/main.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master l10n: Updated Croatian (hr) translation to 62%
Updating branch refs/heads/master to 8bdfe254db9656ce4f632f0a5cba017fe82639c6 (commit) from 35a3e216a45a31d141663e48295449d47749452e (commit) commit 8bdfe254db9656ce4f632f0a5cba017fe82639c6 Author: Ivica Kolić ik...@yahoo.com Date: Thu Dec 27 09:48:39 2012 +0100 l10n: Updated Croatian (hr) translation to 62% New status: 154 messages complete with 0 fuzzies and 93 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 770 -- 1 files changed, 400 insertions(+), 370 deletions(-) diff --git a/po/hr.po b/po/hr.po index d211a25..b814c32 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,102 +2,129 @@ # Copyright (C) 2010 os-cillation e.K. # This file is distributed under the same license as the Terminal package. # Ivica Kolićik...@yahoo.com, 2010. -# +# msgid msgstr Project-Id-Version: Terminal 0.4.3\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-26 10:01+0100\n +POT-Creation-Date: 2012-12-27 06:21+\n PO-Revision-Date: 2010-06-11 23:18+0200\n Last-Translator: Ivica Kolić ik...@yahoo.com\n Language-Team: Croatian \n -Language: hr\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n -%10=4 (n%10010 || n%100=20) ? 1 : 2);\n +Language: hr\n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n -#: ../terminal/main.c:108 +#: ../colorschemes/black-on-white.theme.in.h:1 +msgid Black on White +msgstr + +#: ../colorschemes/dark-pastels.theme.in.h:1 +msgid Dark Pastels +msgstr + +#: ../colorschemes/green-on-black.theme.in.h:1 +msgid Green on Black +msgstr + +#: ../colorschemes/solarized-dark.theme.in.h:1 +msgid Solarized +msgstr + +#: ../colorschemes/tango.theme.in.h:1 +msgid Tango +msgstr + +#: ../colorschemes/white-on-black.theme.in.h:1 +msgid White on Black +msgstr + +#: ../colorschemes/xterm.theme.in.h:1 +msgid XTerm +msgstr XTerm + +#: ../terminal/main.c:105 msgid Usage: msgstr Upotreba -#: ../terminal/main.c:108 +#: ../terminal/main.c:105 msgid OPTION msgstr OPCIJA -#: ../terminal/main.c:113 +#: ../terminal/main.c:110 msgid General Options msgstr Osnovne opcije #. parameter of --default-display #. parameter of --display -#: ../terminal/main.c:115 ../terminal/main.c:141 +#: ../terminal/main.c:112 ../terminal/main.c:138 msgid display msgstr prikaz #. parameter of --default-working-directory #. parameter of --working-directory -#: ../terminal/main.c:117 ../terminal/main.c:132 +#: ../terminal/main.c:114 ../terminal/main.c:129 msgid directory msgstr direktorij -#: ../terminal/main.c:121 +#: ../terminal/main.c:118 msgid Window or Tab Separators msgstr Razdjelnici prozora ili kartica -#: ../terminal/main.c:126 +#: ../terminal/main.c:123 msgid Tab Options msgstr Opcije kartice #. parameter of --command -#: ../terminal/main.c:128 +#: ../terminal/main.c:125 msgid command msgstr naredba #. parameter of --title -#: ../terminal/main.c:130 +#: ../terminal/main.c:127 msgid title msgstr naslov -#: ../terminal/main.c:139 +#: ../terminal/main.c:136 msgid Window Options msgstr Opcije prozora #. parameter of --geometry -#: ../terminal/main.c:143 +#: ../terminal/main.c:140 msgid geometry msgstr geometrija #. parameter of --role -#: ../terminal/main.c:145 +#: ../terminal/main.c:142 msgid role msgstr #. parameter of --startup-id -#: ../terminal/main.c:147 +#: ../terminal/main.c:144 msgid string msgstr #. parameter of --icon -#: ../terminal/main.c:149 +#: ../terminal/main.c:146 msgid icon msgstr ikona -#: ../terminal/main.c:151 +#: ../terminal/main.c:148 #, c-format msgid See the %s man page for full explanation of the options above. msgstr Vidi %s man stranicu za puno objašnjenje gornjih opcija. -#: ../terminal/main.c:184 ../xfce4-terminal.desktop.in.h:1 +#: ../terminal/main.c:181 ../xfce4-terminal.desktop.in.h:2 msgid Xfce Terminal msgstr Xfce terminal -#: ../terminal/main.c:200 +#: ../terminal/main.c:197 msgid The Xfce development team. All rights reserved. msgstr Xfce razvojni tim. Sva prava pridržana. -#: ../terminal/main.c:201 +#: ../terminal/main.c:198 msgid Written by Benedikt Meurer be...@xfce.org msgstr Napisao Benedikt Meurer\r\n @@ -106,21 +133,21 @@ msgstr \r\n be...@xfce.org -#: ../terminal/main.c:202 +#: ../terminal/main.c:199 msgid and Nick Schermer n...@xfce.org. msgstr i Nick Schermer n...@xfce.org. -#: ../terminal/main.c:203 +#: ../terminal/main.c:200 #, c-format msgid Please report bugs to %s. msgstr MOlim,prijavite probleme na %s. -#: ../terminal/main.c:306 +#: ../terminal/main.c:303 #, c-format msgid Unable to register terminal service: %s\n msgstr Ne mogu registrirati terminalni servis: %s\n -#: ../terminal/terminal-app.c:601 +#: ../terminal/terminal-app.c:617 #, c-format msgid
[Xfce4-commits] parole:master l10n: Updated Croatian (hr) translation to 75%
Updating branch refs/heads/master to 03b6551d241a054d1cf324cac4eb6c275b35d728 (commit) from 78e7b79d86232d671095815d0dbcc967187ac7d6 (commit) commit 03b6551d241a054d1cf324cac4eb6c275b35d728 Author: Ivica Kolić ik...@yahoo.com Date: Thu Dec 27 09:50:51 2012 +0100 l10n: Updated Croatian (hr) translation to 75% New status: 155 messages complete with 0 fuzzies and 50 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 28 +++- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/po/hr.po b/po/hr.po index c425171..658544a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: parole\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-21 21:36+\n +POT-Creation-Date: 2012-12-27 06:00+\n PO-Revision-Date: 2012-12-13 11:03+0100\n Last-Translator: Ivica Kolić ik...@yahoo.com\n Language-Team: Hrvatski \n @@ -100,8 +100,8 @@ msgid Parole Media Player msgstr #: ../data/interfaces/parole.ui.h:20 -msgid Pl_ugins -msgstr Pr_iključci +msgid Plugins +msgstr Priključci #: ../data/interfaces/parole.ui.h:21 msgid Select Text Subtitles... @@ -642,7 +642,7 @@ msgstr Nepoznata pjesma msgid on msgstr -#: ../src/parole-player.c:1700 +#: ../src/parole-player.c:1700 ../src/plugins/notify/notify-provider.c:124 msgid Unknown Album msgstr Nepoznati album @@ -650,7 +650,7 @@ msgstr Nepoznati album msgid by msgstr -#: ../src/parole-player.c:1711 +#: ../src/parole-player.c:1711 ../src/plugins/notify/notify-provider.c:126 msgid Unknown Artist msgstr Nepoznati umjetnik @@ -835,6 +835,24 @@ msgstr Sve podržane datoteke msgid Playlist files msgstr Datoteke liste izvođenja +#: ../src/plugins/notify/notify-provider.c:129 +#: ../src/plugins/notify/notify-provider.c:132 +msgid ion/i +msgstr + +#: ../src/plugins/notify/notify-provider.c:129 +#: ../src/plugins/notify/notify-provider.c:132 +msgid iby/i +msgstr + +#: ../src/plugins/notify/notify.desktop.in.h:1 +msgid Notify +msgstr + +#: ../src/plugins/notify/notify.desktop.in.h:2 +msgid Show notifications for currently playing tracks +msgstr + #: ../src/plugins/tray/tray-provider.c:244 msgid Tray icon plugin msgstr ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] garcon:master Remove unmaintained translations.
Updating branch refs/heads/master to 10ec7a48c6ed5f73868ad37f60903d2379fa6780 (commit) from 7de8b5f48ae755c20a6578940f7230d623a570a0 (commit) commit 10ec7a48c6ed5f73868ad37f60903d2379fa6780 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 11:21:48 2012 +0100 Remove unmaintained translations. po/ku.po | 150 -- po/ms.po | 128 2 files changed, 0 insertions(+), 278 deletions(-) diff --git a/po/ku.po b/po/ku.po deleted file mode 100644 index f8ab870..000 --- a/po/ku.po +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Erdal Ronahi erdal.ron...@gmail.com, 2008. -msgid -msgstr -Project-Id-Version: libxfce4menu-0.1\n -Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 14:36+0100\n -PO-Revision-Date: 2008-11-01 18:31+0100\n -Last-Translator: Erdal Ronahi erdal.ron...@gmail.com\n -Language-Team: Kurdish ubuntu-l10n-...@lists.ubuntu.com\n -Language: ku\n -MIME-Version: 1.0\n -Content-Type: text/plain; charset=UTF-8\n -Content-Transfer-Encoding: 8bit\n -X-Generator: Lokalize 0.2\n -Plural-Forms: nplurals=2; plural=n != 1;\n - -#: ../data/xfce/xfce-accessories.directory.in.h:1 -msgid Accessories -msgstr - -#: ../data/xfce/xfce-accessories.directory.in.h:2 -msgid Common desktop tools and applications -msgstr - -#: ../data/xfce/xfce-development.directory.in.h:1 -msgid Development -msgstr - -#: ../data/xfce/xfce-development.directory.in.h:2 -msgid Software development tools -msgstr - -#: ../data/xfce/xfce-education.directory.in.h:1 -msgid Education -msgstr - -#: ../data/xfce/xfce-education.directory.in.h:2 -msgid Educational software -msgstr - -#: ../data/xfce/xfce-games.directory.in.h:1 -msgid Games -msgstr - -#: ../data/xfce/xfce-games.directory.in.h:2 -msgid Games, puzzles, and other fun software -msgstr - -#: ../data/xfce/xfce-graphics.directory.in.h:1 -msgid Graphics -msgstr - -#: ../data/xfce/xfce-graphics.directory.in.h:2 -msgid Graphics creation and manipulation applications -msgstr - -#: ../data/xfce/xfce-multimedia.directory.in.h:1 -msgid Audio and video players and editors -msgstr - -#: ../data/xfce/xfce-multimedia.directory.in.h:2 -msgid Multimedia -msgstr - -#: ../data/xfce/xfce-network.directory.in.h:1 -msgid Network -msgstr - -#: ../data/xfce/xfce-network.directory.in.h:2 -msgid Network applications and utilities -msgstr - -#: ../data/xfce/xfce-office.directory.in.h:1 -msgid Office -msgstr - -#: ../data/xfce/xfce-office.directory.in.h:2 -msgid Office and productivity applications -msgstr - -#: ../data/xfce/xfce-other.directory.in.h:1 -msgid Applications that don't fit into other categories -msgstr - -#: ../data/xfce/xfce-other.directory.in.h:2 -msgid Other -msgstr - -#: ../data/xfce/xfce-science.directory.in.h:1 -msgid Science -msgstr - -#: ../data/xfce/xfce-science.directory.in.h:2 -msgid Scientific software -msgstr - -#: ../data/xfce/xfce-screensavers.directory.in.h:1 -msgid Screensaver applets -msgstr - -#: ../data/xfce/xfce-screensavers.directory.in.h:2 -msgid Screensavers -msgstr - -#: ../data/xfce/xfce-settings.directory.in.h:1 -msgid Desktop and system settings applications -msgstr - -#: ../data/xfce/xfce-settings.directory.in.h:2 -msgid Settings -msgstr - -#: ../data/xfce/xfce-system.directory.in.h:1 -msgid System -msgstr - -#: ../data/xfce/xfce-system.directory.in.h:2 -msgid System tools and utilities -msgstr - -#: ../garcon/garcon-menu.c:698 -#, c-format -msgid File \%s\ not found -msgstr - -#: ../garcon/garcon-menu-parser.c:278 -#, fuzzy, c-format -msgid Could not load menu file data from %s: %s -msgstr Vekirina pbra hemanan libxfce4menu di %s de biserneket: %s - -#: ../garcon/garcon-menu-parser.c:284 -#, c-format -msgid Could not load menu file data from %s -msgstr - -#~ msgid XfceMenu: Display Menu Test -#~ msgstr XfceMenu: Testa Pek Nan Bide - -#~ msgid _Show menu -#~ msgstr Pek _nan bide - -#, fuzzy -#~ msgid Failed to locate the system menu -#~ msgstr Peeka bingehn a sepanan nehate dtin - -#~ msgid Failed to create the libxfce4menu item cache in %s. -#~ msgstr Afirandina pbra hmann libxfce4menu li %s biserneket. diff --git a/po/ms.po b/po/ms.po deleted file mode 100644 index 842f76b..000 --- a/po/ms.po +++ /dev/null @@ -1,128 +0,0 @@ -# Malay translations for garcon package. -# Copyright (C) 2007 Jannis Pohlmann. -# This file is distributed under the same license as the garcon package. -# Puretech terjemah.puret...@gmail.com, 2011. -# -msgid -msgstr -Project-Id-Version: libxfce4menu\n -Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-08-26 16:06+\n -PO-Revision-Date: 2011-08-27 04:03+0800\n -Last-Translator: Puretech terjemah.puret...@gmail.com\n -Language-Team: Malay \n -MIME-Version: 1.0\n -Content-Type: text/plain; charset=UTF-8\n -Content-Transfer-Encoding: 8bit\n -Plural-Forms:
[Xfce4-commits] libxfce4ui:master Remove unmaintained translations.
Updating branch refs/heads/master to 77ff43f265e35163c1b251e2d4b0e556e4e0b0cf (commit) from cff10b9438808637139e3e4ffed637fd9b752a82 (commit) commit 77ff43f265e35163c1b251e2d4b0e556e4e0b0cf Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 11:21:48 2012 +0100 Remove unmaintained translations. po/ku.po| 164 --- po/tl.po| 418 --- po/tl_PH.po | 163 --- 3 files changed, 0 insertions(+), 745 deletions(-) diff --git a/po/ku.po b/po/ku.po deleted file mode 100644 index 30d0dba..000 --- a/po/ku.po +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Erdal Ronahi erdal.ron...@gmail.com, 2008. -msgid -msgstr -Project-Id-Version: libxfce4ui\n -Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 16:03+0100\n -PO-Revision-Date: 2008-11-02 13:44+0100\n -Last-Translator: Erdal Ronahi erdal.ron...@gmail.com\n -Language-Team: Kurdish kde-i18n-...@lists.kde.org\n -Language: ku\n -MIME-Version: 1.0\n -Content-Type: text/plain; charset=UTF-8\n -Content-Transfer-Encoding: 8bit\n -X-Generator: Lokalize 0.2\n -Plural-Forms: nplurals=2; plural=n != 1;\n - -#: ../libxfce4ui/xfce-dialogs.c:69 -msgid Information -msgstr Agah - -#: ../libxfce4ui/xfce-dialogs.c:102 -msgid Warning -msgstr Hiyar - -#: ../libxfce4ui/xfce-dialogs.c:136 -msgid Error -msgstr ewt - -#: ../libxfce4ui/xfce-dialogs.c:187 -msgid Question -msgstr Pirs - -#: ../libxfce4ui/xfce-sm-client.c:1401 -msgid Session management client ID -msgstr - -#: ../libxfce4ui/xfce-sm-client.c:1401 -msgid ID -msgstr - -#: ../libxfce4ui/xfce-sm-client.c:1402 -msgid Disable session management -msgstr - -#: ../libxfce4ui/xfce-sm-client.c:1412 -msgid Session management options -msgstr - -#: ../libxfce4ui/xfce-sm-client.c:1413 -msgid Show session management options -msgstr - -#: ../libxfce4ui/xfce-sm-client.c:1589 -#, c-format -msgid Failed to connect to the session manager: %s -msgstr - -#: ../libxfce4ui/xfce-sm-client.c:1596 -#, c-format -msgid Session manager did not return a valid client id -msgstr - -#. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 -#, c-format -msgid -Working directory \%s\ does not exist. It won't be used when spawning \%s -\. -msgstr - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid -This shortcut is already being used for another window manager action. Which -action do you want to use? -msgstr - -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -#, c-format -msgid Use '%s' -msgstr - -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid Keep the other one -msgstr - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 -#, c-format -msgid -This shortcut is already being used for the command '%s'. Which action do -you want to use? -msgstr - -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#, c-format -msgid Keep '%s' -msgstr - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid -This shortcut is already being used by a window manager action. Which action -do you want to use? -msgstr - -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid Keep the window manager action -msgstr - -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 -#, c-format -msgid Conflicting actions for %s -msgstr - -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 -msgid This shortcut is already being used for something else. -msgstr - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 -msgid Window Manager Action Shortcut -msgstr - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid Action: -msgstr - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 -msgid Command Shortcut -msgstr - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid Command: -msgstr - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -msgid Shortcut -msgstr - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 -msgid Shortcut: -msgstr - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 -msgid Could not grab the keyboard. -msgstr - -#: ../glade/libxfce4ui.xml.in.h:1 -msgid Subtitle -msgstr - -#: ../glade/libxfce4ui.xml.in.h:2 -msgid Titled Dialog -msgstr - -#: ../glade/libxfce4ui.xml.in.h:3 -msgid Xfce 4 Widgets -msgstr diff --git a/po/tl.po b/po/tl.po deleted file mode 100644 index 5c7d241..000 --- a/po/tl.po +++ /dev/null @@ -1,418 +0,0 @@ -# Tagalog translation of libxfce4ui -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Charles Casuga charlescas...@gmail.com, 2011. -# -msgid -msgstr -Project-Id-Version: PACKAGE VERSION\n
[Xfce4-commits] tumbler:nick/cover-thumbnailer Remove unmaintained translations.
Updating branch refs/heads/nick/cover-thumbnailer to 6bf5a724fb233c8d10faeb37b3980c2155156526 (commit) from b8bf36f42de59d2c665a5ce2d21e578fd8b9cb3a (commit) commit 6bf5a724fb233c8d10faeb37b3980c2155156526 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 11:21:48 2012 +0100 Remove unmaintained translations. po/ms.po | 294 -- 1 files changed, 0 insertions(+), 294 deletions(-) diff --git a/po/ms.po b/po/ms.po deleted file mode 100644 index b1d3fc1..000 --- a/po/ms.po +++ /dev/null @@ -1,294 +0,0 @@ -# # Malay translation of the tumbler package. -# # Copyright (C) YEAR THE tumbler'S COPYRIGHT HOLDER -# # This file is distributed under the same license as the tumbler package. -# Puretech terjemah.puret...@gmail.com, 2011. -# -msgid -msgstr -Project-Id-Version: tumbler\n -Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-11-18 13:56+\n -PO-Revision-Date: 2011-11-19 02:04+0800\n -Last-Translator: Puretech terjemah.puret...@gmail.com\n -Language-Team: Malay \n -Language: \n -MIME-Version: 1.0\n -Content-Type: text/plain; charset=UTF-8\n -Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=1; plural=0\n - -#: ../tumblerd/tumbler-cache-service.c:413 -#, c-format -msgid Another thumbnail cache service is already running -msgstr Perkhidmatan cache lakaran kecil lain telah pun berjalan - -#: ../tumblerd/tumbler-group-scheduler.c:485 -#: ../tumblerd/tumbler-lifo-scheduler.c:421 -#, c-format -msgid No thumbnailer available for \%s\ -msgstr Tiada lakaran kecil didapati untuk \%s\ - -#: ../tumblerd/tumbler-lifecycle-manager.c:207 -msgid The thumbnailer service is shutting down -msgstr Servis lakaran kecil sedang ditutup - -#: ../tumblerd/tumbler-service.c:758 -#, c-format -msgid Another generic thumbnailer is already running -msgstr Perkhidmatan generik lakaran kenit lain telah pun berjalan - -#: ../tumblerd/tumbler-service.c:867 -msgid Unsupported thumbnail flavor requested -msgstr Meminta lakaran kecil yang tidak disokong - -#: ../tumblerd/tumbler-specialized-thumbnailer.c:461 -msgid Failed to call the specialized thumbnailer: timeout -msgstr Gagal memanggil lakaran.kecil khas: masa tamat - -#: ../tumblerd/tumbler-specialized-thumbnailer.c:470 -#, c-format -msgid Failed to call the specialized thumbnailer: %s -msgstr Gagal memanggil lakaran.kecil khas: %s - -#: ../tumblerd/tumbler-manager.c:489 ../tumblerd/tumbler-manager.c:895 -#, c-format -msgid Failed to load the file \%s\: %s -msgstr Gagal memuatkan fail \%s\: %s - -#: ../tumblerd/tumbler-manager.c:507 ../tumblerd/tumbler-manager.c:521 -#: ../tumblerd/tumbler-manager.c:535 -#, c-format -msgid Malformed section \%s\ in file \%s\: %s -msgstr Seksyen cacat \%s\ dalam fail \%s\: %s - -#: ../tumblerd/tumbler-manager.c:548 -#, c-format -msgid -Malformed section \%s\ in file \%s\: Mismatch between section name and -UriScheme/MimeType -msgstr -Seksyen cacat \%s\ dalam fail \%s\: Tidak sepadan antara nama seksyen -dan UriScheme/MimeType - -#: ../tumblerd/tumbler-manager.c:908 ../tumblerd/tumbler-manager.c:922 -#: ../tumblerd/tumbler-manager.c:936 -#, c-format -msgid Malformed file \%s\: %s -msgstr Fail cacat \%s\: %s - -#: ../tumblerd/tumbler-manager.c:962 -#, c-format -msgid Failed to determine last modified time of \%s\ -msgstr Gagal untuk menentukan masa terakhir ubahsuai \%s\ - -#: ../tumblerd/tumbler-manager.c:1863 -#, c-format -msgid Another thumbnailer manager is already running -msgstr Pengurus lakaran kecil lain sedang berjalan - -#. set the application name. Translators: Don't translate Tumbler. -#: ../tumblerd/main.c:83 -msgid Tumbler Thumbnailing Service -msgstr Servis Lakaran Kecil Tumbler - -#: ../tumblerd/main.c:98 -#, c-format -msgid Failed to connect to the D-Bus session bus: %s -msgstr Gagal menyambung ke sesi bus D-Bus: %s - -#: ../tumblerd/main.c:156 -#, c-format -msgid Failed to load specialized thumbnailers into the registry: %s -msgstr Gagal memuatkan lakaran kecil khas ke dalam daftar: %s - -#: ../tumblerd/main.c:173 -#, c-format -msgid Failed to start the thumbnail cache service: %s -msgstr Gagal memulakan servis cache lakaran kecil: %s - -#: ../tumblerd/main.c:190 -#, c-format -msgid Failed to start the thumbnailer manager: %s -msgstr Gagal memulakan pengurus lakaran kecil: %s - -#: ../tumblerd/main.c:207 -#, c-format -msgid Failed to start the thumbnailer service: %s -msgstr Gagal memulakan servis lakaran kecil: %s - -#: ../tumbler/tumbler-enum-types.c:49 -msgid Invalid format -msgstr Format tidak sah - -#: ../tumbler/tumbler-enum-types.c:50 -msgid PNG -msgstr PNG - -#: ../tumbler/tumbler-enum-types.c:71 -msgid RGB Colorspace -msgstr Ruang warna RGB - -#: ../tumbler/tumbler-cache-plugin.c:145 -#, c-format -msgid Cache plugin \%s\ lacks required symbols -msgstr Cache plugin \%s\ kekurangan simbol yang diperlukan - -#: ../tumbler/tumbler-cache-plugin.c:153 -#, c-format -msgid Failed to load the cache plugin \%s\: %s -msgstr Gagal
[Xfce4-commits] xfce4-mixer:master Do not assume a minimum volume of 0 in the keyboard shortcut handling
Updating branch refs/heads/master
to d87694483f47d69bd52320b125e5db85f9481cd4 (commit)
from 2a898d0ed8474a8258be4f9d384575d84b412474 (commit)
commit d87694483f47d69bd52320b125e5db85f9481cd4
Author: Guido Berhoerster guido+x...@berhoerster.name
Date: Wed Dec 26 18:40:23 2012 +0100
Do not assume a minimum volume of 0 in the keyboard shortcut handling
panel-plugin/xfce-mixer-plugin.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/xfce-mixer-plugin.c b/panel-plugin/xfce-mixer-plugin.c
index bc3f353..7600cb2 100644
--- a/panel-plugin/xfce-mixer-plugin.c
+++ b/panel-plugin/xfce-mixer-plugin.c
@@ -1076,13 +1076,13 @@ xfce_mixer_plugin_volume_key_pressed (const char
*keystring,
xfce_mixer_plugin_set_volume (mixer_plugin, new_volume);
xfce_mixer_plugin_update_volume (mixer_plugin, new_volume);
- /* Mute when volume reaches 0%, unmute if volume is raised from 0% */
- if (old_volume 0 new_volume == 0)
+ /* Mute when volume reaches the minimum, unmute if volume is raised from the
minimum */
+ if (old_volume mixer_plugin-track-min_volume new_volume ==
mixer_plugin-track-min_volume)
{
xfce_mixer_plugin_set_muted (mixer_plugin, TRUE);
xfce_mixer_plugin_update_muted (mixer_plugin, TRUE);
}
- else if (old_volume == 0 new_volume 0)
+ else if (old_volume == mixer_plugin-track-min_volume new_volume
mixer_plugin-track-min_volume)
{
xfce_mixer_plugin_set_muted (mixer_plugin, FALSE);
xfce_mixer_plugin_update_muted (mixer_plugin, FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mixer:master Refactor the handling of minimum volumes
Updating branch refs/heads/master
to 10d82e6eb52dd4f27db48386bf208c2157bc9e3d (commit)
from d87694483f47d69bd52320b125e5db85f9481cd4 (commit)
commit 10d82e6eb52dd4f27db48386bf208c2157bc9e3d
Author: Guido Berhoerster guido+x...@berhoerster.name
Date: Wed Dec 26 18:57:53 2012 +0100
Refactor the handling of minimum volumes
Move the logic that automatically mutes a track when the volume reaches
the minimun and unmutes a track when the volume is raised from the
minimum from the volume button widget into the plugin code.
panel-plugin/xfce-mixer-plugin.c | 22 ++
panel-plugin/xfce-volume-button.c | 24
2 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/panel-plugin/xfce-mixer-plugin.c b/panel-plugin/xfce-mixer-plugin.c
index 7600cb2..5562e80 100644
--- a/panel-plugin/xfce-mixer-plugin.c
+++ b/panel-plugin/xfce-mixer-plugin.c
@@ -864,18 +864,32 @@ static void
xfce_mixer_plugin_button_volume_changed (XfceMixerPlugin *mixer_plugin,
gdouble button_volume)
{
- gint volume;
+ gint old_volume;
+ gint new_volume;
g_return_if_fail (mixer_plugin != NULL);
g_return_if_fail (GST_IS_MIXER (mixer_plugin-card));
g_return_if_fail (GST_IS_MIXER_TRACK (mixer_plugin-track));
+ old_volume = xfce_mixer_plugin_get_volume (mixer_plugin);
/* Convert relative to absolute volume */
- volume = (gint) round (mixer_plugin-track-min_volume + (button_volume *
(mixer_plugin-track-max_volume - mixer_plugin-track-min_volume)));
+ new_volume = (gint) round (mixer_plugin-track-min_volume + (button_volume
* (mixer_plugin-track-max_volume - mixer_plugin-track-min_volume)));
- xfce_mixer_debug (button emitted 'volume-changed', new volume is %d
(%d%%), volume, (gint) round (button_volume * 100));
+ xfce_mixer_debug (button emitted 'volume-changed', new volume is %d
(%d%%), new_volume, (gint) round (button_volume * 100));
- xfce_mixer_plugin_set_volume (mixer_plugin, volume);
+ xfce_mixer_plugin_set_volume (mixer_plugin, new_volume);
+
+ /* Mute when volume reaches the minimum, unmute if volume is raised from the
minimum */
+ if (old_volume mixer_plugin-track-min_volume new_volume ==
mixer_plugin-track-min_volume)
+{
+ xfce_mixer_plugin_set_muted (mixer_plugin, TRUE);
+ xfce_mixer_plugin_update_muted (mixer_plugin, TRUE);
+}
+ else if (old_volume == mixer_plugin-track-min_volume new_volume
mixer_plugin-track-min_volume)
+{
+ xfce_mixer_plugin_set_muted (mixer_plugin, FALSE);
+ xfce_mixer_plugin_update_muted (mixer_plugin, FALSE);
+}
}
diff --git a/panel-plugin/xfce-volume-button.c
b/panel-plugin/xfce-volume-button.c
index 223701b..6877614 100644
--- a/panel-plugin/xfce-volume-button.c
+++ b/panel-plugin/xfce-volume-button.c
@@ -459,16 +459,8 @@ xfce_volume_button_scale_changed_value (XfceVolumeButton
*button,
if (fabs (new_value - old_value) VOLUME_EPSILON)
{
- /* Mute when volume reaches 0%, unmute if volume is raised from 0% */
- if (new_value VOLUME_EPSILON !button-is_muted !button-no_mute)
-xfce_volume_button_set_muted (button, TRUE);
- else if (old_value VOLUME_EPSILON button-is_muted
!button-no_mute)
-xfce_volume_button_set_muted (button, FALSE);
- else
-{
- /* Update the state of the button */
- xfce_volume_button_update (button);
-}
+ /* Update the state of the button */
+ xfce_volume_button_update (button);
/* Notify listeners of the new volume */
g_signal_emit_by_name (button, volume-changed, new_value);
@@ -789,16 +781,8 @@ xfce_volume_button_scroll_event (GtkWidget *widget,
new_value = gtk_adjustment_get_value (GTK_ADJUSTMENT (button-adjustment));
if (fabs (new_value - old_value) VOLUME_EPSILON)
{
- /* Mute when volume reaches 0%, unmute if volume is raised from 0% */
- if (new_value VOLUME_EPSILON !button-is_muted !button-no_mute)
-xfce_volume_button_set_muted (button, TRUE);
- else if (old_value VOLUME_EPSILON button-is_muted
!button-no_mute)
-xfce_volume_button_set_muted (button, FALSE);
- else
-{
- /* Update the state of the button */
- xfce_volume_button_update (button);
-}
+ /* Update the state of the button */
+ xfce_volume_button_update (button);
/* Notify listeners of the new volume */
g_signal_emit_by_name (button, volume-changed, new_value);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:nick/callgrinding Deleting branch nick/callgrinding
Deleting branch refs/heads/nick/callgrinding ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:jeromeg/keyboard-shortcuts Show shortcut label when editing a shortcut.
Updating branch refs/heads/jeromeg/keyboard-shortcuts to 0b39613666ee95df3dbba6a5c9d1470799104a34 (commit) from 993d61b8585607913b21af6b81f74cc94bcb9db5 (commit) commit 0b39613666ee95df3dbba6a5c9d1470799104a34 Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Dec 27 11:28:16 2012 +0100 Show shortcut label when editing a shortcut. dialogs/keyboard-settings/xfce-keyboard-settings.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c index 6880d95..a7529c8 100644 --- a/dialogs/keyboard-settings/xfce-keyboard-settings.c +++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c @@ -1084,12 +1084,14 @@ xfce_keyboard_settings_edit_button_clicked (XfceKeyboardSettings *settings) GtkWidget *command_dialog; gboolean finished; gboolean snotify; + gchar*shortcut_label; gchar*shortcut; gchar*command; gint response; /* Read row values */ gtk_tree_model_get (model, iter, + SHORTCUT_LABEL_COLUMN, shortcut_label, SHORTCUT_COLUMN, shortcut, COMMAND_COLUMN, command, SNOTIFY_COLUMN, snotify, @@ -1098,7 +1100,7 @@ xfce_keyboard_settings_edit_button_clicked (XfceKeyboardSettings *settings) DBG (Edit shortcut %s / command %s, shortcut, command); /* Create command dialog */ - command_dialog = command_dialog_new (shortcut, command, snotify); + command_dialog = command_dialog_new (shortcut_label, command, snotify); /* Run command dialog until a valid (non-empty) command is entered or the dialog is cancelled */ do @@ -1187,6 +1189,7 @@ xfce_keyboard_settings_edit_button_clicked (XfceKeyboardSettings *settings) gtk_widget_destroy (shortcut_dialog); } + g_free (shortcut_label); g_free (shortcut); g_free (command); gtk_widget_destroy (command_dialog); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Slightly improve the matching and title generation.
Updating branch refs/heads/master
to a4c434bf0ed3d8079fc3c012cf08fb4ac3e70faa (commit)
from 1846f6c958bb50707ded2ef9e12072efa0116b5b (commit)
commit a4c434bf0ed3d8079fc3c012cf08fb4ac3e70faa
Author: Nick Schermer n...@xfce.org
Date: Wed Dec 12 17:45:36 2012 +0100
Slightly improve the matching and title generation.
plugins/cover-thumbnailer/cover-thumbnailer.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/cover-thumbnailer/cover-thumbnailer.c
b/plugins/cover-thumbnailer/cover-thumbnailer.c
index ab822e8..6716395 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer.c
@@ -40,7 +40,7 @@
#define SERIES_PATTERN\\b((?:s\\d{1,2}e\\d{1,2}|\\d{1,2}x\\d{1,2}))\\b
-#define ABBREV_PATTERN
\\b(\\w{1,}(?:rip|scr)|r5|hdtv|(?:480|720|1080)p|\\.(?:avi|mpe?g|mkv|ts))\\b
+#define ABBREV_PATTERN
\\b(\\w{1,}(?:rip|scr)|r5|hdtv|(?:480|720|1080)p|\(?:avi|mpe?g|mkv|ts)$)\\b
#define YEAR_PATTERN \\b(\\d{4})\\b
#define OMDBAPI_QUERY_URL http://www.omdbapi.com/?t=;
@@ -498,7 +498,7 @@ cover_thumbnailer_get_title (CoverThumbnailer *cover,
{
uchar = g_utf8_get_char (p);
if (g_unichar_isalnum (uchar)
- || uchar == '\'')
+ || uchar == '\'' || uchar == '!')
{
if (append_space)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Make the extension matching more global.
Updating branch refs/heads/master
to aff8b12f4b3a886575c427a598a9b36786643070 (commit)
from 1b4ed876beb42b3b84b850ce20f085056b7f754c (commit)
commit aff8b12f4b3a886575c427a598a9b36786643070
Author: Nick Schermer n...@xfce.org
Date: Wed Dec 12 21:52:46 2012 +0100
Make the extension matching more global.
Just match the last 3 word-chars at the end of the string, starting
with a dot.
plugins/cover-thumbnailer/cover-thumbnailer.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/plugins/cover-thumbnailer/cover-thumbnailer.c
b/plugins/cover-thumbnailer/cover-thumbnailer.c
index 39a01b8..3cbf9bf 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer.c
@@ -43,7 +43,7 @@
#define SERIES_PATTERN\\b((?:s\\d{1,2}e\\d{1,2}|\\d{1,2}x\\d{1,2}))\\b
-#define ABBREV_PATTERN
\\b(\\w{1,}(?:rip|scr)|r5|hdtv|(?:480|720|1080)p|\(?:avi|mpe?g|mkv|ts)$)\\b
+#define ABBREV_PATTERN
\\b(\\w{1,}(?:rip|scr)|r5|hdtv|(?:480|720|1080)p|\\.\\w{3}$)\\b
#define YEAR_PATTERN \\b(\\d{4})\\b
#define OMDBAPI_QUERY_URL http://www.omdbapi.com/?t=;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Use Imdb to scale the pixbufs.
Updating branch refs/heads/master
to 1b4ed876beb42b3b84b850ce20f085056b7f754c (commit)
from 2089c09dacd9ea555948ae03b63675d2b986a7e3 (commit)
commit 1b4ed876beb42b3b84b850ce20f085056b7f754c
Author: Nick Schermer n...@xfce.org
Date: Wed Dec 12 19:43:27 2012 +0100
Use Imdb to scale the pixbufs.
Imdb poster url can be adapted to get the correct destination
size, which is nice. It saves for download size and a resize.
plugins/cover-thumbnailer/cover-thumbnailer.c | 26 +++-
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/plugins/cover-thumbnailer/cover-thumbnailer.c
b/plugins/cover-thumbnailer/cover-thumbnailer.c
index 584b4c9..39a01b8 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer.c
@@ -612,7 +612,7 @@ cover_thumbnailer_poster_url (CoverThumbnailer
*cover,
gchar *url_part;
gchar *url = NULL;
gchar *data;
- gint dest_width;
+ gint dest_size;
g_return_val_if_fail (TUMBLER_IS_THUMBNAIL_FLAVOR (flavor), NULL);
g_return_val_if_fail (IS_COVER_THUMBNAILER (cover), NULL);
@@ -647,19 +647,33 @@ cover_thumbnailer_poster_url (CoverThumbnailer
*cover,
if (p != NULL k != NULL)
{
- /* extract poster data from the contents and build a working uri */
+ /* extract poster data from the contents */
url_part = g_strndup (p, k - p);
+
+ /* get destination size */
+ tumbler_thumbnail_flavor_get_size (flavor, dest_size, NULL);
+
if (cover-api_key == NULL)
{
- /* imdb image location */
- url = g_strconcat (http://;, url_part, .jpg, NULL);
+ if (g_str_has_suffix (url_part, _V1_SX300))
+{
+ /* imdb supports output sizes, above means image X is 300px
+ * so set something that avoids scaling. Y is most of the
time
+ * higher with posters, so set Ythumbsize */
+ url_part[strlen (url_part) - 4] = '\0';
+ url = g_strdup_printf (http://%sY%d.jpg;, url_part,
dest_size);
+}
+ else
+{
+ /* fallback that always works */
+ url = g_strconcat (http://;, url_part, .jpg, NULL);
+}
}
else
{
/* see http://api.themoviedb.org/3/configuration?api_key= for
the values */
- tumbler_thumbnail_flavor_get_size (flavor, dest_width, NULL);
url = g_strconcat (TMDB_BASE_URL,
- dest_width = 154 ? w154 : w342, /*
optimize for 128 or 256 */
+ dest_size = 154 ? w154 : w342, /*
optimize for 128 or 256 */
/, url_part, .jpg, NULL);
}
g_free (url_part);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Use a curl multi handle to re-use the connections.
Updating branch refs/heads/master
to 2089c09dacd9ea555948ae03b63675d2b986a7e3 (commit)
from a4c434bf0ed3d8079fc3c012cf08fb4ac3e70faa (commit)
commit 2089c09dacd9ea555948ae03b63675d2b986a7e3
Author: Nick Schermer n...@xfce.org
Date: Wed Dec 12 19:16:26 2012 +0100
Use a curl multi handle to re-use the connections.
Together with keep alive only 2 server connects are opened
and re-used instead of opening 2 new sockets for each
thumb.
configure.ac |2 +-
plugins/cover-thumbnailer/cover-thumbnailer.c | 100 +
2 files changed, 86 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index 084a62e..80163e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,7 @@ dnl ***
AC_HEADER_STDC()
AC_CHECK_HEADERS([fcntl.h linux/sched.h memory.h sched.h setjmp.h stdio.h \
stdlib.h string.h syscall.h sys/mman.h sys/types.h \
- sys/stat.h unistd.h])
+ sys/stat.h unistd.h sys/select.h])
dnl
dnl *** Check for standard functions ***
diff --git a/plugins/cover-thumbnailer/cover-thumbnailer.c
b/plugins/cover-thumbnailer/cover-thumbnailer.c
index 6716395..584b4c9 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer.c
@@ -24,6 +24,9 @@
#ifdef HAVE_CONFIG_H
#include config.h
#endif
+#ifdef HAVE_SYS_SELECT_H
+#include sys/select.h
+#endif
#include math.h
@@ -46,7 +49,6 @@
#define OMDBAPI_QUERY_URL http://www.omdbapi.com/?t=;
#define TMDB_BASE_URL http://cf2.imgobject.com/t/p/;
-#define TMDB_API_KEY 4be68d7eab1fbd1b6fd8a3b80a65a95e
#define TMDB_QUERY_URLhttp://api.themoviedb.org/3/search/movie?api_key=;
@@ -81,6 +83,9 @@ struct _CoverThumbnailer
GRegex *series_regex;
GRegex *abbrev_regex;
GRegex *year_regex;
+
+ /* multi session for curl */
+ CURLM *curl_multi;
};
enum
@@ -154,6 +159,9 @@ cover_thumbnailer_init (CoverThumbnailer *thumbnailer)
thumbnailer-series_regex = g_regex_new (SERIES_PATTERN, G_REGEX_CASELESS,
0, NULL);
thumbnailer-abbrev_regex = g_regex_new (ABBREV_PATTERN, G_REGEX_CASELESS,
0, NULL);
thumbnailer-year_regex = g_regex_new (YEAR_PATTERN, 0, 0, NULL);
+
+ /* curl dns share */
+ thumbnailer-curl_multi = curl_multi_init ();
}
@@ -208,6 +216,8 @@ cover_thumbnailer_finalize (GObject *object)
g_slist_foreach (cover-locations, (GFunc) g_object_unref, NULL);
g_slist_free (cover-locations);
+ curl_multi_cleanup (cover-curl_multi);
+
(*G_OBJECT_CLASS (cover_thumbnailer_parent_class)-finalize) (object);
}
@@ -313,16 +323,21 @@ cover_thumbnailer_check_progress (gpointer user_data,
static CURL *
-cover_thumbnailer_load_prepare (const gchar *url,
-GCancellable *cancellable)
+cover_thumbnailer_load_prepare (CoverThumbnailer *cover,
+const gchar *url,
+GCancellable *cancellable)
{
CURL *curl_handle;
g_return_val_if_fail (g_str_has_prefix (url, http://;), NULL);
g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
+ g_return_val_if_fail (IS_COVER_THUMBNAILER (cover), NULL);
/* curl downloader */
curl_handle = curl_easy_init ();
+ curl_multi_add_handle (cover-curl_multi, curl_handle);
+ /* curl_easy_setopt (curl_handle, CURLOPT_VERBOSE, TRUE); */
+ curl_easy_setopt (curl_handle, CURLOPT_TCP_KEEPALIVE, TRUE);
curl_easy_setopt (curl_handle, CURLOPT_URL, url);
curl_easy_setopt (curl_handle, CURLOPT_USERAGENT, PACKAGE_NAME /
PACKAGE_VERSION);
@@ -336,8 +351,64 @@ cover_thumbnailer_load_prepare (const gchar *url,
+static CURLcode
+cover_thumbnailer_load_perform (CoverThumbnailer *cover,
+CURL *curl_handle)
+{
+ gintstill_running;
+ struct timeval timeout;
+ fd_set fdread;
+ fd_set fdwrite;
+ fd_set fdexcep;
+ gintrc = 0;
+ gintmaxfd;
+ CURLcodecode = CURLE_OK;
+ CURLMsg*msg;
+
+ do
+{
+ /* start the action */
+ while (curl_multi_perform (cover-curl_multi, still_running)
+ == CURLM_CALL_MULTI_PERFORM);
+
+ if (!still_running)
+break;
+
+ /* timeout once per second */
+ timeout.tv_sec = 1;
+ timeout.tv_usec = 0;
+
+ FD_ZERO (fdread);
+ FD_ZERO (fdwrite);
+ FD_ZERO (fdexcep);
+
+ /* get file descriptors from the transfers */
+ curl_multi_fdset (cover-curl_multi, fdread, fdwrite, fdexcep,
maxfd);
+ rc = select (maxfd + 1, fdread, fdwrite, fdexcep, timeout);
+
+ /* select error */
+ if (rc == -1)
+break;
+}
+ while (still_running);
+
+ /* get return value */
+ msg = curl_multi_info_read (cover-curl_multi, rc);
+ if (msg != NULL)
+code =
[Xfce4-commits] tumbler:master Always check in the title for a year.
Updating branch refs/heads/master
to 362d13df8edb37d3470617f7d6413bf3d0555012 (commit)
from 41fd44138dd5d966b924a466fe29bbf4d7965cb3 (commit)
commit 362d13df8edb37d3470617f7d6413bf3d0555012
Author: Nick Schermer n...@xfce.org
Date: Wed Dec 12 22:09:28 2012 +0100
Always check in the title for a year.
plugins/cover-thumbnailer/cover-thumbnailer.c | 42 -
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/plugins/cover-thumbnailer/cover-thumbnailer.c
b/plugins/cover-thumbnailer/cover-thumbnailer.c
index 34302e9..14a70ff 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer.c
@@ -533,33 +533,31 @@ cover_thumbnailer_get_title (CoverThumbnailer *cover,
start_pos 0)
basename[start_pos] = '\0';
g_match_info_free (match_info);
+}
- if (!is_series)
+ /* for non-series, look for a year in the title */
+ if (!is_series
+ g_regex_match (cover-year_regex, basename, 0, match_info))
+{
+ /* store year and remove the suffix from the title */
+ if (g_match_info_fetch_pos (match_info, 0, start_pos, end_pos)
+ start_pos = 0
+ end_pos start_pos)
{
- /* for non-series, look for a year in the title */
- if (g_regex_match (cover-year_regex, basename, 0, match_info))
+ year = g_strndup (basename + start_pos, end_pos - start_pos);
+
+ if (start_pos == 0)
{
- /* store year and remove the suffix from the title */
- if (g_match_info_fetch_pos (match_info, 0, start_pos, end_pos)
- start_pos = 0
- end_pos start_pos)
-{
- year = g_strndup (basename + start_pos, end_pos - start_pos);
-
- if (start_pos == 0)
-{
- temp = g_strdup (basename + end_pos);
- g_free (basename);
- basename = temp;
-}
- else
-{
- basename[start_pos] = '\0';
-}
-}
- g_match_info_free (match_info);
+ temp = g_strdup (basename + end_pos);
+ g_free (basename);
+ basename = temp;
+}
+ else
+{
+ basename[start_pos] = '\0';
}
}
+ g_match_info_free (match_info);
}
/* append the possible title part of the filename */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Fix previous commit, . is also a word boundry.
Updating branch refs/heads/master
to 41fd44138dd5d966b924a466fe29bbf4d7965cb3 (commit)
from aff8b12f4b3a886575c427a598a9b36786643070 (commit)
commit 41fd44138dd5d966b924a466fe29bbf4d7965cb3
Author: Nick Schermer n...@xfce.org
Date: Wed Dec 12 22:07:37 2012 +0100
Fix previous commit, . is also a word boundry.
plugins/cover-thumbnailer/cover-thumbnailer.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/plugins/cover-thumbnailer/cover-thumbnailer.c
b/plugins/cover-thumbnailer/cover-thumbnailer.c
index 3cbf9bf..34302e9 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer.c
@@ -43,7 +43,7 @@
#define SERIES_PATTERN\\b((?:s\\d{1,2}e\\d{1,2}|\\d{1,2}x\\d{1,2}))\\b
-#define ABBREV_PATTERN
\\b(\\w{1,}(?:rip|scr)|r5|hdtv|(?:480|720|1080)p|\\.\\w{3}$)\\b
+#define ABBREV_PATTERN
\\b(\\w{1,}(?:rip|scr)|r5|hdtv|(?:480|720|1080)p|\\w{3}$)\\b
#define YEAR_PATTERN \\b(\\d{4})\\b
#define OMDBAPI_QUERY_URL http://www.omdbapi.com/?t=;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Add cover-thumbnailer for movies.
Updating branch refs/heads/master to 72a8b6ad2af67a2455ac0da78a9304138a35c429 (commit) from f2dba5074031aa2faa447ec30ac107debdda7f26 (commit) commit 72a8b6ad2af67a2455ac0da78a9304138a35c429 Author: Nick Schermer n...@xfce.org Date: Tue Dec 11 20:56:25 2012 +0100 Add cover-thumbnailer for movies. Thumbnailer that tries to download the poster of the movie and use it as thumbnail. Plugin send local information over the internet, so you need to explicitly enable the plugin using an rc file. See http://docs.xfce.org/xfce/thunar/tumbler acinclude.m4 | 24 + configure.ac |9 +- plugins/Makefile.am|1 + .../Makefile.am| 30 +- .../cover-thumbnailer-plugin.c}| 14 +- .../cover-thumbnailer/cover-thumbnailer-provider.c | 200 ++ .../cover-thumbnailer/cover-thumbnailer-provider.h | 43 ++ plugins/cover-thumbnailer/cover-thumbnailer.c | 708 plugins/cover-thumbnailer/cover-thumbnailer.h | 43 ++ 9 files changed, 1050 insertions(+), 22 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 4105e37..9afa9c9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -244,6 +244,30 @@ AC_MSG_RESULT([$ac_tumbler_raw_thumbnailer]) +dnl TUMBLER_COVER_THUMBNAILER() +dnl +dnl Check whether to build and install the Open Movie Database thumbnailer plugin. +dnl +AC_DEFUN([TUMBLER_COVER_THUMBNAILER], +[ +AC_ARG_ENABLE([pixbuf-thumbnailer], [AC_HELP_STRING([--disable-cover-thumbnailer], [Don't build the Cover thumbnailer plugin])], + [ac_tumbler_cover_thumbnailer=$enableval], [ac_tumbler_cover_thumbnailer=yes]) +if test x$ac_tumbler_cover_thumbnailer = xyes; then + dnl Check for gdk-pixbuf + PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 = 2.14], + [ +dnl CHeck for curl +PKG_CHECK_MODULES([CURL], [libcurl], [], [ac_tumbler_cover_thumbnailer=no]) + ], [ac_tumbler_cover_thumbnailer=no]) +fi + +AC_MSG_CHECKING([whether to build the Cover thumbnailer plugin]) +AM_CONDITIONAL([TUMBLER_COVER_THUMBNAILER], [test x$ac_tumbler_cover_thumbnailer = xyes]) +AC_MSG_RESULT([$ac_tumbler_cover_thumbnailer]) +]) + + + dnl TUMBLER_XDG_CACHE() dnl dnl Check whether to build and install the freedesktop.org cache plugin. diff --git a/configure.ac b/configure.ac index f41c3a3..084a62e 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,7 @@ PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1 = 0.72]) dnl * dnl *** Check for plugins *** dnl * +TUMBLER_COVER_THUMBNAILER() TUMBLER_FONT_THUMBNAILER() TUMBLER_JPEG_THUMBNAILER() TUMBLER_PIXBUF_THUMBNAILER() @@ -184,6 +185,7 @@ docs/reference/Makefile docs/reference/tumbler/Makefile docs/reference/tumbler/version.xml plugins/Makefile +plugins/cover-thumbnailer/Makefile plugins/font-thumbnailer/Makefile plugins/gst-thumbnailer/Makefile plugins/jpeg-thumbnailer/Makefile @@ -206,7 +208,7 @@ dnl *** echo echo Build Configuration: echo -echo * Debug: $enable_debug +echo * Debug:$enable_debug echo echo Plugins: echo @@ -215,6 +217,11 @@ echo * GdkPixbuf thumbnailer plugin: yes else echo * GdkPixbuf thumbnailer plugin: no fi +if test x$ac_tumbler_cover_thumbnailer = xyes; then +echo * Cover thumbnailer plugin: yes +else +echo * Cover thumbnailer plugin: no +fi if test x$ac_tumbler_font_thumbnailer = xyes; then echo * FreeType font thumbnailer plugin: yes else diff --git a/plugins/Makefile.am b/plugins/Makefile.am index aec18cc..f2c9f5f 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -18,6 +18,7 @@ # Boston, MA 02110-1301, USA. SUBDIRS = \ + cover-thumbnailer \ font-thumbnailer\ gst-thumbnailer \ jpeg-thumbnailer\ diff --git a/plugins/pixbuf-thumbnailer/Makefile.am b/plugins/cover-thumbnailer/Makefile.am similarity index 71% copy from plugins/pixbuf-thumbnailer/Makefile.am copy to plugins/cover-thumbnailer/Makefile.am index 2852a46..7ffb891 100644 --- a/plugins/pixbuf-thumbnailer/Makefile.am +++ b/plugins/cover-thumbnailer/Makefile.am @@ -1,6 +1,6 @@ # vi:set ts=8 sw=8 noet ai nocindent: # - -# Copyright (c) 2009-2012 Jannis Pohlmann jan...@xfce.org +# Copyright (c) 2012 Nick Schermer n...@xfce.org # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@
[Xfce4-commits] tumbler:master Add wiki url.
Updating branch refs/heads/master to 8002e0913ac1bb8f21153fbe6f06be9ad9453a7b (commit) from 8913e999caed579d62b0021f32db6dfef65ff7f4 (commit) commit 8002e0913ac1bb8f21153fbe6f06be9ad9453a7b Author: Nick Schermer n...@xfce.org Date: Sun Dec 16 15:32:33 2012 +0100 Add wiki url. tumblerd/tumbler.rc |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tumblerd/tumbler.rc b/tumblerd/tumbler.rc index 52e73f3..2563d8b 100644 --- a/tumblerd/tumbler.rc +++ b/tumblerd/tumbler.rc @@ -13,6 +13,8 @@ # MaxFileSize: Maximum size of the source file the plugin will still # try to generate a plugin for. The size is in bytes, # 0 disabled the check. +# +# For more information see http://docs.xfce.org/xfce/thunar/tumbler ### ### ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Optimize regex patterns for cover thumbnailer.
Updating branch refs/heads/master
to a1daaeeba2ec8ae075eacff6d95c2e301e5d3003 (commit)
from 8002e0913ac1bb8f21153fbe6f06be9ad9453a7b (commit)
commit a1daaeeba2ec8ae075eacff6d95c2e301e5d3003
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 18 20:51:42 2012 +0100
Optimize regex patterns for cover thumbnailer.
Use multiple times, so worth spending time on.
plugins/cover-thumbnailer/cover-thumbnailer.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/plugins/cover-thumbnailer/cover-thumbnailer.c
b/plugins/cover-thumbnailer/cover-thumbnailer.c
index cb3d708..4ff7756 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer.c
@@ -123,11 +123,12 @@ static void
cover_thumbnailer_init (CoverThumbnailer *thumbnailer)
{
GKeyFile *rc;
+ GRegexCompileFlags rcflags = G_REGEX_CASELESS | G_REGEX_OPTIMIZE;
/* prepare the regular expressions */
- thumbnailer-series_regex = g_regex_new (SERIES_PATTERN, G_REGEX_CASELESS,
0, NULL);
- thumbnailer-abbrev_regex = g_regex_new (ABBREV_PATTERN, G_REGEX_CASELESS,
0, NULL);
- thumbnailer-year_regex = g_regex_new (YEAR_PATTERN, 0, 0, NULL);
+ thumbnailer-series_regex = g_regex_new (SERIES_PATTERN, rcflags, 0, NULL);
+ thumbnailer-abbrev_regex = g_regex_new (ABBREV_PATTERN, rcflags, 0, NULL);
+ thumbnailer-year_regex = g_regex_new (YEAR_PATTERN, rcflags, 0, NULL);
/* curl dns share */
thumbnailer-curl_multi = curl_multi_init ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:nick/cover-thumbnailer Deleting branch nick/cover-thumbnailer
Deleting branch refs/heads/nick/cover-thumbnailer ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Remove unmaintained translations.
Updating branch refs/heads/master to e21beff6f21c53901e14049ebd31037e89d95ac7 (commit) from a1daaeeba2ec8ae075eacff6d95c2e301e5d3003 (commit) commit e21beff6f21c53901e14049ebd31037e89d95ac7 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 11:21:48 2012 +0100 Remove unmaintained translations. po/ms.po | 294 -- 1 files changed, 0 insertions(+), 294 deletions(-) diff --git a/po/ms.po b/po/ms.po deleted file mode 100644 index b1d3fc1..000 --- a/po/ms.po +++ /dev/null @@ -1,294 +0,0 @@ -# # Malay translation of the tumbler package. -# # Copyright (C) YEAR THE tumbler'S COPYRIGHT HOLDER -# # This file is distributed under the same license as the tumbler package. -# Puretech terjemah.puret...@gmail.com, 2011. -# -msgid -msgstr -Project-Id-Version: tumbler\n -Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-11-18 13:56+\n -PO-Revision-Date: 2011-11-19 02:04+0800\n -Last-Translator: Puretech terjemah.puret...@gmail.com\n -Language-Team: Malay \n -Language: \n -MIME-Version: 1.0\n -Content-Type: text/plain; charset=UTF-8\n -Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=1; plural=0\n - -#: ../tumblerd/tumbler-cache-service.c:413 -#, c-format -msgid Another thumbnail cache service is already running -msgstr Perkhidmatan cache lakaran kecil lain telah pun berjalan - -#: ../tumblerd/tumbler-group-scheduler.c:485 -#: ../tumblerd/tumbler-lifo-scheduler.c:421 -#, c-format -msgid No thumbnailer available for \%s\ -msgstr Tiada lakaran kecil didapati untuk \%s\ - -#: ../tumblerd/tumbler-lifecycle-manager.c:207 -msgid The thumbnailer service is shutting down -msgstr Servis lakaran kecil sedang ditutup - -#: ../tumblerd/tumbler-service.c:758 -#, c-format -msgid Another generic thumbnailer is already running -msgstr Perkhidmatan generik lakaran kenit lain telah pun berjalan - -#: ../tumblerd/tumbler-service.c:867 -msgid Unsupported thumbnail flavor requested -msgstr Meminta lakaran kecil yang tidak disokong - -#: ../tumblerd/tumbler-specialized-thumbnailer.c:461 -msgid Failed to call the specialized thumbnailer: timeout -msgstr Gagal memanggil lakaran.kecil khas: masa tamat - -#: ../tumblerd/tumbler-specialized-thumbnailer.c:470 -#, c-format -msgid Failed to call the specialized thumbnailer: %s -msgstr Gagal memanggil lakaran.kecil khas: %s - -#: ../tumblerd/tumbler-manager.c:489 ../tumblerd/tumbler-manager.c:895 -#, c-format -msgid Failed to load the file \%s\: %s -msgstr Gagal memuatkan fail \%s\: %s - -#: ../tumblerd/tumbler-manager.c:507 ../tumblerd/tumbler-manager.c:521 -#: ../tumblerd/tumbler-manager.c:535 -#, c-format -msgid Malformed section \%s\ in file \%s\: %s -msgstr Seksyen cacat \%s\ dalam fail \%s\: %s - -#: ../tumblerd/tumbler-manager.c:548 -#, c-format -msgid -Malformed section \%s\ in file \%s\: Mismatch between section name and -UriScheme/MimeType -msgstr -Seksyen cacat \%s\ dalam fail \%s\: Tidak sepadan antara nama seksyen -dan UriScheme/MimeType - -#: ../tumblerd/tumbler-manager.c:908 ../tumblerd/tumbler-manager.c:922 -#: ../tumblerd/tumbler-manager.c:936 -#, c-format -msgid Malformed file \%s\: %s -msgstr Fail cacat \%s\: %s - -#: ../tumblerd/tumbler-manager.c:962 -#, c-format -msgid Failed to determine last modified time of \%s\ -msgstr Gagal untuk menentukan masa terakhir ubahsuai \%s\ - -#: ../tumblerd/tumbler-manager.c:1863 -#, c-format -msgid Another thumbnailer manager is already running -msgstr Pengurus lakaran kecil lain sedang berjalan - -#. set the application name. Translators: Don't translate Tumbler. -#: ../tumblerd/main.c:83 -msgid Tumbler Thumbnailing Service -msgstr Servis Lakaran Kecil Tumbler - -#: ../tumblerd/main.c:98 -#, c-format -msgid Failed to connect to the D-Bus session bus: %s -msgstr Gagal menyambung ke sesi bus D-Bus: %s - -#: ../tumblerd/main.c:156 -#, c-format -msgid Failed to load specialized thumbnailers into the registry: %s -msgstr Gagal memuatkan lakaran kecil khas ke dalam daftar: %s - -#: ../tumblerd/main.c:173 -#, c-format -msgid Failed to start the thumbnail cache service: %s -msgstr Gagal memulakan servis cache lakaran kecil: %s - -#: ../tumblerd/main.c:190 -#, c-format -msgid Failed to start the thumbnailer manager: %s -msgstr Gagal memulakan pengurus lakaran kecil: %s - -#: ../tumblerd/main.c:207 -#, c-format -msgid Failed to start the thumbnailer service: %s -msgstr Gagal memulakan servis lakaran kecil: %s - -#: ../tumbler/tumbler-enum-types.c:49 -msgid Invalid format -msgstr Format tidak sah - -#: ../tumbler/tumbler-enum-types.c:50 -msgid PNG -msgstr PNG - -#: ../tumbler/tumbler-enum-types.c:71 -msgid RGB Colorspace -msgstr Ruang warna RGB - -#: ../tumbler/tumbler-cache-plugin.c:145 -#, c-format -msgid Cache plugin \%s\ lacks required symbols -msgstr Cache plugin \%s\ kekurangan simbol yang diperlukan - -#: ../tumbler/tumbler-cache-plugin.c:153 -#, c-format -msgid Failed to load the cache plugin \%s\: %s -msgstr Gagal memuatkan cache plugin
[Xfce4-commits] tumbler:master Drop translations of debug message.
Updating branch refs/heads/master
to f7a3eda07ec55d43f92dd2ebbe717cb5c1ddd81c (commit)
from 362d13df8edb37d3470617f7d6413bf3d0555012 (commit)
commit f7a3eda07ec55d43f92dd2ebbe717cb5c1ddd81c
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 15 15:57:48 2012 +0100
Drop translations of debug message.
.../cover-thumbnailer/cover-thumbnailer-plugin.c |4 ++--
.../ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c |4 ++--
plugins/font-thumbnailer/font-thumbnailer-plugin.c |4 ++--
plugins/gst-thumbnailer/gst-thumbnailer-plugin.c |4 ++--
plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c |4 ++--
plugins/odf-thumbnailer/odf-thumbnailer-plugin.c |4 ++--
.../pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c |4 ++--
.../poppler-thumbnailer-plugin.c |4 ++--
plugins/raw-thumbnailer/raw-thumbnailer-plugin.c |4 ++--
plugins/xdg-cache/xdg-cache-plugin.c |4 ++--
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/plugins/cover-thumbnailer/cover-thumbnailer-plugin.c
b/plugins/cover-thumbnailer/cover-thumbnailer-plugin.c
index b612ea6..6bf82b4 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer-plugin.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer-plugin.c
@@ -61,7 +61,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
}
#ifdef DEBUG
- g_message (_(Initializing the Tumbler Cover Thumbnailer plugin));
+ g_print (Initializing the Tumbler Cover Thumbnailer plugin\n);
#endif
/* register the types provided by this plugin */
@@ -78,7 +78,7 @@ void
tumbler_plugin_shutdown (void)
{
#ifdef DEBUG
- g_message (_(Shutting down the Tumbler Cover Thumbnailer plugin));
+ g_print (Shutting down the Tumbler Cover Thumbnailer plugin\n);
#endif
}
diff --git a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c
b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c
index 93fec59..3f393a7 100644
--- a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c
+++ b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c
@@ -60,7 +60,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
}
#ifdef DEBUG
- g_message (_(Initializing the Tumbler ffmpeg video thumbnailer plugin));
+ g_print (Initializing the Tumbler ffmpeg video thumbnailer plugin\n);
#endif
/* register the types provided by this plugin */
@@ -77,7 +77,7 @@ void
tumbler_plugin_shutdown (void)
{
#ifdef DEBUG
- g_message (_(Shutting down the Tumbler ffmpeg video thumbnailer plugin));
+ g_print (Shutting down the Tumbler ffmpeg video thumbnailer plugin\n);
#endif
}
diff --git a/plugins/font-thumbnailer/font-thumbnailer-plugin.c
b/plugins/font-thumbnailer/font-thumbnailer-plugin.c
index a240089..340885c 100644
--- a/plugins/font-thumbnailer/font-thumbnailer-plugin.c
+++ b/plugins/font-thumbnailer/font-thumbnailer-plugin.c
@@ -59,7 +59,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
}
#ifdef DEBUG
- g_message (_(Initializing the Tumbler Font Thumbnailer plugin));
+ g_print (Initializing the Tumbler Font Thumbnailer plugin\n);
#endif
/* register the types provided by this plugin */
@@ -76,7 +76,7 @@ void
tumbler_plugin_shutdown (void)
{
#ifdef DEBUG
- g_message (_(Shutting down the Tumbler Font Thumbnailer plugin));
+ g_print (Shutting down the Tumbler Font Thumbnailer plugin\n);
#endif
}
diff --git a/plugins/gst-thumbnailer/gst-thumbnailer-plugin.c
b/plugins/gst-thumbnailer/gst-thumbnailer-plugin.c
index 5b302bb..1f86ee9 100644
--- a/plugins/gst-thumbnailer/gst-thumbnailer-plugin.c
+++ b/plugins/gst-thumbnailer/gst-thumbnailer-plugin.c
@@ -61,7 +61,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
}
#ifdef DEBUG
- g_message (_(Initializing the Tumbler GStreamer Thumbnailer plugin));
+ g_print (Initializing the Tumbler GStreamer Thumbnailer plugin\n);
#endif
/* register the types provided by this plugin */
@@ -78,7 +78,7 @@ void
tumbler_plugin_shutdown (void)
{
#ifdef DEBUG
- g_message (_(Shutting down the Tumbler GStreamer Thumbnailer plugin));
+ g_print (Shutting down the Tumbler GStreamer Thumbnailer plugin\n);
#endif
}
diff --git a/plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c
b/plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c
index 9544397..036ebd1 100644
--- a/plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c
+++ b/plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c
@@ -59,7 +59,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
}
#ifdef DEBUG
- g_message (_(Initializing the Tumbler JPEG Thumbnailer plugin));
+ g_print (Initializing the Tumbler JPEG Thumbnailer plugin\n);
#endif
/* register the types provided by this plugin */
@@ -76,7 +76,7 @@ void
tumbler_plugin_shutdown (void)
{
#ifdef DEBUG
- g_message (_(Shutting down the Tumbler JPEG Thumbnailer plugin));
+ g_print (Shutting down the Tumbler JPEG Thumbnailer plugin\n);
#endif
}
diff --git
[Xfce4-commits] xfce4-settings:jeromeg/keyboard-shortcuts Tweak buttons positions.
Updating branch refs/heads/jeromeg/keyboard-shortcuts to cd952f2777ffa11e48c003f0795ba5d55c798340 (commit) from 0b39613666ee95df3dbba6a5c9d1470799104a34 (commit) commit cd952f2777ffa11e48c003f0795ba5d55c798340 Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Dec 27 11:33:36 2012 +0100 Tweak buttons positions. Group buttons which act on individual shortcuts to the left and put Reset to defaults with some padding on the right as it will reset all shortcuts. dialogs/keyboard-settings/keyboard-dialog.glade | 39 --- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dialogs/keyboard-settings/keyboard-dialog.glade b/dialogs/keyboard-settings/keyboard-dialog.glade index 822816b..72aec7f 100644 --- a/dialogs/keyboard-settings/keyboard-dialog.glade +++ b/dialogs/keyboard-settings/keyboard-dialog.glade @@ -8,6 +8,11 @@ property name=can_focusFalse/property property name=stockgtk-revert-to-saved/property /object + object class=GtkImage id=image2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=stockgtk-revert-to-saved/property + /object object class=XfceTitledDialog id=keyboard-layout-selection-dialog property name=can_focusFalse/property property name=title translatable=yesKeyboard layout selection/property @@ -113,8 +118,8 @@ property name=can_focusFalse/property property name=layout_styleend/property child - object class=GtkButton id=button2 -property name=labelgtk-close/property + object class=GtkButton id=button1 +property name=labelgtk-help/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property @@ -125,11 +130,12 @@ property name=expandFalse/property property name=fillFalse/property property name=position0/property +property name=secondaryTrue/property /packing /child child - object class=GtkButton id=button1 -property name=labelgtk-help/property + object class=GtkButton id=button2 +property name=labelgtk-close/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property @@ -140,7 +146,6 @@ property name=expandFalse/property property name=fillFalse/property property name=position0/property -property name=secondaryTrue/property /packing /child /object @@ -596,14 +601,13 @@ /packing /child child - object class=GtkButton id=reset_shortcuts_button -property name=label translatable=yesReset to _Defaults/property + object class=GtkButton id=delete_shortcut_button +property name=labelgtk-remove/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=imageimage1/property -property name=use_underlineTrue/property +property name=use_stockTrue/property /object packing property name=expandFalse/property @@ -612,17 +616,19 @@ /packing /child child - object class=GtkButton id=delete_shortcut_button -property name=labelgtk-remove/property + object class=GtkButton id=reset_shortcuts_button +property name=label translatable=yesReset to _Defaults/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=use_stockTrue/property +property name=imageimage1/property +property name=use_underlineTrue/property
[Xfce4-commits] xfce4-cpugraph-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 43aaffcc56a4e0fdd358065bfa9f05eec219b51f (commit) from ed3e8ecd6a6a32a8f315c311bddedd28c0f6cc05 (commit) commit 43aaffcc56a4e0fdd358065bfa9f05eec219b51f Author: Roman K mrdoctor...@gmail.com Date: Thu Dec 27 11:54:57 2012 +0100 l10n: Updated Russian (ru) translation to 100% New status: 37 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 76 - 1 files changed, 40 insertions(+), 36 deletions(-) diff --git a/po/ru.po b/po/ru.po index 0631adc..eebf802 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,7 +3,7 @@ msgid msgstr Project-Id-Version: xfce4-cpugraph-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-05-27 07:27+\n +POT-Creation-Date: 2012-12-27 07:27+\n PO-Revision-Date: \n Last-Translator: Urmas davian...@gmail.com\n Language-Team: Andriy Kovtun kovtu...@yandex.ru\n @@ -14,150 +14,154 @@ msgstr Plural-Forms: nplurals=3; plural=n%10==1 n%100!=11?0:n%10=2 n%10=4 (n%10010 || n%100=20) ?1:2;\n X-Poedit-Language: Russian\n -#: ../panel-plugin/cpu.c:152 ../panel-plugin/cpugraph.desktop.in.h:2 +#: ../panel-plugin/cpu.c:153 ../panel-plugin/cpugraph.desktop.in.h:2 msgid Graphical representation of the CPU load msgstr Графическое представление загруженности процессора -#: ../panel-plugin/cpu.c:154 +#: ../panel-plugin/cpu.c:155 msgid Copyright (c) 2003-2012\n msgstr \t\r\n \r\n Copyright (c) 2003-2012\n -#: ../panel-plugin/cpu.c:361 +#: ../panel-plugin/cpu.c:368 #, c-format msgid Usage: %u%% msgstr Использовано: %u%% -#: ../panel-plugin/properties.c:78 +#: ../panel-plugin/properties.c:80 msgid CPU Graph Properties msgstr Параметры модуля CPU Graph -#: ../panel-plugin/properties.c:96 +#: ../panel-plugin/properties.c:98 msgid Use non-linear time-scale msgstr Нелинейная временная шкала -#: ../panel-plugin/properties.c:97 +#: ../panel-plugin/properties.c:99 msgid Show frame msgstr Показывать рамку -#: ../panel-plugin/properties.c:98 +#: ../panel-plugin/properties.c:100 msgid Show border msgstr Показывать рамку -#: ../panel-plugin/properties.c:99 +#: ../panel-plugin/properties.c:101 msgid Show current usage bar msgid_plural Show current usage bars msgstr[0] Показать панель загруженности msgstr[1] Показать панели загруженности msgstr[2] Показать панели загруженности -#: ../panel-plugin/properties.c:101 +#: ../panel-plugin/properties.c:103 msgid Run in terminal msgstr Запустить в терминале -#: ../panel-plugin/properties.c:102 +#: ../panel-plugin/properties.c:104 msgid Use startup notification msgstr Использовать уведомление при запуске -#: ../panel-plugin/properties.c:105 +#: ../panel-plugin/properties.c:107 msgid Color 1: msgstr Цвет 1: -#: ../panel-plugin/properties.c:106 +#: ../panel-plugin/properties.c:108 msgid Color 2: msgstr Цвет 2: -#: ../panel-plugin/properties.c:107 +#: ../panel-plugin/properties.c:109 msgid Color 3: msgstr Цвет 3: -#: ../panel-plugin/properties.c:108 +#: ../panel-plugin/properties.c:110 msgid Background: msgstr Фон: -#: ../panel-plugin/properties.c:115 +#: ../panel-plugin/properties.c:114 +msgid Bars color: +msgstr Цвет полос + +#: ../panel-plugin/properties.c:119 msgid Appearance msgstr Внешний вид -#: ../panel-plugin/properties.c:117 +#: ../panel-plugin/properties.c:121 msgid Advanced msgstr Расширенные настройки -#: ../panel-plugin/properties.c:193 +#: ../panel-plugin/properties.c:197 msgid Fastest (~250ms) msgstr Очень быстрый (~250ms) -#: ../panel-plugin/properties.c:194 +#: ../panel-plugin/properties.c:198 msgid Fast (~500ms) msgstr Быстрый (~500ms) -#: ../panel-plugin/properties.c:195 +#: ../panel-plugin/properties.c:199 msgid Normal (~750ms) msgstr Нормальный (~750ms) -#: ../panel-plugin/properties.c:196 +#: ../panel-plugin/properties.c:200 msgid Slow (~1s) msgstr Медленный (~1s) -#: ../panel-plugin/properties.c:200 +#: ../panel-plugin/properties.c:204 msgid Update Interval: msgstr Интервал обновления: -#: ../panel-plugin/properties.c:208 +#: ../panel-plugin/properties.c:212 msgid All msgstr Все -#: ../panel-plugin/properties.c:213 +#: ../panel-plugin/properties.c:217 msgid Tracked Core: msgstr Ядро: -#: ../panel-plugin/properties.c:224 +#: ../panel-plugin/properties.c:228 msgid Width: msgstr Ширина: -#: ../panel-plugin/properties.c:226 +#: ../panel-plugin/properties.c:230 msgid Height: msgstr Высота: -#: ../panel-plugin/properties.c:240 +#: ../panel-plugin/properties.c:244 msgid Associated command: msgstr Связанная команда: -#: ../panel-plugin/properties.c:264 +#: ../panel-plugin/properties.c:268 msgid Normal msgstr Нормальный -#: ../panel-plugin/properties.c:265 +#: ../panel-plugin/properties.c:269 msgid LED msgstr Индикатор -#: ../panel-plugin/properties.c:266 +#: ../panel-plugin/properties.c:270 msgid No history msgstr Без
[Xfce4-commits] xfce4-netload-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 54743020384001543c2156512649f1148ff549c0 (commit) from 8bb6a3a44240325c77b030da0072d96b5918ed86 (commit) commit 54743020384001543c2156512649f1148ff549c0 Author: Roman K mrdoctor...@gmail.com Date: Thu Dec 27 11:55:58 2012 +0100 l10n: Updated Russian (ru) translation to 100% New status: 30 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 61 +++-- 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/po/ru.po b/po/ru.po index a02da61..d73180a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-netload-plugin 0.3.3\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-02-16 11:39+\n +POT-Creation-Date: 2012-12-27 08:12+\n PO-Revision-Date: 2010-03-01 11:14+0200\n Last-Translator: Dima Smirnov a...@cnc-parts.info\n Language-Team: Russian r...@li.org\n @@ -17,35 +17,36 @@ msgstr Content-Transfer-Encoding: 8bit\n Language: ru\n -#: ../panel-plugin/netload.c:59 +#: ../panel-plugin/netload.c:61 msgid Xfce4-Netload-Plugin msgstr Модуль сетевой активности Xfce4 -#: ../panel-plugin/netload.c:62 +#: ../panel-plugin/netload.c:64 msgid Unknown error. msgstr Неизвестная ошибка. -#: ../panel-plugin/netload.c:63 +#: ../panel-plugin/netload.c:65 msgid Linux proc device '/proc/net/dev' not found. msgstr Не найдено устройство '/proc/net/dev'. -#: ../panel-plugin/netload.c:64 +#: ../panel-plugin/netload.c:66 msgid Interface was not found. msgstr Интерфейс не найден. -#: ../panel-plugin/netload.c:162 +#: ../panel-plugin/netload.c:163 #, c-format msgid %s (Interface down) msgstr Интерфейс %s выключен -#: ../panel-plugin/netload.c:249 +#: ../panel-plugin/netload.c:250 #, c-format msgid %s (%s)\n -Average of last %d measures:\n -Incoming: %s/s\n -Outgoing: %s/s\n -Total: %s/s +Average of last %d measures\n +with an interval of %.2fs:\n +Incoming: %s\n +Outgoing: %s\n +Total: %s msgstr %s (%s)\n Среднее значение %d \n @@ -54,11 +55,11 @@ msgstr Исходящий: %s кБайт/s\n Всего: %s кБайт/s -#: ../panel-plugin/netload.c:251 +#: ../panel-plugin/netload.c:253 msgid no IP address msgstr нет IP-адреса -#: ../panel-plugin/netload.c:533 +#: ../panel-plugin/netload.c:567 #, c-format msgid %s: Error in initializing:\n @@ -67,71 +68,71 @@ msgstr %s: Ошибка инициализации:\n %s -#: ../panel-plugin/netload.c:872 +#: ../panel-plugin/netload.c:882 msgid Select color msgstr Выбор цвета -#: ../panel-plugin/netload.c:938 +#: ../panel-plugin/netload.c:948 msgid Bar color (i_ncoming): msgstr Цвет индикатора (вхо_дящий): -#: ../panel-plugin/netload.c:939 +#: ../panel-plugin/netload.c:949 msgid Bar color (_outgoing): msgstr Цвет индикатора (исход_ящий): -#: ../panel-plugin/netload.c:942 +#: ../panel-plugin/netload.c:952 msgid Maximum (inco_ming): msgstr Максимум (в_ходящий): -#: ../panel-plugin/netload.c:943 +#: ../panel-plugin/netload.c:953 msgid Maximum (o_utgoing): msgstr Максимум (_исходящий): -#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 +#: ../panel-plugin/netload.c:958 ../panel-plugin/netload.desktop.in.in.h:1 msgid Network Monitor msgstr Сетевой монитор -#: ../panel-plugin/netload.c:977 +#: ../panel-plugin/netload.c:987 msgid _Text to display: msgstr _Подпись: -#: ../panel-plugin/netload.c:1008 +#: ../panel-plugin/netload.c:1018 msgid Network _device: msgstr Сетевое _устройство: -#: ../panel-plugin/netload.c:1036 +#: ../panel-plugin/netload.c:1046 msgid Update _interval: msgstr Интервал о_бновления: -#: ../panel-plugin/netload.c:1049 +#: ../panel-plugin/netload.c:1059 msgid s msgstr сек. -#: ../panel-plugin/netload.c:1062 +#: ../panel-plugin/netload.c:1072 msgid _Automatic maximum msgstr _Автоматически определять максимум -#: ../panel-plugin/netload.c:1096 +#: ../panel-plugin/netload.c:1106 msgid KiB/s msgstr КиБ/с -#: ../panel-plugin/netload.c:1121 +#: ../panel-plugin/netload.c:1131 msgid _Present data as: msgstr Представ_ление в виде: -#: ../panel-plugin/netload.c:1130 +#: ../panel-plugin/netload.c:1140 msgid Bars msgstr Столбцов -#: ../panel-plugin/netload.c:1131 +#: ../panel-plugin/netload.c:1141 msgid Values msgstr Значений -#: ../panel-plugin/netload.c:1132 +#: ../panel-plugin/netload.c:1142 msgid Bars and values msgstr Столбцов и значений -#: ../panel-plugin/netload.c:1182 +#: ../panel-plugin/netload.c:1192 msgid _Colorize values msgstr _Цветные значения ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 02af2721ecde9f9a6a1739365a13b107fd424cd1 (commit) from 5705f041befff1908c6bf3974da5ea39d0f7871a (commit) commit 02af2721ecde9f9a6a1739365a13b107fd424cd1 Author: Roman K mrdoctor...@gmail.com Date: Thu Dec 27 11:58:04 2012 +0100 l10n: Updated Russian (ru) translation to 100% New status: 175 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 18 ++ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index a0486ea..e54f10f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -828,21 +828,18 @@ msgstr Кратковременный дождь #. *short-lived. #. #: ../panel-plugin/weather-translate.c:138 -#, fuzzy msgid Thunder showers -msgstr Кратковременный дождь +msgstr Гроза #. Analogues to Rain showers #: ../panel-plugin/weather-translate.c:141 -#, fuzzy msgid Sleet showers -msgstr Ливни +msgstr Сильные дожди со снегом #: ../panel-plugin/weather-translate.c:142 #: ../panel-plugin/weather-translate.c:174 -#, fuzzy msgid Snow showers -msgstr Снегопад +msgstr Дождь со снегом #. It's raining incessantly, but not heavily. #: ../panel-plugin/weather-translate.c:145 @@ -880,20 +877,17 @@ msgstr Снег #. *extratropical cyclone. #. #: ../panel-plugin/weather-translate.c:166 -#, fuzzy msgid Thundersnow -msgstr Гроза +msgstr Гроза со снегом #. Same as symbols 1-15, but with thunder #: ../panel-plugin/weather-translate.c:177 -#, fuzzy msgid Sleet showers with thunder -msgstr Кратковременный дождь с грозой +msgstr Мокрый снег, гроза #: ../panel-plugin/weather-translate.c:178 -#, fuzzy msgid Snow showers with thunder -msgstr Кратковременный дождь с грозой +msgstr Снег, гроза #: ../panel-plugin/weather-translate.c:179 msgid Light rain with thunder ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-battery-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 4c5cd8449e10f1c60092df77050799e3a40a006f (commit) from 30924ab91c28fbe1a51c74b9f7a9fc2fbcbeb08a (commit) commit 4c5cd8449e10f1c60092df77050799e3a40a006f Author: Roman K mrdoctor...@gmail.com Date: Thu Dec 27 11:58:44 2012 +0100 l10n: Updated Russian (ru) translation to 100% New status: 43 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 36e835b..fe9720f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,7 +3,7 @@ msgid msgstr Project-Id-Version: xfce4-battery-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-10-19 10:03+\n +POT-Creation-Date: 2012-12-27 07:12+\n PO-Revision-Date: \n Last-Translator: Urmas dwqwt3...@sneakemail.com\n Language-Team: None -\n @@ -110,7 +110,7 @@ msgstr Критический заряд батареи: #: ../panel-plugin/battery.c:1428 msgid Bar _colors -msgstr +msgstr _Цвет полос #: ../panel-plugin/battery.c:1442 msgid Low percentage: @@ -161,9 +161,8 @@ msgid Display icon msgstr Значок #: ../panel-plugin/battery.c:1561 -#, fuzzy msgid Display bar -msgstr Метка +msgstr Отображать полосы #: ../panel-plugin/battery.c:1564 msgid Display percentage ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-timer-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 7432ecf649ca58e3a83f6439e9ffcb71466b58b4 (commit) from f840a5d6a1f897e00f1ec1e791b478870a2696e9 (commit) commit 7432ecf649ca58e3a83f6439e9ffcb71466b58b4 Author: Roman K mrdoctor...@gmail.com Date: Thu Dec 27 11:59:32 2012 +0100 l10n: Updated Russian (ru) translation to 100% New status: 32 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 126 +- 1 files changed, 59 insertions(+), 67 deletions(-) diff --git a/po/ru.po b/po/ru.po index e07d764..763e4c9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,178 +3,166 @@ # This file is distributed under the same license as # the xfce4-timer package. # Andrey Fedoseev andrey.fedos...@gmail.com, 2006. -# +# msgid msgstr Project-Id-Version: xfce4-timer 0.3\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-09-04 15:53+0300\n +POT-Creation-Date: 2006-09-10 21:29+0200\n PO-Revision-Date: 2010-03-01 11:17+0200\n Last-Translator: Dima Smirnov a...@cnc-parts.info\n Language-Team: Russian r...@li.org\n -Language: ru\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: ru\n -#: ../src/xfcetimer.c:108 +#: ../src/xfcetimer.c:100 #, c-format msgid %dh %dm %ds left msgstr осталось %dч %dм %dс -#: ../src/xfcetimer.c:111 +#: ../src/xfcetimer.c:103 #, c-format msgid %dm %ds left msgstr осталось %dм %dс -#: ../src/xfcetimer.c:113 +#: ../src/xfcetimer.c:105 #, c-format msgid %ds left msgstr осталось %dс -#: ../src/xfcetimer.c:116 -msgid (Paused) -msgstr - -#: ../src/xfcetimer.c:141 +#: ../src/xfcetimer.c:126 msgid Beeep! :) \n Time is up! msgstr Время вышло -#: ../src/xfcetimer.c:430 -msgid Resume timer -msgstr Запустить таймер - -#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504 +#: ../src/xfcetimer.c:424 msgid Stop timer msgstr Остановить таймер -#: ../src/xfcetimer.c:490 -msgid Pause timer -msgstr Запустить таймер - -#: ../src/xfcetimer.c:506 +#: ../src/xfcetimer.c:426 msgid Start timer msgstr Запустить таймер -#: ../src/xfcetimer.c:516 +#: ../src/xfcetimer.c:436 msgid Stop the alarm msgstr Остановить таймер -#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637 +#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556 #, c-format msgid %dh %dm %ds msgstr %dч %dм %dс -#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639 +#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558 #, c-format msgid %dm %ds msgstr %dм %dс -#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641 +#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560 #, c-format msgid %ds msgstr %dс -#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651 +#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570 #, c-format msgid At %02d:%02d msgstr В %02d:%02d -#: ../src/xfcetimer.c:733 -#, fuzzy -msgid Name: +#: ../src/xfcetimer.c:619 +msgid Name msgstr Название #. -#: ../src/xfcetimer.c:741 +#: ../src/xfcetimer.c:627 msgid Enter the countdown time msgstr Обратный отсчет -#: ../src/xfcetimer.c:744 +#: ../src/xfcetimer.c:629 msgid Enter the time of alarm (24h format) msgstr Время срабатывания сигнала -#: ../src/xfcetimer.c:756 +#: ../src/xfcetimer.c:640 msgid h msgstr ч -#: ../src/xfcetimer.c:761 +#: ../src/xfcetimer.c:645 msgid m msgstr м -#: ../src/xfcetimer.c:766 +#: ../src/xfcetimer.c:650 msgid s msgstr с -#: ../src/xfcetimer.c:769 -#, fuzzy -msgid or +#: ../src/xfcetimer.c:653 +msgid +\n +or\n msgstr \n или\n -#: ../src/xfcetimer.c:792 -#, fuzzy -msgid Command to run: +#. ** +#: ../src/xfcetimer.c:673 +msgid +\n +The command to run msgstr \n Выполнить команду -#: ../src/xfcetimer.c:822 +#: ../src/xfcetimer.c:699 msgid Add new alarm msgstr Добавить новый сигнал -#: ../src/xfcetimer.c:861 +#: ../src/xfcetimer.c:737 msgid Edit alarm msgstr Редактировать сигнал -#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448 -msgid Xfce4 Timer Options -msgstr Настройки таймера Xfce4 +#: ../src/xfcetimer.c:1162 +msgid Properties +msgstr Параметры -#: ../src/xfcetimer.c:1450 -msgid Xfce 4 Timer Plugin +#: ../src/xfcetimer.c:1174 +msgid Xfce4 Timer Options msgstr Настройки таймера Xfce4 -#: ../src/xfcetimer.c:1499 -#, fuzzy -msgid Timer name +#: ../src/xfcetimer.c:1205 +msgid +Timer\n +name msgstr Таймер\n Название -#: ../src/xfcetimer.c:1504 +#: ../src/xfcetimer.c:1210 msgid Countdown period /\n Alarm time msgstr Период срабатывания -#: ../src/xfcetimer.c:1508 +#: ../src/xfcetimer.c:1214 msgid Alarm command msgstr Команда -#: ../src/xfcetimer.c:1564 -#, fuzzy -msgid Don't display a warning if an alarm command is set +#: ../src/xfcetimer.c:1257 +msgid +Don't display the warning window\n +if an alarm command is set msgstr Не показывать уведомление\n если задана команда -#: ../src/xfcetimer.c:1569 -msgid Selecting a timer starts it -msgstr - -#:
[Xfce4-commits] xfce4-places-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 0a10a02546b783d8ba27818ccf41a51c1673279d (commit) from f79da6ecadde26375cdfa0dce2ffa3f92dfc6f02 (commit) commit 0a10a02546b783d8ba27818ccf41a51c1673279d Author: Roman K mrdoctor...@gmail.com Date: Thu Dec 27 12:01:01 2012 +0100 l10n: Updated Russian (ru) translation to 100% New status: 44 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 19 +-- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/po/ru.po b/po/ru.po index 17e62c3..4194c73 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,11 +7,11 @@ # This file is distributed under the same license as the Thunar package. # Andrey Fedoseev andrey.fedos...@gmail.com, 2006. # Sergey Fedoseev fedoseev.ser...@gmail.com, 2006. -# +# # ### # translation of ru.po to Russian # Copyright (C) 1998-2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. -# +# # Max Valianskiy max...@vinchi.ru, 1998-1999. # Sergey Panov si...@mit.edu, 1999. # Valek Filippov f...@df.ru, 2000-2002. @@ -28,10 +28,10 @@ msgstr PO-Revision-Date: 2009-02-19 20:49+0700\n Last-Translator: Pavel Labushev p.labus...@gmail.com\n Language-Team: Russian xfce-i18n...@xfce.org\n -Language: ru\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: ru\n X-Poedit-Language: Russian\n X-Poedit-Country: RUSSIAN FEDERATION\n @@ -219,25 +219,24 @@ msgstr Открыть терминал #: ../panel-plugin/xfce4-popup-places.sh:28 msgid Usage: -msgstr +msgstr Загрузка: #: ../panel-plugin/xfce4-popup-places.sh:29 msgid OPTION -msgstr +msgstr ОПЦИЯ #: ../panel-plugin/xfce4-popup-places.sh:31 msgid Options: -msgstr +msgstr Опции: #: ../panel-plugin/xfce4-popup-places.sh:32 msgid Popup menu at current mouse position -msgstr +msgstr Контекстное меню на текущей позиции курсора #: ../panel-plugin/xfce4-popup-places.sh:33 -#, fuzzy msgid Show help options -msgstr Добавить кнопку _очистки списка +msgstr Отобразить опции помощи #: ../panel-plugin/xfce4-popup-places.sh:34 msgid Print version information and exit -msgstr +msgstr Отображает информацию о версии ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 4e3a6b463c68249e15898015c8a5cf912f288246 (commit) from e100731d07a5e4b3acb33c7060b6daf9b624c416 (commit) commit 4e3a6b463c68249e15898015c8a5cf912f288246 Author: Roman K mrdoctor...@gmail.com Date: Thu Dec 27 12:04:07 2012 +0100 l10n: Updated Russian (ru) translation to 100% New status: 349 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 159 +- 1 files changed, 84 insertions(+), 75 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9f2ca5c..7fa98a7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-11-26 04:00+\n +POT-Creation-Date: 2012-12-27 09:00+\n PO-Revision-Date: 2011-08-23 14:43+0300\n Last-Translator: Artem Zolochevskiy artem.zolochevs...@gmail.com\n Language-Team: Russian\n @@ -249,35 +249,35 @@ msgstr ID сокета #: ../dialogs/display-settings/main.c:138 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39 +#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 msgid Version information msgstr Информация о версии #: ../dialogs/accessibility-settings/main.c:192 #: ../dialogs/appearance-settings/main.c:966 -#: ../dialogs/display-settings/main.c:1941 +#: ../dialogs/display-settings/main.c:1943 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60 +#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 #, c-format msgid Type '%s --help' for usage. msgstr Наберите «%s --help» для информации об использовании. #: ../dialogs/accessibility-settings/main.c:211 #: ../dialogs/appearance-settings/main.c:985 -#: ../dialogs/display-settings/main.c:1960 +#: ../dialogs/display-settings/main.c:1962 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76 +#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 msgid The Xfce development team. All rights reserved. msgstr Команда разработчиков Xfce. Все права защищены. #: ../dialogs/accessibility-settings/main.c:212 #: ../dialogs/appearance-settings/main.c:986 -#: ../dialogs/display-settings/main.c:1961 +#: ../dialogs/display-settings/main.c:1963 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77 +#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 #, c-format msgid Please report bugs to %s. msgstr Об ошибках сообщайте на %s. @@ -297,54 +297,45 @@ msgid Appearance msgstr Внешний вид #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3 -#: ../dialogs/display-settings/main.c:117 -msgid Both -msgstr Значки и текст - -#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4 -msgid Both Horizontal -msgstr Значки и текст горизонтально - -#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5 msgid Custom _DPI setting: msgstr Задать _DPI: -#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6 +#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:2 msgid Customize the look of your desktop msgstr Настройки внешнего вид рабочего стола -#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7 +#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5 msgid DPI msgstr Разрешающая способность (DPI) -#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8 +#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6 msgid Default Fon_t msgstr Шриф_т по умолчанию -#: ../dialogs/appearance-settings/appearance-dialog.glade.h:9 +#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7 msgid Enable _event sounds msgstr Включить _звуки событий -#: ../dialogs/appearance-settings/appearance-dialog.glade.h:10 +#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8 msgid Enable e_ditable accelerators msgstr Включить ре_дактируемые комбинации клавиш -#: ../dialogs/appearance-settings/appearance-dialog.glade.h:11 +#: ../dialogs/appearance-settings/appearance-dialog.glade.h:9 msgid Enable input feedbac_k sounds msgstr Включить вх_одящие звуки обратной связи -#: ../dialogs/appearance-settings/appearance-dialog.glade.h:12 +#: ../dialogs/appearance-settings/appearance-dialog.glade.h:10 msgid
[Xfce4-commits] thunar-volman:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 0de202174ab6aa3dfa2d75b32aca9927d80d18c5 (commit) from 35ca8f7af5d7d5ff176042a1a22d878c40a5aaf9 (commit) commit 0de202174ab6aa3dfa2d75b32aca9927d80d18c5 Author: Roman K mrdoctor...@gmail.com Date: Thu Dec 27 12:04:52 2012 +0100 l10n: Updated Russian (ru) translation to 100% New status: 113 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9059fd4..6fbb93a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: thunar-volman\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-03-08 02:39+\n +POT-Creation-Date: 2012-12-27 06:42+\n PO-Revision-Date: 2009-02-20 12:42+0700\n Last-Translator: Pavel Labushev p.labus...@gmail.com\n Language-Team: Russian xfce-i18n...@xfce.org\n @@ -37,21 +37,21 @@ msgstr Вывести информацию о версии и завершит msgid Thunar Volume Manager msgstr Менеджер томов для Thunar -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid All rights reserved. msgstr Все права защищены. -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid Please report bugs to %s. msgstr Пожалуйста, сообщайте об ошибках по адресу %s. -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid There is no device with the sysfs path \%s\ msgstr Не найдено устройства по системному пути \%s\ -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid Must specify the sysfs path of new devices with --device-added msgstr @@ -213,13 +213,13 @@ msgstr Слушать _музыку #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid Unknown block device type -msgstr Неизвестный тип блочного устройства +msgid Unknown block device type \%s\ +msgstr Неизвестный тип блочного устройства «%s» #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid Device type not supported -msgstr Неподдерживаемый тип устройства +msgid Device type \%s\ not supported +msgstr Неподдерживаемый тип устройства «%s» #: ../thunar-volman/tvm-input-device.c:75 msgid Keyboard detected @@ -249,8 +249,8 @@ msgstr Обнаружена мышь #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid Unsupported input device type -msgstr Неизвестный тип устройства ввода +msgid Unsupported input device type \%s\ +msgstr Неизвестный тип устройства ввода «%s» #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -317,8 +317,8 @@ msgstr Обнаружен USB-принтер #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid Unsupported USB device type -msgstr Неподдерживаемое устройство USB +msgid Unsupported USB device type \%s\ +msgstr Неподдерживаемое устройство USB «%s» #. setup application name #: ../thunar-volman-settings/main.c:52 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add new tab option to right-click menu of location buttons.
Updating branch refs/heads/master
to 5b364c5a7f810b5d9d4298d8bc3c4d49c9f12bc6 (commit)
from 31f32e62cdd7d849c610313acd213c4611b57b98 (commit)
commit 5b364c5a7f810b5d9d4298d8bc3c4d49c9f12bc6
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 11:49:54 2012 +0100
Add new tab option to right-click menu of location buttons.
thunar/thunar-location-buttons-ui.xml |1 +
thunar/thunar-location-buttons.c | 28
thunar/thunar-window.c|1 +
3 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/thunar/thunar-location-buttons-ui.xml
b/thunar/thunar-location-buttons-ui.xml
index 7c50a2a..e8e5926 100644
--- a/thunar/thunar-location-buttons-ui.xml
+++ b/thunar/thunar-location-buttons-ui.xml
@@ -14,6 +14,7 @@
popup action=location-buttons-context-menu
menuitem action=location-buttons-open /
+menuitem action=location-buttons-open-in-new-tab /
menuitem action=location-buttons-open-in-new-window /
separator /
menuitem action=location-buttons-create-folder /
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index 45b3383..e480668 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -122,6 +122,8 @@ static void
thunar_location_buttons_action_empty_trash(GtkActi
ThunarLocationButtons *buttons);
static void thunar_location_buttons_action_open
(GtkAction *action,
ThunarLocationButtons *buttons);
+static void thunar_location_buttons_action_open_in_new_tab
(GtkAction *action,
+
ThunarLocationButtons *buttons);
static void thunar_location_buttons_action_open_in_new_window
(GtkAction *action,
ThunarLocationButtons *buttons);
static void thunar_location_buttons_action_paste_into_folder
(GtkAction *action,
@@ -166,6 +168,7 @@ static const GtkActionEntry action_entries[] =
{ location-buttons-down-folder, NULL, Down Folder, altDown, NULL,
G_CALLBACK (thunar_location_buttons_action_down_folder), },
{ location-buttons-context-menu, NULL, Context Menu, NULL, , NULL, },
{ location-buttons-open, GTK_STOCK_OPEN, N_(_Open), , NULL, G_CALLBACK
(thunar_location_buttons_action_open), },
+ { location-buttons-open-in-new-tab, NULL, N_(Open in New Tab), , NULL,
G_CALLBACK (thunar_location_buttons_action_open_in_new_tab), },
{ location-buttons-open-in-new-window, NULL, N_(Open in New Window), ,
NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_window), },
{ location-buttons-create-folder, NULL, N_(Create _Folder...), , NULL,
G_CALLBACK (thunar_location_buttons_action_create_folder), },
{ location-buttons-empty-trash, NULL, N_(_Empty Trash), , N_(Delete
all files and folders in the Trash), G_CALLBACK
(thunar_location_buttons_action_empty_trash), },
@@ -1226,6 +1229,11 @@ thunar_location_buttons_context_menu
(ThunarLocationButton *button,
thunar_gtk_action_set_tooltip (action, _(Open \%s\ in a new
window), display_name);
g_object_set_data_full (G_OBJECT (action), I_(thunar-file),
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
+ /* setup the Open in New Tab action */
+ action = gtk_action_group_get_action (buttons-action_group,
location-buttons-open-in-new-tab);
+ thunar_gtk_action_set_tooltip (action, _(Open \%s\ in a new
tab), display_name);
+ g_object_set_data_full (G_OBJECT (action), I_(thunar-file),
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
+
/* setup the Create Folder... action */
action = gtk_action_group_get_action (buttons-action_group,
location-buttons-create-folder);
thunar_gtk_action_set_tooltip (action, _(Create a new folder in
\%s\), display_name);
@@ -1369,6 +1377,26 @@ thunar_location_buttons_action_open (GtkAction
*action,
static void
+thunar_location_buttons_action_open_in_new_tab (GtkAction *action,
+ThunarLocationButtons *buttons)
+{
+ ThunarFile *directory;
+
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+
+ /* determine the directory for the action */
+ directory = g_object_get_data (G_OBJECT (action), thunar-file);
+ if (G_LIKELY (directory != NULL))
+{
+ /* open tab in thsi window */
+ thunar_navigator_open_new_tab (THUNAR_NAVIGATOR (buttons), directory);
+}
+}
+
+
+
+static void
thunar_location_buttons_action_open_in_new_window
[Xfce4-commits] thunar:master Use static quark to store the thunar file on buttons.
Updating branch refs/heads/master
to 99af430d8acef55b295d1882888e832d783c6434 (commit)
from 5b364c5a7f810b5d9d4298d8bc3c4d49c9f12bc6 (commit)
commit 99af430d8acef55b295d1882888e832d783c6434
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 11:54:08 2012 +0100
Use static quark to store the thunar file on buttons.
thunar/thunar-location-buttons.c | 30 ++
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index e480668..902b598 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -163,6 +163,10 @@ struct _ThunarLocationButtons
+static GQuark thunar_file_quark = 0;
+
+
+
static const GtkActionEntry action_entries[] =
{
{ location-buttons-down-folder, NULL, Down Folder, altDown, NULL,
G_CALLBACK (thunar_location_buttons_action_down_folder), },
@@ -227,6 +231,8 @@ thunar_location_buttons_class_init
(ThunarLocationButtonsClass *klass)
_(The amount of
space between the path buttons),
0, G_MAXINT, 3,
G_PARAM_READABLE));
+
+ thunar_file_quark = g_quark_from_static_string (button-thunar-file);
}
@@ -1221,23 +1227,23 @@ thunar_location_buttons_context_menu
(ThunarLocationButton *button,
/* setup the Open action */
action = gtk_action_group_get_action (buttons-action_group,
location-buttons-open);
thunar_gtk_action_set_tooltip (action, _(Open \%s\ in this
window), display_name);
- g_object_set_data_full (G_OBJECT (action), I_(thunar-file),
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
+ g_object_set_qdata_full (G_OBJECT (action), thunar_file_quark,
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
gtk_action_set_sensitive (action, (file !=
buttons-current_directory));
/* setup the Open in New Window action */
action = gtk_action_group_get_action (buttons-action_group,
location-buttons-open-in-new-window);
thunar_gtk_action_set_tooltip (action, _(Open \%s\ in a new
window), display_name);
- g_object_set_data_full (G_OBJECT (action), I_(thunar-file),
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
+ g_object_set_qdata_full (G_OBJECT (action), thunar_file_quark,
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
/* setup the Open in New Tab action */
action = gtk_action_group_get_action (buttons-action_group,
location-buttons-open-in-new-tab);
thunar_gtk_action_set_tooltip (action, _(Open \%s\ in a new
tab), display_name);
- g_object_set_data_full (G_OBJECT (action), I_(thunar-file),
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
+ g_object_set_qdata_full (G_OBJECT (action), thunar_file_quark,
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
/* setup the Create Folder... action */
action = gtk_action_group_get_action (buttons-action_group,
location-buttons-create-folder);
thunar_gtk_action_set_tooltip (action, _(Create a new folder in
\%s\), display_name);
- g_object_set_data_full (G_OBJECT (action), I_(thunar-file),
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
+ g_object_set_qdata_full (G_OBJECT (action), thunar_file_quark,
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
gtk_action_set_sensitive (action, thunar_file_is_writable (file));
gtk_action_set_visible (action, !thunar_file_is_trashed (file));
@@ -1249,13 +1255,13 @@ thunar_location_buttons_context_menu
(ThunarLocationButton *button,
/* setup the Paste Into Folder action */
action = gtk_action_group_get_action (buttons-action_group,
location-buttons-paste-into-folder);
thunar_gtk_action_set_tooltip (action, _(Move or copy files
previously selected by a Cut or Copy command into \%s\), display_name);
- g_object_set_data_full (G_OBJECT (action), I_(thunar-file),
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
+ g_object_set_qdata_full (G_OBJECT (action), thunar_file_quark,
g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
gtk_action_set_sensitive (action,
thunar_clipboard_manager_get_can_paste (clipboard));
/* setup the Properties... action */
action = gtk_action_group_get_action (buttons-action_group,
location-buttons-properties);
thunar_gtk_action_set_tooltip (action, _(View the properties of the
folder \%s\), display_name);
- g_object_set_data_full (G_OBJECT (action), I_(thunar-file),
g_object_ref (G_OBJECT (file)), (GDestroyNotify)
[Xfce4-commits] thunar:master Implement tab middle click in location buttons (bug #9684).
Updating branch refs/heads/master
to dbea7584253be6b36b666c43b205df9011058df9 (commit)
from 99af430d8acef55b295d1882888e832d783c6434 (commit)
commit dbea7584253be6b36b666c43b205df9011058df9
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 12:04:58 2012 +0100
Implement tab middle click in location buttons (bug #9684).
thunar/thunar-location-button.c | 30 +++---
thunar/thunar-location-buttons.c |9 +
2 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/thunar/thunar-location-button.c b/thunar/thunar-location-button.c
index 6769d9d..6c7180b 100644
--- a/thunar/thunar-location-button.c
+++ b/thunar/thunar-location-button.c
@@ -35,6 +35,7 @@
#include thunar/thunar-icon-factory.h
#include thunar/thunar-location-button.h
#include thunar/thunar-pango-extensions.h
+#include thunar/thunar-preferences.h
#include thunar/thunar-private.h
@@ -217,8 +218,9 @@ thunar_location_button_class_init
(ThunarLocationButtonClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1,
+ G_TYPE_BOOLEAN);
/**
* ThunarLocationButton::context-menu:
@@ -573,6 +575,8 @@ thunar_location_button_button_release_event (GtkWidget
*button,
ThunarLocationButton
*location_button)
{
ThunarApplication *application;
+ ThunarPreferences *preferences;
+ gboolean open_in_tab;
_thunar_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button),
FALSE);
@@ -585,10 +589,22 @@ thunar_location_button_button_release_event (GtkWidget
*button,
/* verify that we still have a valid file */
if (G_LIKELY (location_button-file != NULL))
{
- /* open a new window for the folder */
- application = thunar_application_get ();
- thunar_application_open_window (application, location_button-file,
gtk_widget_get_screen (GTK_WIDGET (location_button)), NULL);
- g_object_unref (G_OBJECT (application));
+ preferences = thunar_preferences_get ();
+ g_object_get (preferences, misc-middle-click-in-tab, open_in_tab,
NULL);
+ g_object_unref (preferences);
+
+ if (open_in_tab)
+{
+ /* open in tab */
+ g_signal_emit (G_OBJECT (location_button),
location_button_signals[CLICKED], 0, TRUE);
+}
+ else
+{
+ /* open a new window for the folder */
+ application = thunar_application_get ();
+ thunar_application_open_window (application,
location_button-file, gtk_widget_get_screen (GTK_WIDGET (location_button)),
NULL);
+ g_object_unref (G_OBJECT (application));
+}
}
}
@@ -990,7 +1006,7 @@ void
thunar_location_button_clicked (ThunarLocationButton *location_button)
{
_thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
- g_signal_emit (G_OBJECT (location_button), location_button_signals[CLICKED],
0);
+ g_signal_emit (G_OBJECT (location_button), location_button_signals[CLICKED],
0, FALSE);
}
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index 902b598..62325e8 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -108,6 +108,7 @@ static void thunar_location_buttons_scroll_left
(GtkWidg
static void thunar_location_buttons_scroll_right
(GtkWidget *button,
ThunarLocationButtons *buttons);
static void thunar_location_buttons_clicked
(ThunarLocationButton *button,
+
gbooleanopen_in_tab,
ThunarLocationButtons *buttons);
static void thunar_location_buttons_context_menu
(ThunarLocationButton *button,
GdkEventButton *event,
@@ -1114,6 +1115,7 @@ thunar_location_buttons_scroll_right (GtkWidget
*button,
static void
thunar_location_buttons_clicked (ThunarLocationButton *button,
+ gboolean open_in_tab,
ThunarLocationButtons *buttons)
{
ThunarFile *directory;
@@ -1125,6 +1127,13 @@ thunar_location_buttons_clicked (ThunarLocationButton
*button,
/* determine the directory associated with the clicked button */
directory =
[Xfce4-commits] thunar:master Update shortcuts headers when removing a shortcut (bug #9651).
Updating branch refs/heads/master to 2458918c352addf566ec8e187892307176b71d44 (commit) from dbea7584253be6b36b666c43b205df9011058df9 (commit) commit 2458918c352addf566ec8e187892307176b71d44 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 12:08:51 2012 +0100 Update shortcuts headers when removing a shortcut (bug #9651). thunar/thunar-shortcuts-model.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c index 605d5a4..5f6ab62 100644 --- a/thunar/thunar-shortcuts-model.c +++ b/thunar/thunar-shortcuts-model.c @@ -1182,6 +1182,9 @@ thunar_shortcuts_model_remove_shortcut (ThunarShortcutsModel *model, /* the shortcuts list was changed, so write the gtk bookmarks file */ if (needs_save) thunar_shortcuts_model_save (model); + + /* update header visibility */ + thunar_shortcuts_model_header_visibility (model); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] mousepad:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 59%
Updating branch refs/heads/master to b7b6571427a17f8343bda5810f9a830be2c0775a (commit) from d8a3818f250fcd65c1722f8f358322cdf7e5c7dd (commit) commit b7b6571427a17f8343bda5810f9a830be2c0775a Author: Walter cheuk wwych...@gmail.com Date: Thu Dec 27 12:15:33 2012 +0100 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 59% New status: 147 messages complete with 1 fuzzy and 99 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_TW.po | 54 +++--- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 06123bd..f6ad617 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: mousepad master\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-11-25 03:27+\n +POT-Creation-Date: 2012-12-27 05:51+\n PO-Revision-Date: 2012-07-11 18:28+0800\n Last-Translator: Cheng-Chia Tseng pswo10...@gmail.com\n Language-Team: chinese-l10n chinese-l...@googlegroups.com\n @@ -317,7 +317,7 @@ msgstr 頁面設置 #: ../mousepad/mousepad-print.c:605 msgid _Adjust page size and orientation -msgstr +msgstr 調整頁面大小及方向(_A) #: ../mousepad/mousepad-print.c:615 msgid Appearance @@ -361,7 +361,7 @@ msgstr #: ../mousepad/mousepad-print.c:729 msgid Line numbers: -msgstr +msgstr 行數： #. set dialog properties #: ../mousepad/mousepad-replace-dialog.c:167 @@ -371,7 +371,7 @@ msgstr 取代 #: ../mousepad/mousepad-replace-dialog.c:174 #: ../mousepad/mousepad-replace-dialog.c:540 msgid _Replace -msgstr +msgstr 取代(_R) #: ../mousepad/mousepad-replace-dialog.c:192 msgid _Search for: @@ -400,7 +400,7 @@ msgstr #. case sensitive #: ../mousepad/mousepad-replace-dialog.c:253 msgid Case sensi_tive -msgstr +msgstr 區分大小寫(_T) #. match whole word #: ../mousepad/mousepad-replace-dialog.c:260 @@ -440,11 +440,11 @@ msgstr #: ../mousepad/mousepad-search-bar.c:208 msgid _Next -msgstr +msgstr 下一個(_N) #: ../mousepad/mousepad-search-bar.c:219 msgid _Previous -msgstr +msgstr 上一個(_P) #: ../mousepad/mousepad-search-bar.c:230 msgid Highlight _All @@ -465,7 +465,7 @@ msgstr #: ../mousepad/mousepad-statusbar.c:169 msgid Toggle the overwrite mode -msgstr +msgstr 切換覆寫模式 #. overwrite label #: ../mousepad/mousepad-statusbar.c:174 @@ -507,7 +507,7 @@ msgstr 檔案(_F) #: ../mousepad/mousepad-window.c:403 msgid _New -msgstr +msgstr 新增(_N) #: ../mousepad/mousepad-window.c:403 msgid Create a new document @@ -535,7 +535,7 @@ msgstr 開啟檔案 #: ../mousepad/mousepad-window.c:407 msgid Op_en Recent -msgstr +msgstr 最近開啟檔案(_E) #: ../mousepad/mousepad-window.c:408 msgid No items found @@ -719,11 +719,11 @@ msgstr 文字(_T) #: ../mousepad/mousepad-window.c:441 msgid _Convert -msgstr +msgstr 轉換(_C) #: ../mousepad/mousepad-window.c:442 msgid to _Uppercase -msgstr +msgstr 為大寫(_U) #: ../mousepad/mousepad-window.c:442 msgid Change the case of the selection to uppercase @@ -731,7 +731,7 @@ msgstr #: ../mousepad/mousepad-window.c:443 msgid to _Lowercase -msgstr +msgstr 為小寫(_L) #: ../mousepad/mousepad-window.c:443 msgid Change the case of the selection to lowercase @@ -848,7 +848,7 @@ msgstr 檔案類型(_F) #: ../mousepad/mousepad-window.c:462 msgid _Navigation -msgstr +msgstr 導覽(_N) #: ../mousepad/mousepad-window.c:463 msgid _Previous Tab @@ -892,11 +892,11 @@ msgstr 關於此應用程式 #: ../mousepad/mousepad-window.c:474 msgid Line N_umbers -msgstr +msgstr 行號(_U) #: ../mousepad/mousepad-window.c:474 msgid Show line numbers -msgstr +msgstr 顯示行號 #: ../mousepad/mousepad-window.c:475 msgid St_atusbar @@ -924,7 +924,7 @@ msgstr 按 tab 鍵時插入空格 #: ../mousepad/mousepad-window.c:478 msgid _Word Wrap -msgstr +msgstr 文字換行(_W) #: ../mousepad/mousepad-window.c:478 msgid Toggle breaking lines in between words @@ -944,7 +944,7 @@ msgstr Unix (_LF) #: ../mousepad/mousepad-window.c:484 msgid Set the line ending of the document to Unix (LF) -msgstr +msgstr 將文件的每行結尾改為 Unix 式 (LF) #: ../mousepad/mousepad-window.c:485 msgid Mac (_CR) @@ -952,7 +952,7 @@ msgstr Mac (_CR) #: ../mousepad/mousepad-window.c:485 msgid Set the line ending of the document to Mac (CR) -msgstr +msgstr 將文件的每行結尾改為 Mac 式 (CR) #: ../mousepad/mousepad-window.c:486 msgid DOS / Windows (C_R LF) @@ -960,7 +960,7 @@ msgstr DOS / Windows (C_R LF) #: ../mousepad/mousepad-window.c:486 msgid Set the line ending of the document to DOS / Windows (CR LF) -msgstr +msgstr 將文件的每行結尾改為 DOS / Windows 式 (CR LF) #. add the label with the root warning #: ../mousepad/mousepad-window.c:662 @@ -990,7 +990,7 @@ msgstr 設定自訂 tab 大小 #: ../mousepad/mousepad-window.c:2132 #, c-format msgid Ot_her (%d)... -msgstr +msgstr 其他(_H) (%d)... #. set action label #: ../mousepad/mousepad-window.c:2143 @@ -1006,7 +1006,7 @@ msgstr 字元集 #: ../mousepad/mousepad-window.c:2580 #, c-format msgid Open '%s' -msgstr 開啟 '%s' +msgstr 開啟「%s」 #:
[Xfce4-commits] thunar:master Revert Directly popup menus on selected items (bug #3550).
Updating branch refs/heads/master
to b461fc9f02c38a0e862696f2b22175d0f146ce5b (commit)
from 2458918c352addf566ec8e187892307176b71d44 (commit)
commit b461fc9f02c38a0e862696f2b22175d0f146ce5b
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 12:20:52 2012 +0100
Revert Directly popup menus on selected items (bug #3550).
This reverts commit d0513de8a5faa8f2f9436a8b059e674a2deea103.
thunar/thunar-details-view.c | 11 ---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index a22cec5..05a539b 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -691,10 +691,15 @@ thunar_details_view_button_press_event (GtkTreeView
*tree_view,
gtk_tree_selection_select_path (selection, path);
}
gtk_tree_path_free (path);
-}
- /* open the context menu */
- thunar_standard_view_context_menu (THUNAR_STANDARD_VIEW (details_view),
event-button, event-time);
+ /* queue the menu popup */
+ thunar_standard_view_queue_popup (THUNAR_STANDARD_VIEW
(details_view), event);
+}
+ else
+{
+ /* open the context menu */
+ thunar_standard_view_context_menu (THUNAR_STANDARD_VIEW
(details_view), event-button, event-time);
+}
return TRUE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Revert Remove right-click drag possibility (bug #3549).
Updating branch refs/heads/master
to bb96457d8cf1a83052197b1e722eda3c59eb7433 (commit)
from b461fc9f02c38a0e862696f2b22175d0f146ce5b (commit)
commit bb96457d8cf1a83052197b1e722eda3c59eb7433
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 12:21:45 2012 +0100
Revert Remove right-click drag possibility (bug #3549).
This reverts commit edc8e5da5777813956cd8b30a4f64f586c97a3ee.
With a modification to always allow a minimum timeout value
of 225ms to still fix bug #3549.
thunar/thunar-abstract-icon-view.c |2 +-
thunar/thunar-standard-view.c | 145
2 files changed, 146 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-abstract-icon-view.c
b/thunar/thunar-abstract-icon-view.c
index b45bfc0..c79b747 100644
--- a/thunar/thunar-abstract-icon-view.c
+++ b/thunar/thunar-abstract-icon-view.c
@@ -500,7 +500,7 @@ thunar_abstract_icon_view_button_press_event (ExoIconView
*view,
gtk_tree_path_free (path);
/* queue the menu popup */
- thunar_standard_view_context_menu (THUNAR_STANDARD_VIEW
(abstract_icon_view), event-button, event-time);
+ thunar_standard_view_queue_popup (THUNAR_STANDARD_VIEW
(abstract_icon_view), event);
}
else if ((event-state gtk_accelerator_get_default_mod_mask ()) == 0)
{
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 7cdaadb..e82d271 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -206,6 +206,12 @@ static GClosure
*thunar_standard_view_new_files_closure (Thu
GtkWidget*source_view);
static void thunar_standard_view_new_files
(ThunarStandardView *standard_view,
GList*path_list);
+static gboolean thunar_standard_view_button_release_event
(GtkWidget*view,
+
GdkEventButton *event,
+
ThunarStandardView *standard_view);
+static gboolean thunar_standard_view_motion_notify_event
(GtkWidget*view,
+
GdkEventMotion *event,
+
ThunarStandardView *standard_view);
static gboolean thunar_standard_view_key_press_event
(GtkWidget*view,
GdkEventKey *event,
ThunarStandardView *standard_view);
@@ -272,6 +278,8 @@ static void
thunar_standard_view_sort_column_changed(Gtk
static void thunar_standard_view_loading_unbound
(gpointer user_data);
static gboolean thunar_standard_view_drag_scroll_timer
(gpointer user_data);
static void thunar_standard_view_drag_scroll_timer_destroy
(gpointer user_data);
+static gboolean thunar_standard_view_drag_timer
(gpointer user_data);
+static void thunar_standard_view_drag_timer_destroy
(gpointer user_data);
static void thunar_standard_view_finished_thumbnailing
(ThunarThumbnailer*thumbnailer,
guint request,
ThunarStandardView *standard_view);
@@ -332,6 +340,7 @@ struct _ThunarStandardViewPrivate
/* right-click drag/popup support */
GList *drag_g_file_list;
guint drag_scroll_timer_id;
+ guint drag_timer_id;
gintdrag_x;
gintdrag_y;
@@ -808,6 +817,10 @@ thunar_standard_view_dispose (GObject *object)
if (G_UNLIKELY (standard_view-priv-drag_scroll_timer_id != 0))
g_source_remove (standard_view-priv-drag_scroll_timer_id);
+ /* be sure to cancel any pending drag timer */
+ if (G_UNLIKELY (standard_view-priv-drag_timer_id != 0))
+g_source_remove (standard_view-priv-drag_timer_id);
+
/* reset the UI manager property */
thunar_component_set_ui_manager (THUNAR_COMPONENT (standard_view), NULL);
@@ -2921,6 +2934,56 @@ thunar_standard_view_new_files (ThunarStandardView
*standard_view,
static gboolean
[Xfce4-commits] thunar:master Put * around string if * and ? are not used in the pattern.
Updating branch refs/heads/master
to 394e115312f2ddc5a06f5ab9f8ab073a614c79a1 (commit)
from bb96457d8cf1a83052197b1e722eda3c59eb7433 (commit)
commit 394e115312f2ddc5a06f5ab9f8ab073a614c79a1
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 12:39:59 2012 +0100
Put * around string if * and ? are not used in the pattern.
This makes matching filenames easier. Since you don't
have to type *name*, but name is sufficient.
thunar/thunar-standard-view.c | 37 ++---
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index e82d271..0dc3a68 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -2553,14 +2553,16 @@ static void
thunar_standard_view_action_select_by_pattern (GtkAction *action,
ThunarStandardView
*standard_view)
{
- GtkWidget *window;
- GtkWidget *dialog;
- GtkWidget *hbox;
- GtkWidget *label;
- GtkWidget *entry;
- GList *paths;
- GList *lp;
- gint response;
+ GtkWidget *window;
+ GtkWidget *dialog;
+ GtkWidget *hbox;
+ GtkWidget *label;
+ GtkWidget *entry;
+ GList *paths;
+ GList *lp;
+ gint response;
+ const gchar *pattern;
+ gchar *pattern_extended = NULL;
_thunar_return_if_fail (GTK_IS_ACTION (action));
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
@@ -2585,7 +2587,8 @@ thunar_standard_view_action_select_by_pattern (GtkAction
*action,
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
- entry = g_object_new (GTK_TYPE_ENTRY, activates-default, TRUE, NULL);
+ entry = gtk_entry_new ();
+ gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
gtk_widget_show (entry);
@@ -2593,8 +2596,19 @@ thunar_standard_view_action_select_by_pattern (GtkAction
*action,
response = gtk_dialog_run (GTK_DIALOG (dialog));
if (response == GTK_RESPONSE_OK)
{
- /* select all files that match the entered pattern */
- paths = thunar_list_model_get_paths_for_pattern (standard_view-model,
gtk_entry_get_text (GTK_ENTRY (entry)));
+ /* get entered pattern */
+ pattern = gtk_entry_get_text (GTK_ENTRY (entry));
+ if (pattern != NULL
+ strchr (pattern, '*') == NULL
+ strchr (pattern, '?') == NULL)
+{
+ /* make file matching pattern */
+ pattern_extended = g_strdup_printf (*%s*, pattern);
+ pattern = pattern_extended;
+}
+
+ /* select all files that match pattern */
+ paths = thunar_list_model_get_paths_for_pattern (standard_view-model,
pattern);
THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)-unselect_all
(standard_view);
/* set the cursor and scroll to the first selected item */
@@ -2607,6 +2621,7 @@ thunar_standard_view_action_select_by_pattern (GtkAction
*action,
gtk_tree_path_free (lp-data);
}
g_list_free (paths);
+ g_free (pattern_extended);
}
gtk_widget_destroy (dialog);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Don't abort startup if dbus failed.
Updating branch refs/heads/master to 0ba896ba9342f464b284a2513fa49280949cdc13 (commit) from 394e115312f2ddc5a06f5ab9f8ab073a614c79a1 (commit) commit 0ba896ba9342f464b284a2513fa49280949cdc13 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 13:07:46 2012 +0100 Don't abort startup if dbus failed. This could happen with session startup, multiple request the dbus, but only 1 wins. thunar/main.c |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/thunar/main.c b/thunar/main.c index bb42f68..4c31953 100644 --- a/thunar/main.c +++ b/thunar/main.c @@ -293,7 +293,7 @@ error0: /* check if the name was requested successfully */ if (!thunar_dbus_service_has_connection (dbus_service)) -goto dbus_name_failed; +thunar_application_set_daemon (application, FALSE); #endif } else @@ -310,7 +310,6 @@ error0: gtk_main (); #ifdef HAVE_DBUS - dbus_name_failed: if (dbus_service != NULL) g_object_unref (G_OBJECT (dbus_service)); #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Don't idle the volume loading in the shortcuts model.
Updating branch refs/heads/master
to a8a2ce8c41578ece8fdcd79c9ab82eed6e0073d5 (commit)
from 0ba896ba9342f464b284a2513fa49280949cdc13 (commit)
commit a8a2ce8c41578ece8fdcd79c9ab82eed6e0073d5
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 13:08:35 2012 +0100
Don't idle the volume loading in the shortcuts model.
Not needed because the device monitor is started in sync
in other objects. Also caused a crash if the model was
finalized before the monitor was loaded.
thunar/thunar-shortcuts-model.c | 28 +++-
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index 5f6ab62..ce05c9d 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -115,9 +115,9 @@ static gboolean
thunar_shortcuts_model_drag_data_get (GtkTreeDrag
static gboolean thunar_shortcuts_model_drag_data_delete
(GtkTreeDragSource *source,
GtkTreePath *path);
static void thunar_shortcuts_model_header_visibility
(ThunarShortcutsModel *model);
+static void thunar_shortcuts_model_shortcut_devices
(ThunarShortcutsModel *model);
static void thunar_shortcuts_model_shortcut_places
(ThunarShortcutsModel *model);
static void thunar_shortcuts_model_shortcut_network
(ThunarShortcutsModel *model);
-static gboolean thunar_shortcuts_model_devices_load (gpointer
data);
static gboolean thunar_shortcuts_model_get_hidden
(ThunarShortcutsModel *model,
ThunarShortcut*shortcut);
static void thunar_shortcuts_model_add_shortcut
(ThunarShortcutsModel *model,
@@ -173,7 +173,6 @@ struct _ThunarShortcutsModel
gchar **hidden_bookmarks;
ThunarDeviceMonitor *device_monitor;
- guint devices_monitor_idle_id;
gint64bookmarks_time;
GFile*bookmarks_file;
@@ -273,7 +272,7 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
G_OBJECT (model), hidden-bookmarks);
/* load volumes */
- model-devices_monitor_idle_id = g_idle_add_full (G_PRIORITY_DEFAULT,
thunar_shortcuts_model_devices_load, model, NULL);
+ thunar_shortcuts_model_shortcut_devices (model);
/* add network */
thunar_shortcuts_model_shortcut_network (model);
@@ -299,10 +298,6 @@ thunar_shortcuts_model_finalize (GObject *object)
if (model-bookmarks_idle_id != 0)
g_source_remove (model-bookmarks_idle_id);
- /* stop device monitor loading */
- if (model-devices_monitor_idle_id != 0)
-g_source_remove (model-devices_monitor_idle_id);
-
/* free all shortcuts */
g_list_foreach (model-shortcuts, (GFunc) thunar_shortcut_free, model);
g_list_free (model-shortcuts);
@@ -877,15 +872,12 @@ thunar_shortcuts_model_header_visibility
(ThunarShortcutsModel *model)
-static gboolean
-thunar_shortcuts_model_devices_load (gpointer data)
+static void
+thunar_shortcuts_model_shortcut_devices (ThunarShortcutsModel *model)
{
- ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (data);
- ThunarShortcut *shortcut;
- GList*devices;
- GList*lp;
-
- GDK_THREADS_ENTER ();
+ ThunarShortcut *shortcut;
+ GList *devices;
+ GList *lp;
/* add the devices heading */
shortcut = g_slice_new0 (ThunarShortcut);
@@ -914,18 +906,12 @@ thunar_shortcuts_model_devices_load (gpointer data)
}
g_list_free (devices);
- GDK_THREADS_LEAVE ();
-
/* monitor for changes */
g_signal_connect (model-device_monitor, device-added, G_CALLBACK
(thunar_shortcuts_model_device_added), model);
g_signal_connect (model-device_monitor, device-removed, G_CALLBACK
(thunar_shortcuts_model_device_removed), model);
g_signal_connect (model-device_monitor, device-changed, G_CALLBACK
(thunar_shortcuts_model_device_changed), model);
thunar_shortcuts_model_header_visibility (model);
-
- model-devices_monitor_idle_id = 0;
-
- return FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xfce-4.10 l10n: Updated Bulgarian (bg) translation to 100%
Updating branch refs/heads/xfce-4.10 to 5b54ceddea47f6321a2eb14f271361dc2234 (commit) from 4e2f3d42f4b883ab38076b82cd322fc1c3d08491 (commit) commit 5b54ceddea47f6321a2eb14f271361dc2234 Author: Kiril Kirilov cybercop_mont...@abv.bg Date: Thu Dec 27 13:18:14 2012 +0100 l10n: Updated Bulgarian (bg) translation to 100% New status: 338 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/bg.po | 47 +-- 1 files changed, 21 insertions(+), 26 deletions(-) diff --git a/po/bg.po b/po/bg.po index f454131..39c3166 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,19 +1,14 @@ -# Russian translations for xfce4-settings package. +# Bulgarian translations for xfce4-settings package. # Copyright (C) 2009 The Xfce Development Team. # This file is distributed under the same license as the xfce4-settings package. -# Ilya Shestopalov yast...@yahoo.com, 2009. -# Denis Koryavov dkorya...@yandex.ru 2009, 2010. -# Aleksandr Ponomarenko davian...@gmail.com 2010, 2011. -# Dmitrij Smirnov ot...@igus.lv, 2011. -# Alexandr Boltris a...@altlinux.org, 2011. -# Artem Zolochevskiy artem.zolochevs...@gmail.com, 2011. +# Kiril Kirilov (Cybercop) cybercop_mont...@abv.bg 2012 . # msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-12-26 11:39+\n -PO-Revision-Date: 2012-12-27 13:57+0200\n +PO-Revision-Date: 2012-12-27 14:12+0200\n Last-Translator: cybercop cybercop_mont...@abv.bg\n Language-Team: Russian\n Language: ru\n @@ -24,7 +19,7 @@ msgstr #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1 msgid Acceleration _profile: -msgstr Профил ускорение: +msgstr Профил на ускорение: #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2 msgid Acceleration _time: @@ -1442,7 +1437,7 @@ msgstr Диспечер на настройките на Xfce #: ../xfce4-settings-manager/main.c:40 msgid Settings dialog to show -msgstr да се покаже прозорецът на настройките +msgstr Да се покаже прозорецът на настройките #: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186 msgid _All Settings @@ -1470,26 +1465,26 @@ msgstr Мениджър за настройки в графичен режим msgid Settings Manager msgstr Миниджър на настройките -#~ msgid This property name is not valid. -#~ msgstr Это имя свойства не является правильным. +msgid This property name is not valid. +msgstr Името на това свойство не е валидно. -#~ msgid Enabled -#~ msgstr Включено +msgid Enabled +msgstr Включено -#~ msgid Name: -#~ msgstr Название: +msgid Name: +msgstr Име: -#~ msgid Xfconf channels -#~ msgstr Каналы Xfconf +msgid Xfconf channels +msgstr Канали на Xfconf -#~ msgid Use this area to _test the settings above: -#~ msgstr Используйте это поле для _тестирования указанных выше настроек: +msgid Use this area to _test the settings above: +msgstr Използвайте това поле, за да изпробвате настройките: -#~ msgid _General -#~ msgstr _Общее +msgid _General +msgstr Общи -#~ msgid _Overview -#~ msgstr _Обзор +msgid _Overview +msgstr Преглед -#~ msgid Failed to open the documentation -#~ msgstr Не удалось открыть документацию +msgid Failed to open the documentation +msgstr Неоспех при отварянето на документацията ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xfce-4.10 l10n: Updated Bulgarian (bg) translation to 100%
Updating branch refs/heads/xfce-4.10 to 8592a0501ff0b0e8b642775bb922e9d3032c72a1 (commit) from 5b54ceddea47f6321a2eb14f271361dc2234 (commit) commit 8592a0501ff0b0e8b642775bb922e9d3032c72a1 Author: Kiril Kirilov cybercop_mont...@abv.bg Date: Thu Dec 27 13:20:46 2012 +0100 l10n: Updated Bulgarian (bg) translation to 100% New status: 338 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/bg.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/bg.po b/po/bg.po index 39c3166..d30ff24 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgstr POT-Creation-Date: 2012-12-26 11:39+\n PO-Revision-Date: 2012-12-27 14:12+0200\n Last-Translator: cybercop cybercop_mont...@abv.bg\n -Language-Team: Russian\n +Language-Team: Bulgarian\n Language: ru\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Check trash longer with session startup (bug #9513).
Updating branch refs/heads/master
to 689a52e5e93437bda2cbcb69c9a4ecd1fc0dbba9 (commit)
from a8a2ce8c41578ece8fdcd79c9ab82eed6e0073d5 (commit)
commit 689a52e5e93437bda2cbcb69c9a4ecd1fc0dbba9
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 13:19:36 2012 +0100
Check trash longer with session startup (bug #9513).
Check for 15 seconds with 3 second intervals or trash items
were found.
thunar/thunar-session-client.c | 31 ++-
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/thunar/thunar-session-client.c b/thunar/thunar-session-client.c
index 1c529f4..3465709 100644
--- a/thunar/thunar-session-client.c
+++ b/thunar/thunar-session-client.c
@@ -75,10 +75,12 @@ struct _ThunarSessionClientClass
struct _ThunarSessionClient
{
GObject __parent__;
+
gchar *path;
gchar *id;
guint trash_load_idle;
+ guint trash_checks;
#ifdef HAVE_LIBSM
SmcConn connection;
@@ -279,8 +281,7 @@ thunar_session_client_restore_trash (gpointer data)
ThunarSessionClient *session_client = THUNAR_SESSION_CLIENT (data);
GFile *trash;
ThunarFile *directory;
-
- session_client-trash_load_idle = 0;
+ guint32 item_count = 0;
/* make sure the trash is loaded */
trash = thunar_g_file_new_for_trash ();
@@ -288,9 +289,24 @@ thunar_session_client_restore_trash (gpointer data)
g_object_unref (trash);
if (G_LIKELY (directory != NULL))
-thunar_file_reload (directory);
+{
+ thunar_file_reload (directory);
+ item_count = thunar_file_get_item_count (directory);
+}
+
+ /* continue checking for 15 seconds or files are found */
+ return (session_client-trash_checks++ 5 item_count == 0);
+}
+
- return FALSE;
+
+static void
+thunar_session_client_restore_finised (gpointer data)
+{
+ ThunarSessionClient *session_client = THUNAR_SESSION_CLIENT (data);
+
+ session_client-trash_load_idle = 0;
+ session_client-trash_checks = 0;
}
@@ -342,7 +358,12 @@ thunar_session_client_restore (ThunarSessionClient
*session_client)
if (thunar_window_set_directories (THUNAR_WINDOW (window), uris,
active_tab))
{
/* add idle to make sure the trash status is up2date (bug #9513) */
- session_client-trash_load_idle = g_timeout_add_seconds (2,
thunar_session_client_restore_trash, session_client);
+ if (session_client-trash_load_idle == 0)
+{
+ session_client-trash_load_idle =
+ g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE, 3,
thunar_session_client_restore_trash,
+ session_client,
thunar_session_client_restore_finised);
+}
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xfce-4.10 l10n: Updated Bulgarian (bg) translation to 100%
Updating branch refs/heads/xfce-4.10 to 4d31f0f15532af319eaae4e9e59ec0753d6dbf60 (commit) from 8592a0501ff0b0e8b642775bb922e9d3032c72a1 (commit) commit 4d31f0f15532af319eaae4e9e59ec0753d6dbf60 Author: Kiril Kirilov cybercop_mont...@abv.bg Date: Thu Dec 27 13:22:39 2012 +0100 l10n: Updated Bulgarian (bg) translation to 100% New status: 338 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/bg.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/bg.po b/po/bg.po index d30ff24..7b90d66 100644 --- a/po/bg.po +++ b/po/bg.po @@ -11,7 +11,7 @@ msgstr PO-Revision-Date: 2012-12-27 14:12+0200\n Last-Translator: cybercop cybercop_mont...@abv.bg\n Language-Team: Bulgarian\n -Language: ru\n +Language: bg\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:xfce-4.10 l10n: Updated Bulgarian (bg) translation to 99%
Updating branch refs/heads/xfce-4.10 to ecd5060e86d74e94ad07191e141a2514429b9a10 (commit) from 3362860a03443680ae0455ebd2120875e68b7762 (commit) commit ecd5060e86d74e94ad07191e141a2514429b9a10 Author: Kiril Kirilov cybercop_mont...@abv.bg Date: Thu Dec 27 13:28:01 2012 +0100 l10n: Updated Bulgarian (bg) translation to 99% New status: 677 messages complete with 0 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/bg.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/bg.po b/po/bg.po index c4d0235..62d51cf 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgstr Project-Id-Version: 1.4.0\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-12-24 03:54+\n -PO-Revision-Date: 2012-12-25 15:52+0200\n +PO-Revision-Date: 2012-12-27 14:30+0200\n Last-Translator: cybercop cybercop_mont...@abv.bg\n Language-Team: Bulgarian b...@li.org\n Language: bg\n @@ -26,11 +26,11 @@ msgstr Отваряне на диалог за масово преименув #: ../thunar/main.c:64 msgid Run in daemon mode -msgstr Стартирай в режим Demon +msgstr Стартирай в диспечерски режим #: ../thunar/main.c:66 msgid Run in daemon mode (not supported) -msgstr Стартирай в режим Demon (Не се поддържа) +msgstr Стартирай в диспечерски режим (Не се поддържа) #: ../thunar/main.c:70 msgid Quit a running Thunar instance ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Updates for release.
Updating branch refs/heads/master to 7f8e4b111ad2343ed78adc584cd63a1972612f0f (commit) from 689a52e5e93437bda2cbcb69c9a4ecd1fc0dbba9 (commit) commit 7f8e4b111ad2343ed78adc584cd63a1972612f0f Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 13:26:30 2012 +0100 Updates for release. NEWS| 22 ++ configure.ac.in |4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index b5478a7..72827b7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,25 @@ +1.6.2 += +- Don't abort startup if dbus failed. +- Put * around string if * and ? are not used in the pattern. +- Revert Remove right-click drag possibility (bug #3549). +- Revert Directly popup menus on selected items (bug #3550). +- Update shortcuts headers when removing a shortcut (bug #9651). +- Implement tab middle click in location buttons (bug #9684). +- Add new tab option to right-click menu of location buttons. +- Small improvement in thumbnail frame. +- Key combos not working with location buttons (bug #9625). +- Open tree node if expanded and mounted (bug #9603). +- Use some more cairo renderering. +- Make Desktop in Go menu translatable (bug #9616). +- Send to menu not updated for directories (bug #9618). +- Fix freeze on /proc/kmsg. +- Show all volumes in the devices list. +- Removed translations: Dzongkha, Kazakh, Kurdish, Macedonian. +- Translation updates: Arabic, Czech, Italian, Japanese, + Georgian, Korean, Dutch (Flemish), Polish, Portuguese, + Russian, Ukrainian. + 1.6.1 = - Fix bulk renamer url to the wiki. diff --git a/configure.ac.in b/configure.ac.in index c0b4de5..bb48d65 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -25,10 +25,10 @@ m4_define([thunarx_verinfo], [0:0:0]) m4_define([thunarx_version_api], [2]) m4_define([thunar_version_major], [1]) m4_define([thunar_version_minor], [6]) -m4_define([thunar_version_micro], [1]) +m4_define([thunar_version_micro], [2]) m4_define([thunar_version_nano], []) m4_define([thunar_version_build], [@REVISION@]) -m4_define([thunar_version_tag], [git]) +m4_define([thunar_version_tag], []) 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 https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Post release tag bump.
Updating branch refs/heads/master to 06b2b62b6b73e3ee49b0410f00b3b0eb36655291 (commit) from 7f8e4b111ad2343ed78adc584cd63a1972612f0f (commit) commit 06b2b62b6b73e3ee49b0410f00b3b0eb36655291 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 13:29:38 2012 +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 bb48d65..84ac30c 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -28,7 +28,7 @@ m4_define([thunar_version_minor], [6]) m4_define([thunar_version_micro], [2]) 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 https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar|thunar-1.6.2 Creating annotated tag thunar-1.6.2
Updating annotated tag refs/tags/thunar-1.6.2 as new annotated tag to e86f742a5c1a6d04f4f5c13f8797c682d55370e4 (tag) succeeds thunar-1.6.1-38-g689a52e tagged by Nick Schermer n...@xfce.org on 2012-12-27 13:29 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master Add chromium-browser to binary names (bug #9584).
Updating branch refs/heads/master to f3a2c8ba5f456d3ae3831c5daf6ff4d3f27e3edf (commit) from f5e46564fb6d9ebcfd6bff979c767330f02ff61d (commit) commit f3a2c8ba5f456d3ae3831c5daf6ff4d3f27e3edf Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 13:33:59 2012 +0100 Add chromium-browser to binary names (bug #9584). exo-helper/helpers/chromium.desktop.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/exo-helper/helpers/chromium.desktop.in.in b/exo-helper/helpers/chromium.desktop.in.in index a9edf06..b1d284f 100644 --- a/exo-helper/helpers/chromium.desktop.in.in +++ b/exo-helper/helpers/chromium.desktop.in.in @@ -5,7 +5,7 @@ Icon=chromium Type=X-XFCE-Helper _Name=Chromium StartupNotify=true -X-XFCE-Binaries=chromium;google-chrome; +X-XFCE-Binaries=chromium;google-chrome;chromium-browser; X-XFCE-Category=WebBrowser X-XFCE-Commands=%B; X-XFCE-CommandsWithParameter=%B %s; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master Add various helpers.
Updating branch refs/heads/master
to ffce29b1fe261ff3ce52bfb199095d532a6ba277 (commit)
from f3a2c8ba5f456d3ae3831c5daf6ff4d3f27e3edf (commit)
commit ffce29b1fe261ff3ce52bfb199095d532a6ba277
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 13:46:21 2012 +0100
Add various helpers.
exo-helper/helpers/Makefile.am | 15 ---
exo-helper/helpers/caja.desktop.in.in | 10 ++
.../{galeon.desktop.in.in = dillo.desktop.in.in} |6 +++---
...ceweasel.desktop.in.in = icecat.desktop.in.in} |6 +++---
...{midori.desktop.in.in = jumanji.desktop.in.in} |7 +++
.../{Thunar.desktop.in.in = rodent.desktop.in.in} |7 +++
...hunar.desktop.in.in = rox-filer.desktop.in.in} |7 +++
...terminal.desktop.in.in = sakura.desktop.in.in} |8
.../{Thunar.desktop.in.in = xfe.desktop.in.in}|7 +++
po/POTFILES.in | 13 +++--
10 files changed, 55 insertions(+), 31 deletions(-)
diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am
index a0139cb..16cdbbd 100644
--- a/exo-helper/helpers/Makefile.am
+++ b/exo-helper/helpers/Makefile.am
@@ -4,12 +4,13 @@ defaults_DATA = helpers.rc
desktopdir = $(datadir)/xfce4/helpers
desktop_in_in_files = \
- Thunar.desktop.in.in\
aterm.desktop.in.in \
balsa.desktop.in.in \
+ caja.desktop.in.in \
chromium.desktop.in.in \
debian-sensible-browser.desktop.in.in \
debian-x-terminal-emulator.desktop.in.in\
+ dillo.desktop.in.in \
encompass.desktop.in.in \
epiphany.desktop.in.in \
eterm.desktop.in.in \
@@ -17,10 +18,12 @@ desktop_in_in_files =
\
firefox.desktop.in.in \
galeon.desktop.in.in\
gnome-terminal.desktop.in.in\
- kmail.desktop.in.in \
- konqueror.desktop.in.in \
+ icecat.desktop.in.in\
icedove.desktop.in.in \
iceweasel.desktop.in.in \
+ jumanji.desktop.in.in \
+ kmail.desktop.in.in \
+ konqueror.desktop.in.in \
links.desktop.in.in \
lynx.desktop.in.in \
midori.desktop.in.in\
@@ -33,14 +36,20 @@ desktop_in_in_files =
\
opera-browser.desktop.in.in \
opera-mailer.desktop.in.in \
pcmanfm.desktop.in.in \
+ rodent.desktop.in.in\
+ rox-filer.desktop.in.in \
+ sakura.desktop.in.in\
sylpheed.desktop.in.in \
sylpheed-claws.desktop.in.in\
+ Thunar.desktop.in.in\
thunderbird.desktop.in.in \
urxvt.desktop.in.in \
w3m.desktop.in.in \
xfce4-terminal.desktop.in.in\
+ xfe.desktop.in.in \
xterm.desktop.in.in
+
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
%.desktop.in: %.desktop.in.in
diff --git a/exo-helper/helpers/caja.desktop.in.in
b/exo-helper/helpers/caja.desktop.in.in
new file mode 100644
index 000..0d07406
--- /dev/null
+++ b/exo-helper/helpers/caja.desktop.in.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Icon=system-file-manager
+Type=X-XFCE-Helper
+_Name=Caja File Manager
+StartupNotify=true
[Xfce4-commits] exo:master Fixes for xfce4-terminal.
Updating branch refs/heads/master to c05b48281af28eb24fcdc3f1fdfe4227f68e9184 (commit) from ffce29b1fe261ff3ce52bfb199095d532a6ba277 (commit) commit c05b48281af28eb24fcdc3f1fdfe4227f68e9184 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 13:48:04 2012 +0100 Fixes for xfce4-terminal. exo-helper/helpers/helpers.rc |2 +- exo-helper/helpers/xfce4-terminal.desktop.in.in |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exo-helper/helpers/helpers.rc b/exo-helper/helpers/helpers.rc index 0c77f07..e0b4c15 100644 --- a/exo-helper/helpers/helpers.rc +++ b/exo-helper/helpers/helpers.rc @@ -6,5 +6,5 @@ WebBrowser=firefox MailReader=thunderbird -TerminalEmulator=Terminal +TerminalEmulator=xfce4-terminal FileManager=Thunar diff --git a/exo-helper/helpers/xfce4-terminal.desktop.in.in b/exo-helper/helpers/xfce4-terminal.desktop.in.in index b1c776f..1b10ee0 100644 --- a/exo-helper/helpers/xfce4-terminal.desktop.in.in +++ b/exo-helper/helpers/xfce4-terminal.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] Version=1.0 -Icon=utility-terminal +Icon=utilities-terminal Type=X-XFCE-Helper _Name=Xfce Terminal StartupNotify=true ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master Updates for release.
Updating branch refs/heads/master to f455681554ca205ffe49bd616310b19f5f9f8ef1 (commit) from c05b48281af28eb24fcdc3f1fdfe4227f68e9184 (commit) commit f455681554ca205ffe49bd616310b19f5f9f8ef1 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 13:50:21 2012 +0100 Updates for release. NEWS| 11 +++ configure.ac.in |4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 28a8d44..a8ff71e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +0.10.2 +== +- Optimize returning the selected item in icon view. +- Work with icon names in the toolbar editor. +- GIO unix is still used for exo-open (bug #9679). +- Use same thumbnail frame as Thunar. +- Rename Terminal to xfce4-terminal. +- Remove unmaintained translations. +- Add chromium-browser to binary names (bug #9584). +- Add various helpers. + 0.10.1 == - g_main_context_ref_thread_default() is 2.32 API (bug #9577). diff --git a/configure.ac.in b/configure.ac.in index ef3b772..3ac26f2 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -12,10 +12,10 @@ m4_define([libexo_verinfo], [1:0:1]) m4_define([libexo_version_api], [1]) m4_define([libexo_version_major], [0]) m4_define([libexo_version_minor], [10]) -m4_define([libexo_version_micro], [1]) +m4_define([libexo_version_micro], [2]) m4_define([libexo_version_nano], []) m4_define([libexo_version_build], [@REVISION@]) -m4_define([libexo_version_tag], [git]) +m4_define([libexo_version_tag], []) m4_define([libexo_version], [libexo_version_major().libexo_version_minor().libexo_version_micro()ifelse(libexo_version_nano(), [], [], [.libexo_version_nano()])ifelse(libexo_version_tag(), [git], [libexo_version_tag()-libexo_version_build()], [libexo_version_tag()])]) dnl ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master Post release tag bump.
Updating branch refs/heads/master to 76b7f505c643d6023d16232180befd026625e0ce (commit) from f455681554ca205ffe49bd616310b19f5f9f8ef1 (commit) commit 76b7f505c643d6023d16232180befd026625e0ce Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 13:52:05 2012 +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 3ac26f2..d2092e6 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -15,7 +15,7 @@ m4_define([libexo_version_minor], [10]) m4_define([libexo_version_micro], [2]) m4_define([libexo_version_nano], []) m4_define([libexo_version_build], [@REVISION@]) -m4_define([libexo_version_tag], []) +m4_define([libexo_version_tag], [git]) m4_define([libexo_version], [libexo_version_major().libexo_version_minor().libexo_version_micro()ifelse(libexo_version_nano(), [], [], [.libexo_version_nano()])ifelse(libexo_version_tag(), [git], [libexo_version_tag()-libexo_version_build()], [libexo_version_tag()])]) dnl ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo|exo-0.10.2 Creating annotated tag exo-0.10.2
Updating annotated tag refs/tags/exo-0.10.2 as new annotated tag to 298bd7ca71f03cab1aed59967fafdc003fa6e618 (tag) succeeds exo-0.10.1-10-gc05b482 tagged by Nick Schermer n...@xfce.org on 2012-12-27 13:51 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 0e3181b6502066f5a7fe471f09afdf9b4b05377d (commit) from 06b2b62b6b73e3ee49b0410f00b3b0eb36655291 (commit) commit 0e3181b6502066f5a7fe471f09afdf9b4b05377d Author: Masato Hashimoto hash...@xfce.org Date: Thu Dec 27 13:54:31 2012 +0100 l10n: Updated Japanese (ja) translation to 100% New status: 738 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 188 -- 1 files changed, 97 insertions(+), 91 deletions(-) diff --git a/po/ja.po b/po/ja.po index 3d6410e..e20c829 100644 --- a/po/ja.po +++ b/po/ja.po @@ -19,8 +19,8 @@ msgid msgstr Project-Id-Version: Thunar\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-22 17:19+0900\n -PO-Revision-Date: 2012-12-22 17:21+0900\n +POT-Creation-Date: 2012-12-27 21:51+0900\n +PO-Revision-Date: 2012-12-27 21:53+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese xfce-users...@ml.fdiary.net\n Language: ja\n @@ -149,7 +149,7 @@ msgstr 操作の実行に失敗しました #: ../thunar/thunar-launcher.c:1216 ../thunar/thunar-location-entry.c:402 #: ../thunar/thunar-location-entry.c:430 #: ../thunar/thunar-shortcuts-view.c:1630 -#: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c: +#: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c:2223 #, c-format msgid Failed to open \%s\ msgstr \%s\ を開けませんでした。 @@ -162,20 +162,20 @@ msgstr \%s\ を開けませんでした: %s #. display an error message #: ../thunar/thunar-application.c:1307 #: ../thunar/thunar-properties-dialog.c:671 -#: ../thunar/thunar-standard-view.c:2711 ../thunar/thunar-tree-view.c:1760 +#: ../thunar/thunar-standard-view.c:2739 ../thunar/thunar-tree-view.c:1760 #, c-format msgid Failed to rename \%s\ msgstr \%s\ の名前の変更に失敗しました。 #: ../thunar/thunar-application.c:1409 -#: ../thunar/thunar-location-buttons.c:1285 -#: ../thunar/thunar-standard-view.c:2276 ../thunar/thunar-tree-view.c:1622 +#: ../thunar/thunar-location-buttons.c:1308 +#: ../thunar/thunar-standard-view.c:2289 ../thunar/thunar-tree-view.c:1622 msgid New Folder msgstr 新しいフォルダー #: ../thunar/thunar-application.c:1410 -#: ../thunar/thunar-location-buttons.c:1286 -#: ../thunar/thunar-standard-view.c:2277 ../thunar/thunar-tree-view.c:1623 +#: ../thunar/thunar-location-buttons.c:1309 +#: ../thunar/thunar-standard-view.c:2290 ../thunar/thunar-tree-view.c:1623 msgid Create New Folder msgstr 新しいフォルダーを作成します。 @@ -188,7 +188,7 @@ msgid Create New File msgstr 新しいファイルを作成します。 #. generate a title for the create dialog -#: ../thunar/thunar-application.c:1472 ../thunar/thunar-standard-view.c:2321 +#: ../thunar/thunar-application.c:1472 ../thunar/thunar-standard-view.c:2334 #, c-format msgid Create Document from template \%s\ msgstr テンプレート \%s\ からドキュメントを作成 @@ -262,7 +262,7 @@ msgstr ゴミ箱にあるファイルとフォルダーをすべて削除しま #. append the Empty Trash menu action #. prepare the menu item -#: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:171 +#: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:179 #: ../thunar/thunar-shortcuts-view.c:1191 ../thunar/thunar-tree-view.c:1183 #: ../thunar/thunar-window.c:344 ../plugins/thunar-tpa/thunar-tpa.c:189 msgid _Empty Trash @@ -805,7 +805,7 @@ msgid File Name msgstr ファイル名 #: ../thunar/thunar-file.c:929 ../thunar/thunar-gio-extensions.c:236 -#: ../thunar/thunar-shortcuts-model.c:899 ../thunar/thunar-window.c:362 +#: ../thunar/thunar-shortcuts-model.c:891 ../thunar/thunar-window.c:362 msgid File System msgstr ファイルシステム @@ -1019,7 +1019,7 @@ msgstr 移動/コピー先に十分な空き容量がありません。ファ #. Prepare Open label #. append the Open menu action #: ../thunar/thunar-launcher.c:177 ../thunar/thunar-launcher.c:819 -#: ../thunar/thunar-location-buttons.c:168 +#: ../thunar/thunar-location-buttons.c:175 #: ../thunar/thunar-shortcuts-view.c:1087 ../thunar/thunar-tree-view.c:1113 msgid _Open msgstr 開く(_O) @@ -1287,63 +1287,74 @@ msgstr[1] %d 個のフォルダーが選択されています。 msgid %s, %s msgstr %s %s +#. append the Open in New Tab menu action +#: ../thunar/thunar-location-buttons.c:176 +#: ../thunar/thunar-shortcuts-view.c:1097 +msgid Open in New Tab +msgstr 新しいタブで開く + #. append the Open in New Window menu action -#: ../thunar/thunar-location-buttons.c:169 +#: ../thunar/thunar-location-buttons.c:177 #: ../thunar/thunar-shortcuts-view.c:1103 msgid Open in New Window msgstr 新しいウィンドウで開く #. append the Create Folder menu action -#: ../thunar/thunar-location-buttons.c:170 -#: ../thunar/thunar-standard-view.c:387 ../thunar/thunar-tree-view.c:1199 +#: ../thunar/thunar-location-buttons.c:178 +#: ../thunar/thunar-standard-view.c:396 ../thunar/thunar-tree-view.c:1199 msgid Create _Folder... msgstr フォルダーの作成(_F)... -#: ../thunar/thunar-location-buttons.c:171 ../thunar/thunar-window.c:344 +#: ../thunar/thunar-location-buttons.c:179 ../thunar/thunar-window.c:344
[Xfce4-commits] thunar:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to f856c2f36edbf904a5d11b792a1503348c594464 (commit) from 0e3181b6502066f5a7fe471f09afdf9b4b05377d (commit) commit f856c2f36edbf904a5d11b792a1503348c594464 Author: Cristian Marchi cri.pe...@gmail.com Date: Thu Dec 27 14:44:52 2012 +0100 l10n: Updated Italian (it) translation to 100% New status: 738 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 243 -- 1 files changed, 126 insertions(+), 117 deletions(-) diff --git a/po/it.po b/po/it.po index 519f754..04cd607 100644 --- a/po/it.po +++ b/po/it.po @@ -10,7 +10,7 @@ msgid msgstr Project-Id-Version: Thunar trunk\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-10 18:36+\n +POT-Creation-Date: 2012-12-27 11:51+\n PO-Revision-Date: 2010-07-02 16:42+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n @@ -139,8 +139,8 @@ msgstr Impossibile avviare l'operazione #: ../thunar/thunar-application.c:1113 ../thunar/thunar-application.c:1239 #: ../thunar/thunar-launcher.c:1216 ../thunar/thunar-location-entry.c:402 #: ../thunar/thunar-location-entry.c:430 -#: ../thunar/thunar-shortcuts-view.c:1620 -#: ../thunar/thunar-shortcuts-view.c:1648 ../thunar/thunar-window.c:2219 +#: ../thunar/thunar-shortcuts-view.c:1630 +#: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c:2223 #, c-format msgid Failed to open \%s\ msgstr Impossibile aprire \%s\ @@ -153,20 +153,20 @@ msgstr Impossibile aprire \%s\: %s #. display an error message #: ../thunar/thunar-application.c:1307 #: ../thunar/thunar-properties-dialog.c:671 -#: ../thunar/thunar-standard-view.c:2712 ../thunar/thunar-tree-view.c:1751 +#: ../thunar/thunar-standard-view.c:2739 ../thunar/thunar-tree-view.c:1760 #, c-format msgid Failed to rename \%s\ msgstr Impossibile rinominare \%s\ #: ../thunar/thunar-application.c:1409 -#: ../thunar/thunar-location-buttons.c:1285 -#: ../thunar/thunar-standard-view.c:2277 ../thunar/thunar-tree-view.c:1613 +#: ../thunar/thunar-location-buttons.c:1308 +#: ../thunar/thunar-standard-view.c:2289 ../thunar/thunar-tree-view.c:1622 msgid New Folder msgstr Nuova cartella #: ../thunar/thunar-application.c:1410 -#: ../thunar/thunar-location-buttons.c:1286 -#: ../thunar/thunar-standard-view.c:2278 ../thunar/thunar-tree-view.c:1614 +#: ../thunar/thunar-location-buttons.c:1309 +#: ../thunar/thunar-standard-view.c:2290 ../thunar/thunar-tree-view.c:1623 msgid Create New Folder msgstr Crea nuova cartella @@ -179,7 +179,7 @@ msgid Create New File msgstr Crea un nuovo file #. generate a title for the create dialog -#: ../thunar/thunar-application.c:1472 ../thunar/thunar-standard-view.c:2322 +#: ../thunar/thunar-application.c:1472 ../thunar/thunar-standard-view.c:2334 #, c-format msgid Create Document from template \%s\ msgstr Crea documento da un modello \%s\ @@ -253,8 +253,8 @@ msgstr Rimuovere tutti i file e le cartelle dal cestino? #. append the Empty Trash menu action #. prepare the menu item -#: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:171 -#: ../thunar/thunar-shortcuts-view.c:1181 ../thunar/thunar-tree-view.c:1174 +#: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:179 +#: ../thunar/thunar-shortcuts-view.c:1191 ../thunar/thunar-tree-view.c:1183 #: ../thunar/thunar-window.c:344 ../plugins/thunar-tpa/thunar-tpa.c:189 msgid _Empty Trash msgstr _Svuota il cestino @@ -825,42 +825,42 @@ msgstr File msgid File Name msgstr Nome del file -#: ../thunar/thunar-file.c:916 ../thunar/thunar-gio-extensions.c:236 +#: ../thunar/thunar-file.c:929 ../thunar/thunar-gio-extensions.c:236 #: ../thunar/thunar-shortcuts-model.c:899 ../thunar/thunar-window.c:362 msgid File System msgstr File system -#: ../thunar/thunar-file.c:1353 +#: ../thunar/thunar-file.c:1366 #, c-format msgid The root folder has no parent msgstr La cartella radice non ha padre -#: ../thunar/thunar-file.c:1438 ../thunar/thunar-file.c:1713 +#: ../thunar/thunar-file.c:1451 ../thunar/thunar-file.c:1726 #, c-format msgid Failed to parse the desktop file: %s msgstr Impossibile analizzare il file desktop: %s #. if the .desktop file is not secure, ask user what to do -#: ../thunar/thunar-file.c:1450 +#: ../thunar/thunar-file.c:1463 msgid Untrusted application launcher msgstr Avviatore di applicazioni non sicure -#: ../thunar/thunar-file.c:1475 +#: ../thunar/thunar-file.c:1488 #, c-format msgid No Exec field specified msgstr Campo Exec non specificato #. if the .desktop file is not secure, ask user what to do -#: ../thunar/thunar-file.c:1484 +#: ../thunar/thunar-file.c:1497 msgid Untrusted link launcher msgstr Avviatore di collegamenti non sicuri -#: ../thunar/thunar-file.c:1500 +#: ../thunar/thunar-file.c:1513 #,
[Xfce4-commits] terminal:master l10n: Updated Italian (it) translation to 98%
Updating branch refs/heads/master to 2b935a4092a5065baf46fc7b6ed62d1142258807 (commit) from d69c94c4f6e89d47d5e332ca0061b1eac54b6421 (commit) commit 2b935a4092a5065baf46fc7b6ed62d1142258807 Author: Cristian Marchi cri.pe...@gmail.com Date: Thu Dec 27 14:48:01 2012 +0100 l10n: Updated Italian (it) translation to 98% New status: 243 messages complete with 1 fuzzy and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 170 -- 1 files changed, 98 insertions(+), 72 deletions(-) diff --git a/po/it.po b/po/it.po index 74a200e..3891f2b 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: Terminal trunk\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-26 19:39+\n +POT-Creation-Date: 2012-12-27 11:42+\n PO-Revision-Date: 2010-05-01 21:02+0100\n Last-Translator: gianluca foddis gianluca.fod...@gmail.com\n Language-Team: Italian xfce-it-translat...@googlegroups.com\n @@ -17,6 +17,34 @@ msgstr Content-Transfer-Encoding: 8bit\n Language: it\n +#: ../colorschemes/black-on-white.theme.in.h:1 +msgid Black on White +msgstr Nero su sfondo bianco + +#: ../colorschemes/dark-pastels.theme.in.h:1 +msgid Dark Pastels +msgstr + +#: ../colorschemes/green-on-black.theme.in.h:1 +msgid Green on Black +msgstr Verde su sfondo nero + +#: ../colorschemes/solarized-dark.theme.in.h:1 +msgid Solarized +msgstr + +#: ../colorschemes/tango.theme.in.h:1 +msgid Tango +msgstr Tango + +#: ../colorschemes/white-on-black.theme.in.h:1 +msgid White on Black +msgstr Bianco su sfondo nero + +#: ../colorschemes/xterm.theme.in.h:1 +msgid XTerm +msgstr XTerm + # glossario # tab=scheda # terminal=terminale @@ -119,7 +147,7 @@ msgstr Segnalare i bug su %s. msgid Unable to register terminal service: %s\n msgstr Impossibile registrare il servizio terminale: %s\n -#: ../terminal/terminal-app.c:601 +#: ../terminal/terminal-app.c:617 #, c-format msgid Invalid geometry string \%s\\n msgstr Stringa della geometria non valida \%s\\n @@ -298,12 +326,21 @@ msgstr #: ../terminal/terminal-options.c:357 #, c-format msgid +Option \--sm-client-id\ requires specifying the unique session id as its +parameter +msgstr +L'opzione \--sm-client-id\ richiede di specificare l'id di sessione come +parametro + +#: ../terminal/terminal-options.c:372 +#, c-format +msgid Option \--startup-id\ requires specifying the startup id as its parameter msgstr L'opzione \--startup-id\ richiede di specificare l'id di avvio come parametro -#: ../terminal/terminal-options.c:372 +#: ../terminal/terminal-options.c:387 #, c-format msgid Option \--icon/-I\ requires specifying an icon name or filename as its @@ -312,7 +349,7 @@ msgstr L'opzione \--icon/-I\ richiede di specificare il nome dell'icona o il nome del file come parametro -#: ../terminal/terminal-options.c:439 +#: ../terminal/terminal-options.c:453 #, c-format msgid Unknown option \%s\ msgstr Opzione \%s\ sconosciuta @@ -919,193 +956,189 @@ msgstr msgid Failed to open the URL `%s' msgstr Impossibile aprire la URL '%s' -#: ../terminal/terminal-window.c:232 +#: ../terminal/terminal-window.c:237 msgid _File msgstr _File -#: ../terminal/terminal-window.c:233 +#: ../terminal/terminal-window.c:238 msgid Open _Tab msgstr Apri _scheda -#: ../terminal/terminal-window.c:233 +#: ../terminal/terminal-window.c:238 msgid Open a new terminal tab msgstr Apre una nuova scheda -#: ../terminal/terminal-window.c:234 +#: ../terminal/terminal-window.c:239 msgid Open T_erminal msgstr Apri t_erminale -#: ../terminal/terminal-window.c:234 +#: ../terminal/terminal-window.c:239 msgid Open a new terminal window msgstr Apre una nuova finestra -#: ../terminal/terminal-window.c:235 +#: ../terminal/terminal-window.c:240 msgid _Detach Tab msgstr _Stacca scheda -#: ../terminal/terminal-window.c:236 ../terminal/terminal-window.c:558 -#, fuzzy +#: ../terminal/terminal-window.c:241 ../terminal/terminal-window.c:557 msgid Close T_ab -msgstr Chiudi scheda +msgstr Chiudi s_cheda -#: ../terminal/terminal-window.c:237 ../terminal/terminal-window.c:562 -#, fuzzy +#: ../terminal/terminal-window.c:242 ../terminal/terminal-window.c:561 msgid Close _Window -msgstr Chiudi finestra +msgstr Chiudi _finestra -#: ../terminal/terminal-window.c:238 +#: ../terminal/terminal-window.c:243 msgid _Edit msgstr _Modifica -#: ../terminal/terminal-window.c:239 +#: ../terminal/terminal-window.c:244 msgid _Copy msgstr _Copia -#: ../terminal/terminal-window.c:239 +#: ../terminal/terminal-window.c:244 msgid Copy to clipboard msgstr Copia negli appunti -#: ../terminal/terminal-window.c:240 +#: ../terminal/terminal-window.c:245 msgid _Paste msgstr _Incolla -#: ../terminal/terminal-window.c:240 +#: ../terminal/terminal-window.c:245 msgid Paste from clipboard msgstr Incolla dagli appunti -#: ../terminal/terminal-window.c:241
[Xfce4-commits] terminal:master Fix activity handling when resizing the window.
Updating branch refs/heads/master
to 173a433023f3817195eb6cff41ac39030b346ff0 (commit)
from 2b935a4092a5065baf46fc7b6ed62d1142258807 (commit)
commit 173a433023f3817195eb6cff41ac39030b346ff0
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 14:20:56 2012 +0100
Fix activity handling when resizing the window.
terminal/terminal-screen.c | 27 +--
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index c96c983..e7c127d 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -145,8 +145,8 @@ static void terminal_screen_vte_resize_window
(VteTerminal
guint
width,
guint
height,
TerminalScreen*screen);
-static void terminal_screen_vte_window_contents_changed (VteTerminal
*terminal,
-
TerminalScreen*screen);
+static void terminal_screen_vte_window_contents_changed
(TerminalScreen*screen);
+static void terminal_screen_vte_window_contents_resized
(TerminalScreen*screen);
static gboolean terminal_screen_timer_background (gpointer
user_data);
static void terminal_screen_timer_background_destroy (gpointer
user_data);
static void terminal_screen_update_label_orientation
(TerminalScreen*screen);
@@ -182,7 +182,7 @@ struct _TerminalScreen
guintlaunch_idle_id;
guintactivity_timeout_id;
- time_t last_size_change;
+ time_t activity_resize_time;
};
@@ -333,8 +333,10 @@ terminal_screen_init (TerminalScreen *screen)
terminal_screen_update_colors (screen);
/* Last, connect contents-changed to avoid a race with updates above */
- g_signal_connect (G_OBJECT (screen-terminal), contents-changed,
+ g_signal_connect_swapped (G_OBJECT (screen-terminal), contents-changed,
G_CALLBACK (terminal_screen_vte_window_contents_changed), screen);
+ g_signal_connect_swapped (G_OBJECT (screen-terminal), size-allocate,
+ G_CALLBACK (terminal_screen_vte_window_contents_resized), screen);
/* show the terminal */
gtk_widget_show (screen-terminal);
@@ -1271,14 +1273,12 @@ terminal_screen_reset_activity_destroyed (gpointer
user_data)
static void
-terminal_screen_vte_window_contents_changed (VteTerminal*terminal,
- TerminalScreen *screen)
+terminal_screen_vte_window_contents_changed (TerminalScreen *screen)
{
guinttimeout;
GdkColor color;
gboolean has_fg;
- terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
terminal_return_if_fail (GTK_IS_LABEL (screen-tab_label));
terminal_return_if_fail (TERMINAL_IS_PREFERENCES (screen-preferences));
@@ -1286,7 +1286,7 @@ terminal_screen_vte_window_contents_changed (VteTerminal
*terminal,
/* leave if we should not start an update */
if (screen-tab_label == NULL
|| GTK_WIDGET_STATE (screen-tab_label) != GTK_STATE_ACTIVE
- || time (NULL) - screen-last_size_change = 1)
+ || time (NULL) - screen-activity_resize_time = 1)
return;
/* get the reset time, leave if this feature is disabled */
@@ -1311,6 +1311,15 @@ terminal_screen_vte_window_contents_changed (VteTerminal
*terminal,
+static void
+terminal_screen_vte_window_contents_resized (TerminalScreen *screen)
+{
+ /* avoid a content changed when the window is resized */
+ screen-activity_resize_time = time (NULL);
+}
+
+
+
static gboolean
terminal_screen_timer_background (gpointer user_data)
{
@@ -1376,8 +1385,6 @@ terminal_screen_timer_background (gpointer user_data)
background_mode ==
TERMINAL_BACKGROUND_TRANSPARENT
!gtk_widget_is_composited
(GTK_WIDGET (screen)));
- screen-last_size_change = time (NULL);
-
GDK_THREADS_LEAVE ();
return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master Use individual signals and single notify signal.
Updating branch refs/heads/master to cab85ed2ba0c0045ae10ac6d9b1c4f7a6fd95544 (commit) from 173a433023f3817195eb6cff41ac39030b346ff0 (commit) commit cab85ed2ba0c0045ae10ac6d9b1c4f7a6fd95544 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 14:42:52 2012 +0100 Use individual signals and single notify signal. The internal function only does a lot of strcmp, so use this instead. terminal/terminal-screen.c | 120 +++ 1 files changed, 75 insertions(+), 45 deletions(-) diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c index e7c127d..19bf4eb 100644 --- a/terminal/terminal-screen.c +++ b/terminal/terminal-screen.c @@ -106,6 +106,9 @@ static void terminal_screen_set_property (GObject GParamSpec *pspec); static void terminal_screen_realize (GtkWidget *widget); static void terminal_screen_unrealize (GtkWidget *widget); +static void terminal_screen_preferences_changed (TerminalPreferences *preferences, + GParamSpec *pspec, + TerminalScreen*screen); static gboolean terminal_screen_get_child_command (TerminalScreen*screen, gchar **command, gchar ***argv, @@ -265,14 +268,18 @@ terminal_screen_init (TerminalScreen *screen) screen-session_id = ++screen_last_session_id; screen-terminal = g_object_new (TERMINAL_TYPE_WIDGET, NULL); - g_object_connect (G_OBJECT (screen-terminal), -signal::child-exited, G_CALLBACK (terminal_screen_vte_child_exited), screen, -signal::eof, G_CALLBACK (terminal_screen_vte_eof), screen, -signal::context-menu, G_CALLBACK (terminal_screen_vte_get_context_menu), 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, -NULL); + g_signal_connect (G_OBJECT (screen-terminal), child-exited, + G_CALLBACK (terminal_screen_vte_child_exited), screen); + g_signal_connect (G_OBJECT (screen-terminal), eof, + G_CALLBACK (terminal_screen_vte_eof), screen); + g_signal_connect (G_OBJECT (screen-terminal), context-menu, + G_CALLBACK (terminal_screen_vte_get_context_menu), screen); + g_signal_connect (G_OBJECT (screen-terminal), selection-changed, + G_CALLBACK (terminal_screen_vte_selection_changed), screen); + g_signal_connect (G_OBJECT (screen-terminal), window-title-changed, + G_CALLBACK (terminal_screen_vte_window_title_changed), screen); + g_signal_connect (G_OBJECT (screen-terminal), resize-window, + G_CALLBACK (terminal_screen_vte_resize_window), screen); gtk_box_pack_start (GTK_BOX (screen), screen-terminal, TRUE, TRUE, 0); screen-scrollbar = gtk_vscrollbar_new (VTE_TERMINAL (screen-terminal)-adjustment); @@ -280,39 +287,10 @@ terminal_screen_init (TerminalScreen *screen) g_signal_connect_after (G_OBJECT (screen-scrollbar), button-press-event, G_CALLBACK (gtk_true), NULL); gtk_widget_show (screen-scrollbar); + /* watch preferences changes */ screen-preferences = terminal_preferences_get (); - g_object_connect (G_OBJECT (screen-preferences), -swapped-signal::notify::background-mode, G_CALLBACK (terminal_screen_update_background), screen, -swapped-signal::notify::background-image-file, G_CALLBACK (terminal_screen_update_background), screen, -swapped-signal::notify::background-image-style, G_CALLBACK (terminal_screen_update_background), screen, -swapped-signal::notify::background-darkness, G_CALLBACK (terminal_screen_update_background), screen, -swapped-signal::notify::binding-backspace, G_CALLBACK (terminal_screen_update_binding_backspace), screen, -swapped-signal::notify::binding-delete, G_CALLBACK (terminal_screen_update_binding_delete), screen, -swapped-signal::notify::color-foreground, G_CALLBACK (terminal_screen_update_colors), screen, -swapped-signal::notify::color-background, G_CALLBACK (terminal_screen_update_colors), screen, -swapped-signal::notify::color-background-vary, G_CALLBACK (terminal_screen_update_colors), screen, -
[Xfce4-commits] terminal:master Use mid color if activity expired (bug #9686).
Updating branch refs/heads/master
to 74592a9701ff77dc378aa1244d1369044faf2c87 (commit)
from cab85ed2ba0c0045ae10ac6d9b1c4f7a6fd95544 (commit)
commit 74592a9701ff77dc378aa1244d1369044faf2c87
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 15:28:28 2012 +0100
Use mid color if activity expired (bug #9686).
terminal/terminal-screen.c | 40 ++--
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 19bf4eb..98a2840 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1283,10 +1283,30 @@ terminal_screen_vte_resize_window (VteTerminal
*terminal,
static gboolean
terminal_screen_reset_activity_timeout (gpointer user_data)
{
- /* reset label color */
+ TerminalScreen *screen = TERMINAL_SCREEN (user_data);
+ GtkStyle *style;
+ GdkColorcolor;
+ GdkColoractive_color;
+
+ if (G_UNLIKELY (screen-tab_label == NULL))
+return FALSE;
+
GDK_THREADS_ENTER ();
- gtk_widget_modify_fg (TERMINAL_SCREEN (user_data)-tab_label,
-GTK_STATE_ACTIVE, NULL);
+
+ /* unset */
+ gtk_widget_modify_fg (screen-tab_label, GTK_STATE_ACTIVE, NULL);
+
+ if (terminal_preferences_get_color (screen-preferences,
tab-activity-color, active_color))
+{
+ /* calculate color between fg and active color */
+ style = gtk_widget_get_style (screen-tab_label);
+ color.red = (active_color.red + style-fg[GTK_STATE_ACTIVE].red) / 2;
+ color.green = (active_color.green + style-fg[GTK_STATE_ACTIVE].green) /
2;
+ color.blue = (active_color.blue + style-fg[GTK_STATE_ACTIVE].blue) / 2;
+
+ gtk_widget_modify_fg (screen-tab_label, GTK_STATE_ACTIVE, color);
+}
+
GDK_THREADS_LEAVE ();
return FALSE;
@@ -1307,7 +1327,7 @@ terminal_screen_vte_window_contents_changed
(TerminalScreen *screen)
{
guinttimeout;
GdkColor color;
- gboolean has_fg;
+ gboolean has_color;
terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
terminal_return_if_fail (GTK_IS_LABEL (screen-tab_label));
@@ -1325,8 +1345,8 @@ terminal_screen_vte_window_contents_changed
(TerminalScreen *screen)
return;
/* set label color */
- has_fg = terminal_preferences_get_color (screen-preferences,
tab-activity-color, color);
- gtk_widget_modify_fg (screen-tab_label, GTK_STATE_ACTIVE, has_fg ? color :
NULL);
+ has_color = terminal_preferences_get_color (screen-preferences,
tab-activity-color, color);
+ gtk_widget_modify_fg (screen-tab_label, GTK_STATE_ACTIVE, has_color ?
color : NULL);
/* stop running reset timeout */
if (screen-activity_timeout_id != 0)
@@ -2073,10 +2093,10 @@ terminal_screen_reset_activity (TerminalScreen *screen)
terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
if (screen-activity_timeout_id != 0)
-{
- g_source_remove (screen-activity_timeout_id);
- terminal_screen_reset_activity_timeout (screen);
-}
+g_source_remove (screen-activity_timeout_id);
+
+ if (screen-tab_label != NULL)
+gtk_widget_modify_fg (screen-tab_label, GTK_STATE_ACTIVE, NULL);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to ae917d7eed984e3bcd75692d904bc2a6f0a399d4 (commit) from 76b7f505c643d6023d16232180befd026625e0ce (commit) commit ae917d7eed984e3bcd75692d904bc2a6f0a399d4 Author: Cristian Marchi cri.pe...@gmail.com Date: Thu Dec 27 17:23:58 2012 +0100 l10n: Updated Italian (it) translation to 100% New status: 279 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 119 + 1 files changed, 80 insertions(+), 39 deletions(-) diff --git a/po/it.po b/po/it.po index 263e154..1c28234 100644 --- a/po/it.po +++ b/po/it.po @@ -7,15 +7,14 @@ msgid msgstr Project-Id-Version: exo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-09 18:45+0100\n +POT-Creation-Date: 2012-12-27 16:03+\n PO-Revision-Date: 2010-02-22 21:54+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n -Language-Team: Italian Translation Team xfce-it-translators@googlegroups. -com\n -Language: \n +Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Generator: KBabel 1.11.4\n @@ -407,7 +406,7 @@ msgstr Trascinare un elemento sulle barre degli strumenti in alto per aggiungerlo, dalle barre degli strumenti alla tabella degli elementi per rimuoverlo. -#: ../exo/exo-toolbars-editor.c:538 +#: ../exo/exo-toolbars-editor.c:537 msgid Separator msgstr Separatore @@ -611,37 +610,44 @@ msgstr Script per la Shell msgid Create Launcher b%s/b msgstr Crea avviatore b%s/b -#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to +#. avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:297 msgid _Name: msgstr Nom_e: -#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to +#. avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:313 msgid C_omment: msgstr C_ommento: -#. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic +#. conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:329 msgid Comm_and: msgstr Co_mando: -#. TRANSLATORS: Label in Create Link dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Link dialog, make sure to avoid mnemonic +#. conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:344 msgid _URL: msgstr _URL: -#. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic +#. conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:360 msgid Working _Directory: msgstr Cartella di la_voro: -#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to +#. avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:389 msgid _Icon: msgstr _Icona: -#. TRANSLATORS: Label for the icon button in Create Launcher/Create Link dialog if no icon selected +#. TRANSLATORS: Label for the icon button in Create Launcher/Create Link +#. dialog if no icon selected #. setup a label to tell that no icon was selected #: ../exo-desktop-item-edit/exo-die-editor.c:406 #: ../exo-desktop-item-edit/exo-die-editor.c:1233 @@ -652,9 +658,11 @@ msgstr Nessuna icona msgid Options: msgstr Opzioni: -#. TRANSLATORS: Check button label in Create Launcher dialog, make sure to avoid mnemonic conflicts -#. * and sync your translations with the translations in Thunar and xfce4-panel. -#. +#. TRANSLATORS: Check button label in Create Launcher dialog, make sure to +#. avoid mnemonic conflicts +#. * and sync your translations with the translations in Thunar +#. and xfce4-panel. +#. #: ../exo-desktop-item-edit/exo-die-editor.c:421 msgid Use _startup notification msgstr Usa noti_fica di avvio @@ -669,9 +677,11 @@ msgstr comando è eseguito dal gestore di file o dal menu. Non tutte le applicazioni supportano la notifica di avvio -#. TRANSLATORS: Check button label in Create Launcher dialog, make sure to avoid mnemonic conflicts -#. * and sync your translations with the translations in Thunar and xfce4-panel. -#. +#. TRANSLATORS: Check button label in Create Launcher dialog, make sure to +#. avoid mnemonic conflicts +#. * and sync your translations with the translations in Thunar +#. and xfce4-panel. +#. #: ../exo-desktop-item-edit/exo-die-editor.c:434 msgid
[Xfce4-commits] xfburn:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 5797df38bc31959db42c5375620055a17f23b5e8 (commit) from 3995475091bdf2528d99f6166b2f53aff0f81066 (commit) commit 5797df38bc31959db42c5375620055a17f23b5e8 Author: Baurzhan Muftakhidinov baurthefi...@gmail.com Date: Thu Dec 27 18:59:14 2012 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 282 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 286 -- 1 files changed, 147 insertions(+), 139 deletions(-) diff --git a/po/kk.po b/po/kk.po index c4bbf3d..a32e5fe 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 baurthefi...@gmail.com, 2009. -# +# msgid msgstr Project-Id-Version: trunk\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-08-03 22:51+\n +POT-Creation-Date: 2012-12-27 17:45+\n PO-Revision-Date: 2012-08-04 08:43+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\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 #: ../xfburn/xfburn-adding-progress.c:111 @@ -59,21 +59,20 @@ msgstr Дискті тазарту #: ../xfburn/xfburn-blank-dialog.c:209 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:195 -#: ../xfburn/xfburn-burn-image-dialog.c:191 +#: ../xfburn/xfburn-burn-image-dialog.c:200 #: ../xfburn/xfburn-copy-cd-dialog.c:131 #: ../xfburn/xfburn-copy-dvd-dialog.c:131 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:160 msgid Burning device msgstr Жазу құрылғысы -#: ../xfburn/xfburn-blank-dialog.c:222 -#: ../xfburn/xfburn-device-box.c:187 +#: ../xfburn/xfburn-blank-dialog.c:222 ../xfburn/xfburn-device-box.c:187 msgid Blank mode msgstr Тазарту режимі #: ../xfburn/xfburn-blank-dialog.c:230 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:227 -#: ../xfburn/xfburn-burn-image-dialog.c:199 +#: ../xfburn/xfburn-burn-image-dialog.c:208 #: ../xfburn/xfburn-copy-cd-dialog.c:139 #: ../xfburn/xfburn-copy-dvd-dialog.c:139 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:194 @@ -82,7 +81,7 @@ msgstr Опциялар #: ../xfburn/xfburn-blank-dialog.c:234 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:231 -#: ../xfburn/xfburn-burn-image-dialog.c:203 +#: ../xfburn/xfburn-burn-image-dialog.c:212 #: ../xfburn/xfburn-copy-cd-dialog.c:143 #: ../xfburn/xfburn-copy-dvd-dialog.c:143 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:198 @@ -93,7 +92,8 @@ msgstr Д_искті шығару msgid _Blank msgstr Та_зарту -#. 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:356 msgid The inserted disc is already blank. msgstr Салынған диск бос болып тұр. @@ -122,16 +122,15 @@ msgstr Дискті тазарту... msgid Done msgstr Аяқталды -#: ../xfburn/xfburn-blank-dialog.c:444 -#: ../xfburn/xfburn-perform-burn.c:372 -#: ../xfburn/xfburn-progress-dialog.c:603 +#: ../xfburn/xfburn-blank-dialog.c:444 ../xfburn/xfburn-perform-burn.c:372 +#: ../xfburn/xfburn-progress-dialog.c:637 msgid Failure msgstr Сәтсіз #: ../xfburn/xfburn-blank-dialog.c:461 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:610 -#: ../xfburn/xfburn-burn-image-dialog.c:388 -#: ../xfburn/xfburn-burn-image-dialog.c:556 +#: ../xfburn/xfburn-burn-image-dialog.c:402 +#: ../xfburn/xfburn-burn-image-dialog.c:578 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:397 msgid Unable to grab the drive. msgstr Құрылғыны басқару мүмкін емес. @@ -162,7 +161,7 @@ msgid smallWould you like to change the default composition name?/small msgstr smallЖоба үшін бастапқы атын өзгертуді қалайсыз ба?/small #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:236 -#: ../xfburn/xfburn-burn-image-dialog.c:208 +#: ../xfburn/xfburn-burn-image-dialog.c:217 #: ../xfburn/xfburn-copy-cd-dialog.c:148 #: ../xfburn/xfburn-copy-dvd-dialog.c:148 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:203 @@ -170,7 +169,7 @@ msgid _Dummy write msgstr Жазуды и_митациялау #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:240 -#: ../xfburn/xfburn-burn-image-dialog.c:212 +#: ../xfburn/xfburn-burn-image-dialog.c:221 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:207 msgid Burn_Free msgstr Burn_Free @@ -216,79 +215,94 @@ msgstr Жазу режиміне қазір қолдау жоқ. msgid Could not create ISO source structure. msgstr ISO көзінің құрамасын жасау мүмкін емес. -#: ../xfburn/xfburn-burn-image-dialog.c:156 +#: ../xfburn/xfburn-burn-image-dialog.c:161 msgid Burn image msgstr
[Xfce4-commits] exo:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 34889d38a68a0e4e7dc2c0d010d050f2930d4eed (commit) from ae917d7eed984e3bcd75692d904bc2a6f0a399d4 (commit) commit 34889d38a68a0e4e7dc2c0d010d050f2930d4eed Author: Baurzhan Muftakhidinov baurthefi...@gmail.com Date: Thu Dec 27 19:07:00 2012 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 279 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 118 ++ 1 files changed, 80 insertions(+), 38 deletions(-) diff --git a/po/kk.po b/po/kk.po index fa9616c..8b884d5 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 baurthefi...@gmail.com, 2009. -# +# msgid msgstr Project-Id-Version: trunk\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-09 18:45+0100\n +POT-Creation-Date: 2012-12-27 16:03+\n PO-Revision-Date: 2010-08-03 09:54+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\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 #: ../exo/exo-cell-renderer-ellipsized-text.c:131 @@ -392,7 +392,7 @@ msgstr Элементті қосу үшін оны жоғарыдағы панельге тартып апарыңыз, өшіру үшін кері тартыңыз. -#: ../exo/exo-toolbars-editor.c:538 +#: ../exo/exo-toolbars-editor.c:537 msgid Separator msgstr Ажыратқыш @@ -595,37 +595,44 @@ msgstr Shell скриптері msgid Create Launcher b%s/b msgstr b%s/b жөнелткішін жасау -#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to +#. avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:297 msgid _Name: msgstr _Аты: -#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to +#. avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:313 msgid C_omment: msgstr А_нықтамасы: -#. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic +#. conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:329 msgid Comm_and: msgstr Ко_манда: -#. TRANSLATORS: Label in Create Link dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Link dialog, make sure to avoid mnemonic +#. conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:344 msgid _URL: msgstr _URL: -#. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic +#. conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:360 msgid Working _Directory: msgstr Жұмыс _бумасы: -#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to +#. avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:389 msgid _Icon: msgstr Таңба_ша: -#. TRANSLATORS: Label for the icon button in Create Launcher/Create Link dialog if no icon selected +#. TRANSLATORS: Label for the icon button in Create Launcher/Create Link +#. dialog if no icon selected #. setup a label to tell that no icon was selected #: ../exo-desktop-item-edit/exo-die-editor.c:406 #: ../exo-desktop-item-edit/exo-die-editor.c:1233 @@ -636,9 +643,11 @@ msgstr Таңбашасы жоқ msgid Options: msgstr Опциялар: -#. TRANSLATORS: Check button label in Create Launcher dialog, make sure to avoid mnemonic conflicts -#. * and sync your translations with the translations in Thunar and xfce4-panel. -#. +#. TRANSLATORS: Check button label in Create Launcher dialog, make sure to +#. avoid mnemonic conflicts +#. * and sync your translations with the translations in Thunar +#. and xfce4-panel. +#. #: ../exo-desktop-item-edit/exo-die-editor.c:421 msgid Use _startup notification msgstr Қос_ылу хабарламасын қолдану @@ -653,9 +662,11 @@ msgstr кезде хабарлама көрсетіледі. Қосылу хабарламасын әрбір қолданба қолдай бермейді. -#. TRANSLATORS: Check button label in Create Launcher dialog, make sure to avoid mnemonic conflicts -#. * and sync your translations with the translations in Thunar and xfce4-panel. -#. +#. TRANSLATORS: Check button label in Create Launcher dialog, make sure to +#. avoid mnemonic conflicts +#. * and sync your translations with the translations in Thunar +#. and xfce4-panel. +#. #:
[Xfce4-commits] thunar:master l10n: Updated Kazakh (kk) translation to 99%
Updating branch refs/heads/master to eb5b526c59c6ec68755be2c533109ed23d46f3a7 (commit) from f856c2f36edbf904a5d11b792a1503348c594464 (commit) commit eb5b526c59c6ec68755be2c533109ed23d46f3a7 Author: Baurzhan Muftakhidinov baurthefi...@gmail.com Date: Thu Dec 27 19:07:55 2012 +0100 l10n: Updated Kazakh (kk) translation to 99% New status: 737 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 186 -- 1 files changed, 96 insertions(+), 90 deletions(-) diff --git a/po/kk.po b/po/kk.po index ea970af..2ea62d0 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: 4.6\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-20 08:39+\n +POT-Creation-Date: 2012-12-27 17:12+\n PO-Revision-Date: 2012-11-07 22:06+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n @@ -137,7 +137,7 @@ msgstr Әрекетті жөнелту сәтсіз аяқталды #: ../thunar/thunar-launcher.c:1216 ../thunar/thunar-location-entry.c:402 #: ../thunar/thunar-location-entry.c:430 #: ../thunar/thunar-shortcuts-view.c:1630 -#: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c: +#: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c:2223 #, c-format msgid Failed to open \%s\ msgstr \%s\ ашу сәтсіз аяқталды @@ -150,20 +150,20 @@ msgstr \%s\ ашу сәтсіз аяқталды: %s #. display an error message #: ../thunar/thunar-application.c:1307 #: ../thunar/thunar-properties-dialog.c:671 -#: ../thunar/thunar-standard-view.c:2711 ../thunar/thunar-tree-view.c:1760 +#: ../thunar/thunar-standard-view.c:2739 ../thunar/thunar-tree-view.c:1760 #, c-format msgid Failed to rename \%s\ msgstr \%s\ атын ауыстыру қатесі #: ../thunar/thunar-application.c:1409 -#: ../thunar/thunar-location-buttons.c:1285 -#: ../thunar/thunar-standard-view.c:2276 ../thunar/thunar-tree-view.c:1622 +#: ../thunar/thunar-location-buttons.c:1308 +#: ../thunar/thunar-standard-view.c:2289 ../thunar/thunar-tree-view.c:1622 msgid New Folder msgstr Жаңа бума #: ../thunar/thunar-application.c:1410 -#: ../thunar/thunar-location-buttons.c:1286 -#: ../thunar/thunar-standard-view.c:2277 ../thunar/thunar-tree-view.c:1623 +#: ../thunar/thunar-location-buttons.c:1309 +#: ../thunar/thunar-standard-view.c:2290 ../thunar/thunar-tree-view.c:1623 msgid Create New Folder msgstr Жаңа буманы жасау @@ -176,7 +176,7 @@ msgid Create New File msgstr Жаңа файлды жасау #. generate a title for the create dialog -#: ../thunar/thunar-application.c:1472 ../thunar/thunar-standard-view.c:2321 +#: ../thunar/thunar-application.c:1472 ../thunar/thunar-standard-view.c:2334 #, c-format msgid Create Document from template \%s\ msgstr Жаңа құжатты \%s\ үлгісінен жасау @@ -247,7 +247,7 @@ msgstr Қоқыс шелегінен барлық файлдар мен бум #. append the Empty Trash menu action #. prepare the menu item -#: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:171 +#: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:179 #: ../thunar/thunar-shortcuts-view.c:1191 ../thunar/thunar-tree-view.c:1183 #: ../thunar/thunar-window.c:344 ../plugins/thunar-tpa/thunar-tpa.c:189 msgid _Empty Trash @@ -811,7 +811,7 @@ msgid File Name msgstr Файл аты #: ../thunar/thunar-file.c:929 ../thunar/thunar-gio-extensions.c:236 -#: ../thunar/thunar-shortcuts-model.c:899 ../thunar/thunar-window.c:362 +#: ../thunar/thunar-shortcuts-model.c:891 ../thunar/thunar-window.c:362 msgid File System msgstr Файлдық жүйе @@ -1031,7 +1031,7 @@ msgstr #. Prepare Open label #. append the Open menu action #: ../thunar/thunar-launcher.c:177 ../thunar/thunar-launcher.c:819 -#: ../thunar/thunar-location-buttons.c:168 +#: ../thunar/thunar-location-buttons.c:175 #: ../thunar/thunar-shortcuts-view.c:1087 ../thunar/thunar-tree-view.c:1113 msgid _Open msgstr _Ашу @@ -1282,56 +1282,67 @@ msgstr[0] %d бума таңдалды msgid %s, %s msgstr %s, %s +#. append the Open in New Tab menu action +#: ../thunar/thunar-location-buttons.c:176 +#: ../thunar/thunar-shortcuts-view.c:1097 +msgid Open in New Tab +msgstr Жаңа бетте ашу + #. append the Open in New Window menu action -#: ../thunar/thunar-location-buttons.c:169 +#: ../thunar/thunar-location-buttons.c:177 #: ../thunar/thunar-shortcuts-view.c:1103 msgid Open in New Window msgstr Жаңа терезеде ашу #. append the Create Folder menu action -#: ../thunar/thunar-location-buttons.c:170 -#: ../thunar/thunar-standard-view.c:387 ../thunar/thunar-tree-view.c:1199 +#: ../thunar/thunar-location-buttons.c:178 +#: ../thunar/thunar-standard-view.c:396 ../thunar/thunar-tree-view.c:1199 msgid Create _Folder... msgstr Бу_маны жасау... -#: ../thunar/thunar-location-buttons.c:171 ../thunar/thunar-window.c:344 +#: ../thunar/thunar-location-buttons.c:179 ../thunar/thunar-window.c:344
[Xfce4-commits] terminal:master Unset search regex when clearing buffer.
Updating branch refs/heads/master
to 0aaf23d53ac61e1fa23214e26b731d6feefff8d3 (commit)
from 5e15028e1996f53490687414c2ceac2c80521979 (commit)
commit 0aaf23d53ac61e1fa23214e26b731d6feefff8d3
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 20:32:09 2012 +0100
Unset search regex when clearing buffer.
terminal/terminal-screen.c |3 +++
terminal/terminal-window.c |5 -
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 2f93ab0..98df97c 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -2021,6 +2021,9 @@ terminal_screen_reset (TerminalScreen *screen,
{
terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
vte_terminal_reset (VTE_TERMINAL (screen-terminal), TRUE, clear);
+
+ if (clear)
+vte_terminal_search_set_gregex (VTE_TERMINAL (screen-terminal), NULL);
}
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index d3c7b43..2010efb 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -1806,7 +1806,10 @@ terminal_window_action_reset_and_clear (GtkAction
*action,
TerminalWindow *window)
{
if (G_LIKELY (window-active != NULL))
-terminal_screen_reset (window-active, TRUE);
+{
+ terminal_screen_reset (window-active, TRUE);
+ terminal_window_update_actions (window);
+}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master Add search dialog.
Updating branch refs/heads/master
to 5e15028e1996f53490687414c2ceac2c80521979 (commit)
from 8370e736a1bcf4fc585dece42dc328fd1b7d4d70 (commit)
commit 5e15028e1996f53490687414c2ceac2c80521979
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 20:04:14 2012 +0100
Add search dialog.
po/POTFILES.in|1 +
terminal/Makefile.am |2 +
terminal/terminal-screen.c| 39 +
terminal/terminal-screen.h| 11 ++
terminal/terminal-search-dialog.c | 279 +
terminal/terminal-search-dialog.h | 55 +++
terminal/terminal-window-ui.xml |6 +
terminal/terminal-window.c| 110 +++
8 files changed, 503 insertions(+), 0 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3e11c35..36d1199 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,6 +17,7 @@ terminal/terminal-preferences-dialog.c
terminal/terminal-preferences.glade
terminal/terminal-preferences.c
terminal/terminal-screen.c
+terminal/terminal-search-dialog.c
terminal/terminal-widget.c
terminal/terminal-window.c
diff --git a/terminal/Makefile.am b/terminal/Makefile.am
index eeb1817..cb1b96f 100644
--- a/terminal/Makefile.am
+++ b/terminal/Makefile.am
@@ -24,6 +24,7 @@ xfce4_terminal_headers = \
terminal-options.h \
terminal-preferences.h \
terminal-preferences-dialog.h \
+ terminal-search-dialog.h \
terminal-private.h \
terminal-screen.h \
terminal-widget.h \
@@ -42,6 +43,7 @@ xfce4_terminal_SOURCES = \
terminal-options.c \
terminal-preferences.c \
terminal-preferences-dialog.c \
+ terminal-search-dialog.c \
terminal-screen.c \
terminal-widget.c \
terminal-window.c
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 98a2840..2f93ab0 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -2188,3 +2188,42 @@ terminal_screen_set_encoding (TerminalScreen *screen,
terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
vte_terminal_set_encoding (VTE_TERMINAL (screen-terminal), charset);
}
+
+
+
+void
+terminal_screen_search_set_gregex (TerminalScreen *screen,
+ GRegex *regex,
+ gbooleanwrap_around)
+{
+ terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+ vte_terminal_search_set_gregex (VTE_TERMINAL (screen-terminal), regex);
+ vte_terminal_search_set_wrap_around (VTE_TERMINAL (screen-terminal),
wrap_around);
+}
+
+
+
+gboolean
+terminal_screen_search_has_gregex (TerminalScreen *screen)
+{
+ terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
+ return vte_terminal_search_get_gregex (VTE_TERMINAL (screen-terminal)) !=
NULL;
+}
+
+
+
+void
+terminal_screen_search_find_next (TerminalScreen *screen)
+{
+ terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+ vte_terminal_search_find_next (VTE_TERMINAL (screen-terminal));
+}
+
+
+
+void
+terminal_screen_search_find_previous (TerminalScreen *screen)
+{
+ terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+ vte_terminal_search_find_previous (VTE_TERMINAL (screen-terminal));
+}
diff --git a/terminal/terminal-screen.h b/terminal/terminal-screen.h
index cf4badc..1a03a42 100644
--- a/terminal/terminal-screen.h
+++ b/terminal/terminal-screen.h
@@ -95,6 +95,17 @@ const gchar *terminal_screen_get_encoding
(TerminalScreen *scree
void terminal_screen_set_encoding (TerminalScreen
*screen,
const gchar
*charset);
+void terminal_screen_search_set_gregex(TerminalScreen
*screen,
+ GRegex
*regex,
+ gboolean
wrap_around);
+
+gboolean terminal_screen_search_has_gregex(TerminalScreen
*screen);
+
+void terminal_screen_search_find_next (TerminalScreen
*screen);
+
+void terminal_screen_search_find_previous (TerminalScreen
*screen);
+
+
G_END_DECLS
#endif /* !__TERMINAL_SCREEN_H__ */
diff --git a/terminal/terminal-search-dialog.c
b/terminal/terminal-search-dialog.c
new file mode 100644
index 000..ef3cdb7
--- /dev/null
+++ b/terminal/terminal-search-dialog.c
@@ -0,0 +1,279 @@
+/*-
+ * Copyright 2012 Nick Schermer n...@xfce.org
+ *
+ * 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
[Xfce4-commits] xfce4-terminal:master Updates for release.
Updating branch refs/heads/master to 8d6e39a63e7ae511a2c3b9496082ac5111cfd09a (commit) from 50260c8994beff980e0b0348fe43f974a256b4d8 (commit) commit 8d6e39a63e7ae511a2c3b9496082ac5111cfd09a Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 21:07:42 2012 +0100 Updates for release. NEWS| 37 + configure.ac.in | 11 +++ 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 9cdc8b3..45002f8 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,40 @@ +0.6.0 += +- Rename the package from Terminal to xfce4-terminal. +- Don't add mailto when copying to clipboard (bug #7909) +- Add search dialog. +- Fix activity handling when resizing the window. +- Use mid color if activity expired (bug #9686). +- Improve quit confirm dialog. +- Add move tab left/right options (bug #5918). +- Only show terminal in the system category (bug #8693). +- Don't pre-parse options after -x (bug #9167). +- Make tabs a fraction smaller. +- Drop the special handling of the Super key. +- Depend on libxfce4ui and use its API. +- Use standard stock icons. +- Depend on vte 0.28 and exo 0.10. +- Drop anti-alias preference (deprecated in vte). +- Add =+@ to the default word-chars. +- Add encoding support. +- Use GDBus for dbus communication. +- Remove toolbar editor. +- Remove the exo dependency. +- Remove the custom accelerator code. +- Bundle palette colors into a single string. +- Add background color vary option. +- Add option --color-table. +- Add support for color presets. +- Properly set termcap emulation. +- Another attempt to fix the invalid sizing issues (bug #4728). +- Use G_ENABLE_DEBUG to enable additional checks (bug #8552). +- Allow setting the bold color (bug #5987). +- Use xmllint to strip the glade file. +- Rename reset option to Reset Scrollback. +- Allow re-using of last window with --tab. +- Improve documentation of --role (bug #8246). + + 0.4.8 = - Update online documentation location. diff --git a/configure.ac.in b/configure.ac.in index 1814d47..3fd7538 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,11 +9,11 @@ dnl *** dnl *** Version information *** dnl *** m4_define([terminal_version_major], [0]) -m4_define([terminal_version_minor], [4]) -m4_define([terminal_version_micro], [8]) +m4_define([terminal_version_minor], [6]) +m4_define([terminal_version_micro], [0]) 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], [5]) 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()])]) @@ -184,11 +184,6 @@ dnl *** echo echo Build Configuration: echo -if test x$DBUS_FOUND = xyes; then -echo * D-Bus support: yes -else -echo * D-Bus support: no -fi echo * Debug support: $enable_debug if test x$enable_gen_doc = xyes; then echo * Man Pages: yes (generate) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal:master Use new libtool initialization.
Updating branch refs/heads/master to 50260c8994beff980e0b0348fe43f974a256b4d8 (commit) from 0aaf23d53ac61e1fa23214e26b731d6feefff8d3 (commit) commit 50260c8994beff980e0b0348fe43f974a256b4d8 Author: Nick Schermer n...@xfce.org Date: Thu Dec 27 20:48:56 2012 +0100 Use new libtool initialization. configure.ac.in |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 0f7bbcb..1814d47 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -61,7 +61,12 @@ AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() AC_PROG_INTLTOOL([0.31], [no-xml]) -AC_PROG_LIBTOOL() + +dnl ** +dnl *** Initialize libtool *** +dnl ** +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) dnl ** dnl *** Check for standard headers *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal:master Rename go menu to Tabs.
Updating branch refs/heads/master
to 038052ff9ed368e86bc15881672ef0754f6c3b73 (commit)
from 8d6e39a63e7ae511a2c3b9496082ac5111cfd09a (commit)
commit 038052ff9ed368e86bc15881672ef0754f6c3b73
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 27 21:26:34 2012 +0100
Rename go menu to Tabs.
terminal/terminal-window-ui.xml |2 +-
terminal/terminal-window.c | 48 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/terminal/terminal-window-ui.xml b/terminal/terminal-window-ui.xml
index c278142..a03602a 100644
--- a/terminal/terminal-window-ui.xml
+++ b/terminal/terminal-window-ui.xml
@@ -44,7 +44,7 @@
menuitem action=reset/
menuitem action=reset-and-clear/
/menu
-menu action=go-menu
+menu action=tabs-menu
menuitem action=prev-tab/
menuitem action=next-tab/
separator/
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 2010efb..c9dacd8 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -87,7 +87,7 @@ static gbooleanterminal_window_accel_activate
(GtkAccelGr
GdkModifierType accel_mods,
TerminalWindow *window);
static voidterminal_window_update_actions
(TerminalWindow *window);
-static voidterminal_window_rebuild_gomenu
(TerminalWindow *window);
+static voidterminal_window_rebuild_tabs_menu
(TerminalWindow *window);
static voidterminal_window_notebook_page_switched
(GtkNotebook*notebook,
GtkNotebookPage*page,
guint
page_num,
@@ -206,8 +206,8 @@ struct _TerminalWindow
GtkActionGroup *action_group;
GtkUIManager*ui_manager;
- guintgomenu_merge_id;
- GSList *gomenu_actions;
+ guinttabs_menu_merge_id;
+ GSList *tabs_menu_actions;
GtkWidget *menubar;
GtkWidget *toolbar;
@@ -239,7 +239,7 @@ struct _TerminalWindow
static guint window_signals[LAST_SIGNAL];
static gconstpointer window_notebook_group = PACKAGE_NAME;
-static GQuarkgomenu_action_quark = 0;
+static GQuarktabs_menu_action_quark = 0;
@@ -265,7 +265,7 @@ static const GtkActionEntry action_entries[] =
{ search-prev, NULL, N_ (Find Pre_vious), NULL, NULL, G_CALLBACK
(terminal_window_action_search_prev), },
{ reset, NULL, N_ (_Clear Scrollback), NULL, NULL, G_CALLBACK
(terminal_window_action_reset), },
{ reset-and-clear, NULL, N_ (Clear Scrollback and _Reset), NULL, NULL,
G_CALLBACK (terminal_window_action_reset_and_clear), },
- { go-menu, NULL, N_ (_Go), NULL, NULL, NULL, },
+ { tabs-menu, NULL, N_ (T_abs), NULL, NULL, NULL, },
{ prev-tab, GTK_STOCK_GO_BACK, N_ (_Previous Tab), ControlPage_Up,
N_ (Switch to previous tab), G_CALLBACK (terminal_window_action_prev_tab), },
{ next-tab, GTK_STOCK_GO_FORWARD, N_ (_Next Tab),
ControlPage_Down, N_ (Switch to next tab), G_CALLBACK
(terminal_window_action_next_tab), },
{ move-tab-left, NULL, N_ (Move Tab _Left), NULL, NULL, G_CALLBACK
(terminal_window_action_move_tab_left), },
@@ -331,7 +331,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
G_TYPE_INT, G_TYPE_INT);
/* initialize quark */
- gomenu_action_quark = g_quark_from_static_string (gomenu-item);
+ tabs_menu_action_quark = g_quark_from_static_string (tabs-menu-item);
}
@@ -462,7 +462,7 @@ terminal_window_finalize (GObject *object)
g_object_unref (G_OBJECT (window-ui_manager));
g_object_unref (G_OBJECT (window-encoding_action));
- g_slist_free (window-gomenu_actions);
+ g_slist_free (window-tabs_menu_actions);
(*G_OBJECT_CLASS (terminal_window_parent_class)-finalize) (object);
}
@@ -762,7 +762,7 @@ terminal_window_update_actions (TerminalWindow *window)
gtk_action_set_sensitive (window-action_search_prev, can_search);
/* update the Go menu */
- action = g_object_get_qdata (G_OBJECT (window-active),
gomenu_action_quark);
+ action = g_object_get_qdata (G_OBJECT (window-active),
tabs_menu_action_quark);
if (G_LIKELY (action != NULL))
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
}
@@ -771,7 +771,7 @@ terminal_window_update_actions (TerminalWindow *window)
static void
-terminal_window_rebuild_gomenu (TerminalWindow *window)
+terminal_window_rebuild_tabs_menu (TerminalWindow *window)
{
gintnpages, n;
GtkWidget *page;
@@ -780,22 +780,22 @@ terminal_window_rebuild_gomenu
[Xfce4-commits] xfce4-terminal|xfce4-terminal-0.6.0 Creating annotated tag xfce4-terminal-0.6.0
Updating annotated tag refs/tags/xfce4-terminal-0.6.0 as new annotated tag to 16971072f929e7d2e84baf1fbe4d6467e539df63 (tag) succeeds terminal-0.4.8-341-g50260c8 tagged by Nick Schermer n...@xfce.org on 2012-12-27 21:10 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal:master Load default Alt+N accelerators on first startup.
Updating branch refs/heads/master
to f27770c863c22ec3a81e8935d7684080d1464aab (commit)
from 038052ff9ed368e86bc15881672ef0754f6c3b73 (commit)
commit f27770c863c22ec3a81e8935d7684080d1464aab
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 28 00:26:56 2012 +0100
Load default Alt+N accelerators on first startup.
terminal/terminal-app.c| 13 +
terminal/terminal-window.c |2 +-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 3aaba4b..7b4334f 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -36,6 +36,8 @@
#include string.h
#endif
+#include gdk/gdkkeysyms.h
+
#include terminal/terminal-app.h
#include terminal/terminal-config.h
#include terminal/terminal-preferences.h
@@ -259,6 +261,8 @@ terminal_app_accel_map_load (gpointer user_data)
{
TerminalApp *app = TERMINAL_APP (user_data);
gchar *path;
+ gcharname[50];
+ guinti;
app-accel_map_load_id = 0;
@@ -269,6 +273,15 @@ terminal_app_accel_map_load (gpointer user_data)
gtk_accel_map_load (path);
g_free (path);
}
+ else
+{
+ /* create default Alt+N accelerators */
+ for (i = 1; i 10; i++)
+{
+ g_snprintf (name, sizeof (name),
Actions/terminal-window/goto-tab-%d, i);
+ gtk_accel_map_change_entry (name, GDK_0 + i, GDK_MOD1_MASK, FALSE);
+}
+}
/* watch for changes */
app-accel_map = gtk_accel_map_get ();
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index c9dacd8..64f2b19 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -777,7 +777,7 @@ terminal_window_rebuild_tabs_menu (TerminalWindow *window)
GtkWidget *page;
GSList *group = NULL;
GtkRadioAction *radio_action;
- gchar name[100];
+ gchar name[50];
GSList *lp;
if (window-tabs_menu_merge_id != 0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Potential memory leak fixes.
Updating branch refs/heads/master
to 45559f1b426b2acf63c92d961cb893316c9980f5 (commit)
from 03b6551d241a054d1cf324cac4eb6c275b35d728 (commit)
commit 45559f1b426b2acf63c92d961cb893316c9980f5
Author: Sean Davis smd.seanda...@gmail.com
Date: Thu Dec 27 19:07:32 2012 -0500
Potential memory leak fixes.
src/gst/parole-gst.c | 16
src/parole-medialist.c |3 ++-
src/parole-player.c| 30 ++
3 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 83b63af..1f9b0fd 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1046,7 +1046,7 @@ parole_gst_tag_list_get_cover_external (ParoleGst *gst)
const gchar *listing = NULL;
gchar *lower = NULL;
gchar *cover = NULL;
-gchar *cover_filename;
+gchar *cover_filename = NULL;
g_object_get (G_OBJECT (gst-priv-stream),
uri, uri,
@@ -1080,15 +1080,15 @@ parole_gst_tag_list_get_cover_external (ParoleGst *gst)
if (cover)
{
cover_filename = g_build_filename(directory, cover, NULL);
-g_free(uri);
-g_free(filename);
-g_free(directory);
-g_free(file_dir);
-g_free(lower);
-return cover_filename;
+break;
}
}
-return NULL;
+g_free(uri);
+g_free(filename);
+g_free(directory);
+g_free(file_dir);
+g_free(lower);
+return cover_filename;
}
static const GValue *
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 9ac532e..575808f 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -1099,14 +1099,15 @@ void
parole_media_list_clear_disc_list (ParoleMediaList *list)
{
gtk_list_store_clear (GTK_LIST_STORE (list-priv-disc_store));
-//parole_media_list_set_widget_sensitive (list, FALSE);
}
void
parole_media_list_clear_list (ParoleMediaList *list)
{
+TRACE(CLEAR START);
gtk_list_store_clear (GTK_LIST_STORE (list-priv-store));
parole_media_list_set_widget_sensitive (list, FALSE);
+TRACE(CLEAR END);
}
static void
diff --git a/src/parole-player.c b/src/parole-player.c
index 29dd32f..5192223 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -571,7 +571,7 @@ parole_player_reset (ParolePlayer *player)
gtk_window_set_title (GTK_WINDOW (player-priv-window), Parole Media
Player);
player-priv-audio_list = NULL;
player-priv-subtitle_list = NULL;
- player-priv-current_media_type = PAROLE_MEDIA_TYPE_UNKNOWN;
+
gtk_widget_hide(GTK_WIDGET(player-priv-infobar));
parole_player_change_range_value (player, 0);
@@ -582,8 +582,16 @@ parole_player_reset (ParolePlayer *player)
player-priv-row = NULL;
}
+if (player-priv-current_media_type == PAROLE_MEDIA_TYPE_DVD)
+{
+TRACE(CLEAR DVD LIST);
+ parole_media_list_clear_disc_list (player-priv-list);
+ TRACE(END CLEAR DVD LIST);
+}
+ player-priv-current_media_type = PAROLE_MEDIA_TYPE_UNKNOWN;
+
parole_media_list_set_playlist_view(player-priv-list,
PAROLE_MEDIA_LIST_PLAYLIST_VIEW_STANDARD);
-//parole_media_list_clear_disc_list (player-priv-list);
+
}
static void
@@ -975,10 +983,6 @@ parole_player_media_activated_cb (ParoleMediaList *list,
GtkTreeRowReference *ro
GtkTreeIter iter;
GtkTreeModel *model;
-//parole_player_reset (player);
-
-//player-priv-row = gtk_tree_row_reference_copy (row);
-
model = gtk_tree_row_reference_get_model (row);
if ( gtk_tree_model_get_iter (model, iter,
gtk_tree_row_reference_get_path (row)) )
@@ -1047,9 +1051,19 @@ parole_player_disc_selected_cb (ParoleDisc *disc, const
gchar *uri, const gchar
player-priv-current_media_type = parole_gst_get_current_stream_type
(PAROLE_GST (player-priv-gst));
if ( player-priv-current_media_type == PAROLE_MEDIA_TYPE_CDDA )
+{
player-priv-wait_for_gst_disc_info = TRUE;
-
-parole_media_list_clear_list (player-priv-list);
+if ( player-priv-row )
+{
+ parole_media_list_set_row_pixbuf (player-priv-list,
player-priv-row, NULL);
+ gtk_tree_row_reference_free (player-priv-row);
+ player-priv-row = NULL;
+}
+TRACE(CLEAR PLAYLIST);
+parole_media_list_clear_list (player-priv-list);
+TRACE(END CLEAR PLAYLIST);
+}
+else
parole_media_list_set_playlist_view(player-priv-list,
PAROLE_MEDIA_LIST_PLAYLIST_VIEW_DISC);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mixer:master l10n: Updated Kazakh (kk) translation to 97%
Updating branch refs/heads/master to 1538cbe828d2596fe5881c315e22386e138242c5 (commit) from 33adb9229ef0db2f851e271bee8bd6cea31bec37 (commit) commit 1538cbe828d2596fe5881c315e22386e138242c5 Author: Baurzhan Muftakhidinov baurthefi...@gmail.com Date: Fri Dec 28 05:55:59 2012 +0100 l10n: Updated Kazakh (kk) translation to 97% New status: 35 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 53 + 1 files changed, 21 insertions(+), 32 deletions(-) diff --git a/po/kk.po b/po/kk.po index 4714c01..49ef51e 100644 --- a/po/kk.po +++ b/po/kk.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. # Baurzhan Muftakhidinov baurthefi...@gmail.com, 2009. -# +# msgid msgstr Project-Id-Version: trunk\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-09-29 13:30+\n -PO-Revision-Date: 2009-08-16 13:04+0600\n +PO-Revision-Date: 2012-12-28 10:55+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n MIME-Version: 1.0\n @@ -26,14 +26,10 @@ msgstr Дыб_ысты басу msgid Run Audio Mi_xer msgstr Аудио м_иксерін жөнелту -#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148 -msgid -GStreamer was unable to detect any sound devices. Some sound system specific -GStreamer packages may be missing. It may also be a permissions problem. -msgstr -GStreamer бірде-бір дыбыстық картаны таба алмаған. Дыбыстық жүйеге тән -кейбір GStreamer дестелері жоқ болып тұрған мүмкін. Сонымен қатар, бұл -рұқсат мәселесі болуы мүмкін. +#: ../panel-plugin/xfce-mixer-plugin.c:581 +#: ../xfce4-mixer/main.c:148 +msgid GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem. +msgstr GStreamer бірде-бір дыбыстық картаны таба алмаған. Дыбыстық жүйеге тән кейбір GStreamer дестелері жоқ болып тұрған мүмкін. Сонымен қатар, бұл рұқсат мәселесі болуы мүмкін. #: ../panel-plugin/xfce-mixer-plugin.c:931 msgid No command defined @@ -42,14 +38,8 @@ msgstr Команда орнатылмаған #. Generate error message and insert the current command #: ../panel-plugin/xfce-mixer-plugin.c:939 #, c-format -msgid -Could not execute the command \%s\. Ensure that either the location of the -command is included in the PATH environment variable or that you are -providing the full path to the command. -msgstr -\%s\ командасын орындау мүмкін емес. Осы команданың орналақан орны -қоршамыңыздың PATH айнымалысында бар екеніне не осы командаға толық жолды -көрсеткеніңізге көз жеткізіңіз. +msgid Could not execute the command \%s\. Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command. +msgstr \%s\ командасын орындау мүмкін емес. Осы команданың орналақан орны қоршамыңыздың PATH айнымалысында бар екеніне не осы командаға толық жолды көрсеткеніңізге көз жеткізіңіз. #: ../panel-plugin/xfce-plugin-dialog.c:150 msgid Audio Mixer Plugin @@ -83,7 +73,8 @@ msgid %s: %i%% msgstr %s: %i%% #. Set application name -#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99 +#: ../panel-plugin/mixer.desktop.in.h:1 +#: ../xfce4-mixer/main.c:99 #: ../xfce4-mixer/xfce-mixer-window.c:150 #: ../xfce4-mixer/xfce-mixer-window.c:413 #: ../xfce4-mixer/xfce-mixer-window.c:427 @@ -112,7 +103,7 @@ msgstr Нұсқа ақпаратын көрсету мен шығу #: ../xfce4-mixer/main.c:130 #, c-format msgid xfce4-mixer: Failed to initialize xfconf: %s\n -msgstr xfce4-mixer: Xfconf іске қосу қатесі: %s +msgstr xfce4-mixer: Xfconf іске қосу қатесі: %s\n #: ../xfce4-mixer/xfce-mixer-container.c:218 msgid _Playback @@ -132,36 +123,34 @@ msgstr _Опциялар #: ../xfce4-mixer/xfce-mixer-container.c:390 msgid No controls visible -msgstr Көрінетін каналдар жоқ +msgstr Көрінетін арналар жоқ #: ../xfce4-mixer/xfce-mixer-container.c:401 msgid span weight=\bold\ size=\larger\No controls visible/span -msgstr +msgstr span weight=\bold\ size=\larger\Көрінетін басқару элементтері жоқ/span #: ../xfce4-mixer/xfce-mixer-container.c:409 -msgid -In order to toggle the visibility of mixer controls, open the b\Select -Controls\/b dialog. -msgstr +msgid In order to toggle the visibility of mixer controls, open the b\Select Controls\/b dialog. +msgstr Миксердің басқарушы элементтерін көрсету/жасыру үшін,b\Арналарды таңдау\/b терезесін ашыңыз. #: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118 msgid Select Controls -msgstr Каналдарды таңдау +msgstr Арналарды таңдау #: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120 msgid Select which controls should be visible -msgstr Көрінетін каналдарды таңдаңыз +msgstr Көрінетін арналарды таңдаңыз #: ../xfce4-mixer/xfce-mixer-track.c:257
[Xfce4-commits] xfce4-mixer:master l10n: Updated Kazakh (kk) translation to None%
Updating branch refs/heads/master to 33adb9229ef0db2f851e271bee8bd6cea31bec37 (commit) from 10d82e6eb52dd4f27db48386bf208c2157bc9e3d (commit) commit 33adb9229ef0db2f851e271bee8bd6cea31bec37 Author: Baurzhan Muftakhidinov baurthefi...@gmail.com Date: Fri Dec 28 05:51:17 2012 +0100 l10n: Updated Kazakh (kk) translation to None% New status: 0 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 54 ++ 1 files changed, 22 insertions(+), 32 deletions(-) diff --git a/po/kk.po b/po/kk.po index b3cdd26..4714c01 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Baurzhan Muftakhidinov baurthefi...@gmail.com, 2009. -# +# msgid msgstr Project-Id-Version: trunk\n @@ -11,20 +11,20 @@ msgstr PO-Revision-Date: 2009-08-16 13:04+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\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 #. Add menu item for muting #: ../panel-plugin/xfce-mixer-plugin.c:306 msgid Mu_te -msgstr +msgstr Дыб_ысты басу #: ../panel-plugin/xfce-mixer-plugin.c:314 msgid Run Audio Mi_xer -msgstr +msgstr Аудио м_иксерін жөнелту #: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148 msgid @@ -36,9 +36,8 @@ msgstr рұқсат мәселесі болуы мүмкін. #: ../panel-plugin/xfce-mixer-plugin.c:931 -#, fuzzy msgid No command defined -msgstr Сол жақ шерту командасы орнатылмаған +msgstr Команда орнатылмаған #. Generate error message and insert the current command #: ../panel-plugin/xfce-mixer-plugin.c:939 @@ -53,34 +52,30 @@ msgstr көрсеткеніңізге көз жеткізіңіз. #: ../panel-plugin/xfce-plugin-dialog.c:150 -#, fuzzy msgid Audio Mixer Plugin -msgstr Миксер плагині +msgstr Аудио миксер плагині #: ../panel-plugin/xfce-plugin-dialog.c:152 -#, fuzzy msgid Configure the sound card and mixer track -msgstr Дыбыстық карта(лар)ды баптау мен дауыс деңгейін орнату +msgstr Дыбыстық картаны мен миксер трегін баптау #: ../panel-plugin/xfce-plugin-dialog.c:165 #: ../xfce4-mixer/xfce-mixer-window.c:185 -#, fuzzy msgid Sound _card: -msgstr Дыбыстық карта: +msgstr Дыбыстық карта_сы: #: ../panel-plugin/xfce-plugin-dialog.c:174 -#, fuzzy msgid Mixer _track: -msgstr Миксер каналы +msgstr Миксер _трегі: #: ../panel-plugin/xfce-volume-button.c:854 msgid No valid device and/or element. -msgstr +msgstr Дұрыс құрылғы және/не элемент жоқ. #: ../panel-plugin/xfce-volume-button.c:859 #, c-format msgid %s: muted -msgstr +msgstr %s: дыбыс басылған #: ../panel-plugin/xfce-volume-button.c:861 #, c-format @@ -93,14 +88,13 @@ msgstr %s: %i%% #: ../xfce4-mixer/xfce-mixer-window.c:413 #: ../xfce4-mixer/xfce-mixer-window.c:427 #: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1 -#, fuzzy msgid Audio Mixer -msgstr Миксер +msgstr Аудио миксері #: ../panel-plugin/mixer.desktop.in.h:2 #: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2 msgid Adjust volume levels -msgstr +msgstr Дыбыс деңгейлерін орнату #: ../libxfce4mixer/libxfce4mixer.c:422 #, c-format @@ -109,36 +103,32 @@ msgstr Белгісіз дыбыс каналы %d #: ../xfce4-mixer/main.c:86 msgid Enable debugging output -msgstr +msgstr Шығыста жөндеу ақпаратын көрсету #: ../xfce4-mixer/main.c:87 msgid Show version and exit -msgstr +msgstr Нұсқа ақпаратын көрсету мен шығу #: ../xfce4-mixer/main.c:130 -#, fuzzy, c-format +#, c-format msgid xfce4-mixer: Failed to initialize xfconf: %s\n -msgstr Xfconf іске қосу қатесі: %s +msgstr xfce4-mixer: Xfconf іске қосу қатесі: %s #: ../xfce4-mixer/xfce-mixer-container.c:218 -#, fuzzy msgid _Playback -msgstr Ойнату +msgstr О_йнату #: ../xfce4-mixer/xfce-mixer-container.c:218 -#, fuzzy msgid C_apture -msgstr Ұстау +msgstr Ұс_тау #: ../xfce4-mixer/xfce-mixer-container.c:218 -#, fuzzy msgid S_witches -msgstr Ауыстырғыштар +msgstr Ауыстырғы_штар #: ../xfce4-mixer/xfce-mixer-container.c:218 -#, fuzzy msgid _Options -msgstr Опциялар +msgstr _Опциялар #: ../xfce4-mixer/xfce-mixer-container.c:390 msgid No controls visible @@ -176,7 +166,7 @@ msgstr #: ../xfce4-mixer/xfce-mixer-track.c:340 #, c-format msgid Mute/unmute %s -msgstr +msgstr %s дыбысын басу/іске қосу #: ../xfce4-mixer/xfce-mixer-track.c:360 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal:master l10n: Updated Kazakh (kk) translation to 96%
Updating branch refs/heads/master to f1faeacbd21594fe8158bbc71e1f1db9e1b8b7e0 (commit) from f27770c863c22ec3a81e8935d7684080d1464aab (commit) commit f1faeacbd21594fe8158bbc71e1f1db9e1b8b7e0 Author: Baurzhan Muftakhidinov baurthefi...@gmail.com Date: Fri Dec 28 05:47:22 2012 +0100 l10n: Updated Kazakh (kk) translation to 96% New status: 250 messages complete with 2 fuzzies and 7 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 197 ++ 1 files changed, 121 insertions(+), 76 deletions(-) diff --git a/po/kk.po b/po/kk.po index ae471c8..381f74f 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: 2012-12-27 17:03+\n +POT-Creation-Date: 2012-12-28 03:45+\n PO-Revision-Date: 2010-11-23 15:41+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n @@ -23,7 +23,7 @@ msgstr Қара үстіндегі ақ #: ../colorschemes/dark-pastels.theme.in.h:1 msgid Dark Pastels -msgstr +msgstr Күңгірт пастель #: ../colorschemes/green-on-black.theme.in.h:1 msgid Green on Black @@ -39,7 +39,7 @@ msgstr Tango #: ../colorschemes/white-on-black.theme.in.h:1 msgid White on Black -msgstr +msgstr Қара үстіндегі ақ #: ../colorschemes/xterm.theme.in.h:1 msgid XTerm @@ -142,7 +142,7 @@ msgstr Ақаулықтар жөнінде хабарлаңыз: %s. msgid Unable to register terminal service: %s\n msgstr Терминал қызметін тіркеу мүмкін емес: %s\n -#: ../terminal/terminal-app.c:617 +#: ../terminal/terminal-app.c:630 #, c-format msgid Invalid geometry string \%s\\n msgstr Қате geometry жолы \%s\\n @@ -315,7 +315,7 @@ msgstr Option \--role\ опциясы терезе ролінің параметр ретінде берілуін сұрайды #: ../terminal/terminal-options.c:357 -#, fuzzy, c-format +#, c-format msgid Option \--sm-client-id\ requires specifying the unique session id as its parameter @@ -378,9 +378,8 @@ msgid Auto-detect msgstr Автоанықтау #: ../terminal/terminal-preferences.glade.h:6 -#, fuzzy msgid B_old text color: -msgstr Мә_тін түсі: +msgstr Жуан мә_тін түсі: #: ../terminal/terminal-preferences.glade.h:7 msgid Background @@ -472,11 +471,11 @@ msgstr Таңдауыңызша түстер #: ../terminal/terminal-preferences.glade.h:29 msgid Cyan -msgstr +msgstr Көгілдір #: ../terminal/terminal-preferences.glade.h:30 msgid Dark Gray -msgstr +msgstr Күңгірт сұр #: ../terminal/terminal-preferences.glade.h:31 msgid Default character e_ncoding: @@ -503,9 +502,8 @@ msgid Display _menubar in new windows msgstr Жаңа терезелер_де мәзір жолағын көрсету #: ../terminal/terminal-preferences.glade.h:37 -#, fuzzy msgid Display _toolbar in new windows -msgstr Жаңа тере_зелерде саймандар панельдерін көрсету +msgstr Жаңа тере_зелерде панельдерді көрсету #: ../terminal/terminal-preferences.glade.h:38 msgid Double Click @@ -612,7 +610,7 @@ msgstr Ашық көк #: ../terminal/terminal-preferences.glade.h:57 msgid Light Cyan -msgstr +msgstr Ақшыл көгілдір #: ../terminal/terminal-preferences.glade.h:58 msgid Light Gray @@ -624,7 +622,7 @@ msgstr Ашық жасыл #: ../terminal/terminal-preferences.glade.h:60 msgid Light Magenta -msgstr +msgstr Ақшыл қарақошқыл #: ../terminal/terminal-preferences.glade.h:61 msgid Light Red @@ -632,7 +630,7 @@ msgstr Ашық қызыл #: ../terminal/terminal-preferences.glade.h:62 msgid Magenta -msgstr +msgstr Қарақошқыл #: ../terminal/terminal-preferences.glade.h:63 msgid Menubar Access @@ -663,9 +661,8 @@ msgid Palette msgstr Палитра #: ../terminal/terminal-preferences.glade.h:70 -#, fuzzy msgid Presets -msgstr Тастау +msgstr #: ../terminal/terminal-preferences.glade.h:71 msgid Red @@ -884,10 +881,43 @@ msgstr Тіркелгіңіздің командалық қоршауын ан msgid Failed to execute child msgstr Ұрпақ үрдісін жөнелту қатемен аяқталды -#: ../terminal/terminal-screen.c:2140 +#: ../terminal/terminal-screen.c:2143 msgid Close this tab msgstr Бұл бетті жабу +#: ../terminal/terminal-search-dialog.c:91 +msgid Find +msgstr Табу + +#: ../terminal/terminal-search-dialog.c:96 +msgid _Previous +msgstr А_лдыңғы + +#: ../terminal/terminal-search-dialog.c:100 +msgid _Next +msgstr _Келесі + +#: ../terminal/terminal-search-dialog.c:110 +msgid _Search for: +msgstr _Нені іздеу керек: + +#: ../terminal/terminal-search-dialog.c:123 +msgid C_ase sensitive +msgstr Р_егистрге тәуелді + +#: ../terminal/terminal-search-dialog.c:128 +msgid Match as _regular expression +msgstr Тұрақ_ты өрнек ретінде сәйкестендіру + +#: ../terminal/terminal-search-dialog.c:133 +msgid Match _entire word only +msgstr Сө_зді тек толығымен сәйкестендіру + +#: ../terminal/terminal-search-dialog.c:138 +#, fuzzy +msgid _Wrap around +msgstr _Айналдыру + #: ../terminal/terminal-widget.c:324 msgid Copy Email Address msgstr Email адресін көшіру @@ -938,189 +968,200 @@ msgstr Қате түс
[Xfce4-commits] thunar:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 87fca2962757bc1fb718fa8251dcf137d53e1df3 (commit) from eb5b526c59c6ec68755be2c533109ed23d46f3a7 (commit) commit 87fca2962757bc1fb718fa8251dcf137d53e1df3 Author: Baurzhan Muftakhidinov baurthefi...@gmail.com Date: Fri Dec 28 05:57:19 2012 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 738 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/kk.po b/po/kk.po index 2ea62d0..006cb4b 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: 4.6\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-27 17:12+\n +POT-Creation-Date: 2012-12-28 03:54+\n PO-Revision-Date: 2012-11-07 22:06+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n @@ -3135,7 +3135,6 @@ msgid Camelcase msgstr Аралас регистр #: ../plugins/thunar-sbr/thunar-sbr-enum-types.c:96 -#, fuzzy msgid Sentence case msgstr Сөйлемдегі сияқты ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to d2282f1d2bd85cd6332a9ead4a02421e108ff607 (commit) from 4e3a6b463c68249e15898015c8a5cf912f288246 (commit) commit d2282f1d2bd85cd6332a9ead4a02421e108ff607 Author: Baurzhan Muftakhidinov baurthefi...@gmail.com Date: Fri Dec 28 06:05:35 2012 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 349 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 35 +++ 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/po/kk.po b/po/kk.po index 392c300..7cfbacc 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: 2012-12-20 11:09+\n +POT-Creation-Date: 2012-12-28 01:03+\n PO-Revision-Date: 2012-08-04 08:27+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n @@ -574,7 +574,7 @@ msgstr Бұ_рылуы: #: ../dialogs/display-settings/display-dialog.glade.h:9 msgid _Mirror displays -msgstr +msgstr А_йналы дисплейдер #: ../dialogs/display-settings/display-dialog.glade.h:10 msgid _Use this output @@ -593,9 +593,8 @@ msgid Extend to the right msgstr Оңға қарай созу #: ../dialogs/display-settings/minimal-display-dialog.glade.h:4 -#, fuzzy msgid Mirror Displays -msgstr Дисплей +msgstr Айналы дисплейдер #: ../dialogs/display-settings/minimal-display-dialog.glade.h:5 msgid Only Display 1 @@ -611,25 +610,23 @@ msgstr radiobutton #: ../dialogs/display-settings/main.c:91 msgid Same as -msgstr +msgstr Келесідей сияқты #: ../dialogs/display-settings/main.c:92 msgid Above -msgstr +msgstr Үстінен #: ../dialogs/display-settings/main.c:93 msgid Below -msgstr +msgstr Астынан #: ../dialogs/display-settings/main.c:94 -#, fuzzy msgid Right of -msgstr Оң жақ +msgstr Оң жақтан #: ../dialogs/display-settings/main.c:95 -#, fuzzy msgid Left of -msgstr Сол жақ +msgstr Сол жақтан #: ../dialogs/display-settings/main.c:104 msgid Left @@ -675,12 +672,10 @@ msgid %.1f Hz msgstr %.1f Гц #: ../dialogs/display-settings/main.c:1041 -#, fuzzy msgid Display: -msgstr Дисплей +msgstr Дисплей: #: ../dialogs/display-settings/main.c:1046 -#, fuzzy msgid Resolution: msgstr Кең_ейтілуі: @@ -974,16 +969,16 @@ msgstr Жайма msgid Variant msgstr Нұсқа -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:963 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:957 msgid Shortcut command may not be empty. msgstr Жарлық командасы бос болуы мүмкін емес. -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1078 -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1079 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1067 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1068 msgid Reset to Defaults msgstr Бастапқы түріне келтіру -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1080 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1069 msgid This will reset all shortcuts to their default values. Do you really want to do this? @@ -991,12 +986,12 @@ msgstr Бұл әрекет барлық жарлықтарды бастапқы түріне келтіреді. Осыны шынымен қалайсыз ба? -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1159 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1148 msgid The system defaults will be restored next time you log in. msgstr Жүйенің бастапқы баптаулары сіз келесі рет жүйеге кіргенде іске қосылады. -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1161 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1150 msgid Warning msgstr Ескерту ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
