FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #56.

Browse Source
This commit is contained in:
Martin Rotter 2014-09-10 15:59:32 +02:00
parent 52ad6f9221
commit acffb8cf4f
10 changed files with 278 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
localization/rssguard-cs_CZ.ts
View File

@ -100,6 +100,18 @@
<extracomment>Name of root item of feed list which can be seen in feed add/edit dialog.</extracomment>
<translation>Kořen</translation>
</message>
<message>
<source>Invalid tree data.</source>
<translation>Chybná data stromu.</translation>
</message>
<message>
<source>Import successfull, but some feeds/categories were not imported due to error.</source>
<translation>Import byl úspěšný, ale některé kanály či kategorie nebyly importovány kvůli chybě.</translation>
</message>
<message>
<source>Import was completely successfull.</source>
<translation>Import byl zcela úspěšný.</translation>
</message>
</context>
<context>
<name>FeedsModelCategory</name>
@ -235,6 +247,34 @@ Status auto-aktualizací: %5</translation>
<source>You cannot update selected items because another feed update is ongoing.</source>
<translation>Právě nyní nemůžete aktualizovat vybrané položky, protože nejspíše probíhá jiná aktualizace.</translation>
</message>
<message>
<source>You can delete feeds/categories only one by one.</source>
<translation>Kategorie a kanály lze mazat pouze po jednom.</translation>
</message>
<message>
<source>Deleting feed or category.</source>
<translation>Mažu kanál či kategorii.</translation>
</message>
<message>
<source>You are about to delete selected feed or category.</source>
<translation>Právě se chystáte smazat vybraný kanál či kategorii.</translation>
</message>
<message>
<source>Do you really want to remove selected item?</source>
<translation>Upravdu chcete vybranou položku smazat?</translation>
</message>
<message>
<source>Deletion of item failed.</source>
<translation>Mazání položky selhalo.</translation>
</message>
<message>
<source>Selected item was not deleted due to error.</source>
<translation>Vybraná položka nebyla smazána kvůli chybě.</translation>
</message>
<message>
<source>You selected multiple items for deletion.</source>
<translation>Bylo zvoleno více položek pro vymazání najednou.</translation>
</message>
</context>
<context>
<name>FormAbout</name>
@ -684,103 +724,95 @@ Status auto-aktualizací: %5</translation>
<translation>Popis je v pořádku.</translation>
</message>
<message>
<source>Feed was not edit due to error.</source>
<translation type="unfinished"></translation>
<source>Feed was not edited due to error.</source>
<translation>Kanál nebyl upraven kvůli chybě.</translation>
</message>
</context>
<context>
<name>FormImportExport</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Select file</source>
<translation type="unfinished"></translation>
<translation>&amp;Zvolit soubor</translation>
</message>
<message>
<source>Operation results</source>
<translation type="unfinished"></translation>
<translation>Výsledky operací</translation>
</message>
<message>
<source>No file is selected.</source>
<translation type="unfinished"></translation>
<translation>Nevybrán žádný soubor.</translation>
</message>
<message>
<source>No operation executed yet.</source>
<translation type="unfinished"></translation>
<translation>Doposud neprovedena žádná operace.</translation>
</message>
<message>
<source>Export feeds</source>
<translation type="unfinished"></translation>
<translation>Exportovat kanály</translation>
</message>
<message>
<source>Destination file</source>
<translation type="unfinished"></translation>
<translation>Cílový soubor</translation>
</message>
<message>
<source>Source feeds &amp;&amp; categories</source>
<translation type="unfinished"></translation>
<translation>Zdrojové kanály &amp;&amp; kategorie</translation>
</message>
<message>
<source>Source file</source>
<translation type="unfinished"></translation>
<translation>Zdrojový soubor</translation>
</message>
<message>
<source>Target feeds &amp;&amp; categories</source>
<translation type="unfinished"></translation>
<translation>Cílové kanály &amp;&amp; kategorie</translation>
</message>
<message>
<source>Import feeds</source>
<translation type="unfinished"></translation>
<translation>Importovat kanály</translation>
</message>
<message>
<source>OPML 2.0 files (*.opml)</source>
<translation type="unfinished"></translation>
<translation>soubory OPML 2.0 (*.opml)</translation>
</message>
<message>
<source>Select file for feeds export</source>
<translation type="unfinished"></translation>
<translation>Zvolit soubor pro export kanálů</translation>
</message>
<message>
<source>File is selected.</source>
<translation type="unfinished"></translation>
<translation>Soubor je vybrán.</translation>
</message>
<message>
<source>Select file for feeds import</source>
<translation type="unfinished"></translation>
<translation>Zvolit soubot pro import kanálů</translation>
</message>
<message>
<source>Cannot open source file.</source>
<translation type="unfinished"></translation>
<translation>Zdrojový soubor nelze otevřít.</translation>
</message>
<message>
<source>Feeds were loaded.</source>
<translation type="unfinished"></translation>
<translation>Kanály načteny.</translation>
</message>
<message>
<source>Error, file is not well-formed. Select another file.</source>
<translation type="unfinished"></translation>
<translation>Chyba, soubor nemá správný formát, zvolte jiný.</translation>
</message>
<message>
<source>Error occurred. File is not well-formed. Select another file.</source>
<translation type="unfinished"></translation>
<translation>Chyba, soubor nemá správný formát, zvolte jiný.</translation>
</message>
<message>
<source>Feeds were exported successfully.</source>
<translation type="unfinished"></translation>
<translation>Kanály byly úspěšně exportovány.</translation>
</message>
<message>
<source>Cannot write into destination file.</source>
<translation type="unfinished"></translation>
<translation>Do cílového souboru nelze zapisovat.</translation>
</message>
<message>
<source>Critical error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds imported successfully.</source>
<translation type="unfinished"></translation>
<translation>Vyskytla se kritická chyba.</translation>
</message>
</context>
<context>

