From 24b1e8faaeed6d57ed11e18cb56c8f5bc4816819 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Jul 2022 01:48:39 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- plasmoid/package/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index 1f0d5ab8a..664061310 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -22,7 +22,7 @@ ], "Category": "Windows and Tasks", "Description": "Tasks plasmoid from Latte Dock", - "Description[az]": "Latte Dokdan Tapşırılar plasmoidi", + "Description[az]": "Latte Dokdan Tapşırıqlar plasmoidi", "Description[ca@valencia]": "Plasmoide de tasques de Latte Dock", "Description[ca]": "Plasmoide de tasques del Latte Dock", "Description[es]": "Plasmoide de tareas de Latte Dock",