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 2018-07-15 05:21:01 +02:00
parent 4aa19c2e91
commit 7f398af180
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/logout/package/metadata.desktop
View file

@ -20,7 +20,7 @@ Name[it]=uscita
Name[ko]=로그아웃 Name[ko]=로그아웃
Name[nl]=afmelden Name[nl]=afmelden
Name[nn]=Utlogging Name[nn]=Utlogging
Name[pl]=wylogowanie Name[pl]=Wylogowywanie
Name[pt]=encerramento Name[pt]=encerramento
Name[pt_BR]=sair Name[pt_BR]=sair
Name[ru]=Завершение сеанса Name[ru]=Завершение сеанса