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-12-10 01:48:43 +00:00
parent 20b94c9025
commit fedadf706a
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/tileseditor/metadata.json
View file

@ -8,6 +8,7 @@
"Description[es]": "Editor para las áreas de mosaico",
"Description[eu]": "Eremu lauzatuen editorea",
"Description[fr]": "Éditeur pour les zones de recouvrement",
"Description[it]": "Editor per le aree di affiancamento",
"Description[nl]": "Bewerker voor de gebieden waar tegels worden geplaatst",
"Description[pl]": "Edytor dla obszarów kafelkowanych",
"Description[pt]": "Editor das áreas com padrões",
@ -25,6 +26,7 @@
"Name[es]": "Editor de mosaico",
"Name[eu]": "Lauzadura editorea",
"Name[fr]": "Éditeur pour la gestion des recouvrements",
"Name[it]": "Editor di affiancamento",
"Name[nl]": "Bewerker voor tegels plaatsen",
"Name[pl]": "Edytor kafelków",
"Name[pt]": "Editor de Padrões",