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-11-07 01:51:06 +00:00
parent 894883f457
commit 163c36595e
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/mousemark/metadata.json
View file

@ -5,7 +5,7 @@
"Description[ar]": "يسمح لك برسم خطوط على سطح المكتب",
"Description[az]": "Siçan kursoru ilə ekranda şəkil çəkməyə imkan verir",
"Description[bg]": "Позволява ви да чертаете линии на работния плот",
"Description[ca@valencia]": "Permet dibuixar línies a l'escriptori",
"Description[ca@valencia]": "Permet dibuixar línies en l'escriptori",
"Description[ca]": "Permet dibuixar línies a l'escriptori",
"Description[cs]": "Umožní kreslit čáry na ploše",
"Description[de]": "Lässt Sie mit der Maus Linien auf die Arbeitsfläche zeichnen",