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 3018d1f3 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 16f43cd9
Pipeline #19985 passed with stage
in 5 minutes and 48 seconds
......@@ -19,6 +19,7 @@ Name[ko]=Keysmith
Name[nl]=Keysmith
Name[pt]=Keysmith
Name[pt_BR]=Keysmith
Name[ru]=Keysmith
Name[sk]=Keysmith
Name[sv]=Keysmith
Name[tg]=Keysmith
......
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