Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit d3147586 authored by Script Kiddy's avatar Script Kiddy

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 d7d2917e
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"Description[fi]": "Lukitsee järjestelmäsi", "Description[fi]": "Lukitsee järjestelmäsi",
"Description[fr]": "Bloque votre système", "Description[fr]": "Bloque votre système",
"Description[gl]": "Bloquea os seus sistemas.", "Description[gl]": "Bloquea os seus sistemas.",
"Description[id]": "Menggembokkan sistemmu", "Description[id]": "Menguncikan sistemmu",
"Description[it]": "Blocca i tuoi sistemi", "Description[it]": "Blocca i tuoi sistemi",
"Description[ko]": "내 시스템 잠그기", "Description[ko]": "내 시스템 잠그기",
"Description[nl]": "Vergrendeld uw systemen", "Description[nl]": "Vergrendeld uw systemen",
......
Markdown is supported
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