From 539b406c956c4ee5bf2a5ab5c39973b9ffad71cf Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 20 Sep 2023 17:00:59 +1000
Subject: [PATCH] Qt: Fix macro button display

---
 src/duckstation-qt/controllerbindingwidgets.cpp |  2 +-
 .../translations/duckstation-qt_en.ts           | 17 ++++++++++++++---
 .../translations/update-and-edit-english.bat    |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/duckstation-qt/controllerbindingwidgets.cpp b/src/duckstation-qt/controllerbindingwidgets.cpp
index c9ea8e5bd..b605dd3ef 100644
--- a/src/duckstation-qt/controllerbindingwidgets.cpp
+++ b/src/duckstation-qt/controllerbindingwidgets.cpp
@@ -378,7 +378,7 @@ ControllerMacroEditWidget::ControllerMacroEditWidget(ControllerMacroWidget* pare
       continue;
 
     QListWidgetItem* item = new QListWidgetItem();
-    item->setText(tr(cinfo->name, bi.display_name));
+    item->setText(qApp->translate(cinfo->name, bi.display_name));
     item->setCheckState((std::find(m_binds.begin(), m_binds.end(), &bi) != m_binds.end()) ? Qt::Checked :
                                                                                             Qt::Unchecked);
     m_ui.bindList->addItem(item);
diff --git a/src/duckstation-qt/translations/duckstation-qt_en.ts b/src/duckstation-qt/translations/duckstation-qt_en.ts
index 4027e8a28..a76d8b4a4 100644
--- a/src/duckstation-qt/translations/duckstation-qt_en.ts
+++ b/src/duckstation-qt/translations/duckstation-qt_en.ts
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
+<context>
+    <name>AchievementSettingsWidget</name>
+    <message numerus="yes">
+        <location filename="../achievementsettingswidget.cpp" line="164"/>
+        <location filename="../achievementsettingswidget.cpp" line="171"/>
+        <source>%n seconds</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+</context>
 <context>
     <name>EmuThread</name>
     <message numerus="yes">
-        <location filename="../qthost.cpp" line="1211"/>
         <source>%n points</source>
-        <translation>
+        <translation type="vanished">
             <numerusform>%n point</numerusform>
             <numerusform>%n points</numerusform>
         </translation>
@@ -26,7 +37,7 @@
 <context>
     <name>InputBindingWidget</name>
     <message numerus="yes">
-        <location filename="../inputbindingwidgets.cpp" line="68"/>
+        <location filename="../inputbindingwidgets.cpp" line="69"/>
         <source>%n bindings</source>
         <translation>
             <numerusform>%n binding</numerusform>
diff --git a/src/duckstation-qt/translations/update-and-edit-english.bat b/src/duckstation-qt/translations/update-and-edit-english.bat
index c80268a9b..18dc6cade 100644
--- a/src/duckstation-qt/translations/update-and-edit-english.bat
+++ b/src/duckstation-qt/translations/update-and-edit-english.bat
@@ -1,6 +1,6 @@
 @echo off
 
-set "linguist=..\..\..\dep\msvc\qt\6.5.0\msvc2022_64\bin"
+set "linguist=..\..\..\dep\msvc\deps-x64\bin"
 set context=../ ../../core/ ../../util/ -tr-function-alias QT_TRANSLATE_NOOP+=TRANSLATE,QT_TRANSLATE_NOOP+=TRANSLATE_SV,QT_TRANSLATE_NOOP+=TRANSLATE_STR,QT_TRANSLATE_NOOP+=TRANSLATE_FS,QT_TRANSLATE_N_NOOP3+=TRANSLATE_FMT,QT_TRANSLATE_NOOP+=TRANSLATE_NOOP -pluralonly
 
 "%linguist%\lupdate.exe" %context% -ts duckstation-qt_en.ts