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-12 01:14:37 +00:00
parent 4912c7cfa2
commit 4ab4f928f0
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

@ -16,6 +16,7 @@
"Name[ko]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai",
"Name[pl]": "Demitrius Belai",
"Name[sk]": "Demitrius Belai",
"Name[sl]": "Demitrius Belai",
"Name[sv]": "Demitrius Belai",
"Name[uk]": "Demitrius Belai",
@ -35,6 +36,7 @@
"Name[ko]": "KWin Aurorae",
"Name[nl]": "KWin Aurorae",
"Name[pl]": "KWin Aurorae",
"Name[sk]": "KWin Aurorae",
"Name[sl]": "KWin Aurorae",
"Name[sv]": "KWin Aurorae",
"Name[uk]": "KWin Aurorae",

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

@ -16,6 +16,7 @@
"Name[ko]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai",
"Name[pl]": "Demitrius Belai",
"Name[sk]": "Demitrius Belai",
"Name[sl]": "Demitrius Belai",
"Name[sv]": "Demitrius Belai",
"Name[uk]": "Demitrius Belai",
@ -35,6 +36,7 @@
"Name[ko]": "KWin 장식",
"Name[nl]": "KWin-decoraties",
"Name[pl]": "Wygląd KWin",
"Name[sk]": "KWin Dekorácia",
"Name[sl]": "KWin Decoration",
"Name[sv]": "Kwin-dekoration",
"Name[uk]": "Обрамлення вікон KWin",

2
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[sk]": "Vlad Zahorodnii",
"Name[sl]": "Vlad Zahorodnii",
"Name[sv]": "Vlad Zahorodnii",
"Name[uk]": "Влад Загородній",
@ -35,6 +36,7 @@
"Name[ko]": "KWin 효과",
"Name[nl]": "KWin-effect",
"Name[pl]": "Efekt KWin",
"Name[sk]": "KWin Efekt",
"Name[sl]": "KWin Effect",
"Name[sv]": "Kwin-effekt",
"Name[uk]": "Ефект KWin",

2
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[sk]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[uk]": "Marco Martin",
@ -35,6 +36,7 @@
"Name[ko]": "KWin 스크립트",
"Name[nl]": "KWin-script",
"Name[pl]": "Skrypt KWin",
"Name[sk]": "KWin Skript",
"Name[sl]": "KWin Script",
"Name[sv]": "Kwin-skript",
"Name[uk]": "Скрипт KWin",

2
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[sk]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[uk]": "Marco Martin",
@ -35,6 +36,7 @@
"Name[ko]": "KWin 창 전환기",
"Name[nl]": "KWin-vensterwisselaar",
"Name[pl]": "Przełącznik okien KWin",
"Name[sk]": "KWin Prepínač okien",
"Name[sl]": "KWin Window Switcher",
"Name[sv]": "Kwin-fönsterbyte",
"Name[uk]": "Перемикач вікон KWin",