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-25 01:15:54 +00:00
parent 2fb52274d0
commit e227e93792
6 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,9 @@ Name[fr]=aperçu
Name[it]=panoramica Name[it]=panoramica
Name[lt]=apžvalga Name[lt]=apžvalga
Name[nl]=overzicht Name[nl]=overzicht
Name[pt]=introdução
Name[sl]=pregled Name[sl]=pregled
Name[sv]=översikt Name[sv]=översikt
Name[uk]=огляд Name[uk]=огляд
Name[vi]=tổng quan
Name[x-test]=xxoverviewxx Name[x-test]=xxoverviewxx

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

@ -17,6 +17,7 @@
"Name[lt]": "Demitrius Belai", "Name[lt]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai", "Name[nl]": "Demitrius Belai",
"Name[pl]": "Demitrius Belai", "Name[pl]": "Demitrius Belai",
"Name[pt]": "Demitrius Belai",
"Name[sk]": "Demitrius Belai", "Name[sk]": "Demitrius Belai",
"Name[sl]": "Demitrius Belai", "Name[sl]": "Demitrius Belai",
"Name[sv]": "Demitrius Belai", "Name[sv]": "Demitrius Belai",
@ -39,6 +40,7 @@
"Name[lt]": "KWin Aurorae", "Name[lt]": "KWin Aurorae",
"Name[nl]": "KWin Aurorae", "Name[nl]": "KWin Aurorae",
"Name[pl]": "KWin Aurorae", "Name[pl]": "KWin Aurorae",
"Name[pt]": "KWin Aurora",
"Name[sk]": "KWin Aurorae", "Name[sk]": "KWin Aurorae",
"Name[sl]": "KWin Aurorae", "Name[sl]": "KWin Aurorae",
"Name[sv]": "KWin Aurorae", "Name[sv]": "KWin Aurorae",

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

@ -17,6 +17,7 @@
"Name[lt]": "Demitrius Belai", "Name[lt]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai", "Name[nl]": "Demitrius Belai",
"Name[pl]": "Demitrius Belai", "Name[pl]": "Demitrius Belai",
"Name[pt]": "Demitrius Belai",
"Name[sk]": "Demitrius Belai", "Name[sk]": "Demitrius Belai",
"Name[sl]": "Demitrius Belai", "Name[sl]": "Demitrius Belai",
"Name[sv]": "Demitrius Belai", "Name[sv]": "Demitrius Belai",
@ -39,6 +40,7 @@
"Name[lt]": "KWin dekoracijos", "Name[lt]": "KWin dekoracijos",
"Name[nl]": "KWin-decoraties", "Name[nl]": "KWin-decoraties",
"Name[pl]": "Wygląd KWin", "Name[pl]": "Wygląd KWin",
"Name[pt]": "Decoração do KWin",
"Name[sk]": "KWin Dekorácia", "Name[sk]": "KWin Dekorácia",
"Name[sl]": "KWin Decoration", "Name[sl]": "KWin Decoration",
"Name[sv]": "Kwin-dekoration", "Name[sv]": "Kwin-dekoration",

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

@ -40,6 +40,7 @@
"Name[lt]": "KWin efektas", "Name[lt]": "KWin efektas",
"Name[nl]": "KWin-effect", "Name[nl]": "KWin-effect",
"Name[pl]": "Efekt KWin", "Name[pl]": "Efekt KWin",
"Name[pt]": "Efeito do KWin",
"Name[sk]": "KWin Efekt", "Name[sk]": "KWin Efekt",
"Name[sl]": "KWin Effect", "Name[sl]": "KWin Effect",
"Name[sv]": "Kwin-effekt", "Name[sv]": "Kwin-effekt",

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

@ -40,6 +40,7 @@
"Name[lt]": "KWin scenarijus", "Name[lt]": "KWin scenarijus",
"Name[nl]": "KWin-script", "Name[nl]": "KWin-script",
"Name[pl]": "Skrypt KWin", "Name[pl]": "Skrypt KWin",
"Name[pt]": "Programa do KWin",
"Name[sk]": "KWin Skript", "Name[sk]": "KWin Skript",
"Name[sl]": "KWin Script", "Name[sl]": "KWin Script",
"Name[sv]": "Kwin-skript", "Name[sv]": "Kwin-skript",

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

@ -40,6 +40,7 @@
"Name[lt]": "KWin langų perjungiklis", "Name[lt]": "KWin langų perjungiklis",
"Name[nl]": "KWin-vensterwisselaar", "Name[nl]": "KWin-vensterwisselaar",
"Name[pl]": "Przełącznik okien KWin", "Name[pl]": "Przełącznik okien KWin",
"Name[pt]": "Selector de Janelas do KWin",
"Name[sk]": "KWin Prepínač okien", "Name[sk]": "KWin Prepínač okien",
"Name[sl]": "KWin Window Switcher", "Name[sl]": "KWin Window Switcher",
"Name[sv]": "Kwin-fönsterbyte", "Name[sv]": "Kwin-fönsterbyte",