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-06 01:16:36 +00:00
parent 7879450cdf
commit f4c0e19935
5 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Demitrius Belai",
"Name[es]": "Demitrius Belai",
"Name[fr]": "Demitrius Belai",
"Name[it]": "Demitrius Belai",
"Name[ko]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai",
"Name[pl]": "Demitrius Belai",
@ -28,6 +29,7 @@
"Name[en_GB]": "KWin Aurorae",
"Name[es]": "KWin Aurorae",
"Name[fr]": "KWin Aurorae",
"Name[it]": "KWin Aurorae",
"Name[ko]": "KWin Aurorae",
"Name[nl]": "KWin Aurorae",
"Name[pl]": "KWin Aurorae",

2
src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Demitrius Belai",
"Name[es]": "Demitrius Belai",
"Name[fr]": "Demitrius Belai",
"Name[it]": "Demitrius Belai",
"Name[ko]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai",
"Name[pl]": "Demitrius Belai",
@ -28,6 +29,7 @@
"Name[en_GB]": "KWin Decoration",
"Name[es]": "Decoración de KWin",
"Name[fr]": "Décorations pour KWin",
"Name[it]": "Decorazione di KWin",
"Name[ko]": "KWin 장식",
"Name[nl]": "KWin-decoraties",
"Name[pl]": "Wygląd KWin",

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

@ -11,6 +11,7 @@
"Name[en_GB]": "Vlad Zahorodnii",
"Name[es]": "Vlad Zahorodnii",
"Name[fr]": "Vlad Zahorodnii",
"Name[it]": "Vlad Zahorodnii",
"Name[ko]": "Vlad Zahorodnii",
"Name[nl]": "Vlad Zahorodnii",
"Name[pl]": "Vlad Zahorodnii",
@ -28,6 +29,7 @@
"Name[en_GB]": "KWin Effect",
"Name[es]": "Efecto de KWin",
"Name[fr]": "Effet pour KWin",
"Name[it]": "Effetto di KWin",
"Name[ko]": "KWin 효과",
"Name[nl]": "KWin-effect",
"Name[pl]": "Efekt KWin",

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

@ -11,6 +11,7 @@
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[ko]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
@ -28,6 +29,7 @@
"Name[en_GB]": "KWin Script",
"Name[es]": "Guion de KWin",
"Name[fr]": "Script pour KWin",
"Name[it]": "Script di KWin",
"Name[ko]": "KWin 스크립트",
"Name[nl]": "KWin-script",
"Name[pl]": "Skrypt KWin",

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

@ -11,6 +11,7 @@
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[ko]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
@ -28,6 +29,7 @@
"Name[en_GB]": "KWin Window Switcher",
"Name[es]": "Selector de ventanas de KWin",
"Name[fr]": "Sélecteur de fenêtres de KWin",
"Name[it]": "Scambiafinestre di KWin",
"Name[ko]": "KWin 창 전환기",
"Name[nl]": "KWin-vensterwisselaar",
"Name[pl]": "Przełącznik okien KWin",