50
localization/rssguard-de_DE.ts
View File

@ -100,6 +100,18 @@
<extracomment>Name of root item of feed list which can be seen in feed add/edit dialog.</extracomment>
<translation>Wurzel</translation>
</message>
<message>
<source>Invalid tree data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import successfull, but some feeds/categories were not imported due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import was completely successfull.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsModelCategory</name>
@ -224,6 +236,34 @@ Auto-update status: %5</source>
<source>You cannot update selected items because another feed update is ongoing.</source>
<translation>Sie können die selektierten Items nicht updaten weil ein anderer Feed-Update läuft.</translation>
</message>
<message>
<source>You can delete feeds/categories only one by one.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You are about to delete selected feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do you really want to remove selected item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deletion of item failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Selected item was not deleted due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You selected multiple items for deletion.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAbout</name>
@ -673,16 +713,12 @@ Auto-update status: %5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed was not edit due to error.</source>
<source>Feed was not edited due to error.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormImportExport</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Select file</source>
<translation type="unfinished"></translation>
@ -767,10 +803,6 @@ Auto-update status: %5</source>
<source>Critical error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds imported successfully.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormMain</name>

50
localization/rssguard-en_GB.ts
View File

@ -100,6 +100,18 @@
<extracomment>Name of root item of feed list which can be seen in feed add/edit dialog.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid tree data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import successfull, but some feeds/categories were not imported due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import was completely successfull.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsModelCategory</name>
@ -224,6 +236,34 @@ Auto-update status: %5</source>
<source>You cannot update selected items because another feed update is ongoing.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can delete feeds/categories only one by one.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You are about to delete selected feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do you really want to remove selected item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deletion of item failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Selected item was not deleted due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You selected multiple items for deletion.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAbout</name>
@ -673,16 +713,12 @@ Auto-update status: %5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed was not edit due to error.</source>
<source>Feed was not edited due to error.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormImportExport</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Select file</source>
<translation type="unfinished"></translation>
@ -767,10 +803,6 @@ Auto-update status: %5</source>
<source>Critical error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds imported successfully.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormMain</name>

