From 045e7cb770d8bae74712e4aea290c1f1f346c4de Mon Sep 17 00:00:00 2001
From: Poren Chiang <poren@poren.tw>
Date: Tue, 28 Jan 2025 10:22:37 +0800
Subject: [PATCH] Patch: introduce proper plural form strings and fix typo
 (#1622)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix typo in fisheye UI

“othographic” → “orthographic”

* subtitles: use builtin plural support

Currently, the source code on subtitles either assumes subtitle items
to be always in plural form or tries determines plural form by itself.

This commit fixes that by using builtin `QObject::tr` plural support.

* glow: fix typo

“shne” → “shine”

* fisheye: fix typo

“Seperate” → “Separate”

* mainwindow: remove incidental `notr`
---
 src/commands/subtitlecommands.cpp   | 6 +++---
 src/docks/subtitlesdock.cpp         | 4 ++--
 src/mainwindow.ui                   | 2 +-
 src/qml/filters/fisheye/ui.qml      | 4 ++--
 src/qml/filters/glow/meta_movit.qml | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/commands/subtitlecommands.cpp b/src/commands/subtitlecommands.cpp
index b1ad3bace2..96dafc87f1 100644
--- a/src/commands/subtitlecommands.cpp
+++ b/src/commands/subtitlecommands.cpp
@@ -102,7 +102,7 @@ OverwriteSubtitlesCommand::OverwriteSubtitlesCommand(SubtitlesModel &model, int
     if (m_newSubtitles.size() == 1) {
         setText(QObject::tr("Add subtitle"));
     } else {
-        setText(QObject::tr("Add %1 subtitles").arg(m_newSubtitles.size()));
+        setText(QObject::tr("Add %n subtitles", nullptr, m_newSubtitles.size()));
     }
 
     if (m_newSubtitles.size() <= 0) {
@@ -155,7 +155,7 @@ RemoveSubtitlesCommand::RemoveSubtitlesCommand(SubtitlesModel &model, int trackI
     if (m_items.size() == 1) {
         setText(QObject::tr("Remove subtitle"));
     } else {
-        setText(QObject::tr("Remove %1 subtitles").arg(m_items.size()));
+        setText(QObject::tr("Remove %n subtitles", nullptr, m_items.size()));
     }
 }
 
@@ -288,7 +288,7 @@ MoveSubtitlesCommand::MoveSubtitlesCommand(SubtitlesModel &model, int trackIndex
     if (m_oldSubtitles.size() == 1) {
         setText(QObject::tr("Move subtitle"));
     } else {
-        setText(QObject::tr("Move %1 subtitles").arg(m_oldSubtitles.size()));
+        setText(QObject::tr("Move %n subtitles", nullptr, m_oldSubtitles.size()));
     }
     // Create a list of subtitles with the new times
     int64_t delta = msTime - m_oldSubtitles[0].start;
diff --git a/src/docks/subtitlesdock.cpp b/src/docks/subtitlesdock.cpp
index ae9a37316a..50a5829939 100644
--- a/src/docks/subtitlesdock.cpp
+++ b/src/docks/subtitlesdock.cpp
@@ -495,7 +495,7 @@ void SubtitlesDock::importSrtFromFile(const QString &srtPath, const QString &tra
 
     m_model->importSubtitlesToNewTrack(track, items);
 
-    MAIN.showStatusMessage(QObject::tr("Imported %1 subtitle items").arg(items.size()));
+    MAIN.showStatusMessage(QObject::tr("Imported %1 subtitle item(s)", nullptr, items.size()));
 }
 
 void SubtitlesDock::addSubtitleTrack()
@@ -624,7 +624,7 @@ void SubtitlesDock::importSubtitles()
     }
     ensureTrackExists();
     m_model->importSubtitles(m_trackCombo->currentIndex(), msTime, items);
-    MAIN.showStatusMessage(QObject::tr("Imported %1 subtitle items").arg(items.size()));
+    MAIN.showStatusMessage(QObject::tr("Imported %n subtitle item(s)", nullptr, items.size()));
 }
 
 void SubtitlesDock::exportSubtitles()
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index d8914e37ed..1bc6970efa 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -692,7 +692,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string notr="true">Lanczos (best)</string>
+    <string>Lanczos (best)</string>
    </property>
   </action>
   <action name="actionProfileAutomatic">
diff --git a/src/qml/filters/fisheye/ui.qml b/src/qml/filters/fisheye/ui.qml
index 299752873f..72fdee5cb7 100644
--- a/src/qml/filters/fisheye/ui.qml
+++ b/src/qml/filters/fisheye/ui.qml
@@ -621,7 +621,7 @@ Item {
                     }
 
                     ListElement {
-                        text: qsTr('Ortographic')
+                        text: qsTr('Orthographic')
                         value: 0.333
                     }
 
@@ -854,7 +854,7 @@ Item {
             visible: scaleYShowSlider
 
             Shotcut.HoverTip {
-                text: qsTr('Seperate Y scale')
+                text: qsTr('Separate Y scale')
             }
         }
 
diff --git a/src/qml/filters/glow/meta_movit.qml b/src/qml/filters/glow/meta_movit.qml
index 25c21a7f30..9fb285e405 100644
--- a/src/qml/filters/glow/meta_movit.qml
+++ b/src/qml/filters/glow/meta_movit.qml
@@ -4,7 +4,7 @@ import org.shotcut.qml
 Metadata {
     type: Metadata.Filter
     name: qsTr("Glow")
-    keywords: qsTr('shne blur', 'search keywords for the Glow video filter') + ' glow gpu'
+    keywords: qsTr('shine blur', 'search keywords for the Glow video filter') + ' glow gpu'
     mlt_service: "movit.glow"
     needsGPU: true
     qml: "ui_movit.qml"