diff --git a/CMakeLists.txt b/CMakeLists.txt index f35656f47..0642a477e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,8 +41,8 @@ project(rssguard) set(APP_NAME "RSS Guard") set(APP_LOW_NAME "rssguard") -set(APP_VERSION "1.9.9.7") -set(FILE_VERSION "1,9,9,7") +set(APP_VERSION "1.9.9.8") +set(FILE_VERSION "1,9,9,8") set(APP_AUTHOR "Martin Rotter") set(APP_URL "http://bitbucket.org/skunkos/rssguard") set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues") diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index aeaf94f6c..275f0b3e0 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -1,14 +1,6 @@ - - CornerButton - - Open new web browser tab. - Tooltip for "new tab" webbrowser corner button. - Otevřít nový tab webového prohlížeče. - - DatabaseFactory @@ -99,12 +91,12 @@ - FeedsModelStandardCategory + FeedsModelCategory - %1 (standard category) + %1 (category) %2%3 Tooltip for standard feed. - %1 (standardní kategorie) + %1 (kategorie) %2%3 @@ -126,7 +118,7 @@ Tato kategorie neobsahuje žádné podřízené položky. - FeedsModelStandardFeed + FeedsModelFeed does not use auto-update Describes feed auto-update status. @@ -403,22 +395,6 @@ Warning messagebox title when selected item cannot be edited. 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é. - - Add new standard category. - Přidat novou standardní kategorii. - - - Add new standard feed. - Přidat nový standardní kanál. - - - New standard &feed - Nový standard&ní kanál - - - New standard &category - Nová standardní &kategorie - Hides main window if it is visible and shows it if it is hidden. Skryje hlavní ikno, je-li aktuálně viditelné. Jinak jej zobrazí. @@ -615,6 +591,34 @@ Warning messagebox title when selected item cannot be edited. Cannot open external browser. Navigate to application website manually. Externí webový prohlížeč nelze otevřít. Zkontrolujte aktualizace ručně na webu programu. + + New &feed + Nový &kanál + + + Add new feed. + Přidat nový kanál. + + + New &category + No&vá kategorie + + + Add new category. + Přidat novou kategorii. + + + &Toolbars + &Nástrojové lišty + + + Switch visibility of main toolbars. + Přepnout viditelnost hlavnich nástrojových lišet. + + + &Feed/message list headers + &Hlavičky seznamů zpráv/kanálů + FormSettings @@ -1658,21 +1662,6 @@ Přejít na web aplikace a stáhnout jej ručně. Nelze přejít k instalačnímu souboru. Zkontrolujte nové instalační soubory ručně na webu aplikace. - - FormWelcome - - Welcome - Vítejte - - - Welcome to %1 - Vítá Vás %1 - - - <p>%3 is a (very) easy-to-use feed reader. It supports all major feed formats, including RSS, ATOM and RDF.</p><p>Make sure you explore all available features. If you find a bug or if you want to propose new feature, then create new <a href="%1"><span style="text-decoration: underline; color:#0000ff;">issue report</span></a>.</p><p>%3 can be translated to any language. Contact its <a href="mailto:%2"><span style="text-decoration: underline; color:#0000ff;">author</span></a> in case of your interest.</p><p><br/></p> - <p>%3 je (velmi) jednoduchá čtečka kanálů. Podporuje všechny rozšířené formáty kanálů, včetně RSS, ATOM a RDF.</p><p>Ujistěte se, že prozkoumáte všechny její funkce. Pokud najdete v aplikaci chybu nebo jste dostali nápad na její vylepšení, pak to <a href="%1"><span style="text-decoration: underline; color:#0000ff;">nahlaste</span></a>.</p><p>%3 může být přeložen do kteréhokoliv jazyka. Kontaktujte jeho <a href="mailto:%2"><span style="text-decoration: underline; color:#0000ff;">autora</span></a> pro více informací.</p><p><br/></p> - - LocationLineEdit @@ -1900,12 +1889,16 @@ Přejít na web aplikace a stáhnout jej ručně. ShortcutCatcher - Reset shortcut. - Obnovit zkratku. + Reset to original shortcut. + Obnovit původní zkratku. - Set shortcut. - Nastavit zkratku. + Clear current shortcut. + Vymazat současnou zkratku. + + + Click and hit new shortcut. + Klikněte a stiskněte novou zkratku. @@ -1953,6 +1946,10 @@ Přejít na web aplikace a stáhnout jej ručně. Main menu Hlavní menu + + Open new web browser tab. + Otevřít nový tab webového prohlížeče. + TrayIconMenu @@ -2032,6 +2029,10 @@ Přejít na web aplikace a stáhnout jej ručně. Stop web page loading. Zastavit načítání aktuální webové stránky. + + %1 kB / %2 kB + + WebView diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index 2aebcebd7..67dee8e8b 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -1,14 +1,6 @@ - - CornerButton - - Open new web browser tab. - Tooltip for "new tab" webbrowser corner button. - - - DatabaseFactory @@ -99,9 +91,9 @@ - FeedsModelStandardCategory + FeedsModelCategory - %1 (standard category) + %1 (category) %2%3 Tooltip for standard feed. @@ -122,7 +114,7 @@ This category does not contain any nested items. - FeedsModelStandardFeed + FeedsModelFeed does not use auto-update Describes feed auto-update status. @@ -393,22 +385,6 @@ Warning messagebox title when selected item cannot be edited. 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. - - Add new standard category. - Neue Standardkategorie hinzufügen. - - - Add new standard feed. - Füge einen neuen Standard-Feed hinzu. - - - New standard &feed - Neuen Standard-&Feed - - - New standard &category - Neue Standard-&Kategorie - Hides main window if it is visible and shows it if it is hidden. Hauptfenster verstecken falls es sichtbar was oder sichtbar falls es versteckt war. @@ -605,6 +581,34 @@ Warning messagebox title when selected item cannot be edited. Cannot open external browser. Navigate to application website manually. + + New &feed + + + + Add new feed. + + + + New &category + + + + Add new category. + + + + &Toolbars + + + + Switch visibility of main toolbars. + + + + &Feed/message list headers + + FormSettings @@ -1634,21 +1638,6 @@ Go to application website to obtain it manually. - - FormWelcome - - Welcome - Willkommen - - - Welcome to %1 - - - - <p>%3 is a (very) easy-to-use feed reader. It supports all major feed formats, including RSS, ATOM and RDF.</p><p>Make sure you explore all available features. If you find a bug or if you want to propose new feature, then create new <a href="%1"><span style="text-decoration: underline; color:#0000ff;">issue report</span></a>.</p><p>%3 can be translated to any language. Contact its <a href="mailto:%2"><span style="text-decoration: underline; color:#0000ff;">author</span></a> in case of your interest.</p><p><br/></p> - - - LocationLineEdit @@ -1876,12 +1865,16 @@ Go to application website to obtain it manually. ShortcutCatcher - Reset shortcut. - Kürzel zurücksetzen. + Reset to original shortcut. + - Set shortcut. - Kürzel setzen. + Clear current shortcut. + + + + Click and hit new shortcut. + @@ -1929,6 +1922,10 @@ Go to application website to obtain it manually. Main menu + + Open new web browser tab. + + TrayIconMenu @@ -2008,6 +2005,10 @@ Go to application website to obtain it manually. Stop web page loading. Stoppe das laden der Webseite. + + %1 kB / %2 kB + + WebView diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index 1e187ea66..e3d7b02ad 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -1,14 +1,6 @@ - - CornerButton - - Open new web browser tab. - Tooltip for "new tab" webbrowser corner button. - - - DatabaseFactory @@ -99,9 +91,9 @@ - FeedsModelStandardCategory + FeedsModelCategory - %1 (standard category) + %1 (category) %2%3 Tooltip for standard feed. @@ -122,7 +114,7 @@ This category does not contain any nested items. - FeedsModelStandardFeed + FeedsModelFeed does not use auto-update Describes feed auto-update status. @@ -393,22 +385,6 @@ Warning messagebox title when selected item cannot be edited. Displays all messages from selected feeds/categories in a new "newspaper mode" tab. Note that messages are not set as read automatically. - - Add new standard category. - - - - Add new standard feed. - - - - New standard &feed - - - - New standard &category - - Hides main window if it is visible and shows it if it is hidden. @@ -605,6 +581,34 @@ Warning messagebox title when selected item cannot be edited. Cannot open external browser. Navigate to application website manually. + + New &feed + + + + Add new feed. + + + + New &category + + + + Add new category. + + + + &Toolbars + + + + Switch visibility of main toolbars. + + + + &Feed/message list headers + + FormSettings @@ -1629,21 +1633,6 @@ Go to application website to obtain it manually. - - FormWelcome - - Welcome - - - - Welcome to %1 - - - - <p>%3 is a (very) easy-to-use feed reader. It supports all major feed formats, including RSS, ATOM and RDF.</p><p>Make sure you explore all available features. If you find a bug or if you want to propose new feature, then create new <a href="%1"><span style="text-decoration: underline; color:#0000ff;">issue report</span></a>.</p><p>%3 can be translated to any language. Contact its <a href="mailto:%2"><span style="text-decoration: underline; color:#0000ff;">author</span></a> in case of your interest.</p><p><br/></p> - - - LocationLineEdit @@ -1871,11 +1860,15 @@ Go to application website to obtain it manually. ShortcutCatcher - Reset shortcut. + Reset to original shortcut. - Set shortcut. + Clear current shortcut. + + + + Click and hit new shortcut. @@ -1924,6 +1917,10 @@ Go to application website to obtain it manually. Main menu + + Open new web browser tab. + + TrayIconMenu @@ -2003,6 +2000,10 @@ Go to application website to obtain it manually. Stop web page loading. + + %1 kB / %2 kB + + WebView diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts index 97323cb47..41e982588 100644 --- a/localization/rssguard-fr_FR.ts +++ b/localization/rssguard-fr_FR.ts @@ -1,14 +1,6 @@ - - CornerButton - - Open new web browser tab. - Tooltip for "new tab" webbrowser corner button. - Ouvrir un nouvel onglet de navigation web. - - DatabaseFactory @@ -99,47 +91,46 @@ - FeedsModelStandardCategory + FeedsModelCategory - %1 (standard category) + %1 (category) %2%3 Tooltip for standard feed. - %1 (catégorie standard) -%2%3 + This category does not contain any nested items. - + Cette catégorie ne peut pas contenir d'articles imbriqués. %n unread message(s). Tooltip for "unread" column of feed list. - + %n message(s) non lu(s). %n message(s) non lu(s). - FeedsModelStandardFeed + FeedsModelFeed does not use auto-update Describes feed auto-update status. - Ne pas utiliser la mise à jour automatique + Ne pas utiliser la mise à jour automatique uses global settings Describes feed auto-update status. - Utiliser les paramètres globaux + Utiliser les paramètres globaux uses specific settings (%n minute(s) to next auto-update) Describes feed auto-update status. - + Utiliser des paramètres spécifiques (%n minute(s) avant la prochaine mise à jour automatique) Utiliser des paramètres spécifiques (%n minute(s) avant la prochaine mise à jour automatique) @@ -151,7 +142,7 @@ Cette catégorie ne peut pas contenir d'articles imbriqués. Encoding: %4 Auto-update status: %5 Tooltip for feed. - %1 (%2) + %1 (%2) %3 Encodage : %4 @@ -160,7 +151,7 @@ Statut de la mise à jour automatique : %5 %n unread message(s). Tooltip for "unread" column of feed list. - + %n message(s) non lu(s). %n message(s) non lu(s). @@ -400,22 +391,6 @@ Warning messagebox title when selected item cannot be edited. Displays all messages from selected feeds/categories in a new "newspaper mode" tab. Note that messages are not set as read automatically. Afficher tout les messages depuis les flux/catégories sélectionnées dans un nouvel onglet en mode "journal". Notez que les messages ne sont pas marqué lus automatiquement. - - Add new standard category. - Ajouter une nouvelle catégorie standard. - - - Add new standard feed. - Ajouter un nouveau flux standard. - - - New standard &feed - Nouveau &flux standard - - - New standard &category - Nouvelle &catégorie standard - Hides main window if it is visible and shows it if it is hidden. Cacher la fenêtre principale si il est visible et la montrer si il est cacher. @@ -612,6 +587,34 @@ Warning messagebox title when selected item cannot be edited. Cannot open external browser. Navigate to application website manually. + + New &feed + + + + Add new feed. + + + + New &category + + + + Add new category. + + + + &Toolbars + + + + Switch visibility of main toolbars. + + + + &Feed/message list headers + + FormSettings @@ -1658,21 +1661,6 @@ Aller sur le site de l'application pour les obtenir manuellement.Impossible d'aller récupérer le fichier d'installation. Vérifiez le nouveau fichier d'installation manuellement sur ​​le site web du projet. - - FormWelcome - - Welcome - Bienvenu - - - Welcome to %1 - Bienvenu à %1 - - - <p>%3 is a (very) easy-to-use feed reader. It supports all major feed formats, including RSS, ATOM and RDF.</p><p>Make sure you explore all available features. If you find a bug or if you want to propose new feature, then create new <a href="%1"><span style="text-decoration: underline; color:#0000ff;">issue report</span></a>.</p><p>%3 can be translated to any language. Contact its <a href="mailto:%2"><span style="text-decoration: underline; color:#0000ff;">author</span></a> in case of your interest.</p><p><br/></p> - <p>%3 est un lecteur de flux (très) facile d'utilisation. Il supporte tout les principaux formats de flux, incluant RSS, ATOM et RDF.</p><p>Assurez-vous d'explorer toutes les fonctionnalités disponibles. Si vous trouvez un bug ou si vous souhaitez proposer une nouvelle fonctionnalité, alors créez une nouvelle <a href="%1"><span style="text-decoration: underline; color:#0000ff;">"issue report"</span></a>.</p><p>%3 peut être traduit dans n'importe quelle langue. Contactez l'<a href="mailto:%2"><span style="text-decoration: underline; color:#0000ff;">auteur</span></a> dans le cas où vous seriez intéressé(e).</p><p><br/></p> - - LocationLineEdit @@ -1900,12 +1888,16 @@ Aller sur le site de l'application pour les obtenir manuellement. ShortcutCatcher - Reset shortcut. - Réinitialiser le raccourcis. + Reset to original shortcut. + - Set shortcut. - Définir le raccourcis. + Clear current shortcut. + + + + Click and hit new shortcut. + @@ -1953,6 +1945,10 @@ Aller sur le site de l'application pour les obtenir manuellement.Main menu + + Open new web browser tab. + Ouvrir un nouvel onglet de navigation web. + TrayIconMenu @@ -2032,6 +2028,10 @@ Aller sur le site de l'application pour les obtenir manuellement.Stop web page loading. Arrêter le chargement de la page + + %1 kB / %2 kB + + WebView diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index a56dc6f12..b92dbc1e6 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -1,14 +1,6 @@ - - CornerButton - - Open new web browser tab. - Tooltip for "new tab" webbrowser corner button. - Open een nieuw webbrowser tabblad - - DatabaseFactory @@ -99,12 +91,12 @@ - FeedsModelStandardCategory + FeedsModelCategory - %1 (standard category) + %1 (category) %2%3 Tooltip for standard feed. - %1 (standaard categorie) + %1 (categorie) %2%3 @@ -125,7 +117,7 @@ Deze categorie bevat geen nested items. - FeedsModelStandardFeed + FeedsModelFeed does not use auto-update Describes feed auto-update status. @@ -400,22 +392,6 @@ Warning messagebox title when selected item cannot be edited. 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. - - Add new standard category. - Voeg nieuw standaard categorie toe. - - - Add new standard feed. - Voeg nieuw standaard feed toe. - - - New standard &feed - Nieuw standaard &feed - - - New standard &category - Nieuw standaard &categorie - Hides main window if it is visible and shows it if it is hidden. Verberg hoofdvenster als het zichtbaar is en toon het als het verborgen is. @@ -450,7 +426,7 @@ Warning messagebox title when selected item cannot be edited. &Delete selected messages - Verwij&der geselecteerde berichten. + Verwij&der geselecteerde berichten Deletes all messages from selected feeds. @@ -486,7 +462,7 @@ Warning messagebox title when selected item cannot be edited. Hides or displays the main menu. - Verberg of toon het hoofdmenu + Verberg of toon het hoofdmenu. Add &new feed/category @@ -550,11 +526,11 @@ Warning messagebox title when selected item cannot be edited. Select &next feed/category - Selecteer volge&nde feeds/categorieën. + Selecteer volge&nde feeds/categorieën Select &previous feed/category - Selecteer &vorige feeds/categorieën. + Selecteer &vorige feeds/categorieën Select &next message @@ -598,19 +574,47 @@ Warning messagebox title when selected item cannot be edited. Switch visibility of main &window - + Schakel over naar het hoofd&venster Report a &bug... - + Rapporteer een &bug... Cannot open external browser - + Kan externe browser niet starten Cannot open external browser. Navigate to application website manually. - + Kan externe webbrowser niet starten, Navigeer handmatig naar RSSguard website. + + + New &feed + Nieuw &feed + + + Add new feed. + Voeg nieuw feed toe. + + + New &category + Nieuw &categorie + + + Add new category. + Voeg nieuwe categorie toe. + + + &Toolbars + &Werkbalk + + + Switch visibility of main toolbars. + Schakel over naar het hoofdvenster. + + + &Feed/message list headers + &Feed/bericht kopteksten @@ -1638,7 +1642,7 @@ de geïnstalleerde. Download installation file for your OS. - Download installatie bestand voor OS/2 + Download installatie bestand voor OS/2. Installation file is not available directly. @@ -1656,22 +1660,7 @@ Ga naar RRSguard website en download het handmatig. Cannot navigate to installation file. Check new installation downloads manually on project website. - Kan niet naar installatiebestand bladeren. Controleer nieuwe installatie downloads handmatig op RSSguard website - - - - FormWelcome - - Welcome - Welkom - - - Welcome to %1 - Welkom bij %1 - - - <p>%3 is a (very) easy-to-use feed reader. It supports all major feed formats, including RSS, ATOM and RDF.</p><p>Make sure you explore all available features. If you find a bug or if you want to propose new feature, then create new <a href="%1"><span style="text-decoration: underline; color:#0000ff;">issue report</span></a>.</p><p>%3 can be translated to any language. Contact its <a href="mailto:%2"><span style="text-decoration: underline; color:#0000ff;">author</span></a> in case of your interest.</p><p><br/></p> - <p>%3 is een (zeer) makelijk te gebruiken feed lezer.Het ondersteund alle grote formaten, inclusief RSS, ATOM en RDF.</p><p>Maak gebruik van all beschikbare functies die er zijn. Ook als je een bug vind, of je hebt een nieuwe functie die je wilt zien, maak dan een nieuwe <a href="%1"><span style="text-decoration: underline; color:#0000ff;">issue report</span></a>.</p><p>%3 kan naar iedere taal worden vertaald. Contactpersoon is<a href="mailto:%2"><span style="text-decoration: underline; color:#0000ff;">autheur</span></a> In geval van belangstelling.</p><p><br/></p> + Kan niet naar installatiebestand bladeren. Controleer nieuwe installatie downloads handmatig op RSSguard website. @@ -1885,7 +1874,7 @@ Ga naar RRSguard website en download het handmatig. LANG_VERSION Version of your translation, e.g. 1.0. - 0.06 + 0.07 LANG_AUTHOR @@ -1901,12 +1890,16 @@ Ga naar RRSguard website en download het handmatig. ShortcutCatcher - Reset shortcut. - Reset Sneltoets. + Reset to original shortcut. + Reset naar standaard sneltoets. - Set shortcut. - Stel sneltoets in. + Clear current shortcut. + Wis huidige sneltoets. + + + Click and hit new shortcut. + Klik en raak nieuwe sneltoets. @@ -1948,11 +1941,15 @@ Ga naar RRSguard website en download het handmatig. Displays main menu. - + Toont het hoofdmenu. Main menu - + Hoofdmenu + + + Open new web browser tab. + Open een nieuw webbrowser tabblad. @@ -2033,6 +2030,10 @@ Ga naar RRSguard website en download het handmatig. Stop web page loading. Stop het laden van pagina. + + %1 kB / %2 kB + %1 kB / %2 kB + WebView diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index 32af06dc6..ee1cb0711 100644 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -412,7 +412,7 @@ void FeedsView::deleteSelectedItem() { selection_model->select(current_index, QItemSelectionModel::Rows | QItemSelectionModel::SelectCurrent); if (SystemTrayIcon::isSystemTrayActivated()) { - SystemTrayIcon::instance()->showMessage(tr("Cannot delete multiple "), + SystemTrayIcon::instance()->showMessage(tr("Cannot delete item"), tr("Selected item cannot be deleted because feed update is ongoing."), QSystemTrayIcon::Warning); }