Merge #6885: fix: improve governance/proposal dialog strings

af85608 fix: improve governance/proposal dialog strings (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  - make strings easier to translate
  - stop translating non-translatable strings
  - use `%n` where possible

  ## What was done?

  ## How Has This Been Tested?

  ## Breaking Changes
  n/a

  ## Checklist:
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

Top commit has no ACKs.

Tree-SHA512: bba2247fc64f152656972d7e30c12eea6d892a622751c8e798a0ccb522c297356b1ae3964d9db25aa1c920eb71d862e026b0a490ddce784563aea9caa5445425

Author: PastaPastaPasta

src/qt/forms/proposalwizard.ui

@@ -110,7 +110,7 @@
              </sizepolicy>
             </property>
            <property name="placeholderText">
-            <string>short-unique-name</string>
+            <string notr="true">short-unique-name</string>
            </property>
             <property name="maximumHeight">
              <number>24</number>
@@ -136,7 +136,7 @@
              </sizepolicy>
             </property>
            <property name="placeholderText">
-            <string>https://example.com/my-proposal</string>
+            <string notr="true">https://example.com/my-proposal</string>
            </property>
             <property name="maximumHeight">
              <number>24</number>
@@ -255,7 +255,7 @@
           <item row="6" column="1">
            <widget class="QLabel" name="labelTotalValue">
             <property name="text">
-             <string>0</string>
+             <string notr="true">0</string>
             </property>
            </widget>
           </item>
@@ -342,7 +342,7 @@
        <item>
         <widget class="QLabel" name="labelValidateStatus">
          <property name="text">
-          <string>-</string>
+          <string notr="true">-</string>
          </property>
         </widget>
        </item>
@@ -427,7 +427,7 @@
          <item>
           <widget class="QLabel" name="labelTxidCaption">
            <property name="text">
-            <string>TxID:</string>
+            <string notr="true">TxID:</string>
            </property>
           </widget>
          </item>
@@ -437,7 +437,7 @@
             <bool>true</bool>
            </property>
            <property name="placeholderText">
-            <string>-</string>
+            <string notr="true">-</string>
            </property>
             <property name="maximumHeight">
              <number>24</number>
@@ -661,7 +661,7 @@
             <bool>true</bool>
            </property>
            <property name="placeholderText">
-            <string>-</string>
+            <string notr="true">-</string>
            </property>
             <property name="maximumHeight">
              <number>24</number>

src/qt/governancelist.cpp

@@ -595,18 +595,17 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
 
     // Show results
     QString message;
-    if (nSuccessful > 0 && nFailed == 0) {
-        message = tr("Voted successfully %1 time(s).").arg(nSuccessful);
-    } else if (nSuccessful > 0 && nFailed > 0) {
-        message = tr("Voted successfully %1 time(s) and failed %2 time(s).").arg(nSuccessful).arg(nFailed);
-        if (!failedMessages.isEmpty()) {
-            message += tr("\n\nFailed votes:\n%1").arg(failedMessages.join("\n"));
-        }
-    } else {
-        message = tr("Failed to vote %1 time(s).").arg(nFailed);
-        if (!failedMessages.isEmpty()) {
-            message += tr("\n\nErrors:\n%1").arg(failedMessages.join("\n"));
+    if (nSuccessful > 0) {
+        message += tr("Voted successfully %n time(s)", "", nSuccessful);
+    }
+    if (nFailed > 0) {
+        if (nSuccessful > 0) {
+            message += QString("\n");
         }
+        message += tr("Failed to vote %n time(s)", "", nFailed);
+    }
+    if (!failedMessages.isEmpty()) {
+        message += QString("\n\n") + tr("Errors:") + QString("\n") + failedMessages.join("\n");
     }
 
     QMessageBox::information(this, tr("Voting Results"), message);

src/qt/proposalwizard.cpp

@@ -60,7 +60,7 @@ ProposalWizard::ProposalWizard(interfaces::Node& node, WalletModel* walletModel,
     // Initialize fields
     // Populate payments dropdown (mainnet 1..12 by default; adjust by network later if needed)
     for (int i = 1; i <= 12; ++i) {
-        m_ui->comboPayments->addItem(tr("%1").arg(i), i);
+        m_ui->comboPayments->addItem(QString().setNum(i), i);
     }
     m_ui->comboPayments->setCurrentIndex(0);
 
@@ -290,8 +290,8 @@ void ProposalWizard::onMaybeAdvanceAfterConfirmations()
             if (m_confirmTimer) m_confirmTimer->stop();
         } else {
             const auto mins = (secs + 59) / 60;
-            m_ui->labelEta->setText(tr("Estimated time remaining: %1 min").arg(mins));
-            m_ui->labelEta2->setText(tr("Estimated time remaining: %1 min").arg(mins));
+            m_ui->labelEta->setText(tr("Estimated time remaining: %n minute(s)", "", mins));
+            m_ui->labelEta2->setText(tr("Estimated time remaining: %n minute(s)", "", mins));
         }
     }
     // Allow submitting (relay/postpone) at 1 confirmation and enable Next to proceed
@@ -321,7 +321,8 @@ void ProposalWizard::onSubmit()
     const QString govId = QString::fromStdString(obj_hash);
     m_ui->editGovObjId->setText(govId);
     QMessageBox::information(this, tr("Proposal submitted"),
-                             tr("Your proposal was submitted successfully.\nID: %1").arg(govId));
+                             tr("Your proposal was submitted successfully.") +
+                             QString("\nID: %1").arg(govId));
     m_submitted = true;
     m_ui->btnSubmit->setEnabled(false);
     // When 6 confs are reached show a final success message