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 2022-08-07 01:49:26 +00:00
parent ed829eb5ad
commit fbec3a1f80
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/kwin.notifyrc
View file

@ -307,7 +307,7 @@ Name[ar]=إنهيار ويلاند_اكس
Name[az]=Xwayland Qəzası
Name[bg]=Срив на Xwayland
Name[ca]=Fallada de l'Xwayland
Name[ca@valencia]=Fallada de l'XWayland
Name[ca@valencia]=Fallada d'XWayland
Name[de]=Xwayland-Absturz
Name[en_GB]=Xwayland Crash
Name[es]=Fallo de Xwayland
@ -343,7 +343,7 @@ Comment[ar]=إنهار ويلاند_اكس
Comment[az]=Xwayland qəzaya uğradı
Comment[bg]=Xwayland се срина
Comment[ca]=L'Xwayland ha fallat
Comment[ca@valencia]=L'XWayland ha fallat
Comment[ca@valencia]=XWayland ha fallat
Comment[cs]=Xwayland spadnul
Comment[de]=Xwayland ist abgestürzt
Comment[en_GB]=Xwayland has crashed