[Xfce4-commits] midori:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to cabc6c57a6b818ad6eb009bf012f3a8d883b1e74 (commit) from 76cbe8fe64eab975f242908ba5add42bb4df8d4c (commit) commit cabc6c57a6b818ad6eb009bf012f3a8d883b1e74 Author: Pjotr Anon pliniusmi...@gmail.com Date: Mon Oct 24 12:16:35 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 669 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 375 +++--- 1 files changed, 190 insertions(+), 185 deletions(-) diff --git a/po/nl.po b/po/nl.po index 1b59993..f2496c0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: midori\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-10-22 10:10+\n +POT-Creation-Date: 2011-10-24 10:10+\n PO-Revision-Date: 2011-09-08 12:02+0200\n Last-Translator: Emmo (assisted by Pjotr)\n Language-Team: Dutch (Flemish)\n @@ -22,8 +22,8 @@ msgstr msgid Lightweight web browser msgstr Lichtgewicht webbrowser -#: ../data/midori.desktop.in.h:2 ../midori/main.c:2006 ../midori/main.c:2030 -#: ../midori/main.c:2046 ../midori/midori-websettings.c:294 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:2030 ../midori/main.c:2054 +#: ../midori/main.c:2070 ../midori/midori-websettings.c:295 msgid Midori msgstr Midori @@ -101,7 +101,7 @@ msgstr Extensies msgid Privacy msgstr Privacy -#: ../midori/main.c:760 +#: ../midori/main.c:764 msgid Cookies store login data, saved games, or user profiles for advertisement purposes. @@ -109,19 +109,19 @@ msgstr Koekjes slaan aanmeldgegevens, opgeslagen spelletjes of gebruikerprofielen op voor adverteerdoeleinden. -#: ../midori/main.c:822 +#: ../midori/main.c:826 #, c-format msgid The session couldn't be saved. %s msgstr De sessie kon niet worden opgeslagen. %s -#: ../midori/main.c:1015 +#: ../midori/main.c:1033 msgid No root certificate file is available. SSL certificates cannot be verified. msgstr Geen root-certificaatbestand aanwezig. SSL-certificaten kunnen niet worden geverifieerd. -#: ../midori/main.c:1077 +#: ../midori/main.c:1101 msgid Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem. @@ -130,185 +130,185 @@ msgstr Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het probleem op te lossen. -#: ../midori/main.c:1096 +#: ../midori/main.c:1120 msgid Modify _preferences msgstr _Voorkeuren wijzigen -#: ../midori/main.c:1100 +#: ../midori/main.c:1124 msgid Disable all _extensions msgstr Schakel alle _extensies uit -#: ../midori/main.c:1113 +#: ../midori/main.c:1137 msgid Discard old tabs msgstr Verwijder oude tabbladen -#: ../midori/main.c:1114 ../midori/midori-websettings.c:203 +#: ../midori/main.c:1138 ../midori/midori-websettings.c:204 msgid Show last tabs without loading msgstr Toon laatste tabbladen zonder te laden -#: ../midori/main.c:1115 ../midori/midori-websettings.c:202 +#: ../midori/main.c:1139 ../midori/midori-websettings.c:203 msgid Show last open tabs msgstr Toon laatst geopende tabbladen -#: ../midori/main.c:1325 ../midori/main.c:2426 +#: ../midori/main.c:1349 ../midori/main.c:2453 #, c-format msgid The session couldn't be loaded: %s\n msgstr De sessie kon niet geladen worden: %s\n -#: ../midori/main.c:1466 +#: ../midori/main.c:1490 #, c-format msgid Snapshot saved to: %s\n msgstr Momentopname opgeslagen in: %s\n -#: ../midori/main.c:1890 +#: ../midori/main.c:1914 msgid Run ADDRESS as a web application msgstr ADRES uitvoeren als een webtoepassing -#: ../midori/main.c:1890 +#: ../midori/main.c:1914 msgid ADDRESS msgstr ADRES -#: ../midori/main.c:1893 +#: ../midori/main.c:1917 msgid Use FOLDER as configuration folder msgstr Gebruik MAP als configuratiemap -#: ../midori/main.c:1893 +#: ../midori/main.c:1917 msgid FOLDER msgstr MAP -#: ../midori/main.c:1896 +#: ../midori/main.c:1920 msgid Private browsing, no changes are saved msgstr Privé-surfen, veranderingen worden niet opgeslagen. -#: ../midori/main.c:1898 +#: ../midori/main.c:1922 msgid Show a diagnostic dialog msgstr Toon een diagnostisch venster -#: ../midori/main.c:1900 +#: ../midori/main.c:1924 msgid Run the specified filename as javascript msgstr Voer de opgegeven bestandnaam uit als javascript -#: ../midori/main.c:1902 +#: ../midori/main.c:1926 msgid Take a snapshot of the specified URI msgstr Maak een momentopname van de opgegeven URI -#: ../midori/main.c:1904 +#: ../midori/main.c:1928 msgid Execute the specified command msgstr Voer de opgegeven opdracht uit -#: ../midori/main.c:1906 +#: ../midori/main.c:1930 msgid List available commands to execute with -e/ --execute msgstr Lijst beschikbare opdrachten uit te voeren met -e/ --execute -#: ../midori/main.c:1908 +#: ../midori/main.c:1932 msgid
[Xfce4-commits] xfmpc:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 9b7f759099ffb15749635a53af07de601df2eab9 (commit) from 9913cb70f508563ebd39ff4d6b0c731d778c1e0f (commit) commit 9b7f759099ffb15749635a53af07de601df2eab9 Author: Pjotr Anon pliniusmi...@gmail.com Date: Mon Oct 24 12:19:43 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 70 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 21 ++--- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/po/nl.po b/po/nl.po index eb53740..40b6a69 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ # Mike Massonnet mmasson...@xfce.org, 2008-2009. # Timo Verbeek # Pjotr, 2011. -# +# msgid msgstr Project-Id-Version: xfmpc\n @@ -14,10 +14,10 @@ msgstr PO-Revision-Date: 2011-09-08 13:12+0200\n Last-Translator: Pjotr\n Language-Team: Dutch (Flemish)\n -Language: nl (Dutch)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: nl (Dutch)\n Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../src/dbbrowser.c:1508 @@ -253,37 +253,36 @@ msgid %T: Track msgstr %T: Spoor #: ../src/shortcuts-dialog.c:161 -#, fuzzy msgid Xfmpc Shortcuts -msgstr _Snelkoppelingen +msgstr Sneltoetsen voor Xfmpc #: ../src/shortcuts-dialog.c:163 msgid Control your MPD client with your keyboard -msgstr +msgstr Beheers uw MPD-cliënt met uw toetsenbord #: ../src/shortcuts-dialog.c:178 msgid Quit: CTRL+q -msgstr +msgstr Afsluiten: CTRL+q #: ../src/shortcuts-dialog.c:187 msgid Previous: CTRL+b -msgstr +msgstr Vorige: CTRL+b #: ../src/shortcuts-dialog.c:197 msgid Play/Pause: CTRL+p -msgstr +msgstr Spelen/Pauzeren: CTRL+p #: ../src/shortcuts-dialog.c:207 msgid Stop: CTRL+s -msgstr +msgstr Stop: CTRL+s #: ../src/shortcuts-dialog.c:217 msgid Next: CTRL+f -msgstr +msgstr Volgende: CTRL+f #: ../src/shortcuts-dialog.c:227 msgid Volume: CTRL+v -msgstr +msgstr Volume: CTRL+v #: ../src/song-dialog.c:239 msgid File ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated Dutch (Flemish) (nl) translation to 97%
Updating branch refs/heads/master to 82c01dba81cd53c2da3914d58d020194dde616c9 (commit) from 7aa32d384c375e79f96213007ba1aa32b9525040 (commit) commit 82c01dba81cd53c2da3914d58d020194dde616c9 Author: Pjotr Anon pliniusmi...@gmail.com Date: Mon Oct 24 12:27:35 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 97% New status: 368 messages complete with 8 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 260 +++--- 1 files changed, 197 insertions(+), 63 deletions(-) diff --git a/po/nl.po b/po/nl.po index 3b4127a..8ed3821 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-panel\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-10-07 16:06+\n +POT-Creation-Date: 2011-10-24 10:07+\n PO-Revision-Date: 2011-09-24 20:43+0200\n Last-Translator: Pjotr\n Language-Team: Dutch (Flemish)\n @@ -35,7 +35,7 @@ msgstr Pas de werkbalk aan #: ../panel-preferences.desktop.in.h:2 #: ../panel/panel-preferences-dialog.glade.h:26 ../panel/panel-window.c:2275 -#: ../migrate/main.c:100 +#: ../migrate/main.c:107 msgid Panel msgstr Werkbalk @@ -212,11 +212,11 @@ msgstr msgid No running instance of %s was found msgstr Geen actieve functie van %s gevonden -#: ../panel/panel-application.c:217 +#: ../panel/panel-application.c:219 msgid Failed to launch the migration application msgstr Kon de migratietoepassing niet openen -#: ../panel/panel-application.c:1595 ../plugins/actions/actions.c:421 +#: ../panel/panel-application.c:1597 msgid You have started X without session manager. Clicking Quit will close the X server. @@ -224,11 +224,11 @@ msgstr U hebt X (de grafische omgeving) gestart zonder sessiebeheerder. Wanneer u op sluiten klikt, dan zal dat de grafische omgeving afsluiten. -#: ../panel/panel-application.c:1596 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1598 msgid Are you sure you want to quit the panel? msgstr Weet u zeker dat u de werkbalk wil afsluiten? -#: ../panel/panel-application.c:1604 ../plugins/actions/actions.c:430 +#: ../panel/panel-application.c:1606 #, c-format msgid Failed to execute command \%s\ msgstr Kon de opdracht \%s\ niet uitvoeren @@ -430,6 +430,7 @@ msgstr doorzichtigheidinstellingen in de werkbalk. #: ../panel/panel-preferences-dialog.glade.h:14 +#: ../plugins/actions/actions-dialog.glade.h:4 #: ../plugins/launcher/launcher-dialog.glade.h:10 msgid General msgstr Algemeen @@ -619,11 +620,11 @@ msgstr Ervaren msgid Expert msgstr Deskundige -#: ../migrate/main.c:94 +#: ../migrate/main.c:101 msgid Welcome to the first start of the panel msgstr Welkom bij de eerste start van de werkbalk -#: ../migrate/main.c:96 +#: ../migrate/main.c:103 msgid Because the panel moved to a new system for storing the settings, it has to load a fresh initial configuration. @@ -631,91 +632,223 @@ msgstr Omdat de werkbalk een nieuw configuratiesysteem heeft, moeten in het begin de standaardinstellingen worden geladen. -#: ../migrate/main.c:99 +#: ../migrate/main.c:106 msgid Choose below which setup you want for the first startup. msgstr Kies hieronder welke instelling gebruikt moet worden bij de eerste start. -#: ../migrate/main.c:105 +#: ../migrate/main.c:112 msgid Migrate old config msgstr Oude instellingen overnemen -#: ../migrate/main.c:106 +#: ../migrate/main.c:113 msgid Migrate the old 4.6 configuration to Xfconf msgstr Neem de oude instellingen over -#: ../migrate/main.c:111 +#: ../migrate/main.c:118 msgid Use default config msgstr Standaardinstellingen gebruiken -#: ../migrate/main.c:112 +#: ../migrate/main.c:119 msgid Load the default configuration msgstr Gebruik de standaardinstellingen -#: ../migrate/main.c:117 +#: ../migrate/main.c:124 msgid One empty panel msgstr Eén lege werkbalk -#: ../migrate/main.c:118 +#: ../migrate/main.c:125 msgid Start with one empty panel msgstr Begin met één lege werkbalk -#: ../migrate/main.c:131 +#: ../migrate/main.c:138 msgid Failed to migrate the old panel configuration msgstr Kon de oude instellingen niet overnemen -#: ../migrate/main.c:144 +#: ../migrate/main.c:151 msgid Failed to load the default configuration msgstr Kon de standaardinstellingen niet laden +#: ../migrate/main.c:163 +msgid Panel config needs migration... +msgstr Werkbalkconfiguratie heeft migratie nodig... + +#: ../migrate/main.c:167 +msgid Failed to migrate the existing configuration +msgstr Kon de bestaande instellingen niet overbrengen + +#: ../migrate/main.c:173 +msgid Panel configuration has been updated. +msgstr Werkbalkconfiguratie is bijgewerkt. + #: ../plugins/actions/actions-dialog.glade.h:1 +msgid Action +msgstr Actie + +#: ../plugins/actions/actions-dialog.glade.h:2 #: ../plugins/actions/actions.desktop.in.h:1 msgid Action Buttons msgstr Actieknoppen -#:
[Xfce4-commits] xfce4-panel:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 9477e91d1af3805d3e050bdcec901a4693b22ed8 (commit) from 82c01dba81cd53c2da3914d58d020194dde616c9 (commit) commit 9477e91d1af3805d3e050bdcec901a4693b22ed8 Author: Pjotr Anon pliniusmi...@gmail.com Date: Mon Oct 24 12:30:43 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 379 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 21 +++-- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/po/nl.po b/po/nl.po index 8ed3821..5e38547 100644 --- a/po/nl.po +++ b/po/nl.po @@ -724,7 +724,6 @@ msgid Log Out msgstr Afmelden #: ../plugins/actions/actions.c:160 -#, fuzzy msgid _Log Out msgstr Afmelden @@ -758,7 +757,6 @@ msgid Lock Screen msgstr Scherm vergrendelen #: ../plugins/actions/actions.c:179 -#, fuzzy msgid L_ock Screen msgstr Scherm vergrendelen @@ -767,7 +765,6 @@ msgid Hibernate msgstr Slaapstand #: ../plugins/actions/actions.c:185 -#, fuzzy msgid _Hibernate msgstr Slaapstand @@ -785,7 +782,6 @@ msgid Suspend msgstr Pauzestand #: ../plugins/actions/actions.c:192 -#, fuzzy msgid Sus_pend msgstr Pauzestand @@ -807,33 +803,30 @@ msgid _Restart msgstr _Herstarten #: ../plugins/actions/actions.c:200 -#, fuzzy msgid Are you sure you want to restart? -msgstr Weet u zeker dat u '%s' wil verwijderen? +msgstr Weet u zeker dat u wil herstarten? #: ../plugins/actions/actions.c:201 #, c-format msgid Restarting computer in %d seconds. -msgstr +msgstr Herstart vindt plaats over %d seconden. #: ../plugins/actions/actions.c:205 msgid Shut Down msgstr Afsluiten #: ../plugins/actions/actions.c:206 -#, fuzzy msgid Shut _Down msgstr Afsluiten #: ../plugins/actions/actions.c:207 -#, fuzzy msgid Are you sure you want to shut down? -msgstr Weet u zeker dat u de werkbalk wil afsluiten? +msgstr Weet u zeker dat u wil afsluiten? #: ../plugins/actions/actions.c:208 #, c-format msgid Turning off computer in %d seconds. -msgstr +msgstr De computer zal worden uitgezet over %d seconden. #: ../plugins/actions/actions.c:600 #: ../plugins/separator/separator-dialog.glade.h:5 @@ -842,13 +835,13 @@ msgid Separator msgstr Scheidingslijn #: ../plugins/actions/actions.c:869 -#, fuzzy, c-format +#, c-format msgid Failed to run action \%s\ -msgstr Kon toepassing \%s\ niet uitvoeren +msgstr Kon actie \%s\ niet uitvoeren #: ../plugins/actions/actions.c:1027 msgid John Doo -msgstr +msgstr Jantje #: ../plugins/actions/actions.desktop.in.h:2 msgid Log out, lock or other system actions ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 73b6931062e2b4e1fdff2a02b0973de5a962848b (commit) from 24b2590f1da66438895ea571fd0fc177b773f9fd (commit) commit 73b6931062e2b4e1fdff2a02b0973de5a962848b Author: Pjotr Anon pliniusmi...@gmail.com Date: Mon Oct 24 12:35:13 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 300 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 44 +++- 1 files changed, 31 insertions(+), 13 deletions(-) diff --git a/po/nl.po b/po/nl.po index d065cd2..bfd9952 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,7 +9,7 @@ msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-10-23 10:07+\n +POT-Creation-Date: 2011-10-24 10:07+\n PO-Revision-Date: 2011-09-08 22:32+0200\n Last-Translator: Pjotr\n Language-Team: Dutch (Flemish)\n @@ -255,7 +255,7 @@ msgid Version information msgstr Versie-informatie #: ../dialogs/accessibility-settings/main.c:180 -#: ../dialogs/appearance-settings/main.c:905 +#: ../dialogs/appearance-settings/main.c:956 #: ../dialogs/display-settings/main.c:1040 #: ../dialogs/keyboard-settings/main.c:63 #: ../dialogs/mouse-settings/main.c:1504 ../xfce4-settings-editor/main.c:63 @@ -265,7 +265,7 @@ msgid Type '%s --help' for usage. msgstr Tik '%s -- help' voor gebruiksinformatie. #: ../dialogs/accessibility-settings/main.c:199 -#: ../dialogs/appearance-settings/main.c:924 +#: ../dialogs/appearance-settings/main.c:975 #: ../dialogs/display-settings/main.c:1059 #: ../dialogs/keyboard-settings/main.c:79 #: ../dialogs/mouse-settings/main.c:1523 ../xfce4-settings-editor/main.c:82 @@ -274,7 +274,7 @@ msgid The Xfce development team. All rights reserved. msgstr De Xfce-ontwikkelploeg. Alle rechten voorbehouden. #: ../dialogs/accessibility-settings/main.c:200 -#: ../dialogs/appearance-settings/main.c:925 +#: ../dialogs/appearance-settings/main.c:976 #: ../dialogs/display-settings/main.c:1060 #: ../dialogs/keyboard-settings/main.c:80 #: ../dialogs/mouse-settings/main.c:1524 ../xfce4-settings-editor/main.c:83 @@ -394,7 +394,7 @@ msgid Menus and Buttons msgstr Menu's en knoppen #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22 -#: ../dialogs/appearance-settings/main.c:801 +#: ../dialogs/appearance-settings/main.c:852 #: ../dialogs/display-settings/main.c:79 msgid None msgstr Geen @@ -487,27 +487,45 @@ msgstr _Instellingen msgid _Toolbar Style msgstr _Werkbalkstijl -#: ../dialogs/appearance-settings/main.c:722 -msgid An unknown error occured -msgstr Er trad een onbekende fout op +#: ../dialogs/appearance-settings/main.c:733 +#, c-format +msgid File is larger then %d MB, installation aborted +msgstr Bestand is groter dan %d MB, installatie werd afgebroken + +#: ../dialogs/appearance-settings/main.c:738 +msgid Failed to create temporary directory +msgstr Kon geen tijdelijke map maken + +#: ../dialogs/appearance-settings/main.c:743 +msgid Failed to extract archive +msgstr Kon archief niet uitpakken + +#: ../dialogs/appearance-settings/main.c:748 +msgid Unknown format, only archives and directories are supported +msgstr Onbekende bestandopmaak, alleen archieven en mappen worden ondersteund + +#: ../dialogs/appearance-settings/main.c:753 +#, c-format +msgid An unknown error, exit code is %d +msgstr Onbekende fout, afsluitcode is %d -#: ../dialogs/appearance-settings/main.c:729 +#: ../dialogs/appearance-settings/main.c:760 msgid Failed to install theme msgstr Kon thema niet installeren -#: ../dialogs/appearance-settings/main.c:805 +#: ../dialogs/appearance-settings/main.c:856 msgid RGB msgstr RGB -#: ../dialogs/appearance-settings/main.c:809 +#: ../dialogs/appearance-settings/main.c:860 msgid BGR msgstr BGR -#: ../dialogs/appearance-settings/main.c:813 +#: ../dialogs/appearance-settings/main.c:864 msgid Vertical RGB msgstr Verticaal RGB -#: ../dialogs/appearance-settings/main.c:817 +#: ../dialogs/appearance-settings/main.c:868 msgid Vertical BGR msgstr Verticaal BGR ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfmpc:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to abb27b8f38f94847dc9ec073e94dc9759482371a (commit) from 9b7f759099ffb15749635a53af07de601df2eab9 (commit) commit abb27b8f38f94847dc9ec073e94dc9759482371a Author: Chipong Luo chipon...@yahoo.com Date: Mon Oct 24 13:45:08 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 62 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 228 +-- 1 files changed, 96 insertions(+), 132 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 3bf3a55..732 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,103 +3,104 @@ # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Hunt Xu hun...@live.cn, 2009. -# +# Chipong Luo chipon...@yahoo.com, 2011. msgid msgstr Project-Id-Version: xfmpc\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-10-23 17:29+0200\n +POT-Creation-Date: 2011-08-13 19:02+0200\n PO-Revision-Date: 2009-12-13 20:28+0800\n -Last-Translator: Hunt Xu hun...@live.cn\n +Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n Language: zh_CN\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: ../src/dbbrowser.c:1508 +#: ../src/dbbrowser.c:863 msgid Replace msgstr 替换 -#: ../src/dbbrowser.c:1524 ../src/playlist.c:1511 +#: ../src/dbbrowser.c:868 ../src/playlist.c:828 msgid Browse msgstr 浏览 -#: ../src/extended-interface.c:495 +#: ../src/extended-interface.c:337 msgid Repeat -msgstr 重复播放 +msgstr 重复 -#: ../src/extended-interface.c:505 +#: ../src/extended-interface.c:340 msgid Random -msgstr 随机播放 +msgstr 随机 -#: ../src/extended-interface.c:515 +#: ../src/extended-interface.c:343 msgid Single Mode msgstr 单曲模式 -#: ../src/extended-interface.c:525 -#, fuzzy +#: ../src/extended-interface.c:346 msgid Consume Mode -msgstr 消耗 +msgstr 消耗模式 -#: ../src/extended-interface.c:548 +#: ../src/extended-interface.c:354 msgid _Shortcuts -msgstr 快捷方式(_S) +msgstr 快捷键 -#: ../src/extended-interface.c:747 ../xfmpc.desktop.in.h:2 +#: ../src/extended-interface.c:467 ../xfmpc.desktop.in.h:2 msgid MPD client written in GTK+ for Xfce -msgstr 使用GTK+编写的用于Xfce的MPD客户端 +msgstr 使用 GTK+ 编写的用于 Xfce 的 MPD 客户端 -#: ../src/extended-interface.c:749 +#: ../src/extended-interface.c:467 msgid translator-credits -msgstr Hunt Xu hun...@live.cn +msgstr +Hunt Xu hun...@live.cn, 2009.\n +Chipong Luo chipon...@yahoo.com, 2011. -#: ../src/extended-interface.c:890 +#: ../src/extended-interface.c:539 msgid Clear Playlist msgstr 清除播放列表 -#: ../src/extended-interface.c:908 +#: ../src/extended-interface.c:545 msgid Refresh Database msgstr 刷新数据库 -#: ../src/extended-interface.c:926 +#: ../src/extended-interface.c:551 msgid Context Menu -msgstr 菜单 +msgstr 交互菜单 -#: ../src/extended-interface.c:969 +#: ../src/extended-interface.c:566 msgid Current Playlist msgstr 当前播放列表 -#: ../src/extended-interface.c:975 +#: ../src/extended-interface.c:568 msgid Browse database msgstr 浏览数据库 -#: ../src/interface.c:467 +#: ../src/interface.c:264 #, c-format msgid by \%s\ from \%s\ (%s) -msgstr 艺术家: \%s\; 专辑: \%s\; 年份: %s +msgstr “%s” 创作的 “%s”(%s) -#: ../src/interface.c:486 +#: ../src/interface.c:269 msgid Stopped msgstr 已停止 -#: ../src/interface.c:496 ../src/interface.c:916 +#: ../src/interface.c:273 ../src/interface.c:471 msgid Not connected msgstr 未连接 -#: ../src/main-window.c:641 +#: ../src/main-window.c:444 #, c-format msgid %d songs, %d hours and %d minutes -msgstr %d 首歌, %d 小时 %d 分钟 +msgstr %d 首歌，%d 小时 %d 分钟 -#: ../src/main-window.c:652 +#: ../src/main-window.c:446 #, c-format msgid %d songs, %d minutes -msgstr %d 首歌, %d 分钟 +msgstr %d 首歌，%d 分钟 #: ../src/mpdclient.c:382 msgid Failed to connect to MPD -msgstr 连接至 MPD 失败 +msgstr 无法与 MPD 连接 #: ../src/mpdclient.c:387 msgid Connected to MPD @@ -109,208 +110,171 @@ msgstr 已连接至 MPD msgid n/a msgstr 未知 -#: ../src/preferences-dialog.c:701 +#: ../src/preferences-dialog.c:369 msgid Xfmpc Preferences msgstr Xfmpc 首选项 -#: ../src/preferences-dialog.c:703 +#: ../src/preferences-dialog.c:370 msgid Customize your MPD client msgstr 自定义您的 MPD 客户端 -#: ../src/preferences-dialog.c:720 +#: ../src/preferences-dialog.c:377 msgid MPD msgstr MPD -#: ../src/preferences-dialog.c:731 +#: ../src/preferences-dialog.c:380 msgid Connection msgstr 连接 -#: ../src/preferences-dialog.c:739 +#: ../src/preferences-dialog.c:382 msgid Use _default system settings -msgstr 使用系统默认设置(_D) +msgstr 使用默认的系统设置(_D) -#: ../src/preferences-dialog.c:745 +#: ../src/preferences-dialog.c:383 msgid If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost -msgstr 选中此项，Xfmpc将尝试读取环境变量MPD_HOST和MPD_PORT，否则使用本地主机 +msgstr
[Xfce4-commits] squeeze:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 7becf7787217155c75ab5872b647e2de6dcd4d8e (commit) from bc7be8990bb2b53079703a8f6b3b70a15e8c7f5f (commit) commit 7becf7787217155c75ab5872b647e2de6dcd4d8e Author: Chipong Luo chipon...@yahoo.com Date: Mon Oct 24 13:48:12 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 90 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 323 ++- 1 files changed, 75 insertions(+), 248 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index a252946..7ef7e24 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the squeeze package. # Hunt Xu hun...@live.cn, 2008, 2009. # Aron Xu aronmala...@163.com, 2009. -# +# Chipong Luo chipon...@yahoo.com, 2011. msgid msgstr -Project-Id-Version: squeeze 0.2.0\n -Report-Msgid-Bugs-To: step...@xfce.org\n -POT-Creation-Date: 2011-08-24 20:32+0200\n +Project-Id-Version: squeeze\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2011-10-09 04:04+\n PO-Revision-Date: 2009-06-14 02:36+0800\n -Last-Translator: Hunt Xu hun...@live.cn\n +Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese/Simplified\n Language: \n MIME-Version: 1.0\n @@ -43,15 +43,15 @@ msgstr Squeeze 归档文件管理器 #. #: ../src/application.c:160 ../src/application.c:251 msgid Could not open archive, MIME-type unsupported or file did not exist -msgstr 无法打开归档文件，MIME 类型不支持或者文件不存在 +msgstr 无法打开归档文件，不支持 MIME 类型或文件不存在 #: ../src/application.c:190 ../src/main_window.c:838 ../src/main_window.c:1301 msgid Squeeze cannot extract this archive type,\n the application to support this is missing. msgstr -Squeeze无法解压此归档文件，\n -未找到支持此项操作的程序 +Squeeze 无法解压此归档文件，\n +支持此操作的应用程序丢失。 #. #. * Could not create archive (mime type unsupported) @@ -65,8 +65,8 @@ msgid Squeeze cannot add files to this archive type,\n the application to support this is missing. msgstr -Squeeze 无法添加文件到此归档文件，\n -未找到支持此项操作的程序 +Squeeze 无法在此归档文件类型中添加文件，\n +支持此操作的应用程序丢失。 #: ../src/archive_store.c:250 ../src/notebook.c:181 msgid Show full path @@ -74,52 +74,52 @@ msgstr 显示完整路径 #: ../src/archive_store.c:251 ../src/notebook.c:182 msgid Show the full path strings for each entry -msgstr 为每个项目显示完整路径 +msgstr 为每个条目显示完整路径 #: ../src/archive_store.c:257 ../src/notebook.c:188 msgid Show mime icons -msgstr 显示 MIME 类型图标 +msgstr 显示 mime 图标 #: ../src/archive_store.c:258 ../src/notebook.c:189 msgid Show the mime type icons for each entry -msgstr 为每个项目显示 MIME 类型图标 +msgstr 为每个条目显示 mime 类型图标 #: ../src/archive_store.c:264 msgid Show up dir entry -msgstr 显示上级目录 +msgstr 显示上级目录条目 #: ../src/archive_store.c:265 msgid Show '..' to go to the parent directory -msgstr 显示 '..' 以便进入上层目录 +msgstr 显示 ‘..’ 以便进入父目录 #: ../src/archive_store.c:271 ../src/notebook.c:195 msgid Sort folders before files -msgstr 将文件夹排列在文件之前 +msgstr 文件夹排列在文件之前 #: ../src/archive_store.c:272 ../src/notebook.c:196 msgid The folders will be put at the top of the list -msgstr 文件夹将会显示在列表最上方 +msgstr 文件夹将显示在列表最上方 #: ../src/archive_store.c:278 ../src/archive_store.c:279 ../src/notebook.c:202 #: ../src/notebook.c:203 msgid Sort text case sensitive -msgstr 排列时对大小写敏感 +msgstr 排列文本区分大小写 #: ../src/button_drag_box.c:85 msgid Visible: -msgstr +msgstr 可见： #: ../src/button_drag_box.c:96 msgid Available: -msgstr +msgstr 可用： #: ../src/extract_dialog.c:76 msgid bExtract files:/b -msgstr b解压文件:/b +msgstr b解压缩文件：/b #: ../src/extract_dialog.c:77 msgid bOptions:/b -msgstr b选项:/b +msgstr b选项：/b #: ../src/extract_dialog.c:88 msgid All files @@ -127,16 +127,16 @@ msgstr 所有文件 #: ../src/extract_dialog.c:89 msgid Selected files -msgstr 已选择的文件 +msgstr 选中的文件 #: ../src/extract_dialog.c:101 ../src/main_window.c:457 #: ../src/main_window.c:1255 msgid Extract -msgstr 解压 +msgstr 解压缩 #: ../src/extract_dialog.c:114 msgid Extract archive -msgstr 解压归档文件 +msgstr 解压缩归档文件 #: ../src/main.c:53 msgid [destination path] @@ -144,11 +144,11 @@ msgstr [目标路径] #: ../src/main.c:61 msgid [archive path] [file1] [file2] ... [fileN] -msgstr [归档文件路径] [文件1] [文件2] ... [文件N] +msgstr [归档文件路径] [文件 1] [文件 2] ... [文件 N] #: ../src/main.c:65 msgid [file1] [file2] ... [fileN] -msgstr [文件1] [文件2] ... [文件N] +msgstr [文件 1] [文件 2] ... [文件 N] #: ../src/main.c:68 msgid Version information @@ -165,11 +165,11 @@ msgid Try %s --help to see a full list of available command line options.\n msgstr %s: %s\n -输入 %s --help 查看可用的命令行参数.\n +试试 %s --help 查看完整的可用命令行选项列表。\n #: ../src/main_window.c:134 msgid Internal Style -msgstr 内置样式 +msgstr 内部样式 #: ../src/main_window.c:136 msgid Tool Bar Style @@ -211,12 +211,12 @@ msgstr 添加文件夹(_A _f) #: ../src/main_window.c:346 msgid _Extract -msgstr 解压(_E) +msgstr 解压缩(_E) #. View menu #: ../src/main_window.c:379 msgid _View -msgstr 查看(_V) +msgstr
[Xfce4-commits] xfbib:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to c64f314477fdebed160eb66e0ab790e6a6949dd4 (commit) from 8c32358c1a6fc81395a83f5571da1292d1643a90 (commit) commit c64f314477fdebed160eb66e0ab790e6a6949dd4 Author: Chipong Luo chipon...@yahoo.com Date: Mon Oct 24 13:53:10 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 75 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 104 +-- 1 files changed, 51 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 3b70e4b..cb34b88 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,16 +2,17 @@ # Copyright 2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfbib package. # Hunt Xu hun...@live.cn, 2008, 2009. -# Chris K. Zhang plut...@gmail.com 2009 -# +# Chris K. Zhang plut...@gmail.com, 2009. +# Chipong Luo chipon...@yahoo.com, 2011. msgid msgstr Project-Id-Version: xfbib\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2009-03-31 18:57+0200\n PO-Revision-Date: 2009-06-17 01:41+0800\n -Last-Translator: Hunt Xu hun...@live.cn\n +Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Simplified Chinese xfce-i...@xfce.org\n +Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n @@ -22,22 +23,22 @@ msgstr 主条目(_E) #: ../src/main.c:71 msgid Report bugs to http://bugs.xfce.org/\n; -msgstr 请提交错误报告至 http://bugs.xfce.org/\n; +msgstr 向 http://bugs.xfce.org/ 报告缺陷\n #: ../src/main.c:73 #, c-format msgid Error parsing: %s\n -msgstr 解析 %s 时发生错误\n +msgstr 解析时出错：%s\n #: ../src/main.c:112 #, c-format msgid Error merging files, no output file specified\n -msgstr 合并文件时发生错误，没有指定输出文件\n +msgstr 合并文件时出错，没有指定输出文件\n #: ../src/xfbib-bibtex.c:129 #, c-format msgid Unknown bracket type: %c\n -msgstr 未知括号类型: %c\n +msgstr 未知括号类型：%c\n #. Error #: ../src/xfbib-bibtex.c:240 @@ -46,69 +47,66 @@ msgstr 未知条目类型\n #. Equal sign missing #: ../src/xfbib-bibtex-field.c:96 -#, fuzzy msgid No equal sign found in definition of Field\n -msgstr 在元素定义语句中未发现等号\n +msgstr 在域定义中未找到等号\n #. Equal sign missing #: ../src/xfbib-bibtex-string.c:125 -#, fuzzy msgid No equal sign found in definition of String\n -msgstr 在字符串定义语句中未发现等号\n +msgstr 在字符串定义中未找到等号\n #. Braced string contains @ #: ../src/xfbib-bibtex-value.c:121 -#, fuzzy, c-format +#, c-format msgid Braced string contains @: %s\n -msgstr 大括号中的字符串含有 @: %s\n +msgstr 大括号中的字符串包含 @：%s\n #: ../src/xfbib-bibtex-value.c:134 -#, fuzzy, c-format +#, c-format msgid Double quotation marks not inside braces in string: %s\n -msgstr 字符串中的双引号并不在大括号中: %s\n +msgstr 字符串中的双引号并不在大括号中：%s\n #. Braces was not balanced #: ../src/xfbib-bibtex-value.c:141 -#, fuzzy, c-format +#, c-format msgid Braces not balanced in field string: %s\n -msgstr 元素字符串中含有未闭合的括号: %s\n +msgstr 域字符串中的括号未闭合：%s\n #: ../src/xfbib-bibtex-value.c:151 #, c-format msgid Variable contains double quotation marks: %s\n -msgstr 变量中含有双引号: %s\n +msgstr 变量中包含双引号：%s\n #. Character was not a number between 0 and 9 #: ../src/xfbib-bibtex-value.c:164 -#, fuzzy, c-format +#, c-format msgid Number contains a non-digit: %s\n -msgstr 数字串中含有非数字: %s\n +msgstr 数字中包含非数字： %s\n #: ../src/xfbib-entry-edit-dialog.c:123 msgid Edit compound string -msgstr +msgstr 编辑合成字符串 #: ../src/xfbib-entry-edit-dialog.c:134 msgid Text/String key -msgstr +msgstr 文本/字符串关键字 #: ../src/xfbib-entry-edit-dialog.c:134 msgid Row can contain either text or a BibTeX string key -msgstr +msgstr 行要么包含文本关键字要么包含 BibTeX 字符串关键字 #: ../src/xfbib-entry-edit-dialog.c:178 #, c-format msgid Icon missing: %s -msgstr 缺少图标: %s +msgstr 图标丢失：%s #: ../src/xfbib-entry-edit-dialog.c:224 msgid Type: -msgstr 类型: +msgstr 类型： #: ../src/xfbib-entry-edit-dialog.c:231 -#, fuzzy msgid Key: -msgstr 关键字: +msgstr 关键字： #: ../src/xfbib-entry-edit-dialog.c:327 ../src/xfbib-multiple-input.c:168 msgid Title @@ -132,11 +130,11 @@ msgstr 杂项 #: ../src/xfbib-entry-edit-dialog.c:484 msgid A BibTeX type is required! -msgstr +msgstr 需要 BibTeX 类型！ #: ../src/xfbib-entry-edit-dialog.c:488 msgid BibTeX key is required! -msgstr +msgstr 需要 BibTeX 关键字！ #: ../src/xfbib-entry-tree-view.c:172 msgid Address of publisher @@ -148,11 +146,11 @@ msgstr 加注文献风格的注解 #: ../src/xfbib-entry-tree-view.c:174 msgid Name(s) of the author(s), separated by 'and' if more than one -msgstr 作者姓名，如有多个请用“and”隔开 +msgstr 作者姓名，多个用 ‘和’ 隔开 #: ../src/xfbib-entry-tree-view.c:175 msgid Title of the book, if only part of it is being cited -msgstr 如果只引用该书的一部分，请在这里输入书名 +msgstr 此书标题，如果只是引用其部分的话 #: ../src/xfbib-entry-tree-view.c:176 msgid Chapter number @@ -160,23 +158,23 @@ msgstr 章节序号 #: ../src/xfbib-entry-tree-view.c:177 msgid Citation key of the cross-referenced entry -msgstr 交叉引用文献的引用关键字 +msgstr 交叉参考条目的引用关键字 #:
[Xfce4-commits] xfvnc:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 43ce610e321e1b4316ca9c23d6dc416d5c339647 (commit) from 2814e0a96de991668d6cb6789df383c7cb188732 (commit) commit 43ce610e321e1b4316ca9c23d6dc416d5c339647 Author: Chipong Luo chipon...@yahoo.com Date: Mon Oct 24 13:54:06 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 18 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 25 + 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 2ffe938..cac5e0b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,22 +2,23 @@ # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Hunt XuHunt Xu hun...@live.cn, 2009. -# +# Chipong Luo chipon...@yahoo.com, 2011. msgid msgstr Project-Id-Version: xfvnc\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2007-11-02 01:40-0700\n PO-Revision-Date: 2009-05-13 09:58+0800\n -Last-Translator: Hunt XuHunt Xu hun...@live.cn\n +Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese (simplified)\n +Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n #: ../xfvnc/main.c:28 msgid Connected. Starting session... -msgstr 已连接。启动会话中... +msgstr 已连接。正在启动会话... #: ../xfvnc/main.c:50 #, c-format @@ -30,11 +31,11 @@ msgstr 连接错误 #: ../xfvnc/main.c:66 msgid There was an error connecting to the VNC server -msgstr 连接至 VNC 服务器时发生一个错误 +msgstr 连接至 VNC 服务器时发生了一个错误 #: ../xfvnc/main.c:67 msgid Unfortunately, the type of error is unknown. -msgstr 错误类型未知。 +msgstr 不幸，未知错误类型。 #: ../xfvnc/xfvnc.desktop.in.h:1 msgid VNC Viewer @@ -46,7 +47,7 @@ msgstr XfVNC #: ../xfvnc/xfvnc.desktop.in.h:3 msgid Xfce VNC Viewer Application -msgstr Xfce VNC 查看器程序 +msgstr Xfce VNC 查看器应用程序 #: ../xfvnc/xfvnc.glade.h:1 msgid Connecting... @@ -54,11 +55,11 @@ msgstr 正在连接... #: ../xfvnc/xfvnc.glade.h:2 msgid Display _number: -msgstr 显示数字(_N): +msgstr 显示数字(_N)： #: ../xfvnc/xfvnc.glade.h:3 msgid Show _fullscreen -msgstr 全屏(_F) +msgstr 全屏显示(_F) #: ../xfvnc/xfvnc.glade.h:5 msgid XfVNC Status @@ -70,19 +71,19 @@ msgstr Xfce VNC 查看器 #: ../xfvnc/xfvnc.glade.h:7 msgid _Allow other clients to connect -msgstr 允许其他客户端进行连接(_A) +msgstr 允许其它客户端连接(_A) #: ../xfvnc/xfvnc.glade.h:8 msgid _Computer name: -msgstr 计算机名称(_C): +msgstr 计算机名称(_C)： #: ../xfvnc/xfvnc.glade.h:9 msgid _Password: -msgstr 密码(_P): +msgstr 密码(_P)： #: ../xfvnc/xfvnc.glade.h:10 msgid _Recent servers: -msgstr 最近使用的服务器(_R): +msgstr 最近使用的服务器(_R)： #: ../xfvnc/xfvnc.glade.h:11 msgid _View only ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-screenshooter:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 8d1e2b9903c4a30b80925025e058efb46ca0fd93 (commit) from d2ef858a6fb38679269bff759b61eea322c14002 (commit) commit 8d1e2b9903c4a30b80925025e058efb46ca0fd93 Author: Chipong Luo chipon...@yahoo.com Date: Mon Oct 24 13:55:29 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 73 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 169 ++- 1 files changed, 51 insertions(+), 118 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 1ad3961..9fe2c19 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,14 +2,14 @@ # Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce package. # Hunt Xu hun...@live.cn, 2008, 2009. -# +# Chipong Luo chipon...@yahoo.com, 2011. msgid msgstr Project-Id-Version: xfce 4-screenshooter-plugin\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2011-07-31 23:29+0200\n PO-Revision-Date: 2009-11-29 19:20+0800\n -Last-Translator: Hunt Xu hun...@live.cn\n +Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n Language: \n MIME-Version: 1.0\n @@ -19,18 +19,18 @@ msgstr #: ../lib/screenshooter-dialogs.c:453 #, c-format msgid %.2fKb of %.2fKb -msgstr %2$.2fKb中的%1$.2fKb +msgstr %2$.2f Kb 中的 %1$.2f Kb #: ../lib/screenshooter-dialogs.c:535 msgid Transfer -msgstr 传送 +msgstr 传送器 #: ../lib/screenshooter-dialogs.c:556 msgid span weight=\bold\ stretch=\semiexpanded\The screenshot is being transferred to:/span msgstr -span weight=\bold\ stretch=\semiexpanded\这张截图将会被传送至:/span +span weight=\bold\ stretch=\semiexpanded\此截图会传送至：/span #: ../lib/screenshooter-dialogs.c:672 ../lib/screenshooter-dialogs.c:689 #: ../lib/screenshooter-dialogs.c:881 ../lib/screenshooter-utils.c:64 @@ -38,7 +38,7 @@ msgstr #: ../src/xfce4-screenshooter.desktop.in.in.h:1 #: ../panel-plugin/screenshooter.desktop.in.in.h:1 msgid Screenshot -msgstr 屏幕截图 +msgstr 截图 #: ../lib/screenshooter-dialogs.c:684 msgid Take a screenshot @@ -59,7 +59,7 @@ msgstr 全屏幕 #: ../lib/screenshooter-dialogs.c:757 ../src/main.c:53 #: ../panel-plugin/screenshooter-plugin.c:311 msgid Take a screenshot of the entire screen -msgstr 截取全屏幕图像 +msgstr 全屏幕截图 #: ../lib/screenshooter-dialogs.c:765 msgid Active window @@ -68,11 +68,11 @@ msgstr 活动窗口 #: ../lib/screenshooter-dialogs.c:772 ../src/main.c:90 #: ../panel-plugin/screenshooter-plugin.c:316 msgid Take a screenshot of the active window -msgstr 只截取当前活动窗口图像 +msgstr 当前活动窗口截屏 #: ../lib/screenshooter-dialogs.c:780 msgid Select a region -msgstr 选择一个区域 +msgstr 选择区域 #: ../lib/screenshooter-dialogs.c:785 ../src/main.c:68 #: ../panel-plugin/screenshooter-plugin.c:321 @@ -80,7 +80,9 @@ msgid Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button. -msgstr 按住鼠标左键拖拽后松开以选取要截取的屏幕区域。 +msgstr +点击屏幕上一点不松开鼠标按钮，拖动鼠标至某一区域的另一角并松开鼠标按钮来 +选择要截取的区域。 #: ../lib/screenshooter-dialogs.c:795 msgid Capture the mouse pointer @@ -88,16 +90,16 @@ msgstr 截取鼠标指针 #: ../lib/screenshooter-dialogs.c:800 msgid Display the mouse pointer on the screenshot -msgstr 抓取鼠标光标 +msgstr 在截图上显示鼠标指针 #: ../lib/screenshooter-dialogs.c:816 msgid span weight=\bold\ stretch=\semiexpanded\Delay before capturing/span -msgstr span weight=\bold\ stretch=\semiexpanded\截图前延迟/span +msgstr span weight=\bold\ stretch=\semiexpanded\截取前延迟/span #: ../lib/screenshooter-dialogs.c:838 msgid Delay in seconds before the screenshot is taken -msgstr 截图前延迟 +msgstr 以秒计的截图获取前的延迟 #: ../lib/screenshooter-dialogs.c:841 msgid seconds @@ -118,7 +120,7 @@ msgstr 保存 #: ../lib/screenshooter-dialogs.c:943 msgid Save the screenshot to a PNG file -msgstr 保存为 PNG 文件 +msgstr 保存此截图为 PNG 文件 #: ../lib/screenshooter-dialogs.c:952 msgid Copy to the clipboard @@ -126,19 +128,19 @@ msgstr 复制到剪贴板 #: ../lib/screenshooter-dialogs.c:954 msgid Copy the screenshot to the clipboard so that it can be pasted later -msgstr 复制到剪贴板以便之后粘贴 +msgstr 复制截图到剪贴板以便以后粘贴 #: ../lib/screenshooter-dialogs.c:971 msgid Open with: -msgstr 打开程序: +msgstr 打开方式： #: ../lib/screenshooter-dialogs.c:977 msgid Open the screenshot with the chosen application -msgstr 使用所选程序打开截图 +msgstr 使用所选的应用程序打开截图 #: ../lib/screenshooter-dialogs.c:995 ../src/main.c:63 msgid Application to open the screenshot -msgstr 用以打开截图的程序 +msgstr 打开截图的应用程序 #: ../lib/screenshooter-dialogs.c:1005 msgid Host on ZimageZ @@ -146,7 +148,7 @@ msgstr 上传至 ZimageZ #: ../lib/screenshooter-dialogs.c:1009 ../src/main.c:80 msgid Host the screenshot on ZimageZ, a free online image hosting service -msgstr 上传屏幕截图至 ZimageZ，一个免费的在线存储图片服务 +msgstr 上传截图至 ZimageZ，一个免费的在线存储图片服务 #: ../lib/screenshooter-dialogs.c:1023 msgid
[Xfce4-commits] xfce4-clipman-plugin|1.2.0 Creating annotated tag 1.2.0
Updating annotated tag refs/tags/1.2.0 as new annotated tag to c0e4fdac83a74ec956587c6bea2a0baf43be2dec (tag) succeeds 1.1.3-152-g2f3866d tagged by Mike Massonnet mmasson...@xfce.org on 2011-10-24 15:48 +0200 Mike Massonnet (1): === Release 1.2.0 === ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master bump post-release
Updating branch refs/heads/master to 21d54aa2ce95c96327e37ae6c7b536f2c504a016 (commit) from 6106acd8f69e07dde297b21ea5d4a52d3835e8f6 (commit) commit 21d54aa2ce95c96327e37ae6c7b536f2c504a016 Author: Mike Massonnet mmasson...@xfce.org Date: Mon Oct 24 15:49:37 2011 +0200 bump post-release configure.ac.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 82dad74..9ee8a96 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,9 +11,9 @@ dnl *** Version information *** dnl *** m4_define([project_version_major], [1]) m4_define([project_version_minor], [2]) -m4_define([project_version_micro], [0]) +m4_define([project_version_micro], [1]) m4_define([project_version_build], [@REVISION@]) -m4_define([project_version_tag], []) # leave empty for release +m4_define([project_version_tag], [git]) # leave empty for release m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()ifelse(project_version_tag(), [git], [project_version_tag()-project_version_build()], [project_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master l10n: Updated Chinese (China) (zh_CN) translation to 99%
Updating branch refs/heads/master to a6015e53af66b99ce4f9f19291bcbe4065a01a0a (commit) from 3c5f5ebdf56fc8adfe40551e34ffa77a8935d634 (commit) commit a6015e53af66b99ce4f9f19291bcbe4065a01a0a Author: Chipong Luo chipon...@yahoo.com Date: Mon Oct 24 17:36:18 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 99% New status: 798 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 54 +++--- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index de600bb..cf7a787 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -158,12 +158,12 @@ msgstr 使用默认值 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832 msgid Cross this to use default instead of selected value -msgstr 划掉本项取消选中的值而改用缺省值 +msgstr 划掉本项取消选中的值而改用默认值 #. foreground- #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889 msgid Foreground (=text) color: -msgstr 前景(文字)色： +msgstr 前景(文本)色： #: ../globaltime/gt_prefs.c:688 msgid Click to change foreground colour for clock @@ -207,7 +207,7 @@ msgstr 点击更改时钟的默认背景色 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910 msgid Cross this to use system default instead of selected color -msgstr 划去本项取消所选颜色而用系统默认值 +msgstr 划掉本项取消选中的颜色而用系统默认值 #: ../globaltime/gt_prefs.c:896 msgid Click to change default text colour for clocks @@ -291,7 +291,7 @@ msgstr 本地时区： #: ../globaltime/timezone_selection.c:101 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102 msgid Other -msgstr 其它 +msgstr 其它 #: ../globaltime/timezone_selection.c:156 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168 @@ -482,7 +482,7 @@ msgid msgstr 短期挂起或休眠(小于 5 小时)而且所显示的时间不包含秒的时候才需要 这个选项。这些情况下，除非您选了本选项，Orage 时钟显示的时间可能 -不准确。(本选项将使 CPU 和中断保留功能失效。) +不准确。(本选项将使 cpu 和中断保留功能失效。) #: ../panel-plugin/oc_config.c:432 msgid @@ -1236,7 +1236,7 @@ msgstr 查找 #: ../src/event-list.c:1125 msgid Dayview -msgstr 按日浏览 +msgstr 日视图 #: ../src/event-list.c:1158 msgid Extra days to show @@ -1280,15 +1280,15 @@ msgstr 双击编辑本行。\n \n 标签顺序：\n -\t 1. 闹铃： n - 无闹铃\n -\t\t A - 视觉闹铃，S - 同时声音提示\n -\t 2. 重复发生： n - 不重复\n -\t\t D - 每天，W - 每周，M - 每月，Y - 每年\n -\t 3. 类型： f - 空闲，B - 忙\n +\t 1. 闹铃： n 为无闹铃\n +\t\t A 为视觉闹铃，S 为同时声音提示\n +\t 2. 重复发生： n 为不重复\n +\t\t D 为每天，W 为每周，M 为每月，Y 为每年\n +\t 3. 类型： f 为空闲，B 为忙\n \t 4. 定位于该文件中：\n -\t\tO - Orage，A - 归档文件，F - 外部文件\n +\t\tO 为Orage，A 为归档文件，F 为外部文件\n \t 5. 约会类型：\n -\t\tE - 事件，T - 待办事项，J - 日志 +\t\tE 为事件，T 为待办事项，J 为日志 #: ../src/functions.c:146 msgid Pick the date @@ -1297,7 +1297,7 @@ msgstr 选择日期 #. remove since it has ended #: ../src/ical-archive.c:278 msgid \tRecur ended, moving to archive file. -msgstr \t闹铃不再重复，移入归档文件。 +msgstr \t重复结束，正在移入归档文件。 #: ../src/ical-archive.c:340 msgid Archiving not enabled. Exiting @@ -1306,7 +1306,7 @@ msgstr 没有启用归档功能。正在退出 #: ../src/ical-archive.c:358 #, c-format msgid Archiving threshold: %d month(s) -msgstr 归档阈值： %d 月 +msgstr 归档阈值：%d 月 #. yy mon day #: ../src/ical-archive.c:361 @@ -1317,7 +1317,7 @@ msgstr \t归档 %04d-%02d-%02d 之前的事件。 #: ../src/ical-archive.c:388 #, c-format msgid Archiving uid: %s -msgstr 归档 UID： %s +msgstr 归档 UID：%s #. VTODO not completed, do not archive #: ../src/ical-archive.c:394 @@ -1332,12 +1332,12 @@ msgstr \t重复发生。结束时间：%04d 年 %02d 月 %02d 日 #: ../src/ical-archive.c:416 msgid Archiving done\n -msgstr 完成归档\n +msgstr 归档完成\n #. PHASE 1: go through base orage file and remove repeat shortcuts #: ../src/ical-archive.c:432 msgid Starting archive removal. -msgstr 开始移除归档。 +msgstr 开始归档移除。 #: ../src/ical-archive.c:433 msgid \tPHASE 1: reset recurring appointments @@ -1423,7 +1423,7 @@ msgid NOTE: comma is not valid character in filenames for Orage. msgstr 用逗号(,)隔开文件名。\n - 注意： 对 Orage 来说在文件名中逗号不是有效的字符。 + 注意：对 Orage 来说在文件名中逗号不是有效的字符。 #: ../src/interface.c:1008 msgid Export @@ -1543,7 +1543,7 @@ msgstr 移动 #: ../src/interface.c:1176 msgid Current file is moved and vanishes from the old place. -msgstr 当前文件被移走并在原位置消失。 +msgstr 当前文件被移走并从原位置消失。 #: ../src/interface.c:1190 msgid Archive file @@ -1577,7 +1577,7 @@ msgid original tool, where they came from! msgstr 如果您确定 Orage 将永不修改此文件则设置此项。\n -注意修改外部文件将使它们其来源的源工具不兼容。 +注意修改外部文件将使与其来源的源工具不兼容。 #: ../src/interface.c:1308 msgid Exchange data - Orage @@ -1701,7 +1701,7 @@ msgstr --export (-e) 文件 [约会...] \t从 Orage 导出约会至文件\n #: ../src/main.c:241 #, c-format msgid files=ical files to load into orage\n -msgstr 文件 = 要载入进 orage 的 ical 文件\n +msgstr 文件为要载入进 orage 的 ical 文件\n #: ../src/main.c:243 #, c-format @@ -1775,7 +1775,7 @@ msgstr 标题： %s\n 开始：\t%s\n 到期：\t%s\n - 完成：\t%s\n + 做完：\t%s\n 注意：\n %s @@ -1804,9 +1804,9 @@ msgid bEvents for %s:/b msgstr b%s 的事件：/b #: ../src/mainbox.c:589 -#,
[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master Fix symlink of media directory
Updating branch refs/heads/xfce4-clipman-plugin-master to 0b84b9c2cae31356af4a035d83f7d63af4b787fc (commit) from fbfdf73383b20387a0885ca878398207984a551d (commit) commit 0b84b9c2cae31356af4a035d83f7d63af4b787fc Author: Mike Massonnet mmasson...@xfce.org Date: Mon Oct 24 17:34:01 2011 +0200 Fix symlink of media directory Translations that don't provide screenshots have a media symlink that points to the C version. Instead of pointing to: $(DESTDIR)$(docdir)/html/C/media simply point to: ../C/media $(DESTDIR) must not be present and was a bug. Also updated the install-data-local rule to delete preexisting symlink when running make install again. Makefile.am |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0816992..be26369 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,8 +22,11 @@ install-data-local: $(mkinstalldirs) $(TARGET_DIR)/$$lang; \ $(INSTALL_DATA) $(srcdir)/html/$$lang/index.html $(TARGET_DIR)/$$lang; \ fi; \ - if test ! -d $(TARGET_DIR)/$$lang/media; then \ - $(LN_S) $(TARGET_DIR)/C/media $(TARGET_DIR)/$$lang/media; \ + if test ! -d $(TARGET_DIR)/$$lang/media -o -L $(TARGET_DIR)/$$lang/media; then \ + if test -L $(TARGET_DIR)/$$lang/media; then \ + rm -f $(TARGET_DIR)/$$lang/media; \ + fi; \ + $(LN_S) ../C/media $(TARGET_DIR)/$$lang/media; \ fi; \ done; \ else \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to a05bacc7c1c7d90df646614326bd07478502659f (commit) from 73b6931062e2b4e1fdff2a02b0973de5a962848b (commit) commit a05bacc7c1c7d90df646614326bd07478502659f Author: Per Kongstad p_kongs...@op.pl Date: Mon Oct 24 17:41:08 2011 +0200 l10n: Updated Danish (da) translation to 100% New status: 300 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 320 ++ 1 files changed, 238 insertions(+), 82 deletions(-) diff --git a/po/da.po b/po/da.po index d262cd0..2a72193 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-settings 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-07-04 16:13+\n +POT-Creation-Date: 2011-10-24 10:07+\n PO-Revision-Date: 2010-01-19 21:40+0100\n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Dansk da...@dansk-gruppen.dk\n @@ -58,8 +58,12 @@ msgid Disable sticky keys if _two keys are pressed msgstr Deaktivér klæbende taster hvis _to taster er trykket #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10 -msgid If enabled, the session manager will start the required applications for screen readers and magnifiers -msgstr Hvis aktiveret, vil sessionshåndteringen starte de nødvendige programmer for skærmlæser og forstørrelsesglas. +msgid +If enabled, the session manager will start the required applications for +screen readers and magnifiers +msgstr +Hvis aktiveret, vil sessionshåndteringen starte de nødvendige programmer for +skærmlæser og forstørrelsesglas. #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11 msgid K_eystroke delay: @@ -98,8 +102,12 @@ msgid The amount of time, in milliseconds, required between keystrokes msgstr Tiden i millisekunder som kræves mellem tastetryk #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20 -msgid The amount of time, in milliseconds, that must elapse before a keystroke will be accepted -msgstr Tiden i millisekunder som skal forløbe inden et tastetryk vil blive accepteret +msgid +The amount of time, in milliseconds, that must elapse before a keystroke +will be accepted +msgstr +Tiden i millisekunder som skal forløbe inden et tastetryk vil blive +accepteret #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21 msgid The maximum pointer speed after acceleration @@ -114,20 +122,32 @@ msgid The time, in milliseconds, between repeated motion events msgstr Tiden i millisekunder mellem gentagne bevægelseshandlinger #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 -msgid The time, in milliseconds, between the initial key press and first repeated motion event -msgstr Tiden i millisekunder, mellem det første tastetryk og den første gentagne bevægelsesbegivenhed +msgid +The time, in milliseconds, between the initial key press and first repeated +motion event +msgstr +Tiden i millisekunder, mellem det første tastetryk og den første gentagne +bevægelsesbegivenhed #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25 msgid The time, in milliseconds, to get to maximum speed msgstr Tiden i millisekunder for at opnå maksimal hastighed #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26 -msgid To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted -msgstr For at afhjælpe utilsigtede tastetryk, kræver langsomme taster at en tast er holdt nede for et bestemt minimum tidsrum før tastetrykket bliver accepteret +msgid +To help prevent accidental keystrokes, slow keys requires that a key is held +for a certain minimum amount of time before the keystroke will be accepted +msgstr +For at afhjælpe utilsigtede tastetryk, kræver langsomme taster at en tast er +holdt nede for et bestemt minimum tidsrum før tastetrykket bliver accepteret #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27 -msgid To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes -msgstr For at afhjælpe utilsigtede multi-tastetryk indsætter ryste-taster en minimumsforsinkelse mellem tastetryk +msgid +To help prevent accidental multiple keystrokes, bounce keys imposes a +minimum delay between keystrokes +msgstr +For at afhjælpe utilsigtede multi-tastetryk indsætter ryste-taster en +minimumsforsinkelse mellem tastetryk #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28 msgid Use _bounce keys @@ -142,20 +162,37 @@ msgid Use slow _keys msgstr Brug langsomme _taster #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31 -msgid When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple
[Xfce4-commits] midori:master l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 501a883a11c3dcc365b51872ed7fe364e400342c (commit) from cabc6c57a6b818ad6eb009bf012f3a8d883b1e74 (commit) commit 501a883a11c3dcc365b51872ed7fe364e400342c Author: Per Kongstad p_kongs...@op.pl Date: Mon Oct 24 17:42:09 2011 +0200 l10n: Updated Danish (da) translation to 100% New status: 669 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 375 +++--- 1 files changed, 190 insertions(+), 185 deletions(-) diff --git a/po/da.po b/po/da.po index 7035686..cb7a5d3 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: midori 0.2.2\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-10-22 16:11+\n +POT-Creation-Date: 2011-10-24 10:10+\n PO-Revision-Date: 2010-02-20 00:37+0100\n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Danish da...@dansk-gruppen.dk\n @@ -24,8 +24,8 @@ msgstr msgid Lightweight web browser msgstr Letvægtig webbrowser -#: ../data/midori.desktop.in.h:2 ../midori/main.c:2006 ../midori/main.c:2030 -#: ../midori/main.c:2046 ../midori/midori-websettings.c:294 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:2030 ../midori/main.c:2054 +#: ../midori/main.c:2070 ../midori/midori-websettings.c:295 msgid Midori msgstr Midori @@ -103,7 +103,7 @@ msgstr Udvidelser msgid Privacy msgstr Beskyttelse af privatliv -#: ../midori/main.c:760 +#: ../midori/main.c:764 msgid Cookies store login data, saved games, or user profiles for advertisement purposes. @@ -111,18 +111,18 @@ msgstr Cookies gemmer loginddata, gemte spil eller brugerprofiler for marketingsformål -#: ../midori/main.c:822 +#: ../midori/main.c:826 #, c-format msgid The session couldn't be saved. %s msgstr Sessionen kunne ikke gemmes. %s -#: ../midori/main.c:1015 +#: ../midori/main.c:1033 msgid No root certificate file is available. SSL certificates cannot be verified. msgstr Ingen rodcertifikatfil er tilgængelig. SSL certifikater kan ikke verificeres. -#: ../midori/main.c:1077 +#: ../midori/main.c:1101 msgid Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem. @@ -131,183 +131,183 @@ msgstr dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet. -#: ../midori/main.c:1096 +#: ../midori/main.c:1120 msgid Modify _preferences msgstr Ændre _indstillinger -#: ../midori/main.c:1100 +#: ../midori/main.c:1124 msgid Disable all _extensions msgstr Slå alle _udvidelser fra -#: ../midori/main.c:1113 +#: ../midori/main.c:1137 msgid Discard old tabs msgstr Kassér gamle faneblade -#: ../midori/main.c:1114 ../midori/midori-websettings.c:203 +#: ../midori/main.c:1138 ../midori/midori-websettings.c:204 msgid Show last tabs without loading msgstr Vis sidste faneblad uden at indlæse -#: ../midori/main.c:1115 ../midori/midori-websettings.c:202 +#: ../midori/main.c:1139 ../midori/midori-websettings.c:203 msgid Show last open tabs msgstr Vis sidste åbne faneblade -#: ../midori/main.c:1325 ../midori/main.c:2426 +#: ../midori/main.c:1349 ../midori/main.c:2453 #, c-format msgid The session couldn't be loaded: %s\n msgstr Sessionen kunne ikke indlæses: %s\n -#: ../midori/main.c:1466 +#: ../midori/main.c:1490 #, c-format msgid Snapshot saved to: %s\n msgstr Øjebliksbillede gem til: %s\n -#: ../midori/main.c:1890 +#: ../midori/main.c:1914 msgid Run ADDRESS as a web application msgstr Kør ADRESSE som et webprogram -#: ../midori/main.c:1890 +#: ../midori/main.c:1914 msgid ADDRESS msgstr ADRESSE -#: ../midori/main.c:1893 +#: ../midori/main.c:1917 msgid Use FOLDER as configuration folder msgstr Brug MAPPE som en indstillingsmappe -#: ../midori/main.c:1893 +#: ../midori/main.c:1917 msgid FOLDER msgstr MAPPE -#: ../midori/main.c:1896 +#: ../midori/main.c:1920 msgid Private browsing, no changes are saved msgstr Privat browsing. Ingen ændringer bliver gemt -#: ../midori/main.c:1898 +#: ../midori/main.c:1922 msgid Show a diagnostic dialog msgstr Vis en nedbrudsdialog -#: ../midori/main.c:1900 +#: ../midori/main.c:1924 msgid Run the specified filename as javascript msgstr Kør det angivne filnavn som javascript -#: ../midori/main.c:1902 +#: ../midori/main.c:1926 msgid Take a snapshot of the specified URI msgstr Tag et øjebliksbillede at det angivne URI -#: ../midori/main.c:1904 +#: ../midori/main.c:1928 msgid Execute the specified command msgstr Kør den angivne kommando -#: ../midori/main.c:1906 +#: ../midori/main.c:1930 msgid List available commands to execute with -e/ --execute msgstr Vis tilgængelige kommandoer for kør med -e/ --execute -#: ../midori/main.c:1908 +#: ../midori/main.c:1932 msgid Display program version msgstr Vis programversion -#: ../midori/main.c:1910 +#:
[Xfce4-commits] xfce4-panel:master l10n: Updated Danish (da) translation to 95%
Updating branch refs/heads/master to 86a31469313780b364f450703c4c123393360acb (commit) from 9477e91d1af3805d3e050bdcec901a4693b22ed8 (commit) commit 86a31469313780b364f450703c4c123393360acb Author: Per Kongstad p_kongs...@op.pl Date: Mon Oct 24 17:45:32 2011 +0200 l10n: Updated Danish (da) translation to 95% New status: 363 messages complete with 6 fuzzies and 10 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 461 ++ 1 files changed, 344 insertions(+), 117 deletions(-) diff --git a/po/da.po b/po/da.po index 62764bd..add495a 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-08-18 16:13+\n +POT-Creation-Date: 2011-10-24 10:07+\n PO-Revision-Date: 2010-06-14 11:44+0100\n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Danish da...@dansk-gruppen.dk\n @@ -22,8 +22,11 @@ msgstr X-Poedit-Country: DENMARK\n #: ../panel-desktop-handler.desktop.in.h:1 -msgid Add a new launcher to the panel based on the information of this desktop file -msgstr Føj en ny opstarter til panelet baseret på informationen fra denne skrivebordsfil +msgid +Add a new launcher to the panel based on the information of this desktop file +msgstr +Føj en ny opstarter til panelet baseret på informationen fra denne +skrivebordsfil #: ../panel-desktop-handler.desktop.in.h:2 msgid Create Launcher on the panel @@ -35,7 +38,7 @@ msgstr Tilpas panelet #: ../panel-preferences.desktop.in.h:2 #: ../panel/panel-preferences-dialog.glade.h:26 ../panel/panel-window.c:2275 -#: ../migrate/main.c:100 +#: ../migrate/main.c:107 msgid Panel msgstr Panel @@ -44,8 +47,12 @@ msgid _Read Online msgstr _Læs på internet #: ../common/panel-utils.c:158 -msgid You can read the user manual online. This manual may however not exactly match your panel version. -msgstr Du kan læse brugermanualen på internettet. Den manual kan være ikke helt i overenstemmelse med din panelversion. +msgid +You can read the user manual online. This manual may however not exactly +match your panel version. +msgstr +Du kan læse brugermanualen på internettet. Den manual kan være ikke helt i +overenstemmelse med din panelversion. #: ../common/panel-utils.c:160 msgid The user manual is not installed on your computer @@ -192,39 +199,54 @@ msgid Failed to send D-Bus message msgstr Kunne ikke sende D-bus-besked #: ../panel/main.c:416 -msgid Do you want to start the panel? If you do, make sure you save the session on logout, so the panel is automatically started the next time you login. -msgstr Ønsker du at starte panelet? Hvis du vil det skal du huske at gemme sessionen ved logud. Det vil sikre dig at panelet vil blive startet automatisk næste gang ved logind. +msgid +Do you want to start the panel? If you do, make sure you save the session on +logout, so the panel is automatically started the next time you login. +msgstr +Ønsker du at starte panelet? Hvis du vil det skal du huske at gemme +sessionen ved logud. Det vil sikre dig at panelet vil blive startet +automatisk næste gang ved logind. #: ../panel/main.c:419 ../panel/main.c:433 #, c-format msgid No running instance of %s was found msgstr Ingen kørende instans af %s blev fundet -#: ../panel/panel-application.c:217 +#: ../panel/panel-application.c:219 msgid Failed to launch the migration application msgstr Kunne ikke starte migrationsprogrammet -#: ../panel/panel-application.c:1595 ../plugins/actions/actions.c:421 -msgid You have started X without session manager. Clicking Quit will close the X server. -msgstr Hvis du har startet X uden sessionshåndteringen vil dette lukke X-serveren ned. +#: ../panel/panel-application.c:1597 +msgid +You have started X without session manager. Clicking Quit will close the X +server. +msgstr +Hvis du har startet X uden sessionshåndteringen vil dette lukke X-serveren +ned. -#: ../panel/panel-application.c:1596 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1598 msgid Are you sure you want to quit the panel? msgstr Er du sikker på, at du vil afslutte panelet? -#: ../panel/panel-application.c:1604 ../plugins/actions/actions.c:430 +#: ../panel/panel-application.c:1606 #, c-format msgid Failed to execute command \%s\ msgstr Kunne ikke køre kommando \%s\ #: ../panel/panel-dbus-client.c:208 -msgid Invalid plugin event syntax specified. Use PLUGIN-NAME:NAME[:TYPE:VALUE]. -msgstr Ugyldigt udvidelsesmodul syntaks angivet. Brug UDVIDELSESMODULNAVN:NAVN[:TYPE:VÆRDI]. +msgid +Invalid plugin event syntax specified. Use PLUGIN-NAME:NAME[:TYPE:VALUE]. +msgstr +Ugyldigt udvidelsesmodul syntaks angivet. Brug UDVIDELSESMODULNAVN:NAVN[: +TYPE:VÆRDI]. #: ../panel/panel-dbus-client.c:241 #, c-format -msgid Invalid hint type \%s\. Valid types are bool, double, int,
[Xfce4-commits] orage:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 2509c5b01efb3dc47939a628807e0630234cbf99 (commit) from a6015e53af66b99ce4f9f19291bcbe4065a01a0a (commit) commit 2509c5b01efb3dc47939a628807e0630234cbf99 Author: Chipong Luo chipon...@yahoo.com Date: Mon Oct 24 17:47:09 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 799 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index cf7a787..cdb2938 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -23,11 +23,11 @@ msgstr #: ../globaltime/globaltime.c:100 msgid Raising GlobalTime window... -msgstr 提升 GlobalTime 窗口... +msgstr 提升全球时间窗口... #: ../globaltime/globaltime.c:102 msgid GlobalTime window raise failed -msgstr 无法提升 GlobalTime 窗口 +msgstr 无法提升全球时间窗口 #. ** timezone tooltip ** #: ../globaltime/globaltime.c:277 @@ -2547,7 +2547,6 @@ msgid America/Menominee msgstr 美洲/梅诺米尼 #: ../src/timezone_names.c:165 -#, fuzzy msgid America/Merida msgstr 美洲/梅里达 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfmpc:master l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 6f06726559ea82ebc21448d309d658862b69ae16 (commit) from abb27b8f38f94847dc9ec073e94dc9759482371a (commit) commit 6f06726559ea82ebc21448d309d658862b69ae16 Author: Per Kongstad p_kongs...@op.pl Date: Mon Oct 24 17:53:20 2011 +0200 l10n: Updated Danish (da) translation to 100% New status: 70 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 19 +-- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/po/da.po b/po/da.po index 65fb7cc..8e77d6d 100644 --- a/po/da.po +++ b/po/da.po @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2009-12-03 13:14+0100\n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Danish da...@dansk-gruppen.dk\n -Language: da\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: da\n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Poedit-Language: Danish\n X-Poedit-SourceCharset: utf-8\n @@ -253,37 +253,36 @@ msgid %T: Track msgstr %T: Spor #: ../src/shortcuts-dialog.c:161 -#, fuzzy msgid Xfmpc Shortcuts -msgstr _Genveje +msgstr _Genveje i Xfmpc #: ../src/shortcuts-dialog.c:163 msgid Control your MPD client with your keyboard -msgstr +msgstr Kontrollér din MPD-klient med dit tastatur #: ../src/shortcuts-dialog.c:178 msgid Quit: CTRL+q -msgstr +msgstr Afslutt: CTRL+q #: ../src/shortcuts-dialog.c:187 msgid Previous: CTRL+b -msgstr +msgstr Forrige: CTRL+b #: ../src/shortcuts-dialog.c:197 msgid Play/Pause: CTRL+p -msgstr +msgstr Spil/pause: CTRL+p #: ../src/shortcuts-dialog.c:207 msgid Stop: CTRL+s -msgstr +msgstr Stop: CTRL+s #: ../src/shortcuts-dialog.c:217 msgid Next: CTRL+f -msgstr +msgstr Næste: CTRL+f #: ../src/shortcuts-dialog.c:227 msgid Volume: CTRL+v -msgstr +msgstr Volumen: CTRL+v #: ../src/song-dialog.c:239 msgid File ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-volstatus-icon:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to ed20971759cdb035925894f31838b2cfb1110c6a (commit) from 980a3390bbfb620352ad740c4dfd4289d1f83177 (commit) commit ed20971759cdb035925894f31838b2cfb1110c6a Author: Chipong Luo chipon...@yahoo.com Date: Mon Oct 24 18:04:29 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 56 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 65 ++- 1 files changed, 33 insertions(+), 32 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 0f240d6..b39b03d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,15 +2,16 @@ # Copyright (C) 2009 THE xfce'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce package. # Hunt Xu hun...@live.cn, 2009. -# +# Chipong Luo chipon...@yahoo.com, 2011. msgid msgstr Project-Id-Version: xfce 4-volstatus-icon\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2007-05-27 20:15-0700\n PO-Revision-Date: 2009-07-05 01:45+0800\n -Last-Translator: Hunt Xu hun...@live.cn\n +Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n +Language: zh_CN\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n @@ -30,20 +31,20 @@ msgid begins? You can disable this behavior later by using the \Autostarted Applications\ settings panel. msgstr -您是否要让 Xfce 卷状态图标程序在您每次会话启动时自动启动？您稍后可以在设置 -面板上使用“自动启动程序”禁用此项功能。 +您是否要让 Xfce 卷状态图标程序在您每次启动会话时自动启动吗？您以后可以 +在设置面板上使用 “自动启动应用程序” 禁用此行为。 #: xfce4-volstatus-icon/main.c:117 msgid Failed to write autostart file -msgstr 写入自动启动文件失败 +msgstr 无法写入自动启动文件 #: xfce4-volstatus-icon/main.c:118 msgid For some reason, the autostart location could not be found or written to. This location is usually in your home directory, in ~/.config/autostart/. msgstr -由于某些原因，无法找到或写入您的自动启动程序目录。 -该位置通常在您的家目录中，在 ~/.config/autostart/ 。 +由于某些原因，无法找到或写入自动启动位置。此位置通常在您的主文件夹中， +在 ~/.config/autostart/。 #: xfce4-volstatus-icon/main.c:125 msgid Xfce Volstatus Icon @@ -51,11 +52,11 @@ msgstr Xfce 卷状态图标 #: xfce4-volstatus-icon/main.c:127 msgid Safe removal of removable volumes -msgstr 安全移除可移动卷 +msgstr 可移动卷安全移除 #: xfce4-volstatus-icon/main.c:213 msgid An unknown error occurred. -msgstr 发生一个未知错误。 +msgstr 发生了一个未知错误。 #: xfce4-volstatus-icon/main.c:215 xfce4-volstatus-icon/main.c:226 #: xfce4-volstatus-icon/main.c:241 @@ -64,11 +65,11 @@ msgstr Xfce 卷状态 #: xfce4-volstatus-icon/main.c:216 msgid Unable to connect to D-Bus system bus daemon -msgstr 无法连接至 D-Bus 系统消息总线服务 +msgstr 无法与 D-Bus 系统总线守护进程连接 #: xfce4-volstatus-icon/main.c:227 msgid Unable to connect to HAL -msgstr 无法连接至 HAL 服务 +msgstr 无法与 HAL 连接 #: xfce4-volstatus-icon/main.c:242 msgid Unable to get device list from HAL @@ -77,11 +78,11 @@ msgstr 无法从 HAL 获取设备列表 #: xfce4-volstatus-icon/xfce-volstatus-common.c:76 #, c-format msgid Unable to remove \%s\ -msgstr 无法移除“%s” +msgstr 无法移除 “%s” #: xfce4-volstatus-icon/xfce-volstatus-common.c:77 msgid Removal Failure -msgstr 移除失败 +msgstr 无法移除 #: xfce4-volstatus-icon/xfce-volstatus-common.c:79 msgid Unknown error @@ -93,11 +94,11 @@ msgstr 音频 CD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:178 msgid Recordable CD -msgstr 可刻录 CD +msgstr 可录制 CD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:181 msgid Rewritable CD -msgstr 可重复刻录 CD +msgstr 可擦写 CD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:184 msgid DVD @@ -105,27 +106,27 @@ msgstr DVD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:187 msgid Rewritable DVD (DVD-RAM) -msgstr 可重复刻录 DVD (DVD-RAM) +msgstr 可擦写 DVD(DVD-RAM) #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:192 msgid Recordable DVD -msgstr 可刻录 DVD +msgstr 可录制 DVD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:196 msgid Rewritable DVD -msgstr 可重复刻录 DVD +msgstr 可擦写 DVD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:199 msgid Blu-ray Disc -msgstr 蓝光盘 +msgstr 蓝光光盘 #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:202 msgid Recordable Blu-ray Disc -msgstr 可刻录蓝光盘 +msgstr 可录制蓝光光盘 #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:205 msgid Rewritable Blu-ray Disc -msgstr 可重复刻录蓝光盘 +msgstr 可擦写蓝光光盘 #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:208 msgid HD-DVD @@ -133,11 +134,11 @@ msgstr HD-DVD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:211 msgid Recordable HD-DVD -msgstr 可刻录 HD-DVD +msgstr 可录制 HD-DVD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:214 msgid Rewritable HD-DVD -msgstr 可重复刻录 HD-DVD +msgstr 可擦写 HD-DVD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:217 msgid Data CD @@ -181,7 +182,7 @@ msgstr SD/MMC 卡 #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:250 msgid Camera -msgstr 摄像头 +msgstr 摄像机 #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:252 msgid Zip Disk @@ -198,12 +199,12 @@ msgstr 未知 #:
[Xfce4-commits] xfce4-mixer:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 1edca380402cadf8f53ab35293c11a933001ce9d (commit) from 1e0758c1104305396522ab791d97945d11e8f41a (commit) commit 1edca380402cadf8f53ab35293c11a933001ce9d Author: Chipong Luo chipon...@yahoo.com Date: Mon Oct 24 18:25:10 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 37 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 33 + 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 53ac438..d9dc1eb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,15 +2,16 @@ # Copyright (C) 2009 Xfce development team # This file is distributed under the same license as the xfce-mixer package. # Chris K. Zhang plut...@gmail.com, 2009 -# +# Chipong Luo chipon...@yahoo.com, 2011. msgid msgstr Project-Id-Version: xfce4-mixer\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2009-01-11 00:59+0100\n PO-Revision-Date: 2009-01-19 12:59-0800\n -Last-Translator: Chris K. Zhang plut...@gmail.com\n +Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Simplified Chinese i18n-x...@xfce.org\n +Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n @@ -20,17 +21,17 @@ msgstr #: ../panel-plugin/xfce-mixer-plugin.c:548 #, c-format msgid %s: %i%% -msgstr %s: %i%% +msgstr %s： %i%% #: ../panel-plugin/xfce-mixer-plugin.c:346 msgid No left-click command defined -msgstr 鼠标左键点击命令未定义 +msgstr 未定义左键点击命令 #: ../panel-plugin/xfce-mixer-plugin.c:349 msgid No left-click command defined yet. You can change this in the plugin properties. -msgstr 鼠标左键点击命令未定义，可以通过插件属性来定义。 +msgstr 左键点击命令仍未定义。您可以在插件属性中更改。 #: ../panel-plugin/xfce-mixer-plugin.c:350 msgid Properties @@ -44,16 +45,16 @@ msgid command is included in the PATH environment variable or that you are providing the full path to the command. msgstr -无法运行命令“%s”，请确定该命令的路径包含在 PATH 环境变量中，或者你使用了该\n -命令的完整路径。 +无法执行命令 “%s”。确保要么该命令的路径包含在 PATH 环境变量中， +要么您提供了该命令的完整路径。 #: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89 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 的设备插件没有安装，\n -或者您没有使用声音设备的权限。 +Gstreamer 未能检测到任何声音设备。一些声音系统的特定 Gstreamer +插件可能缺失。也可能是权限问题。 #: ../panel-plugin/xfce-plugin-dialog.c:234 msgid Mixer Plugin @@ -61,7 +62,7 @@ msgstr 混音器插件 #: ../panel-plugin/xfce-plugin-dialog.c:236 msgid Configure the mixer track and left-click command -msgstr 配置混音器通道和鼠标左击命令 +msgstr 配置混音器音轨和左键点击命令 #: ../panel-plugin/xfce-plugin-dialog.c:248 msgid Sound card @@ -69,11 +70,11 @@ msgstr 声卡 #: ../panel-plugin/xfce-plugin-dialog.c:266 msgid Mixer track -msgstr 混音器通道 +msgstr 混音器音轨 #: ../panel-plugin/xfce-plugin-dialog.c:284 msgid Left-click command -msgstr 鼠标左击命令 +msgstr 左键点击命令 #: ../panel-plugin/xfce-plugin-dialog.c:322 msgid Select command @@ -151,7 +152,7 @@ msgid No controls are marked as visible. Please open the span size='large'bSelect Controls/b/span dialog to select some. msgstr -没有控制被标为可见。请打开 span size='large'b选择控制/b/span \n +没有控制被标为可见。请打开 span size='large'b选择控制/b/span 对话框来选一些。 #: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135 @@ -160,7 +161,7 @@ msgstr 选择控制 #: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137 msgid Select which controls should be visible -msgstr 选择那些控制可见 +msgstr 选择哪些控制应该可见 #: ../xfce4-mixer/xfce-mixer-window.c:84 msgid _Quit @@ -180,7 +181,7 @@ msgstr 选择显示哪些控制 #: ../xfce4-mixer/xfce-mixer-window.c:184 msgid Configure sound card(s) and control the volume of selected tracks -msgstr 配置声卡并控制所选通道的音量 +msgstr 配置声卡并控制选中音轨的音量 #: ../xfce4-mixer/xfce-mixer-window.c:199 msgid Sound card: @@ -188,4 +189,4 @@ msgstr 声卡： #: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1 msgid Audio mixer for the Xfce Desktop Environment -msgstr Xfce 桌面环境混音器 +msgstr Xfce 桌面环境下的音频混音器 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master history: Add reorder-items option
Updating branch refs/heads/master
to 22e591e64c145ee775769c9bb048093235b7417f (commit)
from 21d54aa2ce95c96327e37ae6c7b536f2c504a016 (commit)
commit 22e591e64c145ee775769c9bb048093235b7417f
Author: Mike Massonnet mmasson...@xfce.org
Date: Mon Oct 24 21:19:53 2011 +0200
history: Add reorder-items option
This option lets user choose to push or not the last copied text to
the top of the history, by default it's set to true.
The Xfconf property /tweaks/reorder-items is binded to it.
panel-plugin/common.h |1 +
panel-plugin/history.c | 31 +--
panel-plugin/plugin.c |2 ++
3 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/common.h b/panel-plugin/common.h
index 76fa9c5..9542979 100644
--- a/panel-plugin/common.h
+++ b/panel-plugin/common.h
@@ -27,6 +27,7 @@
#define DEFAULT_MAX_IMAGES_IN_HISTORY 1
#define DEFAULT_SAVE_ON_QUITTRUE
#define DEFAULT_REVERSE_ORDER FALSE
+#define DEFAULT_REORDER_ITEMS TRUE
/* Collector */
#define DEFAULT_ADD_PRIMARY_CLIPBOARD FALSE
diff --git a/panel-plugin/history.c b/panel-plugin/history.c
index b6c1e58..d1c3f99 100644
--- a/panel-plugin/history.c
+++ b/panel-plugin/history.c
@@ -46,6 +46,7 @@ struct _ClipmanHistoryPrivate
guint max_texts_in_history;
guint max_images_in_history;
gboolean save_on_quit;
+ gboolean reorder_items;
};
enum
@@ -53,6 +54,7 @@ enum
MAX_TEXTS_IN_HISTORY = 1,
MAX_IMAGES_IN_HISTORY,
SAVE_ON_QUIT,
+ REORDER_ITEMS,
};
enum
@@ -216,8 +218,17 @@ clipman_history_add_text (ClipmanHistory *history,
if (list != NULL)
{
DBG (Found a previous occurence for text `%s', text);
- __clipman_history_item_free (list-data);
- history-priv-texts = g_slist_delete_link (history-priv-texts, list);
+ item = list-data;
+ if (history-priv-reorder_items)
+{
+ __clipman_history_item_free (item);
+ history-priv-texts = g_slist_delete_link (history-priv-texts,
list);
+}
+ else
+{
+ history-priv-item_to_restore = item;
+ return;
+}
}
/* Store the text */
@@ -433,6 +444,14 @@ clipman_history_class_init (ClipmanHistoryClass *klass)
True if the history
must be saved on quit,
DEFAULT_SAVE_ON_QUIT,
G_PARAM_CONSTRUCT|G_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
+ REORDER_ITEMS,
+ g_param_spec_boolean (reorder-items,
+ ReorderItems,
+ Always push last
clipboard content to the top of the history,
+ DEFAULT_REORDER_ITEMS,
+
G_PARAM_CONSTRUCT|G_PARAM_READWRITE));
}
static void
@@ -470,6 +489,10 @@ clipman_history_set_property (GObject *object,
priv-save_on_quit = g_value_get_boolean (value);
break;
+case REORDER_ITEMS:
+ priv-reorder_items = g_value_get_boolean (value);
+ break;
+
default:
break;
}
@@ -497,6 +520,10 @@ clipman_history_get_property (GObject *object,
g_value_set_boolean (value, priv-save_on_quit);
break;
+case REORDER_ITEMS:
+ g_value_set_boolean (value, priv-reorder_items);
+ break;
+
default:
break;
}
diff --git a/panel-plugin/plugin.c b/panel-plugin/plugin.c
index 12c9d4d..3582035 100644
--- a/panel-plugin/plugin.c
+++ b/panel-plugin/plugin.c
@@ -95,6 +95,8 @@ plugin_register (void)
G_TYPE_UINT, plugin-history,
max-images-in-history);
xfconf_g_property_bind (plugin-channel, /settings/save-on-quit,
G_TYPE_BOOLEAN, plugin-history, save-on-quit);
+ xfconf_g_property_bind (plugin-channel, /tweaks/reorder-items,
+ G_TYPE_BOOLEAN, plugin-history, reorder-items);
/* ClipmanCollector */
plugin-collector = clipman_collector_get ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master doc: document /tweaks/reorder-items
Updating branch refs/heads/xfce4-clipman-plugin-master to db5268ad519045b18a86cd971e72d8500d882f11 (commit) from 0b84b9c2cae31356af4a035d83f7d63af4b787fc (commit) commit db5268ad519045b18a86cd971e72d8500d882f11 Author: Mike Massonnet mmasson...@xfce.org Date: Mon Oct 24 21:45:40 2011 +0200 doc: document /tweaks/reorder-items index.page |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/index.page b/index.page index 087f427..7e9e3be 100644 --- a/index.page +++ b/index.page @@ -321,6 +321,12 @@ tdptrue or false to popup the Clipman menu at the mouse pointer position, works only when called from the xfce4-popup-clipman command/p/td /tr tr +tdp its:translate=no/tweaks/reorder-items/p/td +tdp its:translate=nobool/p/td +tdp its:translate=notrue/p/td +tdptrue or false to push the last copied text to the top of the history, useful to reorder old items/p/td + /tr + tr tdp its:translate=no/tweaks/reverse-menu-order/p/td tdp its:translate=nobool/p/td tdp its:translate=nofalse/p/td ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master actions: Add skip-action-on-key-down option
Updating branch refs/heads/master
to 1f1aa61509b6c57b119ae0baf16e1bf50b7056e9 (commit)
from 22e591e64c145ee775769c9bb048093235b7417f (commit)
commit 1f1aa61509b6c57b119ae0baf16e1bf50b7056e9
Author: Mike Massonnet mmasson...@xfce.org
Date: Mon Oct 24 23:35:32 2011 +0200
actions: Add skip-action-on-key-down option
This option lets the user skip the actions popup menu by holding
the Control key down when the selection is done, by default it's
set to false.
The Xfconf property /tweaks/skip-action-key-down is binded to it.
panel-plugin/actions.c | 71
panel-plugin/common.h |1 +
panel-plugin/plugin.c |2 +
3 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/actions.c b/panel-plugin/actions.c
index a01fb35..ad2ae74 100644
--- a/panel-plugin/actions.c
+++ b/panel-plugin/actions.c
@@ -57,9 +57,23 @@ struct _ClipmanActionsPrivate
GFileMonitor *file_monitor;
GSList *entries;
GtkWidget*menu;
+ gboolean skip_action_on_key_down;
+};
+
+enum
+{
+ SKIP_ACTION_ON_KEY_DOWN = 1,
};
static void clipman_actions_finalize(GObject *object);
+static void clipman_actions_set_property(GObject *object,
+ guint property_id,
+ const GValue
*value,
+ GParamSpec
*pspec);
+static void clipman_actions_get_property(GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec
*pspec);
/*
* Misc functions declarations
@@ -672,6 +686,16 @@ clipman_actions_match_with_menu (ClipmanActions *actions,
ClipmanActionsEntry *entry;
GtkWidget *mi;
GSList *l, *entries;
+ GdkModifierType state;
+
+ if (actions-priv-skip_action_on_key_down)
+{
+ gdk_window_get_pointer (NULL, NULL, NULL, state);
+ if (state GDK_CONTROL_MASK)
+{
+ return;
+}
+}
entries = clipman_actions_match (actions, group, text);
@@ -881,6 +905,15 @@ clipman_actions_class_init (ClipmanActionsClass *klass)
object_class = G_OBJECT_CLASS (klass);
object_class-finalize = clipman_actions_finalize;
+ object_class-set_property = clipman_actions_set_property;
+ object_class-get_property = clipman_actions_get_property;
+
+ g_object_class_install_property (object_class, SKIP_ACTION_ON_KEY_DOWN,
+ g_param_spec_boolean
(skip-action-on-key-down,
+ SkipActionOnKeyDown,
+ Skip the action if
the Control key is pressed down,
+
DEFAULT_SKIP_ACTION_ON_KEY_DOWN,
+
G_PARAM_CONSTRUCT|G_PARAM_READWRITE));
}
static void
@@ -912,3 +945,41 @@ clipman_actions_finalize (GObject *object)
g_object_unref (actions-priv-file);
}
+static void
+clipman_actions_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ ClipmanActionsPrivate *priv = CLIPMAN_ACTIONS (object)-priv;
+
+ switch (property_id)
+{
+case SKIP_ACTION_ON_KEY_DOWN:
+ priv-skip_action_on_key_down = g_value_get_boolean (value);
+ break;
+
+default:
+ break;
+}
+}
+
+static void
+clipman_actions_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ ClipmanActionsPrivate *priv = CLIPMAN_ACTIONS (object)-priv;
+
+ switch (property_id)
+{
+case SKIP_ACTION_ON_KEY_DOWN:
+ g_value_set_boolean (value, priv-skip_action_on_key_down);
+ break;
+
+default:
+ break;
+}
+}
+
diff --git a/panel-plugin/common.h b/panel-plugin/common.h
index 9542979..bab4795 100644
--- a/panel-plugin/common.h
+++ b/panel-plugin/common.h
@@ -28,6 +28,7 @@
#define DEFAULT_SAVE_ON_QUITTRUE
#define DEFAULT_REVERSE_ORDER FALSE
#define DEFAULT_REORDER_ITEMS TRUE
+#define DEFAULT_SKIP_ACTION_ON_KEY_DOWN FALSE
/* Collector */
#define DEFAULT_ADD_PRIMARY_CLIPBOARD FALSE
diff --git a/panel-plugin/plugin.c b/panel-plugin/plugin.c
index 3582035..7a3d3ae 100644
--- a/panel-plugin/plugin.c
+++ b/panel-plugin/plugin.c
@@ -86,6 +86,8 @@ plugin_register (void)
/* ClipmanActions */
[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master doc: document /tweaks/skip-action-on-key-down
Updating branch refs/heads/xfce4-clipman-plugin-master to e99fc5a73b9beec94c5d9da3b4fafeec844031e8 (commit) from db5268ad519045b18a86cd971e72d8500d882f11 (commit) commit e99fc5a73b9beec94c5d9da3b4fafeec844031e8 Author: Mike Massonnet mmasson...@xfce.org Date: Mon Oct 24 23:48:38 2011 +0200 doc: document /tweaks/skip-action-on-key-down index.page |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/index.page b/index.page index 7e9e3be..c88e6a0 100644 --- a/index.page +++ b/index.page @@ -332,6 +332,12 @@ tdp its:translate=nofalse/p/td tdptrue or false to display the history in the reverse order/p/td /tr + tr +tdp its:translate=no/tweaks/skip-action-on-key-down/p/td +tdp its:translate=nobool/p/td +tdp its:translate=nofalse/p/td +tdptrue or false to skip the actions popup menu when the Control key is hold down at the end of the selection/p/td + /tr /tbody /table p ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master make update-po
Updating branch refs/heads/xfce4-clipman-plugin-master to 744dd08e6e5de3f170206b3dc56cb675e1af483d (commit) from e99fc5a73b9beec94c5d9da3b4fafeec844031e8 (commit) commit 744dd08e6e5de3f170206b3dc56cb675e1af483d Author: Mike Massonnet mmasson...@xfce.org Date: Tue Oct 25 00:01:52 2011 +0200 make update-po po/ca.po| 30 +- po/da.po| 30 +- po/el.po| 30 +- po/fr.po| 36 ++-- po/gl.po| 30 +- po/it.po| 30 +- po/ja.po| 30 +- po/pt.po| 30 +- po/ru.po| 30 +- po/tr.po| 30 +- po/ug.po| 30 +- po/uk.po| 30 +- po/xfce4-clipman-plugin.pot | 26 +- po/zh_CN.po | 30 +- 14 files changed, 295 insertions(+), 127 deletions(-) diff --git a/po/ca.po b/po/ca.po index cb5ede6..9d1c060 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-clipman-plugin\n -POT-Creation-Date: 2011-10-24 00:42+0200\n +POT-Creation-Date: 2011-10-24 23:59+0200\n PO-Revision-Date: 2009-12-09 18:15+0100\n Last-Translator: Carles Muñoz Gorriz carle...@internautas.org\n Language-Team: Catalan\n @@ -616,20 +616,32 @@ msgid msgstr #: index.page:327(td/p) +msgid +true or false to push the last copied text to the top of the history, useful +to reorder old items +msgstr + +#: index.page:333(td/p) #, fuzzy msgid true or false to display the history in the reverse order msgstr cert per a restaurar l'historial a cada nova sessió -#: index.page:331(section/p) +#: index.page:339(td/p) +msgid +true or false to skip the actions popup menu when the Control key is hold +down at the end of the selection +msgstr + +#: index.page:343(section/p) #, fuzzy msgid To change a setting from a terminal type the following command-line: msgstr Per canviar una opció des de el terminal escriviu la següent ordre: -#: index.page:344(section/title) +#: index.page:356(section/title) msgid Support msgstr Suport -#: index.page:345(section/p) +#: index.page:357(section/p) #, fuzzy msgid To report a bug or a feature request use the bug tracking system at _: @@ -646,11 +658,11 @@ msgstr vos al canal d'IRC emphasis role=\bold\#xfce/emphasis del servidor emphasis role=\bold\irc.freenode.net/emphasis i demaneu ajuda. -#: index.page:356(section/title) +#: index.page:368(section/title) msgid About Clipman msgstr -#: index.page:357(section/p) +#: index.page:369(section/p) #, fuzzy msgid appClipman/app was written by Eduard Roccatello and then maintained by @@ -664,7 +676,7 @@ msgstr projects/panel-plugins/xfce4-clipman-plugin\lloc web de @PACKAGE_NAME@/ ulink. -#: index.page:362(section/p) +#: index.page:374(section/p) #, fuzzy msgid This documentation was written by Mike Massonnet (mmasson...@xfce.com). @@ -675,7 +687,7 @@ msgstr comentaris i suggerències relatives al manual a emailmmasson...@xfce.org/ email. -#: index.page:367(section/p) +#: index.page:379(section/p) #, fuzzy msgid This software is distributed under the terms of the GNU General Public @@ -687,7 +699,7 @@ msgstr Foundation; ja sigui la versió 2 de la llicència, o (si ho preferiu) qualsevol versió posterior. -#: index.page:371(section/p) +#: index.page:383(section/p) #, fuzzy msgid You should have received a copy of the GNU General Public License along with diff --git a/po/da.po b/po/da.po index bda9207..8424a0f 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: Xfce-clipman 1.1.4\n -POT-Creation-Date: 2011-10-24 00:42+0200\n +POT-Creation-Date: 2011-10-24 23:59+0200\n PO-Revision-Date: \n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Dansk-gruppen da...@dansk-gruppen.dk\n @@ -624,21 +624,33 @@ msgid msgstr #: index.page:327(td/p) +msgid +true or false to push the last copied text to the top of the history, useful +to reorder old items +msgstr + +#: index.page:333(td/p) #, fuzzy msgid true or false to display the history in the reverse order msgstr sand for at gendanne historikken ved hver ny session -#: index.page:331(section/p) +#: index.page:339(td/p) +msgid +true or false to skip the actions popup menu when the Control key is hold +down at the end of the selection +msgstr + +#: index.page:343(section/p) #, fuzzy msgid To change a setting from a terminal type the following command-line: msgstr Indtast følgende kommandolinje
[Xfce4-commits] xfce4-clipman-plugin:master doc: Update git submodule reference
Updating branch refs/heads/master to 66f8a08ab66f4840cd54426706f53293c440fe00 (commit) from 1f1aa61509b6c57b119ae0baf16e1bf50b7056e9 (commit) commit 66f8a08ab66f4840cd54426706f53293c440fe00 Author: Mike Massonnet mmasson...@xfce.org Date: Tue Oct 25 00:02:32 2011 +0200 doc: Update git submodule reference doc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc b/doc index fbfdf73..744dd08 16 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit fbfdf73383b20387a0885ca878398207984a551d +Subproject commit 744dd08e6e5de3f170206b3dc56cb675e1af483d ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Look for localized next page link and unify code
Updating branch refs/heads/master
to 990b6b77bdf1ddc6b47337a899db672179a432a3 (commit)
from 501a883a11c3dcc365b51872ed7fe364e400342c (commit)
commit 990b6b77bdf1ddc6b47337a899db672179a432a3
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Oct 24 19:27:34 2011 +0200
Look for localized next page link and unify code
midori/midori-view.c | 71 +++--
1 files changed, 33 insertions(+), 38 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 8d94a6e..f1be02a 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4969,44 +4969,57 @@ midori_view_go_forward (MidoriView* view)
webkit_web_view_go_forward (WEBKIT_WEB_VIEW (view-web_view));
}
-/**
- * midori_view_get_previous_page
- * @view: a #MidoriView
- *
- * Determines the previous sub-page in the view.
- *
- * Return value: an URI, or %NULL
- *
- * Since: 0.2.3
- **/
-const gchar*
-midori_view_get_previous_page (MidoriView* view)
+static gchar*
+midori_view_get_related_page (MidoriView* view,
+ const gchar* rel,
+ const gchar* local)
{
+gchar* script;
static gchar* uri = NULL;
WebKitWebFrame* web_frame;
JSContextRef js_context;
-g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
-
if (!view-web_view)
return NULL;
web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW
(view-web_view));
js_context = webkit_web_frame_get_global_context (web_frame);
-katze_assign (uri, sokoke_js_script_eval (js_context,
+script = g_strdup_printf (
(function (tags) {
for (var tag in tags) {
var l = document.getElementsByTagName (tag);
for (var i in l) {
-if ((l[i].rel l[i].rel.toLowerCase () == 'prev')
+if ((l[i].rel l[i].rel.toLowerCase () == '%s')
|| (l[i].innerHTML
- l[i].innerHTML.toLowerCase ().indexOf ('prev') != -1))
+ (l[i].innerHTML.toLowerCase ().indexOf ('%s') != -1
+ || l[i].innerHTML.toLowerCase ().indexOf ('%s') != -1)))
{ return l[i].href; } } } return 0; })(
-{ link:'link', a:'a' });, NULL));
+{ link:'link', a:'a' });, rel, rel, local);
+katze_assign (uri, sokoke_js_script_eval (js_context, script, NULL));
+g_free (script);
return uri uri[0] != '0' ? uri : NULL;
}
/**
+ * midori_view_get_previous_page
+ * @view: a #MidoriView
+ *
+ * Determines the previous sub-page in the view.
+ *
+ * Return value: an URI, or %NULL
+ *
+ * Since: 0.2.3
+ **/
+const gchar*
+midori_view_get_previous_page (MidoriView* view)
+{
+g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+
+/* i18n: word stem of previous page type links, case is not important */
+return midori_view_get_related_page (view, prev, _(previous));
+}
+
+/**
* midori_view_get_next_page
* @view: a #MidoriView
*
@@ -5019,28 +5032,10 @@ midori_view_get_previous_page (MidoriView* view)
const gchar*
midori_view_get_next_page (MidoriView* view)
{
-static gchar* uri = NULL;
-WebKitWebFrame* web_frame;
-JSContextRef js_context;
-
g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
-if (!view-web_view)
-return NULL;
-
-web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW
(view-web_view));
-js_context = webkit_web_frame_get_global_context (web_frame);
-katze_assign (uri, sokoke_js_script_eval (js_context,
-(function (tags) {
-for (var tag in tags) {
-var l = document.getElementsByTagName (tag);
-for (var i in l) {
-if ((l[i].rel l[i].rel.toLowerCase () == 'next')
- || (l[i].innerHTML
- l[i].innerHTML.toLowerCase ().indexOf ('next') != -1))
-{ return l[i].href; } } } return 0; })(
-{ link:'link', a:'a' });, NULL));
-return uri uri[0] != '0' ? uri : NULL;
+/* i18n: word stem of next page type links, case is not important */
+return midori_view_get_related_page (view, next, _(next));
}
static GtkWidget*
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Split proxy server and port options into two fields
Updating branch refs/heads/master
to d707a8758d3e52e43864636da6b90e4f0a3e56ff (commit)
from 990b6b77bdf1ddc6b47337a899db672179a432a3 (commit)
commit d707a8758d3e52e43864636da6b90e4f0a3e56ff
Author: Peter Hatina phat...@redhat.com
Date: Mon Oct 24 19:53:37 2011 +0200
Split proxy server and port options into two fields
Fixes: https://bugs.launchpad.net/midori/+bug/699986
midori/main.c |9 ++---
midori/midori-preferences.c |8
midori/midori-websettings.c | 25 +
3 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index b46ba2d..79e93d2 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -918,9 +918,12 @@ soup_session_settings_notify_http_proxy_cb
(MidoriWebSettings* settings,
}
else if (proxy_type == MIDORI_PROXY_HTTP)
{
-gchar* http_proxy = katze_object_get_string (settings, http-proxy);
-midori_soup_session_set_proxy_uri (session, http_proxy);
-g_free (http_proxy);
+gchar* proxy = katze_object_get_string (settings, http-proxy);
+GString *http_proxy = g_string_new (proxy);
+g_string_append_printf (http_proxy, :%d, katze_object_get_int
(settings, http-proxy-port));
+midori_soup_session_set_proxy_uri (session, http_proxy-str);
+g_string_free (http_proxy, TRUE);
+g_free (proxy);
}
else
midori_soup_session_set_proxy_uri (session, NULL);
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 59ade73..682e91c 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -461,6 +461,14 @@ midori_preferences_set_settings (MidoriPreferences*
preferences,
g_signal_connect (settings, notify::proxy-type,
G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry);
midori_preferences_notify_proxy_type_cb (settings, NULL, entry);
+label = katze_property_label (settings, http-proxy-port);
+gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+INDENTED_ADD (label);
+entry = katze_property_proxy (settings, http-proxy-port, NULL);
+SPANNED_ADD (entry);
+g_signal_connect (settings, notify::proxy-type,
+G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry);
+midori_preferences_notify_proxy_type_cb (settings, NULL, entry);
#endif
#if WEBKIT_CHECK_VERSION (1, 3, 11)
if (soup_session_get_feature (webkit_get_default_session (),
SOUP_TYPE_CACHE))
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index e34b546..b2e29a1 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -78,6 +78,7 @@ struct _MidoriWebSettings
gchar* news_aggregator;
gchar* location_entry_search;
gchar* http_proxy;
+gint http_proxy_port;
#if WEBKIT_CHECK_VERSION (1, 3, 11)
gint maximum_cache_size;
#endif
@@ -162,6 +163,7 @@ enum
PROP_PROXY_TYPE,
PROP_HTTP_PROXY,
+PROP_HTTP_PROXY_PORT,
PROP_MAXIMUM_CACHE_SIZE,
PROP_IDENTIFY_AS,
PROP_USER_AGENT,
@@ -896,6 +898,23 @@ midori_web_settings_class_init (MidoriWebSettingsClass*
class)
NULL,
flags));
+/**
+ * MidoriWebSettings:http-proxy-port:
+ *
+ * The proxy server port used for HTTP connections
+ *
+ * Since: 0.4.2
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_HTTP_PROXY_PORT,
+ g_param_spec_int (
+ http-proxy-port,
+ _(Port),
+ _(The proxy server port used for HTTP
connections),
+ 1, 65535, 8080,
+ flags
+ ));
+
#if WEBKIT_CHECK_VERSION (1, 3, 11)
/**
* MidoriWebSettings:maximum-cache-size:
@@ -1387,6 +1406,9 @@ midori_web_settings_set_property (GObject* object,
case PROP_HTTP_PROXY:
katze_assign (web_settings-http_proxy, g_value_dup_string (value));
break;
+case PROP_HTTP_PROXY_PORT:
+web_settings-http_proxy_port = g_value_get_int (value);
+break;
#if WEBKIT_CHECK_VERSION (1, 3, 11)
case PROP_MAXIMUM_CACHE_SIZE:
web_settings-maximum_cache_size = g_value_get_int (value);
@@ -1648,6 +1670,9 @@ midori_web_settings_get_property (GObject*object,
case PROP_HTTP_PROXY:
g_value_set_string (value, web_settings-http_proxy);
break;
+case PROP_HTTP_PROXY_PORT:
+g_value_set_int (value, web_settings-http_proxy_port);
+break;
#if WEBKIT_CHECK_VERSION (1, 3, 11)
case PROP_MAXIMUM_CACHE_SIZE:
g_value_set_int (value, web_settings-maximum_cache_size);
___
Xfce4-commits mailing
[Xfce4-commits] midori:master Make title on speed dial a bit easier to click for editing
Updating branch refs/heads/master
to b359341801ded617ac82bdbc4d2004e50ba730d2 (commit)
from d707a8758d3e52e43864636da6b90e4f0a3e56ff (commit)
commit b359341801ded617ac82bdbc4d2004e50ba730d2
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Sun Oct 23 14:19:22 2011 +0200
Make title on speed dial a bit easier to click for editing
data/speeddial-head.html |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/data/speeddial-head.html b/data/speeddial-head.html
index 201fc9c..ff86866 100644
--- a/data/speeddial-head.html
+++ b/data/speeddial-head.html
@@ -68,7 +68,7 @@
.title {
text-align: center;
-margin-top: -12%;
+margin-top: -17%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Use versioned speed dial template filename
Updating branch refs/heads/master
to 3c116eab7e35a4b85dd35ae8f2b09529218f31b6 (commit)
from b359341801ded617ac82bdbc4d2004e50ba730d2 (commit)
commit 3c116eab7e35a4b85dd35ae8f2b09529218f31b6
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Sun Oct 23 19:23:03 2011 +0200
Use versioned speed dial template filename
midori/midori-view.c |3 ++-
wscript | 12
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index f1be02a..1eeeaf7 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3704,7 +3704,8 @@ prepare_speed_dial_html (MidoriView* view)
if (!key_file)
return g_strdup ();
-file_name = g_build_filename (midori, res, speeddial-head.html,
NULL);
+file_name = g_build_filename (midori, res,
+speeddial-head- MIDORI_VERSION .html, NULL);
file_path = sokoke_find_data_filename (file_name);
g_free (file_name);
diff --git a/wscript b/wscript
index 7ff2a29..6c3073a 100644
--- a/wscript
+++ b/wscript
@@ -32,13 +32,13 @@ minor = 4
micro = 1
APPNAME = 'midori'
-VERSION = str (major) + '.' + str (minor) + '.' + str (micro)
+VERSION = VERSION_FULL = str (major) + '.' + str (minor) + '.' + str (micro)
try:
if os.path.isdir ('.git'):
git = Utils.cmd_output (['git', 'describe'], silent=True)
if git:
-VERSION = git.strip ()
+VERSION_FULL = git.strip ()
except:
pass
@@ -272,11 +272,12 @@ def configure (conf):
else:
conf.check (header_name='signal.h')
-conf.define ('PACKAGE_VERSION', VERSION)
+conf.define ('PACKAGE_VERSION', VERSION_FULL)
conf.define ('PACKAGE_NAME', APPNAME)
conf.define ('PACKAGE_BUGREPORT', 'https://bugs.launchpad.net/midori')
conf.define ('GETTEXT_PACKAGE', APPNAME)
+conf.define ('MIDORI_VERSION', VERSION)
conf.define ('MIDORI_MAJOR_VERSION', major)
conf.define ('MIDORI_MINOR_VERSION', minor)
conf.define ('MIDORI_MICRO_VERSION', micro)
@@ -476,8 +477,11 @@ def build (bld):
else:
Utils.pprint ('BLUE', logo-shade could not be rasterized.)
-for res_file in ['error.html', 'speeddial-head.html', 'close.png']:
+for res_file in ['error.html', 'close.png']:
bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/' +
res_file)
+bld.install_as ( \
+'${MDATADIR}/' + APPNAME + '/res/speeddial-head-%s.html' % VERSION, \
+'data/speeddial-head.html')
if bld.env['addons']:
bld.install_files ('${MDATADIR}/' + APPNAME + '/res',
'data/autosuggestcontrol.js')
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Use bookmark-new for Add Bookmark
Updating branch refs/heads/master
to 9159e72b58ee8dff334a871cea6cd4000edead5b (commit)
from 3c116eab7e35a4b85dd35ae8f2b09529218f31b6 (commit)
commit 9159e72b58ee8dff334a871cea6cd4000edead5b
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Oct 25 02:13:18 2011 +0200
Use bookmark-new for Add Bookmark
Fixes: https://bugs.launchpad.net/midori/+bug/880179
midori/midori-stock.h |2 +-
midori/sokoke.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/midori/midori-stock.h b/midori/midori-stock.h
index ff98c7b..57d04fa 100644
--- a/midori/midori-stock.h
+++ b/midori/midori-stock.h
@@ -32,8 +32,8 @@
#define STOCK_TRANSFERS package
#define STOCK_PLUGINSgnome-mime-application-x-shockwave-flash
-#define STOCK_BOOKMARK_ADD stock_add-bookmark
#define STOCK_HOMEPAGE GTK_STOCK_HOME
+#define STOCK_BOOKMARK_ADD bookmark-new
#define STOCK_IMAGE gnome-mime-image
#define STOCK_NETWORK_OFFLINEnetwork-offline
#define STOCK_SCRIPT stock_script
diff --git a/midori/sokoke.c b/midori/sokoke.c
index d8a47db..d3daab0 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -1217,7 +1217,7 @@ sokoke_register_stock_items (void)
{ STOCK_BOOKMARK, N_(_Bookmark), 0, 0, GTK_STOCK_FILE },
{ STOCK_BOOKMARKS, N_(_Bookmarks), GDK_CONTROL_MASK |
GDK_SHIFT_MASK, GDK_KEY_B, GTK_STOCK_DIRECTORY },
-{ STOCK_BOOKMARK_ADD, N_(Add Boo_kmark), 0, 0, GTK_STOCK_ADD },
+{ STOCK_BOOKMARK_ADD, N_(Add Boo_kmark), 0, 0,
stock_add-bookmark },
{ STOCK_CONSOLE,N_(_Console), 0, 0, GTK_STOCK_DIALOG_WARNING
},
{ STOCK_EXTENSIONS, N_(_Extensions), 0, 0, GTK_STOCK_CONVERT },
{ STOCK_HISTORY,N_(_History), GDK_CONTROL_MASK |
GDK_SHIFT_MASK, GDK_KEY_H, GTK_STOCK_SORT_ASCENDING },
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Correctly use user-home for Homepage
Updating branch refs/heads/master to 2cc0341bf0e2d83c867b81c541339b462fa3535b (commit) from 9159e72b58ee8dff334a871cea6cd4000edead5b (commit) commit 2cc0341bf0e2d83c867b81c541339b462fa3535b Author: Christian Dywan christ...@twotoasts.de Date: Tue Oct 25 02:14:40 2011 +0200 Correctly use user-home for Homepage Since the stock item is re-registered, using GTK_STOCK_HOME directly will wrongly take gtk-home as the icon name. midori/midori-stock.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/midori/midori-stock.h b/midori/midori-stock.h index 57d04fa..991d2ec 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -32,8 +32,8 @@ #define STOCK_TRANSFERS package #define STOCK_PLUGINSgnome-mime-application-x-shockwave-flash -#define STOCK_HOMEPAGE GTK_STOCK_HOME #define STOCK_BOOKMARK_ADD bookmark-new +#define STOCK_HOMEPAGE go-home #define STOCK_IMAGE gnome-mime-image #define STOCK_NETWORK_OFFLINEnetwork-offline #define STOCK_SCRIPT stock_script ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
