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-09-13 05:57:35 +02:00
parent 6072b0cd6c
commit e4ff50624a
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/logout/package/metadata.desktop
View file

@ -16,6 +16,7 @@ Name[nn]=Logg ut
Name[pl]=Wylogowywanie Name[pl]=Wylogowywanie
Name[pt]=Encerrar Name[pt]=Encerrar
Name[pt_BR]=Encerrar sessão Name[pt_BR]=Encerrar sessão
Name[ru]=Завершение работы
Name[sv]=Logga ut Name[sv]=Logga ut
Name[uk]=Вихід Name[uk]=Вихід
Name[x-test]=xxLogoutxx Name[x-test]=xxLogoutxx
@ -39,6 +40,7 @@ Comment[nn]=Ton ut til utloggingsbiletet
Comment[pl]=Płynne zanikanie do ekranu wylogowywania Comment[pl]=Płynne zanikanie do ekranu wylogowywania
Comment[pt]=Desvanecer suavemente para o ecrã de encerramento Comment[pt]=Desvanecer suavemente para o ecrã de encerramento
Comment[pt_BR]=Suaviza o desaparecimento para a tela de encerramento da sessão Comment[pt_BR]=Suaviza o desaparecimento para a tela de encerramento da sessão
Comment[ru]=Плавное появление экрана завершения работы
Comment[sv]=Tona mjukt till utloggningsskärmen Comment[sv]=Tona mjukt till utloggningsskärmen
Comment[uk]=Плавний перехід до вікна виходу з системи Comment[uk]=Плавний перехід до вікна виходу з системи
Comment[x-test]=xxSmoothly fade to the logout screenxx Comment[x-test]=xxSmoothly fade to the logout screenxx