FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanups.

Browse Source
This commit is contained in:
Martin Rotter 2014-11-09 10:22:15 +01:00
parent 05f2e28984
commit d3b97ddf98
19 changed files with 518 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -208,7 +208,7 @@ else(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release"
# See http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
message(STATUS "[${APP_LOW_NAME}] Enabling verbose makefile and full warning reports.")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-pedantic -Wall -Wextra)
add_definitions(-pedantic -Wall) # -Wextra -Wno-unused-variable
endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
# Verbose compiling outputs.

33
localization/rssguard-cs_CZ.ts
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="cs_CZ">
<TS version="2.1" language="cs_CZ">
<context>
<name>Application</name>
<message>
@ -94,12 +94,10 @@
</message>
<message>
<source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Názvy kanálů/kategorií.</translation>
</message>
<message>
<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>
</message>
<message>
@ -1335,6 +1333,10 @@ and/or settings were backed or not. Also make sure that target foder is writable
<source>&amp;Backup database/settings</source>
<translation>&amp;Zálohovat databázi/nastavení</translation>
</message>
<message>
<source>Switch message list layout orientation</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1416,9 +1418,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message>
<message>
<source>Language</source>
<extracomment>Language settings section.
----------
Language column of language list.</extracomment>
<extracomment>Language settings section.</extracomment>
<translation>Lokalizace</translation>
</message>
<message>
@ -1476,12 +1476,10 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Kód</translation>
</message>
<message>
<source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Verze</translation>
</message>
<message>
@ -1559,7 +1557,6 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Název</translation>
</message>
<message>
@ -2104,52 +2101,42 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
<name>MessagesModel</name>
<message>
<source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation></translation>
</message>
<message>
<source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Přečteno</translation>
</message>
<message>
<source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Smazáno</translation>
</message>
<message>
<source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Důležité</translation>
</message>
<message>
<source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Kanál</translation>
</message>
<message>
<source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Nadpis</translation>
</message>
<message>
<source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation></translation>
</message>
<message>
<source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Autor</translation>
</message>
<message>
<source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Vytvořeno</translation>
</message>
<message>
<source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Obsah</translation>
</message>
<message>
@ -2192,6 +2179,14 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
<source>Contents of the message.</source>
<translation>Obsah zprávy.</translation>
</message>
<message>
<source>Permanently deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Is message permanently deleted from recycle bin?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MessagesToolBar</name>

33
localization/rssguard-de_DE.ts
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="de_DE">
<TS version="2.1" language="de_DE">
<context>
<name>Application</name>
<message>
@ -94,12 +94,10 @@
</message>
<message>
<source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Titel der Feeds/Kategorien.</translation>
</message>
<message>
<source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation>Anzahl ungelesener/aller Nachrichten.</translation>
</message>
<message>
@ -1325,6 +1323,10 @@ and/or settings were backed or not. Also make sure that target foder is writable
<source>&amp;Backup database/settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch message list layout orientation</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1406,9 +1408,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message>
<message>
<source>Language</source>
<extracomment>Language settings section.
----------
Language column of language list.</extracomment>
<extracomment>Language settings section.</extracomment>
<translation>Sprache</translation>
</message>
<message>
@ -1466,12 +1466,10 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Code</translation>
</message>
<message>
<source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Version</translation>
</message>
<message>
@ -1549,7 +1547,6 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Name</translation>
</message>
<message>
@ -2078,52 +2075,42 @@ Go to application website to obtain it manually.</source>
<name>MessagesModel</name>
<message>
<source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>ID</translation>
</message>
<message>
<source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Lesen</translation>
</message>
<message>
<source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Gelöscht</translation>
</message>
<message>
<source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Wichtig</translation>
</message>
<message>
<source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Feed</translation>
</message>
<message>
<source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titel</translation>
</message>
<message>
<source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>Url</translation>
</message>
<message>
<source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Author</translation>
</message>
<message>
<source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Erstellt am</translation>
</message>
<message>
<source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Inhalt</translation>
</message>
<message>
@ -2166,6 +2153,14 @@ Go to application website to obtain it manually.</source>
<source>Contents of the message.</source>
<translation>Inhalt der Nachricht.</translation>
</message>
<message>
<source>Permanently deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Is message permanently deleted from recycle bin?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MessagesToolBar</name>

33
localization/rssguard-en_GB.ts
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="en_GB">
<TS version="2.1" language="en_GB">
<context>
<name>Application</name>
<message>
@ -94,12 +94,10 @@
</message>
<message>
<source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -1325,6 +1323,10 @@ and/or settings were backed or not. Also make sure that target foder is writable
<source>&amp;Backup database/settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch message list layout orientation</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1406,9 +1408,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message>
<message>
<source>Language</source>
<extracomment>Language settings section.
----------
Language column of language list.</extracomment>
<extracomment>Language settings section.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -1466,12 +1466,10 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -1549,7 +1547,6 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -2073,52 +2070,42 @@ Go to application website to obtain it manually.</source>
<name>MessagesModel</name>
<message>
<source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -2161,6 +2148,14 @@ Go to application website to obtain it manually.</source>
<source>Contents of the message.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Permanently deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Is message permanently deleted from recycle bin?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MessagesToolBar</name>

470
localization/rssguard-en_US.ts
View File

File diff suppressed because it is too large Load Diff

33
localization/rssguard-fr_FR.ts
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="fr_FR">
<TS version="2.1" language="fr_FR">
<context>
<name>Application</name>
<message>
@ -94,12 +94,10 @@
</message>
<message>
<source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Titres des flux/catégories.</translation>
</message>
<message>
<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>
</message>
<message>
@ -1326,6 +1324,10 @@ and/or settings were backed or not. Also make sure that target foder is writable
<source>&amp;Backup database/settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch message list layout orientation</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1407,9 +1409,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message>
<message>
<source>Language</source>
<extracomment>Language settings section.
----------
Language column of language list.</extracomment>
<extracomment>Language settings section.</extracomment>
<translation>Langage</translation>
</message>
<message>
@ -1467,12 +1467,10 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Code</translation>
</message>
<message>
<source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Version</translation>
</message>
<message>
@ -1550,7 +1548,6 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Nom</translation>
</message>
<message>
@ -2096,52 +2093,42 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
<name>MessagesModel</name>
<message>
<source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>Id</translation>
</message>
<message>
<source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Lire</translation>
</message>
<message>
<source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Supprimé</translation>
</message>
<message>
<source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Important</translation>
</message>
<message>
<source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Flux</translation>
</message>
<message>
<source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titre</translation>
</message>
<message>
<source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>Url</translation>
</message>
<message>
<source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Auteur</translation>
</message>
<message>
<source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Crée sur</translation>
</message>
<message>
<source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Contenus</translation>
</message>
<message>
@ -2184,6 +2171,14 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
<source>Contents of the message.</source>
<translation>Contenu du message.</translation>
</message>
<message>
<source>Permanently deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Is message permanently deleted from recycle bin?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MessagesToolBar</name>

