Commit 95808d88 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 617f4f72
......@@ -172,7 +172,7 @@ Comment[pa]=ਰੂਲਰ ਨੂੰ ਕਰਸਰ ਸਵਿੱਚਾਂ ਦੀ ਮ
Comment[pl]=Linijka przesunięta o zadaną ilość pikseli używając klawiszy kursora
Comment[pt]=A regra mudou de posição, ao nível do pixel, com as teclas de cursores
Comment[pt_BR]=A régua foi movida usando as teclas de direção
Comment[ro]=Rigla a fost mutată cîțiva pixeli cu tastele cursor
Comment[ro]=Rigla a fost mutată câțiva pixeli cu tastele cursor
Comment[ru]=Линейка сдвигается попиксельно с помощью стрелок.
Comment[sk]=Pravítko bolo posunuté kurzorovými klávesmi o niekoľko bodov
Comment[sl]=Ravnilo se je premaknilo po točkah z uporabo smernih tipk
......
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