diff --git a/src/attica/atticaprovider.cpp b/src/attica/atticaprovider.cpp --- a/src/attica/atticaprovider.cpp +++ b/src/attica/atticaprovider.cpp @@ -523,7 +523,7 @@ if (job->metadata().statusCode() == 200) { emit signalErrorCode(KNSCore::OcsError, i18n("Too many requests to server. Please try again in a few minutes."), job->metadata().statusCode()); } else if (job->metadata().statusCode() == 405) { - emit signalErrorCode(KNSCore::OcsError, i18n("The Open Collaboration Services instance %1 does not support the attempted function.").arg(name()), job->metadata().statusCode()); + emit signalErrorCode(KNSCore::OcsError, i18n("The Open Collaboration Services instance %1 does not support the attempted function.", name()), job->metadata().statusCode()); } else { emit signalErrorCode(KNSCore::OcsError, i18n("Unknown Open Collaboration Service API error. (%1)", job->metadata().statusCode()), job->metadata().statusCode()); } diff --git a/src/qtquick/qml/Dialog.qml b/src/qtquick/qml/Dialog.qml --- a/src/qtquick/qml/Dialog.qml +++ b/src/qtquick/qml/Dialog.qml @@ -52,7 +52,7 @@ * @note For the sake of consistency, you should NOT override the text propety, just set this one */ property string downloadNewWhat: engine.name - title: i18n("Download New %1").arg(component.downloadNewWhat) + title: i18n("Download New %1", component.downloadNewWhat) /** * The engine which handles the content in this dialog diff --git a/src/qtquick/qml/EntryDetails.qml b/src/qtquick/qml/EntryDetails.qml --- a/src/qtquick/qml/EntryDetails.qml +++ b/src/qtquick/qml/EntryDetails.qml @@ -60,7 +60,7 @@ id: downloadItemsSheet onItemPicked: { var entryName = newStuffModel.data(newStuffModel.index(entryId, 0), NewStuff.ItemsModel.NameRole); - applicationWindow().showPassiveNotification(i18nc("A passive notification shown when installation of an item is initiated", "Installing %1 from %2").arg(downloadName).arg(entryName), 1500); + applicationWindow().showPassiveNotification(i18nc("A passive notification shown when installation of an item is initiated", "Installing %1 from %2", downloadName, entryName), 1500); newStuffModel.installItem(entryId, downloadItemId); } } @@ -75,9 +75,9 @@ || status == NewStuff.ItemsModel.DeletedStatus) { statusCard.message = ""; } else if (status == NewStuff.ItemsModel.InstallingStatus) { - statusCard.message = i18nc("Status message to be shown when the entry is in the process of being installed", "Currently installing the item %1 by %2. Please wait...").arg(component.name).arg(entryAuthor.name); + statusCard.message = i18nc("Status message to be shown when the entry is in the process of being installed", "Currently installing the item %1 by %2. Please wait...", component.name, entryAuthor.name); } else if (status == NewStuff.ItemsModel.UpdatingStatus) { - statusCard.message = i18nc("Status message to be shown when the entry is in the process of being updated", "Currently updating the item %1 by %2. Please wait...").arg(component.name).arg(entryAuthor.name); + statusCard.message = i18nc("Status message to be shown when the entry is in the process of being updated", "Currently updating the item %1 by %2. Please wait...", component.name, entryAuthor.name); } else { statusCard.message = i18nc("Status message which should only be shown when the entry has been given some unknown or invalid status.", "This item is currently in an invalid or unknown state. Please report this to the KDE Community in a bug report."); } @@ -90,7 +90,7 @@ providerId: component.providerId username: author.name } - title: i18nc("Combined title for the entry details page made of the name of the entry, and the author's name", "%1 by %2").arg(component.name).arg(entryAuthor.name) + title: i18nc("Combined title for the entry details page made of the name of the entry, and the author's name", "%1 by %2", component.name, entryAuthor.name) actions { contextualActions: [ Kirigami.Action { @@ -175,7 +175,7 @@ Kirigami.LinkButton { Kirigami.FormData.label: i18n("Comments and Reviews:") enabled: component.commentsCount > 0 - text: i18nc("A link which, when clicked, opens a new sub page with comments (comments with or without ratings) for this entry", "%1 Reviews and Comments").arg(component.commentsCount) + text: i18nc("A link which, when clicked, opens a new sub page with comments (comments with or without ratings) for this entry", "%1 Reviews and Comments", component.commentsCount) onClicked: pageStack.push(commentsPage) } Private.Rating { @@ -185,7 +185,7 @@ } Kirigami.LinkButton { Kirigami.FormData.label: i18n("Homepage:") - text: i18nc("A link which, when clicked, opens the website associated with the entry (this could be either one specific to the project, the author's homepage, or any other website they have chosen for the purpose)", "Open the homepage for %2").arg(component.name) + text: i18nc("A link which, when clicked, opens the website associated with the entry (this could be either one specific to the project, the author's homepage, or any other website they have chosen for the purpose)", "Open the homepage for %1", component.name) onClicked: Qt.openUrlExternally(component.homepage) } Kirigami.LinkButton { diff --git a/src/qtquick/qml/private/EntryCommentDelegate.qml b/src/qtquick/qml/private/EntryCommentDelegate.qml --- a/src/qtquick/qml/private/EntryCommentDelegate.qml +++ b/src/qtquick/qml/private/EntryCommentDelegate.qml @@ -153,7 +153,7 @@ id: authorLabel visible: (url !== "") url: (component.commentAuthor.homepage === "") ? component.commentAuthor.profilepage : component.commentAuthor.homepage - text: (component.author === component.entryAuthorId) ? i18nc("The author label in case the comment was written by the author of the content entry the comment is attached to", "%1 (author)").arg(component.commentAuthor.name) : component.commentAuthor.name + text: (component.author === component.entryAuthorId) ? i18nc("The author label in case the comment was written by the author of the content entry the comment is attached to", "%1 (author)", component.commentAuthor.name) : component.commentAuthor.name } QtControls.Label { visible: !authorLabel.visible diff --git a/src/qtquick/qml/private/EntryCommentsPage.qml b/src/qtquick/qml/private/EntryCommentsPage.qml --- a/src/qtquick/qml/private/EntryCommentsPage.qml +++ b/src/qtquick/qml/private/EntryCommentsPage.qml @@ -38,7 +38,7 @@ property string entryProviderId property alias entryIndex: commentsModel.entryIndex property alias itemsModel: commentsModel.itemsModel - title: i18nc("Title for the page containing a view of the comments for the entry", "Comments and Reviews for %1").arg(component.entryName) + title: i18nc("Title for the page containing a view of the comments for the entry", "Comments and Reviews for %1", component.entryName) actions { contextualActions: [ Kirigami.Action { diff --git a/src/qtquick/qml/private/entrygriddelegates/BigPreviewDelegate.qml b/src/qtquick/qml/private/entrygriddelegates/BigPreviewDelegate.qml --- a/src/qtquick/qml/private/entrygriddelegates/BigPreviewDelegate.qml +++ b/src/qtquick/qml/private/entrygriddelegates/BigPreviewDelegate.qml @@ -177,7 +177,7 @@ QtLayouts.Layout.fillWidth: true level: 5 elide: Text.ElideRight - text: i18nc("The number of times the item has been downloaded", "%1 downloads").arg(model.downloadCount) + text: i18nc("The number of times the item has been downloaded", "%1 downloads", model.downloadCount) } Kirigami.Heading { QtLayouts.Layout.fillWidth: true @@ -190,7 +190,7 @@ elide: Text.ElideRight level: 4 textFormat: Text.StyledText - text: i18nc("Subheading for the tile view, located immediately underneath the name of the item", "By %1").arg(model.author.name) + text: i18nc("Subheading for the tile view, located immediately underneath the name of the item", "By %1", model.author.name) } QtControls.Label { QtLayouts.Layout.fillWidth: true diff --git a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml --- a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml +++ b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml @@ -177,7 +177,7 @@ elide: Text.ElideRight level: 4 textFormat: Text.StyledText - text: i18nc("Subheading for the tile view, located immediately underneath the name of the item", "By %1").arg(model.author.name) + text: i18nc("Subheading for the tile view, located immediately underneath the name of the item", "By %1", model.author.name) } QtControls.Label { QtLayouts.Layout.fillWidth: true @@ -195,7 +195,7 @@ QtLayouts.Layout.fillWidth: true level: 5 elide: Text.ElideRight - text: i18nc("The number of times the item has been downloaded", "%1 downloads").arg(model.downloadCount) + text: i18nc("The number of times the item has been downloaded", "%1 downloads", model.downloadCount) } } FeedbackOverlay { diff --git a/src/qtquick/quickitemsmodel.cpp b/src/qtquick/quickitemsmodel.cpp --- a/src/qtquick/quickitemsmodel.cpp +++ b/src/qtquick/quickitemsmodel.cpp @@ -425,7 +425,7 @@ QStringList args = KShell::splitArgs(d->coreEngine->adoptionCommand(entry)); qCDebug(KNEWSTUFFQUICK) << "executing AdoptionCommand" << args; QProcess::startDetached(args.takeFirst(), args); - d->engine->idleMessage(i18n("Using %1").arg(entry.name())); + d->engine->idleMessage(i18n("Using %1", entry.name())); } } }