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-08-16 01:12:48 +00:00
parent 7dc1bf29bc
commit 214a318811
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/plugins/kpackage/effect/kwin-packagestructure-effect.json
View file

@ -16,6 +16,7 @@
"Name[ko]": "Vlad Zahorodnii",
"Name[nl]": "Vlad Zahorodnii",
"Name[pl]": "Vlad Zahorodnii",
"Name[pt]": "Vlad Zahorodnii",
"Name[sk]": "Vlad Zahorodnii",
"Name[sl]": "Vlad Zahorodnii",
"Name[sv]": "Vlad Zahorodnii",

1
src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
View file

@ -16,6 +16,7 @@
"Name[ko]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[sk]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",

1
src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
View file

@ -16,6 +16,7 @@
"Name[ko]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[sk]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",