33
localization/rssguard-it_IT.ts
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="it_IT">
<TS version="2.1" language="it_IT">
<context>
<name>Application</name>
<message>
@ -94,12 +94,10 @@
</message>
<message>
<source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Titoli dei feed/categorie.</translation>
</message>
<message>
<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>
</message>
<message>
@ -1325,6 +1323,10 @@ and/or settings were backed or not. Also make sure that target foder is writable
<source>&amp;Backup database/settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch message list layout orientation</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1406,9 +1408,7 @@ and/or settings were backed or not. Also make sure that target foder is writable
</message>
<message>
<source>Language</source>
<extracomment>Language settings section.
----------
Language column of language list.</extracomment>
<extracomment>Language settings section.</extracomment>
<translation>Lingua</translation>
</message>
<message>
@ -1466,12 +1466,10 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Codice</translation>
</message>
<message>
<source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Versione</translation>
</message>
<message>
@ -1549,7 +1547,6 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Nome</translation>
</message>
<message>
@ -2078,52 +2075,42 @@ Go to application website to obtain it manually.</source>
<name>MessagesModel</name>
<message>
<source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>Id</translation>
</message>
<message>
<source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Leggi</translation>
</message>
<message>
<source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Eliminato</translation>
</message>
<message>
<source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Importante</translation>
</message>
<message>
<source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Feed</translation>
</message>
<message>
<source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titolo</translation>
</message>
<message>
<source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>Url</translation>
</message>
<message>
<source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Autore</translation>
</message>
<message>
<source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Creato il</translation>
</message>
<message>
<source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Contenuti</translation>
</message>
<message>
@ -2166,6 +2153,14 @@ Go to application website to obtain it manually.</source>
<source>Contents of the message.</source>
<translation>Contenuti del messaggio.</translation>
</message>
<message>
<source>Permanently deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Is message permanently deleted from recycle bin?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MessagesToolBar</name>

57
localization/rssguard-nl_NL.ts
View File

@ -1,4 +1,6 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.0">
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="nl_NL">
<context>
<name>Application</name>
<message>
@ -92,12 +94,10 @@
</message>
<message>
<source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Naam van feeds/categorieën.</translation>
</message>
<message>
<source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation>Aantal van alle ongelezen berichten.</translation>
</message>
<message>
@ -123,7 +123,10 @@
<message numerus="yes">
<source>%n unread message(s).</source>
<extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
<translation><numerusform>%n ongelezen bericht.</numerusform><numerusform>%n ongelezen berichten.</numerusform></translation>
<translation>
<numerusform>%n ongelezen bericht.</numerusform>
<numerusform>%n ongelezen berichten.</numerusform>
</translation>
</message>
<message>
<source>%1 (category)%2%3</source>
@ -153,12 +156,18 @@ Deze categorie bevat geen nested items.</translation>
<message numerus="yes">
<source>uses specific settings (%n minute(s) to next auto-update)</source>
<extracomment>Describes feed auto-update status.</extracomment>
<translation><numerusform>gebruik specifieke instellingen (%n minuut voor volgende automatische update)</numerusform><numerusform>gebruik specifieke instellingen (%n minuten voor volgende automatische update)</numerusform></translation>
<translation>
<numerusform>gebruik specifieke instellingen (%n minuut voor volgende automatische update)</numerusform>
<numerusform>gebruik specifieke instellingen (%n minuten voor volgende automatische update)</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n unread message(s).</source>
<extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
<translation><numerusform>%n ongelezen bericht.</numerusform><numerusform>%n ongelezen berichten.</numerusform></translation>
<translation>
<numerusform>%n ongelezen bericht.</numerusform>
<numerusform>%n ongelezen berichten.</numerusform>
</translation>
</message>
<message>
<source>%1 (%2)%3
@ -192,7 +201,10 @@ Auto-update status: %5</translation>
</message>
<message numerus="yes">
<source>%n deleted message(s).</source>
<translation><numerusform>%n verwijderde bericht(en).</numerusform><numerusform>%n verwijderde bericht(en).</numerusform></translation>
<translation>
<numerusform>%n verwijderde bericht(en).</numerusform>
<numerusform>%n verwijderde bericht(en).</numerusform>
</translation>
</message>
</context>
<context>
@ -1320,6 +1332,10 @@ Exporteer feeds die je wilt van het geselecteerde bestand.</translation>
<source>&amp;Backup database/settings</source>
<translation>Backup database/instellingen</translation>
</message>
<message>
<source>Switch message list layout orientation</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1401,9 +1417,7 @@ Exporteer feeds die je wilt van het geselecteerde bestand.</translation>
</message>
<message>
<source>Language</source>
<extracomment>Language settings section.
----------
Language column of language list.</extracomment>
<extracomment>Language settings section.</extracomment>
<translation>Taal</translation>
</message>
<message>
@ -1461,12 +1475,10 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Code</translation>
</message>
<message>
<source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Versie</translation>
</message>
<message>
@ -1544,7 +1556,6 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Naam</translation>
</message>
<message>
@ -2093,52 +2104,42 @@ Ga naar RRSguard website en download het handmatig.</translation>
<name>MessagesModel</name>
<message>
<source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>ld</translation>
</message>
<message>
<source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Lees</translation>
</message>
<message>
<source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>verwijder</translation>
</message>
<message>
<source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Belangrijk</translation>
</message>
<message>
<source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Feed</translation>
</message>
<message>
<source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titel</translation>
</message>
<message>
<source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>Url</translation>
</message>
<message>
<source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Auteur</translation>
</message>
<message>
<source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Gemaakt op</translation>
</message>
<message>
<source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Inhoud</translation>
</message>
<message>
@ -2181,6 +2182,14 @@ Ga naar RRSguard website en download het handmatig.</translation>
<source>Contents of the message.</source>
<translation>Inhoud van het bericht.</translation>
</message>
<message>
<source>Permanently deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Is message permanently deleted from recycle bin?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MessagesToolBar</name>
@ -2640,4 +2649,4 @@ Ongelezen nieuws: %2</translation>
<translation>Open de hyperlink in externe browser</translation>
</message>
</context>
</TS>
</TS>

