diff --git a/.gitmodules b/.gitmodules index 26a88cff0..42bce1682 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "resources/binaries"] path = resources/binaries url = git@bitbucket.org:skunkos/qt-binaries.git +[submodule "resources/scripts/transka"] + path = resources/scripts/transka + url = https://github.com/martinrotter/transka.git diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index e6cb45e38..aecdfb1bd 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -640,10 +640,6 @@ Automatický update: %5 Selected item was not deleted due to error. Vybraná položka nebyla smazána kvůli chybě. - - Deleting feed or category - Mazání zprávy či kategorie - Do you really want to delete selected item? Opravdu chcete vybranou položku smazat? @@ -684,6 +680,10 @@ Automatický update: %5 Selected item cannot be deleted because another critical operation is ongoing. Nelze smazat vybranou položku, protože už běží jiná kritická operace. + + Delete feed/category + Smazat kanál/kategorii + FormAbout diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index b601bde75..155352984 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -621,10 +621,6 @@ Auto-update status: %5 Selected item was not deleted due to error. - - Deleting feed or category - - Do you really want to delete selected item? Möchtest du dieses Item wirklich löschen? @@ -665,6 +661,10 @@ Auto-update status: %5 Selected item cannot be deleted because another critical operation is ongoing. + + Delete feed/category + + FormAbout diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index adfbc0926..fcb5b61d2 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -621,10 +621,6 @@ Auto-update status: %5 Selected item was not deleted due to error. - - Deleting feed or category - - Do you really want to delete selected item? @@ -665,6 +661,10 @@ Auto-update status: %5 Selected item cannot be deleted because another critical operation is ongoing. + + Delete feed/category + + FormAbout diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts index 1ffea1864..ed070a02e 100644 --- a/localization/rssguard-en_US.ts +++ b/localization/rssguard-en_US.ts @@ -757,7 +757,7 @@ Auto-update status: %5 - Deleting feed or category + Delete feed/category @@ -3939,23 +3939,23 @@ Unread news: %2 - + No title Webbrowser tab title when no title is available. - + Written by - + uknown author - + Newspaper view diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts index a9ac87ac6..a2980c3ff 100644 --- a/localization/rssguard-fr_FR.ts +++ b/localization/rssguard-fr_FR.ts @@ -621,10 +621,6 @@ Auto-update status: %5 Selected item was not deleted due to error. - - Deleting feed or category - - Do you really want to delete selected item? @@ -665,6 +661,10 @@ Auto-update status: %5 Selected item cannot be deleted because another critical operation is ongoing. + + Delete feed/category + + FormAbout diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts index a78d54a05..e0eaf2c53 100644 --- a/localization/rssguard-it_IT.ts +++ b/localization/rssguard-it_IT.ts @@ -621,10 +621,6 @@ Auto-update status: %5 Selected item was not deleted due to error. - - Deleting feed or category - - Do you really want to delete selected item? @@ -665,6 +661,10 @@ Auto-update status: %5 Selected item cannot be deleted because another critical operation is ongoing. + + Delete feed/category + + FormAbout diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index 1c89fb8b9..bb765018c 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -629,10 +629,6 @@ Auto-update status: %5 Selected item was not deleted due to error. Geselecteerde item is niet verwijderd door een fout. - - Deleting feed or category - Verwijder feed of categorie - Do you really want to delete selected item? Wil je het geselecteerde item echt verwijderen? @@ -673,6 +669,10 @@ Auto-update status: %5 Selected item cannot be deleted because another critical operation is ongoing. Geselecteerde item kunt u niet verwijderen omdat een andere kritieke operatie aan de gang is. + + Delete feed/category + + FormAbout diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts index 116afd309..a1bf1c600 100644 --- a/localization/rssguard-sv_SE.ts +++ b/localization/rssguard-sv_SE.ts @@ -628,10 +628,6 @@ Uppdateringsstatus: %5 Selected item was not deleted due to error. Objektet togs inte bort, på grund av ett fel. - - Deleting feed or category - Tar bort flöde/kategori - Do you really want to delete selected item? Vill du verkligen ta bort markerat objekt? @@ -672,6 +668,10 @@ Uppdateringsstatus: %5 Selected item cannot be deleted because another critical operation is ongoing. Markerat objekt kan inte tas bort, eftersom en annan kritisk åtgärd pågår. + + Delete feed/category + + FormAbout diff --git a/resources/scripts/transka b/resources/scripts/transka new file mode 160000 index 000000000..65735639e --- /dev/null +++ b/resources/scripts/transka @@ -0,0 +1 @@ +Subproject commit 65735639e5e74310bb845d1cc885f04e71c8e2e3 diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index 4fe5a45d3..2ebf00ce0 100755 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -323,7 +323,7 @@ void FeedsView::deleteSelectedItem() { return; } - if (MessageBox::show(qApp->mainForm(), QMessageBox::Question, tr("Deleting feed or category"), + if (MessageBox::show(qApp->mainForm(), QMessageBox::Question, tr("Delete feed/category"), tr("You are about to delete selected feed or category."), tr("Do you really want to delete selected item?"), QString(), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::No) { // User changed his mind.