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 2022-04-09 01:49:59 +00:00
parent 2ef6215a51
commit 35c0aca980
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/effects/blendchanges/metadata.json
View file

@ -6,6 +6,7 @@
"Description[ca@valencia]": "Anima els canvis d'estil del sistema", "Description[ca@valencia]": "Anima els canvis d'estil del sistema",
"Description[ca]": "Anima els canvis d'estil del sistema", "Description[ca]": "Anima els canvis d'estil del sistema",
"Description[es]": "Anima los cambios de estilo del sistema", "Description[es]": "Anima los cambios de estilo del sistema",
"Description[fr]": "Anime les modifications de style du système",
"Description[nl]": "Systeemstijl wijzigingen animeren", "Description[nl]": "Systeemstijl wijzigingen animeren",
"Description[sv]": "Animerar systemets stiländringar", "Description[sv]": "Animerar systemets stiländringar",
"Description[uk]": "Анімація змін у стилі системи", "Description[uk]": "Анімація змін у стилі системи",
@ -19,6 +20,7 @@
"Name[ca@valencia]": "Transició de canvis", "Name[ca@valencia]": "Transició de canvis",
"Name[ca]": "Transició de canvis", "Name[ca]": "Transició de canvis",
"Name[es]": "Mezclar cambios", "Name[es]": "Mezclar cambios",
"Name[fr]": "Modifications des mélanges",
"Name[nl]": "Wijzigingen mengen", "Name[nl]": "Wijzigingen mengen",
"Name[sv]": "Blanda ändringar", "Name[sv]": "Blanda ändringar",
"Name[uk]": "Злиття змін", "Name[uk]": "Злиття змін",