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-23 01:44:53 +00:00
parent 0ef12b69a1
commit b935bca22f
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/windowview/metadata.json
View file

@ -2,6 +2,7 @@
"KPlugin": {
"Category": "Window Management",
"Description": "Helper effect for the task manager",
"Description[az]": "Tapşırıq meneceri üçün köməkçi effekti",
"Description[ca@valencia]": "Efecte auxiliar per al gestor de tasques",
"Description[ca]": "Efecte auxiliar per al gestor de tasques",
"Description[es]": "Efecto auxiliar para el gestor de tareas",
@ -21,6 +22,7 @@
"Id": "windowview",
"License": "GPL",
"Name": "Window View",
"Name[az]": "Pəncərənin görünüşü",
"Name[ca@valencia]": "Vista de finestres",
"Name[ca]": "Vista de finestres",
"Name[es]": "Vista de ventanas",