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-03-19 05:51:04 +01:00
parent 29fa85eed1
commit 9f3b817bdc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwinoptions/kwinactions.desktop
View file

@ -32,7 +32,7 @@ Name[pl]=Zachowanie okien
Name[pt]=Acções das Janelas Name[pt]=Acções das Janelas
Name[pt_BR]=Ações da janela Name[pt_BR]=Ações da janela
Name[ru]=Действия с окнами Name[ru]=Действия с окнами
Name[sk]=Akcie ok&na Name[sk]=Akcie okna
Name[sv]=Fönsteråtgärder Name[sv]=Fönsteråtgärder
Name[uk]=Дії з вікнами Name[uk]=Дії з вікнами
Name[x-test]=xxWindow Actionsxx Name[x-test]=xxWindow Actionsxx