diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts
index 1c5f5dc5b..54379ae2f 100644
--- a/localization/rssguard-cs_CZ.ts
+++ b/localization/rssguard-cs_CZ.ts
@@ -100,6 +100,18 @@
Name of root item of feed list which can be seen in feed add/edit dialog.Kořen
+
+ Invalid tree data.
+ Chybná data stromu.
+
+
+ Import successfull, but some feeds/categories were not imported due to error.
+ Import byl úspěšný, ale některé kanály či kategorie nebyly importovány kvůli chybě.
+
+
+ Import was completely successfull.
+ Import byl zcela úspěšný.
+ FeedsModelCategory
@@ -235,6 +247,34 @@ Status auto-aktualizací: %5
You cannot update selected items because another feed update is ongoing.Právě nyní nemůžete aktualizovat vybrané položky, protože nejspíše probíhá jiná aktualizace.
+
+ You can delete feeds/categories only one by one.
+ Kategorie a kanály lze mazat pouze po jednom.
+
+
+ Deleting feed or category.
+ Mažu kanál či kategorii.
+
+
+ You are about to delete selected feed or category.
+ Právě se chystáte smazat vybraný kanál či kategorii.
+
+
+ Do you really want to remove selected item?
+ Upravdu chcete vybranou položku smazat?
+
+
+ Deletion of item failed.
+ Mazání položky selhalo.
+
+
+ Selected item was not deleted due to error.
+ Vybraná položka nebyla smazána kvůli chybě.
+
+
+ You selected multiple items for deletion.
+ Bylo zvoleno více položek pro vymazání najednou.
+ FormAbout
@@ -684,103 +724,95 @@ Status auto-aktualizací: %5
Popis je v pořádku.
- Feed was not edit due to error.
-
+ Feed was not edited due to error.
+ Kanál nebyl upraven kvůli chybě.FormImportExport
-
- Dialog
-
- &Select file
-
+ &Zvolit souborOperation results
-
+ Výsledky operacíNo file is selected.
-
+ Nevybrán žádný soubor.No operation executed yet.
-
+ Doposud neprovedena žádná operace.Export feeds
-
+ Exportovat kanályDestination file
-
+ Cílový souborSource feeds && categories
-
+ Zdrojové kanály && kategorieSource file
-
+ Zdrojový souborTarget feeds && categories
-
+ Cílové kanály && kategorieImport feeds
-
+ Importovat kanályOPML 2.0 files (*.opml)
-
+ soubory OPML 2.0 (*.opml)Select file for feeds export
-
+ Zvolit soubor pro export kanálůFile is selected.
-
+ Soubor je vybrán.Select file for feeds import
-
+ Zvolit soubot pro import kanálůCannot open source file.
-
+ Zdrojový soubor nelze otevřít.Feeds were loaded.
-
+ Kanály načteny.Error, file is not well-formed. Select another file.
-
+ Chyba, soubor nemá správný formát, zvolte jiný.Error occurred. File is not well-formed. Select another file.
-
+ Chyba, soubor nemá správný formát, zvolte jiný.Feeds were exported successfully.
-
+ Kanály byly úspěšně exportovány.Cannot write into destination file.
-
+ Do cílového souboru nelze zapisovat.Critical error occurred.
-
-
-
- Feeds imported successfully.
-
+ Vyskytla se kritická chyba.
diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts
index 1b49c7efc..214e1dafe 100644
--- a/localization/rssguard-de_DE.ts
+++ b/localization/rssguard-de_DE.ts
@@ -100,6 +100,18 @@
Name of root item of feed list which can be seen in feed add/edit dialog.Wurzel
+
+ Invalid tree data.
+
+
+
+ Import successfull, but some feeds/categories were not imported due to error.
+
+
+
+ Import was completely successfull.
+
+ FeedsModelCategory
@@ -224,6 +236,34 @@ Auto-update status: %5
You cannot update selected items because another feed update is ongoing.Sie können die selektierten Items nicht updaten weil ein anderer Feed-Update läuft.
+
+ You can delete feeds/categories only one by one.
+
+
+
+ Deleting feed or category.
+
+
+
+ You are about to delete selected feed or category.
+
+
+
+ Do you really want to remove selected item?
+
+
+
+ Deletion of item failed.
+
+
+
+ Selected item was not deleted due to error.
+
+
+
+ You selected multiple items for deletion.
+
+ FormAbout
@@ -673,16 +713,12 @@ Auto-update status: %5
- Feed was not edit due to error.
+ Feed was not edited due to error.FormImportExport
-
- Dialog
-
- &Select file
@@ -767,10 +803,6 @@ Auto-update status: %5
Critical error occurred.
-
- Feeds imported successfully.
-
- FormMain
diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts
index f1035982a..b73029a67 100644
--- a/localization/rssguard-en_GB.ts
+++ b/localization/rssguard-en_GB.ts
@@ -100,6 +100,18 @@
Name of root item of feed list which can be seen in feed add/edit dialog.
+
+ Invalid tree data.
+
+
+
+ Import successfull, but some feeds/categories were not imported due to error.
+
+
+
+ Import was completely successfull.
+
+ FeedsModelCategory
@@ -224,6 +236,34 @@ Auto-update status: %5
You cannot update selected items because another feed update is ongoing.
+
+ You can delete feeds/categories only one by one.
+
+
+
+ Deleting feed or category.
+
+
+
+ You are about to delete selected feed or category.
+
+
+
+ Do you really want to remove selected item?
+
+
+
+ Deletion of item failed.
+
+
+
+ Selected item was not deleted due to error.
+
+
+
+ You selected multiple items for deletion.
+
+ FormAbout
@@ -673,16 +713,12 @@ Auto-update status: %5
- Feed was not edit due to error.
+ Feed was not edited due to error.FormImportExport
-
- Dialog
-
- &Select file
@@ -767,10 +803,6 @@ Auto-update status: %5
Critical error occurred.
-
- Feeds imported successfully.
-
- FormMain
diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts
index 4766e184b..e3e373274 100644
--- a/localization/rssguard-fr_FR.ts
+++ b/localization/rssguard-fr_FR.ts
@@ -100,6 +100,18 @@
Name of root item of feed list which can be seen in feed add/edit dialog.Racine
+
+ Invalid tree data.
+
+
+
+ Import successfull, but some feeds/categories were not imported due to error.
+
+
+
+ Import was completely successfull.
+
+ FeedsModelCategory
@@ -226,6 +238,34 @@ Auto-update status: %5
You cannot update selected items because another feed update is ongoing.Vous ne pouvez pas mettre à jour les articles sélectionnés car une autre mise à jour est en cours sur les flux.
+
+ You can delete feeds/categories only one by one.
+
+
+
+ Deleting feed or category.
+
+
+
+ You are about to delete selected feed or category.
+
+
+
+ Do you really want to remove selected item?
+
+
+
+ Deletion of item failed.
+
+
+
+ Selected item was not deleted due to error.
+
+
+
+ You selected multiple items for deletion.
+
+ FormAbout
@@ -675,16 +715,12 @@ Auto-update status: %5
- Feed was not edit due to error.
+ Feed was not edited due to error.FormImportExport
-
- Dialog
-
- &Select file
@@ -769,10 +805,6 @@ Auto-update status: %5
Critical error occurred.
-
- Feeds imported successfully.
-
- FormMain
diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts
index 547afb162..f2f37da44 100644
--- a/localization/rssguard-it_IT.ts
+++ b/localization/rssguard-it_IT.ts
@@ -100,6 +100,18 @@
Name of root item of feed list which can be seen in feed add/edit dialog.Root
+
+ Invalid tree data.
+
+
+
+ Import successfull, but some feeds/categories were not imported due to error.
+
+
+
+ Import was completely successfull.
+
+ FeedsModelCategory
@@ -225,6 +237,34 @@ Auto-update status: %5
You cannot update selected items because another feed update is ongoing.
+
+ You can delete feeds/categories only one by one.
+
+
+
+ Deleting feed or category.
+
+
+
+ You are about to delete selected feed or category.
+
+
+
+ Do you really want to remove selected item?
+
+
+
+ Deletion of item failed.
+
+
+
+ Selected item was not deleted due to error.
+
+
+
+ You selected multiple items for deletion.
+
+ FormAbout
@@ -674,16 +714,12 @@ Auto-update status: %5
- Feed was not edit due to error.
+ Feed was not edited due to error.FormImportExport
-
- Dialog
- Dialogo
- &Select file
@@ -768,10 +804,6 @@ Auto-update status: %5
Critical error occurred.
-
- Feeds imported successfully.
-
- FormMain
diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts
index 5acf5a9f7..4bf3359dc 100644
--- a/localization/rssguard-nl_NL.ts
+++ b/localization/rssguard-nl_NL.ts
@@ -100,6 +100,18 @@
Name of root item of feed list which can be seen in feed add/edit dialog.Root
+
+ Invalid tree data.
+
+
+
+ Import successfull, but some feeds/categories were not imported due to error.
+
+
+
+ Import was completely successfull.
+
+ FeedsModelCategory
@@ -227,6 +239,34 @@ Auto-update status: %5
You cannot update selected items because another feed update is ongoing.Je kan gekozen items niet bijwerken omdat feeds aan het updaten zijn.
+
+ You can delete feeds/categories only one by one.
+
+
+
+ Deleting feed or category.
+
+
+
+ You are about to delete selected feed or category.
+
+
+
+ Do you really want to remove selected item?
+
+
+
+ Deletion of item failed.
+
+
+
+ Selected item was not deleted due to error.
+
+
+
+ You selected multiple items for deletion.
+
+ FormAbout
@@ -676,16 +716,12 @@ Auto-update status: %5
- Feed was not edit due to error.
+ Feed was not edited due to error.FormImportExport
-
- Dialog
-
- &Select file
@@ -770,10 +806,6 @@ Auto-update status: %5
Critical error occurred.
-
- Feeds imported successfully.
-
- FormMain
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 7e7badbb1..46dc2bc1a 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -416,11 +416,3 @@ void FeedMessageViewer::refreshVisualProperties() {
m_toolBarFeeds->setToolButtonStyle(button_style);
m_toolBarMessages->setToolButtonStyle(button_style);
}
-
-void FeedMessageViewer::importFeeds() {
- // TODO: todo
-}
-
-void FeedMessageViewer::exportFeeds() {
- // TODO: todo
-}
diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h
index 16a356897..7f7371f07 100644
--- a/src/gui/feedmessageviewer.h
+++ b/src/gui/feedmessageviewer.h
@@ -89,11 +89,6 @@ class FeedMessageViewer : public TabContent {
// Reloads some changeable visual settings.
void refreshVisualProperties();
- // Displays dialog for export/import of feeds
- // in various formats + does the whole job.
- void importFeeds();
- void exportFeeds();
-
protected slots:
// Updates counts of messages for example in tray icon.
void updateTrayIconStatus(int unread_messages, int total_messages);
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index 93d78f355..c5599cc76 100755
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -351,11 +351,19 @@ void FeedsView::deleteSelectedItem() {
selection_model->clearSelection();
selection_model->select(current_index, QItemSelectionModel::Rows | QItemSelectionModel::SelectCurrent);
- qApp->showGuiMessage(tr("You selected multiplet items for deletion."),
+ qApp->showGuiMessage(tr("You selected multiple items for deletion."),
tr("You can delete feeds/categories only one by one."),
QSystemTrayIcon::Warning, qApp->mainForm());
}
+ if (MessageBox::show(qApp->mainForm(), QMessageBox::Question, tr("Deleting feed or category."),
+ tr("You are about to delete selected feed or category."), tr("Do you really want to remove selected item?"),
+ QString(), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::No) {
+ // User changed his mind.
+ qApp->closeLock()->unlock();
+ return;
+ }
+
if (m_sourceModel->removeItem(m_proxyModel->mapToSource(current_index))) {
// Item WAS removed, update counts.
// TODO: I do not need to update counts of all items here.
diff --git a/src/gui/formfeeddetails.cpp b/src/gui/formfeeddetails.cpp
index dcea91a65..08c95a5e6 100755
--- a/src/gui/formfeeddetails.cpp
+++ b/src/gui/formfeeddetails.cpp
@@ -237,7 +237,7 @@ void FormFeedDetails::apply() {
}
else {
qApp->showGuiMessage(tr("Cannot edit feed"),
- tr("Feed was not edit due to error."),
+ tr("Feed was not edited due to error."),
QSystemTrayIcon::Critical);
}
}