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"
This commit is contained in:
parent
9cf52340ef
commit
d36e326d66
1 changed files with 2 additions and 0 deletions
|
@ -12,6 +12,7 @@ Name[nl]=Vensters
|
|||
Name[nn]=Vindauge
|
||||
Name[pt]=Janelas
|
||||
Name[pt_BR]=Janelas
|
||||
Name[sk]=Okná
|
||||
Name[sl]=Okna
|
||||
Name[sv]=Fönster
|
||||
Name[uk]=Вікна
|
||||
|
@ -28,6 +29,7 @@ Comment[nl]=Toon vensters en bureaubladen en schakel ze om
|
|||
Comment[nn]=Vis vindauge og skrivebord, og byt mellom dei
|
||||
Comment[pt]=Listar as janelas e ecrãs e mudar entre elas
|
||||
Comment[pt_BR]=Lista as janelas e áreas de trabalho e alterna entre elas
|
||||
Comment[sk]=Zobraziť okná a plochy a prepnúť ich
|
||||
Comment[sl]=Prikaži seznam oken in namizij in preklopi med njimi
|
||||
Comment[sv]=Lista fönster och skrivbord, och byt mellan dem
|
||||
Comment[uk]=Показує список вікон і стільниць і перемикає їх
|
||||
|
|
Loading…
Reference in a new issue