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-23 01:13:26 +00:00
parent e07b876677
commit b504c990f8
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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[de]": "Tobias Fella",
"Name[es]": "Tobias Fella", "Name[es]": "Tobias Fella",
"Name[fr]": "Tobias Fella", "Name[fr]": "Tobias Fella",
"Name[hu]": "Tobias Fella", "Name[hu]": "Tobias Fella",
@@ -24,6 +25,7 @@
"Description": "Share via NeoChat", "Description": "Share via NeoChat",
"Description[ca@valencia]": "Compartix a través de NeoChat", "Description[ca@valencia]": "Compartix a través de NeoChat",
"Description[ca]": "Comparteix a través del NeoChat", "Description[ca]": "Comparteix a través del NeoChat",
"Description[de]": "Über NeoChat teilen",
"Description[es]": "Compartir mediante NeoChat", "Description[es]": "Compartir mediante NeoChat",
"Description[fr]": "Partager grâce à NeoChat", "Description[fr]": "Partager grâce à NeoChat",
"Description[hu]": "Megosztás NeoChatben", "Description[hu]": "Megosztás NeoChatben",
@@ -42,6 +44,7 @@
"Name": "NeoChat", "Name": "NeoChat",
"Name[ca@valencia]": "NeoChat", "Name[ca@valencia]": "NeoChat",
"Name[ca]": "NeoChat", "Name[ca]": "NeoChat",
"Name[de]": "NeoChat",
"Name[es]": "NeoChat", "Name[es]": "NeoChat",
"Name[fr]": "NeoChat", "Name[fr]": "NeoChat",
"Name[hu]": "NeoChat", "Name[hu]": "NeoChat",