[Xfce4-commits] midori:master l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to a68bba484621c7ed9944fd8d7070d08cbefa143c (commit) from 8dbc86361d02d50165326c76e73ec2fcead9fa27 (commit) commit a68bba484621c7ed9944fd8d7070d08cbefa143c Author: Per Kongstad p_kongs...@op.pl Date: Thu Jan 14 09:30:48 2010 +0100 l10n: Updated Danish (da) translation to 100% New status: 571 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 337 -- 1 files changed, 174 insertions(+), 163 deletions(-) diff --git a/po/da.po b/po/da.po index c0c7279..c464980 100644 --- a/po/da.po +++ b/po/da.po @@ -5,9 +5,9 @@ msgid msgstr Project-Id-Version: midori 0.2.2\n -Report-Msgid-Bugs-To: http://bugzilla.xfce.org\n; -POT-Creation-Date: 2010-01-08 05:00+\n -PO-Revision-Date: 2010-01-08 09:44+0100\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2010-01-14 06:00+0100\n +PO-Revision-Date: 2010-01-14 09:25+0100\n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Danish da...@dansk-gruppen.dk\n MIME-Version: 1.0\n @@ -22,10 +22,10 @@ msgid Lightweight web browser msgstr Letvægtig webbrowser #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1577 -#: ../midori/main.c:1779 -#: ../midori/main.c:1787 -#: ../midori/main.c:1798 +#: ../midori/main.c:1538 +#: ../midori/main.c:1743 +#: ../midori/main.c:1751 +#: ../midori/main.c:1762 #: ../midori/midori-websettings.c:296 msgid Midori msgstr Midori @@ -51,14 +51,14 @@ msgid Invalid configuration value '%s' msgstr Ugyldig indstillingsværdi '%s' #: ../midori/main.c:377 -#: ../extensions/formhistory.c:436 +#: ../extensions/formhistory.c:437 #, c-format msgid Failed to open database: %s\n msgstr Kunne ikke åbne databasen: %s\n #: ../midori/main.c:409 -#: ../extensions/formhistory.c:451 -#: ../extensions/formhistory.c:455 +#: ../extensions/formhistory.c:452 +#: ../extensions/formhistory.c:456 #, c-format msgid Failed to execute database statement: %s\n msgstr Kunne ikke køre databaseudtryk: %s\n @@ -89,161 +89,161 @@ msgid Failed to add history item: %s\n msgstr Kunne ikke tilføje historikelementet: %s\n #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:739 +#: ../midori/main.c:700 #, c-format msgid Failed to remove old history items: %s\n msgstr Kunne ikke fjerne gamle historikelementer: %s\n -#: ../midori/main.c:768 +#: ../midori/main.c:729 #, c-format msgid The configuration couldn't be saved. %s msgstr Indstillingen kunne ikke gemmes. %s -#: ../midori/main.c:806 +#: ../midori/main.c:767 #, c-format msgid The search engines couldn't be saved. %s msgstr Søgemaskinerne kunne ikke gemmes. %s -#: ../midori/main.c:825 -#: ../midori/main.c:875 -#: ../midori/main.c:895 +#: ../midori/main.c:786 +#: ../midori/main.c:836 +#: ../midori/main.c:856 #, c-format msgid The bookmarks couldn't be saved. %s msgstr Bogmærkerne kunne ikke gemmes. %s #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:925 -#: ../midori/main.c:948 +#: ../midori/main.c:886 +#: ../midori/main.c:909 #, c-format msgid The trash couldn't be saved. %s msgstr Papirkurven kunne ikke fyldes. %s -#: ../midori/main.c:1012 -#: ../midori/main.c:1215 +#: ../midori/main.c:973 +#: ../midori/main.c:1176 #, c-format msgid The session couldn't be saved. %s msgstr Sessionen kunne ikke gemmes. %s -#: ../midori/main.c:1249 +#: ../midori/main.c:1210 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. msgstr Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet. -#: ../midori/main.c:1264 +#: ../midori/main.c:1225 msgid Modify _preferences msgstr Ændre _indstillinger -#: ../midori/main.c:1268 +#: ../midori/main.c:1229 msgid Reset the last _session msgstr Nulstil den sidste _session -#: ../midori/main.c:1273 +#: ../midori/main.c:1234 msgid Disable all _extensions msgstr Slå alle _udvidelser fra -#: ../midori/main.c:1481 -#: ../midori/main.c:2013 +#: ../midori/main.c:1442 +#: ../midori/main.c:1977 #, c-format msgid The session couldn't be loaded: %s\n msgstr Sessionen kunne ikke indlæses: %s\n -#: ../midori/main.c:1577 +#: ../midori/main.c:1538 msgid No filename specified msgstr Intet filnavn angivet -#: ../midori/main.c:1600 +#: ../midori/main.c:1561 msgid An unknown error occured. msgstr En ukendt fejl opstod. -#: ../midori/main.c:1632 +#: ../midori/main.c:1593 #, c-format msgid Snapshot saved to: %s\n msgstr Øjebliksbillede gem til: %s\n -#: ../midori/main.c:1692 +#: ../midori/main.c:1653 msgid Run ADDRESS as a web application msgstr Kør ADRESSE som et webprogram -#: ../midori/main.c:1692 +#: ../midori/main.c:1653 msgid ADDRESS msgstr ADRESSE -#:
[Xfce4-commits] xfmpc:master l10n: Updated Dutch (Flemish) (nl) translation to 82%
Updating branch refs/heads/master to b5d93a6c541f3a8d4556effcb17de9f1b1d85a1a (commit) from a21b62f69c5f79bc39f4b0c405a98f0121651696 (commit) commit b5d93a6c541f3a8d4556effcb17de9f1b1d85a1a Author: Timo Verbeek timoverbee...@hotmail.com Date: Thu Jan 14 09:38:01 2010 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 82% New status: 46 messages complete with 8 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 86 +++--- 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/po/nl.po b/po/nl.po index 6992f31..c36e8e5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ # This file is distributed under the same license as the xfmpc package. # Stephan Arts step...@xfce.org, 2008. # Mike Massonnet mmasson...@xfce.org, 2008-2009. -# +# msgid msgstr Project-Id-Version: xfmpc\n @@ -19,13 +19,12 @@ msgstr Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../src/dbbrowser.c:913 -#, fuzzy msgid Replace msgstr _Vervangen #: ../src/dbbrowser.c:919 ../src/playlist.c:884 msgid Browse -msgstr +msgstr Bladeren #: ../src/extended-interface.c:288 msgid Repeat @@ -63,11 +62,10 @@ msgstr Huidige afspeellijst msgid Browse database msgstr Databasebrowser -#. #. // write private function in case it is wished to avoid the #. // n/a values, but no big deal IMO #. text = get_subtitle (interface); -#. +#. #. TRANSLATORS: subtitle by \artist\ from \album\ (year) #: ../src/interface.c:263 #, c-format @@ -83,31 +81,31 @@ msgid Not connected msgstr Niet verbonden #: ../src/main-window.c:383 -#, c-format +#, c-format, fuzzy msgid %d songs, %d hours and %d minutes -msgstr +msgstr %d nummers ,%d uur en %d minuten #: ../src/main-window.c:385 #, c-format msgid %d songs, %d minutes -msgstr +msgstr %d liedjes,%d minuten #: ../src/mpdclient.c:348 msgid Failed to connect to MPD -msgstr +msgstr Mislukt verbinding te maken met MPD #: ../src/mpdclient.c:353 msgid Connected to MPD -msgstr +msgstr Verbonden met MPD #: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614 -#, fuzzy msgid n/a msgstr n/a #: ../src/preferences-dialog.c:359 +#, fuzzy msgid MPD -msgstr +msgstr MPD #: ../src/preferences-dialog.c:363 msgid Connection @@ -120,9 +118,7 @@ msgstr Standaard systeeminstellingen gebruiken #: ../src/preferences-dialog.c:367 #, fuzzy -msgid -If checked, Xfmpc will try to read the environment variables MPD_HOST and -MPD_PORT otherwise it will use localhost +msgid If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost msgstr Indien geselecteerd, #: ../src/preferences-dialog.c:378 @@ -139,120 +135,124 @@ msgstr Wachtwoord: #: ../src/preferences-dialog.c:414 msgid Appearance -msgstr +msgstr Uiterlijk #: ../src/preferences-dialog.c:420 +#, fuzzy msgid Statusbar -msgstr +msgstr Statusbar #: ../src/preferences-dialog.c:423 +#, fuzzy msgid Show _stastusbar -msgstr +msgstr Toon _stastusbar #: ../src/preferences-dialog.c:431 +#, fuzzy msgid Song Format -msgstr +msgstr Liedje Formaat #: ../src/preferences-dialog.c:436 +#, fuzzy msgid Song Format: -msgstr +msgstr Liedje Formaat: #: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139 msgid Title -msgstr +msgstr Titel #: ../src/preferences-dialog.c:442 msgid Album - Title -msgstr +msgstr Album - Titel #: ../src/preferences-dialog.c:443 msgid Artist - Title -msgstr +msgstr Artiest - Titel #: ../src/preferences-dialog.c:444 msgid Artist - Title (Date) -msgstr +msgstr Artiest - Titel (datum) #: ../src/preferences-dialog.c:445 msgid Artist - Album - Title -msgstr +msgstr Artiest - Album - Titel #: ../src/preferences-dialog.c:446 msgid Artist - Album - Track. Title -msgstr +msgstr Artiest - Album - Track. Titel #: ../src/preferences-dialog.c:447 msgid Custom... -msgstr +msgstr Aangepast ... #: ../src/preferences-dialog.c:453 msgid Custom format: -msgstr +msgstr Aangepast formaat: #: ../src/preferences-dialog.c:466 msgid Available parameters: -msgstr +msgstr Beschikbare parameters: #: ../src/preferences-dialog.c:472 #, c-format msgid %a: Artist -msgstr +msgstr %a: Artist #: ../src/preferences-dialog.c:477 #, c-format msgid %A: Album -msgstr +msgstr %A: Album #: ../src/preferences-dialog.c:482 #, c-format msgid %d: Date -msgstr +msgstr %d: Datum #: ../src/preferences-dialog.c:487 msgid %D: Disc -msgstr +msgstr %D: Disc #: ../src/preferences-dialog.c:492 #, c-format msgid %f: File -msgstr +msgstr %f: File #: ../src/preferences-dialog.c:497 #, c-format msgid %g: Genre -msgstr +msgstr %g: Genre #: ../src/preferences-dialog.c:502 msgid %t: Title -msgstr +msgstr %t: Titel #: ../src/preferences-dialog.c:507 msgid %T: Track -msgstr +msgstr %T: Track #: ../src/song-dialog.c:117 msgid File -msgstr
[Xfce4-commits] xfconf:master l10n: Updated Dutch (Flemish) (nl) translation to 96%
Updating branch refs/heads/master to 7cf88b77c04b1d5c5151797185b9310e8a4a689d (commit) from fa85217770c8c8e5b3189120fa7d0faae3a2afa1 (commit) commit 7cf88b77c04b1d5c5151797185b9310e8a4a689d Author: Timo Verbeek timoverbee...@hotmail.com Date: Thu Jan 14 09:56:42 2010 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 96% New status: 61 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 74 + 1 files changed, 26 insertions(+), 48 deletions(-) diff --git a/po/nl.po b/po/nl.po index c69de12..ca6b3f3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,12 +2,12 @@ # Copyright (C) 2009 THE xfconf'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfconf package. # Stephan Arts step...@xfce.org, 2009. -# +# msgid msgstr Project-Id-Version: xfconf 4.5.92svn-r28734\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-26 12:49+0100\n +POT-Creation-Date: 2010-01-14 06:05+0100\n PO-Revision-Date: 2009-01-24 16:20+0100\n Last-Translator: Vincent Tunru proje...@vinnl.nl\n Language-Team: Dutch\n @@ -16,10 +16,10 @@ msgstr Content-Transfer-Encoding: 8bit\n Plural-Forms: nplurals=2; plural=(n != 1);\n -#: ../xfconf/xfconf-cache.c:854 -#, fuzzy, c-format +#: ../xfconf/xfconf-cache.c:891 +#, c-format msgid Failed to make ResetProperty DBus call -msgstr De instelling kon niet worden opgeslagen.\n +msgstr Mislukt ResetProperty DBus call te maken #: ../xfconfd/xfconf-backend-perchannel-xml.c:280 #, c-format @@ -30,8 +30,7 @@ msgstr De configuratiemap \%s\ kon niet gemaakt worden #: ../xfconfd/xfconf-daemon.c:244 #, c-format msgid Permission denied while modifying property \%s\ on channel \%s\ -msgstr -Onvoldoende rechten voor het bewerken van instelling \%s\ op kanaal \%s\ +msgstr Onvoldoende rechten voor het bewerken van instelling \%s\ op kanaal \%s\ #: ../xfconfd/xfconf-backend-perchannel-xml.c:393 #: ../xfconfd/xfconf-backend-perchannel-xml.c:475 @@ -95,18 +94,13 @@ msgstr Het hoofdonderdeel ('/') is geen geldige instellingsnaam #: ../xfconfd/xfconf-backend.c:126 #, c-format -msgid -Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', -'-', '' and '', as well as '/' as a separator -msgstr -Instellingsnamen kunnen alleen de ASCII karakters A-Z, a-z, 0-9, '_', '-', -'' en '', en het scheidingsteken '/' bevatten +msgid Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '' and '', as well as '/' as a separator +msgstr Instellingsnamen kunnen alleen de ASCII karakters A-Z, a-z, 0-9, '_', '-', '' en '', en het scheidingsteken '/' bevatten #: ../xfconfd/xfconf-backend.c:135 #, c-format msgid Property names cannot have two or more consecutive '/' characters -msgstr -Instellingsnamen kunnen niet meerdere opeenvolgende '/' symbolen bevatten +msgstr Instellingsnamen kunnen niet meerdere opeenvolgende '/' symbolen bevatten #: ../xfconfd/xfconf-backend.c:146 #, c-format @@ -120,35 +114,25 @@ msgstr Kanaalnaam kan geen lege string zijn #: ../xfconfd/xfconf-backend.c:176 #, c-format -msgid -Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and -'-' -msgstr -Kanaalnamen kunnen alleen de ASCII karakters A-Z, a-z, 0-9, '_', en '-' -bevatten +msgid Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and '-' +msgstr Kanaalnamen kunnen alleen de ASCII karakters A-Z, a-z, 0-9, '_', en '-' bevatten #: ../xfconfd/xfconf-backend.c:398 #, c-format -msgid -The property name can only be empty or \/\ if a recursive reset was -specified -msgstr -De instellingsnaam kan alleen \/\ of leeg zijn wanneer er een recursieve -reset wordt uitgevoerd +msgid The property name can only be empty or \/\ if a recursive reset was specified +msgstr De instellingsnaam kan alleen \/\ of leeg zijn wanneer er een recursieve reset wordt uitgevoerd #: ../xfconfd/main.c:133 msgid Prints the xfconfd version. msgstr Toont de xfconfd versie. #: ../xfconfd/main.c:135 -msgid -Configuration backends to use. The first backend specified is opened read/ -write; the others, read-only. +msgid Configuration backends to use. The first backend specified is opened read/write; the others, read-only. msgstr #: ../xfconfd/main.c:138 msgid Fork into background after starting; only useful for testing purposes -msgstr +msgstr Plaats in de achtergrond na de start, alleen nuttig voor testdoeleinden #: ../xfconfd/main.c:158 msgid Xfce Configuration Daemon @@ -219,10 +203,8 @@ msgid The new value to set for the property msgstr Nieuwe waarde voor de instelling #: ../xfconf-query/main.c:207 -#, fuzzy msgid List properties (or channels if -c is not specified) -msgstr -Geef een lijst van instellingen (of kanalen wanneer -c niet is meegegeven) +msgstr Geef een lijst van instellingen (of kanalen wanneer -c niet is
[Xfce4-commits] parole:0.2.2 Properly handle WriteReady callback.
Updating branch refs/heads/0.2.2 to 3c88414b3b0edf3ed4620e62df9c69e39c05c67f (commit) from f6b28fc169ba66d48c179df355804d258fbf40bd (commit) commit 3c88414b3b0edf3ed4620e62df9c69e39c05c67f Author: Ali Abdallah al...@xfce.org Date: Wed Jan 13 21:24:57 2010 +0100 Properly handle WriteReady callback. Conflicts: browser-plugin/plugin.cpp browser-plugin/npp_gate.cpp |2 -- browser-plugin/plugin.cpp | 28 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/browser-plugin/npp_gate.cpp b/browser-plugin/npp_gate.cpp index 3fbb03b..90c1d00 100644 --- a/browser-plugin/npp_gate.cpp +++ b/browser-plugin/npp_gate.cpp @@ -71,7 +71,6 @@ NPError NPP_New(NPMIMEType pluginType, NPError rv = NPERR_NO_ERROR; -printf(NPP_New called\n); CPlugin *pPlugin = new CPlugin(instance); if (pPlugin == NULL) return NPERR_OUT_OF_MEMORY_ERROR; @@ -132,7 +131,6 @@ NPError NPP_SetWindow(NPP instance, NPWindow * pNPWindow) // window resized if (pPlugin-isInitialized() (pNPWindow-window != NULL)) { -printf(Window resized\n); pPlugin-SetWindow(pNPWindow); return NPERR_NO_ERROR; } diff --git a/browser-plugin/plugin.cpp b/browser-plugin/plugin.cpp index 365af6f..43372f0 100644 --- a/browser-plugin/plugin.cpp +++ b/browser-plugin/plugin.cpp @@ -407,6 +407,23 @@ NPError CPlugin::NewStream (NPMIMEType type, NPStream * stream, NPBool seekable, NPError CPlugin::DestroyStream(NPStream * stream, NPError reason) { +/* +g_debug (DestroyStream reason = %i for %s\n, reason, stream-url); + +if ( reason == NPRES_DONE ) +{ + g_debug (NPRES_DONE); +} +else if ( reason == NPRES_USER_BREAK ) +{ + g_debug (NPRES_USER_BREAK); + +} +else if ( reason == NPRES_NETWORK_ERR ) +{ + g_debug (NPRES_NETWORK_ERR); +} +*/ return NPERR_NO_ERROR; } @@ -424,6 +441,12 @@ int32_t CPlugin::WriteReady (NPStream * stream) { g_debug (WriteReady url=%s, stream-url); +if ( mode != NP_FULL ) +{ + NPN_DestroyStream (mInstance, stream, NPRES_DONE); + return -1; +} + return player_ready ? STREAMBUFSIZE : 0; } @@ -464,10 +487,7 @@ int32_t CPlugin::Write (NPStream * stream, int32_t offset, int32_t len, void *bu if ( cache ) { fseek (cache, offset, SEEK_SET); - wrotebytes += fwrite (buffer, 1, len, cache); -#ifdef DEBUG - g_debug (Wrotebytes=%d offset=%d data=%s, wrotebytes, offset, (gchar*)buffer); -#endif + wrotebytes += fwrite (buffer, 1, MAX (len, STREAMBUFSIZE), cache); } if ( wrotebytes = 0 ) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master l10n: Updated Catalan (Valencian) (ca) translation to 100%
Updating branch refs/heads/master to be63cc8950b431f8a9a90e419471b2856f472c96 (commit) from e4a9d4227f3251efc30709933d4a8078f0091e10 (commit) commit be63cc8950b431f8a9a90e419471b2856f472c96 Author: Harald Servat redcr...@gmail.com Date: Thu Jan 14 10:03:00 2010 +0100 l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 182 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ca.po | 198 -- 1 files changed, 89 insertions(+), 109 deletions(-) diff --git a/po/ca.po b/po/ca.po index fc0754c..0601d2e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2,14 +2,14 @@ # Traduccions al català del paquet «parole». # Copyright (C) 2009 THE parole'S COPYRIGHT HOLDER # This file is distributed under the same license as the parole package. -# +# # Carles Muñoz Gorriz carle...@internautas.org, 2009. -# +# msgid msgstr Project-Id-Version: parole\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-10 14:17+0100\n +POT-Creation-Date: 2010-01-14 06:06+0100\n PO-Revision-Date: 2009-12-10 15:32+0100\n Last-Translator: Harald Servat redcr...@gmail.com\n Language-Team: Catalan\n @@ -45,89 +45,93 @@ msgid Chapter Menu msgstr Menú de capítols #: ../data/interfaces/parole.ui.h:7 +msgid DVD +msgstr DVD + +#: ../data/interfaces/parole.ui.h:8 msgid DVD Menu msgstr Menú DVD -#: ../data/interfaces/parole.ui.h:8 +#: ../data/interfaces/parole.ui.h:9 +msgid From ISO image +msgstr D'una imatge ISO + +#: ../data/interfaces/parole.ui.h:10 msgid Media player msgstr Reproductor de suports -#: ../data/interfaces/parole.ui.h:9 +#: ../data/interfaces/parole.ui.h:11 msgid Mute msgstr Silenci -#: ../data/interfaces/parole.ui.h:10 -#: ../src/parole-player.c:1098 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1198 #: ../src/parole-disc-menu.c:113 msgid Next Chapter msgstr Capítol següent -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:13 msgid None msgstr Cap -#: ../data/interfaces/parole.ui.h:12 -#: ../data/desktop/parole.desktop.in.in.h:1 -#: ../src/parole-about.c:70 -#: ../plugins/window-title/window-title-provider.c:58 +#: ../data/interfaces/parole.ui.h:14 ../data/desktop/parole.desktop.in.in.h:1 +#: ../src/parole-about.c:70 ../plugins/window-title/window-title-provider.c:58 msgid Parole Media Player msgstr Reproductor de suports Parole -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:15 msgid Plugins msgstr Connectors -#: ../data/interfaces/parole.ui.h:14 -#: ../src/parole-player.c:1110 +#: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1210 #: ../src/parole-disc-menu.c:114 msgid Previous Chapter msgstr Capítol anterior -#: ../data/interfaces/parole.ui.h:15 +#: ../data/interfaces/parole.ui.h:17 msgid Repeat msgstr Repetició -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:18 msgid Select Track msgstr Selecciona pista -#: ../data/interfaces/parole.ui.h:17 +#: ../data/interfaces/parole.ui.h:19 msgid Shuffle msgstr Ordre aleatori -#: ../data/interfaces/parole.ui.h:18 +#: ../data/interfaces/parole.ui.h:20 msgid Sound msgstr Só -#: ../data/interfaces/parole.ui.h:19 +#: ../data/interfaces/parole.ui.h:21 msgid Square msgstr Quadrat -#: ../data/interfaces/parole.ui.h:20 +#: ../data/interfaces/parole.ui.h:22 msgid Volume Down msgstr Menys volum -#: ../data/interfaces/parole.ui.h:21 +#: ../data/interfaces/parole.ui.h:23 msgid Volume Up msgstr Més volum -#: ../data/interfaces/parole.ui.h:22 +#: ../data/interfaces/parole.ui.h:24 msgid _Edit msgstr _Edita -#: ../data/interfaces/parole.ui.h:23 +#: ../data/interfaces/parole.ui.h:25 msgid _Help msgstr A_juda -#: ../data/interfaces/parole.ui.h:24 +#: ../data/interfaces/parole.ui.h:26 msgid _Media msgstr _Suport -#: ../data/interfaces/parole.ui.h:25 +#: ../data/interfaces/parole.ui.h:27 msgid _Open location msgstr _Obre una ubicació -#: ../data/interfaces/parole.ui.h:26 +#: ../data/interfaces/parole.ui.h:28 msgid _View msgstr _Visualitza @@ -239,19 +243,19 @@ msgstr Per extensió msgid Select File Types (By Extension) msgstr Seleccioneu el tipus de fitxer (per extensió) -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1498 msgid The stream is taking too much time to load msgstr Cal massa temps per carregar el flux -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1498 msgid Stop msgstr Para -#: ../gst/parole-gst.c:1683 +#: ../gst/parole-gst.c:1687 msgid Unable to load playbin GStreamer plugin, check your GStreamer installation msgstr No s'ha pogut carregar el connector playbin Gstreamer, comproveu la vostra instaŀlació de Gstreamer -#: ../gst/parole-gst.c:1703 +#: ../gst/parole-gst.c:1707 msgid Unable to load video GStreamer plugin, check your GStreamer installation msgstr No s'ha pogut carregar el connector de vídeo
[Xfce4-commits] parole:master For local media files, check the stream caps only when switching from ready to paused state.
Updating branch refs/heads/master to 1a09d817662e5d3be8cae120d6c006d2c7b6760a (commit) from e4a9d4227f3251efc30709933d4a8078f0091e10 (commit) commit 1a09d817662e5d3be8cae120d6c006d2c7b6760a Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 10:01:19 2010 +0100 For local media files, check the stream caps only when switching from ready to paused state. gst/parole-gst.c | 52 ++-- 1 files changed, 38 insertions(+), 14 deletions(-) diff --git a/gst/parole-gst.c b/gst/parole-gst.c index cb30a38..2f982e7 100644 --- a/gst/parole-gst.c +++ b/gst/parole-gst.c @@ -34,7 +34,7 @@ #include gst/video/video.h #include libxfce4util/libxfce4util.h -#include libxfcegui4/libxfcegui4.h +#include libxfce4ui/libxfce4ui.h #include gdk/gdkx.h @@ -630,8 +630,8 @@ parole_gst_query_capabilities (ParoleGst *gst) NULL, NULL); g_object_set (G_OBJECT (gst-priv-stream), - seekable, seekable, - NULL); + seekable, seekable, + NULL); } gst_query_unref (query); } @@ -931,9 +931,22 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState } case GST_STATE_PAUSED: { - parole_gst_query_duration (gst); - parole_gst_query_capabilities (gst); - parole_gst_query_info (gst); + if ( pending == GST_STATE_PLAYING ) + { + ParoleMediaType media_type; + + g_object_get (G_OBJECT (gst-priv-stream), + media-type, media_type, + NULL); + + if ( (media_type == PAROLE_MEDIA_TYPE_LOCAL_FILE old == GST_STATE_READY) || + media_type != PAROLE_MEDIA_TYPE_LOCAL_FILE ) + { + parole_gst_query_duration (gst); + parole_gst_query_capabilities (gst); + parole_gst_query_info (gst); + } + } if ( gst-priv-target == GST_STATE_PLAYING ) { @@ -953,7 +966,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0, gst-priv-stream, PAROLE_MEDIA_STATE_STOPPED); - if ( gst-priv-target == GST_STATE_PLAYING pending != GST_STATE_PLAYING) + if ( gst-priv-target == GST_STATE_PLAYING pending GST_STATE_PAUSED) { parole_gst_play_file_internal (gst); } @@ -1494,8 +1507,11 @@ parole_gst_check_state_change_timeout (gpointer data) if ( gst-priv-state != gst-priv-target ) { - gboolean ret_val = - xfce_confirm (_(The stream is taking too much time to load), GTK_STOCK_OK, _(Stop)); + gboolean ret_val = xfce_dialog_confirm (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gst))), + GTK_STOCK_YES, + _(Stop), + _(The stream is taking too much time to load), + NULL); if ( ret_val ) { @@ -1684,9 +1700,13 @@ parole_gst_constructed (GObject *object) if ( G_UNLIKELY (gst-priv-playbin == NULL) ) { - xfce_err (_(Unable to load playbin GStreamer plugin - , check your GStreamer installation)); - + GError *error; + error = g_error_new (0, 0, %s, _(Unable to load playbin GStreamer plugin + , check your GStreamer installation)); + + xfce_dialog_show_error (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gst))), + error, NULL); + g_error_free (error); g_error (playbin load failed); } @@ -1704,8 +1724,12 @@ parole_gst_constructed (GObject *object) if ( G_UNLIKELY (gst-priv-video_sink == NULL) ) { - xfce_err (_(Unable to load video GStreamer plugin - , check your GStreamer installation)); + GError *error; + error = g_error_new (0, 0, %s, _(Unable to load video GStreamer plugin + , check your GStreamer installation)); + xfce_dialog_show_error (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gst))), + error, NULL); + g_error_free (error); g_error (ximagesink load failed); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Merge branch 'master' of ssh://git.xfce.org/git/apps/parole
Updating branch refs/heads/master to 4f874ff01dfa0c5538dc1c113331d6fddb174a0c (commit) from 1a09d817662e5d3be8cae120d6c006d2c7b6760a (commit) commit 4f874ff01dfa0c5538dc1c113331d6fddb174a0c Merge: 1a09d817662e5d3be8cae120d6c006d2c7b6760a be63cc8950b431f8a9a90e419471b2856f472c96 Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 10:03:08 2010 +0100 Merge branch 'master' of ssh://git.xfce.org/git/apps/parole commit be63cc8950b431f8a9a90e419471b2856f472c96 Author: Harald Servat redcr...@gmail.com Date: Thu Jan 14 10:03:00 2010 +0100 l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 182 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ca.po | 198 -- 1 files changed, 89 insertions(+), 109 deletions(-) diff --git a/po/ca.po b/po/ca.po index fc0754c..0601d2e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2,14 +2,14 @@ # Traduccions al català del paquet «parole». # Copyright (C) 2009 THE parole'S COPYRIGHT HOLDER # This file is distributed under the same license as the parole package. -# +# # Carles Muñoz Gorriz carle...@internautas.org, 2009. -# +# msgid msgstr Project-Id-Version: parole\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-10 14:17+0100\n +POT-Creation-Date: 2010-01-14 06:06+0100\n PO-Revision-Date: 2009-12-10 15:32+0100\n Last-Translator: Harald Servat redcr...@gmail.com\n Language-Team: Catalan\n @@ -45,89 +45,93 @@ msgid Chapter Menu msgstr Menú de capítols #: ../data/interfaces/parole.ui.h:7 +msgid DVD +msgstr DVD + +#: ../data/interfaces/parole.ui.h:8 msgid DVD Menu msgstr Menú DVD -#: ../data/interfaces/parole.ui.h:8 +#: ../data/interfaces/parole.ui.h:9 +msgid From ISO image +msgstr D'una imatge ISO + +#: ../data/interfaces/parole.ui.h:10 msgid Media player msgstr Reproductor de suports -#: ../data/interfaces/parole.ui.h:9 +#: ../data/interfaces/parole.ui.h:11 msgid Mute msgstr Silenci -#: ../data/interfaces/parole.ui.h:10 -#: ../src/parole-player.c:1098 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1198 #: ../src/parole-disc-menu.c:113 msgid Next Chapter msgstr Capítol següent -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:13 msgid None msgstr Cap -#: ../data/interfaces/parole.ui.h:12 -#: ../data/desktop/parole.desktop.in.in.h:1 -#: ../src/parole-about.c:70 -#: ../plugins/window-title/window-title-provider.c:58 +#: ../data/interfaces/parole.ui.h:14 ../data/desktop/parole.desktop.in.in.h:1 +#: ../src/parole-about.c:70 ../plugins/window-title/window-title-provider.c:58 msgid Parole Media Player msgstr Reproductor de suports Parole -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:15 msgid Plugins msgstr Connectors -#: ../data/interfaces/parole.ui.h:14 -#: ../src/parole-player.c:1110 +#: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1210 #: ../src/parole-disc-menu.c:114 msgid Previous Chapter msgstr Capítol anterior -#: ../data/interfaces/parole.ui.h:15 +#: ../data/interfaces/parole.ui.h:17 msgid Repeat msgstr Repetició -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:18 msgid Select Track msgstr Selecciona pista -#: ../data/interfaces/parole.ui.h:17 +#: ../data/interfaces/parole.ui.h:19 msgid Shuffle msgstr Ordre aleatori -#: ../data/interfaces/parole.ui.h:18 +#: ../data/interfaces/parole.ui.h:20 msgid Sound msgstr Só -#: ../data/interfaces/parole.ui.h:19 +#: ../data/interfaces/parole.ui.h:21 msgid Square msgstr Quadrat -#: ../data/interfaces/parole.ui.h:20 +#: ../data/interfaces/parole.ui.h:22 msgid Volume Down msgstr Menys volum -#: ../data/interfaces/parole.ui.h:21 +#: ../data/interfaces/parole.ui.h:23 msgid Volume Up msgstr Més volum -#: ../data/interfaces/parole.ui.h:22 +#: ../data/interfaces/parole.ui.h:24 msgid _Edit msgstr _Edita -#: ../data/interfaces/parole.ui.h:23 +#: ../data/interfaces/parole.ui.h:25 msgid _Help msgstr A_juda -#: ../data/interfaces/parole.ui.h:24 +#: ../data/interfaces/parole.ui.h:26 msgid _Media msgstr _Suport -#: ../data/interfaces/parole.ui.h:25 +#: ../data/interfaces/parole.ui.h:27 msgid _Open location msgstr _Obre una ubicació -#: ../data/interfaces/parole.ui.h:26 +#: ../data/interfaces/parole.ui.h:28 msgid _View msgstr _Visualitza @@ -239,19 +243,19 @@ msgstr Per extensió msgid Select File Types (By Extension) msgstr Seleccioneu el tipus de fitxer (per extensió) -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1498 msgid The stream is taking too much time to load msgstr Cal massa temps per carregar el flux -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1498 msgid Stop msgstr Para -#: ../gst/parole-gst.c:1683 +#: ../gst/parole-gst.c:1687 msgid Unable to load playbin GStreamer plugin, check your GStreamer installation msgstr No s'ha pogut carregar
[Xfce4-commits] xfce-utils:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 0ee8018ece415d243d0a41395e5d669579d9a853 (commit) from 79b2e2b36223fd8d36dd6af7d94e4a18401f5b98 (commit) commit 0ee8018ece415d243d0a41395e5d669579d9a853 Author: Xu Meihong mhun...@gmail.com Date: Thu Jan 14 15:10:10 2010 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 36 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 79 ++- 1 files changed, 40 insertions(+), 39 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 0f25727..83aac25 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid msgstr Project-Id-Version: xfce-utils 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-02-01 11:39+0100\n +POT-Creation-Date: 2010-01-14 12:04+0100\n PO-Revision-Date: 2009-06-14 02:40+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese/Simplified xfce-i...@xfce.org\n @@ -20,154 +20,155 @@ msgstr Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: ../xfce4-about/info.c:197 -msgid Unable to load -msgstr 无法加载 +#: ../xfce4-about/info.c:206 ../xfce4-about/info.c:385 +#, c-format +msgid Unable to load the file %s +msgstr 无法加载文件 %s #. Project lead -#: ../xfce4-about/info.c:226 +#: ../xfce4-about/info.c:235 msgid Project Lead msgstr 项目领导者 #. Core developers -#: ../xfce4-about/info.c:230 +#: ../xfce4-about/info.c:239 msgid Core developers msgstr 核心开发者 #. Active contributors -#: ../xfce4-about/info.c:234 +#: ../xfce4-about/info.c:243 msgid Active contributors msgstr 活跃贡献者 #. Previous contributors -#: ../xfce4-about/info.c:238 +#: ../xfce4-about/info.c:247 msgid Previous contributors msgstr 先前贡献者 -#: ../xfce4-about/info.c:243 +#: ../xfce4-about/info.c:252 msgid Web Hosting and Mailing Lists provided by msgstr 网站和邮件列表提供 #. Server admins -#: ../xfce4-about/info.c:275 +#: ../xfce4-about/info.c:284 msgid Server maintained by msgstr 服务器维护者 #. Goodies supervision -#: ../xfce4-about/info.c:279 +#: ../xfce4-about/info.c:288 msgid Goodies supervision msgstr Goodies 管理 #. Translations supervision -#: ../xfce4-about/info.c:283 +#: ../xfce4-about/info.c:292 msgid Translations supervision msgstr 翻译管理 #. Translators -#: ../xfce4-about/info.c:287 +#: ../xfce4-about/info.c:296 msgid Translators msgstr 翻译者 -#: ../xfce4-about/info.c:318 +#: ../xfce4-about/info.c:327 msgid If you know of anyone missing from this list, please let us know on msgstr 如果你知道本列表上有漏掉的任何信息,请告诉我们 -#: ../xfce4-about/info.c:322 +#: ../xfce4-about/info.c:331 msgid Thanks to all who helped making this software available. msgstr 谢谢所有帮助这个软件发展的人。 -#: ../xfce4-about/info.c:431 +#: ../xfce4-about/info.c:441 msgid About Xfce 4 msgstr 关于Xfce 4 -#: ../xfce4-about/info.c:432 +#: ../xfce4-about/info.c:442 msgid Copyright 2002-2010 by Olivier Fourdan msgstr 版权所有2002-2010 Olivier Fourdan -#: ../xfce4-about/info.c:455 +#: ../xfce4-about/info.c:461 msgid Info msgstr 信息 #. add_page (GTK_NOTEBOOK (notebook), _(Credits), XFCE_AUTHORS, FALSE); -#: ../xfce4-about/info.c:457 +#: ../xfce4-about/info.c:463 msgid Credits msgstr 光荣榜 -#: ../xfce4-about/info.c:458 +#: ../xfce4-about/info.c:464 msgid Copyright msgstr 版权 -#: ../xfce4-about/info.c:459 +#: ../xfce4-about/info.c:465 msgid BSDL msgstr BSDL -#: ../xfce4-about/info.c:460 +#: ../xfce4-about/info.c:466 msgid LGPL msgstr LGPL -#: ../xfce4-about/info.c:461 +#: ../xfce4-about/info.c:467 msgid GPL msgstr GPL #. we don't support daemon mode -#: ../xfrun/xfrun.c:50 +#: ../xfrun/xfrun.c:49 msgid Daemon Mode msgstr 守护进程模式 -#: ../xfrun/xfrun.c:52 +#: ../xfrun/xfrun.c:51 msgid Daemon mode is not supported. msgstr 不支持守护进程模式 -#: ../xfrun/xfrun.c:53 +#: ../xfrun/xfrun.c:52 msgid Xfrun must be compiled with D-BUS support to enable daemon mode. msgstr xfrun 必须在编译时加入 D-BUS 支持才能启用守护进程模式 -#: ../xfrun/xfrun-dbus.c:141 +#: ../xfrun/xfrun-dbus.c:144 #, c-format msgid Unable to open display \%s\. -msgstr 无法打开显示“%s”。 +msgstr 无法打开显示 \%s\。 -#: ../xfrun/xfrun-dbus.c:200 +#: ../xfrun/xfrun-dbus.c:201 #, c-format msgid D-BUS message bus disconnected. Exiting ...\n msgstr 与 D-BUS 信息总线的连接已被断开。正在退出...\n #. failed -#: ../xfrun/xfrun-dbus.c:342 ../xfrun/xfrun-dbus.c:353 +#: ../xfrun/xfrun-dbus.c:343 ../xfrun/xfrun-dbus.c:354 msgid System Error msgstr 系统错误 -#: ../xfrun/xfrun-dbus.c:344 ../xfrun/xfrun-dbus.c:355 +#: ../xfrun/xfrun-dbus.c:345 ../xfrun/xfrun-dbus.c:356 msgid Unable to fork to background: msgstr 无法派生指令到后台 -#: ../xfrun/xfrun-dialog.c:188 +#: ../xfrun/xfrun-dialog.c:187 msgid Run in _terminal -msgstr 在终端中运行(_t) +msgstr 在终端中运行(_T) -#: ../xfrun/xfrun-dialog.c:209 +#: ../xfrun/xfrun-dialog.c:208 msgid _Run msgstr 运行(_R) -#: ../xfrun/xfrun-dialog.c:540 +#: ../xfrun/xfrun-dialog.c:539 #, c-format msgid The command \%s\ failed to
[Xfce4-commits] parole:master l10n: Updated Galician (gl) translation to 93%
Updating branch refs/heads/master to 5dbd3b571c21880debfd76a16be3e3bc3d64f8e1 (commit) from 80675e4da44cfcdc6210387aafd8c47e0aa87a6c (commit) commit 5dbd3b571c21880debfd76a16be3e3bc3d64f8e1 Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Jan 14 15:14:54 2010 +0100 l10n: Updated Galician (gl) translation to 93% New status: 171 messages complete with 0 fuzzies and 11 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po | 203 -- 1 files changed, 91 insertions(+), 112 deletions(-) diff --git a/po/gl.po b/po/gl.po index 7118450..6eaf584 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,17 +1,17 @@ # Galician translation of notification-daemon-xfce # Copyright (C) 2009 Leandro Regueiro. # This file is distributed under the same license as the Xfce package. -# +# # Leandro Regueiro leandro DOT regueiro AT gmail DOT com, 2009. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en http://trasno.net -# +# msgid msgstr Project-Id-Version: Parole 0.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-10 14:17+0100\n +POT-Creation-Date: 2010-01-14 12:06+0100\n PO-Revision-Date: 2009-12-18 15:09+0100\n Last-Translator: Leandro Regueiro leandro.regue...@gmail.com\n Language-Team: Galician proxe...@trasno.net\n @@ -45,89 +45,93 @@ msgid Chapter Menu msgstr Menú de capítulos #: ../data/interfaces/parole.ui.h:7 +msgid DVD +msgstr DVD + +#: ../data/interfaces/parole.ui.h:8 msgid DVD Menu msgstr Menú do DVD -#: ../data/interfaces/parole.ui.h:8 +#: ../data/interfaces/parole.ui.h:9 +msgid From ISO image +msgstr Dende imaxe ISO + +#: ../data/interfaces/parole.ui.h:10 msgid Media player msgstr Reprodutor multimedia -#: ../data/interfaces/parole.ui.h:9 +#: ../data/interfaces/parole.ui.h:11 msgid Mute msgstr Silencio -#: ../data/interfaces/parole.ui.h:10 -#: ../src/parole-player.c:1098 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1198 #: ../src/parole-disc-menu.c:113 msgid Next Chapter msgstr Capítulo seguinte -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:13 msgid None msgstr Ningunha -#: ../data/interfaces/parole.ui.h:12 -#: ../data/desktop/parole.desktop.in.in.h:1 -#: ../src/parole-about.c:70 -#: ../plugins/window-title/window-title-provider.c:58 +#: ../data/interfaces/parole.ui.h:14 ../data/desktop/parole.desktop.in.in.h:1 +#: ../src/parole-about.c:70 ../plugins/window-title/window-title-provider.c:58 msgid Parole Media Player msgstr Reprodutor multimedia Parole -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:15 msgid Plugins msgstr Engadidos -#: ../data/interfaces/parole.ui.h:14 -#: ../src/parole-player.c:1110 +#: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1210 #: ../src/parole-disc-menu.c:114 msgid Previous Chapter msgstr Capítulo anterior -#: ../data/interfaces/parole.ui.h:15 +#: ../data/interfaces/parole.ui.h:17 msgid Repeat msgstr Repetir -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:18 msgid Select Track msgstr Escoller pista -#: ../data/interfaces/parole.ui.h:17 +#: ../data/interfaces/parole.ui.h:19 msgid Shuffle msgstr Aleatorio -#: ../data/interfaces/parole.ui.h:18 +#: ../data/interfaces/parole.ui.h:20 msgid Sound msgstr Son -#: ../data/interfaces/parole.ui.h:19 +#: ../data/interfaces/parole.ui.h:21 msgid Square msgstr Cadrado -#: ../data/interfaces/parole.ui.h:20 +#: ../data/interfaces/parole.ui.h:22 msgid Volume Down msgstr Baixar o volume -#: ../data/interfaces/parole.ui.h:21 +#: ../data/interfaces/parole.ui.h:23 msgid Volume Up msgstr Subir o volume -#: ../data/interfaces/parole.ui.h:22 +#: ../data/interfaces/parole.ui.h:24 msgid _Edit msgstr _Editar -#: ../data/interfaces/parole.ui.h:23 +#: ../data/interfaces/parole.ui.h:25 msgid _Help msgstr A_xuda -#: ../data/interfaces/parole.ui.h:24 +#: ../data/interfaces/parole.ui.h:26 msgid _Media msgstr _Soportes -#: ../data/interfaces/parole.ui.h:25 +#: ../data/interfaces/parole.ui.h:27 msgid _Open location msgstr _Abrir localización -#: ../data/interfaces/parole.ui.h:26 +#: ../data/interfaces/parole.ui.h:28 msgid _View msgstr _Ver @@ -239,19 +243,19 @@ msgstr Por extensión msgid Select File Types (By Extension) msgstr Seleccionar tipos de ficheiros (por extensión) -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1511 msgid The stream is taking too much time to load msgstr Está levando moito tempo cargar o fluxo -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1511 msgid Stop msgstr Deter -#: ../gst/parole-gst.c:1683 +#: ../gst/parole-gst.c:1700 msgid Unable to load playbin GStreamer plugin, check your GStreamer installation msgstr Non foi posible cargar o engadido playbin de GStreamer, verifique a instalación de
[Xfce4-commits] parole:master l10n: Updated Galician (gl) translation to 94%
Updating branch refs/heads/master to d424d54db1c7c805ba0faa1f381b06a3e74afbe5 (commit) from 5dbd3b571c21880debfd76a16be3e3bc3d64f8e1 (commit) commit d424d54db1c7c805ba0faa1f381b06a3e74afbe5 Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Jan 14 15:16:08 2010 +0100 l10n: Updated Galician (gl) translation to 94% New status: 172 messages complete with 0 fuzzies and 10 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/gl.po b/po/gl.po index 6eaf584..5930e12 100644 --- a/po/gl.po +++ b/po/gl.po @@ -173,7 +173,7 @@ msgstr bSon/b #: ../data/interfaces/parole-settings.ui.h:2 msgid bDisplay/b -msgstr +msgstr bPantalla/b #: ../data/interfaces/parole-settings.ui.h:3 msgid bSubtitles/b ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master l10n: Updated Galician (gl) translation to 98%
Updating branch refs/heads/master to 56b89c83b1b32095f56883d40e3ba959ccfa7896 (commit) from d424d54db1c7c805ba0faa1f381b06a3e74afbe5 (commit) commit 56b89c83b1b32095f56883d40e3ba959ccfa7896 Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Jan 14 15:19:12 2010 +0100 l10n: Updated Galician (gl) translation to 98% New status: 179 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/gl.po b/po/gl.po index 5930e12..5d24b88 100644 --- a/po/gl.po +++ b/po/gl.po @@ -407,15 +407,15 @@ msgstr Mostrar a lista de reprodución #: ../src/parole-player.c:375 msgid Open ISO image -msgstr +msgstr Abrir imaxe ISO #: ../src/parole-player.c:392 msgid CD image -msgstr +msgstr Imaxe de CD #: ../src/parole-player.c:392 msgid DVD image -msgstr +msgstr Imaxe de DVD #: ../src/parole-player.c:643 #: ../browser-plugin/media-plugin/parole-plugin-player.c:300 @@ -692,7 +692,7 @@ msgstr Xeral #: ../plugins/properties/stream-properties-provider.c:392 msgid Stream doesn't support tags changes -msgstr +msgstr O fluxo non admite cambios de etiquetas #: ../plugins/properties/stream-properties-provider.c:399 msgid Save media tags changes @@ -764,7 +764,7 @@ msgstr Título da fiestra #: ../plugins/power-manager/power-manager.desktop.in.h:1 msgid Inhibit Power Manager from suspending the machine while playing DVD. -msgstr +msgstr Evitar que o Xestor de enerxía suspenda a máquina mentres se reproducen DVDs. #: ../plugins/power-manager/power-manager.desktop.in.h:2 msgid Power Manager Plugin @@ -772,11 +772,11 @@ msgstr Engadido do xestor de enerxía #: ../browser-plugin/media-plugin/main.c:72 msgid socket -msgstr +msgstr conectador #: ../browser-plugin/media-plugin/main.c:72 msgid SOCKET ID -msgstr +msgstr ID CONECTADOR #: ../browser-plugin/media-plugin/main.c:73 msgid url to play ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 31e641de2b9a244566c276ecf0ca6fba8682c44f (commit) from 9bb5a8416f794da729ef39c0e0e1b1260d569785 (commit) commit 31e641de2b9a244566c276ecf0ca6fba8682c44f Author: Xu Meihong mhun...@gmail.com Date: Thu Jan 14 15:18:11 2010 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 40 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 7ee3102..b7578e2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,8 +8,8 @@ msgid msgstr Project-Id-Version: tumbler\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-01-07 14:45+0100\n -PO-Revision-Date: 2009-12-22 22:52+0800\n +POT-Creation-Date: 2010-01-14 12:00+0100\n +PO-Revision-Date: 2010-01-14 22:21+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n MIME-Version: 1.0\n @@ -34,7 +34,7 @@ msgstr 另一个通用的缩略图查看器正在运行 #: ../tumblerd/tumbler-service.c:704 msgid Unsupported thumbnail flavor requested -msgstr +msgstr 请求了一个不支持的缩略图风格 #: ../tumblerd/tumbler-specialized-thumbnailer.c:461 msgid Failed to call the specialized thumbnailer: timeout ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master l10n: Updated Chinese (China) (zh_CN) translation to 98%
Updating branch refs/heads/master to a10597d90f4b63a56e0d1f14288d932f3c94dbe0 (commit) from 56b89c83b1b32095f56883d40e3ba959ccfa7896 (commit) commit a10597d90f4b63a56e0d1f14288d932f3c94dbe0 Author: Xu Meihong mhun...@gmail.com Date: Thu Jan 14 15:20:28 2010 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 98% New status: 180 messages complete with 2 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 92 --- 1 files changed, 56 insertions(+), 36 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 8a2baca..33959e0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,8 +8,8 @@ msgid msgstr Project-Id-Version: Parole\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-10 14:17+0100\n -PO-Revision-Date: 2009-12-13 20:27+0800\n +POT-Creation-Date: 2010-01-14 12:06+0100\n +PO-Revision-Date: 2010-01-14 22:22+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n MIME-Version: 1.0\n @@ -41,87 +41,95 @@ msgid Chapter Menu msgstr 章节菜单 #: ../data/interfaces/parole.ui.h:7 +msgid DVD +msgstr DVD + +#: ../data/interfaces/parole.ui.h:8 msgid DVD Menu msgstr DVD 菜单 -#: ../data/interfaces/parole.ui.h:8 +#: ../data/interfaces/parole.ui.h:9 +msgid From ISO image +msgstr 从 ISO 镜像载入 + +#: ../data/interfaces/parole.ui.h:10 msgid Media player msgstr 媒体播放器 -#: ../data/interfaces/parole.ui.h:9 +#: ../data/interfaces/parole.ui.h:11 msgid Mute msgstr 静音 -#: ../data/interfaces/parole.ui.h:10 ../src/parole-player.c:1098 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1198 #: ../src/parole-disc-menu.c:113 msgid Next Chapter msgstr 下一章节 -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:13 msgid None msgstr 无 -#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1 +#: ../data/interfaces/parole.ui.h:14 ../data/desktop/parole.desktop.in.in.h:1 #: ../src/parole-about.c:70 ../plugins/window-title/window-title-provider.c:58 msgid Parole Media Player msgstr Parole 媒体播放器 -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:15 msgid Plugins msgstr 插件 -#: ../data/interfaces/parole.ui.h:14 ../src/parole-player.c:1110 +#: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1210 #: ../src/parole-disc-menu.c:114 msgid Previous Chapter msgstr 上一章节 -#: ../data/interfaces/parole.ui.h:15 +#: ../data/interfaces/parole.ui.h:17 msgid Repeat msgstr 重复 -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:18 msgid Select Track msgstr 选择轨道 -#: ../data/interfaces/parole.ui.h:17 +#: ../data/interfaces/parole.ui.h:19 #, fuzzy msgid Shuffle msgstr 拖拽 -#: ../data/interfaces/parole.ui.h:18 +#: ../data/interfaces/parole.ui.h:20 msgid Sound msgstr 声音 -#: ../data/interfaces/parole.ui.h:19 +#: ../data/interfaces/parole.ui.h:21 #, fuzzy msgid Square msgstr 广场 -#: ../data/interfaces/parole.ui.h:20 +#: ../data/interfaces/parole.ui.h:22 msgid Volume Down msgstr 减小音量 -#: ../data/interfaces/parole.ui.h:21 +#: ../data/interfaces/parole.ui.h:23 msgid Volume Up msgstr 增大音量 -#: ../data/interfaces/parole.ui.h:22 +#: ../data/interfaces/parole.ui.h:24 msgid _Edit msgstr 编辑(_E) -#: ../data/interfaces/parole.ui.h:23 +#: ../data/interfaces/parole.ui.h:25 msgid _Help msgstr 帮助(_H) -#: ../data/interfaces/parole.ui.h:24 +#: ../data/interfaces/parole.ui.h:26 msgid _Media msgstr 媒体(_M) -#: ../data/interfaces/parole.ui.h:25 +#: ../data/interfaces/parole.ui.h:27 msgid _Open location msgstr 打开位置(_O) -#: ../data/interfaces/parole.ui.h:26 +#: ../data/interfaces/parole.ui.h:28 msgid _View msgstr 查看(_V) @@ -233,20 +241,20 @@ msgstr 以扩展名 msgid Select File Types (By Extension) msgstr 选择文件类型 (以扩展名) -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1511 msgid The stream is taking too much time to load msgstr 载入该流媒体使用时间过长 -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1511 msgid Stop msgstr 停止 -#: ../gst/parole-gst.c:1683 +#: ../gst/parole-gst.c:1700 msgid Unable to load playbin GStreamer plugin, check your GStreamer installation msgstr 无法载入 GStreamer 播放插件,检查您的 GStreamer 是否正确安装 -#: ../gst/parole-gst.c:1703 +#: ../gst/parole-gst.c:1720 msgid Unable to load video GStreamer plugin, check your GStreamer installation msgstr 无法载入 GStreamer 视频插件,检查您的 GStreamer 是否正确安装 @@ -361,7 +369,7 @@ msgstr 权限不足 msgid Unknown playlist format, Please select a support playlist format msgstr 未知播放列表格式,请选择一个已被支持的播放列表格式 -#: ../src/parole-medialist.c:514 ../src/parole-player.c:1852 +#: ../src/parole-medialist.c:514 ../src/parole-player.c:1974 msgid Playlist msgstr 播放列表 @@ -389,35 +397,47 @@ msgstr 记住播放列表 msgid Media list msgstr 媒体列表 -#: ../src/parole-player.c:318 +#: ../src/parole-player.c:333 msgid Hide playlist msgstr 隐藏播放列表 -#: ../src/parole-player.c:327 +#:
[Xfce4-commits] ristretto:master l10n: Updated Dutch (Flemish) (nl) translation to 88%
Updating branch refs/heads/master to 66d3f626989162041657ec69da6ad726267fa57e (commit) from 2f5ac49acd1bca48b4396f8c4a372d2697fed5e0 (commit) commit 66d3f626989162041657ec69da6ad726267fa57e Author: Timo Verbeek timoverbee...@hotmail.com Date: Thu Jan 14 15:23:44 2010 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 88% New status: 107 messages complete with 11 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 233 ++--- 1 files changed, 99 insertions(+), 134 deletions(-) diff --git a/po/nl.po b/po/nl.po index 0944592..8c8d689 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,7 +2,7 @@ # Copyright (C) 2007 THE ristretto'S COPYRIGHT HOLDER # This file is distributed under the same license as the ristretto package. # Stephan Arts step...@xfce.org, 2007. -# +# msgid msgstr Project-Id-Version: ristretto 0.0.1-svn-r02537\n @@ -22,7 +22,7 @@ msgstr Versie informatie #: ../src/main.c:63 msgid Start in fullscreen mode -msgstr Start in volledig scherm +msgstr Start in volledig scherm mode #: ../src/main.c:67 msgid Start a slideshow @@ -44,68 +44,59 @@ msgstr _Bestand #: ../src/main_window.c:265 msgid _Open -msgstr +msgstr _Open #: ../src/main_window.c:265 -#, fuzzy msgid Open an image msgstr Afbeelding openen #: ../src/main_window.c:266 -#, fuzzy msgid Open _Folder -msgstr Map o_penen +msgstr _Map openen #: ../src/main_window.c:266 -#, fuzzy msgid Open a folder msgstr Map openen #: ../src/main_window.c:267 msgid _Save copy -msgstr +msgstr Kopie Opslaan #: ../src/main_window.c:267 msgid Save a copy of the image -msgstr +msgstr Sla een kopie van de afbeelding op #: ../src/main_window.c:268 msgid _Print -msgstr +msgstr _Print #: ../src/main_window.c:268 -#, fuzzy msgid Print the image -msgstr _Afbeeldingen vooruit inladen +msgstr _Afbeelding printen #: ../src/main_window.c:269 -#, fuzzy msgid _Close -msgstr _Opruimen +msgstr _Sluiten #: ../src/main_window.c:269 msgid Close this image -msgstr +msgstr Sluit deze afbeelding #: ../src/main_window.c:270 -#, fuzzy msgid _Close All msgstr _Alles Sluiten #: ../src/main_window.c:270 -#, fuzzy msgid Close all images -msgstr _Alles Sluiten +msgstr _Alle afbeeldingen sluiten #: ../src/main_window.c:271 -#, fuzzy msgid _Quit -msgstr Be_werken +msgstr _Afsluiten #: ../src/main_window.c:271 -#, fuzzy msgid Quit Ristretto -msgstr Ristretto +msgstr Ristretto sluiten #. Edit Menu #: ../src/main_window.c:273 @@ -113,39 +104,37 @@ msgid _Edit msgstr Be_werken #: ../src/main_window.c:274 -#, fuzzy msgid _Open with... msgstr _Openen met... #: ../src/main_window.c:275 -#, fuzzy msgid _Sorting -msgstr _Zoomen +msgstr _Sorteren #: ../src/main_window.c:276 msgid _Delete -msgstr +msgstr _Verwijderen #: ../src/main_window.c:277 -#, fuzzy msgid _Preferences -msgstr Afbeeldingsweergave voorkeuren +msgstr _Voorkeuren #. View Menu #: ../src/main_window.c:279 msgid _View -msgstr Beel_d +msgstr _Beeld #: ../src/main_window.c:280 +#, fuzzy msgid _Fullscreen -msgstr +msgstr _Volledig scherm #: ../src/main_window.c:281 +#, fuzzy msgid _Leave Fullscreen -msgstr +msgstr _Volledig scherm sluiten #: ../src/main_window.c:282 -#, fuzzy msgid _Set as Wallpaper msgstr In_stellen als bureaublad achtergrond @@ -155,13 +144,12 @@ msgid _Zooming msgstr _Zoomen #: ../src/main_window.c:285 -#, fuzzy msgid Zoom _In -msgstr _Zoomen +msgstr _Inzoomen #: ../src/main_window.c:286 msgid Zoom _Out -msgstr +msgstr _Uitzoomen #: ../src/main_window.c:287 msgid Zoom _Fit @@ -169,13 +157,12 @@ msgstr #: ../src/main_window.c:288 msgid _Normal Size -msgstr +msgstr _Normale Grootte #. Rotation submenu #: ../src/main_window.c:290 -#, fuzzy msgid _Rotation -msgstr _Roteren +msgstr _Rotatie #: ../src/main_window.c:291 msgid Rotate _Right @@ -192,19 +179,19 @@ msgstr _Ga #: ../src/main_window.c:295 msgid _Forward -msgstr +msgstr _Volgende #: ../src/main_window.c:296 msgid _Back -msgstr +msgstr _Vorige #: ../src/main_window.c:297 msgid _First -msgstr +msgstr _Eerste #: ../src/main_window.c:298 msgid _Last -msgstr +msgstr _Laatste #. Help Menu #: ../src/main_window.c:300 @@ -213,96 +200,90 @@ msgstr _Help #: ../src/main_window.c:302 msgid _Contents -msgstr +msgstr _Inhoud #: ../src/main_window.c:304 msgid Display ristretto user manual -msgstr +msgstr Laat ristretto handleiding zien #: ../src/main_window.c:307 msgid _About -msgstr +msgstr _Over #: ../src/main_window.c:309 msgid Display information about ristretto -msgstr +msgstr Laat informatie over ristretto zien #. Position Menu #: ../src/main_window.c:312 msgid _Position -msgstr +msgstr _Positie #. Misc #: ../src/main_window.c:314 msgid Leave _Fullscreen -msgstr +msgstr Verlaat _Volledig scherm modus #. Toggle visibility of the main
[Xfce4-commits] xfce-utils:master l10n: Updated Galician (gl) translation to 100%
Updating branch refs/heads/master to 6e5f1e38476fcc715b99d45e224ac17e82bf39d3 (commit) from 0ee8018ece415d243d0a41395e5d669579d9a853 (commit) commit 6e5f1e38476fcc715b99d45e224ac17e82bf39d3 Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Jan 14 15:26:52 2010 +0100 l10n: Updated Galician (gl) translation to 100% New status: 36 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po | 85 ++--- 1 files changed, 42 insertions(+), 43 deletions(-) diff --git a/po/gl.po b/po/gl.po index 8aa5cc0..c70ca31 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,17 +1,17 @@ # Galician translation of xfce4-utils # Copyright (C) 2006, 2008, 2009 Leandro Regueiro # This file is distributed under the same license as the xfce package. -# +# # Leandro Regueiro leandro.regue...@gmail.com, 2006, 2008, 2009. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en http://trasno.net -# +# msgid msgstr Project-Id-Version: xfce-utils 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-02-01 11:39+0100\n +POT-Creation-Date: 2010-01-14 12:04+0100\n PO-Revision-Date: 2009-11-13 14:03+0100\n Last-Translator: Leandro Regueiro leandro.regue...@gmail.com\n Language-Team: Galician proxe...@trasno.net\n @@ -20,156 +20,155 @@ msgstr Content-Transfer-Encoding: 8bit\n Plural-Forms: nplurals=2; plural=(n!=1);\n -#: ../xfce4-about/info.c:197 -msgid Unable to load -msgstr Non foi posible cargar +#: ../xfce4-about/info.c:206 ../xfce4-about/info.c:385 +#, c-format +msgid Unable to load the file %s +msgstr Non foi posible cargar o ficheiro %s #. Project lead -#: ../xfce4-about/info.c:226 +#: ../xfce4-about/info.c:235 msgid Project Lead msgstr Líder do proxecto #. Core developers -#: ../xfce4-about/info.c:230 +#: ../xfce4-about/info.c:239 msgid Core developers msgstr Desenvolvedores principais #. Active contributors -#: ../xfce4-about/info.c:234 +#: ../xfce4-about/info.c:243 msgid Active contributors msgstr Contribuíntes activos #. Previous contributors -#: ../xfce4-about/info.c:238 +#: ../xfce4-about/info.c:247 msgid Previous contributors msgstr Contribuíntes anteriores -#: ../xfce4-about/info.c:243 +#: ../xfce4-about/info.c:252 msgid Web Hosting and Mailing Lists provided by msgstr Aloxamento web e listas de correo proporcionadas por #. Server admins -#: ../xfce4-about/info.c:275 +#: ../xfce4-about/info.c:284 msgid Server maintained by msgstr Servidor mantido por #. Goodies supervision -#: ../xfce4-about/info.c:279 +#: ../xfce4-about/info.c:288 msgid Goodies supervision msgstr Supervisión de goodies (extensións) #. Translations supervision -#: ../xfce4-about/info.c:283 +#: ../xfce4-about/info.c:292 msgid Translations supervision msgstr Supervisión das traducións #. Translators -#: ../xfce4-about/info.c:287 +#: ../xfce4-about/info.c:296 msgid Translators msgstr Tradutores -#: ../xfce4-about/info.c:318 +#: ../xfce4-about/info.c:327 msgid If you know of anyone missing from this list, please let us know on msgstr Se coñece a alguén que falta nesta lista, fáganolo saber en -#: ../xfce4-about/info.c:322 +#: ../xfce4-about/info.c:331 msgid Thanks to all who helped making this software available. msgstr Grazas a tódolos que axudaron a facer que este software estea dispoñible. -#: ../xfce4-about/info.c:431 +#: ../xfce4-about/info.c:441 msgid About Xfce 4 msgstr Acerca de Xfce 4 -#: ../xfce4-about/info.c:432 +#: ../xfce4-about/info.c:442 msgid Copyright 2002-2010 by Olivier Fourdan msgstr Copyright 2002-2010 de Olivier Fourdan -#: ../xfce4-about/info.c:455 +#: ../xfce4-about/info.c:461 msgid Info msgstr Información #. add_page (GTK_NOTEBOOK (notebook), _(Credits), XFCE_AUTHORS, FALSE); -#: ../xfce4-about/info.c:457 +#: ../xfce4-about/info.c:463 msgid Credits msgstr Créditos -#: ../xfce4-about/info.c:458 +#: ../xfce4-about/info.c:464 msgid Copyright msgstr Copyright -#: ../xfce4-about/info.c:459 +#: ../xfce4-about/info.c:465 msgid BSDL msgstr BSDL -#: ../xfce4-about/info.c:460 +#: ../xfce4-about/info.c:466 msgid LGPL msgstr LGPL -#: ../xfce4-about/info.c:461 +#: ../xfce4-about/info.c:467 msgid GPL msgstr GPL #. we don't support daemon mode -#: ../xfrun/xfrun.c:50 +#: ../xfrun/xfrun.c:49 msgid Daemon Mode msgstr Modo daemon -#: ../xfrun/xfrun.c:52 +#: ../xfrun/xfrun.c:51 msgid Daemon mode is not supported. msgstr O modo daemon non está soportado. -#: ../xfrun/xfrun.c:53 +#: ../xfrun/xfrun.c:52 msgid Xfrun must be compiled with D-BUS support to enable daemon mode. msgstr Debe compilarse xfrun con soporte para D-BUS para activar o modo daemon. -#: ../xfrun/xfrun-dbus.c:141 +#: ../xfrun/xfrun-dbus.c:144 #, c-format msgid Unable to open display \%s\. msgstr Non foi posible abrir a
[Xfce4-commits] xfce4-dict:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 114077340f6380fce6f6439622e22826ad6662fb (commit) from c85b8e05751da540189e1809d4e8fc1b7d6adc37 (commit) commit 114077340f6380fce6f6439622e22826ad6662fb Author: Xu Meihong mhun...@gmail.com Date: Thu Jan 14 15:30:26 2010 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 109 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 38 +++--- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 871fa30..f2cd921 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,14 +1,14 @@ # Chinese translations for xfce package. # 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. +# Hunt Xu hun...@live.cn, 2008, 2009, 2010. # msgid msgstr Project-Id-Version: xfce 4-dict\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-30 14:17+0100\n -PO-Revision-Date: 2010-01-01 18:44+0800\n +POT-Creation-Date: 2010-01-14 12:01+0100\n +PO-Revision-Date: 2010-01-14 22:32+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n MIME-Version: 1.0\n @@ -133,7 +133,7 @@ msgstr 无效输入 msgid Process failed (%s) msgstr 执行失败(%s)。 -#: ../lib/speedreader.c:80 ../lib/speedreader.c:664 +#: ../lib/speedreader.c:80 ../lib/speedreader.c:665 msgid P_ause msgstr 暂停(_A) @@ -157,22 +157,22 @@ msgstr 语速训练器 msgid You must enter a text. msgstr 您必须输入一段文本。 -#: ../lib/speedreader.c:505 +#: ../lib/speedreader.c:506 msgid Choose a file to load msgstr 选择要载入的文件 -#: ../lib/speedreader.c:534 +#: ../lib/speedreader.c:535 #, c-format msgid The file '%s' could not be loaded. msgstr 无法载入文件 '%s'。 -#: ../lib/speedreader.c:552 +#: ../lib/speedreader.c:553 #, c-format msgid (display %d word at a time) msgid_plural (display %d words at a time) msgstr[0] (一次显示 %d 个单词) -#: ../lib/speedreader.c:577 +#: ../lib/speedreader.c:578 msgid This is an easy speed reading utility to help train you to read faster. It does this by flashing words at a rapid rate on the screen. @@ -180,23 +180,23 @@ msgstr 这是一个简单的帮助训练阅读以提高您的语速的工具。其原理是以一定的速率在屏幕上 闪过不同的单词。 -#: ../lib/speedreader.c:580 +#: ../lib/speedreader.c:581 msgid _Words per Minute: msgstr 每分钟单词数(_W): -#: ../lib/speedreader.c:586 +#: ../lib/speedreader.c:587 msgid _Mark Paragraphs msgstr 标记段落(_M) -#: ../lib/speedreader.c:593 +#: ../lib/speedreader.c:594 msgid Word _Grouping: msgstr 单词分组(_G): -#: ../lib/speedreader.c:609 +#: ../lib/speedreader.c:610 msgid _Font Size: msgstr 字体大小(_F): -#: ../lib/speedreader.c:629 +#: ../lib/speedreader.c:630 msgid Enter some text here you would like to read.\n \n @@ -207,15 +207,15 @@ msgstr \n 放松,让自己处于舒适的状态,然后点击开始进行训练。 -#: ../lib/speedreader.c:645 +#: ../lib/speedreader.c:646 msgid Load the contents of a file msgstr 读取文件内容 -#: ../lib/speedreader.c:653 +#: ../lib/speedreader.c:654 msgid Clear the contents of the text field msgstr 清空文本框 -#: ../lib/speedreader.c:665 +#: ../lib/speedreader.c:666 msgid _Start msgstr 开始(_S) @@ -333,12 +333,12 @@ msgid Xfce4 Dictionary msgstr Xfce4 词典 #: ../lib/gui.c:848 -msgid Copyright © 2006-2009 Enrico Tröger -msgstr Copyright © 2006-2009 Enrico Tröger +msgid Copyright © 2006-2010 Enrico Tröger +msgstr Copyright © 2006-2010 Enrico Tröger #: ../lib/gui.c:851 msgid translator-credits -msgstr Hunt Xu hun...@live.cn +msgstr Hunt Xu hun...@live.cn, 2008, 2009, 2010. #: ../lib/prefs.c:55 msgid dict.leo.org - German - English ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gigolo:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 6e58a33843be42a7513b37040aa2d28f5ae2c03e (commit) from c763f88bf776ed9a59394475fe6fe740f3a54cf5 (commit) commit 6e58a33843be42a7513b37040aa2d28f5ae2c03e Author: Xu Meihong mhun...@gmail.com Date: Thu Jan 14 15:30:33 2010 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 133 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 16 +++- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 256e393..541e223 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,15 +2,14 @@ # gigolo 软件包的简体中文翻译 # Copyright (C) 2009 THE gigolo'S COPYRIGHT HOLDER # This file is distributed under the same license as the gigglo package. -# Hunt Xu hun...@live.cn, 2009. +# Hunt Xu hun...@live.cn, 2009, 2010. # Jiahua Huang jhuangjia...@gmail.com, 2009. - msgid msgstr Project-Id-Version: gigolo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-14 19:41+0100\n -PO-Revision-Date: 2009-12-16 21:17+0800\n +POT-Creation-Date: 2010-01-14 12:00+0100\n +PO-Revision-Date: 2010-01-14 22:32+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n MIME-Version: 1.0\n @@ -95,13 +94,13 @@ msgid A simple frontend to easily connect to remote filesystems msgstr 一个易用的远程文件系统连接工具 #: ../src/window.c:422 -msgid Copyright 2008-2009 Enrico Tröger -msgstr 版权所有 2008-2009 Enrico Tröger +msgid Copyright 2008-2010 Enrico Tröger +msgstr 版权所有 2008-2010 Enrico Tröger #: ../src/window.c:425 msgid translator-credits msgstr -Hunt Xu hun...@live.cn, 2009.\n +Hunt Xu hun...@live.cn, 2009, 2010.\n Jiahua Huang jhuangjia...@gmail.com, 2009. #: ../src/window.c:457 @@ -482,8 +481,7 @@ msgstr 显示侧边栏 msgid Whether to show a side panel for browsing the local network for available Samba/Windows shares and a bookmark list -msgstr -是否显示侧边栏以便浏览可用的局域网 Samba/Windows 共享和书签列表 +msgstr 是否显示侧边栏以便浏览可用的局域网 Samba/Windows 共享和书签列表 #: ../src/preferencesdialog.c:422 msgid Show auto-connect error messages ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to cb1616bdf2bbba80e132c4073e5f1cdf1a87a3cc (commit) from 953b2e66bbc40169c20f4bc25f690433aff7aff9 (commit) commit cb1616bdf2bbba80e132c4073e5f1cdf1a87a3cc Author: Xu Meihong mhun...@gmail.com Date: Thu Jan 14 15:31:07 2010 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 571 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 4347cac..e8caf27 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,14 +2,14 @@ # Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Stanley Zhang yatzh...@gmail.com, 2009. -# Hunt Xu mhun...@gmail.com, 2009. +# Hunt Xu mhun...@gmail.com, 2009, 2010. # msgid msgstr Project-Id-Version: midori 0.2.2\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2010-01-14 12:00+0100\n -PO-Revision-Date: 2010-01-14 22:28+0800\n +PO-Revision-Date: 2010-01-14 22:33+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Simplified Chinese xfce-i...@xfce.org\n MIME-Version: 1.0\n @@ -477,7 +477,9 @@ msgstr 轻量级的网页浏览器. #: ../midori/midori-browser.c:4763 msgid translator-credits -msgstr 张翼 yatzh...@gmail.com Hunt Xu mhun...@gmail.com +msgstr +张翼 yatzh...@gmail.com, 2009.\n +Hunt Xu mhun...@gmail.com, 2009, 2010. #: ../midori/midori-browser.c:5045 msgid _File ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:xfce-4.6 l10n: Updated Dutch (Flemish) (nl) translation to 85%
Updating branch refs/heads/xfce-4.6 to f56aa65a6f74c237e4099f8182f46d851ca3ce20 (commit) from 8c42518aaf8bbc019a1892100bd184d6e27253cf (commit) commit f56aa65a6f74c237e4099f8182f46d851ca3ce20 Author: Timo Verbeek timoverbee...@hotmail.com Date: Thu Jan 14 16:16:00 2010 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 85% New status: 6 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 36 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/po/nl.po b/po/nl.po index 45ea7ca..d2ad66c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: libxfce4util 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-01-11 09:10-0500\n +POT-Creation-Date: 2010-01-14 12:08+0100\n PO-Revision-Date: 2006-10-03 23:54+0200\n Last-Translator: Stephan Arts psy...@gmail.com\n Language-Team: Dutch vertal...@vrijschrift.org\n @@ -22,6 +22,7 @@ msgid Error creating directory '%s': %s msgstr Fout tijdens het maken van map '%s': %s #: ../libxfce4util/xfce-license.c:33 +#, fuzzy msgid Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n @@ -43,7 +44,7 @@ msgid THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n -msgstr +msgstr Herdistributie en gebruik in bron-en binaire vorm, met of zonder \\ n wijzigingen, is toegestaan mits aan de volgende voorwaarden \\ n vervuld zijn: \\ n \\ n 1. Herdistributie van de broncode moeten de bovenstaande copyright \\ n bericht, deze lijst van voorwaarden en de volgende disclaimer. \\ N 2. Bij herdistributie in binaire vorm moet de bovenstaande copyright \\ n bericht, deze lijst van voorwaarden en de volgende disclaimer in de \\ n documentatie en / of andere materialen die bij de distributie. \\ N \\ n DEZE SOFTWARE WORDT DOOR DE AUTEUR `` AS IS''EN ENIGE EXPLICIETE OF \\ n STILZWIJGENDE GARANTIES, INCLUSIEF MAAR NIET BEPERKT TOT DE IMPLICIETE GARANTIES \\ n VAN VERHANDELBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD DOEL WORDEN GEWEZEN. \\ n IN GEEN GEVAL IS DE AUTEUR AANSPRAKELIJK VOOR ENIGE DIRECTE, INDIRECTE , \\ n INCIDENTELE, SPECIALE, MORELE OF GEVOLGSCHADE (INCLUSIEF, MAAR \\ n NIET BEPERKT TOT VERWERVING VAN VERVANGENDE GOEDEREN OF SERVICES; VERLIES VA N GEBRUIK \\ n GEGEVENS OF WINSTEN, OF ONDERBREKING VAN DE BEDRIJFSVOERING) OOK VEROORZAAKT EN OP ELKE \\ n THEORIE VAN AANSPRAKELIJKHEID, HETZIJ IN CONTRACT, STRIKTE AANSPRAKELIJKHEID OF ONRECHTMATIGE DAAD \\ n (WAARONDER NALATIGHEID OF ANDERS) OP ENIGE WIJZE VOORTVLOEIEND UIT HET GEBRUIK VAN \\ n DEZE SOFTWARE, ZELFS INDIEN IS GEWEZEN OP DE MOGELIJKHEID VAN DERGELIJKE SCHADE. \\ n #: ../libxfce4util/xfce-license.c:55 msgid @@ -61,9 +62,20 @@ msgid this program; if not, write to the Free Software Foundation, Inc., 51 Franklin\n Street, Fifth Floor, Boston, MA 02110-1301, USA.\n msgstr +Dit programma is gratis software, je kunt het verspreiden en/of wijzigen \n +onder de voorwaarden van de GNU General Public License zoals gepubliceerd door de Free Software Foundation; versie 2 van de Licentie, of (naar keuze) \n +een later versie. \n +\n +Dit programma wordt verspreid in de hoop dat het nuttig zal zijn, maar ZONDER \n +ENIGE GARANTIE; zonder zelfs de impliciete garantie van VERKOOPBAARHEID of \n +BRUIKBAARHEID VOOR EEN BEPAALD DOEL. Zie de GNU General Public License voor\n + meer details. \n + \n + U moet hierbij een kopie van de GNU General Public License ontvangen hebben samen met \n +Dit programma; zo niet, schrijf naar de Free Software Foundation, Inc., 51 Franklin\n +Street, Fifth Floor, Boston, MA 02110-1301, USA. \n #: ../libxfce4util/xfce-license.c:70 -#, fuzzy msgid This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Library General Public\n @@ -80,20 +92,28 @@ msgid Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, \n Boston, MA 02110-1301 USA.\n msgstr -Deze bibliotheek is vrije software, je kunt het verspreiden en/of\\aanpassen onder de voorwaarden van de GNU General Public \\ nLicense zoals gepubliceerd door de Free Software Foundation; ofwel \\ nversion 2 van de Licentie, of (naar keuze) een latere versie. \n +Deze bibliotheek is gratis software, je kunt het verspreiden en/of wijzigen \n +onder de voorwaarden van de GNU General Public License zoals gepubliceerd door de Free Software Foundation; versie 2 van de Licentie, of (naar keuze) \n +een later versie. \n \n - Dit bibliotheek wordt verspreid in de hoop dat het van nut zal zijn, \n -but ZONDER ENIGE GARANTIE; zonder zelfs de impliciete garantie van \\ nMERCHANTABILITY of GESCHIKTHEID VOOR EEN BEPAALD
[Xfce4-commits] xfce4-taskmanager:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 9e53a3d1a0a9a47d9ff273b310e86e465582a94a (commit) from 2a728386340bd54fa1a85eac7e98eb1789bb1ca2 (commit) commit 9e53a3d1a0a9a47d9ff273b310e86e465582a94a Author: Timo Verbeek timoverbee...@hotmail.com Date: Thu Jan 14 16:22:30 2010 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 39 +++ 1 files changed, 15 insertions(+), 24 deletions(-) diff --git a/po/nl.po b/po/nl.po index 37e4e39..fa71ee1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the xfce package. # Stephan Arts step...@xfce.org, 2007. # Vincent msn_vinc...@hotmail.com, 2008. -# +# msgid msgstr Project-Id-Version: xfce 4-taskmanager\n @@ -26,8 +26,7 @@ msgstr Controleer processen msgid Process manager msgstr Xfce4 Taakbeheerder -#: ../xfce4-taskmanager.desktop.in.h:3 -#: ../src/interface.c:46 +#: ../xfce4-taskmanager.desktop.in.h:3 ../src/interface.c:46 msgid Xfce4 Taskmanager msgstr Xfce4 Taakbeheerder @@ -51,50 +50,43 @@ msgstr %0.0f %% #: ../src/interface.c:61 msgid Cpu usage -msgstr Gebruik CPU +msgstr CPU Gebruik #: ../src/interface.c:69 msgid Memory usage -msgstr Gebruik geheugen +msgstr Geheugen Gebruik #: ../src/interface.c:136 msgid Command msgstr Commando -#: ../src/interface.c:143 -#: ../src/interface.c:347 +#: ../src/interface.c:143 ../src/interface.c:347 msgid PID msgstr PID -#: ../src/interface.c:149 -#: ../src/interface.c:348 +#: ../src/interface.c:149 ../src/interface.c:348 msgid PPID msgstr PPID -#: ../src/interface.c:155 -#: ../src/interface.c:349 +#: ../src/interface.c:155 ../src/interface.c:349 msgid State msgstr Status -#: ../src/interface.c:161 -#: ../src/interface.c:350 +#: ../src/interface.c:161 ../src/interface.c:350 msgid VM-Size -msgstr VSZ +msgstr Virtueel geheugen grootte -#: ../src/interface.c:167 -#: ../src/interface.c:351 +#: ../src/interface.c:167 ../src/interface.c:351 msgid RSS msgstr RSS -#: ../src/interface.c:173 -#: ../src/interface.c:352 +#: ../src/interface.c:173 ../src/interface.c:352 msgid User msgstr Gebruiker -#: ../src/interface.c:179 -#: ../src/interface.c:353 +#: ../src/interface.c:179 ../src/interface.c:353 msgid CPU% -msgstr CPU +msgstr CPU% #. my change #: ../src/interface.c:186 @@ -117,8 +109,7 @@ msgstr Stoppen msgid Kill msgstr Beëindigen -#: ../src/interface.c:223 -#: ../src/interface.c:354 +#: ../src/interface.c:223 ../src/interface.c:354 msgid Priority msgstr Prioriteit @@ -158,6 +149,6 @@ msgstr #~ msgid xfce4-taskmanager #~ msgstr xfce4-taakbeheer + #~ msgid more details #~ msgstr meer details - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master l10n: Updated Czech (cs) translation to 97%
Updating branch refs/heads/master to b7f6cc68267b8116484b05872c47b722efe095ec (commit) from a10597d90f4b63a56e0d1f14288d932f3c94dbe0 (commit) commit b7f6cc68267b8116484b05872c47b722efe095ec Author: Michal Várady miko.v...@gmail.com Date: Thu Jan 14 17:55:36 2010 +0100 l10n: Updated Czech (cs) translation to 97% New status: 178 messages complete with 0 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 195 +- 1 files changed, 91 insertions(+), 104 deletions(-) diff --git a/po/cs.po b/po/cs.po index 7657c2f..6f4e277 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,8 +1,9 @@ +# msgid msgstr Project-Id-Version: Parole\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-18 18:47+\n +POT-Creation-Date: 2010-01-14 12:06+0100\n PO-Revision-Date: \n Last-Translator: Michal Várady miko.v...@gmail.com\n Language-Team: Czech\n @@ -11,8 +12,8 @@ msgstr Content-Transfer-Encoding: 8bit\n Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n=2 n=4) ? 1 : 2;\n X-Poedit-Language: Czech\n -X-Poedit-Country: CZECH REPUBLIC\n X-Poedit-SourceCharset: ASCII\n +X-Poedit-Country: CZECH REPUBLIC\n #: ../data/interfaces/parole.ui.h:1 msgid 16:9 (Widescreen) @@ -39,89 +40,93 @@ msgid Chapter Menu msgstr Nabídka kapitoly #: ../data/interfaces/parole.ui.h:7 +msgid DVD +msgstr Disk DVD + +#: ../data/interfaces/parole.ui.h:8 msgid DVD Menu msgstr Nabídka disku DVD -#: ../data/interfaces/parole.ui.h:8 +#: ../data/interfaces/parole.ui.h:9 +msgid From ISO image +msgstr Z obrazu disku DVD + +#: ../data/interfaces/parole.ui.h:10 msgid Media player msgstr Přehrávač médií -#: ../data/interfaces/parole.ui.h:9 +#: ../data/interfaces/parole.ui.h:11 msgid Mute msgstr Ztlumit -#: ../data/interfaces/parole.ui.h:10 -#: ../src/parole-player.c:1102 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1198 #: ../src/parole-disc-menu.c:113 msgid Next Chapter msgstr Další kapitola -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:13 msgid None msgstr Žádný -#: ../data/interfaces/parole.ui.h:12 -#: ../data/desktop/parole.desktop.in.in.h:1 -#: ../src/parole-about.c:70 -#: ../plugins/window-title/window-title-provider.c:58 +#: ../data/interfaces/parole.ui.h:14 ../data/desktop/parole.desktop.in.in.h:1 +#: ../src/parole-about.c:70 ../plugins/window-title/window-title-provider.c:58 msgid Parole Media Player msgstr Přehrávač médií Parole -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:15 msgid Plugins msgstr Zásuvné moduly -#: ../data/interfaces/parole.ui.h:14 -#: ../src/parole-player.c:1114 +#: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1210 #: ../src/parole-disc-menu.c:114 msgid Previous Chapter msgstr Předchozí kapitola -#: ../data/interfaces/parole.ui.h:15 +#: ../data/interfaces/parole.ui.h:17 msgid Repeat msgstr Opakovat -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:18 msgid Select Track msgstr Vybrat stopu -#: ../data/interfaces/parole.ui.h:17 +#: ../data/interfaces/parole.ui.h:19 msgid Shuffle msgstr Náhodně -#: ../data/interfaces/parole.ui.h:18 +#: ../data/interfaces/parole.ui.h:20 msgid Sound msgstr Zvuk -#: ../data/interfaces/parole.ui.h:19 +#: ../data/interfaces/parole.ui.h:21 msgid Square msgstr Čtverec -#: ../data/interfaces/parole.ui.h:20 +#: ../data/interfaces/parole.ui.h:22 msgid Volume Down msgstr Snížit hlasitost -#: ../data/interfaces/parole.ui.h:21 +#: ../data/interfaces/parole.ui.h:23 msgid Volume Up msgstr Zvýšit hlasitost -#: ../data/interfaces/parole.ui.h:22 +#: ../data/interfaces/parole.ui.h:24 msgid _Edit msgstr _Upravit -#: ../data/interfaces/parole.ui.h:23 +#: ../data/interfaces/parole.ui.h:25 msgid _Help msgstr _Nápověda -#: ../data/interfaces/parole.ui.h:24 +#: ../data/interfaces/parole.ui.h:26 msgid _Media msgstr _Média -#: ../data/interfaces/parole.ui.h:25 +#: ../data/interfaces/parole.ui.h:27 msgid _Open location msgstr _Otevřít umístění -#: ../data/interfaces/parole.ui.h:26 +#: ../data/interfaces/parole.ui.h:28 msgid _View msgstr _Zobrazit @@ -226,22 +231,26 @@ msgid Visualization type: msgstr Typ vizualizace: #: ../data/interfaces/save-playlist.ui.h:1 +msgid By Extension +msgstr + +#: ../data/interfaces/save-playlist.ui.h:2 msgid Select File Types (By Extension) msgstr Vybrat typy souborů (podle přípony) -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1511 msgid The stream is taking too much time to load msgstr Načtení datového proudu trvá příliš dlouho -#: ../gst/parole-gst.c:1494 +#: ../gst/parole-gst.c:1511 msgid Stop msgstr Zastavit -#: ../gst/parole-gst.c:1683 +#: ../gst/parole-gst.c:1700 msgid Unable to load playbin GStreamer plugin, check your GStreamer installation msgstr Nelze zavést zásuvný modul GStreamer playbin, zkontrolujte stav instalace aplikace
[Xfce4-commits] parole:master l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to e91a7c511074f207067d0d6f3609f014bef984cc (commit) from b7f6cc68267b8116484b05872c47b722efe095ec (commit) commit e91a7c511074f207067d0d6f3609f014bef984cc Author: Michal Várady miko.v...@gmail.com Date: Thu Jan 14 17:57:29 2010 +0100 l10n: Updated Czech (cs) translation to 100% New status: 182 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/cs.po b/po/cs.po index 6f4e277..2b667e2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -232,7 +232,7 @@ msgstr Typ vizualizace: #: ../data/interfaces/save-playlist.ui.h:1 msgid By Extension -msgstr +msgstr Podle přípony #: ../data/interfaces/save-playlist.ui.h:2 msgid Select File Types (By Extension) @@ -402,15 +402,15 @@ msgstr Zobrazit seznam médií #: ../src/parole-player.c:375 msgid Open ISO image -msgstr +msgstr Otevřít obraz ISO #: ../src/parole-player.c:392 msgid CD image -msgstr +msgstr Obraz disku CD #: ../src/parole-player.c:392 msgid DVD image -msgstr +msgstr Obraz disku DVD #: ../src/parole-player.c:643 #: ../browser-plugin/media-plugin/parole-plugin-player.c:300 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-dict:master l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to bd24734bf3ef7523900c47a2558b9d28ea35eedb (commit) from 114077340f6380fce6f6439622e22826ad6662fb (commit) commit bd24734bf3ef7523900c47a2558b9d28ea35eedb Author: Michal Várady miko.v...@gmail.com Date: Thu Jan 14 17:59:11 2010 +0100 l10n: Updated Czech (cs) translation to 100% New status: 109 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 100 + 1 files changed, 48 insertions(+), 52 deletions(-) diff --git a/po/cs.po b/po/cs.po index 6b0087a..75be654 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,12 +2,12 @@ # Copyright (C) 2006-2007 Enrico Tröger # This file is distributed under the same license as the xfce4-dict-plugin package. # Michal Várady miko.v...@gmail.com, 2006-2010. -# +# msgid msgstr Project-Id-Version: xfce4-dict 0.5.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-30 14:17+0100\n +POT-Creation-Date: 2010-01-14 12:01+0100\n PO-Revision-Date: 2010-01-04 18:30+0100\n Last-Translator: Michal Várady miko.v...@gmail.com\n Language-Team: Czech xfce-i...@xfce.org\n @@ -21,17 +21,13 @@ msgid A plugin to query different dictionaries. msgstr Zásuvný modul pro získávání dat za slovníků. #: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2 -#: ../src/xfce4-dict.desktop.in.h:2 -#: ../lib/gui.c:627 -#: ../lib/prefs.c:270 +#: ../src/xfce4-dict.desktop.in.h:2 ../lib/gui.c:627 ../lib/prefs.c:270 msgid Dictionary msgstr Slovník #: ../panel-plugin/xfce4-dict-plugin.c:346 -#: ../panel-plugin/xfce4-dict-plugin.c:472 -#: ../src/xfce4-dict.c:204 -#: ../lib/spell.c:243 -#: ../lib/gui.c:411 +#: ../panel-plugin/xfce4-dict-plugin.c:472 ../src/xfce4-dict.c:204 +#: ../lib/spell.c:243 ../lib/gui.c:411 msgid Ready msgstr Připraven @@ -39,8 +35,7 @@ msgstr Připraven msgid Look up a word msgstr Vyhledat slovo -#: ../panel-plugin/xfce4-dict-plugin.c:443 -#: ../lib/gui.c:651 +#: ../panel-plugin/xfce4-dict-plugin.c:443 ../lib/gui.c:651 msgid Search term msgstr Hledat pojem @@ -85,8 +80,7 @@ msgstr [TEXT] msgid Please report bugs to %s. msgstr Prosíme, abyste chyby hlásili na adresu %s. -#: ../src/xfce4-dict.desktop.in.h:1 -#: ../lib/gui.c:847 +#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:847 msgid A client program to query different dictionaries. msgstr Klientský program pro získávání dat z různých slovníků. @@ -132,8 +126,7 @@ msgstr Chyba při spouštění „%s“ (%s). msgid Please set the spell check command in the preferences dialog. msgstr Nastavte příkaz pro kontrolu pravopisu v dialogovém okně Předvolby. -#: ../lib/spell.c:208 -#: ../lib/common.c:224 +#: ../lib/spell.c:208 ../lib/common.c:224 msgid Invalid input msgstr Neplatný vstup @@ -142,8 +135,7 @@ msgstr Neplatný vstup msgid Process failed (%s) msgstr Proces skončil chybou (%s) -#: ../lib/speedreader.c:80 -#: ../lib/speedreader.c:664 +#: ../lib/speedreader.c:80 ../lib/speedreader.c:665 msgid P_ause msgstr Po_zastavit @@ -167,16 +159,16 @@ msgstr Rychločtení msgid You must enter a text. msgstr Zadejte text. -#: ../lib/speedreader.c:505 +#: ../lib/speedreader.c:506 msgid Choose a file to load msgstr Zvolte soubor pro načtení -#: ../lib/speedreader.c:534 +#: ../lib/speedreader.c:535 #, c-format msgid The file '%s' could not be loaded. msgstr Soubor '%s' nelze načíst. -#: ../lib/speedreader.c:552 +#: ../lib/speedreader.c:553 #, c-format msgid (display %d word at a time) msgid_plural (display %d words at a time) @@ -184,27 +176,27 @@ msgstr[0] (zobrazit %d slovo najednou) msgstr[1] (zobrazit %d slova najednou) msgstr[2] (zobrazit %d slov najednou) -#: ../lib/speedreader.c:577 +#: ../lib/speedreader.c:578 msgid This is an easy speed reading utility to help train you to read faster. It does this by flashing words at a rapid rate on the screen. msgstr Toto je jednoduchý nástroj pro rychločtení, který vám pomůže se cvičením rychlého čtení. Pracuje na principu rychle se zobrazujících slov na obrazovce. -#: ../lib/speedreader.c:580 +#: ../lib/speedreader.c:581 msgid _Words per Minute: msgstr _Slov za minutu: -#: ../lib/speedreader.c:586 +#: ../lib/speedreader.c:587 msgid _Mark Paragraphs msgstr _Označovat odstavce -#: ../lib/speedreader.c:593 +#: ../lib/speedreader.c:594 msgid Word _Grouping: msgstr Ses_kupování slov: -#: ../lib/speedreader.c:609 +#: ../lib/speedreader.c:610 msgid _Font Size: msgstr _Velikost písma: -#: ../lib/speedreader.c:629 +#: ../lib/speedreader.c:630 msgid Enter some text here you would like to read.\n \n @@ -214,15 +206,15 @@ msgstr \n Uvolněte se, pohodlně se usaďte a poté stiksněte tlačítko Start pro spuštění rychločtení. -#: ../lib/speedreader.c:645 +#: ../lib/speedreader.c:646 msgid Load the contents of a file msgstr Načíst obsah ze souboru -#: ../lib/speedreader.c:653 +#: ../lib/speedreader.c:654 msgid Clear the contents
[Xfce4-commits] midori:master l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to d85d2806beab79cb8030dca507667d0669bf8570 (commit) from cb1616bdf2bbba80e132c4073e5f1cdf1a87a3cc (commit) commit d85d2806beab79cb8030dca507667d0669bf8570 Author: Michal Várady miko.v...@gmail.com Date: Thu Jan 14 18:04:37 2010 +0100 l10n: Updated Czech (cs) translation to 100% New status: 571 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 377 +- 1 files changed, 176 insertions(+), 201 deletions(-) diff --git a/po/cs.po b/po/cs.po index 231ded5..37e2d5f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,12 +2,12 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the home package. # David Stancl dsta...@dstancl.cz 2009 -# +# msgid msgstr Project-Id-Version: midori 0.2.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-01-08 08:29+0100\n +POT-Creation-Date: 2010-01-14 18:00+0100\n PO-Revision-Date: 2010-01-08 08:31+0100\n Last-Translator: David Štancl dsta...@dstancl.cz\n Language-Team: Czech \n @@ -22,8 +22,8 @@ msgstr msgid Lightweight web browser msgstr Odlehčený prohlížeč -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1577 ../midori/main.c:1779 -#: ../midori/main.c:1787 ../midori/main.c:1798 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1538 ../midori/main.c:1743 +#: ../midori/main.c:1751 ../midori/main.c:1762 #: ../midori/midori-websettings.c:296 msgid Midori msgstr Midori @@ -47,13 +47,13 @@ msgstr Hodnota '%s' je pro %s špatná msgid Invalid configuration value '%s' msgstr Nesprávná hodnota '%s' v konfiguraci -#: ../midori/main.c:377 ../extensions/formhistory.c:436 +#: ../midori/main.c:377 ../extensions/formhistory.c:437 #, c-format msgid Failed to open database: %s\n msgstr Nepodařilo se otevřít databázi: %s\n -#: ../midori/main.c:409 ../extensions/formhistory.c:451 -#: ../extensions/formhistory.c:455 +#: ../midori/main.c:409 ../extensions/formhistory.c:452 +#: ../extensions/formhistory.c:456 #, c-format msgid Failed to execute database statement: %s\n msgstr Nepodařilo se spustit databázový příkaz: %s\n @@ -84,160 +84,156 @@ msgid Failed to add history item: %s\n msgstr Nepodařilo se přidat položku do historie: %s\n #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:739 +#: ../midori/main.c:700 #, c-format msgid Failed to remove old history items: %s\n msgstr Nepodařilo se odstranit staré položky historie: %s\n -#: ../midori/main.c:768 +#: ../midori/main.c:729 #, c-format msgid The configuration couldn't be saved. %s msgstr Konfigurace nemůže být uložena. %s -#: ../midori/main.c:806 +#: ../midori/main.c:767 #, c-format msgid The search engines couldn't be saved. %s msgstr Vyhledávací nástroj nemůže být uložen. %s -#: ../midori/main.c:825 ../midori/main.c:875 ../midori/main.c:895 +#: ../midori/main.c:786 ../midori/main.c:836 ../midori/main.c:856 #, c-format msgid The bookmarks couldn't be saved. %s msgstr Záložky nemohou být uloženy. %s #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:925 ../midori/main.c:948 +#: ../midori/main.c:886 ../midori/main.c:909 #, c-format msgid The trash couldn't be saved. %s msgstr Seznam zavřených karet nemůže být uložen. %s -#: ../midori/main.c:1012 ../midori/main.c:1215 +#: ../midori/main.c:973 ../midori/main.c:1176 #, c-format msgid The session couldn't be saved. %s msgstr Sezení nemůže být uloženo. %s -#: ../midori/main.c:1249 -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. -msgstr -Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává -opakovaně, pro odstranění problému zkuste následující možnosti. +#: ../midori/main.c:1210 +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. +msgstr Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává opakovaně, pro odstranění problému zkuste následující možnosti. -#: ../midori/main.c:1264 +#: ../midori/main.c:1225 msgid Modify _preferences msgstr Změnit _nastavení -#: ../midori/main.c:1268 +#: ../midori/main.c:1229 msgid Reset the last _session msgstr Vymazat poslední _sezení -#: ../midori/main.c:1273 +#: ../midori/main.c:1234 msgid Disable all _extensions msgstr Zakázat všechna _rozšíření -#: ../midori/main.c:1481 ../midori/main.c:2013 +#: ../midori/main.c:1442 ../midori/main.c:1977 #, c-format msgid The session couldn't be loaded: %s\n msgstr Sezení nemůže být načteno: %s\n -#: ../midori/main.c:1577 +#: ../midori/main.c:1538 msgid No filename specified msgstr Nebyl zadán název souboru -#: ../midori/main.c:1600 +#: ../midori/main.c:1561 msgid An unknown error occured. msgstr Nastala
[Xfce4-commits] gigolo:master l10n: Overwrite wrong commit.
Updating branch refs/heads/master to 055d6bef5ce3dc42f1bf8dfb6a9012004303915a (commit) from 6e58a33843be42a7513b37040aa2d28f5ae2c03e (commit) commit 055d6bef5ce3dc42f1bf8dfb6a9012004303915a Author: Nick Schermer n...@xfce.org Date: Thu Jan 14 19:39:57 2010 +0100 l10n: Overwrite wrong commit. New status: 122 messages complete with 8 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 376 +++--- 1 files changed, 190 insertions(+), 186 deletions(-) diff --git a/po/cs.po b/po/cs.po index 28c7113..3ce5511 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,50 +1,49 @@ -# Danish translation of Gigolo +# Czech translation of Gigolo. # Copyright (C) 2008-2009 Enrico Tröger -# This file is distributed under the same license as the Gigolo package. -# Per Kongstad p_kongs...@op.pl, 2009. +# This file is distributed under the same license as Gigolo. +# Jan Hrdina jan.hr...@gmail.com, 2009. +# # msgid msgstr -Project-Id-Version: gigolo 0.3.2\n +Project-Id-Version: gigolo 0.3.1\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2009-12-14 19:41+0100\n -PO-Revision-Date: 2009-12-14 22:21+0100\n -Last-Translator: Per Kongstad p_kongs...@op.pl\n -Language-Team: Danish da...@dansk-gruppen.dk\n +PO-Revision-Date: 2009-06-07 17:25+0100\n +Last-Translator: Michal Várady miko.v...@gmail.com\n +Language-Team: Czech c...@li.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Poedit-Language: Danish\n -X-Poedit-Country: DENMARK\n -X-Poedit-SourceCharset: utf-8\n #: ../src/main.c:46 msgid Ignore running instances, enforce opening a new instance -msgstr Ignorér kørende instanser, gennemtving åbning af ny instans +msgstr Ignorovat spuštěné instance, vynutit otevření nové instance #: ../src/main.c:47 msgid Print a list of supported URI schemes -msgstr Udskriv en liste med understøttede URI-skemaer +msgstr Vypsat seznam podporovaných schémat URI #: ../src/main.c:48 msgid Be verbose -msgstr Vær uddybende +msgstr Podrobné informace #: ../src/main.c:49 msgid Show version information -msgstr Vis versionsinformation +msgstr Zobrazit informace o verzi #: ../src/main.c:80 msgid - a simple frontend to easily connect to remote filesystems -msgstr - en simpel grænseflade til nemt at forbinde til eksterne filsystemer +msgstr +- jednoduché rozhraní pro snadné připojení ke vzdáleným systémům souborů #: ../src/common.c:77 msgid Unix Device -msgstr Unix-enhed +msgstr Zařízení Unixu #: ../src/common.c:79 msgid Windows Share -msgstr Windowsdeling +msgstr Sdílená složka Windows #: ../src/common.c:81 msgid FTP @@ -68,214 +67,210 @@ msgstr WebDAV #: ../src/common.c:91 msgid WebDAV (secure) -msgstr WebDAV (sikker) +msgstr WebDAV (zabezpečený) -#: ../src/common.c:93 -#: ../src/window.c:1352 +#: ../src/common.c:93 ../src/window.c:1352 msgid Network -msgstr Netværk +msgstr Síť #: ../src/common.c:95 msgid Archive -msgstr Arkiv +msgstr #: ../src/common.c:97 +#, fuzzy msgid Photos -msgstr Billeder +msgstr Port #: ../src/common.c:99 msgid Custom Location -msgstr Tilpasset sted +msgstr Vlastní umístění #: ../src/window.c:253 #, c-format msgid Connecting to \%s\ -msgstr Forbinder til \%s\ +msgstr Připojování k \%s\ -#: ../src/window.c:421 -#: ../gigolo.desktop.in.h:1 +#: ../src/window.c:421 ../gigolo.desktop.in.h:1 msgid A simple frontend to easily connect to remote filesystems -msgstr En simpel grænseflade til nemt at forbinde til eksterne filsystemer +msgstr Jednoduché rozhraní pro snadné připojení ke vzdáleným systémům souborů #: ../src/window.c:422 msgid Copyright 2008-2009 Enrico Tröger -msgstr Ophavsret 2008-2009 Enrico Tröger +msgstr Copyright 2008-2009 Enrico Tröger #: ../src/window.c:425 msgid translator-credits -msgstr -Per Kongstad\n -\n -Dansk-gruppen da...@dansk-gruppen.dk\n -Mere info: http://www.dansk-gruppen.dk; +msgstr Jan Hrdina jan.hr...@gmail.comMichal Várady miko.v...@gmail.com #: ../src/window.c:457 msgid Gigolo can use the following protocols provided by GVfs: -msgstr Gigolo kan bruge følgende protokoller gennem GVFs: - -#: ../src/window.c:671 -#: ../src/bookmarkeditdialog.c:214 -#: ../src/bookmarkeditdialog.c:233 -#: ../src/bookmarkeditdialog.c:246 -#: ../src/bookmarkeditdialog.c:257 -#: ../src/bookmarkeditdialog.c:268 +msgstr +Aplikace Gigolo může používat následující protokoly poskytované systémem +souborů GVfs: + +#: ../src/window.c:671 ../src/bookmarkeditdialog.c:214 +#: ../src/bookmarkeditdialog.c:233 ../src/bookmarkeditdialog.c:246 +#: ../src/bookmarkeditdialog.c:257 ../src/bookmarkeditdialog.c:268 msgid Error -msgstr Fejl +msgstr Chyba #: ../src/window.c:1138 msgid _File -msgstr _Fil +msgstr _Soubor #: ../src/window.c:1139 msgid _Edit -msgstr _Redigér +msgstr _Upravit #: ../src/window.c:1140 msgid _Actions -msgstr H_andlinger +msgstr _Akce #:
[Xfce4-commits] xfce4-settings:jeromeg/settings-editor Make the UI consistent with xfconf-query.
Updating branch refs/heads/jeromeg/settings-editor to 94fc1d757e87f960a9cff6533d68909e05bb5275 (commit) from 165525f8b63545ae313a822cb805843342fcbf98 (commit) commit 94fc1d757e87f960a9cff6533d68909e05bb5275 Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Jan 14 19:59:27 2010 +0100 Make the UI consistent with xfconf-query. Use Reset instead of Reset/remove and Remove/reset. xfce4-settings-editor/main_window.c |6 +++--- xfce4-settings-editor/xfce4-settings-editor.glade |2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xfce4-settings-editor/main_window.c b/xfce4-settings-editor/main_window.c index 882e7a0..914c2bc 100644 --- a/xfce4-settings-editor/main_window.c +++ b/xfce4-settings-editor/main_window.c @@ -930,8 +930,8 @@ cb_property_revert_button_clicked (GtkButton *button, GtkBuilder *builder) response = xfce_dialog_confirm (GTK_WINDOW (gtk_builder_get_object (builder, main_window)), GTK_STOCK_YES, _(Reset), -_(Resetting a channel will permanently remove those custom settings.), -_(Are you sure you want to reset channel \%s\ and all its properties?), +_(Resetting a property will permanently remove those custom settings.), +_(Are you sure you want to reset property \%s\?), current_property); if (response) @@ -1043,7 +1043,7 @@ channel_treeview_popup_menu (GtkWidget *widget, GdkEventButton *event, GtkBuilde menu = gtk_menu_new (); g_signal_connect (menu, deactivate, G_CALLBACK (gtk_menu_popdown), NULL); -menu_item = gtk_image_menu_item_new_with_mnemonic (_(_Remove/reset)); +menu_item = gtk_image_menu_item_new_with_mnemonic (_(_Reset)); image = gtk_image_new_from_stock (gtk-remove, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); diff --git a/xfce4-settings-editor/xfce4-settings-editor.glade b/xfce4-settings-editor/xfce4-settings-editor.glade index 5853146..0cdd942 100644 --- a/xfce4-settings-editor/xfce4-settings-editor.glade +++ b/xfce4-settings-editor/xfce4-settings-editor.glade @@ -317,7 +317,7 @@ child object class=GtkToolButton id=property_revert_button property name=visibleTrue/property -property name=tooltip_text translatable=yesReset/remove property/property +property name=tooltip_text translatable=yesReset property/property property name=stock_idgtk-revert-to-saved/property /object packing ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:jeromeg/settings-editor Respect HIG for reset dialogs.
Updating branch refs/heads/jeromeg/settings-editor to 165525f8b63545ae313a822cb805843342fcbf98 (commit) from 9114e1d7a32108a0ad705b703dcb62e3b4d08186 (commit) commit 165525f8b63545ae313a822cb805843342fcbf98 Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Jan 14 19:55:55 2010 +0100 Respect HIG for reset dialogs. Use Reset for the confirm button and improve the description of the dialogs. xfce4-settings-editor/main_window.c | 40 +- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/xfce4-settings-editor/main_window.c b/xfce4-settings-editor/main_window.c index 8f3afc0..882e7a0 100644 --- a/xfce4-settings-editor/main_window.c +++ b/xfce4-settings-editor/main_window.c @@ -925,21 +925,17 @@ cb_property_edit_button_clicked (GtkButton *button, GtkBuilder *builder) static void cb_property_revert_button_clicked (GtkButton *button, GtkBuilder *builder) { -GtkWidget *dialog; +gboolean response; -dialog = gtk_message_dialog_new_with_markup ( - GTK_WINDOW (gtk_builder_get_object (builder, main_window)), - 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, - _(Are you sure you want to reset property \b%s/b\?), - current_property); +response = xfce_dialog_confirm (GTK_WINDOW (gtk_builder_get_object (builder, main_window)), +GTK_STOCK_YES, +_(Reset), +_(Resetting a channel will permanently remove those custom settings.), +_(Are you sure you want to reset channel \%s\ and all its properties?), +current_property); -if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_YES) -{ -gtk_widget_hide (dialog); +if (response) xfconf_channel_reset_property (current_channel, current_property, FALSE); -} - -gtk_widget_destroy (dialog); } static void @@ -1073,20 +1069,24 @@ channel_treeview_popup_menu (GtkWidget *widget, GdkEventButton *event, GtkBuilde static void cb_channel_popup_menu_remove_item_activate (GtkMenuItem *item, GtkBuilder *builder) { -GtkWidget *dialog; +gboolean response; +gchar *channel_name; + +g_object_get (G_OBJECT (current_channel), channel-name, channel_name, NULL); -dialog = gtk_message_dialog_new_with_markup ( - GTK_WINDOW (gtk_builder_get_object (builder, main_window)), - 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, - _(Are you sure you want to reset this channel and all its properties?)); +response = xfce_dialog_confirm (GTK_WINDOW (gtk_builder_get_object (builder, main_window)), +GTK_STOCK_YES, +_(Reset), +_(Resetting a channel will permanently remove those custom settings.), +_(Are you sure you want to reset channel \%s\ and all its properties?), +channel_name); -if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_YES) +if (response) { GObject *channel_treeview; GObject *property_treeview; GtkTreeModel *tree_store = NULL; -gtk_widget_hide (dialog); channel_treeview = gtk_builder_get_object (builder, channel_treeview); tree_store = gtk_tree_view_get_model (GTK_TREE_VIEW (channel_treeview)); xfconf_channel_reset_property (current_channel, /, TRUE); @@ -1101,5 +1101,5 @@ cb_channel_popup_menu_remove_item_activate (GtkMenuItem *item, GtkBuilder *build load_properties (current_channel, GTK_TREE_STORE (tree_store), GTK_TREE_VIEW (property_treeview)); } -gtk_widget_destroy (dialog); +g_free (channel_name); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:jeromeg/settings-editor Set the edit button insensitive for arrays.
Updating branch refs/heads/jeromeg/settings-editor to aaa49010d28180a9f8e5e59ec2a1d965051e9b44 (commit) from 94fc1d757e87f960a9cff6533d68909e05bb5275 (commit) commit aaa49010d28180a9f8e5e59ec2a1d965051e9b44 Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Jan 14 20:11:40 2010 +0100 Set the edit button insensitive for arrays. xfce4-settings-editor/main_window.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xfce4-settings-editor/main_window.c b/xfce4-settings-editor/main_window.c index 914c2bc..57b9a57 100644 --- a/xfce4-settings-editor/main_window.c +++ b/xfce4-settings-editor/main_window.c @@ -527,6 +527,7 @@ cb_property_treeview_selection_changed (GtkTreeSelection *selection, GtkBuilder GObject *property_revert_button; GValue value = {0, }; gchar *prop_name = NULL; +const gchar *prop_type; gchar *temp = NULL; property_edit_button = gtk_builder_get_object (builder, property_edit_button); @@ -578,7 +579,9 @@ cb_property_treeview_selection_changed (GtkTreeSelection *selection, GtkBuilder gtk_tree_selection_get_selected (selection, model, iter); gtk_tree_model_get_value (model, iter, 1, value); -if (g_strcmp0 (g_value_get_string (value), Empty) == 0) +prop_type = g_value_get_string (value); + +if ((g_strcmp0 (prop_type, Empty) == 0) || g_strcmp0 (prop_type, GPtrArray_GValue_) == 0) gtk_widget_set_sensitive (GTK_WIDGET (property_edit_button), FALSE); g_value_unset (value); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:master l10n: Dutch one
Updating branch refs/heads/master to 91383d77e92ad6b9d73296921528c4a081272555 (commit) from b32e566d4c4d59793bfeecde1b6d467e817e3555 (commit) commit 91383d77e92ad6b9d73296921528c4a081272555 Author: Timo Verbeek timoverbee...@hotmail.com Date: Thu Jan 14 20:51:26 2010 +0100 l10n: Dutch one New status: 4 messages complete with 0 fuzzies and 26 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/{en_GB.po = nl.po} |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/en_GB.po b/po/nl.po similarity index 98% copy from po/en_GB.po copy to po/nl.po index 8270bf7..b97a603 100644 --- a/po/en_GB.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: libxfce4ui\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-18 15:10+0100\n +POT-Creation-Date: 2010-01-14 18:03+0100\n PO-Revision-Date: 2008-05-10 13:16+1000\n Last-Translator: Jeff Bailes thepizzak...@gmail.com\n Language-Team: English/GB\n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:master l10n: Updated Dutch (Flemish) (nl) translation to 96%
Updating branch refs/heads/master to 95af69848bb5995b170166c910e583024bfe2334 (commit) from 91383d77e92ad6b9d73296921528c4a081272555 (commit) commit 95af69848bb5995b170166c910e583024bfe2334 Author: Timo Verbeek timoverbee...@hotmail.com Date: Thu Jan 14 21:33:27 2010 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 96% New status: 29 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 73 - 1 files changed, 34 insertions(+), 39 deletions(-) diff --git a/po/nl.po b/po/nl.po index b97a603..612caa4 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR em...@address, YEAR. -# +# msgid msgstr Project-Id-Version: libxfce4ui\n @@ -20,12 +20,12 @@ msgstr #. run dialog #: ../libxfce4ui/xfce-dialogs.c:71 msgid Information -msgstr Information +msgstr Informatie #. run dialog #: ../libxfce4ui/xfce-dialogs.c:107 msgid Warning -msgstr Warning +msgstr Waarschuwing #. run dialog #: ../libxfce4ui/xfce-dialogs.c:144 @@ -35,43 +35,41 @@ msgstr Error #. run dialog #: ../libxfce4ui/xfce-dialogs.c:198 msgid Question -msgstr Question +msgstr Vraag #: ../libxfce4ui/xfce-sm-client.c:1394 msgid Session management client ID -msgstr +msgstr Session management client-ID #: ../libxfce4ui/xfce-sm-client.c:1394 msgid ID -msgstr +msgstr ID #: ../libxfce4ui/xfce-sm-client.c:1395 msgid Disable session management -msgstr +msgstr Schakel sessie management uit #: ../libxfce4ui/xfce-sm-client.c:1405 msgid Session management options -msgstr +msgstr Sessie management opties #: ../libxfce4ui/xfce-sm-client.c:1406 msgid Show session management options -msgstr +msgstr Toon sessie beheer opties #: ../libxfce4ui/xfce-sm-client.c:1582 #, c-format msgid Failed to connect to the session manager: %s -msgstr +msgstr Mislukt om verbinding te maken met de sessie manager:%s #: ../libxfce4ui/xfce-sm-client.c:1589 #, c-format msgid Session manager did not return a valid client id -msgstr +msgstr Session Manager kwam niet van een geldige client id terug #: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid -This shortcut is already being used for another window manager action. Which -action do you want to use? -msgstr +msgid This shortcut is already being used for another window manager action. Which action do you want to use? +msgstr Deze snelkoppeling wordt al gebruikt voor een andere window manager actie. Welke actie wilt u gebruiken? #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #: ../libxfce4kbd-private/xfce-shortcuts.c:56 @@ -79,82 +77,79 @@ msgstr #: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format msgid Use '%s' -msgstr +msgstr Gebruik '%s' #: ../libxfce4kbd-private/xfce-shortcuts.c:53 msgid Keep the other one -msgstr +msgstr Houd de andere #: ../libxfce4kbd-private/xfce-shortcuts.c:55 #: ../libxfce4kbd-private/xfce-shortcuts.c:58 #, c-format -msgid -This shortcut is already being used for the command '%s'. Which action do -you want to use? -msgstr +msgid This shortcut is already being used for the command '%s'. Which action do you want to use? +msgstr Deze snelkoppeling wordt al gebruikt voor het commando '%s'. Welke actie wilt u gebruiken? #: ../libxfce4kbd-private/xfce-shortcuts.c:56 #: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid Keep '%s' -msgstr +msgstr Houd '%s' #: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid -This shortcut is already being used by a window manager action. Which action -do you want to use? -msgstr +msgid This shortcut is already being used by a window manager action. Which action do you want to use? +msgstr Deze snelkoppeling wordt reeds gebruikt door een window manager actie. Welke actie wilt u gebruiken? #: ../libxfce4kbd-private/xfce-shortcuts.c:62 msgid Keep the window manager action -msgstr +msgstr Houd de window manager actie #: ../libxfce4kbd-private/xfce-shortcuts.c:95 #, c-format msgid Conflicting actions for %s -msgstr +msgstr Tegenstrijdige acties voor %s #: ../libxfce4kbd-private/xfce-shortcuts.c:128 msgid This shortcut is already being used for something else. -msgstr +msgstr Deze snelkoppeling wordt al gebruikt voor iets anders. #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 msgid Window Manager Action Shortcut -msgstr +msgstr Window Manager Actie Snelkoppeling #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 msgid Action: -msgstr +msgstr Actie: #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 msgid Command Shortcut -msgstr +msgstr Commando Snelkoppeling #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 msgid Command: -msgstr +msgstr Commando: #:
[Xfce4-commits] xfce4-sensors-plugin:master l10n: Dutch
Updating branch refs/heads/master to b1b8037f7a7522ccca30be1a336f87c67bdcc196 (commit) from ebcecf5b1f9d42016749be0b33d2b3ecc964f624 (commit) commit b1b8037f7a7522ccca30be1a336f87c67bdcc196 Author: Timo Verbeek timoverbee...@hotmail.com Date: Thu Jan 14 21:38:37 2010 +0100 l10n: Dutch New status: 64 messages complete with 1 fuzzy and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/{en_GB.po = nl.po} |0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/po/en_GB.po b/po/nl.po similarity index 100% copy from po/en_GB.po copy to po/nl.po ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.2.2 Add 'Since 0.2' in parole-file for gtk doc markup.
Updating branch refs/heads/0.2.2 to 7af5a0d21f2c9c68652984bc2965eaa5f6a29cb5 (commit) from 8995695a6ae7bec33de24a271b637e2451acd3e1 (commit) commit 7af5a0d21f2c9c68652984bc2965eaa5f6a29cb5 Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 10:28:22 2010 +0100 Add 'Since 0.2' in parole-file for gtk doc markup. parole/parole-file.c | 20 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/parole/parole-file.c b/parole/parole-file.c index 00b1bec..472a01a 100644 --- a/parole/parole-file.c +++ b/parole/parole-file.c @@ -312,6 +312,8 @@ parole_file_init (ParoleFile *file) * * * Returns: A new #ParoleFile object. + * + * Since: 0.2 **/ ParoleFile * parole_file_new (const gchar *filename) @@ -321,6 +323,16 @@ parole_file_new (const gchar *filename) return file; } +/** + * parole_file_new_with_display_name: + * @filename: filename. + * + * + * + * Returns: A new #ParoleFile object. + * + * Since: 0.2 + **/ ParoleFile * parole_file_new_with_display_name (const gchar *filename, const gchar *display_name) { @@ -338,6 +350,8 @@ parole_file_new_with_display_name (const gchar *filename, const gchar *display_n * * * Returns: A string containing the file name. + * + * Since: 0.2 **/ const gchar * parole_file_get_file_name (const ParoleFile *file) @@ -353,6 +367,8 @@ parole_file_get_file_name (const ParoleFile *file) * * * Returns: A string containing the display name. + * + * Since: 0.2 **/ const gchar * parole_file_get_display_name (const ParoleFile *file) @@ -368,6 +384,8 @@ parole_file_get_display_name (const ParoleFile *file) * * * Returns: A string containing the file uri. + * + * Since: 0.2 **/ const gchar * parole_file_get_uri (const ParoleFile *file) @@ -383,6 +401,8 @@ parole_file_get_uri (const ParoleFile *file) * * * Returns: A string containing the content type of the file. + * + * Since: 0.2 **/ const gchar * parole_file_get_content_type (const ParoleFile *file) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.2.2 parole --device=/dev/cdrom is now enough to play media on that device. in thunar-volman the command should be parole --device=%d and Parole will handle the rest.
Updating branch refs/heads/0.2.2 to 8995695a6ae7bec33de24a271b637e2451acd3e1 (commit) from 4568822db02335517d685604e66323636018c14f (commit) commit 8995695a6ae7bec33de24a271b637e2451acd3e1 Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 15:15:17 2010 +0100 parole --device=/dev/cdrom is now enough to play media on that device. in thunar-volman the command should be parole --device=%d and Parole will handle the rest. src/main.c | 20 ++- src/parole-player.c | 14 - src/parole-utils.c | 177 +++ src/parole-utils.h |8 ++- 4 files changed, 216 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index ec74bb0..51bab94 100644 --- a/src/main.c +++ b/src/main.c @@ -72,14 +72,26 @@ parole_send_play_disc (const gchar *uri, const gchar *device) { DBusGProxy *proxy; GError *error = NULL; +gchar *uri_local; + +if ( uri ) +{ + uri_local = g_strdup (uri); +} +else +{ + uri_local = parole_get_uri_from_unix_device (device); +} proxy = parole_get_proxy (PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE); dbus_g_proxy_call (proxy, PlayDisc, error, - G_TYPE_STRING, uri, + G_TYPE_STRING, uri_local, G_TYPE_STRING, device, G_TYPE_INVALID, G_TYPE_INVALID); + +g_free (uri_local); if ( error ) { @@ -264,6 +276,8 @@ int main (int argc, char **argv) if ( filenames filenames[0] != NULL ) parole_send (filenames, device); + else if (device != NULL) + parole_send_play_disc (NULL, device); if ( play ) parole_send_message (Play); @@ -314,6 +328,10 @@ int main (int argc, char **argv) parole_media_list_add_files (list, filenames); } } + else if ( device != NULL ) + { + parole_player_play_uri_disc (player, NULL, device); + } if ( xfce_posix_signal_handler_init (error)) { diff --git a/src/parole-player.c b/src/parole-player.c index c11f272..84b7261 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2180,7 +2180,19 @@ ParoleMediaList *parole_player_get_media_list (ParolePlayer *player) void parole_player_play_uri_disc (ParolePlayer *player, const gchar *uri, const gchar *device) { -parole_player_disc_selected_cb (NULL, uri, device, player); +if ( uri ) +{ + parole_player_disc_selected_cb (NULL, uri, device, player); +} +else if (device) +{ + gchar *uri_local = parole_get_uri_from_unix_device (device); + if ( uri_local ) + { + parole_player_disc_selected_cb (NULL, uri_local, device, player); + g_free (uri_local); + } +} } void parole_player_terminate (ParolePlayer *player) diff --git a/src/parole-utils.c b/src/parole-utils.c index d7a0b76..f52e857 100644 --- a/src/parole-utils.c +++ b/src/parole-utils.c @@ -29,6 +29,15 @@ #include gst/gst.h #include glib.h +#include fcntl.h +#include unistd.h +#include sys/stat.h +#include sys/ioctl.h + +#if defined(__linux__) +#include linux/cdrom.h +#endif + #include libxfce4util/libxfce4util.h #include parole/parole.h @@ -414,3 +423,171 @@ void parole_get_media_files (GtkFileFilter *filter, const gchar *path, } g_object_unref (playlist_filter); } + +/*** + * FIXME, parole_device_has_cdda and parole_guess_uri_from_mount + *have common code with parole-disc.c + ***/ + + +gboolean +parole_device_has_cdda (const gchar *device) +{ +gboolean ret_val = FALSE; + +#if defined(__linux__) +gint fd; +gint drive; + +TRACE (device : %s, device); + +if ( (fd = open (device, O_RDONLY)) 0 ) +{ + g_debug (Failed to open device : %s, device); + return FALSE; +} + +if ( (drive = ioctl (fd, CDROM_DRIVE_STATUS, NULL)) ) +{ + if ( drive == CDS_DRIVE_NOT_READY ) + { + g_debug (Drive :%s is not yet ready\n, device); + } + else if ( drive == CDS_DISC_OK ) + { + if ( (drive = ioctl (fd, CDROM_DISC_STATUS, NULL)) 0 ) + { + if ( drive == CDS_AUDIO ) + { + ret_val = TRUE; + } + } + } +} + +close (fd); +#endif /* if defined(__linux__) */ +return ret_val; +} + +gchar * +parole_guess_uri_from_mount (GMount *mount) +{ +GFile *file; +gchar *uri = NULL; + +g_return_val_if_fail (G_IS_MOUNT (mount), NULL); + +file = g_mount_get_root (mount); + +if ( g_file_has_uri_scheme (file, cdda) ) +{ + uri = g_strdup (cdda://); +} +else +{ + gchar **content_type; + int i; + + content_type = g_content_type_guess_for_tree (file); +
[Xfce4-commits] parole:0.2.2 Fix memory leak in the previous commit
Updating branch refs/heads/0.2.2 to 545eb671487e884eb2bf44fe0296d7a163fedc5f (commit) from 6b53cbaeb97e0b73837b5863e58049e047017d62 (commit) commit 545eb671487e884eb2bf44fe0296d7a163fedc5f Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 21:20:36 2010 +0100 Fix memory leak in the previous commit src/parole-utils.c |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/parole-utils.c b/src/parole-utils.c index f52e857..b0cb8c8 100644 --- a/src/parole-utils.c +++ b/src/parole-utils.c @@ -565,18 +565,22 @@ parole_get_uri_from_unix_device (const gchar *device) { gchar *unix_device; unix_device = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE); - + if ( !g_strcmp0 (unix_device, device) ) { GMount *mount; mount = g_volume_get_mount (volume); + if ( mount ) { uri = parole_guess_uri_from_mount (mount); g_object_unref (mount); + g_object_unref (drive); + g_free (unix_device); break; } } + g_free (unix_device); } g_object_unref (drive); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.2.2 Update NEWS and TODO
Updating branch refs/heads/0.2.2 to 6b53cbaeb97e0b73837b5863e58049e047017d62 (commit) from 7af5a0d21f2c9c68652984bc2965eaa5f6a29cb5 (commit) commit 6b53cbaeb97e0b73837b5863e58049e047017d62 Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 15:20:33 2010 +0100 Update NEWS and TODO NEWS | 30 ++ TODO |7 +++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index ee6137a..ec1fe61 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,33 @@ +0.2.0.1 +=== +- Automatically detect disc type when parole is started with --device=/dev/sr0 without a uri +- Make the browser plugin compatible with midori, Makefile was broken. +- Remove border width from the settings. +- Fix on disk file check +- Avoid a Glib warning in the statusbar when filename is null. +- Support for playing DVD/VCD ISO images from a file. +- Query stream duration on-ready state always, fixes DVD duration query. +- Properly handle WriteReady callback. +- For local media files, check the stream caps only when switching from ready to paused state. + +0.2.0 + +- Fix the confirmation on delete event. +- Use g_key_file_get_locale_string to load plugin name and description +- Fix missing installable include files. +- Fix unused Gst overlay expose on READY state. +- Provide a command line to be used to enable/disable xv, X Video support might be missing for some drivers. +- Handle non local file from the command line. +- Send the kill signal if the dbus name is not yet registered in the browser plugin. +- Set the _NET_WM_WINDOW_OPACITY_LOCKED wm hint, so xfwm4 keep us opaque. +- Grab the focus on the video widget after we get the playing state signal, not when asking gst to play, this will avoid an expose event on the video widget that causes the logo to be drawn before the movie frames shows up. +- Provide an option to Enable/Disable resetting X screen saver counter while playing movies +- Check for stream type before settings the live bit. +- Don't use uri as a status bar text for live streams. +- Added get_stream to the plugin API. +- Don't popup errors in the browser plugin. +- Fix seek backwards+add mouse wheel on the volume slider, patches by Enrico Troger. + 0.1.99 - Fix bug in the active plugin saved list. diff --git a/TODO b/TODO index 7608257..13f4646 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,13 @@ === Media player === -* Have an option for clearing playlist in the prefs, not only in the media chooser. * Check for duplicate playlist entries -* Remove libxfcegui4 dependency and depend on libxfce4ui instead -* Automatically detect disc type when parole - is launched with --device=/dev/sr0 without a uri * Support scale ratio view. * Handle missing gstreamer plugins. * ... === Plugins === +* Library collection. +* Galago plugin to set the IM status as away when playing a film in fullscreen. +* Equalizer plugin * Write a youtube plugin. * Subtitle downloader. * Always on top. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix memory leak in the previous commit
Updating branch refs/heads/master to c54e5fc2cc583a5e2712b6bd4c3cb0ca758607c5 (commit) from 090f1825fadfc8a567819e7d9b62a2414754b613 (commit) commit c54e5fc2cc583a5e2712b6bd4c3cb0ca758607c5 Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 21:20:36 2010 +0100 Fix memory leak in the previous commit src/parole-utils.c |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/parole-utils.c b/src/parole-utils.c index f52e857..b0cb8c8 100644 --- a/src/parole-utils.c +++ b/src/parole-utils.c @@ -565,18 +565,22 @@ parole_get_uri_from_unix_device (const gchar *device) { gchar *unix_device; unix_device = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE); - + if ( !g_strcmp0 (unix_device, device) ) { GMount *mount; mount = g_volume_get_mount (volume); + if ( mount ) { uri = parole_guess_uri_from_mount (mount); g_object_unref (mount); + g_object_unref (drive); + g_free (unix_device); break; } } + g_free (unix_device); } g_object_unref (drive); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master parole --device=/dev/cdrom is now enough to play media on that device. in thunar-volman the command should be parole --device=%d and Parole will handle the rest.
Updating branch refs/heads/master to d577e6eaaa96923030b9cdd37744910b0146d312 (commit) from 01ed5fba8afa9263cbd489b80b2bf527d26fac6a (commit) commit d577e6eaaa96923030b9cdd37744910b0146d312 Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 15:15:17 2010 +0100 parole --device=/dev/cdrom is now enough to play media on that device. in thunar-volman the command should be parole --device=%d and Parole will handle the rest. src/main.c | 20 ++- src/parole-player.c | 14 - src/parole-utils.c | 177 +++ src/parole-utils.h | 10 ++- 4 files changed, 217 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 28e9e9f..524a731 100644 --- a/src/main.c +++ b/src/main.c @@ -72,14 +72,26 @@ parole_send_play_disc (const gchar *uri, const gchar *device) { DBusGProxy *proxy; GError *error = NULL; +gchar *uri_local; + +if ( uri ) +{ + uri_local = g_strdup (uri); +} +else +{ + uri_local = parole_get_uri_from_unix_device (device); +} proxy = parole_get_proxy (PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE); dbus_g_proxy_call (proxy, PlayDisc, error, - G_TYPE_STRING, uri, + G_TYPE_STRING, uri_local, G_TYPE_STRING, device, G_TYPE_INVALID, G_TYPE_INVALID); + +g_free (uri_local); if ( error ) { @@ -265,6 +277,8 @@ int main (int argc, char **argv) if ( filenames filenames[0] != NULL ) parole_send (filenames, device); + else if (device != NULL) + parole_send_play_disc (NULL, device); if ( play ) parole_send_message (Play); @@ -318,6 +332,10 @@ int main (int argc, char **argv) parole_media_list_add_files (list, filenames); } } + else if ( device != NULL ) + { + parole_player_play_uri_disc (player, NULL, device); + } if ( xfce_posix_signal_handler_init (error)) { diff --git a/src/parole-player.c b/src/parole-player.c index 8277f61..cb97477 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2061,7 +2061,19 @@ ParoleMediaList *parole_player_get_media_list (ParolePlayer *player) void parole_player_play_uri_disc (ParolePlayer *player, const gchar *uri, const gchar *device) { -parole_player_disc_selected_cb (NULL, uri, device, player); +if ( uri ) +{ + parole_player_disc_selected_cb (NULL, uri, device, player); +} +else if (device) +{ + gchar *uri_local = parole_get_uri_from_unix_device (device); + if ( uri_local ) + { + parole_player_disc_selected_cb (NULL, uri_local, device, player); + g_free (uri_local); + } +} } void parole_player_terminate (ParolePlayer *player) diff --git a/src/parole-utils.c b/src/parole-utils.c index d7a0b76..f52e857 100644 --- a/src/parole-utils.c +++ b/src/parole-utils.c @@ -29,6 +29,15 @@ #include gst/gst.h #include glib.h +#include fcntl.h +#include unistd.h +#include sys/stat.h +#include sys/ioctl.h + +#if defined(__linux__) +#include linux/cdrom.h +#endif + #include libxfce4util/libxfce4util.h #include parole/parole.h @@ -414,3 +423,171 @@ void parole_get_media_files (GtkFileFilter *filter, const gchar *path, } g_object_unref (playlist_filter); } + +/*** + * FIXME, parole_device_has_cdda and parole_guess_uri_from_mount + *have common code with parole-disc.c + ***/ + + +gboolean +parole_device_has_cdda (const gchar *device) +{ +gboolean ret_val = FALSE; + +#if defined(__linux__) +gint fd; +gint drive; + +TRACE (device : %s, device); + +if ( (fd = open (device, O_RDONLY)) 0 ) +{ + g_debug (Failed to open device : %s, device); + return FALSE; +} + +if ( (drive = ioctl (fd, CDROM_DRIVE_STATUS, NULL)) ) +{ + if ( drive == CDS_DRIVE_NOT_READY ) + { + g_debug (Drive :%s is not yet ready\n, device); + } + else if ( drive == CDS_DISC_OK ) + { + if ( (drive = ioctl (fd, CDROM_DISC_STATUS, NULL)) 0 ) + { + if ( drive == CDS_AUDIO ) + { + ret_val = TRUE; + } + } + } +} + +close (fd); +#endif /* if defined(__linux__) */ +return ret_val; +} + +gchar * +parole_guess_uri_from_mount (GMount *mount) +{ +GFile *file; +gchar *uri = NULL; + +g_return_val_if_fail (G_IS_MOUNT (mount), NULL); + +file = g_mount_get_root (mount); + +if ( g_file_has_uri_scheme (file, cdda) ) +{ + uri = g_strdup (cdda://); +} +else +{ + gchar **content_type; + int i; + + content_type = g_content_type_guess_for_tree (file); +
[Xfce4-commits] parole|0.2.0.1 Creating annotated tag 0.2.0.1
Updating annotated tag refs/tags/0.2.0.1 as new annotated tag to 5ff8cab269b108c77a0bde1b46cb44ab20275c39 (tag) succeeds 0.2.0-37-g090f182 tagged by Ali Abdallah al...@xfce.org on 2010-01-14 20:27 + Ali Abdallah (1): Fix memory leak in the previous commit ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Merge branch 'master' of ssh://git.xfce.org/git/apps/parole
Updating branch refs/heads/master to 090f1825fadfc8a567819e7d9b62a2414754b613 (commit) from 59f92240805f37061cd9a822777fc2f881cf131c (commit) commit 090f1825fadfc8a567819e7d9b62a2414754b613 Merge: 59f92240805f37061cd9a822777fc2f881cf131c e91a7c511074f207067d0d6f3609f014bef984cc Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 21:16:39 2010 +0100 Merge branch 'master' of ssh://git.xfce.org/git/apps/parole commit e91a7c511074f207067d0d6f3609f014bef984cc Author: Michal Várady miko.v...@gmail.com Date: Thu Jan 14 17:57:29 2010 +0100 l10n: Updated Czech (cs) translation to 100% New status: 182 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit b7f6cc68267b8116484b05872c47b722efe095ec Author: Michal Várady miko.v...@gmail.com Date: Thu Jan 14 17:55:36 2010 +0100 l10n: Updated Czech (cs) translation to 97% New status: 178 messages complete with 0 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 195 +- 1 files changed, 91 insertions(+), 104 deletions(-) diff --git a/po/cs.po b/po/cs.po index 7657c2f..2b667e2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,8 +1,9 @@ +# msgid msgstr Project-Id-Version: Parole\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-18 18:47+\n +POT-Creation-Date: 2010-01-14 12:06+0100\n PO-Revision-Date: \n Last-Translator: Michal Várady miko.v...@gmail.com\n Language-Team: Czech\n @@ -11,8 +12,8 @@ msgstr Content-Transfer-Encoding: 8bit\n Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n=2 n=4) ? 1 : 2;\n X-Poedit-Language: Czech\n -X-Poedit-Country: CZECH REPUBLIC\n X-Poedit-SourceCharset: ASCII\n +X-Poedit-Country: CZECH REPUBLIC\n #: ../data/interfaces/parole.ui.h:1 msgid 16:9 (Widescreen) @@ -39,89 +40,93 @@ msgid Chapter Menu msgstr Nabídka kapitoly #: ../data/interfaces/parole.ui.h:7 +msgid DVD +msgstr Disk DVD + +#: ../data/interfaces/parole.ui.h:8 msgid DVD Menu msgstr Nabídka disku DVD -#: ../data/interfaces/parole.ui.h:8 +#: ../data/interfaces/parole.ui.h:9 +msgid From ISO image +msgstr Z obrazu disku DVD + +#: ../data/interfaces/parole.ui.h:10 msgid Media player msgstr Přehrávač médií -#: ../data/interfaces/parole.ui.h:9 +#: ../data/interfaces/parole.ui.h:11 msgid Mute msgstr Ztlumit -#: ../data/interfaces/parole.ui.h:10 -#: ../src/parole-player.c:1102 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1198 #: ../src/parole-disc-menu.c:113 msgid Next Chapter msgstr Další kapitola -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:13 msgid None msgstr Žádný -#: ../data/interfaces/parole.ui.h:12 -#: ../data/desktop/parole.desktop.in.in.h:1 -#: ../src/parole-about.c:70 -#: ../plugins/window-title/window-title-provider.c:58 +#: ../data/interfaces/parole.ui.h:14 ../data/desktop/parole.desktop.in.in.h:1 +#: ../src/parole-about.c:70 ../plugins/window-title/window-title-provider.c:58 msgid Parole Media Player msgstr Přehrávač médií Parole -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:15 msgid Plugins msgstr Zásuvné moduly -#: ../data/interfaces/parole.ui.h:14 -#: ../src/parole-player.c:1114 +#: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1210 #: ../src/parole-disc-menu.c:114 msgid Previous Chapter msgstr Předchozí kapitola -#: ../data/interfaces/parole.ui.h:15 +#: ../data/interfaces/parole.ui.h:17 msgid Repeat msgstr Opakovat -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:18 msgid Select Track msgstr Vybrat stopu -#: ../data/interfaces/parole.ui.h:17 +#: ../data/interfaces/parole.ui.h:19 msgid Shuffle msgstr Náhodně -#: ../data/interfaces/parole.ui.h:18 +#: ../data/interfaces/parole.ui.h:20 msgid Sound msgstr Zvuk -#: ../data/interfaces/parole.ui.h:19 +#: ../data/interfaces/parole.ui.h:21 msgid Square msgstr Čtverec -#: ../data/interfaces/parole.ui.h:20 +#: ../data/interfaces/parole.ui.h:22 msgid Volume Down msgstr Snížit hlasitost -#: ../data/interfaces/parole.ui.h:21 +#: ../data/interfaces/parole.ui.h:23 msgid Volume Up msgstr Zvýšit hlasitost -#: ../data/interfaces/parole.ui.h:22 +#: ../data/interfaces/parole.ui.h:24 msgid _Edit msgstr _Upravit -#: ../data/interfaces/parole.ui.h:23 +#: ../data/interfaces/parole.ui.h:25 msgid _Help msgstr _Nápověda -#: ../data/interfaces/parole.ui.h:24 +#: ../data/interfaces/parole.ui.h:26 msgid _Media msgstr _Média -#: ../data/interfaces/parole.ui.h:25 +#: ../data/interfaces/parole.ui.h:27 msgid _Open location msgstr _Otevřít umístění -#: ../data/interfaces/parole.ui.h:26 +#: ../data/interfaces/parole.ui.h:28 msgid _View msgstr _Zobrazit @@ -226,22 +231,26 @@ msgid Visualization type: msgstr Typ vizualizace: #: ../data/interfaces/save-playlist.ui.h:1 +msgid By Extension +msgstr Podle přípony + +#:
[Xfce4-commits] parole:master Update NEWS and TODO
Updating branch refs/heads/master to 979883d11187b57ca7bd5bb25241862e8f621c97 (commit) from d577e6eaaa96923030b9cdd37744910b0146d312 (commit) commit 979883d11187b57ca7bd5bb25241862e8f621c97 Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 15:17:40 2010 +0100 Update NEWS and TODO NEWS | 30 ++ TODO |5 +++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ee6137a..ec1fe61 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,33 @@ +0.2.0.1 +=== +- Automatically detect disc type when parole is started with --device=/dev/sr0 without a uri +- Make the browser plugin compatible with midori, Makefile was broken. +- Remove border width from the settings. +- Fix on disk file check +- Avoid a Glib warning in the statusbar when filename is null. +- Support for playing DVD/VCD ISO images from a file. +- Query stream duration on-ready state always, fixes DVD duration query. +- Properly handle WriteReady callback. +- For local media files, check the stream caps only when switching from ready to paused state. + +0.2.0 + +- Fix the confirmation on delete event. +- Use g_key_file_get_locale_string to load plugin name and description +- Fix missing installable include files. +- Fix unused Gst overlay expose on READY state. +- Provide a command line to be used to enable/disable xv, X Video support might be missing for some drivers. +- Handle non local file from the command line. +- Send the kill signal if the dbus name is not yet registered in the browser plugin. +- Set the _NET_WM_WINDOW_OPACITY_LOCKED wm hint, so xfwm4 keep us opaque. +- Grab the focus on the video widget after we get the playing state signal, not when asking gst to play, this will avoid an expose event on the video widget that causes the logo to be drawn before the movie frames shows up. +- Provide an option to Enable/Disable resetting X screen saver counter while playing movies +- Check for stream type before settings the live bit. +- Don't use uri as a status bar text for live streams. +- Added get_stream to the plugin API. +- Don't popup errors in the browser plugin. +- Fix seek backwards+add mouse wheel on the volume slider, patches by Enrico Troger. + 0.1.99 - Fix bug in the active plugin saved list. diff --git a/TODO b/TODO index b220056..907a616 100644 --- a/TODO +++ b/TODO @@ -1,11 +1,12 @@ === Media player === -* Automatically detect disc type when parole - is launched with --device=/dev/sr0 without a uri * Support scale ratio view. * Handle missing gstreamer plugins. * ... === Plugins === +* Library collection. +* Galago plugin to set the IM status as away when playing a film in fullscreen. +* Equalizer plugin * Write a youtube plugin. * Subtitle downloader. * Always on top. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Merge branch 'master' of ssh://git.xfce.org/git/apps/parole
Updating branch refs/heads/master to 59f92240805f37061cd9a822777fc2f881cf131c (commit) from 979883d11187b57ca7bd5bb25241862e8f621c97 (commit) commit 59f92240805f37061cd9a822777fc2f881cf131c Merge: 979883d11187b57ca7bd5bb25241862e8f621c97 a10597d90f4b63a56e0d1f14288d932f3c94dbe0 Author: Ali Abdallah al...@xfce.org Date: Thu Jan 14 15:22:00 2010 +0100 Merge branch 'master' of ssh://git.xfce.org/git/apps/parole commit a10597d90f4b63a56e0d1f14288d932f3c94dbe0 Author: Xu Meihong mhun...@gmail.com Date: Thu Jan 14 15:20:28 2010 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 98% New status: 180 messages complete with 2 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 56b89c83b1b32095f56883d40e3ba959ccfa7896 Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Jan 14 15:19:12 2010 +0100 l10n: Updated Galician (gl) translation to 98% New status: 179 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit d424d54db1c7c805ba0faa1f381b06a3e74afbe5 Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Jan 14 15:16:08 2010 +0100 l10n: Updated Galician (gl) translation to 94% New status: 172 messages complete with 0 fuzzies and 10 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 5dbd3b571c21880debfd76a16be3e3bc3d64f8e1 Author: Leandro Regueiro leandro.regue...@gmail.com Date: Thu Jan 14 15:14:54 2010 +0100 l10n: Updated Galician (gl) translation to 93% New status: 171 messages complete with 0 fuzzies and 11 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 80675e4da44cfcdc6210387aafd8c47e0aa87a6c Author: Sergio Marques smarque...@gmail.com Date: Thu Jan 14 11:11:25 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 182 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po| 213 ++ po/pt.po| 100 +--- po/zh_CN.po | 92 -- 3 files changed, 212 insertions(+), 193 deletions(-) diff --git a/po/gl.po b/po/gl.po index 7118450..5d24b88 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,17 +1,17 @@ # Galician translation of notification-daemon-xfce # Copyright (C) 2009 Leandro Regueiro. # This file is distributed under the same license as the Xfce package. -# +# # Leandro Regueiro leandro DOT regueiro AT gmail DOT com, 2009. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en http://trasno.net -# +# msgid msgstr Project-Id-Version: Parole 0.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-10 14:17+0100\n +POT-Creation-Date: 2010-01-14 12:06+0100\n PO-Revision-Date: 2009-12-18 15:09+0100\n Last-Translator: Leandro Regueiro leandro.regue...@gmail.com\n Language-Team: Galician proxe...@trasno.net\n @@ -45,89 +45,93 @@ msgid Chapter Menu msgstr Menú de capítulos #: ../data/interfaces/parole.ui.h:7 +msgid DVD +msgstr DVD + +#: ../data/interfaces/parole.ui.h:8 msgid DVD Menu msgstr Menú do DVD -#: ../data/interfaces/parole.ui.h:8 +#: ../data/interfaces/parole.ui.h:9 +msgid From ISO image +msgstr Dende imaxe ISO + +#: ../data/interfaces/parole.ui.h:10 msgid Media player msgstr Reprodutor multimedia -#: ../data/interfaces/parole.ui.h:9 +#: ../data/interfaces/parole.ui.h:11 msgid Mute msgstr Silencio -#: ../data/interfaces/parole.ui.h:10 -#: ../src/parole-player.c:1098 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1198 #: ../src/parole-disc-menu.c:113 msgid Next Chapter msgstr Capítulo seguinte -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:13 msgid None msgstr Ningunha -#: ../data/interfaces/parole.ui.h:12 -#: ../data/desktop/parole.desktop.in.in.h:1 -#: ../src/parole-about.c:70 -#: ../plugins/window-title/window-title-provider.c:58 +#: ../data/interfaces/parole.ui.h:14 ../data/desktop/parole.desktop.in.in.h:1 +#: ../src/parole-about.c:70 ../plugins/window-title/window-title-provider.c:58 msgid Parole Media Player msgstr Reprodutor multimedia Parole -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:15 msgid Plugins msgstr Engadidos -#: ../data/interfaces/parole.ui.h:14 -#: ../src/parole-player.c:1110 +#: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1210 #: ../src/parole-disc-menu.c:114 msgid Previous Chapter msgstr Capítulo anterior -#: ../data/interfaces/parole.ui.h:15 +#: ../data/interfaces/parole.ui.h:17 msgid Repeat msgstr Repetir -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:18 msgid Select Track msgstr Escoller pista -#: ../data/interfaces/parole.ui.h:17 +#:
[Xfce4-commits] ristretto:master Remove stuff that is not going to be ready for 0.1.0
Updating branch refs/heads/master to ca420c8020448401b22a125e0530844002cb9574 (commit) from 66d3f626989162041657ec69da6ad726267fa57e (commit) commit ca420c8020448401b22a125e0530844002cb9574 Author: Stephan Arts step...@xfce.org Date: Sat Jan 9 08:58:15 2010 +0100 Remove stuff that is not going to be ready for 0.1.0 src/main_window.c |6 ++ src/main_window_ui.xml |4 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index 674c617..9319dc4 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -803,7 +803,9 @@ rstto_main_window_update_buttons (RsttoMainWindow *window) { case 0: gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/save-copy), FALSE); +/* gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/print), FALSE); +*/ gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/close), FALSE); gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/close-all), FALSE); gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/edit-menu/delete), FALSE); @@ -861,7 +863,9 @@ rstto_main_window_update_buttons (RsttoMainWindow *window) break; case 1: gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/save-copy), TRUE); +/* gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/print), TRUE); +*/ gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/close), TRUE); gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/close-all), FALSE); gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/edit-menu/delete), TRUE); @@ -921,7 +925,9 @@ rstto_main_window_update_buttons (RsttoMainWindow *window) break; default: gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/save-copy), TRUE); +/* gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/print), TRUE); +*/ gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/close), TRUE); gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/file-menu/close-all), TRUE); gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window-priv-ui_manager, /main-menu/edit-menu/delete), TRUE); diff --git a/src/main_window_ui.xml b/src/main_window_ui.xml index e82e5e5..24f2d3f 100644 --- a/src/main_window_ui.xml +++ b/src/main_window_ui.xml @@ -10,8 +10,10 @@ placeholder name=placeholder-open-recent/ separator/ menuitem action=save-copy/ +!-- separator/ menuitem action=print/ +-- separator/ menuitem action=close/ menuitem action=close-all/ @@ -58,7 +60,9 @@ placeholder name=placeholder-slideshow / /menu menu action=help-menu +!-- menuitem action=contents/ +-- menuitem action=about/ /menu /menubar ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Implement box-zoom... it only works when the image is loaded at max-quality... still need to fix that
Updating branch refs/heads/master to 8a1e66cd4e1f9095133abcebd6ecf5ab2e0d9601 (commit) from ca420c8020448401b22a125e0530844002cb9574 (commit) commit 8a1e66cd4e1f9095133abcebd6ecf5ab2e0d9601 Author: Stephan Arts step...@xfce.org Date: Tue Jan 12 10:27:33 2010 +0100 Implement box-zoom... it only works when the image is loaded at max-quality... still need to fix that src/picture_viewer.c | 112 ++ 1 files changed, 112 insertions(+), 0 deletions(-) diff --git a/src/picture_viewer.c b/src/picture_viewer.c index fb4a031..ece3353 100644 --- a/src/picture_viewer.c +++ b/src/picture_viewer.c @@ -1368,7 +1368,11 @@ cb_rstto_picture_viewer_button_press_event (RsttoPictureViewer *viewer, GdkEvent static void cb_rstto_picture_viewer_button_release_event (RsttoPictureViewer *viewer, GdkEventButton *event) { +gdouble *scale, old_scale; +gboolean *fit_to_screen; +gdouble width, height; GtkWidget *widget = GTK_WIDGET(viewer); + switch (event-button) { case 1: @@ -1379,8 +1383,116 @@ cb_rstto_picture_viewer_button_release_event (RsttoPictureViewer *viewer, GdkEve rstto_picture_viewer_set_zoom_mode (viewer, RSTTO_ZOOM_MODE_CUSTOM); if(GTK_WIDGET_REALIZED(widget)) { +scale = g_object_get_data (G_OBJECT (viewer-priv-image), viewer-scale); +fit_to_screen = g_object_get_data (G_OBJECT (viewer-priv-image), viewer-fit-to-screen); +old_scale = *scale; +width = (gdouble)rstto_image_get_width(viewer-priv-image); +height = (gdouble)rstto_image_get_height(viewer-priv-image); + +gdouble d_width = (gdouble)gdk_pixbuf_get_width(viewer-priv-dst_pixbuf); +gdouble d_height = (gdouble)gdk_pixbuf_get_height(viewer-priv-dst_pixbuf); + +gdouble box_width, box_height; +gdouble top_left_x, top_left_y; + +if (viewer-priv-motion.x viewer-priv-motion.current_x) +{ +gint x_offset = (widget-allocation.width - d_width)=0?0:((widget-allocation.width - d_width)/2); +top_left_x = viewer-priv-motion.x + viewer-hadjustment-value - x_offset; +box_width = viewer-priv-motion.current_x - viewer-priv-motion.x; +} +else +{ +gint x_offset = (widget-allocation.width - d_width)=0?0:((widget-allocation.width - d_width)/2); +top_left_x = viewer-priv-motion.current_x + viewer-hadjustment-value - x_offset; +box_width = viewer-priv-motion.x - viewer-priv-motion.current_x; +} +if (viewer-priv-motion.y viewer-priv-motion.current_y) +{ +gint y_offset = (widget-allocation.height - d_height)=0?0:((widget-allocation.height - d_height)/2); +top_left_y = viewer-priv-motion.y + viewer-vadjustment-value - y_offset; +box_height = viewer-priv-motion.current_y - viewer-priv-motion.y; +} +else +{ +gint y_offset = (widget-allocation.height - d_height) =0?0:((widget-allocation.height - d_height)/2); + +top_left_y = viewer-priv-motion.current_y + viewer-vadjustment-value - y_offset; +box_height = viewer-priv-motion.y - viewer-priv-motion.current_y; +} + +gdouble h_scale = widget-allocation.width / box_width * *scale; +gdouble v_scale = widget-allocation.height / box_height * *scale; +/** + * Check if the mouse has been moved (and there exists a box + */ +if (box_height 1 box_width 1) +{ +if (h_scale v_scale) +{ +*scale = h_scale; +gdouble d_box_height = box_height * v_scale / h_scale; +top_left_y -= (d_box_height - box_height) / 2; +box_height = d_box_height; +} +else +{ +*scale = v_scale; +gdouble d_box_width = box_width * h_scale / v_scale; +top_left_x -= (d_box_width - box_width) / 2; +box_width
[Xfce4-commits] ristretto:master Update copyright messages
Updating branch refs/heads/master to 61d59ea78f70e4a1b94d8a1c040bcc4a2f4491bd (commit) from 8a1e66cd4e1f9095133abcebd6ecf5ab2e0d9601 (commit) commit 61d59ea78f70e4a1b94d8a1c040bcc4a2f4491bd Author: Stephan Arts step...@xfce.org Date: Thu Jan 14 00:49:27 2010 +0100 Update copyright messages src/app_menu_item.c |2 ++ src/app_menu_item.h |2 +- src/image.c |2 +- src/image.h |2 +- src/image_cache.c|2 +- src/image_cache.h|2 +- src/image_list.c |2 +- src/image_list.h |2 +- src/main.c |2 +- src/main_window.c|4 ++-- src/main_window.h|2 +- src/picture_viewer.c |2 +- src/picture_viewer.h |2 +- src/preferences_dialog.c |2 +- src/preferences_dialog.h |2 +- src/settings.c |2 +- src/settings.h |2 ++ src/thumbnail.c |2 +- src/thumbnail.h |2 +- src/thumbnailer.c|2 +- src/thumbnailer.h|2 ++ src/wallpaper_manager.c |2 +- src/wallpaper_manager.h |2 +- src/xfce_wallpaper_manager.c |2 +- src/xfce_wallpaper_manager.h |2 ++ 25 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/app_menu_item.c b/src/app_menu_item.c index fe505fa..01aa634 100644 --- a/src/app_menu_item.c +++ b/src/app_menu_item.c @@ -1,4 +1,6 @@ /* + * Copyright (C) Stephan Arts 2009-2010 step...@xfce.org + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/app_menu_item.h b/src/app_menu_item.h index d358f50..ca4cc07 100644 --- a/src/app_menu_item.h +++ b/src/app_menu_item.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Stephan Arts 2009 step...@xfce.org + * Copyright (C) Stephan Arts 2009-2010 step...@xfce.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image.c b/src/image.c index a1a83af..316cd2c 100644 --- a/src/image.c +++ b/src/image.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Stephan Arts step...@xfce.org + * Copyright (c) Stephan Arts 2009-2010 step...@xfce.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image.h b/src/image.h index 2a996bd..1e17346 100644 --- a/src/image.h +++ b/src/image.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Stephan Arts 2006-2009 step...@xfce.org + * Copyright (C) Stephan Arts 2006-2010 step...@xfce.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image_cache.c b/src/image_cache.c index 347df8e..e037c17 100644 --- a/src/image_cache.c +++ b/src/image_cache.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Stephan Arts step...@xfce.org + * Copyright (c) Stephan Arts 2009-2010 step...@xfce.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image_cache.h b/src/image_cache.h index 15ef87d..4c79047 100644 --- a/src/image_cache.h +++ b/src/image_cache.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Stephan Arts 2009 step...@xfce.org + * Copyright (c) Stephan Arts 2009-2010 step...@xfce.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image_list.c b/src/image_list.c index 5a64e68..911d1cc 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Stephan Arts step...@xfce.org + * Copyright (c) Stephan Arts 2009-2010 step...@xfce.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image_list.h b/src/image_list.h index 2011824..d5a0351 100644 --- a/src/image_list.h +++ b/src/image_list.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Stephan Arts step...@xfce.org + * Copyright (c) Stephan Arts 2009-2010 step...@xfce.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main.c b/src/main.c index 81f1d38..cc51e6c 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2009 Stephan Arts step...@xfce.org + * Copyright (c) Stephan Arts 2006-2010 step...@xfce.org * * This program is free software; you can redistribute it and/or modify * it under
[Xfce4-commits] ristretto:master Fix box-zoom when image is rendered at below-maximum resolution
Updating branch refs/heads/master to fe9d58b921b5b1f9b37cbfadafd464a1f2a13539 (commit) from 61d59ea78f70e4a1b94d8a1c040bcc4a2f4491bd (commit) commit fe9d58b921b5b1f9b37cbfadafd464a1f2a13539 Author: Stephan Arts step...@xfce.org Date: Fri Jan 15 00:50:16 2010 +0100 Fix box-zoom when image is rendered at below-maximum resolution src/picture_viewer.c | 45 ++--- 1 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/picture_viewer.c b/src/picture_viewer.c index c55c89f..f206fd6 100644 --- a/src/picture_viewer.c +++ b/src/picture_viewer.c @@ -1368,10 +1368,11 @@ cb_rstto_picture_viewer_button_press_event (RsttoPictureViewer *viewer, GdkEvent static void cb_rstto_picture_viewer_button_release_event (RsttoPictureViewer *viewer, GdkEventButton *event) { -gdouble *scale, old_scale; +gdouble *scale, old_scale, img_scale; gboolean *fit_to_screen; -gdouble width, height; +gdouble width, height, image_width, image_height; GtkWidget *widget = GTK_WIDGET(viewer); +GdkPixbuf *p_src_pixbuf = NULL; switch (event-button) { @@ -1384,10 +1385,19 @@ cb_rstto_picture_viewer_button_release_event (RsttoPictureViewer *viewer, GdkEve if(GTK_WIDGET_REALIZED(widget)) { scale = g_object_get_data (G_OBJECT (viewer-priv-image), viewer-scale); -fit_to_screen = g_object_get_data (G_OBJECT (viewer-priv-image), viewer-fit-to-screen); old_scale = *scale; -width = (gdouble)rstto_image_get_width(viewer-priv-image); -height = (gdouble)rstto_image_get_height(viewer-priv-image); +p_src_pixbuf = rstto_image_get_pixbuf (viewer-priv-image); +if (p_src_pixbuf) +{ +width = (gdouble)gdk_pixbuf_get_width (p_src_pixbuf); +height = (gdouble)gdk_pixbuf_get_height (p_src_pixbuf); +} +else +return; +image_width = rstto_image_get_width(viewer-priv-image); +image_height = rstto_image_get_height(viewer-priv-image); + +img_scale = width / image_width; gdouble d_width = (gdouble)gdk_pixbuf_get_width(viewer-priv-dst_pixbuf); gdouble d_height = (gdouble)gdk_pixbuf_get_height(viewer-priv-dst_pixbuf); @@ -1398,26 +1408,25 @@ cb_rstto_picture_viewer_button_release_event (RsttoPictureViewer *viewer, GdkEve if (viewer-priv-motion.x viewer-priv-motion.current_x) { gint x_offset = (widget-allocation.width - d_width)=0?0:((widget-allocation.width - d_width)/2); -top_left_x = viewer-priv-motion.x + viewer-hadjustment-value - x_offset; +top_left_x = viewer-priv-motion.x - x_offset + (viewer-hadjustment-value * *scale); box_width = viewer-priv-motion.current_x - viewer-priv-motion.x; } else { gint x_offset = (widget-allocation.width - d_width)=0?0:((widget-allocation.width - d_width)/2); -top_left_x = viewer-priv-motion.current_x + viewer-hadjustment-value - x_offset; +top_left_x = viewer-priv-motion.current_x - x_offset + (viewer-hadjustment-value * *scale); box_width = viewer-priv-motion.x - viewer-priv-motion.current_x; } if (viewer-priv-motion.y viewer-priv-motion.current_y) { gint y_offset = (widget-allocation.height - d_height)=0?0:((widget-allocation.height - d_height)/2); -top_left_y = viewer-priv-motion.y + viewer-vadjustment-value - y_offset; +top_left_y = viewer-priv-motion.y - y_offset + (viewer-vadjustment-value * *scale); box_height = viewer-priv-motion.current_y - viewer-priv-motion.y; } else { gint y_offset = (widget-allocation.height - d_height) =0?0:((widget-allocation.height - d_height)/2); - -top_left_y = viewer-priv-motion.current_y + viewer-vadjustment-value - y_offset; +top_left_y = viewer-priv-motion.y - y_offset + (viewer-vadjustment-value * *scale); box_height = viewer-priv-motion.y - viewer-priv-motion.current_y; } @@ -1445,17 +1454,15 @@
[Xfce4-commits] midori:master Only define adblock_prepare_urihider_js() if it is used
Updating branch refs/heads/master to e6163a761f6891438221a53e8b214c7369800410 (commit) from d85d2806beab79cb8030dca507667d0669bf8570 (commit) commit e6163a761f6891438221a53e8b214c7369800410 Author: Enrico Tröger enrico.troe...@uvena.de Date: Fri Jan 15 06:15:48 2010 +0100 Only define adblock_prepare_urihider_js() if it is used extensions/adblock.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extensions/adblock.c b/extensions/adblock.c index 6abeeb1..f89c16e 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -636,6 +636,7 @@ adblock_is_matched (const gchar* opts, return adblock_is_matched_by_pattern (req_uri, page_uri); } +#if HAVE_WEBKIT_RESOURCE_REQUEST static gchar* adblock_prepare_urihider_js (const gchar* uri) { @@ -667,7 +668,6 @@ adblock_prepare_urihider_js (const gchar* uri) return g_strdup_printf (js, uri); } -#if HAVE_WEBKIT_RESOURCE_REQUEST static void adblock_resource_request_starting_cb (WebKitWebView* web_view, WebKitWebFrame*web_frame, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Change db_ helpers in main.c into direct sqlite3_ calls
Updating branch refs/heads/master to 86d060f25099d4b9600e8b81a627f34f29da273e (commit) from de141078b2343e74f85a4f6ee7d88e28fc7062e5 (commit) commit 86d060f25099d4b9600e8b81a627f34f29da273e Author: Christian Dywan christ...@twotoasts.de Date: Fri Jan 15 06:47:16 2010 +0100 Change db_ helpers in main.c into direct sqlite3_ calls This means 1 function call instead of 2 or 3 calls for each query and should reduce some overhead. midori/main.c | 173 1 files changed, 50 insertions(+), 123 deletions(-) diff --git a/midori/main.c b/midori/main.c index 52b0347..2880f70 100644 --- a/midori/main.c +++ b/midori/main.c @@ -54,15 +54,6 @@ #define BOOKMARK_FILE bookmarks.xbel #endif -#define MIDORI_HISTORY_ERROR g_quark_from_string(MIDORI_HISTORY_ERROR) - -typedef enum -{ -MIDORI_HISTORY_ERROR_DB_OPEN,/* Error opening the database file */ -MIDORI_HISTORY_ERROR_EXEC_SQL, /* Error executing SQL statement */ - -} MidoriHistoryError; - static gchar* build_config_filename (const gchar* filename) { @@ -361,69 +352,6 @@ search_engines_save_to_file (KatzeArray* search_engines, } #if HAVE_SQLITE -/* Open database 'dbname' */ -static sqlite3* -db_open (const char* dbname, - GError**error) -{ -sqlite3* db; - -if (sqlite3_open (dbname, db)) -{ -if (error) -{ -*error = g_error_new (MIDORI_HISTORY_ERROR, - MIDORI_HISTORY_ERROR_DB_OPEN, - _(Failed to open database: %s\n), - sqlite3_errmsg (db)); -} -sqlite3_close (db); -return NULL; -} -return (db); -} - -/* Close database 'db' */ -static void -db_close (sqlite3* db) -{ -sqlite3_close (db); -} - -/* Execute an SQL statement and run 'callback' on the result data */ -static gboolean -db_exec_callback (sqlite3*db, - const char* sqlcmd, - int (*callback)(void*, int, char**, char**), - void* cbarg, - GError**error) -{ -char* errmsg; - -if (sqlite3_exec (db, sqlcmd, callback, cbarg, errmsg) != SQLITE_OK) -{ -if (error) -{ -*error = g_error_new (MIDORI_HISTORY_ERROR, - MIDORI_HISTORY_ERROR_EXEC_SQL, - _(Failed to execute database statement: %s\n), - errmsg); -} -sqlite3_free (errmsg); -return FALSE; -} -return TRUE; -} - -/* Execute a SQL statement */ -static gboolean -db_exec (sqlite3*db, - const char* sqlcmd, - GError**error) -{ -return (db_exec_callback (db, sqlcmd, NULL, NULL, error)); -} - /* sqlite method for retrieving the date/ time */ static int gettimestr (void* data, @@ -446,8 +374,7 @@ midori_history_remove_item_cb (KatzeArray* history, sqlite3*db) { gchar* sqlcmd; -gboolean success = TRUE; -GError* error = NULL; +char* errmsg = NULL; g_return_if_fail (KATZE_IS_ITEM (item)); @@ -457,12 +384,10 @@ midori_history_remove_item_cb (KatzeArray* history, katze_item_get_uri (item), katze_item_get_name (item), katze_item_get_added (item)); -success = db_exec (db, sqlcmd, error); -if (!success) +if (sqlite3_exec (db, sqlcmd, NULL, NULL, errmsg) != SQLITE_OK) { -g_printerr (_(Failed to remove history item: %s\n), error-message); -g_error_free (error); -return ; +g_printerr (_(Failed to remove history item: %s\n), errmsg); +sqlite3_free (errmsg); } sqlite3_free (sqlcmd); } @@ -478,14 +403,14 @@ static void midori_history_clear_cb (KatzeArray* history, sqlite3*db) { -GError* error = NULL; +char* errmsg = NULL; g_return_if_fail (KATZE_IS_ARRAY (history)); -if (!db_exec (db, DELETE FROM history, error)) +if (sqlite3_exec (db, DELETE FROM history, NULL, NULL, errmsg) != SQLITE_OK) { -g_printerr (_(Failed to clear history: %s\n), error-message); -g_error_free (error); +g_printerr (_(Failed to clear history: %s\n), errmsg); +sqlite3_free (errmsg); } } @@ -495,22 +420,19 @@ midori_history_notify_item_cb (KatzeItem* item, sqlite3*db) { gchar* sqlcmd; -gboolean success = TRUE; -GError* error = NULL; +char* errmsg = NULL; sqlcmd = sqlite3_mprintf (UPDATE history SET title='%q' WHERE uri='%q' AND date=%llu, katze_item_get_name (item), katze_item_get_uri (item), katze_item_get_added (item)); -success = db_exec (db, sqlcmd, error); -sqlite3_free (sqlcmd); -