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 2016-10-24 12:07:39 +00:00
parent 94d009ec02
commit 2e9dc7f28a
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/platforms/x11/standalone/x11.json
View file

@ -8,6 +8,7 @@
"Description[es]": "Complemento de Platform para X11 autónomo en kwin_x11.",
"Description[et]": "Autonoomse x11 platvormi plugin kwin_x11-s",
"Description[fi]": "Alustaliitännäinen itsenäiselle x11:lle kwin_x11:ssä.",
"Description[fr]": "Module de plate-forme pour x11 autonomes, au sein de kwin_x11",
"Description[gl]": "Complemento de plataforma para x11 independente en kwin_x11.",
"Description[it]": "Estensione di piattaforma per x11 autonomo in kwin_x11.",
"Description[ko]": "kwin_x11의 단독 X11 플러그인입니다.",