SVN_SILENT made messages (.desktop file) - always resolve ours

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"
5 years ago · 214a318811
parent 7dc1bf29bc
commit 214a318811
3 changed files with 3 additions and 0 deletions
--- a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json
+++ b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json
@ -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",
--- a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
+++ b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
@ -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",
--- a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
+++ b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
@ -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",