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 2019-11-06 05:43:12 +01:00
parent 0a7aa75870
commit aa3a16845b
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ Name[lt]=Seanso baigimas
Name[nl]=Afsluiten van sessie
Name[pt]=Saída da Sessão
Name[pt_BR]=Saída da sessão
Name[sk]=Ukončenie sedenia
Name[sv]=Avsluta session
Name[uk]=Вихід з сеансу
Name[x-test]=xxSession Quitxx
@ -25,6 +26,7 @@ Comment[lt]=Atsijungiant, išlaikyti darbalaukio foną reaguojantį iki pat galo
Comment[nl]=De achtergrond van het bureaublad tot het einde levend houden gedurende afmelden
Comment[pt]=Manter o fundo do ecrã activo durante a saída da sessão até ao fim
Comment[pt_BR]=Mantém ativo o fundo da área de trabalho até o fim do fechamento da sessão
Comment[sk]=Ponechať pozadie plochy aktívne počas odhlásenia do skončenia
Comment[sv]=Behåll skrivbordets bakgrund levande under utloggning till slutet
Comment[uk]=Не вимикати тло стільниці до кінця процедури виходу із облікового запису
Comment[x-test]=xxKeep the desktop background alive during logout until the endxx