diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index 8f357959e..9f22ca8b0 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -238,6 +238,10 @@ Tato stránka obsahuje %n kanálů. Toolbar for feeds Panel kanálů + + Error when loading initial feeds + + FeedsImportExportModel @@ -1031,6 +1035,26 @@ Automatický update: %5 Feed was not edited due to error. Kanál nebyl upraven kvůli chybě. + + Icon fetched successfully. + + + + Icon metadata fetched. + + + + Icon metatada not fetched. + + + + No icon fetched. + + + + Fetch icon from feed + + FormImportExport @@ -2352,6 +2376,13 @@ Přejít na web aplikace a stáhnout jej ručně. Přejít na web aplikace + + IOFactory + + Cannot open file '%s' for reading. + + + LocationLineEdit @@ -2603,11 +2634,6 @@ Přejít na web aplikace a stáhnout jej ručně. QObject - - LANG_NAME - Name of language, e.g. English. - Čeština - LANG_ABBREV Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". @@ -2625,9 +2651,25 @@ Přejít na web aplikace a stáhnout jej ručně. LANG_EMAIL - Email of translator - optional. rotter.martinos@gmail.com + + Load initial feeds + + + + Your started %1 for the first time, now you can load initial set of feeds. + + + + Do you want to load initial set of feeds? + + + + LANG_NAME + Name of language, e.g. English. + + ShortcutCatcher @@ -2978,5 +3020,9 @@ Nepřečtené zprávy: %2 source_page zdrojova_stranka + + Search "%1" via Google... + + diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index 8e9bbf701..3e0355184 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -231,6 +231,10 @@ This website contains %n feed(s). Toolbar for feeds Toolbar für Feeds + + Error when loading initial feeds + + FeedsImportExportModel @@ -1014,6 +1018,26 @@ Auto-update status: %5 Feed was not edited due to error. Feed wurde nicht editiert aufgrund eines Fehler. + + Icon fetched successfully. + + + + Icon metadata fetched. + + + + Icon metatada not fetched. + + + + No icon fetched. + + + + Fetch icon from feed + + FormImportExport @@ -2325,6 +2349,13 @@ Go to application website to obtain it manually. + + IOFactory + + Cannot open file '%s' for reading. + + + LocationLineEdit @@ -2576,11 +2607,6 @@ Go to application website to obtain it manually. QObject - - LANG_NAME - Name of language, e.g. English. - Deutsch - LANG_ABBREV Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". @@ -2598,9 +2624,25 @@ Go to application website to obtain it manually. LANG_EMAIL - Email of translator - optional. patlecat@gmail.com + + Load initial feeds + + + + Your started %1 for the first time, now you can load initial set of feeds. + + + + Do you want to load initial set of feeds? + + + + LANG_NAME + Name of language, e.g. English. + + ShortcutCatcher @@ -2950,5 +2992,9 @@ Unread news: %2 source_page + + Search "%1" via Google... + + diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index 1214683a4..b33f894b0 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -231,6 +231,10 @@ This website contains %n feed(s). Toolbar for feeds + + Error when loading initial feeds + + FeedsImportExportModel @@ -1014,6 +1018,26 @@ Auto-update status: %5 Feed was not edited due to error. + + Icon fetched successfully. + + + + Icon metadata fetched. + + + + Icon metatada not fetched. + + + + No icon fetched. + + + + Fetch icon from feed + + FormImportExport @@ -2320,6 +2344,13 @@ Go to application website to obtain it manually. + + IOFactory + + Cannot open file '%s' for reading. + + + LocationLineEdit @@ -2571,11 +2602,6 @@ Go to application website to obtain it manually. QObject - - LANG_NAME - Name of language, e.g. English. - English - LANG_ABBREV Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". @@ -2593,9 +2619,25 @@ Go to application website to obtain it manually. LANG_EMAIL - Email of translator - optional. rotter.martinos@gmail.com + + Load initial feeds + + + + Your started %1 for the first time, now you can load initial set of feeds. + + + + Do you want to load initial set of feeds? + + + + LANG_NAME + Name of language, e.g. English. + + ShortcutCatcher @@ -2945,5 +2987,9 @@ Unread news: %2 source_page + + Search "%1" via Google... + + diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts index 0a7d3c477..a653d0169 100644 --- a/localization/rssguard-en_US.ts +++ b/localization/rssguard-en_US.ts @@ -4,32 +4,32 @@ Application - + Output directory is not writable. - + Settings file not copied to output directory successfully. - + Database file not copied to output directory successfully. - + Database restoration was not initiated. Make sure that output directory is writable. - + Settings restoration was not initiated. Make sure that output directory is writable. - + Application is already running. @@ -231,54 +231,59 @@ This website contains %n feed(s). FeedMessageViewer - + Toolbar for feeds - + Toolbar for messages - + + Error when loading initial feeds + + + + Feed update started Text display in status bar when feed update is started. - + Updated feed '%1' Text display in status bar when particular feed is updated. - + Cannot defragment database - + Database cannot be defragmented because feed update is ongoing. - + Database defragmented - + Database was successfully defragmented. - + Database was not defragmented - + Database was not defragmented. This database backend does not support it or it cannot be defragmented now. @@ -286,17 +291,17 @@ This website contains %n feed(s). FeedsImportExportModel - + Category - + (category) - + (feed) @@ -368,19 +373,19 @@ This category does not contain any nested items. FeedsModelFeed - + does not use auto-update Describes feed auto-update status. - + uses global settings Describes feed auto-update status. - + uses specific settings (%n minute(s) to next auto-update) Describes feed auto-update status. @@ -389,7 +394,7 @@ This category does not contain any nested items. - + %1 (%2)%3 Network status: %6 @@ -399,7 +404,7 @@ Auto-update status: %5 - + %n unread message(s). Tooltip for "unread" column of feed list. @@ -709,47 +714,47 @@ Auto-update status: %5 - + Common name for backup files - + No operation executed yet. - + Backup was created successfully and stored in target directory. - + Select destination directory - + Good destination directory is specified. - + Backup was created successfully. - + Backup failed. - + Backup name cannot be empty. - + Backup name looks okay. @@ -1002,13 +1007,13 @@ Auto-update status: %5 - + Username - + Password @@ -1150,6 +1155,7 @@ Auto-update status: %5 + Result: %1. @@ -1160,6 +1166,7 @@ Auto-update status: %5 + Error: %1. @@ -1169,83 +1176,108 @@ Auto-update status: %5 - + + Icon fetched successfully. + + + + + Icon metadata fetched. + + + + + Icon metatada not fetched. + + + + + No icon fetched. + + + + Feed title - + Set title for your feed. - + Feed description - + Set description for your feed. - + Full feed url including scheme - + Set url for your feed. - + Set username to access the feed. - + Set password to access the feed. - + Icon selection - + Load icon from file... - + Do not use icon - + Use default icon - - + + Fetch icon from feed + + + + + No metadata fetched so far. - + Auto-update using global interval - + Auto-update every - + Do not auto-update at all @@ -1283,54 +1315,54 @@ Auto-update status: %5 - + Export feeds - + Destination file - + Source feeds && categories - + Source file - + Target feeds && categories - + Import feeds - - + + OPML 2.0 files (*.opml) - + Select file for feeds export - - + + File is selected. - + Select file for feeds import @@ -1896,37 +1928,37 @@ Auto-update status: %5 - + Restart - + No operation executed yet. - + Restoration was initiated. Restart to proceed. - + You need to restart application for restoration process to finish. - + Database and/or settings were not copied to restoration directory successully. - + Select source directory - + Good source directory is specified. @@ -2461,40 +2493,39 @@ MySQL backend will automatically use database with name "rssguard". Do - + Version - + Author - - + Email - + Name - + Select downloads target directory - + Select web browser executable - - + + Executables (*) File filter for external browser selection dialog. ---------- @@ -2502,238 +2533,238 @@ File filter for external e-mail selection dialog. - - + + Executables (*.*) - + Select e-mail executable - + some keyboard shortcuts are not unique - + custom external browser is not set correctly - + Cannot save settings - + Some critical settings are not set. You must fix these settings in order confirm new settings. - + List of errors: %1. - + Critical settings were changed - + Some critical settings were changed and will be applied after the application gets restarted. You have to restart manually. - + Do you want to restart now? - + List of changes: %1. - + Opera 12 or older - + Mozilla Thunderbird - + No proxy - + System proxy - + Socks5 - + Http - + language changed - + No connection test triggered so far. - + You did not executed any connection test yet. - + SQLite (embedded database) - + MySQL/MariaDB (dedicated database) - + Hostname of your MySQL server - + Username to login with - + Password for your username - + Working database which you have full access to. - + in-memory database switched - + data storage backend changed - + Hostname is empty. - + Hostname looks ok. - + Username is empty. - + Username looks ok. - + Password is empty. - + Password looks ok. - + Working database is empty. - + Working database is ok. - + (not supported on this platform) - + Disable (Tray icon is not available.) - + no icon theme Label for disabling icon theme. - + Icon only - + Text only - + Text beside icon - + Text under icon - + Follow OS style - + icon theme changed - + skin changed @@ -2899,6 +2930,14 @@ currently installed one. + + IOFactory + + + Cannot open file '%s' for reading. + + + LocationLineEdit @@ -3206,38 +3245,51 @@ currently installed one. QObject - - + + LANG_NAME Name of language, e.g. English. - English (USA) + - - + + LANG_ABBREV Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". en_US - - + + LANG_VERSION Version of your translation, e.g. 1.0. 1.33.7 - - + + LANG_AUTHOR Name of translator - optional. Martin Rotter - - + + Load initial feeds + + + + + Your started %1 for the first time, now you can load initial set of feeds. + + + + + Do you want to load initial set of feeds? + + + + LANG_EMAIL - Email of translator - optional. rotter.martinos@gmail.com @@ -3492,17 +3544,17 @@ Unread news: %2 - + Written by - + uknown author - + Newspaper view @@ -3510,167 +3562,172 @@ Unread news: %2 WebView - + HTML web pages (*.html) - + Select destination file for web page - + Cannot save web page - + Web page cannot be saved because destination file is not writtable. - + Reload web page - + Reload current web page. - + Print - + source_page - + Print current web page. - + Copy selection - + Copies current selection into the clipboard. - + Save target as... - + Download content from the hyperlink. - + Copy link url - + Copy link url to clipboard. - + Copy image - + Copy image to clipboard. - + Save image as... - + Save image to disk. - + + Search "%1" via Google... + + + + Save page as... - + Copy image url - + Copy image url to clipboard. - + Open link in new tab - + Open this hyperlink in new tab. - + Follow link - + Open the hyperlink in this tab. - + Open link in external browser - + Open the hyperlink in external browser. - + Open image in new tab - + Open this image in this tab. - + Web browser - + Image - + Hyperlink diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts index f3e91bdd9..89927c996 100644 --- a/localization/rssguard-fr_FR.ts +++ b/localization/rssguard-fr_FR.ts @@ -231,6 +231,10 @@ This website contains %n feed(s). Toolbar for feeds Barre d'outils pour les flux + + Error when loading initial feeds + + FeedsImportExportModel @@ -1015,6 +1019,26 @@ Auto-update status: %5 Feed was not edited due to error. Le flux n'a pas été édité dû à une erreur. + + Icon fetched successfully. + + + + Icon metadata fetched. + + + + Icon metatada not fetched. + + + + No icon fetched. + + + + Fetch icon from feed + + FormImportExport @@ -2337,6 +2361,13 @@ Aller sur le site de l'application pour les obtenir manuellement.Aller sur le site web de l'application + + IOFactory + + Cannot open file '%s' for reading. + + + LocationLineEdit @@ -2588,11 +2619,6 @@ Aller sur le site de l'application pour les obtenir manuellement. QObject - - LANG_NAME - Name of language, e.g. English. - French - LANG_ABBREV Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". @@ -2610,9 +2636,25 @@ Aller sur le site de l'application pour les obtenir manuellement. LANG_EMAIL - Email of translator - optional. nicolaslegall34@gmail.com + + Load initial feeds + + + + Your started %1 for the first time, now you can load initial set of feeds. + + + + Do you want to load initial set of feeds? + + + + LANG_NAME + Name of language, e.g. English. + + ShortcutCatcher @@ -2962,5 +3004,9 @@ Unread news: %2 source_page + + Search "%1" via Google... + + diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts index 9f503b114..cdd8155ac 100644 --- a/localization/rssguard-it_IT.ts +++ b/localization/rssguard-it_IT.ts @@ -231,6 +231,10 @@ This website contains %n feed(s). Toolbar for feeds Toolbar per i feed + + Error when loading initial feeds + + FeedsImportExportModel @@ -1014,6 +1018,26 @@ Auto-update status: %5 Feed was not edited due to error. Feed non modificato a coausa di un errore. + + Icon fetched successfully. + + + + Icon metadata fetched. + + + + Icon metatada not fetched. + + + + No icon fetched. + + + + Fetch icon from feed + + FormImportExport @@ -2325,6 +2349,13 @@ Go to application website to obtain it manually. + + IOFactory + + Cannot open file '%s' for reading. + + + LocationLineEdit @@ -2576,11 +2607,6 @@ Go to application website to obtain it manually. QObject - - LANG_NAME - Name of language, e.g. English. - Italiano - LANG_ABBREV Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". @@ -2598,9 +2624,25 @@ Go to application website to obtain it manually. LANG_EMAIL - Email of translator - optional. rotter.martinos@gmail.com + + Load initial feeds + + + + Your started %1 for the first time, now you can load initial set of feeds. + + + + Do you want to load initial set of feeds? + + + + LANG_NAME + Name of language, e.g. English. + + ShortcutCatcher @@ -2950,5 +2992,9 @@ Unread news: %2 source_page + + Search "%1" via Google... + + diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index 7b651126e..9eb200f6f 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -233,6 +233,10 @@ Deze website bevat % n feed(s). Toolbar for feeds Werkbalk voor feeds + + Error when loading initial feeds + + FeedsImportExportModel @@ -1023,6 +1027,26 @@ Auto-update status: %5 Feed was not edited due to error. Door een fout is de feed niet bewerkt. + + Icon fetched successfully. + + + + Icon metadata fetched. + + + + Icon metatada not fetched. + + + + No icon fetched. + + + + Fetch icon from feed + + FormImportExport @@ -2352,6 +2376,13 @@ Ga naar RRSguard website en download het handmatig. Ga naar Rssguard website + + IOFactory + + Cannot open file '%s' for reading. + + + LocationLineEdit @@ -2603,11 +2634,6 @@ Ga naar RRSguard website en download het handmatig. QObject - - LANG_NAME - Name of language, e.g. English. - Nederlands - LANG_ABBREV Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". @@ -2625,9 +2651,25 @@ Ga naar RRSguard website en download het handmatig. LANG_EMAIL - Email of translator - optional. elbert.pol@gmail.com + + Load initial feeds + + + + Your started %1 for the first time, now you can load initial set of feeds. + + + + Do you want to load initial set of feeds? + + + + LANG_NAME + Name of language, e.g. English. + + ShortcutCatcher @@ -2979,5 +3021,9 @@ Ongelezen nieuws: %2 source_page + + Search "%1" via Google... + + diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts index 130265fa5..3ed032737 100644 --- a/localization/rssguard-sv_SE.ts +++ b/localization/rssguard-sv_SE.ts @@ -1,4 +1,6 @@ - + + + Application @@ -60,9 +62,12 @@ Click me to add feeds from this website. This website contains %n feed(s). - Klicka för att lägga till flöden från webbsidan. -Denna webbsida innehåller %1 flöde.Klicka för att lägga till flöden från webbsidan. -Denna webbsida innehåller %1 flöden. + + Klicka för att lägga till flöden från webbsidan. +Denna webbsida innehåller %1 flöde. + Klicka för att lägga till flöden från webbsidan. +Denna webbsida innehåller %1 flöden. + @@ -148,11 +153,17 @@ Denna webbsida innehåller %1 flöden. %n minutes remaining - %n minut kvar%n minuter kvar + + %n minut kvar + %n minuter kvar + %n seconds remaining - %n sekund kvar%n sekunder kvar + + %n sekund kvar + %n sekunder kvar + bytes @@ -172,7 +183,10 @@ Denna webbsida innehåller %1 flöden. Downloading %n file(s)... - Laddar ner %1 filLaddar ner %1 filer + + Laddar ner %1 fil + Laddar ner %1 filer + @@ -219,6 +233,10 @@ Denna webbsida innehåller %1 flöden. Toolbar for feeds Verktygsfält för flöden + + Error when loading initial feeds + + FeedsImportExportModel @@ -273,7 +291,10 @@ Denna webbsida innehåller %1 flöden. %n unread message(s). Tooltip for "unread" column of feed list. - %n oläst meddelande.%n olästa meddelanden. + + %n oläst meddelande. + %n olästa meddelanden. + %1 (category)%2%3 @@ -302,12 +323,18 @@ Denna kategori innehåller inga objekt. uses specific settings (%n minute(s) to next auto-update) Describes feed auto-update status. - Anpassade inställningar. (%n minut till nästa auto-uppdatering)Anpassade inställningar. (%n minuter till nästa auto-uppdatering) + + Anpassade inställningar. (%n minut till nästa auto-uppdatering) + Anpassade inställningar. (%n minuter till nästa auto-uppdatering) + %n unread message(s). Tooltip for "unread" column of feed list. - %n oläst meddelande.%n olästa meddelanden. + + %n oläst meddelande. + %n olästa meddelanden. + %1 (%2)%3 @@ -341,7 +368,10 @@ Uppdateringsstatus: %5 %n deleted message(s). - %n borttaget meddelande.%n borttagna meddelanden. + + %n borttaget meddelande. + %n borttagna meddelanden. + @@ -996,6 +1026,26 @@ Uppdateringsstatus: %5 Feed was not edited due to error. Flödet redigerades inte, på grund av något fel. + + Icon fetched successfully. + + + + Icon metadata fetched. + + + + Icon metatada not fetched. + + + + No icon fetched. + + + + Fetch icon from feed + + FormImportExport @@ -2328,6 +2378,13 @@ Gå till programmets hemsida för att hämta den manuellt. Gå till programmets hemsida + + IOFactory + + Cannot open file '%s' for reading. + + + LocationLineEdit @@ -2579,11 +2636,6 @@ Gå till programmets hemsida för att hämta den manuellt. QObject - - LANG_NAME - Name of language, e.g. English. - Swedish - LANG_ABBREV Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". @@ -2601,9 +2653,25 @@ Gå till programmets hemsida för att hämta den manuellt. LANG_EMAIL - Email of translator - optional. eson57@gmail.com + + Load initial feeds + + + + Your started %1 for the first time, now you can load initial set of feeds. + + + + Do you want to load initial set of feeds? + + + + LANG_NAME + Name of language, e.g. English. + + ShortcutCatcher @@ -2954,5 +3022,9 @@ Olästa nyheter: %2 source_page source_page + + Search "%1" via Google... + + - \ No newline at end of file + diff --git a/src/core/feedsselection.cpp b/src/core/feedsselection.cpp index dfbbb50e5..b9437785d 100644 --- a/src/core/feedsselection.cpp +++ b/src/core/feedsselection.cpp @@ -60,8 +60,6 @@ QString FeedsSelection::generateListOfIds() { QList children = m_selectedItem->getRecursiveChildren(); QStringList stringy_ids; - children.append(m_selectedItem); - foreach (FeedsModelRootItem *child, children) { if (child->kind() == FeedsModelRootItem::Feed) { stringy_ids.append(QString::number(child->id())); diff --git a/src/gui/messagebox.cpp b/src/gui/messagebox.cpp index 78e251cce..3deb41d2d 100755 --- a/src/gui/messagebox.cpp +++ b/src/gui/messagebox.cpp @@ -42,6 +42,7 @@ void MessageBox::setIcon(QMessageBox::Icon icon) { setIconPixmap(iconForStatus(icon).pixmap(icon_size, icon_size)); } +#if defined(Q_OS_OS2) void MessageBox::iconify(QDialogButtonBox *button_box) { foreach (QAbstractButton *button, button_box->buttons()) { button->setIcon(iconForRole(button_box->standardButton(button))); @@ -72,6 +73,7 @@ QIcon MessageBox::iconForRole(QDialogButtonBox::StandardButton button) { return QIcon(); } } +#endif QIcon MessageBox::iconForStatus(QMessageBox::Icon status) { switch (status) { @@ -114,7 +116,7 @@ QMessageBox::StandardButton MessageBox::show(QWidget *parent, msg_box.setDefaultButton(default_button); // Setup button box icons. -#if !defined(Q_OS_WIN) +#if defined(Q_OS_OS2) QDialogButtonBox *button_box = msg_box.findChild(); iconify(button_box); #endif diff --git a/src/gui/messagebox.h b/src/gui/messagebox.h index 63f40c5fc..e0ff21c99 100644 --- a/src/gui/messagebox.h +++ b/src/gui/messagebox.h @@ -33,9 +33,6 @@ class MessageBox : public QMessageBox { // Custom icon setting. void setIcon(Icon icon); - // Performs icon replacements for given button box. - static void iconify(QDialogButtonBox *button_box); - // Displays custom message box. static QMessageBox::StandardButton show(QWidget *parent, QMessageBox::Icon icon, @@ -46,10 +43,15 @@ class MessageBox : public QMessageBox { QMessageBox::StandardButtons buttons = QMessageBox::Ok, QMessageBox::StandardButton default_button = QMessageBox::Ok); - private: + static QIcon iconForStatus(QMessageBox::Icon status); + +#if defined(Q_OS_OS2) + // Performs icon replacements for given button box. + static void iconify(QDialogButtonBox *button_box); + // Returns icons for standard roles/statuses. static QIcon iconForRole(QDialogButtonBox::StandardButton button); - static QIcon iconForStatus(QMessageBox::Icon status); +#endif }; #endif // MESSAGEBOX_H diff --git a/src/main.cpp b/src/main.cpp index 96e9a6308..b595be4db 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,6 +39,8 @@ int main(int argc, char *argv[]) { + //: Name of language, e.g. English. + QObject::tr("LANG_NAME"); //: Abbreviation of language, e.g. en. //: Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. //: Examples: "cs_CZ", "en_GB", "en_US". @@ -67,7 +69,7 @@ int main(int argc, char *argv[]) { // Check if another instance is running. if (application.sendMessage(APP_IS_RUNNING)) { qDebug("Another instance of the application is already running. Notifying it."); - return EXIT_SUCCESS; + return EXIT_FAILURE; } // Add an extra path for non-system icon themes and set current icon theme diff --git a/src/miscellaneous/localization.cpp b/src/miscellaneous/localization.cpp index a8a9cede3..b2b42371d 100755 --- a/src/miscellaneous/localization.cpp +++ b/src/miscellaneous/localization.cpp @@ -78,7 +78,12 @@ QList Localization::installedLanguages() { new_language.m_version = translator.translate("QObject", "LANG_VERSION"); new_language.m_author = translator.translate("QObject", "LANG_AUTHOR"); new_language.m_email = translator.translate("QObject", "LANG_EMAIL"); + +#if QT_VERSION >= 0x040800 new_language.m_name = QLocale(new_language.m_code).nativeLanguageName(); +#else + new_language.m_name = translator.translate("QObject", "LANG_NAME"); +#endif languages << new_language; } diff --git a/src/network-web/webfactory.cpp b/src/network-web/webfactory.cpp index 2d779ef3d..1d6ce6ae8 100755 --- a/src/network-web/webfactory.cpp +++ b/src/network-web/webfactory.cpp @@ -37,8 +37,6 @@ bool WebFactory::sendMessageViaEmail(const Message &message) { stripTags(message.m_contents))); } else { - // TODO: Check encoding when using mailto. - // Send it via mailto protocol. // NOTE: http://en.wikipedia.org/wiki/Mailto return QDesktopServices::openUrl(QString("mailto:?subject=%1&body=%2").arg(QString(QUrl::toPercentEncoding(message.m_title)),