Refreshed translations, fixed texts for web browser, work on dowloader.

This commit is contained in:
Martin Rotter 2015-01-25 16:36:45 +01:00
parent e5f0246566
commit 1e69518af5
13 changed files with 846 additions and 751 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0" language="cs_CZ"> <TS version="2.1" language="cs_CZ">
<context> <context>
<name>Application</name> <name>Application</name>
<message> <message>
@ -29,17 +29,6 @@
<translation>Neznámá chyba.</translation> <translation>Neznámá chyba.</translation>
</message> </message>
</context> </context>
<context>
<name>DownloadDialog</name>
<message>
<source>Downloading %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>DownloadItem</name> <name>DownloadItem</name>
<message> <message>
@ -50,22 +39,6 @@
<source>Filename</source> <source>Filename</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Stop</source>
<translation type="unfinished">Zastavit</translation>
</message>
<message>
<source>Save File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download canceled: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory (%1) couldn&apos;t be created.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error opening output file: %1</source> <source>Error opening output file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -74,10 +47,6 @@
<source>Error saving: %1</source> <source>Error saving: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Network Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>%1 of %2 (%3/sec) - %4</source> <source>%1 of %2 (%3/sec) - %4</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -91,28 +60,51 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Try again</source> <source>&amp;Try again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Open file</source> <source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open &amp;folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select destination for downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download for %1 cancelled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory %1 couldn&apos;t be created</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1</source>
<translation type="unfinished">Chyba: %1. {1?}</translation>
</message>
<message>
<source>Cannot open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot open output folder. Open it manually.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
<name>DownloadManager</name> <name>DownloadManager</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Clean up</source> <source>Clean up</source>
<translation type="unfinished"></translation> <translation>Vyčistit</translation>
</message>
<message>
<source>There are %1 downloads in progress
Do you want to quit anyway?</source>
<translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>%n minutes remaining</source> <source>%n minutes remaining</source>
@ -132,19 +124,19 @@ Do you want to quit anyway?</source>
</message> </message>
<message> <message>
<source>bytes</source> <source>bytes</source>
<translation type="unfinished"></translation> <translation>bajtů</translation>
</message> </message>
<message> <message>
<source>kB</source> <source>kB</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<source>MB</source> <source>MB</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<source>GB</source> <source>GB</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -212,12 +204,10 @@ Do you want to quit anyway?</source>
</message> </message>
<message> <message>
<source>Titles of feeds/categories.</source> <source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Názvy kanálů/kategorií.</translation> <translation>Názvy kanálů/kategorií.</translation>
</message> </message>
<message> <message>
<source>Counts of unread/all meesages.</source> <source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation>Počty nepřečtených/všech zpráviček.</translation> <translation>Počty nepřečtených/všech zpráviček.</translation>
</message> </message>
<message> <message>
@ -1459,7 +1449,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message> </message>
<message> <message>
<source>&amp;Downloads</source> <source>&amp;Downloads</source>
<translation type="unfinished"></translation> <translation>&amp;Stahování</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1542,9 +1532,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
<extracomment>Language settings section. <extracomment>Language settings section.</extracomment>
----------
Language column of language list.</extracomment>
<translation>Lokalizace</translation> <translation>Lokalizace</translation>
</message> </message>
<message> <message>
@ -1602,12 +1590,10 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Code</source> <source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Kód</translation> <translation>Kód</translation>
</message> </message>
<message> <message>
<source>Version</source> <source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Verze</translation> <translation>Verze</translation>
</message> </message>
<message> <message>
@ -1685,7 +1671,6 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Name</source> <source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Název</translation> <translation>Název</translation>
</message> </message>
<message> <message>
@ -2091,15 +2076,43 @@ Musíte restartovat manuálně.</translation>
</message> </message>
<message> <message>
<source>Remove all read messages from all feeds on application exit</source> <source>Remove all read messages from all feeds on application exit</source>
<translation type="unfinished"></translation> <translation>Vymazat všechny přečtené zprávy, když se aplikace vypíná</translation>
</message> </message>
<message> <message>
<source>When new message arrives from feed and duplicate exists, then its content is updated and new message is dropped.</source> <source>When new message arrives from feed and duplicate exists, then its content is updated and new message is dropped.</source>
<translation type="unfinished"></translation> <translation>Když se v kanálu objeví nová zpráva a existuje v databázi duplikát, pak jeho obsah je aktualizován a nová zpráva je zahozena.</translation>
</message> </message>
<message> <message>
<source>Remove duplicate messages</source> <source>Remove duplicate messages</source>
<translation type="unfinished"></translation> <translation>Mazat duplicitní zprávy</translation>
</message>
<message>
<source>Downloads</source>
<translation>Stahování</translation>
</message>
<message>
<source>Target directory for downloaded files</source>
<translation>Cílový adresář pro stahované soubory</translation>
</message>
<message>
<source>Ask for each individual downloaded file</source>
<translation>Ptát se u každého stahovaného souboru</translation>
</message>
<message>
<source>Save all downloaded files into</source>
<translation>Všechny soubory automaticky stahovat do</translation>
</message>
<message>
<source>Target directory where all downloaded files are saved</source>
<translation>Cílový adresář, kam jsou ukládány všechny stahované soubory</translation>
</message>
<message>
<source>&amp;Browse</source>
<translation>&amp;Procházet</translation>
</message>
<message>
<source>Select downloads target directory</source>
<translation>Zvolit cílový adresář pro uložení stahovaných souborů</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2242,52 +2255,42 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
<name>MessagesModel</name> <name>MessagesModel</name>
<message> <message>
<source>Id</source> <source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<source>Read</source> <source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Přečteno</translation> <translation>Přečteno</translation>
</message> </message>
<message> <message>
<source>Deleted</source> <source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Smazáno</translation> <translation>Smazáno</translation>
</message> </message>
<message> <message>
<source>Important</source> <source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Důležité</translation> <translation>Důležité</translation>
</message> </message>
<message> <message>
<source>Feed</source> <source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Kanál</translation> <translation>Kanál</translation>
</message> </message>
<message> <message>
<source>Title</source> <source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Nadpis</translation> <translation>Nadpis</translation>
</message> </message>
<message> <message>
<source>Url</source> <source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<source>Author</source> <source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Autor</translation> <translation>Autor</translation>
</message> </message>
<message> <message>
<source>Created on</source> <source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Vytvořeno</translation> <translation>Vytvořeno</translation>
</message> </message>
<message> <message>
<source>Contents</source> <source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Obsah</translation> <translation>Obsah</translation>
</message> </message>
<message> <message>
@ -2332,7 +2335,6 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
</message> </message>
<message> <message>
<source>Permanently deleted</source> <source>Permanently deleted</source>
<extracomment>Tooltip for &quot;pdeleted&quot; column in msg list.</extracomment>
<translation>Permanentně smazáno</translation> <translation>Permanentně smazáno</translation>
</message> </message>
<message> <message>
@ -2589,7 +2591,7 @@ Nepřečtené zprávy: %2</translation>
</message> </message>
<message> <message>
<source>Downloads</source> <source>Downloads</source>
<translation type="unfinished"></translation> <translation>Stahování</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2794,31 +2796,39 @@ Nepřečtené zprávy: %2</translation>
</message> </message>
<message> <message>
<source>HTML web pages (*.html)</source> <source>HTML web pages (*.html)</source>
<translation type="unfinished"></translation> <translation>HTML stránky (*.html)</translation>
</message> </message>
<message> <message>
<source>Select destination file for web page</source> <source>Select destination file for web page</source>
<translation type="unfinished"></translation> <translation>Zvolte cílový soubor pro webovou stránku</translation>
</message> </message>
<message> <message>
<source>Cannot save web page</source> <source>Cannot save web page</source>
<translation type="unfinished"></translation> <translation>Nelze uložit webovou stránku</translation>
</message> </message>
<message> <message>
<source>Web page cannot be saved because destination file is not writtable.</source> <source>Web page cannot be saved because destination file is not writtable.</source>
<translation type="unfinished"></translation> <translation>Webová stránka nemůže být uložena, protože do cíle nelze zapisovat.</translation>
</message> </message>
<message> <message>
<source>Save target as...</source> <source>Save target as...</source>
<translation type="unfinished"></translation> <translation>Uložit cíl jako...</translation>
</message> </message>
<message> <message>
<source>Download content from the hyperlink.</source> <source>Download content from the hyperlink.</source>
<translation type="unfinished"></translation> <translation>Stáhnout cíl odkazu.</translation>
</message> </message>
<message> <message>
<source>Save page as...</source> <source>Save page as...</source>
<translation type="unfinished"></translation> <translation>Uložit stránku jako...</translation>
</message>
<message>
<source>Save image to disk.</source>
<translation>Uloží obrázek na disk.</translation>
</message>
<message>
<source>Save image as...</source>
<translation>Uložit obrázek jako...</translation>
</message> </message>
</context> </context>
</TS> </TS>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0" language="de_DE"> <TS version="2.1" language="de_DE">
<context> <context>
<name>Application</name> <name>Application</name>
<message> <message>
@ -29,17 +29,6 @@
<translation>Unbekannter Fehler.</translation> <translation>Unbekannter Fehler.</translation>
</message> </message>
</context> </context>
<context>
<name>DownloadDialog</name>
<message>
<source>Downloading %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>DownloadItem</name> <name>DownloadItem</name>
<message> <message>
@ -50,22 +39,6 @@
<source>Filename</source> <source>Filename</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Stop</source>
<translation type="unfinished">Stopp</translation>
</message>
<message>
<source>Save File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download canceled: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory (%1) couldn&apos;t be created.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error opening output file: %1</source> <source>Error opening output file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -74,10 +47,6 @@
<source>Error saving: %1</source> <source>Error saving: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Network Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>%1 of %2 (%3/sec) - %4</source> <source>%1 of %2 (%3/sec) - %4</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -91,29 +60,52 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Try again</source> <source>&amp;Try again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Open file</source> <source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open &amp;folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select destination for downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download for %1 cancelled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory %1 couldn&apos;t be created</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1</source>
<translation type="unfinished">Fehler: %1. {1?}</translation>
</message>
<message>
<source>Cannot open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot open output folder. Open it manually.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
<name>DownloadManager</name> <name>DownloadManager</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Clean up</source> <source>Clean up</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>There are %1 downloads in progress
Do you want to quit anyway?</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<source>%n minutes remaining</source> <source>%n minutes remaining</source>
<translation type="unfinished"> <translation type="unfinished">
@ -210,12 +202,10 @@ Do you want to quit anyway?</source>
</message> </message>
<message> <message>
<source>Titles of feeds/categories.</source> <source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Titel der Feeds/Kategorien.</translation> <translation>Titel der Feeds/Kategorien.</translation>
</message> </message>
<message> <message>
<source>Counts of unread/all meesages.</source> <source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation>Anzahl ungelesener/aller Nachrichten.</translation> <translation>Anzahl ungelesener/aller Nachrichten.</translation>
</message> </message>
<message> <message>
@ -1530,9 +1520,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
<extracomment>Language settings section. <extracomment>Language settings section.</extracomment>
----------
Language column of language list.</extracomment>
<translation>Sprache</translation> <translation>Sprache</translation>
</message> </message>
<message> <message>
@ -1590,12 +1578,10 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Code</source> <source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Code</translation> <translation>Code</translation>
</message> </message>
<message> <message>
<source>Version</source> <source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Version</translation> <translation>Version</translation>
</message> </message>
<message> <message>
@ -1673,7 +1659,6 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Name</source> <source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
<message> <message>
@ -2071,6 +2056,34 @@ You have to restart manually.</source>
<source>Remove duplicate messages</source> <source>Remove duplicate messages</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory for downloaded files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ask for each individual downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save all downloaded files into</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory where all downloaded files are saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Browse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select downloads target directory</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FormUpdate</name> <name>FormUpdate</name>
@ -2214,52 +2227,42 @@ Go to application website to obtain it manually.</source>
<name>MessagesModel</name> <name>MessagesModel</name>
<message> <message>
<source>Id</source> <source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>ID</translation> <translation>ID</translation>
</message> </message>
<message> <message>
<source>Read</source> <source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Lesen</translation> <translation>Lesen</translation>
</message> </message>
<message> <message>
<source>Deleted</source> <source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Gelöscht</translation> <translation>Gelöscht</translation>
</message> </message>
<message> <message>
<source>Important</source> <source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Wichtig</translation> <translation>Wichtig</translation>
</message> </message>
<message> <message>
<source>Feed</source> <source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Feed</translation> <translation>Feed</translation>
</message> </message>
<message> <message>
<source>Title</source> <source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titel</translation> <translation>Titel</translation>
</message> </message>
<message> <message>
<source>Url</source> <source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>Url</translation> <translation>Url</translation>
</message> </message>
<message> <message>
<source>Author</source> <source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Author</translation> <translation>Author</translation>
</message> </message>
<message> <message>
<source>Created on</source> <source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Erstellt am</translation> <translation>Erstellt am</translation>
</message> </message>
<message> <message>
<source>Contents</source> <source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Inhalt</translation> <translation>Inhalt</translation>
</message> </message>
<message> <message>
@ -2304,7 +2307,6 @@ Go to application website to obtain it manually.</source>
</message> </message>
<message> <message>
<source>Permanently deleted</source> <source>Permanently deleted</source>
<extracomment>Tooltip for &quot;pdeleted&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2791,5 +2793,13 @@ Unread news: %2</source>
<source>Save page as...</source> <source>Save page as...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Save image to disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save image as...</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0" language="en_GB"> <TS version="2.1" language="en_GB">
<context> <context>
<name>Application</name> <name>Application</name>
<message> <message>
@ -29,17 +29,6 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>DownloadDialog</name>
<message>
<source>Downloading %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>DownloadItem</name> <name>DownloadItem</name>
<message> <message>
@ -50,22 +39,6 @@
<source>Filename</source> <source>Filename</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download canceled: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory (%1) couldn&apos;t be created.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error opening output file: %1</source> <source>Error opening output file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -74,10 +47,6 @@
<source>Error saving: %1</source> <source>Error saving: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Network Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>%1 of %2 (%3/sec) - %4</source> <source>%1 of %2 (%3/sec) - %4</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -91,29 +60,52 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Try again</source> <source>&amp;Try again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Open file</source> <source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open &amp;folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select destination for downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download for %1 cancelled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory %1 couldn&apos;t be created</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot open output folder. Open it manually.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
<name>DownloadManager</name> <name>DownloadManager</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Clean up</source> <source>Clean up</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>There are %1 downloads in progress
Do you want to quit anyway?</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<source>%n minutes remaining</source> <source>%n minutes remaining</source>
<translation type="unfinished"> <translation type="unfinished">
@ -210,12 +202,10 @@ Do you want to quit anyway?</source>
</message> </message>
<message> <message>
<source>Titles of feeds/categories.</source> <source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Counts of unread/all meesages.</source> <source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1530,9 +1520,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
<extracomment>Language settings section. <extracomment>Language settings section.</extracomment>
----------
Language column of language list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1590,12 +1578,10 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Code</source> <source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Version</source> <source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1673,7 +1659,6 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Name</source> <source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2069,6 +2054,34 @@ You have to restart manually.</source>
<source>Remove duplicate messages</source> <source>Remove duplicate messages</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory for downloaded files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ask for each individual downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save all downloaded files into</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory where all downloaded files are saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Browse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select downloads target directory</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FormUpdate</name> <name>FormUpdate</name>
@ -2209,52 +2222,42 @@ Go to application website to obtain it manually.</source>
<name>MessagesModel</name> <name>MessagesModel</name>
<message> <message>
<source>Id</source> <source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Read</source> <source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Deleted</source> <source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Important</source> <source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Feed</source> <source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Title</source> <source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Url</source> <source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Author</source> <source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Created on</source> <source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Contents</source> <source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2299,7 +2302,6 @@ Go to application website to obtain it manually.</source>
</message> </message>
<message> <message>
<source>Permanently deleted</source> <source>Permanently deleted</source>
<extracomment>Tooltip for &quot;pdeleted&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2786,5 +2788,13 @@ Unread news: %2</source>
<source>Save page as...</source> <source>Save page as...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Save image to disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save image as...</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0" language="fr_FR"> <TS version="2.1" language="fr_FR">
<context> <context>
<name>Application</name> <name>Application</name>
<message> <message>
@ -29,17 +29,6 @@
<translation>Erreur inconnue.</translation> <translation>Erreur inconnue.</translation>
</message> </message>
</context> </context>
<context>
<name>DownloadDialog</name>
<message>
<source>Downloading %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>DownloadItem</name> <name>DownloadItem</name>
<message> <message>
@ -50,22 +39,6 @@
<source>Filename</source> <source>Filename</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Stop</source>
<translation type="unfinished">Stop</translation>
</message>
<message>
<source>Save File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download canceled: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory (%1) couldn&apos;t be created.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error opening output file: %1</source> <source>Error opening output file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -74,10 +47,6 @@
<source>Error saving: %1</source> <source>Error saving: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Network Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>%1 of %2 (%3/sec) - %4</source> <source>%1 of %2 (%3/sec) - %4</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -91,29 +60,52 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Try again</source> <source>&amp;Try again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Open file</source> <source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open &amp;folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select destination for downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download for %1 cancelled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory %1 couldn&apos;t be created</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1</source>
<translation type="unfinished">Erreur : %1. {1?}</translation>
</message>
<message>
<source>Cannot open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot open output folder. Open it manually.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
<name>DownloadManager</name> <name>DownloadManager</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Clean up</source> <source>Clean up</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>There are %1 downloads in progress
Do you want to quit anyway?</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<source>%n minutes remaining</source> <source>%n minutes remaining</source>
<translation type="unfinished"> <translation type="unfinished">
@ -210,12 +202,10 @@ Do you want to quit anyway?</source>
</message> </message>
<message> <message>
<source>Titles of feeds/categories.</source> <source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Titres des flux/catégories.</translation> <translation>Titres des flux/catégories.</translation>
</message> </message>
<message> <message>
<source>Counts of unread/all meesages.</source> <source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation>Nombre des messages lus/non-lus.</translation> <translation>Nombre des messages lus/non-lus.</translation>
</message> </message>
<message> <message>
@ -1531,9 +1521,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
<extracomment>Language settings section. <extracomment>Language settings section.</extracomment>
----------
Language column of language list.</extracomment>
<translation>Langage</translation> <translation>Langage</translation>
</message> </message>
<message> <message>
@ -1591,12 +1579,10 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Code</source> <source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Code</translation> <translation>Code</translation>
</message> </message>
<message> <message>
<source>Version</source> <source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Version</translation> <translation>Version</translation>
</message> </message>
<message> <message>
@ -1674,7 +1660,6 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Name</source> <source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Nom</translation> <translation>Nom</translation>
</message> </message>
<message> <message>
@ -2088,6 +2073,34 @@ You have to restart manually.</source>
<source>Remove duplicate messages</source> <source>Remove duplicate messages</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory for downloaded files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ask for each individual downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save all downloaded files into</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory where all downloaded files are saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Browse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select downloads target directory</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FormUpdate</name> <name>FormUpdate</name>
@ -2232,52 +2245,42 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
<name>MessagesModel</name> <name>MessagesModel</name>
<message> <message>
<source>Id</source> <source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>Id</translation> <translation>Id</translation>
</message> </message>
<message> <message>
<source>Read</source> <source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Lire</translation> <translation>Lire</translation>
</message> </message>
<message> <message>
<source>Deleted</source> <source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Supprimé</translation> <translation>Supprimé</translation>
</message> </message>
<message> <message>
<source>Important</source> <source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Important</translation> <translation>Important</translation>
</message> </message>
<message> <message>
<source>Feed</source> <source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Flux</translation> <translation>Flux</translation>
</message> </message>
<message> <message>
<source>Title</source> <source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titre</translation> <translation>Titre</translation>
</message> </message>
<message> <message>
<source>Url</source> <source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>Url</translation> <translation>Url</translation>
</message> </message>
<message> <message>
<source>Author</source> <source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Auteur</translation> <translation>Auteur</translation>
</message> </message>
<message> <message>
<source>Created on</source> <source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Crée sur</translation> <translation>Crée sur</translation>
</message> </message>
<message> <message>
<source>Contents</source> <source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Contenus</translation> <translation>Contenus</translation>
</message> </message>
<message> <message>
@ -2322,7 +2325,6 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
</message> </message>
<message> <message>
<source>Permanently deleted</source> <source>Permanently deleted</source>
<extracomment>Tooltip for &quot;pdeleted&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2809,5 +2811,13 @@ Unread news: %2</source>
<source>Save page as...</source> <source>Save page as...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Save image to disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save image as...</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0" language="it_IT"> <TS version="2.1" language="it_IT">
<context> <context>
<name>Application</name> <name>Application</name>
<message> <message>
@ -29,17 +29,6 @@
<translation>Errore sconosciuto.</translation> <translation>Errore sconosciuto.</translation>
</message> </message>
</context> </context>
<context>
<name>DownloadDialog</name>
<message>
<source>Downloading %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>DownloadItem</name> <name>DownloadItem</name>
<message> <message>
@ -50,22 +39,6 @@
<source>Filename</source> <source>Filename</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Stop</source>
<translation type="unfinished">Ferma</translation>
</message>
<message>
<source>Save File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download canceled: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory (%1) couldn&apos;t be created.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error opening output file: %1</source> <source>Error opening output file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -74,10 +47,6 @@
<source>Error saving: %1</source> <source>Error saving: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Network Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>%1 of %2 (%3/sec) - %4</source> <source>%1 of %2 (%3/sec) - %4</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -91,29 +60,52 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Try again</source> <source>&amp;Try again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Open file</source> <source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open &amp;folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select destination for downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download for %1 cancelled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory %1 couldn&apos;t be created</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1</source>
<translation type="unfinished">Errore: %1. {1?}</translation>
</message>
<message>
<source>Cannot open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot open output folder. Open it manually.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
<name>DownloadManager</name> <name>DownloadManager</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Clean up</source> <source>Clean up</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>There are %1 downloads in progress
Do you want to quit anyway?</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<source>%n minutes remaining</source> <source>%n minutes remaining</source>
<translation type="unfinished"> <translation type="unfinished">
@ -210,12 +202,10 @@ Do you want to quit anyway?</source>
</message> </message>
<message> <message>
<source>Titles of feeds/categories.</source> <source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Titoli dei feed/categorie.</translation> <translation>Titoli dei feed/categorie.</translation>
</message> </message>
<message> <message>
<source>Counts of unread/all meesages.</source> <source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation>Conteggio dei messaggi non letti/tutti.</translation> <translation>Conteggio dei messaggi non letti/tutti.</translation>
</message> </message>
<message> <message>
@ -1530,9 +1520,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
<extracomment>Language settings section. <extracomment>Language settings section.</extracomment>
----------
Language column of language list.</extracomment>
<translation>Lingua</translation> <translation>Lingua</translation>
</message> </message>
<message> <message>
@ -1590,12 +1578,10 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Code</source> <source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Codice</translation> <translation>Codice</translation>
</message> </message>
<message> <message>
<source>Version</source> <source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Versione</translation> <translation>Versione</translation>
</message> </message>
<message> <message>
@ -1673,7 +1659,6 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Name</source> <source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Nome</translation> <translation>Nome</translation>
</message> </message>
<message> <message>
@ -2071,6 +2056,34 @@ You have to restart manually.</source>
<source>Remove duplicate messages</source> <source>Remove duplicate messages</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory for downloaded files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ask for each individual downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save all downloaded files into</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory where all downloaded files are saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Browse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select downloads target directory</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FormUpdate</name> <name>FormUpdate</name>
@ -2214,52 +2227,42 @@ Go to application website to obtain it manually.</source>
<name>MessagesModel</name> <name>MessagesModel</name>
<message> <message>
<source>Id</source> <source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>Id</translation> <translation>Id</translation>
</message> </message>
<message> <message>
<source>Read</source> <source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Leggi</translation> <translation>Leggi</translation>
</message> </message>
<message> <message>
<source>Deleted</source> <source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Eliminato</translation> <translation>Eliminato</translation>
</message> </message>
<message> <message>
<source>Important</source> <source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Importante</translation> <translation>Importante</translation>
</message> </message>
<message> <message>
<source>Feed</source> <source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Feed</translation> <translation>Feed</translation>
</message> </message>
<message> <message>
<source>Title</source> <source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titolo</translation> <translation>Titolo</translation>
</message> </message>
<message> <message>
<source>Url</source> <source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>Url</translation> <translation>Url</translation>
</message> </message>
<message> <message>
<source>Author</source> <source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Autore</translation> <translation>Autore</translation>
</message> </message>
<message> <message>
<source>Created on</source> <source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Creato il</translation> <translation>Creato il</translation>
</message> </message>
<message> <message>
<source>Contents</source> <source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Contenuti</translation> <translation>Contenuti</translation>
</message> </message>
<message> <message>
@ -2304,7 +2307,6 @@ Go to application website to obtain it manually.</source>
</message> </message>
<message> <message>
<source>Permanently deleted</source> <source>Permanently deleted</source>
<extracomment>Tooltip for &quot;pdeleted&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2791,5 +2793,13 @@ Unread news: %2</source>
<source>Save page as...</source> <source>Save page as...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Save image to disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save image as...</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0" language="nl_NL"> <TS version="2.1" language="nl_NL">
<context> <context>
<name>Application</name> <name>Application</name>
<message> <message>
@ -29,17 +29,6 @@
<translation>Onbekende fout.</translation> <translation>Onbekende fout.</translation>
</message> </message>
</context> </context>
<context>
<name>DownloadDialog</name>
<message>
<source>Downloading %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>DownloadItem</name> <name>DownloadItem</name>
<message> <message>
@ -50,22 +39,6 @@
<source>Filename</source> <source>Filename</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Stop</source>
<translation type="unfinished">Stop</translation>
</message>
<message>
<source>Save File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download canceled: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory (%1) couldn&apos;t be created.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error opening output file: %1</source> <source>Error opening output file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -74,10 +47,6 @@
<source>Error saving: %1</source> <source>Error saving: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Network Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>%1 of %2 (%3/sec) - %4</source> <source>%1 of %2 (%3/sec) - %4</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -91,29 +60,52 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Try again</source> <source>&amp;Try again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Open file</source> <source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open &amp;folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select destination for downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download for %1 cancelled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory %1 couldn&apos;t be created</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1</source>
<translation type="unfinished">Fout: %1. {1?}</translation>
</message>
<message>
<source>Cannot open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot open output folder. Open it manually.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
<name>DownloadManager</name> <name>DownloadManager</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Clean up</source> <source>Clean up</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>There are %1 downloads in progress
Do you want to quit anyway?</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<source>%n minutes remaining</source> <source>%n minutes remaining</source>
<translation type="unfinished"> <translation type="unfinished">
@ -210,12 +202,10 @@ Do you want to quit anyway?</source>
</message> </message>
<message> <message>
<source>Titles of feeds/categories.</source> <source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Naam van feeds/categorieën.</translation> <translation>Naam van feeds/categorieën.</translation>
</message> </message>
<message> <message>
<source>Counts of unread/all meesages.</source> <source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation>Aantal van alle ongelezen berichten.</translation> <translation>Aantal van alle ongelezen berichten.</translation>
</message> </message>
<message> <message>
@ -1539,9 +1529,7 @@ Exporteer feeds die je wilt van het geselecteerde bestand.</translation>
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
<extracomment>Language settings section. <extracomment>Language settings section.</extracomment>
----------
Language column of language list.</extracomment>
<translation>Taal</translation> <translation>Taal</translation>
</message> </message>
<message> <message>
@ -1599,12 +1587,10 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Code</source> <source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Code</translation> <translation>Code</translation>
</message> </message>
<message> <message>
<source>Version</source> <source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Versie</translation> <translation>Versie</translation>
</message> </message>
<message> <message>
@ -1682,7 +1668,6 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Name</source> <source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Naam</translation> <translation>Naam</translation>
</message> </message>
<message> <message>
@ -2099,6 +2084,34 @@ Je moet handmatig herstarten.</translation>
<source>Remove duplicate messages</source> <source>Remove duplicate messages</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory for downloaded files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ask for each individual downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save all downloaded files into</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory where all downloaded files are saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Browse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select downloads target directory</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FormUpdate</name> <name>FormUpdate</name>
@ -2243,52 +2256,42 @@ Ga naar RRSguard website en download het handmatig.</translation>
<name>MessagesModel</name> <name>MessagesModel</name>
<message> <message>
<source>Id</source> <source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>ld</translation> <translation>ld</translation>
</message> </message>
<message> <message>
<source>Read</source> <source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Lees</translation> <translation>Lees</translation>
</message> </message>
<message> <message>
<source>Deleted</source> <source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>verwijder</translation> <translation>verwijder</translation>
</message> </message>
<message> <message>
<source>Important</source> <source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Belangrijk</translation> <translation>Belangrijk</translation>
</message> </message>
<message> <message>
<source>Feed</source> <source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Feed</translation> <translation>Feed</translation>
</message> </message>
<message> <message>
<source>Title</source> <source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titel</translation> <translation>Titel</translation>
</message> </message>
<message> <message>
<source>Url</source> <source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>Url</translation> <translation>Url</translation>
</message> </message>
<message> <message>
<source>Author</source> <source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Auteur</translation> <translation>Auteur</translation>
</message> </message>
<message> <message>
<source>Created on</source> <source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Gemaakt op</translation> <translation>Gemaakt op</translation>
</message> </message>
<message> <message>
<source>Contents</source> <source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Inhoud</translation> <translation>Inhoud</translation>
</message> </message>
<message> <message>
@ -2333,7 +2336,6 @@ Ga naar RRSguard website en download het handmatig.</translation>
</message> </message>
<message> <message>
<source>Permanently deleted</source> <source>Permanently deleted</source>
<extracomment>Tooltip for &quot;pdeleted&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2822,5 +2824,13 @@ Ongelezen nieuws: %2</translation>
<source>Save page as...</source> <source>Save page as...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Save image to disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save image as...</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0" language="sv_SE"> <TS version="2.1" language="sv_SE">
<context> <context>
<name>Application</name> <name>Application</name>
<message> <message>
@ -29,17 +29,6 @@
<translation>Okänt fel.</translation> <translation>Okänt fel.</translation>
</message> </message>
</context> </context>
<context>
<name>DownloadDialog</name>
<message>
<source>Downloading %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>DownloadItem</name> <name>DownloadItem</name>
<message> <message>
@ -50,22 +39,6 @@
<source>Filename</source> <source>Filename</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Stop</source>
<translation type="unfinished">Stopp</translation>
</message>
<message>
<source>Save File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download canceled: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory (%1) couldn&apos;t be created.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Error opening output file: %1</source> <source>Error opening output file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -74,10 +47,6 @@
<source>Error saving: %1</source> <source>Error saving: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Network Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>%1 of %2 (%3/sec) - %4</source> <source>%1 of %2 (%3/sec) - %4</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -91,29 +60,52 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Try again</source> <source>&amp;Try again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Open file</source> <source>&amp;Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open &amp;folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select destination for downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download for %1 cancelled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download directory %1 couldn&apos;t be created</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: %1</source>
<translation type="unfinished">Fel: %1. {1?}</translation>
</message>
<message>
<source>Cannot open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot open output folder. Open it manually.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
<name>DownloadManager</name> <name>DownloadManager</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Clean up</source> <source>Clean up</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>There are %1 downloads in progress
Do you want to quit anyway?</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<source>%n minutes remaining</source> <source>%n minutes remaining</source>
<translation type="unfinished"> <translation type="unfinished">
@ -210,12 +202,10 @@ Do you want to quit anyway?</source>
</message> </message>
<message> <message>
<source>Titles of feeds/categories.</source> <source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Namn kategorier/flöden.</translation> <translation>Namn kategorier/flöden.</translation>
</message> </message>
<message> <message>
<source>Counts of unread/all meesages.</source> <source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation>Antal meddelanden.</translation> <translation>Antal meddelanden.</translation>
</message> </message>
<message> <message>
@ -1537,9 +1527,7 @@ och/eller inställningar sparades. Tillse också att målmappen inte är skrivsk
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
<extracomment>Language settings section. <extracomment>Language settings section.</extracomment>
----------
Language column of language list.</extracomment>
<translation>Språk</translation> <translation>Språk</translation>
</message> </message>
<message> <message>
@ -1597,12 +1585,10 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Code</source> <source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Språkkod</translation> <translation>Språkkod</translation>
</message> </message>
<message> <message>
<source>Version</source> <source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Version</translation> <translation>Version</translation>
</message> </message>
<message> <message>
@ -1680,7 +1666,6 @@ Language column of language list.</extracomment>
</message> </message>
<message> <message>
<source>Name</source> <source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Namn</translation> <translation>Namn</translation>
</message> </message>
<message> <message>
@ -2097,6 +2082,34 @@ Du måste starta om manuellt.</translation>
<source>Remove duplicate messages</source> <source>Remove duplicate messages</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory for downloaded files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ask for each individual downloaded file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save all downloaded files into</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Target directory where all downloaded files are saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Browse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select downloads target directory</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FormUpdate</name> <name>FormUpdate</name>
@ -2240,52 +2253,42 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
<name>MessagesModel</name> <name>MessagesModel</name>
<message> <message>
<source>Id</source> <source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>ID</translation> <translation>ID</translation>
</message> </message>
<message> <message>
<source>Read</source> <source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Läst</translation> <translation>Läst</translation>
</message> </message>
<message> <message>
<source>Deleted</source> <source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Borttaget</translation> <translation>Borttaget</translation>
</message> </message>
<message> <message>
<source>Important</source> <source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Viktigt</translation> <translation>Viktigt</translation>
</message> </message>
<message> <message>
<source>Feed</source> <source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Flöde</translation> <translation>Flöde</translation>
</message> </message>
<message> <message>
<source>Title</source> <source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titel</translation> <translation>Titel</translation>
</message> </message>
<message> <message>
<source>Url</source> <source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>URL</translation> <translation>URL</translation>
</message> </message>
<message> <message>
<source>Author</source> <source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Författare</translation> <translation>Författare</translation>
</message> </message>
<message> <message>
<source>Created on</source> <source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Skapad</translation> <translation>Skapad</translation>
</message> </message>
<message> <message>
<source>Contents</source> <source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Innehåll</translation> <translation>Innehåll</translation>
</message> </message>
<message> <message>
@ -2330,7 +2333,6 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
</message> </message>
<message> <message>
<source>Permanently deleted</source> <source>Permanently deleted</source>
<extracomment>Tooltip for &quot;pdeleted&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2818,5 +2820,13 @@ Olästa nyheter: %2</translation>
<source>Save page as...</source> <source>Save page as...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Save image to disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save image as...</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -21,6 +21,7 @@
#include "miscellaneous/application.h" #include "miscellaneous/application.h"
#include "gui/formmain.h" #include "gui/formmain.h"
#include "gui/tabwidget.h" #include "gui/tabwidget.h"
#include "gui/messagebox.h"
#include "network-web/silentnetworkaccessmanager.h" #include "network-web/silentnetworkaccessmanager.h"
#include "network-web/webbrowsernetworkaccessmanager.h" #include "network-web/webbrowsernetworkaccessmanager.h"
@ -207,8 +208,19 @@ void DownloadItem::openFile() {
void DownloadItem::openFolder() { void DownloadItem::openFolder() {
if (m_output.exists()) { if (m_output.exists()) {
QString folder = QDir::toNativeSeparators(QFileInfo(m_output.fileName()).absoluteDir().absolutePath());
#if defined(Q_OS_WIN32)
QString file = QDir::toNativeSeparators(m_output.fileName()); QString file = QDir::toNativeSeparators(m_output.fileName());
QProcess::startDetached(QString("explorer.exe /select, \"") + file + "\"");
if (!QProcess::startDetached(QString("explorer.exe /select, \"") + file + "\"")) {
MessageBox::show(this, QMessageBox::Warning, tr("Cannot open folder"), tr("Cannot open output folder. Open it manually."), QString(), folder);
}
#else
if (!QDesktopServices::openUrl(QUrl::fromLocalFile(folder))) {
MessageBox::show(this, QMessageBox::Warning, tr("Cannot open folder"), tr("Cannot open output folder. Open it manually."), QString(), folder);
}
#endif
} }
} }
@ -435,22 +447,6 @@ int DownloadManager::activeDownloads() const
return count; return count;
} }
bool DownloadManager::allowQuit() {
if (activeDownloads() >= 1) {
int choice = QMessageBox::warning(this, QString(),
tr("There are %1 downloads in progress\n"
"Do you want to quit anyway?").arg(activeDownloads()),
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No);
if (choice == QMessageBox::No) {
show();
return false;
}
}
return true;
}
void DownloadManager::download(const QNetworkRequest &request, bool request_filename) void DownloadManager::download(const QNetworkRequest &request, bool request_filename)
{ {
if (request.url().isEmpty()) if (request.url().isEmpty())
@ -689,9 +685,7 @@ QString DownloadManager::dataString(qint64 size)
} }
DownloadModel::DownloadModel(DownloadManager *download_manager, QObject *parent) DownloadModel::DownloadModel(DownloadManager *download_manager, QObject *parent)
: QAbstractListModel(parent) : QAbstractListModel(parent), m_downloadManager(download_manager) {
, m_downloadManager(download_manager)
{
} }
QVariant DownloadModel::data(const QModelIndex &index, int role) const { QVariant DownloadModel::data(const QModelIndex &index, int role) const {
@ -708,53 +702,57 @@ QVariant DownloadModel::data(const QModelIndex &index, int role) const {
return QVariant(); return QVariant();
} }
int DownloadModel::rowCount(const QModelIndex &parent) const int DownloadModel::rowCount(const QModelIndex &parent) const {
{ return parent.isValid() ? 0 : m_downloadManager->m_downloads.count();
return (parent.isValid()) ? 0 : m_downloadManager->m_downloads.count();
} }
bool DownloadModel::removeRows(int row, int count, const QModelIndex &parent) bool DownloadModel::removeRows(int row, int count, const QModelIndex &parent) {
{ if (parent.isValid()) {
if (parent.isValid())
return false; return false;
}
int lastRow = row + count - 1; int lastRow = row + count - 1;
for (int i = lastRow; i >= row; --i) { for (int i = lastRow; i >= row; --i) {
if (m_downloadManager->m_downloads.at(i)->downloadedSuccessfully() if (m_downloadManager->m_downloads.at(i)->downloadedSuccessfully() ||
|| m_downloadManager->m_downloads.at(i)->m_ui->m_btnTryAgain->isEnabled()) { m_downloadManager->m_downloads.at(i)->m_ui->m_btnTryAgain->isEnabled()) {
beginRemoveRows(parent, i, i); beginRemoveRows(parent, i, i);
m_downloadManager->m_downloads.takeAt(i)->deleteLater(); m_downloadManager->m_downloads.takeAt(i)->deleteLater();
endRemoveRows(); endRemoveRows();
} }
} }
m_downloadManager->m_autoSaver->changeOccurred(); m_downloadManager->m_autoSaver->changeOccurred();
return true; return true;
} }
Qt::ItemFlags DownloadModel::flags(const QModelIndex &index) const Qt::ItemFlags DownloadModel::flags(const QModelIndex &index) const {
{ if (index.row() < 0 || index.row() >= rowCount(index.parent())) {
if (index.row() < 0 || index.row() >= rowCount(index.parent())) return Qt::NoItemFlags;
return 0; }
Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
Qt::ItemFlags default_flags = QAbstractItemModel::flags(index);
DownloadItem *item = m_downloadManager->m_downloads.at(index.row()); DownloadItem *item = m_downloadManager->m_downloads.at(index.row());
if (item->downloadedSuccessfully())
return defaultFlags | Qt::ItemIsDragEnabled;
return defaultFlags; if (item->downloadedSuccessfully()) {
return default_flags | Qt::ItemIsDragEnabled;
}
return default_flags;
} }
QMimeData *DownloadModel::mimeData(const QModelIndexList &indexes) const QMimeData *DownloadModel::mimeData(const QModelIndexList &indexes) const {
{
QMimeData *mimeData = new QMimeData(); QMimeData *mimeData = new QMimeData();
QList<QUrl> urls; QList<QUrl> urls;
foreach (const QModelIndex &index, indexes) { foreach (const QModelIndex &index, indexes) {
if (!index.isValid()) if (!index.isValid()) {
continue; continue;
DownloadItem *item = m_downloadManager->m_downloads.at(index.row()); }
urls.append(QUrl::fromLocalFile(QFileInfo(item->m_output).absoluteFilePath()));
urls.append(QUrl::fromLocalFile(QFileInfo(m_downloadManager->m_downloads.at(index.row())->m_output).absoluteFilePath()));
} }
mimeData->setUrls(urls); mimeData->setUrls(urls);
return mimeData; return mimeData;
} }

View file

@ -109,7 +109,6 @@ class DownloadManager : public TabContent {
QNetworkAccessManager *networkManager() const; QNetworkAccessManager *networkManager() const;
int activeDownloads() const; int activeDownloads() const;
bool allowQuit();
RemovePolicy removePolicy() const; RemovePolicy removePolicy() const;
void setRemovePolicy(RemovePolicy policy); void setRemovePolicy(RemovePolicy policy);
@ -128,13 +127,14 @@ class DownloadManager : public TabContent {
private slots: private slots:
void save() const; void save() const;
void load();
void updateRow(DownloadItem *item); void updateRow(DownloadItem *item);
void updateRow(); void updateRow();
void finished(); void finished();
private: private:
void addItem(DownloadItem *item); void addItem(DownloadItem *item);
void load();
Ui::DownloadManager *m_ui; Ui::DownloadManager *m_ui;
AutoSaver *m_autoSaver; AutoSaver *m_autoSaver;

View file

@ -10,9 +10,6 @@
<height>300</height> <height>300</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="EditTableView" name="m_viewDownloads"> <widget class="EditTableView" name="m_viewDownloads">

View file

@ -144,16 +144,12 @@ void WebView::initializeActions() {
// Create needed actions. // Create needed actions.
m_actionReload = pageAction(QWebPage::Reload); m_actionReload = pageAction(QWebPage::Reload);
m_actionReload->setParent(this); m_actionReload->setParent(this);
m_actionReload->setText(tr("Reload web page"));
m_actionReload->setToolTip(tr("Reload current web page."));
m_actionPrint = new QAction(tr("Print"), this); m_actionPrint = new QAction(tr("Print"), this);
m_actionPrint->setToolTip(tr("Print current web page.")); m_actionPrint->setToolTip(tr("Print current web page."));
m_actionCopySelectedItem = pageAction(QWebPage::Copy); m_actionCopySelectedItem = pageAction(QWebPage::Copy);
m_actionCopySelectedItem->setParent(this); m_actionCopySelectedItem->setParent(this);
m_actionCopySelectedItem->setText(tr("Copy selection"));
m_actionCopySelectedItem->setToolTip(tr("Copies current selection into the clipboard."));
#if defined(Q_OS_OS2) #if defined(Q_OS_OS2)
m_actionCopySelectedItem->setShortcut(QKeySequence::Copy); m_actionCopySelectedItem->setShortcut(QKeySequence::Copy);
@ -162,48 +158,60 @@ void WebView::initializeActions() {
m_actionSaveHyperlinkAs = pageAction(QWebPage::DownloadLinkToDisk); m_actionSaveHyperlinkAs = pageAction(QWebPage::DownloadLinkToDisk);
m_actionSaveHyperlinkAs->setParent(this); m_actionSaveHyperlinkAs->setParent(this);
m_actionSaveHyperlinkAs->setText(tr("Save target as..."));
m_actionSaveHyperlinkAs->setToolTip(tr("Download content from the hyperlink."));
m_actionCopyLink = pageAction(QWebPage::CopyLinkToClipboard); m_actionCopyLink = pageAction(QWebPage::CopyLinkToClipboard);
m_actionCopyLink->setParent(this); m_actionCopyLink->setParent(this);
m_actionCopyLink->setText(tr("Copy link url"));
m_actionCopyLink->setToolTip(tr("Copy link url to clipboard."));
m_actionCopyImage = pageAction(QWebPage::CopyImageToClipboard); m_actionCopyImage = pageAction(QWebPage::CopyImageToClipboard);
m_actionCopyImage->setParent(this); m_actionCopyImage->setParent(this);
m_actionCopyImage->setText(tr("Copy image"));
m_actionCopyImage->setToolTip(tr("Copy image to clipboard."));
m_actionSaveImageAs = pageAction(QWebPage::DownloadImageToDisk); m_actionSaveImageAs = pageAction(QWebPage::DownloadImageToDisk);
m_actionSaveImageAs->setParent(this); m_actionSaveImageAs->setParent(this);
m_actionSaveImageAs->setText("Save image as...");
m_actionSaveImageAs->setToolTip(tr("Save image to disk."));
m_actionSavePageAs = new QAction(qApp->icons()->fromTheme("document-download"), tr("Save page as..."), this); m_actionSavePageAs = new QAction(qApp->icons()->fromTheme("document-download"), tr("Save page as..."), this);
#if QT_VERSION >= 0x040800 #if QT_VERSION >= 0x040800
m_actionCopyImageUrl = pageAction(QWebPage::CopyImageUrlToClipboard); m_actionCopyImageUrl = pageAction(QWebPage::CopyImageUrlToClipboard);
m_actionCopyImageUrl->setParent(this); m_actionCopyImageUrl->setParent(this);
m_actionCopyImageUrl->setText(tr("Copy image url"));
m_actionCopyImageUrl->setToolTip(tr("Copy image url to clipboard."));
#endif #endif
m_actionOpenLinkNewTab = pageAction(QWebPage::OpenLinkInNewWindow); m_actionOpenLinkNewTab = pageAction(QWebPage::OpenLinkInNewWindow);
m_actionOpenLinkNewTab->setParent(this); m_actionOpenLinkNewTab->setParent(this);
m_actionOpenLinkNewTab->setText(tr("Open link in new tab"));
m_actionOpenLinkNewTab->setToolTip(tr("Open this hyperlink in new tab."));
m_actionOpenLinkThisTab = pageAction(QWebPage::OpenLink); m_actionOpenLinkThisTab = pageAction(QWebPage::OpenLink);
m_actionOpenLinkThisTab->setParent(this); m_actionOpenLinkThisTab->setParent(this);
m_actionOpenLinkThisTab->setText(tr("Follow link"));
m_actionOpenLinkThisTab->setToolTip(tr("Open the hyperlink in this tab."));
m_actionOpenLinkExternally = new QAction(tr("Open link in external browser"), this); m_actionOpenLinkExternally = new QAction(tr("Open link in external browser"), this);
m_actionOpenLinkExternally->setToolTip(tr("Open the hyperlink in external browser."));
m_actionOpenImageNewTab = pageAction(QWebPage::OpenImageInNewWindow); m_actionOpenImageNewTab = pageAction(QWebPage::OpenImageInNewWindow);
m_actionOpenImageNewTab->setParent(this); m_actionOpenImageNewTab->setParent(this);
}
void WebView::setActionTexts() {
m_actionReload->setText(tr("Reload web page"));
m_actionReload->setToolTip(tr("Reload current web page."));
m_actionCopySelectedItem->setText(tr("Copy selection"));
m_actionCopySelectedItem->setToolTip(tr("Copies current selection into the clipboard."));
m_actionSaveHyperlinkAs->setText(tr("Save target as..."));
m_actionSaveHyperlinkAs->setToolTip(tr("Download content from the hyperlink."));
m_actionCopyLink->setText(tr("Copy link url"));
m_actionCopyLink->setToolTip(tr("Copy link url to clipboard."));
m_actionCopyImage->setText(tr("Copy image"));
m_actionCopyImage->setToolTip(tr("Copy image to clipboard."));
m_actionSaveImageAs->setText(tr("Save image as..."));
m_actionSaveImageAs->setToolTip(tr("Save image to disk."));
#if QT_VERSION >= 0x040800
m_actionCopyImageUrl->setText(tr("Copy image url"));
m_actionCopyImageUrl->setToolTip(tr("Copy image url to clipboard."));
#endif
m_actionOpenLinkNewTab->setText(tr("Open link in new tab"));
m_actionOpenLinkNewTab->setToolTip(tr("Open this hyperlink in new tab."));
m_actionOpenLinkThisTab->setText(tr("Follow link"));
m_actionOpenLinkThisTab->setToolTip(tr("Open the hyperlink in this tab."));
m_actionOpenLinkExternally->setToolTip(tr("Open the hyperlink in external browser."));
m_actionOpenImageNewTab->setText(tr("Open image in new tab")); m_actionOpenImageNewTab->setText(tr("Open image in new tab"));
m_actionOpenImageNewTab->setToolTip(tr("Open this image in this tab.")); m_actionOpenImageNewTab->setToolTip(tr("Open this image in this tab."));
} }
@ -281,6 +289,7 @@ void WebView::popupContextMenu(const QPoint &pos) {
} }
// Display the menu. // Display the menu.
setActionTexts();
context_menu.exec(mapToGlobal(pos)); context_menu.exec(mapToGlobal(pos));
} }
@ -305,7 +314,6 @@ void WebView::mousePressEvent(QMouseEvent *event) {
if (link_url.isValid()) { if (link_url.isValid()) {
emit linkMiddleClicked(link_url); emit linkMiddleClicked(link_url);
// No more handling of event is now needed. Return.
return; return;
} }
else if (image_url.isValid()) { else if (image_url.isValid()) {

View file

@ -78,6 +78,8 @@ class WebView : public QWebView {
// Initializes all actions. // Initializes all actions.
void initializeActions(); void initializeActions();
void setActionTexts();
// Creates necessary connections. // Creates necessary connections.
void createConnections(); void createConnections();