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 2021-04-15 01:16:21 +00:00
parent 59f6b77612
commit 82723be8db
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kcmkwin/kwinoptions/kwinmoving.desktop
View file

@ -13,6 +13,7 @@ Name[az]=Pəncərə yerdəyişdirilməsi
Name[ca]=Moviment de les finestres Name[ca]=Moviment de les finestres
Name[cs]=Pohyb oken Name[cs]=Pohyb oken
Name[da]=Flytning af vinduer Name[da]=Flytning af vinduer
Name[de]=Fensterverschiebung
Name[en_GB]=Window Movement Name[en_GB]=Window Movement
Name[es]=Movimiento de las ventanas Name[es]=Movimiento de las ventanas
Name[et]=Akna liigutamine Name[et]=Akna liigutamine
@ -45,6 +46,7 @@ Comment[az]=Pəncərə yerdəyişdirilməsinin tənzimlənməsi
Comment[ca]=Configura les opcions de moviment de les finestres Comment[ca]=Configura les opcions de moviment de les finestres
Comment[cs]=Nastavit volby pohybu oken Comment[cs]=Nastavit volby pohybu oken
Comment[da]=Indstil flytning af vinduer Comment[da]=Indstil flytning af vinduer
Comment[de]=Fensterverschiebung einrichten
Comment[en_GB]=Configure window movement options Comment[en_GB]=Configure window movement options
Comment[es]=Configurar las opciones del movimiento de las ventanas Comment[es]=Configurar las opciones del movimiento de las ventanas
Comment[et]=Akende liigutamise seadistamine Comment[et]=Akende liigutamise seadistamine