Commit a3f9d40b 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 e8398bfc
......@@ -10,7 +10,7 @@ Name[bn_IN]=KDE Write ডেমন
Name[br]=Diaoul skrivañ KDE
Name[bs]=KDE‑ov demon za poruke
Name[ca]=Dimoni d'escriptura del KDE
Name[ca@valencia]=Dimoni d'escriptura del KDE
Name[ca@valencia]=Dimoni d'escriptura de KDE
Name[cs]=Zapisovací démon KDE
Name[csb]=Demóna zôpisu KDE
Name[cy]=Daemon KDE Write
......
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