50
localization/rssguard-fr_FR.ts
View File

@ -100,6 +100,18 @@
<extracomment>Name of root item of feed list which can be seen in feed add/edit dialog.</extracomment>
<translation>Racine</translation>
</message>
<message>
<source>Invalid tree data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import successfull, but some feeds/categories were not imported due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import was completely successfull.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsModelCategory</name>
@ -226,6 +238,34 @@ Auto-update status: %5</source>
<source>You cannot update selected items because another feed update is ongoing.</source>
<translation>Vous ne pouvez pas mettre à jour les articles sélectionnés car une autre mise à jour est en cours sur les flux.</translation>
</message>
<message>
<source>You can delete feeds/categories only one by one.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You are about to delete selected feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do you really want to remove selected item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deletion of item failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Selected item was not deleted due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You selected multiple items for deletion.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAbout</name>
@ -675,16 +715,12 @@ Auto-update status: %5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed was not edit due to error.</source>
<source>Feed was not edited due to error.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormImportExport</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Select file</source>
<translation type="unfinished"></translation>
@ -769,10 +805,6 @@ Auto-update status: %5</source>
<source>Critical error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds imported successfully.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormMain</name>

50
localization/rssguard-it_IT.ts
View File

@ -100,6 +100,18 @@
<extracomment>Name of root item of feed list which can be seen in feed add/edit dialog.</extracomment>
<translation>Root</translation>
</message>
<message>
<source>Invalid tree data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import successfull, but some feeds/categories were not imported due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import was completely successfull.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsModelCategory</name>
@ -225,6 +237,34 @@ Auto-update status: %5</source>
<source>You cannot update selected items because another feed update is ongoing.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can delete feeds/categories only one by one.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You are about to delete selected feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do you really want to remove selected item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deletion of item failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Selected item was not deleted due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You selected multiple items for deletion.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAbout</name>
@ -674,16 +714,12 @@ Auto-update status: %5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed was not edit due to error.</source>
<source>Feed was not edited due to error.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormImportExport</name>
<message>
<source>Dialog</source>
<translation type="unfinished">Dialogo</translation>
</message>
<message>
<source>&amp;Select file</source>
<translation type="unfinished"></translation>
@ -768,10 +804,6 @@ Auto-update status: %5</source>
<source>Critical error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds imported successfully.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormMain</name>

50
localization/rssguard-nl_NL.ts
View File

@ -100,6 +100,18 @@
<extracomment>Name of root item of feed list which can be seen in feed add/edit dialog.</extracomment>
<translation>Root</translation>
</message>
<message>
<source>Invalid tree data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import successfull, but some feeds/categories were not imported due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import was completely successfull.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsModelCategory</name>
@ -227,6 +239,34 @@ Auto-update status: %5</source>
<source>You cannot update selected items because another feed update is ongoing.</source>
<translation>Je kan gekozen items niet bijwerken omdat feeds aan het updaten zijn.</translation>
</message>
<message>
<source>You can delete feeds/categories only one by one.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You are about to delete selected feed or category.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do you really want to remove selected item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deletion of item failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Selected item was not deleted due to error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You selected multiple items for deletion.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormAbout</name>
@ -676,16 +716,12 @@ Auto-update status: %5</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feed was not edit due to error.</source>
<source>Feed was not edited due to error.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormImportExport</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Select file</source>
<translation type="unfinished"></translation>
@ -770,10 +806,6 @@ Auto-update status: %5</source>
<source>Critical error occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feeds imported successfully.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormMain</name>

8
src/gui/feedmessageviewer.cpp
View File

@ -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
}

5
src/gui/feedmessageviewer.h
View File

@ -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);

10
src/gui/feedsview.cpp
View File

@ -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.

2
src/gui/formfeeddetails.cpp
View File

@ -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);
}
}