33
localization/rssguard-sv_SE.ts
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="sv_SE">
<TS version="2.1" language="sv_SE">
<context>
<name>Application</name>
<message>
@ -94,12 +94,10 @@
</message>
<message>
<source>Titles of feeds/categories.</source>
<extracomment>Feed list header &quot;titles&quot; column tooltip.</extracomment>
<translation>Namn på kategorier/flöden.</translation>
</message>
<message>
<source>Counts of unread/all meesages.</source>
<extracomment>Feed list header &quot;counts&quot; column tooltip.</extracomment>
<translation>Antal meddelanden.</translation>
</message>
<message>
@ -1332,6 +1330,10 @@ och/eller inställningar sparades. Tillse också att målmappen inte är skrivsk
<source>&amp;Backup database/settings</source>
<translation>&amp;Säkerhetskopiera databas/inställningar</translation>
</message>
<message>
<source>Switch message list layout orientation</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormRestoreDatabaseSettings</name>
@ -1413,9 +1415,7 @@ och/eller inställningar sparades. Tillse också att målmappen inte är skrivsk
</message>
<message>
<source>Language</source>
<extracomment>Language settings section.
----------
Language column of language list.</extracomment>
<extracomment>Language settings section.</extracomment>
<translation>Språk</translation>
</message>
<message>
@ -1473,12 +1473,10 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Code</source>
<extracomment>Lang. code column of language list.</extracomment>
<translation>Språkkod</translation>
</message>
<message>
<source>Version</source>
<extracomment>Version column of skin list.</extracomment>
<translation>Version</translation>
</message>
<message>
@ -1556,7 +1554,6 @@ Language column of language list.</extracomment>
</message>
<message>
<source>Name</source>
<extracomment>Skin list name column.</extracomment>
<translation>Namn</translation>
</message>
<message>
@ -2104,52 +2101,42 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
<name>MessagesModel</name>
<message>
<source>Id</source>
<extracomment>Tooltip for ID of message.</extracomment>
<translation>ID</translation>
</message>
<message>
<source>Read</source>
<extracomment>Tooltip for &quot;read&quot; column in msg list.</extracomment>
<translation>Läst</translation>
</message>
<message>
<source>Deleted</source>
<extracomment>Tooltip for &quot;deleted&quot; column in msg list.</extracomment>
<translation>Borttaget</translation>
</message>
<message>
<source>Important</source>
<extracomment>Tooltip for &quot;important&quot; column in msg list.</extracomment>
<translation>Viktigt</translation>
</message>
<message>
<source>Feed</source>
<extracomment>Tooltip for name of feed for message.</extracomment>
<translation>Flöde</translation>
</message>
<message>
<source>Title</source>
<extracomment>Tooltip for title of message.</extracomment>
<translation>Titel</translation>
</message>
<message>
<source>Url</source>
<extracomment>Tooltip for url of message.</extracomment>
<translation>URL</translation>
</message>
<message>
<source>Author</source>
<extracomment>Tooltip for author of message.</extracomment>
<translation>Författare</translation>
</message>
<message>
<source>Created on</source>
<extracomment>Tooltip for creation date of message.</extracomment>
<translation>Skapad</translation>
</message>
<message>
<source>Contents</source>
<extracomment>Tooltip for contents of message.</extracomment>
<translation>Innehåll</translation>
</message>
<message>
@ -2192,6 +2179,14 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
<source>Contents of the message.</source>
<translation>Innehåll i meddelandet.</translation>
</message>
<message>
<source>Permanently deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Is message permanently deleted from recycle bin?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MessagesToolBar</name>

