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 2023-08-08 02:20:18 +00:00
parent 5007d337b3
commit 37e490d7cc
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json
View file

@ -24,6 +24,7 @@
"Description[uk]": "Рушій тем обрамлення вікон", "Description[uk]": "Рушій тем обрамлення вікон",
"Description[x-test]": "xxWindow Decoration Theme Enginexx", "Description[x-test]": "xxWindow Decoration Theme Enginexx",
"Description[zh_CN]": "窗口装饰主题引擎", "Description[zh_CN]": "窗口装饰主题引擎",
"Description[zh_TW]": "視窗裝飾主題引擎",
"Name": "Aurorae", "Name": "Aurorae",
"Name[ar]": "أورورا", "Name[ar]": "أورورا",
"Name[bg]": "Aurorae", "Name[bg]": "Aurorae",
@ -48,6 +49,7 @@
"Name[tr]": "Aurorae", "Name[tr]": "Aurorae",
"Name[uk]": "Aurorae", "Name[uk]": "Aurorae",
"Name[x-test]": "xxAuroraexx", "Name[x-test]": "xxAuroraexx",
"Name[zh_CN]": "Aurorae 极光" "Name[zh_CN]": "Aurorae 极光",
"Name[zh_TW]": "Aurorae"
} }
} }