From 48c2146a420d8474359cce5b507606fdb2a6988f Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 18 Mar 2022 13:19:09 +0100
Subject: fix(i18n): fix translatable strings

---
 launcher/ui/pages/global/APIPage.ui                     | 2 +-
 launcher/ui/pages/modplatform/atlauncher/AtlPage.ui     | 2 +-
 launcher/ui/pages/modplatform/flame/FlameModPage.cpp    | 4 ++--
 launcher/ui/pages/modplatform/flame/FlameModPage.ui     | 2 +-
 launcher/ui/pages/modplatform/flame/FlamePage.ui        | 2 +-
 launcher/ui/pages/modplatform/ftb/FtbPage.ui            | 2 +-
 launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp | 6 +++---
 launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui  | 2 +-
 launcher/ui/pages/modplatform/technic/TechnicPage.ui    | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'launcher/ui/pages')

diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui
index 1bc41e5a..7a9088d1 100644
--- a/launcher/ui/pages/global/APIPage.ui
+++ b/launcher/ui/pages/global/APIPage.ui
@@ -71,7 +71,7 @@
             </property>
             <item>
              <property name="text">
-              <string>https://0x0.st</string>
+              <string notr="true">https://0x0.st</string>
              </property>
             </item>
            </widget>
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.ui b/launcher/ui/pages/modplatform/atlauncher/AtlPage.ui
index 9085766a..746aa6d1 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.ui
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.ui
@@ -71,7 +71,7 @@
    <item row="0" column="0">
     <widget class="QLineEdit" name="searchEdit">
      <property name="placeholderText">
-      <string>Search and filter ...</string>
+      <string>Search and filter...</string>
      </property>
      <property name="clearButtonEnabled">
       <bool>true</bool>
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp b/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
index 114ac907..1801c5a8 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
@@ -153,7 +153,7 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
         ui->versionSelectionBox->addItem(version.version, QVariant(i));
       }
       if (ui->versionSelectionBox->count() == 0) {
-        ui->versionSelectionBox->addItem(tr("No Valid Version found!"),
+        ui->versionSelectionBox->addItem(tr("No valid version found."),
                                          QVariant(-1));
       }
 
@@ -171,7 +171,7 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
                                        QVariant(i));
     }
     if (ui->versionSelectionBox->count() == 0) {
-      ui->versionSelectionBox->addItem(tr("No Valid Version found!"),
+      ui->versionSelectionBox->addItem(tr("No valid version found."),
                                        QVariant(-1));
     }
 
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.ui b/launcher/ui/pages/modplatform/flame/FlameModPage.ui
index 36df7e8a..25cb2571 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.ui
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.ui
@@ -41,7 +41,7 @@
    <item row="0" column="0">
     <widget class="QLineEdit" name="searchEdit">
      <property name="placeholderText">
-      <string>Search and filter ...</string>
+      <string>Search and filter...</string>
      </property>
     </widget>
    </item>
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.ui b/launcher/ui/pages/modplatform/flame/FlamePage.ui
index 9723815a..6d8d8e10 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.ui
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.ui
@@ -71,7 +71,7 @@
       <item row="0" column="0">
         <widget class="QLineEdit" name="searchEdit">
           <property name="placeholderText">
-            <string>Search and filter ...</string>
+            <string>Search and filter...</string>
           </property>
         </widget>
       </item>
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.ui b/launcher/ui/pages/modplatform/ftb/FtbPage.ui
index e9c783e3..850bf091 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.ui
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.ui
@@ -34,7 +34,7 @@
    <item row="0" column="0">
     <widget class="QLineEdit" name="searchEdit">
      <property name="placeholderText">
-      <string>Search and filter ...</string>
+      <string>Search and filter...</string>
      </property>
      <property name="clearButtonEnabled">
       <bool>true</bool>
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index 35cd743a..26afe88a 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -27,7 +27,7 @@ ModrinthPage::ModrinthPage(ModDownloadDialog *dialog, BaseInstance *instance)
   ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
 
   // index is used to set the sorting with the modrinth api
-  ui->sortByBox->addItem(tr("Sort by Relevence"));
+  ui->sortByBox->addItem(tr("Sort by Relevance"));
   ui->sortByBox->addItem(tr("Sort by Downloads"));
   ui->sortByBox->addItem(tr("Sort by Follows"));
   ui->sortByBox->addItem(tr("Sort by last updated"));
@@ -139,7 +139,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
         ui->versionSelectionBox->addItem(version.version, QVariant(i));
       }
       if (ui->versionSelectionBox->count() == 0) {
-        ui->versionSelectionBox->addItem(tr("No Valid Version found !"),
+        ui->versionSelectionBox->addItem(tr("No valid version found."),
                                          QVariant(-1));
       }
 
@@ -159,7 +159,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
                                        QVariant(i));
     }
     if (ui->versionSelectionBox->count() == 0) {
-      ui->versionSelectionBox->addItem(tr("No Valid Version found !"),
+      ui->versionSelectionBox->addItem(tr("No valid version found."),
                                        QVariant(-1));
     }
 
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
index d0a8b8f7..6c709825 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
@@ -51,7 +51,7 @@
    <item row="0" column="0">
     <widget class="QLineEdit" name="searchEdit">
      <property name="placeholderText">
-      <string>Search and filter ...</string>
+      <string>Search and filter...</string>
      </property>
     </widget>
    </item>
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.ui b/launcher/ui/pages/modplatform/technic/TechnicPage.ui
index dde685d9..62ab6154 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.ui
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.ui
@@ -29,7 +29,7 @@
       <item>
        <widget class="QLineEdit" name="searchEdit">
         <property name="placeholderText">
-         <string>Search and filter ...</string>
+         <string>Search and filter...</string>
         </property>
        </widget>
       </item>
-- 
cgit 


From ccfd06ad2141663f38ac42dd8c68ed6253bdfdde Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 19 Mar 2022 12:35:15 +0100
Subject: fix(i18n): remove brand names from translations

---
 launcher/ui/pages/modplatform/atlauncher/AtlPage.h    | 2 +-
 launcher/ui/pages/modplatform/flame/FlameModPage.h    | 2 +-
 launcher/ui/pages/modplatform/flame/FlamePage.h       | 2 +-
 launcher/ui/pages/modplatform/ftb/FtbPage.h           | 2 +-
 launcher/ui/pages/modplatform/legacy_ftb/Page.h       | 2 +-
 launcher/ui/pages/modplatform/modrinth/ModrinthPage.h | 2 +-
 launcher/ui/pages/modplatform/technic/TechnicPage.h   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'launcher/ui/pages')

diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
index 5b3f2228..150edd02 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
@@ -42,7 +42,7 @@ public:
     virtual ~AtlPage();
     virtual QString displayName() const override
     {
-        return tr("ATLauncher");
+        return "ATLauncher";
     }
     virtual QIcon icon() const override
     {
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.h b/launcher/ui/pages/modplatform/flame/FlameModPage.h
index b5b19a4f..115ebab2 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.h
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.h
@@ -27,7 +27,7 @@ public:
     virtual ~FlameModPage();
     virtual QString displayName() const override
     {
-        return tr("CurseForge");
+        return "CurseForge";
     }
     virtual QIcon icon() const override
     {
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.h b/launcher/ui/pages/modplatform/flame/FlamePage.h
index 5cfe21dc..b0a25a26 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.h
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.h
@@ -42,7 +42,7 @@ public:
     virtual ~FlamePage();
     virtual QString displayName() const override
     {
-        return tr("CurseForge");
+        return "CurseForge";
     }
     virtual QIcon icon() const override
     {
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.h b/launcher/ui/pages/modplatform/ftb/FtbPage.h
index 28a189f0..c4a242dd 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.h
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.h
@@ -40,7 +40,7 @@ public:
     virtual ~FtbPage();
     virtual QString displayName() const override
     {
-        return tr("FTB");
+        return "FTB";
     }
     virtual QIcon icon() const override
     {
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.h b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
index d8225e11..59911908 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.h
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
@@ -50,7 +50,7 @@ public:
     virtual ~Page();
     QString displayName() const override
     {
-        return tr("FTB Legacy");
+        return "FTB Legacy";
     }
     QIcon icon() const override
     {
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
index 52b538e3..402c8770 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
@@ -27,7 +27,7 @@ public:
     virtual ~ModrinthPage();
     virtual QString displayName() const override
     {
-        return tr("Modrinth");
+        return "Modrinth";
     }
     virtual QIcon icon() const override
     {
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.h b/launcher/ui/pages/modplatform/technic/TechnicPage.h
index 21695dd0..3635472e 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.h
@@ -42,7 +42,7 @@ public:
     virtual ~TechnicPage();
     virtual QString displayName() const override
     {
-        return tr("Technic");
+        return "Technic";
     }
     virtual QIcon icon() const override
     {
-- 
cgit