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-09-04 06:04:49 +02:00
parent d3cca65d39
commit a457bd4310
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -26,7 +26,7 @@ Name[nn]=Veksleoppsett for vindaugshandsamar
Name[pa]=ਵਿੰਡੋ ਮੈਨੇਜਰ ਸਵਿੱਚਰ ਲੇਆਉਟ
Name[pl]=Układ przełączania zarządzana oknami
Name[pt]=Disposições da Mudança de Janelas do KWin
Name[pt_BR]=Layouts de mudança do gerenciador de Janelas
Name[pt_BR]=Layouts de mudança do gerenciador de janelas
Name[ru]=Оформления переключателя окон для KWin
Name[sk]=Prepínanie rozložení správcu okien
Name[sl]=Razporedi preklapljanja upravljalnika oken

2
kwin.notifyrc
View file

@ -294,6 +294,7 @@ Name[az]=Xwayland Qəzası
Name[ca]=Fallada de l'Xwayland
Name[es]=Fallo de Xwayland
Name[nl]=Xwayland-crash
Name[pt]=Estoiro do Xwayland
Name[sv]=Krasch av Xwayland
Name[uk]=Аварія Xwayland
Name[x-test]=xxXwayland Crashxx
@ -302,6 +303,7 @@ Comment[az]=Xwayland qəzaya uğradı
Comment[ca]=L'Xwayland ha fallat
Comment[es]=Xwayland ha fallado
Comment[nl]=Xwayland is gecrasht
Comment[pt]=O Xwayland estoirou
Comment[sv]=Xwayland har kraschat
Comment[uk]=Xwayland завершив роботу в аварійному режимі
Comment[x-test]=xxXwayland has crashedxx