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-06 01:49:30 +00:00
parent fdea693da5
commit 30f73e7b03
2 changed files with 3 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

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

1
src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json
View file

@ -43,6 +43,7 @@
"Name[ca]": "Gestos de pantalla tàctil", "Name[ca]": "Gestos de pantalla tàctil",
"Name[es]": "Gestos de la pantalla táctil", "Name[es]": "Gestos de la pantalla táctil",
"Name[eu]": "Ukimen-pantailako keinuak", "Name[eu]": "Ukimen-pantailako keinuak",
"Name[fr]": "Gestes de balayage de l'écran tactile",
"Name[it]": "Gesti dello schermo tattile", "Name[it]": "Gesti dello schermo tattile",
"Name[ka]": "სენსორული ეკრანის ჟესტები", "Name[ka]": "სენსორული ეკრანის ჟესტები",
"Name[nl]": "Veeggebaren voor aanraakscherm", "Name[nl]": "Veeggebaren voor aanraakscherm",