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 2021-10-23 01:16:55 +00:00
parent 49afd18018
commit 0c6bf857be
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/effects/overview/metadata.json
View file

@ -3,7 +3,7 @@
"Category": "Window Management",
"Description": "Allows you to overview virtual desktops and windows",
"Description[az]": "Pəncərələrə və iş masalarına ümumi baxışa imkan yaradır",
"Description[ca]": "Permet un vista general dels escriptoris virtuals i les finestres",
"Description[ca]": "Permet una vista general dels escriptoris virtuals i les finestres",
"Description[es]": "Le permite mostrar una vista general de los escritorios virtuales y de las ventanas",
"Description[fr]": "Permet d'avoir un aperçu des bureaux virtuels et des fenêtres",
"Description[nl]": "Biedt u een overzicht van virtuele bureaubladen en vensters",