From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Fri, 9 Oct 2020 22:26:18 +0000 (+0200)
Subject: Avoid string translation puzzle
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~112^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=206c98688e91cd286eb4b3b10d0bd05166d01052;p=nextcloud-desktop.git

Avoid string translation puzzle

Combining translated strings like this makes them hard to translate since the order of words is different between languages.
Use proper placeholder strings instead.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
---

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index a73b3bfad..6c33c1c4f 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -488,7 +488,7 @@ Window {
                                 }
 
                                 Accessible.role: Accessible.MenuItem
-                                Accessible.name: qsTr("Open") + " " + appName + " " + qsTr("in browser")
+                                Accessible.name: qsTr("Open %1 in browser").arg(appName)
                                 Accessible.onPressAction: appEntry.triggered()
                             }
                         }
@@ -524,7 +524,7 @@ Window {
                 spacing: 0
 
                 Accessible.role: Accessible.ListItem
-                Accessible.name: path !== "" ? qsTr("Open") + " " + displayPath + " " + qsTr("locally")
+                Accessible.name: path !== "" ? qsTr("Open %1 locally").arg(displayPath)
                                                     : message
                 Accessible.onPressAction: activityMouseArea.clicked()
 
@@ -640,7 +640,7 @@ Window {
                     onClicked: Systray.openShareDialog(displayPath,absolutePath)
 
                     Accessible.role: Accessible.Button
-                    Accessible.name: qsTr("Share") + " " + displayPath
+                    Accessible.name: qsTr("Share %1").arg(displayPath)
                     Accessible.onPressAction: shareButton.clicked()
                 }
 
@@ -666,7 +666,7 @@ Window {
                     onClicked: Qt.openUrlExternally(link)
 
                     Accessible.role: Accessible.Button
-                    Accessible.name: qsTr("Open Talk") + " " + link
+                    Accessible.name: qsTr("Open Talk %1").arg(link)
                     Accessible.onPressAction: replyButton.clicked()
                 }
             }