some missing file, sync langs

localization/rssguard_en_US.ts

@@ -385,7 +385,7 @@ version by clicking this popup notification.</source>
     <message numerus="yes">
         <location filename="../src/librssguard/gui/reusable/discoverfeedsbutton.cpp" line="33"/>
         <source>Add one of %n feed(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Add one of %n feed</numerusform><numerusform>Add one of %n feeds</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/gui/reusable/discoverfeedsbutton.cpp" line="55"/>
@@ -512,12 +512,12 @@ Click here to open parent directory.</source>
     <message numerus="yes">
         <location filename="../src/librssguard/network-web/downloadmanager.cpp" line="707"/>
         <source>%n minutes remaining</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n minute remaining</numerusform><numerusform>%n minutes remaining</numerusform></translation>
     </message>
     <message numerus="yes">
         <location filename="../src/librssguard/network-web/downloadmanager.cpp" line="711"/>
         <source>%n seconds remaining</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n second remaining</numerusform><numerusform>%n seconds remaining</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/network-web/downloadmanager.cpp" line="723"/>
@@ -542,7 +542,7 @@ Click here to open parent directory.</source>
     <message numerus="yes">
         <location filename="../src/librssguard/network-web/downloadmanager.cpp" line="568"/>
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Downloading %n file...</numerusform><numerusform>Downloading %n files...</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/network-web/downloadmanager.ui" line="38"/>
@@ -612,7 +612,7 @@ Status: %3</source>
         <location filename="../src/librssguard/services/abstract/feed.cpp" line="231"/>
         <source>uses global settings (%n minute(s) to next auto-fetch of articles)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>uses global settings (%n minute to next auto-fetch of articles)</numerusform><numerusform>uses global settings (%n minutes to next auto-fetch of articles)</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/services/abstract/feed.cpp" line="234"/>
@@ -623,7 +623,7 @@ Status: %3</source>
         <location filename="../src/librssguard/services/abstract/feed.cpp" line="241"/>
         <source>uses specific settings (%n minute(s) to next auto-fetching of new articles)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>uses specific settings (%n minute to next auto-fetching of new articles)</numerusform><numerusform>uses specific settings (%n minutes to next auto-fetching of new articles)</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/services/abstract/feed.cpp" line="254"/>
@@ -664,7 +664,7 @@ Status: %3</source>
     <message numerus="yes">
         <location filename="../src/librssguard/miscellaneous/feedreader.cpp" line="335"/>
         <source>I will auto-download new articles for %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>I will auto-download new articles for %n feed.</numerusform><numerusform>I will auto-download new articles for %n feeds.</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/miscellaneous/feedreader.cpp" line="89"/>
@@ -3979,27 +3979,27 @@ Login tokens expiration: %2</source>
     <message numerus="yes">
         <location filename="../src/librssguard/core/messagesmodel.cpp" line="324"/>
         <source>%n months ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n month ago</numerusform><numerusform>%n months ago</numerusform></translation>
     </message>
     <message numerus="yes">
         <location filename="../src/librssguard/core/messagesmodel.cpp" line="328"/>
         <source>%n weeks ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n week ago</numerusform><numerusform>%n weeks ago</numerusform></translation>
     </message>
     <message numerus="yes">
         <location filename="../src/librssguard/core/messagesmodel.cpp" line="332"/>
         <source>%n days ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n day ago</numerusform><numerusform>%n days ago</numerusform></translation>
     </message>
     <message numerus="yes">
         <location filename="../src/librssguard/core/messagesmodel.cpp" line="340"/>
         <source>%n hours ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n hour ago</numerusform><numerusform>%n hours ago</numerusform></translation>
     </message>
     <message numerus="yes">
         <location filename="../src/librssguard/core/messagesmodel.cpp" line="344"/>
         <source>%n minutes ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n minute ago</numerusform><numerusform>%n minutes ago</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/core/messagesmodel.cpp" line="336"/>
@@ -4415,7 +4415,7 @@ Login tokens expiration: %2</source>
     <message numerus="yes">
         <location filename="../src/librssguard/gui/newspaperpreviewer.cpp" line="45"/>
         <source>Show more articles (%n remaining)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Show more articles (%n remaining)</numerusform><numerusform>Show more articles (%n remaining)</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/gui/newspaperpreviewer.cpp" line="51"/>
@@ -4657,7 +4657,11 @@ Login tokens expiration: %2</source>
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>
+
++ %n other feed.</numerusform><numerusform>
+
++ %n other feeds.</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/services/standard/standardserviceroot.cpp" line="57"/>
@@ -4887,7 +4891,7 @@ List of supported readers:</source>
     <message numerus="yes">
         <location filename="../src/librssguard/services/abstract/recyclebin.cpp" line="24"/>
         <source>%n deleted article(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n deleted article.</numerusform><numerusform>%n deleted articles.</numerusform></translation>
     </message>
 </context>
 <context>
@@ -5072,7 +5076,7 @@ Login tokens expiration: %2</source>
         <location filename="../src/librssguard/services/abstract/rootitem.cpp" line="146"/>
         <source>%n unread article(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n unread article.</numerusform><numerusform>%n unread articles.</numerusform></translation>
     </message>
 </context>
 <context>
@@ -6704,13 +6708,13 @@ Unread news: %2</source>
     <message numerus="yes">
         <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="54"/>
         <source>%n hour(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n hour</numerusform><numerusform>%n hours</numerusform></translation>
     </message>
     <message numerus="yes">
         <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="55"/>
         <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="65"/>
         <source>%n minute(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n minute</numerusform><numerusform>%n minutes</numerusform></translation>
     </message>
     <message>
         <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="57"/>
@@ -6721,7 +6725,7 @@ Unread news: %2</source>
     <message numerus="yes">
         <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="64"/>
         <source>%n second(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n second</numerusform><numerusform>%n seconds</numerusform></translation>
     </message>
 </context>
 <context>

resources/rssguard.qrc

@@ -80,7 +80,7 @@
     <file>skins/nudus-light/metadata.xml</file>
     <file>skins/nudus-light/qt_style.qss</file>
 
-    <file>initial_feeds/feeds-en.opml</file>
+    <file>initial_feeds/feeds-en_US.opml</file>
 
     <file>desktop/com.github.rssguard.desktop</file>
     <file>desktop/com.github.rssguard.desktop.autostart</file>

src/librssguard/database/databasequeries.cpp

@@ -2095,6 +2095,30 @@ bool DatabaseQueries::deleteCategory(const QSqlDatabase& db, int id) {
   return q.exec();
 }
 
+void DatabaseQueries::fixupOrders(const QSqlDatabase& db) {
+  QSqlQuery res = db.exec(QSL("SELECT COUNT(*) FROM Accounts WHERE ordr = 0 "
+                              "UNION ALL "
+                              "SELECT COUNT(*) FROM Categories WHERE ordr = 0 "
+                              "UNION ALL "
+                              "SELECT COUNT(*) FROM Feeds WHERE ordr = 0;"));
+  bool should_fixup = false;
+
+  while (res.next() && !(should_fixup = (res.value(0).toInt() > 1))) {}
+
+  if (should_fixup) {
+    // Some orders are messed up, fix.
+    qCriticalNN << LOGSEC_DB << "Order of items is messed up, fixing.";
+
+    for (const QString& table : { QSL("Accounts"), QSL("Categories"), QSL("Feeds") }) {
+      QSqlQuery q = db.exec(QSL("UPDATE %1 SET ordr = id;").arg(table));
+
+      if (q.lastError().isValid()) {
+        qFatal("Fixup of messed up order failed: '%s'.", qPrintable(q.lastError().text()));
+      }
+    }
+  }
+}
+
 void DatabaseQueries::moveItemUp(RootItem* item, const QSqlDatabase& db) {}
 
 void DatabaseQueries::moveItemDown(RootItem* item, const QSqlDatabase& db) {}

src/librssguard/database/databasequeries.h

@@ -135,6 +135,7 @@ class DatabaseQueries {
                                int account_id, bool* ok = nullptr);
 
     // Item order methods.
+    static void fixupOrders(const QSqlDatabase& db);
     static void moveItemUp(RootItem* item, const QSqlDatabase& db);
     static void moveItemDown(RootItem* item, const QSqlDatabase& db);
 
@@ -337,6 +338,9 @@ Assignment DatabaseQueries::getFeeds(const QSqlDatabase& db,
 template<typename Categ, typename Fee>
 void DatabaseQueries::loadRootFromDatabase(ServiceRoot* root) {
   QSqlDatabase database = qApp->database()->driver()->connection(root->metaObject()->className());
+
+  fixupOrders(database);
+
   Assignment categories = DatabaseQueries::getCategories<Categ>(database, root->accountId());
   Assignment feeds = DatabaseQueries::getFeeds<Fee>(database, qApp->feedReader()->messageFilters(), root->accountId());
   auto labels = DatabaseQueries::getLabelsForAccount(database, root->accountId());