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-04-14 09:57:09 +00:00
parent b4b0b100df
commit a3cd28a87e
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

@ -6,6 +6,7 @@
"Description[es]": "Complemento de Platform para X11 autónomo en kwin_x11.",
"Description[nl]": "Platform plug-in voor alleenstaande x11 in kwin_x11.",
"Description[pt]": "'Plugin' de plataformas para um X11 autónomo no X11 do KWin.",
"Description[pt_BR]": "Plugin de plataforma para um x11 independente no kwin_x11.",
"Description[sv]": "Plattforminsticksprogram för fristående X11 i kwin_x11",
"Description[uk]": "Додаток платформи для окремого x11 у kwin_x11.",
"Description[x-test]": "xxPlatform plugin for standalone x11 in kwin_x11.xx",