2
src/gui/formabout.cpp
View File

@ -38,7 +38,7 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout)
//: About RSS Guard dialog title.
setWindowTitle(tr("About %1").arg(APP_NAME));
#if !defined(Q_OS_WIN)
#if defined(Q_OS_OS2)
MessageBox::iconify(m_ui->m_buttonBox);
#endif

2
src/gui/formcategorydetails.cpp
View File

@ -212,7 +212,7 @@ void FormCategoryDetails::initialize() {
// Setup button box.
m_ui->m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
#if !defined(Q_OS_WIN)
#if defined(Q_OS_OS2)
MessageBox::iconify(m_ui->m_buttonBox);
#endif

2
src/gui/formfeeddetails.cpp
View File

@ -371,7 +371,7 @@ void FormFeedDetails::initialize() {
m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password"));
m_ui->m_txtPassword->lineEdit()->setToolTip(tr("Set password to access the feed."));
#if !defined(Q_OS_WIN)
#if defined(Q_OS_OS2)
MessageBox::iconify(m_ui->m_buttonBox);
#endif

9
src/gui/formsettings.cpp
View File

@ -62,7 +62,7 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
m_ui->m_editorMessagesToolbar->availableItemsWidget()->viewport()->installEventFilter(this);
m_ui->m_editorFeedsToolbar->availableItemsWidget()->viewport()->installEventFilter(this);
#if !defined(Q_OS_WIN)
#if defined(Q_OS_OS2)
MessageBox::iconify(m_ui->m_buttonBox);
#endif
@ -168,7 +168,12 @@ void FormSettings::selectBrowserExecutable() {
tr("Select web browser executable"),
qApp->homeFolderPath(),
//: File filter for external browser selection dialog.
tr("Executables (*.*)"));
#if defined(Q_OS_LINUX)
tr("Executables (*)")
#else
tr("Executables (*.*)")
#endif
);
if (!executable_file.isEmpty()) {
m_ui->m_txtExternalBrowserExecutable->setText(executable_file);

2
src/gui/formupdate.cpp
View File

@ -48,7 +48,7 @@ FormUpdate::FormUpdate(QWidget *parent)
connect(m_btnUpdate, SIGNAL(clicked()), this, SLOT(startUpdate()));
#if !defined(Q_OS_WIN)
#if defined(Q_OS_OS2)
MessageBox::iconify(m_ui->m_buttonBox);
#endif

3
src/gui/messagebox.cpp
View File

@ -39,8 +39,7 @@ void MessageBox::setIcon(QMessageBox::Icon icon) {
0,
this);
// Setup status icon.
setIconPixmap(iconForStatus(icon).pixmap(icon_size,
icon_size));
setIconPixmap(iconForStatus(icon).pixmap(icon_size, icon_size));
}
void MessageBox::iconify(QDialogButtonBox *button_box) {

84
src/miscellaneous/settings.cpp
View File

@ -26,6 +26,90 @@
#include <QWebSettings>
// Feeds.
DKEY Feeds::ID = "feeds";
DKEY Feeds::UpdateTimeout = "feed_update_timeout";
DVALUE(int) Feeds::UpdateTimeoutDef = DOWNLOAD_TIMEOUT;
DKEY Feeds::CountFormat = "count_format";
DVALUE(char*) Feeds::CountFormatDef = "(%unread)";
DKEY Feeds::AutoUpdateInterval = "auto_update_interval";
DVALUE(int) Feeds::AutoUpdateIntervalDef = DEFAULT_AUTO_UPDATE_INTERVAL;
DKEY Feeds::AutoUpdateEnabled = "auto_update_enabled";
DVALUE(bool) Feeds::AutoUpdateEnabledDef = false;
DKEY Feeds::FeedsUpdateOnStartup = "feeds_update_on_startup";
DVALUE(bool) Feeds::FeedsUpdateOnStartupDef = false;
// Messages.
DKEY Messages::ID = "messages";
DKEY Messages::UseCustomDate = "use_custom_date";
DVALUE(bool) Messages::UseCustomDateDef = false;
DKEY Messages::CustomDateFormat = "custom_date_format";
DVALUE(char*) Messages::CustomDateFormatDef = "";
DKEY Messages::ClearReadOnExit = "clear_read_on_exit";
DVALUE(bool) Messages::ClearReadOnExitDef = false;
// GUI.
DKEY GUI::ID = "gui";
DKEY GUI::SplitterFeeds = "splitter_feeds";
DVALUE(char*) GUI::SplitterFeedsDef = "";
DKEY GUI::SplitterMessages = "splitter_messages";
DVALUE(char*) GUI::SplitterMessagesDef = "";
DKEY GUI::ToolbarStyle = "toolbar_style";
DVALUE(Qt::ToolButtonStyle) GUI::ToolbarStyleDef = Qt::ToolButtonIconOnly;
DKEY GUI::FeedsToolbarActions = "feeds_toolbar";
DVALUE(char*) GUI::FeedsToolbarActionsDef = "m_actionUpdateAllFeeds,m_actionMarkAllFeedsRead";
// General.
DKEY General::ID = "main";
// Proxy.
DKEY Proxy::ID = "proxy";
// Database.
DKEY Database::ID = "database";
// Keyboard.
DKEY Keyboard::ID = "keyboard";
// Web browser.
DKEY Browser::ID = "browser";
DKEY Browser::GesturesEnabled = "gestures_enabled";
DVALUE(bool) Browser::GesturesEnabledDef = true;
DKEY Browser::JavascriptEnabled = "enable_javascript";
DVALUE(bool) Browser::JavascriptEnabledDef = true;
DKEY Browser::ImagesEnabled = "enable_images";
DVALUE(bool) Browser::ImagesEnabledDef = true;
DKEY Browser::PluginsEnabled = "enable_plugins";
DVALUE(bool) Browser::PluginsEnabledDef = false;
DKEY Browser::CustomExternalBrowserEnabled = "custom_external_browser";
DVALUE(bool) Browser::CustomExternalBrowserEnabledDef = false;
DKEY Browser::CustomExternalBrowserExecutable = "external_browser_executable";
DVALUE(char*) Browser::CustomExternalBrowserExecutableDef = "";
DKEY Browser::CustomExternalBrowserArguments = "external_browser_arguments";
DVALUE(char*) Browser::CustomExternalBrowserArgumentsDef = "%1";
// Categories.
DKEY Categories::ID = "categories_expand_states";
Settings::Settings(const QString &file_name, Format format,
const Type &status, QObject *parent)
: QSettings(file_name, format, parent), m_initializationStatus(status) {

95
src/miscellaneous/settings.h
View File

@ -24,93 +24,116 @@
#include <QPointer>
#define KEY static const char*
#define VALUE(x) static const x
#define KEY extern const char*
#define DKEY const char*
#define VALUE(x) extern const x
#define DVALUE(x) const x
#define SETTING(x) x, x##Def
#define GROUP(x) x::ID
// Feeds.
namespace Feeds {
KEY ID = "feeds";
KEY ID;
KEY UpdateTimeout = "feed_update_timeout";
VALUE(int) UpdateTimeoutDef = DOWNLOAD_TIMEOUT;
KEY UpdateTimeout;
VALUE(int) UpdateTimeoutDef;
KEY CountFormat = "count_format";
VALUE(char*) CountFormatDef = "(%unread)";
KEY CountFormat;
VALUE(char*) CountFormatDef;
KEY AutoUpdateInterval = "auto_update_interval";
VALUE(int) AutoUpdateIntervalDef = DEFAULT_AUTO_UPDATE_INTERVAL;
KEY AutoUpdateInterval;
VALUE(int) AutoUpdateIntervalDef;
KEY AutoUpdateEnabled = "auto_update_enabled";
VALUE(bool) AutoUpdateEnabledDef = false;
KEY AutoUpdateEnabled;
VALUE(bool) AutoUpdateEnabledDef;
KEY FeedsUpdateOnStartup = "feeds_update_on_startup";
VALUE(bool) FeedsUpdateOnStartupDef = false;
KEY FeedsUpdateOnStartup;
VALUE(bool) FeedsUpdateOnStartupDef;
}
// Messages.
namespace Messages {
KEY ID = "messages";
KEY ID;
KEY UseCustomDate = "use_custom_date";
VALUE(bool) UseCustomDateDef = false;
KEY UseCustomDate;
VALUE(bool) UseCustomDateDef;
KEY CustomDateFormat = "custom_date_format";
VALUE(char*) CustomDateFormatDef = "";
KEY CustomDateFormat;
VALUE(char*) CustomDateFormatDef;
KEY ClearReadOnExit = "clear_read_on_exit";
VALUE(bool) ClearReadOnExitDef = false;
KEY ClearReadOnExit;
VALUE(bool) ClearReadOnExitDef;
}
// GUI.
namespace GUI {
KEY ID = "gui";
KEY ID;
KEY SplitterFeeds = "splitter_feeds";
VALUE(char*) SplitterFeedsDef = "";
KEY SplitterFeeds;
VALUE(char*) SplitterFeedsDef;
KEY SplitterMessages = "splitter_messages";
VALUE(char*) SplitterMessagesDef = "";
KEY SplitterMessages;
VALUE(char*) SplitterMessagesDef;
KEY ToolbarStyle = "toolbar_style";
VALUE(Qt::ToolButtonStyle) ToolbarStyleDef = Qt::ToolButtonIconOnly;
KEY ToolbarStyle;
VALUE(Qt::ToolButtonStyle) ToolbarStyleDef;
KEY FeedsToolbarActions = "feeds_toolbar";
VALUE(char*) FeedsToolbarActionsDef = "m_actionUpdateAllFeeds,m_actionMarkAllFeedsRead";
KEY FeedsToolbarActions;
VALUE(char*) FeedsToolbarActionsDef;
}
// General.
namespace General {
KEY ID = "main";
KEY ID;
}
// Proxy.
namespace Proxy {
KEY ID = "proxy";
KEY ID;
}
// Database.
namespace Database {
KEY ID = "database";
KEY ID;
}
// Keyboard.
namespace Keyboard {
KEY ID = "keyboard";
KEY ID;
}
// Web browser.
namespace Browser {
KEY ID = "browser";
KEY ID;
KEY GesturesEnabled;
VALUE(bool) GesturesEnabledDef;
KEY JavascriptEnabled;
VALUE(bool) JavascriptEnabledDef;
KEY ImagesEnabled;
VALUE(bool) ImagesEnabledDef;
KEY PluginsEnabled;
VALUE(bool) PluginsEnabledDef;
KEY CustomExternalBrowserEnabled;
VALUE(bool) CustomExternalBrowserEnabledDef;
KEY CustomExternalBrowserExecutable;
VALUE(char*) CustomExternalBrowserExecutableDef;
KEY CustomExternalBrowserArguments;
VALUE(char*) CustomExternalBrowserArgumentsDef;
}
// Categories.
namespace Categories {
KEY ID = "categories_expand_states";
KEY ID;
}
class Settings : public QSettings {
Q_OBJECT

22
src/network-web/webfactory.cpp
View File

@ -24,15 +24,15 @@ WebFactory::~WebFactory() {
void WebFactory::loadState() {
Settings *settings = qApp->settings();
switchJavascript(settings->value(GROUP(Browser), "enable_javascript", true).toBool(), false);
switchImages(settings->value(GROUP(Browser), "enable_images", true).toBool(), false);
switchPlugins(settings->value(GROUP(Browser), "enable_plugins", false).toBool(), false);
switchJavascript(settings->value(GROUP(Browser), SETTING(Browser::JavascriptEnabled)).toBool(), false);
switchImages(settings->value(GROUP(Browser), SETTING(Browser::ImagesEnabled)).toBool(), false);
switchPlugins(settings->value(GROUP(Browser), SETTING(Browser::PluginsEnabled)).toBool(), false);
}
bool WebFactory::openUrlInExternalBrowser(const QString &url) {
if (qApp->settings()->value(GROUP(Browser), "custom_external_browser", false).toBool()) {
QString browser = qApp->settings()->value(GROUP(Browser), "external_browser_executable").toString();
QString arguments = qApp->settings()->value(GROUP(Browser), "external_browser_arguments", "%1").toString();
if (qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserEnabled)).toBool()) {
QString browser = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserExecutable)).toString();
QString arguments = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserArguments)).toString();
return QProcess::startDetached(browser, QStringList() << arguments.arg(url));
}
@ -43,7 +43,7 @@ bool WebFactory::openUrlInExternalBrowser(const QString &url) {
void WebFactory::switchJavascript(bool enable, bool save_settings) {
if (save_settings) {
qApp->settings()->setValue(GROUP(Browser), "enable_javascript", enable);
qApp->settings()->setValue(GROUP(Browser), Browser::JavascriptEnabled, enable);
}
m_globalSettings->setAttribute(QWebSettings::JavascriptEnabled, enable);
@ -52,9 +52,7 @@ void WebFactory::switchJavascript(bool enable, bool save_settings) {
void WebFactory::switchPlugins(bool enable, bool save_settings) {
if (save_settings) {
qApp->settings()->setValue(GROUP(Browser),
"enable_plugins",
enable);
qApp->settings()->setValue(GROUP(Browser), Browser::PluginsEnabled, enable);
}
m_globalSettings->setAttribute(QWebSettings::PluginsEnabled, enable);
@ -63,9 +61,7 @@ void WebFactory::switchPlugins(bool enable, bool save_settings) {
void WebFactory::switchImages(bool enable, bool save_settings) {
if (save_settings) {
qApp->settings()->setValue(GROUP(Browser),
"enable_images",
enable);
qApp->settings()->setValue(GROUP(Browser), Browser::ImagesEnabled, enable);
}
m_globalSettings->setAttribute(QWebSettings::AutoLoadImages, enable);

8
src/network-web/webview.cpp
View File

@ -238,18 +238,14 @@ void WebView::mousePressEvent(QMouseEvent *event) {
void WebView::mouseReleaseEvent(QMouseEvent *event) {
if (event->button() & Qt::MiddleButton) {
bool are_gestures_enabled = qApp->settings()->value(GROUP(Browser),
"gestures_enabled",
true).toBool();
bool are_gestures_enabled = qApp->settings()->value(GROUP(Browser), SETTING(Browser::GesturesEnabled)).toBool();
if (are_gestures_enabled) {
QPoint release_point = event->pos();
int left_move = m_gestureOrigin.x() - release_point.x();
int right_move = -left_move;
int top_move = m_gestureOrigin.y() - release_point.y();
int bottom_move = -top_move;
int total_max = qMax(qMax(qMax(left_move, right_move),
qMax(top_move, bottom_move)),
40);
int total_max = qMax(qMax(qMax(left_move, right_move), qMax(top_move, bottom_move)), 40);
if (total_max == left_move) {
back();