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-03 01:55:31 +00:00
parent 8ebe9c7981
commit 0c6d62a2ec
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/effects/tileseditor/metadata.json
View file

@ -2,10 +2,24 @@
"KPlugin": { "KPlugin": {
"Category": "Window Management", "Category": "Window Management",
"Description": "Editor for the tiling areas", "Description": "Editor for the tiling areas",
"Description[ca@valencia]": "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[nl]": "Bewerker voor de gebieden waar tegels worden geplaatst",
"Description[tr]": "Döşeme alanları için düzenleyici",
"Description[uk]": "Редактор для мозаїчних областей",
"Description[x-test]": "xxEditor for the tiling areasxx",
"EnabledByDefault": true, "EnabledByDefault": true,
"Id": "tileseditor", "Id": "tileseditor",
"License": "GPL", "License": "GPL",
"Name": "Tiling Editor" "Name": "Tiling Editor",
"Name[ca@valencia]": "Editor de mosaic",
"Name[ca]": "Editor de mosaic",
"Name[es]": "Editor de mosaico",
"Name[nl]": "Bewerker voor tegels plaatsen",
"Name[tr]": "Döşeme Düzenleyici",
"Name[uk]": "Редактор мозаїк",
"Name[x-test]": "xxTiling Editorxx"
}, },
"X-KDE-ConfigModule": "kwin_tileseditor_config" "X-KDE-ConfigModule": "kwin_tileseditor_config"
} }