Members of the KDE Community are recommended to subscribe to the kde-community mailing list at to allow them to participate in important discussions and receive other important announcements

Commit f30b7915 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 8f43bb83
......@@ -2,7 +2,7 @@
Name=External Scripting
Name[bs]=Vanjsko skriptiranje
Name[ca]=Creador de scripts externs
Name[ca]=Creació de scripts externs
Name[de]=Externe Skripte
Name[es]=Scripts externos
Name[et]=Väline skriptimine
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