marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues 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 2023-11-14 02:08:47 +00:00
parent b59011c187
commit 262a8392a5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kwin/scripts/convergentwindows/metadata.json
View file

@ -57,8 +57,8 @@
"Description[uk]": "Вилучає оздоблення вікон та максимізує вікна лише на першому екрані.", "Description[uk]": "Вилучає оздоблення вікон та максимізує вікна лише на першому екрані.",
"Description[x-test]": "xxRemoves window decorations and maximizes windows on the first screen only.xx", "Description[x-test]": "xxRemoves window decorations and maximizes windows on the first screen only.xx",
"Description[zh_CN]": "删除窗口装饰并最大化第一个屏幕上的窗口。", "Description[zh_CN]": "删除窗口装饰并最大化第一个屏幕上的窗口。",
"Id": "convergentwindows",
"Icon": "preferences-system-windows", "Icon": "preferences-system-windows",
"Id": "convergentwindows",
"License": "LGPL-2.1-or-later", "License": "LGPL-2.1-or-later",
"Name": "Convergent Windows", "Name": "Convergent Windows",
"Name[ca@valencia]": "Finestres convergents", "Name[ca@valencia]": "Finestres convergents",