diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index 70a4caf06..99f8d59d9 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -4,9 +4,30 @@ CornerButton - Open new tab + Open new web browser tab. Tooltip for "new tab" webbrowser corner button. - Otevřít nový panel + + + + + DatabaseFactory + + MySQL server works as expected. + MySQL server pracuje v pořádku. + + + No MySQL server is running in the target destination. + V daném umístění neběží žádný MySQL server. + + + Access denied. Invalid username or password used. + Access to MySQL server was denied. + Přístup zamítnut. Nesprávne jméno či heslo. + + + Unknown error. + Unknown MySQL error arised. + Neznámá chyba. @@ -17,10 +38,12 @@ Feed update started + Text display in status bar when feed update is started. Spuštěn update kanálů Updated feed '%1' + Text display in status bar when particular feed is updated. Aktualizován kanál '%1' @@ -57,11 +80,12 @@ Titles of feeds/categories. - Feed list header tooltips. + Feed list header "titles" column tooltip. Názvy kanálů/kategorií. Counts of unread/all meesages. + Feed list header "counts" column tooltip. Počty nepřečtených/všech zpráviček. @@ -70,6 +94,77 @@ Kořen + + FeedsModelStandardCategory + + %1 (standard category) +%2%3 + Tooltip for standard feed. + %1 (standardní kategorie) +%2%3 + + + + +This category does not contain any nested items. + + +Tato kategorie neobsahuje žádné podřízené položky. + + + %n unread message(s). + Tooltip for "unread" column of feed list. + + %n nepřečtená zpráva. + %n nepřečtené zprávy. + %n nepřečtených zpráv. + + + + + FeedsModelStandardFeed + + does not use auto-update + Describes feed auto-update status. + nepoužívá auto-aktualizace + + + uses global settings + Describes feed auto-update status. + používá globální nastavení + + + uses specific settings (%n minute(s) to next auto-update) + Describes feed auto-update status. + + používá specifické nastavení (%n minuta do další aktualizace) + používá specifické nastavení (%n minuty do další aktualizace) + používá specifické nastavení (%n minut do další aktualizace) + + + + %1 (%2) +%3 + +Encoding: %4 +Auto-update status: %5 + Tooltip for feed. + %1 (%2) +%3 + +Kódování: %4 +Status auto-aktualizace: %5 + + + %n unread message(s). + Tooltip for "unread" column of feed list. + + %n nepřečtená zpráva. + %n nepřečtené zprávy. + %n nepřečtených zpráv. + + + FeedsView @@ -133,15 +228,12 @@ Warning messagebox title when selected item cannot be edited. %1 is performing scheduled update of some feeds. + RSS Guard is performing updates right now. FormAbout - - About RSS Guard - O programu RSS Guard - Information Informace @@ -203,6 +295,11 @@ Warning messagebox title when selected item cannot be edited. <body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~email</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body> + + About %1 + About RSS Guard dialog title. + + FormMain @@ -238,10 +335,6 @@ Warning messagebox title when selected item cannot be edited. &Settings Na&stavení - - &About RSS Guard - &O aplikaci RSS Guard - &Current tab &Aktivní panel @@ -266,30 +359,6 @@ Warning messagebox title when selected item cannot be edited. &Messages &Zprávy - - Update all feeds. - Aktualizovat všechny kanály. - - - Update selected feeds/categories. - Aktualizovat vybrané kategorie/kanály. - - - Edit selected feed/category. - Editovat vybrané kategorii/kanál. - - - Mark selected messages as read. - Označit vybrané zprávy jako přečtené. - - - Mark selected messages as unread. - Označit vybrané zprávy jako nepřečtené. - - - Switch importance of selected messages. - Přepnout důležitost vybraných zpráv. - &Web browser &Webovy prohlížeč @@ -314,10 +383,6 @@ Warning messagebox title when selected item cannot be edited. Display settings of the application. Zobrazit nastavení aplikace. - - About RSS Guard. - O programu RSS Guard. - Switch fullscreen mode. Přepnout režim celé obrazovky. @@ -330,42 +395,22 @@ Warning messagebox title when selected item cannot be edited. Close current web browser tab. Zavřít aktuální panel webového prohlížeče.. - - Delete selected messages. - Smazat vybrané zprávy. - Open selected messages in internal browser Otevřít vybrané zprávy v interním prohlížeči - - Open selected messages in internal browser. - Otevřít vybrané zprávy v interním prohlížeči. - Open selected source articles in external browser Otevřít vybrané zdrojové články v externím prohlížeči - - Open selected source articles in external browser. - Otevřít vybrané zdrojové články v externím prohlížeči. - Open selected source articles in internal browser Otevřít vybrané zdrojové články v interním prohlížeči - - Open selected source messages in internal browser. - Otevřít vybrané zdrojové články v interním prohlížeči. - Application is already running. Aplikace již běží. - - &Clear selected messages - &Smazat vybrané zprávy - No actions available Žádná dostupná akce @@ -378,30 +423,6 @@ Warning messagebox title when selected item cannot be edited. Fee&ds && categories Kanály && ka&tegorie - - Update &all items - Aktualizov&at všechny položky - - - Update &selected items - Aktualizovat v&ybrané položky - - - Clear selected items - Vyprázdnit vybrané položky - - - Mark all messages in all feeds read. This does not take message filters into account. - Označí všechny zprávy ve všech kanálech jako přečtené. Toto nebere v potaz filtry zpráv. - - - View selected items in newspaper mode - Zobrazit vybrané položky v novinovém náhledu - - - Delete selected feed/category. - Smazat vybraný kanál/kategorii. - Mark all messages (without message filters) from selected feeds as read. Označit všechny zprávy (i přes filtry zpráv) z vybraných kanálů jako přečtené. @@ -410,10 +431,6 @@ Warning messagebox title when selected item cannot be edited. Mark all messages (without message filters) from selected feeds as unread. Označit všechny zprávy (i přes filtry zpráv) z vybraných kanálů jako nepřečtené. - - Remove all messages from selected feeds. - Smazat všechny zprávy z vybraných kanálů. - Displays all messages from selected feeds/categories in a new "newspaper mode" tab. Note that messages are not set as read automatically. Zobrazí všechny zprávy z vybraných kanálů/kategorií v "novinovém" náhledu. Všechny zprávy budou automaticky označeny jako přečtené. @@ -422,22 +439,10 @@ Warning messagebox title when selected item cannot be edited. Add new standard category. Přidat novou standardní kategorii. - - Add new item - Přidat novou položku - Switch &fullscreen/normal mode Přepnout režim &celé obrazovky - - &Edit selected item - Upravit &vybranou položku - - - &Delete selected item - &Smazat vybranou položku - Add new standard feed. Přidat nový standardní kanál. @@ -474,38 +479,18 @@ Warning messagebox title when selected item cannot be edited. Hides or shows the list of feeds/categories. Skryje nebo zobrazí seznam kanálů/kategorií. - - Clear all items - Vyprázdnit všechny položky - - - Remove all messages from all feeds. - Smazat všechnyzprávy ze všech kanálů. - Select next feed/category Vybrat další kanál/kategorii - - Select next feed/category. - Vybrat další kanál/kategorii. - Select previous feed/category Vybrat předchozí kanál/kategorii - - Select previous feed/category. - Vybrat předchozí kanál/kategorii. - Select next message Vybrat další zprávu - - Select next message. - Vybrat další zprávu. - Select previous message Vybrat předchozí zprávu @@ -539,15 +524,75 @@ Warning messagebox title when selected item cannot be edited. - Mark &selected items as read + &About application - Mark selected items as unread + Displays extra info about this application. - Mark all &items as read + Ctrl+Shift+A + + + + Mark &selected feeds as read + + + + Mark selected feeds as unread + + + + &Delete selected messages + + + + Clean selected feeds + + + + Deletes all messages from selected feeds. + + + + Marks all messages in all feeds read. This does not take message filters into account. + + + + Deletes all messages from all feeds. + + + + Add new feed/category + + + + Update &all feeds + + + + Update &selected feeds + + + + &Edit selected feed/category + + + + &Delete selected feed/category + + + + Mark all &feeds as read + + + + View selected feeds in newspaper mode + + + + Clean all feeds @@ -645,6 +690,7 @@ Language column of language list. Version + Version column of skin list. Verze @@ -746,6 +792,7 @@ Language column of language list. Name + Skin list name column. Název @@ -822,6 +869,7 @@ Language column of language list. Executables (*.*) + File filter for external browser selection dialog. Spouštěče (*.*) @@ -1523,6 +1571,10 @@ downloaded and installed. currently installed one. Toto vydání není novější než aktuálně nainstalované. + + Check for updates + Zkontrolovat aktualizace + FormWelcome @@ -1671,108 +1723,7 @@ currently installed one. - QObject - - LANG_NAME - Name of language, e.g. English. - Čeština - - - LANG_ABBREV - Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". - cs_CZ - - - LANG_VERSION - Version of your translation, e.g. 1.0. - 0.01 - - - LANG_AUTHOR - Name of translator - optional. - Martin Rotter - - - LANG_EMAIL - Email of translator - optional. - rotter.martinos@gmail.com - - - %n unread message(s). - Tooltip for "unread" column of feed list. ----------- -Tooltip for "unread" column of feed list. - - %n nepřečtená zpráva. - %n nepřečtené zprávy. - %n nepřečtených zpráv. - - - - - -This category does not contain any nested items. - - -Tato kategorie neobsahuje žádné podřízené položky. - - - %1 (standard category) -%2%3 - Tooltip for standard feed. - %1 (standardní kategorie) -%2%3 - - - No MySQL server is running in the target destination. - V daném umístění neběží žádný MySQL server. - - - Access denied. Invalid username or password used. - Access to MySQL server was denied. - Přístup zamítnut. Nesprávne jméno či heslo. - - - Unknown error. - Unknown MySQL error arised. - Neznámá chyba. - - - does not use auto-update - Describes feed auto-update status. - nepoužívá auto-aktualizace - - - uses global settings - Describes feed auto-update status. - používá globální nastavení - - - uses specific settings (%n minute(s) to next auto-update) - Describes feed auto-update status. - - používá specifické nastavení (%n minuta do další aktualizace) - používá specifické nastavení (%n minuty do další aktualizace) - používá specifické nastavení (%n minut do další aktualizace) - - - - %1 (%2) -%3 - -Encoding: %4 -Auto-update status: %5 - Tooltip for feed. - %1 (%2) -%3 - -Kódování: %4 -Status auto-aktualizace: %5 - - - MySQL server works as expected. - MySQL server pracuje v pořádku. - + NetworkFactory protocol error Network status. @@ -1808,6 +1759,11 @@ Status auto-aktualizace: %5 Network status. dočasný výpadek + + authentication failed + Network status. + autentifikace selhala + proxy authentication required Network status. @@ -1828,20 +1784,43 @@ Status auto-aktualizace: %5 Network status. neznámý obsah + + content not found + Network status. + obsah nenalezen + unknown error Network status. neznámá chyba + + + QObject - authentication failed - Network status. - autentifikace selhala + LANG_NAME + Name of language, e.g. English. + Čeština - content not found - Network status. - obsah nenalezen + LANG_ABBREV + Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". + cs_CZ + + + LANG_VERSION + Version of your translation, e.g. 1.0. + 0.01 + + + LANG_AUTHOR + Name of translator - optional. + Martin Rotter + + + LANG_EMAIL + Email of translator - optional. + rotter.martinos@gmail.com diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index 13abd7ba7..6f68e48e9 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -4,9 +4,30 @@ CornerButton - Open new tab + Open new web browser tab. Tooltip for "new tab" webbrowser corner button. - Öffne neuen Reiter + + + + + DatabaseFactory + + MySQL server works as expected. + + + + No MySQL server is running in the target destination. + + + + Access denied. Invalid username or password used. + Access to MySQL server was denied. + + + + Unknown error. + Unknown MySQL error arised. + Unbekannter Fehler. @@ -17,10 +38,12 @@ Feed update started + Text display in status bar when feed update is started. Feed update begonnen Updated feed '%1' + Text display in status bar when particular feed is updated. Upgedateter feed '%1' @@ -57,11 +80,12 @@ Titles of feeds/categories. - Feed list header tooltips. + Feed list header "titles" column tooltip. Titel der Feeds/Kategorien. Counts of unread/all meesages. + Feed list header "counts" column tooltip. Anzahl ungelesener/aller Nachrichten. @@ -70,6 +94,67 @@ + + FeedsModelStandardCategory + + %1 (standard category) +%2%3 + Tooltip for standard feed. + + + + + +This category does not contain any nested items. + + + + %n unread message(s). + Tooltip for "unread" column of feed list. + + + + + + + + FeedsModelStandardFeed + + does not use auto-update + Describes feed auto-update status. + + + + uses global settings + Describes feed auto-update status. + + + + uses specific settings (%n minute(s) to next auto-update) + Describes feed auto-update status. + + + + + + + %1 (%2) +%3 + +Encoding: %4 +Auto-update status: %5 + Tooltip for feed. + + + + %n unread message(s). + Tooltip for "unread" column of feed list. + + + + + + FeedsView @@ -133,15 +218,12 @@ Warning messagebox title when selected item cannot be edited. %1 is performing scheduled update of some feeds. + RSS Guard is performing updates right now. FormAbout - - About RSS Guard - Über RSS Guard - Information Information @@ -203,6 +285,11 @@ Warning messagebox title when selected item cannot be edited. <body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~email</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body> + + About %1 + About RSS Guard dialog title. + + FormMain @@ -238,10 +325,6 @@ Warning messagebox title when selected item cannot be edited. &Settings &Einstellungen - - &About RSS Guard - &Über RSS Guard - &Current tab &Aktueller Reiter @@ -266,30 +349,6 @@ Warning messagebox title when selected item cannot be edited. &Messages &Nachrichten - - Update all feeds. - Alle Feeds updaten. - - - Update selected feeds/categories. - Update alle selektierten Feeds/Kategorien. - - - Edit selected feed/category. - Editiere selektierten Feed/Kategorie. - - - Mark selected messages as read. - Markiere die selektierten Nachrichten als gelesen. - - - Mark selected messages as unread. - Markiere die selektierten Nachrichten als ungelesen. - - - Switch importance of selected messages. - Schalte die Wichtigkeit der selektierten Nachrichten um. - &Web browser &Web Browser @@ -314,10 +373,6 @@ Warning messagebox title when selected item cannot be edited. Display settings of the application. Anzeigeeinstellungen der Applikation. - - About RSS Guard. - Über RSS Guard. - Switch fullscreen mode. Schalte zum Vollbildmodus. @@ -330,42 +385,22 @@ Warning messagebox title when selected item cannot be edited. Close current web browser tab. Schliesse aktuellen Web Browser Reiter. - - Delete selected messages. - Lösche selektierte Nachrichten. - Open selected messages in internal browser Öffne selektierte Nachrichten im internen Browser - - Open selected messages in internal browser. - Öffne selektierte Nachrichten im internen Browser. - Open selected source articles in external browser Öffne selektierte Quellenartikel im externen Browser - - Open selected source articles in external browser. - Öffne selektierte Quellenartikel im externen Browser. - Open selected source articles in internal browser Öffne selektierte Quellenartikel im internen Browser - - Open selected source messages in internal browser. - Öffne selektierte Quellenartikel im internen Browser. - Application is already running. Die Applikation läuft bereits. - - &Clear selected messages - Selektierte Nachrichten &löschen - No actions available Keine Funktionen verfügbar @@ -378,30 +413,6 @@ Warning messagebox title when selected item cannot be edited. Fee&ds && categories Fee&ds && Kategorien - - Update &all items - &Alle Items updaten - - - Update &selected items - &Selektierte Items updaten - - - Clear selected items - Lösche selektierte Items - - - Mark all messages in all feeds read. This does not take message filters into account. - Markiere alle Nachrichten in allen Feeds als gelesen. Dies erstreckt sich nicht auf Nachrichtenfilter. - - - View selected items in newspaper mode - Zeige die selektierten Items im Zeitungsmodus - - - Delete selected feed/category. - Lösche selektierten Feed/Kategorie. - Mark all messages (without message filters) from selected feeds as read. Markiere alle Nachrichten (ohne Nachrichtenfilter) der selektierten Feeds als gelesen. @@ -410,10 +421,6 @@ Warning messagebox title when selected item cannot be edited. Mark all messages (without message filters) from selected feeds as unread. Markiere alle Nachrichten (ohne Nachrichtenfilter) der selektierten Feeds als ungelesen. - - Remove all messages from selected feeds. - Entferne alle Nachrichten von den selektierten Feeds. - Displays all messages from selected feeds/categories in a new "newspaper mode" tab. Note that messages are not set as read automatically. Zeige alle Nachrichten der selektierten Feeds/Kategorien in einem neuen Zeitungsmodusreiter an. Bemerke, dass Nachrichten nicht automatisch als gelesen gesetzt werden. @@ -422,22 +429,10 @@ Warning messagebox title when selected item cannot be edited. Add new standard category. Neue Standardkategorie hinzufügen. - - Add new item - Neues Item hinzufügen - Switch &fullscreen/normal mode Schalte zwischen &Vollbild- und Normalmodus um. - - &Edit selected item - &Editiere das selektierte Item - - - &Delete selected item - &Lösche das selektierte Item - Add new standard feed. Füge einen neuen Standard-Feed hinzu. @@ -474,38 +469,18 @@ Warning messagebox title when selected item cannot be edited. Hides or shows the list of feeds/categories. Versteckt oder zeigt die Liste der Feeds/Kategorien an. - - Clear all items - Lösche alle Items - - - Remove all messages from all feeds. - Entferne alle Nachrichten von allen Feeds. - Select next feed/category Selektiere den nächsten Feed/Kategorie - - Select next feed/category. - Selektiere den nächsten Feed/Kategorie. - Select previous feed/category Selektiere den vorherigen Feed/Kategorie - - Select previous feed/category. - Selektiere den vorherigen Feed/Kategorie. - Select next message Selektiere die nächste Nachricht - - Select next message. - Selektiere die nächste Nachricht. - Select previous message Selektiere die vorherige Nachricht @@ -539,15 +514,75 @@ Warning messagebox title when selected item cannot be edited. - Mark &selected items as read + &About application - Mark selected items as unread + Displays extra info about this application. - Mark all &items as read + Ctrl+Shift+A + + + + Mark &selected feeds as read + + + + Mark selected feeds as unread + + + + &Delete selected messages + + + + Clean selected feeds + + + + Deletes all messages from selected feeds. + + + + Marks all messages in all feeds read. This does not take message filters into account. + + + + Deletes all messages from all feeds. + + + + Add new feed/category + + + + Update &all feeds + + + + Update &selected feeds + + + + &Edit selected feed/category + + + + &Delete selected feed/category + + + + Mark all &feeds as read + + + + View selected feeds in newspaper mode + + + + Clean all feeds @@ -645,6 +680,7 @@ Language column of language list. Version + Version column of skin list. Version @@ -740,6 +776,7 @@ Language column of language list. Name + Skin list name column. Name @@ -816,6 +853,7 @@ Language column of language list. Executables (*.*) + File filter for external browser selection dialog. @@ -1505,6 +1543,10 @@ downloaded and installed. currently installed one. + + Check for updates + Prüfe auf Updates + FormWelcome @@ -1652,6 +1694,79 @@ currently installed one. + + NetworkFactory + + protocol error + Network status. + Protokollfehler + + + host not found + Network status. + Host nicht gefunden + + + connection refused + Network status. + + + + connection timed out + Network status. + + + + SSL handshake failed + Network status. + + + + proxy server connection refused + Network status. + + + + temporary failure + Network status. + Temporärer Fehler + + + authentication failed + Network status. + + + + proxy authentication required + Network status. + + + + proxy server not found + Network status. + + + + success + Network status. + Erfolg + + + uknown content + Network status. + unbekannter Inhalt + + + content not found + Network status. + Inhalt nicht gefunden + + + unknown error + Network status. + unbekannter Fehler + + QObject @@ -1679,143 +1794,6 @@ currently installed one. Email of translator - optional. - - %n unread message(s). - Tooltip for "unread" column of feed list. ----------- -Tooltip for "unread" column of feed list. - - - - - - - - -This category does not contain any nested items. - - - - %1 (standard category) -%2%3 - Tooltip for standard feed. - - - - No MySQL server is running in the target destination. - - - - Access denied. Invalid username or password used. - Access to MySQL server was denied. - - - - Unknown error. - Unknown MySQL error arised. - Unbekannter Fehler. - - - does not use auto-update - Describes feed auto-update status. - - - - uses global settings - Describes feed auto-update status. - - - - uses specific settings (%n minute(s) to next auto-update) - Describes feed auto-update status. - - - - - - - %1 (%2) -%3 - -Encoding: %4 -Auto-update status: %5 - Tooltip for feed. - - - - MySQL server works as expected. - - - - protocol error - Network status. - Protokollfehler - - - host not found - Network status. - Host nicht gefunden - - - connection refused - Network status. - - - - connection timed out - Network status. - - - - SSL handshake failed - Network status. - - - - proxy server connection refused - Network status. - - - - temporary failure - Network status. - Temporärer Fehler - - - proxy authentication required - Network status. - - - - proxy server not found - Network status. - - - - success - Network status. - Erfolg - - - uknown content - Network status. - unbekannter Inhalt - - - unknown error - Network status. - unbekannter Fehler - - - authentication failed - Network status. - - - - content not found - Network status. - Inhalt nicht gefunden - ShortcutCatcher diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index 827d2856e..bd2f63aa7 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -4,11 +4,32 @@ CornerButton - Open new tab + Open new web browser tab. Tooltip for "new tab" webbrowser corner button. + + DatabaseFactory + + MySQL server works as expected. + + + + No MySQL server is running in the target destination. + + + + Access denied. Invalid username or password used. + Access to MySQL server was denied. + + + + Unknown error. + Unknown MySQL error arised. + + + FeedMessageViewer @@ -17,10 +38,12 @@ Feed update started + Text display in status bar when feed update is started. Updated feed '%1' + Text display in status bar when particular feed is updated. @@ -57,11 +80,12 @@ Titles of feeds/categories. - Feed list header tooltips. + Feed list header "titles" column tooltip. Counts of unread/all meesages. + Feed list header "counts" column tooltip. @@ -70,6 +94,67 @@ + + FeedsModelStandardCategory + + %1 (standard category) +%2%3 + Tooltip for standard feed. + + + + + +This category does not contain any nested items. + + + + %n unread message(s). + Tooltip for "unread" column of feed list. + + + + + + + + FeedsModelStandardFeed + + does not use auto-update + Describes feed auto-update status. + + + + uses global settings + Describes feed auto-update status. + + + + uses specific settings (%n minute(s) to next auto-update) + Describes feed auto-update status. + + + + + + + %1 (%2) +%3 + +Encoding: %4 +Auto-update status: %5 + Tooltip for feed. + + + + %n unread message(s). + Tooltip for "unread" column of feed list. + + + + + + FeedsView @@ -133,15 +218,12 @@ Warning messagebox title when selected item cannot be edited. %1 is performing scheduled update of some feeds. + RSS Guard is performing updates right now. FormAbout - - About RSS Guard - - Information @@ -203,6 +285,11 @@ Warning messagebox title when selected item cannot be edited. <body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~email</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body> + + About %1 + About RSS Guard dialog title. + + FormMain @@ -238,10 +325,6 @@ Warning messagebox title when selected item cannot be edited. &Settings - - &About RSS Guard - - &Current tab @@ -266,30 +349,6 @@ Warning messagebox title when selected item cannot be edited. &Messages - - Update all feeds. - - - - Update selected feeds/categories. - - - - Edit selected feed/category. - - - - Mark selected messages as read. - - - - Mark selected messages as unread. - - - - Switch importance of selected messages. - - &Web browser @@ -314,10 +373,6 @@ Warning messagebox title when selected item cannot be edited. Display settings of the application. - - About RSS Guard. - - Switch fullscreen mode. @@ -330,42 +385,22 @@ Warning messagebox title when selected item cannot be edited. Close current web browser tab. - - Delete selected messages. - - Open selected messages in internal browser - - Open selected messages in internal browser. - - Open selected source articles in external browser - - Open selected source articles in external browser. - - Open selected source articles in internal browser - - Open selected source messages in internal browser. - - Application is already running. - - &Clear selected messages - - No actions available @@ -378,30 +413,6 @@ Warning messagebox title when selected item cannot be edited. Fee&ds && categories - - Update &all items - - - - Update &selected items - - - - Clear selected items - - - - Mark all messages in all feeds read. This does not take message filters into account. - - - - View selected items in newspaper mode - - - - Delete selected feed/category. - - Mark all messages (without message filters) from selected feeds as read. @@ -410,10 +421,6 @@ Warning messagebox title when selected item cannot be edited. Mark all messages (without message filters) from selected feeds as unread. - - Remove all messages from selected feeds. - - Displays all messages from selected feeds/categories in a new "newspaper mode" tab. Note that messages are not set as read automatically. @@ -422,22 +429,10 @@ Warning messagebox title when selected item cannot be edited. Add new standard category. - - Add new item - - Switch &fullscreen/normal mode - - &Edit selected item - - - - &Delete selected item - - Add new standard feed. @@ -474,38 +469,18 @@ Warning messagebox title when selected item cannot be edited. Hides or shows the list of feeds/categories. - - Clear all items - - - - Remove all messages from all feeds. - - Select next feed/category - - Select next feed/category. - - Select previous feed/category - - Select previous feed/category. - - Select next message - - Select next message. - - Select previous message @@ -539,15 +514,75 @@ Warning messagebox title when selected item cannot be edited. - Mark &selected items as read + &About application - Mark selected items as unread + Displays extra info about this application. - Mark all &items as read + Ctrl+Shift+A + + + + Mark &selected feeds as read + + + + Mark selected feeds as unread + + + + &Delete selected messages + + + + Clean selected feeds + + + + Deletes all messages from selected feeds. + + + + Marks all messages in all feeds read. This does not take message filters into account. + + + + Deletes all messages from all feeds. + + + + Add new feed/category + + + + Update &all feeds + + + + Update &selected feeds + + + + &Edit selected feed/category + + + + &Delete selected feed/category + + + + Mark all &feeds as read + + + + View selected feeds in newspaper mode + + + + Clean all feeds @@ -645,6 +680,7 @@ Language column of language list. Version + Version column of skin list. @@ -740,6 +776,7 @@ Language column of language list. Name + Skin list name column. @@ -816,6 +853,7 @@ Language column of language list. Executables (*.*) + File filter for external browser selection dialog. @@ -1505,6 +1543,10 @@ downloaded and installed. currently installed one. + + Check for updates + + FormWelcome @@ -1653,99 +1695,7 @@ currently installed one. - QObject - - LANG_NAME - Name of language, e.g. English. - English - - - LANG_ABBREV - Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". - en_GB - - - LANG_VERSION - Version of your translation, e.g. 1.0. - 0.01 - - - LANG_AUTHOR - Name of translator - optional. - Martin Rotter - - - LANG_EMAIL - Email of translator - optional. - rotter.martinos@gmail.com - - - %n unread message(s). - Tooltip for "unread" column of feed list. ----------- -Tooltip for "unread" column of feed list. - - - - - - - - -This category does not contain any nested items. - - - - %1 (standard category) -%2%3 - Tooltip for standard feed. - - - - No MySQL server is running in the target destination. - - - - Access denied. Invalid username or password used. - Access to MySQL server was denied. - - - - Unknown error. - Unknown MySQL error arised. - - - - does not use auto-update - Describes feed auto-update status. - - - - uses global settings - Describes feed auto-update status. - - - - uses specific settings (%n minute(s) to next auto-update) - Describes feed auto-update status. - - - - - - - %1 (%2) -%3 - -Encoding: %4 -Auto-update status: %5 - Tooltip for feed. - - - - MySQL server works as expected. - - + NetworkFactory protocol error Network status. @@ -1781,6 +1731,11 @@ Auto-update status: %5 Network status. + + authentication failed + Network status. + + proxy authentication required Network status. @@ -1801,20 +1756,43 @@ Auto-update status: %5 Network status. + + content not found + Network status. + + unknown error Network status. + + + QObject - authentication failed - Network status. - + LANG_NAME + Name of language, e.g. English. + English - content not found - Network status. - + LANG_ABBREV + Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". + en_GB + + + LANG_VERSION + Version of your translation, e.g. 1.0. + 0.01 + + + LANG_AUTHOR + Name of translator - optional. + Martin Rotter + + + LANG_EMAIL + Email of translator - optional. + rotter.martinos@gmail.com diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index d9d2b7e96..835ebc918 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -4,9 +4,30 @@ CornerButton - Open new tab + Open new web browser tab. Tooltip for "new tab" webbrowser corner button. - Open nieuw tabblad + + + + + DatabaseFactory + + MySQL server works as expected. + MySQL server werkt als verwacht. + + + No MySQL server is running in the target destination. + Geen MySQL server draait in de doelbestemming. + + + Access denied. Invalid username or password used. + Access to MySQL server was denied. + Toegang geweigerd. Ongeldig gebruikersnaam of paswoord gebruikt. + + + Unknown error. + Unknown MySQL error arised. + Onbekende fout. @@ -17,10 +38,12 @@ Feed update started + Text display in status bar when feed update is started. Bijwerken feed is gestart Updated feed '%1' + Text display in status bar when particular feed is updated. Feed bijwerken '%1' @@ -57,11 +80,12 @@ Titles of feeds/categories. - Feed list header tooltips. + Feed list header "titles" column tooltip. Naam van feeds/categorieën. Counts of unread/all meesages. + Feed list header "counts" column tooltip. Aantal van alle ongelezen berichten. @@ -70,6 +94,74 @@ Root + + FeedsModelStandardCategory + + %1 (standard category) +%2%3 + Tooltip for standard feed. + %1 (standaard categorie) +%2%3 + + + + +This category does not contain any nested items. + + +Deze categorie bevat geen nested items. + + + %n unread message(s). + Tooltip for "unread" column of feed list. + + %n ongelezen bericht. + %n ongelezen berichten. + + + + + FeedsModelStandardFeed + + does not use auto-update + Describes feed auto-update status. + automatisch bijwerken niet gebruiken + + + uses global settings + Describes feed auto-update status. + gebruik algemene instellingen + + + uses specific settings (%n minute(s) to next auto-update) + Describes feed auto-update status. + + gebruik specifieke instellingen (%n minuut voor volgende automatische update) + gebruik specifieke instellingen (%n minuten voor volgende automatische update) + + + + %1 (%2) +%3 + +Encoding: %4 +Auto-update status: %5 + Tooltip for feed. + %1 (%2) +%3 + +Encoderen: %4 +Status automatisch bijwerken: %5 + + + %n unread message(s). + Tooltip for "unread" column of feed list. + + %n ongelezen bericht. + %n ongelezen berichten. + + + FeedsView @@ -133,15 +225,12 @@ Warning messagebox title when selected item cannot be edited. %1 is performing scheduled update of some feeds. + RSS Guard is performing updates right now. FormAbout - - About RSS Guard - Over RSS Guard - Information Informatie @@ -203,6 +292,11 @@ Warning messagebox title when selected item cannot be edited. <body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~email</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body> + + About %1 + About RSS Guard dialog title. + + FormMain @@ -238,10 +332,6 @@ Warning messagebox title when selected item cannot be edited. &Settings &Instellingen - - &About RSS Guard - &Over RSS Guard - &Current tab &Huidig tabblad @@ -266,30 +356,6 @@ Warning messagebox title when selected item cannot be edited. &Messages &Berichten - - Update all feeds. - Alle feeds bijwerken. - - - Update selected feeds/categories. - Update geselecteerde feeds/categorieën. - - - Edit selected feed/category. - Bewerk geselecteerde feeds/categorieën. - - - Mark selected messages as read. - Markeer geselecteerde bericht als gelezen. - - - Mark selected messages as unread. - Markeer geselecteerde bericht als ongelezen. - - - Switch importance of selected messages. - Wissel de belangrijkheid van geselecteerde berichten. - &Web browser &Webbrowser @@ -314,10 +380,6 @@ Warning messagebox title when selected item cannot be edited. Display settings of the application. Toon instellingen van het programma. - - About RSS Guard. - Over RSS Guard. - Switch fullscreen mode. Schakel beeldvullende modus. @@ -330,42 +392,22 @@ Warning messagebox title when selected item cannot be edited. Close current web browser tab. Sluit huidige webbrowser tabblad. - - Delete selected messages. - Verwijder geselecteerde berichten. - Open selected messages in internal browser Open geselecteerde berichten met ingebouwde webbrowser - - Open selected messages in internal browser. - Open geselecteerde berichten met ingebouwde webbrowser. - Open selected source articles in external browser Open geselecteerde bron artikelen met externe webbrowser - - Open selected source articles in external browser. - Open geselecteerde bron artikelen met externe webbrowser. - Open selected source articles in internal browser Open geselecteerde bron artikelen met ingebouwde webbrowser - - Open selected source messages in internal browser. - Open geselecteerde bron artikelen met ingebouwde webbrowser. - Application is already running. RSSguard is al gestart. - - &Clear selected messages - Wis gesele&cteerde berichten - No actions available Geen acties beschikbaar @@ -378,30 +420,6 @@ Warning messagebox title when selected item cannot be edited. Fee&ds && categories Fee&ds && categorieën - - Update &all items - Update &alle items - - - Update &selected items - Update ge&selecteerde items - - - Clear selected items - Wis geselecteerde items - - - Mark all messages in all feeds read. This does not take message filters into account. - Markeer alle berichten van alle feeds als gelezen. Dit is niet van toepassing op berichten filters in account. - - - View selected items in newspaper mode - Bekijk de geselecteerde items in de krantweergave modus - - - Delete selected feed/category. - Verwijder geselecteerde feed/categorie. - Mark all messages (without message filters) from selected feeds as read. Markeer alle berichten (zonder berichten filters) van geselecteerde feeds als gelezen. @@ -410,10 +428,6 @@ Warning messagebox title when selected item cannot be edited. Mark all messages (without message filters) from selected feeds as unread. Markeer alle berichten (zonder berichten filters) van geselecteerde feeds als ongelezen. - - Remove all messages from selected feeds. - Verwijder alle berichten van geselecteerde feeds. - Displays all messages from selected feeds/categories in a new "newspaper mode" tab. Note that messages are not set as read automatically. Toon alle berichten van geselecteerde feeds/categorieën in een nieuwe "Krantweergave modus" tabblad. Onthoud dat de berichten niet zijn ingesteld als automatisch gelezen. @@ -422,22 +436,10 @@ Warning messagebox title when selected item cannot be edited. Add new standard category. Voeg nieuw standaard categorie toe. - - Add new item - Voeg nieuw item toe - Switch &fullscreen/normal mode Schakel &beeldvullende/normale modus - - &Edit selected item - &Bewerk geselecteerde item - - - &Delete selected item - &Verwijder geselecteerde items - Add new standard feed. Voeg nieuw standaard feed toe. @@ -474,38 +476,18 @@ Warning messagebox title when selected item cannot be edited. Hides or shows the list of feeds/categories. Verberg of toon de lijst van feeds/categorieën. - - Clear all items - Wis alle items - - - Remove all messages from all feeds. - Verwijder alle berichten van alle feeds. - Select next feed/category Selecteer volgende feeds/categorieën - - Select next feed/category. - Selecteer volgende feed/categorie. - Select previous feed/category Selecteer vorige feeds/categorieën - - Select previous feed/category. - Selecteer vorige feeds/categorieën. - Select next message Selecteer volgend bericht - - Select next message. - Selecteer volgend bericht. - Select previous message Selecteer vorige bericht @@ -539,15 +521,75 @@ Warning messagebox title when selected item cannot be edited. - Mark &selected items as read + &About application - Mark selected items as unread + Displays extra info about this application. - Mark all &items as read + Ctrl+Shift+A + + + + Mark &selected feeds as read + + + + Mark selected feeds as unread + + + + &Delete selected messages + + + + Clean selected feeds + + + + Deletes all messages from selected feeds. + + + + Marks all messages in all feeds read. This does not take message filters into account. + + + + Deletes all messages from all feeds. + + + + Add new feed/category + + + + Update &all feeds + + + + Update &selected feeds + + + + &Edit selected feed/category + + + + &Delete selected feed/category + + + + Mark all &feeds as read + + + + View selected feeds in newspaper mode + + + + Clean all feeds @@ -645,6 +687,7 @@ Language column of language list. Version + Version column of skin list. Versie @@ -746,6 +789,7 @@ Language column of language list. Name + Skin list name column. Naam @@ -822,6 +866,7 @@ Language column of language list. Executables (*.*) + File filter for external browser selection dialog. Uitvoerbare bestanden (*.*) @@ -1526,6 +1571,10 @@ currently installed one. Deze versie is niet nieuwer dan de geïnstalleerde. + + Check for updates + Controleer op updates + FormWelcome @@ -1673,6 +1722,79 @@ de geïnstalleerde. Externe webbrowser kon niet worden gestart. + + NetworkFactory + + protocol error + Network status. + protocol fout + + + host not found + Network status. + host niet gevonden + + + connection refused + Network status. + verbinding geweigerd + + + connection timed out + Network status. + Verbindings time-out + + + SSL handshake failed + Network status. + SSL handshake is mislukt + + + proxy server connection refused + Network status. + proxy server verbinding geweigerd + + + temporary failure + Network status. + tijdelijke storing + + + authentication failed + Network status. + verificatie mislukt + + + proxy authentication required + Network status. + proxy verificatie vereist + + + proxy server not found + Network status. + proxy server niet gevonden + + + success + Network status. + succes + + + uknown content + Network status. + onbekende inhoud + + + content not found + Network status. + inhoud niet gevonden + + + unknown error + Network status. + onbekende fout + + QObject @@ -1700,150 +1822,6 @@ de geïnstalleerde. Email of translator - optional. elbert.pol@gmail.com - - %n unread message(s). - Tooltip for "unread" column of feed list. ----------- -Tooltip for "unread" column of feed list. - - %n ongelezen bericht. - %n ongelezen berichten. - - - - - -This category does not contain any nested items. - - -Deze categorie bevat geen nested items. - - - %1 (standard category) -%2%3 - Tooltip for standard feed. - %1 (standaard categorie) -%2%3 - - - No MySQL server is running in the target destination. - Geen MySQL server draait in de doelbestemming. - - - Access denied. Invalid username or password used. - Access to MySQL server was denied. - Toegang geweigerd. Ongeldig gebruikersnaam of paswoord gebruikt. - - - Unknown error. - Unknown MySQL error arised. - Onbekende fout. - - - does not use auto-update - Describes feed auto-update status. - automatisch bijwerken niet gebruiken - - - uses global settings - Describes feed auto-update status. - gebruik algemene instellingen - - - uses specific settings (%n minute(s) to next auto-update) - Describes feed auto-update status. - - gebruik specifieke instellingen (%n minuut voor volgende automatische update) - gebruik specifieke instellingen (%n minuten voor volgende automatische update) - - - - %1 (%2) -%3 - -Encoding: %4 -Auto-update status: %5 - Tooltip for feed. - %1 (%2) -%3 - -Encoderen: %4 -Status automatisch bijwerken: %5 - - - MySQL server works as expected. - MySQL server werkt als verwacht. - - - protocol error - Network status. - protocol fout - - - host not found - Network status. - host niet gevonden - - - connection refused - Network status. - verbinding geweigerd - - - connection timed out - Network status. - Verbindings time-out - - - SSL handshake failed - Network status. - SSL handshake is mislukt - - - proxy server connection refused - Network status. - proxy server verbinding geweigerd - - - temporary failure - Network status. - tijdelijke storing - - - proxy authentication required - Network status. - proxy verificatie vereist - - - proxy server not found - Network status. - proxy server niet gevonden - - - success - Network status. - succes - - - uknown content - Network status. - onbekende inhoud - - - unknown error - Network status. - onbekende fout - - - authentication failed - Network status. - verificatie mislukt - - - content not found - Network status. - inhoud niet gevonden - ShortcutCatcher diff --git a/src/core/databasefactory.cpp b/src/core/databasefactory.cpp index 89d9b32f4..5727f2d81 100644 --- a/src/core/databasefactory.cpp +++ b/src/core/databasefactory.cpp @@ -61,7 +61,7 @@ DatabaseFactory::MySQLError DatabaseFactory::mysqlTestConnection(const QString & database.setPassword(password); if (database.open()) { - // Connection succeeded, clean up the mess and return 0. + // Connection succeeded, clean up the mess and return OK status. database.close(); removeConnection(APP_DB_TEST_MYSQL); return MySQLOk; @@ -79,20 +79,20 @@ DatabaseFactory::MySQLError DatabaseFactory::mysqlTestConnection(const QString & QString DatabaseFactory::mysqlInterpretErrorCode(MySQLError error_code) { switch (error_code) { case MySQLOk: - return QObject::tr("MySQL server works as expected."); + return tr("MySQL server works as expected."); case MySQLCantConnect: case MySQLConnectionError: case MySQLUnknownHost: - return QObject::tr("No MySQL server is running in the target destination."); + return tr("No MySQL server is running in the target destination."); case MySQLAccessDenied: //: Access to MySQL server was denied. - return QObject::tr("Access denied. Invalid username or password used."); + return tr("Access denied. Invalid username or password used."); default: //: Unknown MySQL error arised. - return QObject::tr("Unknown error."); + return tr("Unknown error."); } } diff --git a/src/core/defs.h.in b/src/core/defs.h.in index 8d8c6f717..08b48bb39 100755 --- a/src/core/defs.h.in +++ b/src/core/defs.h.in @@ -62,12 +62,6 @@ #define STARTUP_UPDATE_DELAY 1500 #define TIMEZONE_OFFSET_LIMIT 6 -#define MYSQL_CODE_OK 0 -#define MYSQL_CODE_NOT_FOUND 2002 -#define MYSQL_CODE_NOT_FOUND 2002 -#define MYSQL_CODE_NOT_FOUND 2002 -#define MYSQL_CODE_NOT_FOUND 2002 - #define APP_DB_TEST_MYSQL "MySQLTest" #define APP_DB_MYSQL_PORT 3306 #define APP_DB_DRIVER_SQLITE "QSQLITE" @@ -75,10 +69,10 @@ #define APP_DB_INIT_MYSQL "db_init_mysql.sql" #define APP_DB_INIT_SQLITE "db_init_sqlite.sql" #define APP_DB_INIT_SQLITE_MEMORY "db_init_sqlite_memory.sql" -#define APP_DB_INIT_SPLIT "-- !\n" -#define APP_DB_PATH "data/database/local" -#define APP_DB_FILE "database.db" -#define APP_DB_WEB_PATH "data/database/web" +#define APP_DB_INIT_SPLIT "-- !\n" +#define APP_DB_PATH "data/database/local" +#define APP_DB_FILE "database.db" +#define APP_DB_WEB_PATH "data/database/web" #define APP_CFG_PATH "data/config" #define APP_CFG_FILE "config.ini" @@ -90,9 +84,8 @@ #define APP_CFG_BROWSER "browser" #define APP_CFG_MESSAGES "messages" #define APP_CFG_FEEDS "feeds" -#define APP_CFG_CAT_EXT "expanded_categories" -#ifdef Q_OS_OSX +#if defined(Q_OS_OSX) #define APP_PREFIX "@CMAKE_INSTALL_PREFIX@/@APP_LOW_NAME@.app/Contents/Resources" #else #define APP_PREFIX "@CMAKE_INSTALL_PREFIX@" diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index c2deb2d79..df4dbe26e 100644 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -47,9 +47,8 @@ FeedsModel::FeedsModel(QObject *parent) : QAbstractItemModel(parent) { //: Title text in the feed list header. m_headerData << tr("Title"); - //: Feed list header tooltips. - m_tooltipData << tr("Titles of feeds/categories.") << - tr("Counts of unread/all meesages."); + m_tooltipData << /*: Feed list header "titles" column tooltip.*/ tr("Titles of feeds/categories.") << + /*: Feed list header "counts" column tooltip.*/ tr("Counts of unread/all meesages."); loadFromDatabase(); } diff --git a/src/core/feedsmodelstandardcategory.cpp b/src/core/feedsmodelstandardcategory.cpp index 6afb93f72..d74697f11 100755 --- a/src/core/feedsmodelstandardcategory.cpp +++ b/src/core/feedsmodelstandardcategory.cpp @@ -41,16 +41,16 @@ QVariant FeedsModelStandardCategory::data(int column, int role) const { case Qt::ToolTipRole: if (column == FDS_MODEL_TITLE_INDEX) { //: Tooltip for standard feed. - return QObject::tr("%1 (standard category)\n" - "%2%3").arg(m_title, - m_description, - m_childItems.size() == 0 ? - QObject::tr("\n\nThis category does not contain any nested items.") : - ""); + return tr("%1 (standard category)\n" + "%2%3").arg(m_title, + m_description, + m_childItems.size() == 0 ? + tr("\n\nThis category does not contain any nested items.") : + ""); } else if (column == FDS_MODEL_COUNTS_INDEX) { //: Tooltip for "unread" column of feed list. - return QObject::tr("%n unread message(s).", "", countOfUnreadMessages()); + return tr("%n unread message(s).", "", countOfUnreadMessages()); } else { return QVariant(); diff --git a/src/core/feedsmodelstandardcategory.h b/src/core/feedsmodelstandardcategory.h index 7ac6c03ed..f5703631e 100644 --- a/src/core/feedsmodelstandardcategory.h +++ b/src/core/feedsmodelstandardcategory.h @@ -22,6 +22,7 @@ #include #include +#include // Represents STANDARD category container. @@ -30,6 +31,8 @@ // b) standard feeds, // c) other containers and feeds (synchronized ones). class FeedsModelStandardCategory : public FeedsModelCategory { + Q_DECLARE_TR_FUNCTIONS(FeedsModelStandardCategory) + public: // Constructors and destructors. explicit FeedsModelStandardCategory(FeedsModelRootItem *parent_item = NULL); diff --git a/src/core/feedsmodelstandardfeed.cpp b/src/core/feedsmodelstandardfeed.cpp index 3ac79b9fb..1dc925005 100755 --- a/src/core/feedsmodelstandardfeed.cpp +++ b/src/core/feedsmodelstandardfeed.cpp @@ -196,7 +196,7 @@ QVariant FeedsModelStandardFeed::data(int column, int role) const { else if (column == FDS_MODEL_COUNTS_INDEX) { // TODO: Changeable text. return QString("(%1)").arg(QString::number(countOfUnreadMessages())); - //QString::number(countOfAllMessages())); + //QString::number(countOfAllMessages())); } else { return QVariant(); @@ -228,37 +228,37 @@ QVariant FeedsModelStandardFeed::data(int column, int role) const { switch (m_autoUpdateType) { case DontAutoUpdate: //: Describes feed auto-update status. - auto_update_string = QObject::tr("does not use auto-update"); + auto_update_string = tr("does not use auto-update"); break; case DefaultAutoUpdate: //: Describes feed auto-update status. - auto_update_string = QObject::tr("uses global settings"); + auto_update_string = tr("uses global settings"); break; case SpecificAutoUpdate: default: //: Describes feed auto-update status. - auto_update_string = QObject::tr("uses specific settings " - "(%n minute(s) to next auto-update)", - 0, - m_autoUpdateRemainingInterval); + auto_update_string = tr("uses specific settings " + "(%n minute(s) to next auto-update)", + 0, + m_autoUpdateRemainingInterval); break; } //: Tooltip for feed. - return QObject::tr("%1 (%2)\n" - "%3\n\n" - "Encoding: %4\n" - "Auto-update status: %5").arg(m_title, - FeedsModelFeed::typeToString(m_type), - m_description, - m_encoding, - auto_update_string); + return tr("%1 (%2)\n" + "%3\n\n" + "Encoding: %4\n" + "Auto-update status: %5").arg(m_title, + FeedsModelFeed::typeToString(m_type), + m_description, + m_encoding, + auto_update_string); } else if (column == FDS_MODEL_COUNTS_INDEX) { //: Tooltip for "unread" column of feed list. - return QObject::tr("%n unread message(s).", 0, countOfUnreadMessages()); + return tr("%n unread message(s).", 0, countOfUnreadMessages()); } else { return QVariant(); @@ -425,7 +425,3 @@ void FeedsModelStandardFeed::updateMessages(const QList &messages) { qDebug("Transaction commit for message downloader failed."); } } - - - - diff --git a/src/core/feedsmodelstandardfeed.h b/src/core/feedsmodelstandardfeed.h index 15984552c..6f77a9b83 100644 --- a/src/core/feedsmodelstandardfeed.h +++ b/src/core/feedsmodelstandardfeed.h @@ -24,6 +24,7 @@ #include #include #include +#include class Message; @@ -32,6 +33,8 @@ class Message; // online synchronization services (NO TT-RSS, NO FEEDLY). // So, parent item is either root item or category. class FeedsModelStandardFeed : public FeedsModelFeed { + Q_DECLARE_TR_FUNCTIONS(FeedsModelStandardFeed) + public: enum AutoUpdateType { DontAutoUpdate = 0, diff --git a/src/core/feedsproxymodel.cpp b/src/core/feedsproxymodel.cpp index 52f2249bf..342b72ae0 100755 --- a/src/core/feedsproxymodel.cpp +++ b/src/core/feedsproxymodel.cpp @@ -42,8 +42,6 @@ FeedsProxyModel::~FeedsProxyModel() { qDebug("Destroying FeedsProxyModel instance"); } - - bool FeedsProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { if (left.isValid() && right.isValid()) { diff --git a/src/core/networkfactory.cpp b/src/core/networkfactory.cpp index 347b87bec..3ea8eb873 100644 --- a/src/core/networkfactory.cpp +++ b/src/core/networkfactory.cpp @@ -33,62 +33,62 @@ QString NetworkFactory::networkErrorText(QNetworkReply::NetworkError error_code) case QNetworkReply::ProtocolUnknownError: case QNetworkReply::ProtocolFailure: //: Network status. - return QObject::tr("protocol error"); + return tr("protocol error"); case QNetworkReply::HostNotFoundError: //: Network status. - return QObject::tr("host not found"); + return tr("host not found"); case QNetworkReply::RemoteHostClosedError: case QNetworkReply::ConnectionRefusedError: //: Network status. - return QObject::tr("connection refused"); + return tr("connection refused"); case QNetworkReply::TimeoutError: case QNetworkReply::ProxyTimeoutError: //: Network status. - return QObject::tr("connection timed out"); + return tr("connection timed out"); case QNetworkReply::SslHandshakeFailedError: //: Network status. - return QObject::tr("SSL handshake failed"); + return tr("SSL handshake failed"); case QNetworkReply::ProxyConnectionClosedError: case QNetworkReply::ProxyConnectionRefusedError: //: Network status. - return QObject::tr("proxy server connection refused"); + return tr("proxy server connection refused"); case QNetworkReply::TemporaryNetworkFailureError: //: Network status. - return QObject::tr("temporary failure"); + return tr("temporary failure"); case QNetworkReply::AuthenticationRequiredError: //: Network status. - return QObject::tr("authentication failed"); + return tr("authentication failed"); case QNetworkReply::ProxyAuthenticationRequiredError: //: Network status. - return QObject::tr("proxy authentication required"); + return tr("proxy authentication required"); case QNetworkReply::ProxyNotFoundError: //: Network status. - return QObject::tr("proxy server not found"); + return tr("proxy server not found"); case QNetworkReply::NoError: //: Network status. - return QObject::tr("success"); + return tr("success"); case QNetworkReply::UnknownContentError: //: Network status. - return QObject::tr("uknown content"); + return tr("uknown content"); case QNetworkReply::ContentNotFoundError: //: Network status. - return QObject::tr("content not found"); + return tr("content not found"); default: //: Network status. - return QObject::tr("unknown error"); + return tr("unknown error"); } } diff --git a/src/core/networkfactory.h b/src/core/networkfactory.h index c9a82eea8..c4db0c668 100644 --- a/src/core/networkfactory.h +++ b/src/core/networkfactory.h @@ -19,11 +19,14 @@ #define NETWORKFACTORY_H #include +#include class FeedsModelStandardFeed; -class NetworkFactory { +class NetworkFactory { + Q_DECLARE_TR_FUNCTIONS(NetworkFactory) + private: // Constructor. explicit NetworkFactory(); diff --git a/src/core/textfactory.cpp b/src/core/textfactory.cpp index b56cb43f7..912fec8a3 100755 --- a/src/core/textfactory.cpp +++ b/src/core/textfactory.cpp @@ -133,11 +133,11 @@ QMap TextFactory::generetaEscapes() { sequences["<"] = '<'; sequences[">"] = '>'; - sequences["&"] = '&'; - sequences["""] = '\"'; - sequences[" "] = ' '; + sequences["&"] = '&'; + sequences["""] = '\"'; + sequences[" "] = ' '; sequences["±"] = "±"; - sequences["×"] = "×"; + sequences["×"] = "×"; sequences["'"] = '\''; return sequences; @@ -146,12 +146,12 @@ QMap TextFactory::generetaEscapes() { QMap TextFactory::generateDeescapes() { QMap sequences; - sequences["<"] = "<"; - sequences[">"] = ">"; - sequences["&"] = "&"; + sequences["<"] = "<"; + sequences[">"] = ">"; + sequences["&"] = "&"; sequences["\""] = """; - sequences["±"] = "±"; - sequences["×"] = "×"; + sequences["±"] = "±"; + sequences["×"] = "×"; sequences["\'"] = "'"; return sequences; diff --git a/src/gui/comboboxwithstatus.cpp b/src/gui/comboboxwithstatus.cpp index 4615d8298..4855f3391 100644 --- a/src/gui/comboboxwithstatus.cpp +++ b/src/gui/comboboxwithstatus.cpp @@ -36,5 +36,4 @@ ComboBoxWithStatus::ComboBoxWithStatus(QWidget *parent) } ComboBoxWithStatus::~ComboBoxWithStatus() { - } diff --git a/src/gui/cornerbutton.cpp b/src/gui/cornerbutton.cpp index 84a628874..273212690 100644 --- a/src/gui/cornerbutton.cpp +++ b/src/gui/cornerbutton.cpp @@ -22,7 +22,7 @@ CornerButton::CornerButton(QWidget *parent) : QToolButton(parent) { //: Tooltip for "new tab" webbrowser corner button. - setToolTip(tr("Open new tab")); + setToolTip(tr("Open new web browser tab.")); setAutoRaise(true); setIcon(IconThemeFactory::instance()->fromTheme("list-add")); } diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index 3667e19f6..8fe6e480c 100644 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -137,6 +137,7 @@ void FeedMessageViewer::updateTrayIconStatus(int unread_messages, } void FeedMessageViewer::onFeedUpdatesStarted() { + //: Text display in status bar when feed update is started. FormMain::instance()->statusBar()->showProgress(0, tr("Feed update started")); } @@ -146,6 +147,7 @@ void FeedMessageViewer::onFeedUpdatesProgress(FeedsModelFeed *feed, // Some feed got updated. m_feedsView->updateCountsOfParticularFeed(feed, true); FormMain::instance()->statusBar()->showProgress((current * 100.0) / total, + //: Text display in status bar when particular feed is updated. tr("Updated feed '%1'").arg(feed->title())); } @@ -321,7 +323,6 @@ void FeedMessageViewer::initializeViews() { setLayout(central_layout); } - void FeedMessageViewer::vacuumDatabase() { bool is_tray_activated = SystemTrayIcon::isSystemTrayActivated(); diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index fc854521e..972c459e8 100644 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -195,6 +195,7 @@ void FeedsView::executeNextAutoUpdate() { if (SystemTrayIcon::isSystemTrayActivated()) { SystemTrayIcon::instance()->showMessage(tr("Scheduled update started"), + //: RSS Guard is performing updates right now. tr("%1 is performing scheduled update of some feeds.").arg(APP_NAME), QSystemTrayIcon::Information); } diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp index 96ac1c521..29fe1e9e9 100644 --- a/src/gui/formabout.cpp +++ b/src/gui/formabout.cpp @@ -34,6 +34,8 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) // Set flags and attributes. setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog); setWindowIcon(IconThemeFactory::instance()->fromTheme("application-about")); + //: About RSS Guard dialog title. + setWindowTitle(tr("About %1").arg(APP_NAME)); #if !defined(Q_OS_WIN) MessageBox::iconify(m_ui->m_buttonBox); diff --git a/src/gui/formabout.ui b/src/gui/formabout.ui index 7b3b042e7..80598e7b5 100644 --- a/src/gui/formabout.ui +++ b/src/gui/formabout.ui @@ -23,7 +23,7 @@ - About RSS Guard + @@ -166,8 +166,8 @@ p, li { white-space: pre-wrap; } 0 0 - 693 - 196 + 67 + 66 diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 54b5bc6b7..22488aff8 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -302,12 +302,8 @@ void FormMain::loadSize() { Settings *settings = Settings::instance(); // Reload main window size & position. - resize(settings->value(APP_CFG_GUI, - "window_size", - size()).toSize()); - move(settings->value(APP_CFG_GUI, - "window_position", - screen.center() - rect().center()).toPoint()); + resize(settings->value(APP_CFG_GUI, "window_size", size()).toSize()); + move(settings->value(APP_CFG_GUI, "window_position", screen.center() - rect().center()).toPoint()); // If user exited the application while in fullsreen mode, // then re-enable it now. diff --git a/src/gui/formmain.h b/src/gui/formmain.h index 40ecba974..50f3eed03 100644 --- a/src/gui/formmain.h +++ b/src/gui/formmain.h @@ -112,7 +112,6 @@ class FormMain : public QMainWindow { void showUpdates(); private: - Ui::FormMain *m_ui; QMenu *m_trayMenu; StatusBar *m_statusBar; diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui index db0bceb73..97c6fb562 100644 --- a/src/gui/formmain.ui +++ b/src/gui/formmain.ui @@ -15,16 +15,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -48,7 +39,7 @@ 0 0 979 - 21 + 20 @@ -101,7 +92,7 @@ - Add new item + Add new feed/category @@ -197,13 +188,13 @@ - &About RSS Guard + &About application - About RSS Guard. + Displays extra info about this application. - Ctrl+Shift+A + Ctrl+Shift+A QAction::AboutRole @@ -255,78 +246,42 @@ - Update &all items - - - Update all feeds. - - - + Update &all feeds - Update &selected items - - - Update selected feeds/categories. - - - + Update &selected feeds - &Edit selected item - - - Edit selected feed/category. - - - + &Edit selected feed/category - &Delete selected item - - - Delete selected feed/category. - - - + &Delete selected feed/category Mark selected messages as &read - - Mark selected messages as read. - Mark selected messages as &unread - - Mark selected messages as unread. - Switch &importance of selected messages - - Switch importance of selected messages. - - - - - Mark &selected items as read + Mark &selected feeds as read Mark all messages (without message filters) from selected feeds as read. @@ -334,7 +289,7 @@ - Mark selected items as unread + Mark selected feeds as unread Mark all messages (without message filters) from selected feeds as unread. @@ -342,21 +297,15 @@ - &Clear selected messages - - - Delete selected messages. - - - + &Delete selected messages - Clear selected items + Clean selected feeds - Remove all messages from selected feeds. + Deletes all messages from selected feeds. @@ -371,34 +320,16 @@ Open selected source articles in external browser - - Open selected source articles in external browser. - - - - Open selected messages in internal browser - - Open selected messages in internal browser. - - - - Open selected source articles in internal browser - - Open selected source messages in internal browser. - - - - @@ -421,22 +352,19 @@ - Mark all &items as read + Mark all &feeds as read - Mark all messages in all feeds read. This does not take message filters into account. + Marks all messages in all feeds read. This does not take message filters into account. - View selected items in newspaper mode + View selected feeds in newspaper mode Displays all messages from selected feeds/categories in a new "newspaper mode" tab. Note that messages are not set as read automatically. - - - @@ -467,38 +395,26 @@ - Clear all items + Clean all feeds - Remove all messages from all feeds. - - - + Deletes all messages from all feeds. Select next feed/category - - Select next feed/category. - Select previous feed/category - - Select previous feed/category. - Select next message - - Select next message. - diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index 4d0499a98..4e67fe1f6 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -53,6 +53,7 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form #endif // Setup behavior. + m_ui->m_listSettings->setCurrentRow(0); m_ui->m_treeLanguages->setColumnCount(5); m_ui->m_treeLanguages->setHeaderHidden(false); m_ui->m_treeLanguages->setHeaderLabels(QStringList() @@ -65,8 +66,8 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form m_ui->m_treeSkins->setColumnCount(4); m_ui->m_treeSkins->setHeaderHidden(false); m_ui->m_treeSkins->setHeaderLabels(QStringList() - << tr("Name") - << tr("Version") + << /*: Skin list name column. */ tr("Name") + << /*: Version column of skin list. */ tr("Version") << tr("Author") << tr("Email")); @@ -180,6 +181,7 @@ void FormSettings::selectBrowserExecutable() { QString executable_file = QFileDialog::getOpenFileName(this, tr("Select web browser executable"), QDir::homePath(), + //: File filter for external browser selection dialog. tr("Executables (*.*)")); if (!executable_file.isEmpty()) { diff --git a/src/gui/formupdate.ui b/src/gui/formupdate.ui index c2dd1d966..abfd50e6f 100755 --- a/src/gui/formupdate.ui +++ b/src/gui/formupdate.ui @@ -11,7 +11,7 @@ - Dialog + Check for updates @@ -65,8 +65,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p></body></html> Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/src/gui/systemtrayicon.cpp b/src/gui/systemtrayicon.cpp index bc3718899..7df7738d5 100644 --- a/src/gui/systemtrayicon.cpp +++ b/src/gui/systemtrayicon.cpp @@ -137,8 +137,7 @@ void SystemTrayIcon::show() { #else // Delay avoids race conditions and tray icon is properly displayed. qDebug("Showing tray icon with 1000 ms delay."); - QTimer::singleShot(1000, - this, SLOT(showPrivate())); + QTimer::singleShot(1000, this, SLOT(showPrivate())); #endif } diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp index 17dd3a29d..7ff64a498 100644 --- a/src/gui/tabwidget.cpp +++ b/src/gui/tabwidget.cpp @@ -261,8 +261,6 @@ int TabWidget::addBrowser(bool move_after_current, return final_index; } - - void TabWidget::changeIcon(int index, const QIcon &new_icon) { setTabIcon(index, new_icon); } diff --git a/src/gui/webview.cpp b/src/gui/webview.cpp index ee3a294eb..956d6aefb 100644 --- a/src/gui/webview.cpp +++ b/src/gui/webview.cpp @@ -46,8 +46,6 @@ WebView::~WebView() { qDebug("Destroying BaseWebView."); } - - void WebView::onLoadFinished(bool ok) { // If page was not loaded, then display custom error page. if (!ok) {