yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2020-11-02 06:22:11 +01:00
parent 6b34b90635
commit e8162aa79b
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runners/kwin-runner-windows.desktop
View file

@ -6,6 +6,7 @@ Name[es]=Ventanas
Name[fr]=Fenêtres
Name[it]=Finestre
Name[nl]=Vensters
Name[nn]=Vindauge
Name[pt]=Janelas
Name[sv]=Fönster
Name[uk]=Вікна
@ -16,6 +17,7 @@ Comment[es]=Listar ventanas y escritorios y cambiar entre ellos
Comment[fr]=Lister les fenêtres et les bureaux pour pouvoir passer de l'un à l'autre.
Comment[it]=Elenca e scambia le finestre ed i desktop
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[sv]=Lista fönster och skrivbord, och byt mellan dem
Comment[uk]=Показує список вікон і стільниць і перемикає їх