From 802545585174f0c89ababcec7640de0cc7bd9a2d Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 27 Aug 2014 16:31:22 +0200 Subject: [PATCH] Lang update, refactoring and fixing some db errors. --- localization/rssguard-cs_CZ.ts | 44 +++++---- localization/rssguard-de_DE.ts | 30 +++--- localization/rssguard-en_GB.ts | 30 +++--- localization/rssguard-fr_FR.ts | 30 +++--- localization/rssguard-it_IT.ts | 93 +++++++++--------- localization/rssguard-nl_NL.ts | 30 +++--- .../icons/mini-kfaenza/document-export.png | Bin 0 -> 2066 bytes .../icons/mini-kfaenza/document-import.png | Bin 0 -> 2056 bytes src/gui/formcategorydetails.cpp | 2 +- src/gui/formfeeddetails.cpp | 2 +- src/gui/formmain.cpp | 2 + src/gui/formmain.ui | 17 +--- src/gui/messagesview.cpp | 15 +++ src/miscellaneous/debugging.cpp | 1 - src/miscellaneous/localization.cpp | 2 - src/miscellaneous/settings.cpp | 1 - src/miscellaneous/skinfactory.cpp | 2 - src/miscellaneous/systemfactory.cpp | 1 - src/network-web/basenetworkaccessmanager.cpp | 2 - .../silentnetworkaccessmanager.cpp | 6 +- src/network-web/silentnetworkaccessmanager.h | 2 - src/network-web/webfactory.cpp | 2 - 22 files changed, 166 insertions(+), 148 deletions(-) create mode 100644 resources/graphics/icons/mini-kfaenza/document-export.png create mode 100644 resources/graphics/icons/mini-kfaenza/document-import.png diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index dc287f28f..b73a6bb5e 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -341,10 +341,6 @@ Status auto-aktualizace: %5 Description is empty. Popis je prázdný. - - The description os ok. - - Select icon file for the category Zvolte ikonu pro Vaši kategorii @@ -406,6 +402,10 @@ Status auto-aktualizace: %5 Use default icon Použít výchozí ikonu + + The description is ok. + Popis je v pořádku. + FormExport @@ -516,10 +516,6 @@ Status auto-aktualizace: %5 Description is empty. Popis je prázdný. - - The description os ok. - - The url is ok. Url je v pořádku. @@ -681,6 +677,10 @@ Status auto-aktualizace: %5 Do not auto-update at all Zakázat auto-aktualizace + + The description is ok. + Popis je v pořádku. + FormMain @@ -716,10 +716,6 @@ Status auto-aktualizace: %5 &Add tab &Přidat panel - - Close all tabs except current one - Zavřít všechny panely kromě aktivního - &Messages &Zprávy @@ -862,7 +858,7 @@ Status auto-aktualizace: %5 &Close current tab - &Zavřít všechny taby + &Zavřít aktivní tab Mark &selected messages as &read @@ -1006,19 +1002,23 @@ Status auto-aktualizace: %5 &Import feeds - + &Importovat kanály Imports feeds you want from selected file. - + Importuje kanály ze souboru. &Export feeds - + &Exportovat kanály - Imports feeds you want to selected file. - + Exports feeds you want to selected file. + Exportuje kanály do souboru. + + + Close all tabs except current one. + Zavřít všechny taby kromě aktivního. @@ -1581,7 +1581,9 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.Some critical settings were changed and will be applied after the application gets restarted. You have to restart manually. - + Některá kritická nastavení se změnila a budou aktivována až po restartu aplikace. + +Musíte restartovat manuálně. @@ -1708,6 +1710,10 @@ Přejít na web aplikace a stáhnout jej ručně. Cannot launch external updater. Update application manually. Nelze spustit externí aktualizátor. Aktualizuje aplikaci manuálně. + + Go to application website + Přejít na web aplikace + LocationLineEdit diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index 44a78d375..4003673f5 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -331,10 +331,6 @@ Auto-update status: %5 Description is empty. Beschreibung ist leer. - - The description os ok. - Die Beschreibung ist okay. - Select icon file for the category Selektiere die Icon-Datei für die Kategorie @@ -396,6 +392,10 @@ Auto-update status: %5 Use default icon Standard-Icon verwenden + + The description is ok. + + FormExport @@ -506,10 +506,6 @@ Auto-update status: %5 Description is empty. Beschreibung ist leer. - - The description os ok. - Die Beschreibung ist okay. - The url is ok. Die URL ist okay. @@ -671,6 +667,10 @@ Auto-update status: %5 Do not auto-update at all Kein Auto-Update ausführen + + The description is ok. + + FormMain @@ -706,10 +706,6 @@ Auto-update status: %5 &Add tab &Reiter hinzufügen - - Close all tabs except current one - Alle Reiter schliessen ausser dem aktuellen - &Messages &Nachrichten @@ -1007,7 +1003,11 @@ Auto-update status: %5 - Imports feeds you want to selected file. + Exports feeds you want to selected file. + + + + Close all tabs except current one. @@ -1684,6 +1684,10 @@ Go to application website to obtain it manually. Cannot launch external updater. Update application manually. + + Go to application website + + LocationLineEdit diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index 9515b5b9a..f5e06ba51 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -331,10 +331,6 @@ Auto-update status: %5 Description is empty. - - The description os ok. - - Select icon file for the category @@ -396,6 +392,10 @@ Auto-update status: %5 Use default icon + + The description is ok. + + FormExport @@ -506,10 +506,6 @@ Auto-update status: %5 Description is empty. - - The description os ok. - - The url is ok. @@ -671,6 +667,10 @@ Auto-update status: %5 Do not auto-update at all + + The description is ok. + + FormMain @@ -706,10 +706,6 @@ Auto-update status: %5 &Add tab - - Close all tabs except current one - - &Messages @@ -1007,7 +1003,11 @@ Auto-update status: %5 - Imports feeds you want to selected file. + Exports feeds you want to selected file. + + + + Close all tabs except current one. @@ -1679,6 +1679,10 @@ Go to application website to obtain it manually. Cannot launch external updater. Update application manually. + + Go to application website + + LocationLineEdit diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts index c33b8469c..c6cb8676d 100644 --- a/localization/rssguard-fr_FR.ts +++ b/localization/rssguard-fr_FR.ts @@ -337,10 +337,6 @@ Statut de la mise à jour automatique : %5 Description is empty. La description est vide. - - The description os ok. - La description est correct. - Select icon file for the category Sélectionner un icône pour la catégorie @@ -402,6 +398,10 @@ Statut de la mise à jour automatique : %5 Use default icon Utiliser les icônes par défaut + + The description is ok. + + FormExport @@ -512,10 +512,6 @@ Statut de la mise à jour automatique : %5 Description is empty. La description est vide. - - The description os ok. - La description est correct. - The url is ok. L'URL est correct. @@ -677,6 +673,10 @@ Statut de la mise à jour automatique : %5 Do not auto-update at all Ne pas mettre tout à jour automatiquement + + The description is ok. + + FormMain @@ -712,10 +712,6 @@ Statut de la mise à jour automatique : %5 &Add tab &Ajouter un onglet - - Close all tabs except current one - Fermer tout les onglets sauf le courant - &Messages &Messages @@ -1013,7 +1009,11 @@ Statut de la mise à jour automatique : %5 - Imports feeds you want to selected file. + Exports feeds you want to selected file. + + + + Close all tabs except current one. @@ -1707,6 +1707,10 @@ Aller sur le site de l'application pour les obtenir manuellement.Cannot launch external updater. Update application manually. + + Go to application website + + LocationLineEdit diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts index 895d22230..6cbd1c6ac 100644 --- a/localization/rssguard-it_IT.ts +++ b/localization/rssguard-it_IT.ts @@ -131,6 +131,7 @@ This category does not contain any nested items. Describes feed auto-update status. + @@ -146,7 +147,8 @@ Auto-update status: %5 %n unread message(s). Tooltip for "unread" column of feed list. - + %n messaggio(i) non letto. + %n messaggio(i) non letti. @@ -181,9 +183,6 @@ Auto-update status: %5 Cannot edit item - Warning messagebox title when selected item cannot be edited. ----------- -Warning messagebox title when selected item cannot be edited. Impossibile modificare elemento @@ -214,15 +213,6 @@ Warning messagebox title when selected item cannot be edited. You cannot update selected items because another feed update is ongoing. - - Scheduled update started - - - - %1 is performing scheduled update of some feeds. - RSS Guard is performing updates right now. - - FormAbout @@ -342,10 +332,6 @@ Warning messagebox title when selected item cannot be edited. Description is empty. La descrizione è vuota. - - The description os ok. - La descrizione è ok. - Select icon file for the category Seleziona icona per la categoria @@ -407,6 +393,17 @@ Warning messagebox title when selected item cannot be edited. Use default icon Usa icona di default + + The description is ok. + + + + + FormExport + + Dialog + Dialogo + FormFeedDetails @@ -510,10 +507,6 @@ Warning messagebox title when selected item cannot be edited. Description is empty. La descrizione è vuota. - - The description os ok. - La descrizione è ok. - The url is ok. L'url è ok. @@ -675,6 +668,10 @@ Warning messagebox title when selected item cannot be edited. Do not auto-update at all + + The description is ok. + + FormMain @@ -710,10 +707,6 @@ Warning messagebox title when selected item cannot be edited. &Add tab &Aggiungi tab - - Close all tabs except current one - Chiudi tutti i tab tranne quello corrente - &Messages &Messaggi @@ -998,6 +991,26 @@ Warning messagebox title when selected item cannot be edited. &Feed/message list headers + + &Import feeds + + + + Imports feeds you want from selected file. + + + + &Export feeds + + + + Exports feeds you want to selected file. + + + + Close all tabs except current one. + + FormSettings @@ -1116,10 +1129,6 @@ Language column of language list. Http Http - - Do you want to restart now? - Vuoi riavviare adesso? - (not supported on this platform) (non supportato su questa piattaforma) @@ -1202,22 +1211,10 @@ Language column of language list. Hide tab bar if just one tab is visible Nascondi tab se è visibile un tab solo - - Some critical settings were changed and will be applied after the application gets restarted. - - Critical settings were changed Le impostazioni critiche sono cambiate - - Problem with application restart - Problema con il riavvio dell'applicazione - - - Application couldn't be restarted. Please, restart it manually for changes to take effect. - - Feeds & messages Feed & messaggi @@ -1555,6 +1552,12 @@ Authors of this application are NOT responsible for lost data. Select toolbar to edit Seleziona toolbar da modificare + + Some critical settings were changed and will be applied after the application gets restarted. + +You have to restart manually. + + FormUpdate @@ -1682,6 +1685,10 @@ Go to application website to obtain it manually. Cannot launch external updater. Update application manually. + + Go to application website + + LocationLineEdit @@ -2013,10 +2020,6 @@ Go to application website to obtain it manually. ToolBarEditor - - Dialog - Dialogo - Activated actions Azioni attivate diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index bb7a0edd4..f6e7fee25 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -338,10 +338,6 @@ Status automatisch bijwerken: %5 Description is empty. Omschrijving is leeg. - - The description os ok. - Omschrijving is ok. - Select icon file for the category Kies pictogram bestand voor de categorie @@ -403,6 +399,10 @@ Status automatisch bijwerken: %5 Use default icon Gebruik standaard pictogram + + The description is ok. + + FormExport @@ -513,10 +513,6 @@ Status automatisch bijwerken: %5 Description is empty. Omschrijving is leeg. - - The description os ok. - Omschrijving is ok. - The url is ok. De url is ok. @@ -678,6 +674,10 @@ Status automatisch bijwerken: %5 Do not auto-update at all Niet automatisch bijwerken + + The description is ok. + + FormMain @@ -713,10 +713,6 @@ Status automatisch bijwerken: %5 &Add tab &Tabblad toevoegen - - Close all tabs except current one - Sluit alle tabbladen behalve deze - &Messages &Berichten @@ -1014,7 +1010,11 @@ Status automatisch bijwerken: %5 - Imports feeds you want to selected file. + Exports feeds you want to selected file. + + + + Close all tabs except current one. @@ -1709,6 +1709,10 @@ Ga naar RRSguard website en download het handmatig. Cannot launch external updater. Update application manually. + + Go to application website + + LocationLineEdit diff --git a/resources/graphics/icons/mini-kfaenza/document-export.png b/resources/graphics/icons/mini-kfaenza/document-export.png new file mode 100644 index 0000000000000000000000000000000000000000..09eaa9f14f6b0b6f3a55f08165b022bd8f3bbcd5 GIT binary patch literal 2066 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 m`v^58Nm_txtDescription->setStatus(LineEditWithStatus::Warning, tr("Description is empty.")); } else { - m_ui->m_txtDescription->setStatus(LineEditWithStatus::Ok, tr("The description os ok.")); + m_ui->m_txtDescription->setStatus(LineEditWithStatus::Ok, tr("The description is ok.")); } } diff --git a/src/gui/formfeeddetails.cpp b/src/gui/formfeeddetails.cpp index ec09a78f6..a56543929 100755 --- a/src/gui/formfeeddetails.cpp +++ b/src/gui/formfeeddetails.cpp @@ -101,7 +101,7 @@ void FormFeedDetails::onDescriptionChanged(const QString &new_description) { m_ui->m_txtDescription->setStatus(LineEditWithStatus::Warning, tr("Description is empty.")); } else { - m_ui->m_txtDescription->setStatus(LineEditWithStatus::Ok, tr("The description os ok.")); + m_ui->m_txtDescription->setStatus(LineEditWithStatus::Ok, tr("The description is ok.")); } } diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index c5f842107..15d9e43e9 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -268,6 +268,8 @@ void FormMain::setupIcons() { m_ui->m_actionCheckForUpdates->setIcon(icon_theme_factory->fromTheme("check-for-updates")); m_ui->m_actionDefragmentDatabase->setIcon(icon_theme_factory->fromTheme("defragment-database")); m_ui->m_actionReportBug->setIcon(icon_theme_factory->fromTheme("application-report-bug")); + m_ui->m_actionExportFeeds->setIcon(icon_theme_factory->fromTheme("document-export")); + m_ui->m_actionImportFeeds->setIcon(icon_theme_factory->fromTheme("document-import")); // View. m_ui->m_actionSwitchMainWindow->setIcon(icon_theme_factory->fromTheme("view-switch-window")); diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui index 12811bab4..46a228572 100755 --- 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 @@ -236,7 +227,7 @@ &Close all tabs except current one - Close all tabs except current one + Close all tabs except current one. @@ -558,7 +549,7 @@ &Export feeds - Imports feeds you want to selected file. + Exports feeds you want to selected file. diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index 8aa51a288..bea787c0e 100755 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -301,6 +301,11 @@ void MessagesView::markSelectedMessagesUnread() { void MessagesView::setSelectedMessagesReadStatus(int read) { QModelIndex current_index = selectionModel()->currentIndex(); + + if (!current_index.isValid()) { + return; + } + QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index); QModelIndexList selected_indexes = selectionModel()->selectedRows(); QModelIndexList mapped_indexes = m_proxyModel->mapListToSource(selected_indexes); @@ -329,6 +334,11 @@ void MessagesView::setSelectedMessagesReadStatus(int read) { void MessagesView::deleteSelectedMessages() { QModelIndex current_index = selectionModel()->currentIndex(); + + if (!current_index.isValid()) { + return; + } + QModelIndexList selected_indexes = selectionModel()->selectedRows(); QModelIndexList mapped_indexes = m_proxyModel->mapListToSource(selected_indexes); @@ -354,6 +364,11 @@ void MessagesView::deleteSelectedMessages() { void MessagesView::switchSelectedMessagesImportance() { QModelIndex current_index = selectionModel()->currentIndex(); + + if (!current_index.isValid()) { + return; + } + QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index); QModelIndexList selected_indexes = selectionModel()->selectedRows(); QModelIndexList mapped_indexes = m_proxyModel->mapListToSource(selected_indexes); diff --git a/src/miscellaneous/debugging.cpp b/src/miscellaneous/debugging.cpp index 8bddc8579..1ed4ed1ef 100755 --- a/src/miscellaneous/debugging.cpp +++ b/src/miscellaneous/debugging.cpp @@ -17,7 +17,6 @@ #include "miscellaneous/debugging.h" -#include "definitions/definitions.h" #include "miscellaneous/application.h" #include diff --git a/src/miscellaneous/localization.cpp b/src/miscellaneous/localization.cpp index 9ceee90e7..14300e4cf 100755 --- a/src/miscellaneous/localization.cpp +++ b/src/miscellaneous/localization.cpp @@ -17,8 +17,6 @@ #include "miscellaneous/localization.h" -#include "definitions/definitions.h" -#include "miscellaneous/settings.h" #include "miscellaneous/application.h" #include diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index 01f67a25b..1c14289dc 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -17,7 +17,6 @@ #include "miscellaneous/settings.h" -#include "definitions/definitions.h" #include "miscellaneous/application.h" #include diff --git a/src/miscellaneous/skinfactory.cpp b/src/miscellaneous/skinfactory.cpp index 07f205a14..dbe02ff17 100755 --- a/src/miscellaneous/skinfactory.cpp +++ b/src/miscellaneous/skinfactory.cpp @@ -17,8 +17,6 @@ #include "miscellaneous/skinfactory.h" -#include "definitions/definitions.h" -#include "miscellaneous/settings.h" #include "miscellaneous/application.h" #include diff --git a/src/miscellaneous/systemfactory.cpp b/src/miscellaneous/systemfactory.cpp index 4b39db48b..85881192e 100755 --- a/src/miscellaneous/systemfactory.cpp +++ b/src/miscellaneous/systemfactory.cpp @@ -17,7 +17,6 @@ #include "miscellaneous/systemfactory.h" -#include "definitions/definitions.h" #include "network-web/networkfactory.h" #include "miscellaneous/application.h" diff --git a/src/network-web/basenetworkaccessmanager.cpp b/src/network-web/basenetworkaccessmanager.cpp index 0955c4612..94d9752a3 100755 --- a/src/network-web/basenetworkaccessmanager.cpp +++ b/src/network-web/basenetworkaccessmanager.cpp @@ -17,8 +17,6 @@ #include "network-web/basenetworkaccessmanager.h" -#include "definitions/definitions.h" -#include "miscellaneous/settings.h" #include "miscellaneous/application.h" #include diff --git a/src/network-web/silentnetworkaccessmanager.cpp b/src/network-web/silentnetworkaccessmanager.cpp index e8f5d504c..1b05c939c 100644 --- a/src/network-web/silentnetworkaccessmanager.cpp +++ b/src/network-web/silentnetworkaccessmanager.cpp @@ -40,15 +40,13 @@ void SilentNetworkAccessManager::onAuthenticationRequired(QNetworkReply *reply, authenticator->setUser(originating_object->property("username").toString()); authenticator->setPassword(originating_object->property("password").toString()); - qDebug("Feed '%s' requested authentication and got it.", - qPrintable(reply->url().toString())); + qDebug("Feed '%s' requested authentication and got it.", qPrintable(reply->url().toString())); reply->setProperty("authentication-given", true); } else { // Authentication is required but this feed does not contain it. - qDebug("Feed '%s' requested authentication but username/password is not available.", - qPrintable(reply->url().toString())); + qDebug("Feed '%s' requested authentication but username/password is not available.", qPrintable(reply->url().toString())); reply->setProperty("authentication-given", false); } diff --git a/src/network-web/silentnetworkaccessmanager.h b/src/network-web/silentnetworkaccessmanager.h index 701b59e7a..f1afe91f6 100644 --- a/src/network-web/silentnetworkaccessmanager.h +++ b/src/network-web/silentnetworkaccessmanager.h @@ -20,8 +20,6 @@ #include "network-web/basenetworkaccessmanager.h" -#include - // Network manager used for more communication for feeds. class SilentNetworkAccessManager : public BaseNetworkAccessManager { diff --git a/src/network-web/webfactory.cpp b/src/network-web/webfactory.cpp index d19ccb104..851cac8c1 100755 --- a/src/network-web/webfactory.cpp +++ b/src/network-web/webfactory.cpp @@ -1,7 +1,5 @@ #include "network-web/webfactory.h" -#include "definitions/definitions.h" -#include "miscellaneous/settings.h" #include "miscellaneous/application.h" #include