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-09-10 01:18:40 +00:00
parent 1b504818a3
commit 84426e8082
6 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/effects/overview/kcm/overvieweffectkcm.desktop
View file

@ -14,6 +14,7 @@ Name[ca]=Vista general
Name[cs]=přehled
Name[es]=vista general
Name[eu]=Ikuspegi orokorra
Name[fi]=yleiskuva
Name[fr]=aperçu
Name[it]=panoramica
Name[lt]=apžvalga

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

@ -12,6 +12,7 @@
"Name[en_GB]": "Demitrius Belai",
"Name[es]": "Demitrius Belai",
"Name[eu]": "Demitrius Belai",
"Name[fi]": "Demitrius Belai",
"Name[fr]": "Demitrius Belai",
"Name[it]": "Demitrius Belai",
"Name[ko]": "Demitrius Belai",
@ -36,6 +37,7 @@
"Name[en_GB]": "KWin Aurorae",
"Name[es]": "KWin Aurorae",
"Name[eu]": "KWin Aurorae",
"Name[fi]": "KWin Aurorae",
"Name[fr]": "KWin Aurorae",
"Name[it]": "KWin Aurorae",
"Name[ko]": "KWin Aurorae",

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

@ -12,6 +12,7 @@
"Name[en_GB]": "Demitrius Belai",
"Name[es]": "Demitrius Belai",
"Name[eu]": "Demitrius Belai",
"Name[fi]": "Demitrius Belai",
"Name[fr]": "Demitrius Belai",
"Name[it]": "Demitrius Belai",
"Name[ko]": "Demitrius Belai",
@ -36,6 +37,7 @@
"Name[en_GB]": "KWin Decoration",
"Name[es]": "Decoración de KWin",
"Name[eu]": "KWin apainketa",
"Name[fi]": "KWin-koristelu",
"Name[fr]": "Décorations pour KWin",
"Name[it]": "Decorazione di KWin",
"Name[ko]": "KWin 장식",

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

@ -12,6 +12,7 @@
"Name[en_GB]": "Vlad Zahorodnii",
"Name[es]": "Vlad Zahorodnii",
"Name[eu]": "Vlad Zahorodnii",
"Name[fi]": "Vlad Zahorodnii",
"Name[fr]": "Vlad Zahorodnii",
"Name[it]": "Vlad Zahorodnii",
"Name[ko]": "Vlad Zahorodnii",
@ -36,6 +37,7 @@
"Name[en_GB]": "KWin Effect",
"Name[es]": "Efecto de KWin",
"Name[eu]": "KWin efektua",
"Name[fi]": "KWin-tehoste",
"Name[fr]": "Effet pour KWin",
"Name[it]": "Effetto di KWin",
"Name[ko]": "KWin 효과",

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

@ -12,6 +12,7 @@
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fi]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[ko]": "Marco Martin",
@ -36,6 +37,7 @@
"Name[en_GB]": "KWin Script",
"Name[es]": "Guion de KWin",
"Name[eu]": "KWin gidoia",
"Name[fi]": "KWin-skripti",
"Name[fr]": "Script pour KWin",
"Name[it]": "Script di KWin",
"Name[ko]": "KWin 스크립트",

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

@ -12,6 +12,7 @@
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fi]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[ko]": "Marco Martin",
@ -36,6 +37,7 @@
"Name[en_GB]": "KWin Window Switcher",
"Name[es]": "Selector de ventanas de KWin",
"Name[eu]": "KWin leiho-aldatzailea",
"Name[fi]": "KWin-ikkunavaihto",
"Name[fr]": "Sélecteur de fenêtres de KWin",
"Name[it]": "Scambiafinestre di KWin",
"Name[ko]": "KWin 창 전환기",