ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
2024-03-28 01:18:33 +00:00
parent bae14ecd35
commit dc2cf21cb8
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/purpose/purposeplugin.json
View File

@@ -46,6 +46,7 @@
"Icon": "org.kde.neochat", "Icon": "org.kde.neochat",
"License": "GPL", "License": "GPL",
"Name": "NeoChat", "Name": "NeoChat",
"Name[ast]": "NeoChat",
"Name[ca@valencia]": "NeoChat", "Name[ca@valencia]": "NeoChat",
"Name[ca]": "NeoChat", "Name[ca]": "NeoChat",
"Name[de]": "NeoChat", "Name[de]": "NeoChat",