1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-09 00:58:15 +03:00

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"
This commit is contained in:
l10n daemon script 2022-07-04 01:48:39 +00:00
parent 0cc73324c3
commit 24b1e8faae

View File

@ -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",