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 2017-01-15 06:12:16 +01:00
parent c36b79345d
commit 6b593b5b53
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -2,6 +2,7 @@
Name=Window Manager Switching Layouts Name=Window Manager Switching Layouts
Name[ca]=Disposicions del commutador del gestor de finestres Name[ca]=Disposicions del commutador del gestor de finestres
Name[ca@valencia]=Disposicions del commutador del gestor de finestres Name[ca@valencia]=Disposicions del commutador del gestor de finestres
Name[de]=Wechsel-Layout für Fensterverwaltung
Name[en_GB]=Window Manager Switching Layouts Name[en_GB]=Window Manager Switching Layouts
Name[es]=Esquemas de cambio del gestor de ventanas Name[es]=Esquemas de cambio del gestor de ventanas
Name[ia]=Disposition de commutator de gerente de fenestra Name[ia]=Disposition de commutator de gerente de fenestra