Commit 25babca1 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 fe20601b
......@@ -90,7 +90,7 @@ Name[uz@cyrillic]=Интернет
Name[vi]=Mạng
Name[wa]=Daegntoele
Name[x-test]=xxInternetxx
Name[zh_CN]=互联
Name[zh_CN]=网
Name[zh_TW]=網際網路
Icon=applications-internet
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