Commit baf3ddea 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 c544d4f2
......@@ -14,6 +14,7 @@ X-KDE-OnlyShowOnQtPlatforms=wayland;
X-DocPath=kcontrol/kwinvirtualkeyboard/index.html
Name=Virtual Keyboard
Name[ast]=Tecláu virtual
Name[az]=Virtual Klaviatura
Name[ca]=Teclat virtual
Name[de]=Virtuelle Tastatur
......
......@@ -3,6 +3,7 @@
[Desktop Entry]
Name=Virtual Keyboard
Name[ast]=Tecláu virtual
Name[az]=Virtual Klaviatura
Name[ca]=Teclat virtual
Name[de]=Virtuelle Tastatur
......
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