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 2023-07-14 02:33:35 +00:00
parent 3e31b6fdf2
commit bf50cc2b67
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json
View file

@ -10,6 +10,7 @@
"Description[eo]": "Fenestrodekora Etosmotoro",
"Description[es]": "Motor de temas de decoraciones de las ventanas",
"Description[eu]": "Leiho-apaindura gaien motorra",
"Description[fi]": "Ikkunakoristeluteemamoottori",
"Description[fr]": "Moteur pour les thèmes de décorations de fenêtres",
"Description[ia]": "Motor de Thema de Decoratione de fenestra",
"Description[it]": "Motore dei temi delle decorazioni delle finestre",
@ -32,6 +33,7 @@
"Name[eo]": "Aurorae",
"Name[es]": "Aurorae",
"Name[eu]": "Aurorae",
"Name[fi]": "Aurorae",
"Name[fr]": "Aurorae",
"Name[ia]": "Aurorae",
"Name[it]": "Aurorae",

3
src/tabbox/switchers/thumbnail_grid/metadata.json
View file

@ -15,6 +15,7 @@
"Name[eo]": "Chris Holland",
"Name[es]": "Chris Holland",
"Name[eu]": "Chris Holland",
"Name[fi]": "Chris Holland",
"Name[fr]": "Chris Holland",
"Name[ia]": "Chris Holland",
"Name[it]": "Chris Holland",
@ -42,6 +43,7 @@
"Description[eo]": "Fenestroŝaltila aranĝo uzante malgrandan kradon de bildetoj",
"Description[es]": "Un esquema de selector de ventanas que usa una pequeña cuadrícula de miniaturas",
"Description[eu]": "Koadro txikien sareta txiki bat erabiltzen duen leiho-trukatzaile antolaera bat",
"Description[fi]": "Pientä pienoiskuvaruudukkoa käyttävä ikkunavaihto",
"Description[fr]": "Une disposition du sélecteur de fenêtres utilisant une petite grille de vignettes.",
"Description[ia]": "Un disposition de commutator de fenestra usante un parve grillia de miniaturas",
"Description[it]": "Una disposizione per il cambio finestra che utilizza una piccola griglia di miniature",
@ -70,6 +72,7 @@
"Name[eo]": "Bildeta Krado",
"Name[es]": "Cuadrícula de miniaturas",
"Name[eu]": "Koadro txikien sareta",
"Name[fi]": "Pienoiskuvaruudukko",
"Name[fr]": "Grille de vignettes",
"Name[ia]": "Grillia de Miniatura",
"Name[it]": "Griglia delle miniature",