Commit f922fc05 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 5ccdf24b
......@@ -85,7 +85,7 @@ Name[ug]=تور بەت يان بالداق بۆلىكى
Name[uk]=Модуль бічної панелі інтернету
Name[uz]=Veb yon paneli moduli
Name[uz@cyrillic]=Веб ён панели модули
Name[vi]=Mô đun Thanh bên Trình duyệt
Name[vi]=Khối Thanh bên Trình duyệt
Name[wa]=Module waibe del bår di costé
Name[x-test]=xxWeb SideBar Modulexx
Name[zh_CN]=网页侧边栏模块
......
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