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-04-03 01:14:45 +00:00
parent bb776d5c2b
commit f29781349c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/purpose/purposeplugin.json
View File

@@ -5,6 +5,7 @@
"Name": "Tobias Fella", "Name": "Tobias Fella",
"Name[ca@valencia]": "Tobias Fella", "Name[ca@valencia]": "Tobias Fella",
"Name[ca]": "Tobias Fella", "Name[ca]": "Tobias Fella",
"Name[cs]": "Tobias Fella",
"Name[de]": "Tobias Fella", "Name[de]": "Tobias Fella",
"Name[es]": "Tobias Fella", "Name[es]": "Tobias Fella",
"Name[eu]": "Tobias Fella", "Name[eu]": "Tobias Fella",
@@ -49,6 +50,7 @@
"Name[ast]": "NeoChat", "Name[ast]": "NeoChat",
"Name[ca@valencia]": "NeoChat", "Name[ca@valencia]": "NeoChat",
"Name[ca]": "NeoChat", "Name[ca]": "NeoChat",
"Name[cs]": "NeoChat",
"Name[de]": "NeoChat", "Name[de]": "NeoChat",
"Name[es]": "NeoChat", "Name[es]": "NeoChat",
"Name[eu]": "NeoChat", "Name[eu]": "NeoChat",