Commit 2734c580 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent d31f1733
Pipeline #79329 skipped
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
"Id": "pmdummybackendplugin", "Id": "pmdummybackendplugin",
"License": "GPL", "License": "GPL",
"Name": "KDE Partition Manager Dummy Backend", "Name": "KDE Partition Manager Dummy Backend",
"Name[ca@valencia]": "Dorsal fals per al gestor de particions del KDE", "Name[ca@valencia]": "Dorsal fals del gestor de particions del KDE",
"Name[ca]": "Dorsal fals del gestor de particions del KDE", "Name[ca]": "Dorsal fals del gestor de particions del KDE",
"Name[cs]": "Podpůrná vrstva pro správce diskových oddílů pro KDE", "Name[cs]": "Podpůrná vrstva pro správce diskových oddílů pro KDE",
"Name[da]": "KDE-partitionshåndtering med attrap-backend", "Name[da]": "KDE-partitionshåndtering med attrap-backend",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment