Commit 20ea40e7 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 d82db290
......@@ -2,6 +2,7 @@
Name=US English
Name[ar]=الإنجليزية الأمريكية
Name[ast]=Inglés (EE.XX)
Name[az]=US İngiliscə
Name[bs]=Američki engleski
Name[ca]=Anglès US
Name[ca@valencia]=Anglés US
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