Commit 6ce11522 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 b6fe7dc1
......@@ -31,6 +31,7 @@ Icon=preferences-system-windows-effect-scale
Comment=Make windows smoothly scale in and out when they are shown or hidden
Comment[ca]=Fa que les finestres entrin o surtin volant quan es mostren o s'oculten
Comment[ca@valencia]=Fa que les finestres entrin o isquen volant quan es mostren o s'oculten
Comment[de]=Ändert die Fenstergröße langsam beim Ein- oder Ausblenden
Comment[gl]=Facer que as xanelas crezan ou decrezan suavemente cando se mostran ou agochan
Comment[id]=Buat jendela menskala besar atau kecil secara mulus ketika ia ditampilkan atau disembunyikan
Comment[nl]=Laat vensters vloeiend kleiner en groter schalen als ze worden getoond of verborgen
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