Commit 11acc158 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 fbce7c7f
......@@ -44,6 +44,7 @@ Comment[en_GB]=Shows the desktop by moving windows aside
Comment[es]=Muestra el escritorio moviendo las ventanas a un lado
Comment[eu]=Mahaigaina erakusten du leihoak alde batera eramanez
Comment[fi]=Näyttää työpöydän siirtämällä ikkunoita sivuun
Comment[fr]=Afficher le bureau en déplaçant toutes les fenêtres sur le côté
Comment[hu]=Az asztal megjelenítése az ablakok oldalra mozgatásával
Comment[ia]=Monstra le scriptorio per mover fenestra a latere
Comment[id]=Menampilkan desktop dengan memindah window ke samping
......
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