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-07 01:53:13 +00:00
parent 3d9ccaf742
commit 9e82887160
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

@ -11,6 +11,7 @@
"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",
"Description[sl]": "Urejevalnik za področja s sličicami",
"Description[tr]": "Döşeme alanları için düzenleyici",
"Description[uk]": "Редактор для мозаїчних областей",
"Description[x-test]": "xxEditor for the tiling areasxx",
@ -27,6 +28,7 @@
"Name[nl]": "Bewerker voor tegels plaatsen",
"Name[pl]": "Edytor kafelków",
"Name[pt]": "Editor de Padrões",
"Name[sl]": "Urejevalnik sličic",
"Name[tr]": "Döşeme Düzenleyici",
"Name[uk]": "Редактор мозаїк",
"Name[x-test]": "xxTiling Editorxx"