Commit cc9065e0 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 fdb2036e
......@@ -30,7 +30,7 @@ Name[fi]=Konquerorin tietoa-sivu
Name[fr]=Page « À propos » de Konqueror
Name[fy]=Ynformaasjeside foar Konqueror
Name[ga]=Leathanach Eolais le haghaidh Konqueror
Name[gl]=Páxina acerca de Konqueror
Name[gl]=Páxina sobre Konqueror
Name[gu]=કોન્કરર માટે વિશે-પાનું
Name[he]=דף אודות עבור Konqueror
Name[hi]=कॉन्करर के लिए 'के-बारे में' पृष्ठ
......
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