Merge branch 'master' of bitbucket.org:skunkos/rssguard

CMakeLists.txt

@@ -408,7 +408,10 @@ set(APP_TRANSLATIONS
   localization/rssguard-nl_NL.ts
   localization/rssguard-pt_BR.ts
   localization/qt-cs_CZ.ts
+  localization/qt-de_DE.ts
+  localization/qt-fr_FR.ts
   localization/qt-nl_NL.ts
+  localization/qt-pt_BR.ts
 )
 
 set(APP_TRANSLATIONS_WO_QT

README.md

@@ -39,12 +39,13 @@ RSS Guard is written in C++. It is pretty fast even with tons of messages loaded
 * multiplatformity,
 * support for all feed formats,
 * simplicity,
-* feed metadata fetching,
+* feed metadata fetching including icons,
+* enhanced feed auto-updating with separate time intervals,
 * multiple data backend support (SQLite + MySQL),
 * “portable” mode support,
 * feed categorization,
 * feed authentication (Digest-MD5, BASIC, NTLM-2),
-* handles tons of messages,
+* handles tons of messages & feeds,
 * sweet look & feel,
 * KFeanza-based default icon theme + ability to create your own icon themes,
 * fully skinnable user interface + ability to create your own skins,
@@ -53,6 +54,9 @@ RSS Guard is written in C++. It is pretty fast even with tons of messages loaded
 * open-source development model based on GNU GPL license, version 3,
 * tabbed interface,
 * integrated web browser + external browser support,
+* internal web browser mouse gestures support,
 * desktop integration via tray icon,
+* localizations to some languages,
 * Qt library is the only dependency,
+* open-source development model and friendly author waiting for your feedback,
 * no ads, no hidden costs.

src/core/dynamicshortcuts.cpp

@@ -32,7 +32,7 @@ void DynamicShortcuts::save(const QList<QAction *> actions) {
   foreach (QAction *action, actions) {
     settings->setValue(APP_CFG_CUTS,
                        action->objectName(),
-                       action->shortcut().toString(QKeySequence::NativeText));
+                       action->shortcut().toString(QKeySequence::PortableText));
   }
 }
 
@@ -42,8 +42,8 @@ void DynamicShortcuts::load(const QList<QAction *> actions) {
   foreach (QAction *action, actions) {
     QString shortcut_for_action = settings->value(APP_CFG_CUTS,
                                                   action->objectName(),
-                                                  action->shortcut().toString(QKeySequence::NativeText)).toString();
+                                                  action->shortcut().toString(QKeySequence::PortableText)).toString();
     action->setShortcut(QKeySequence::fromString(shortcut_for_action,
-                                                 QKeySequence::NativeText));
+                                                 QKeySequence::PortableText));
   }
 }

src/main.cpp

@@ -83,7 +83,6 @@ int main(int argc, char *argv[]) {
   SkinFactory::instance()->loadCurrentSkin();
 
   // Load localization and setup locale before any widget is constructed.
-  //LoadLocalization();
   Localization::instance()->load();
 
   // These settings needs to be set before any QSettings object.