Commit 257014a8 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 02429fbf
......@@ -153,7 +153,7 @@ Name[cs]=Rotovat proti směru hodin
Name[da]=Rotér mod uret
Name[de]=Gegen den Uhrzeigersinn drehen
Name[el]=Περιστροφή αριστερόστροφα
Name[en_GB]=Rotate Anti-Clockwise
Name[en_GB]=Rotate Anticlockwise
Name[es]=Girar en sentido contrario a las agujas del reloj
Name[et]=Pööra vastupäeva
Name[eu]=Biratu ordulariaren aurkako norantzan
......
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