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
2021-03-22 05:28:00 +01:00
parent 1d06feee11
commit 1bc2719665
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neochat.notifyrc
View File

@@ -4,6 +4,10 @@ Name=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
Name[nl]=NeoChat
Name[nn]=NeoChat
Name[pt]=NeoChat
Name[sl]=NeoChat
Name[sv]=NeoChat Name[sv]=NeoChat
Name[uk]=NeoChat Name[uk]=NeoChat
Name[x-test]=xxNeoChatxx Name[x-test]=xxNeoChatxx

4
org.kde.neochat.desktop
View File

@@ -3,6 +3,10 @@ Name=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
Name[nl]=NeoChat
Name[nn]=NeoChat
Name[pt]=NeoChat
Name[sl]=NeoChat
Name[sv]=NeoChat Name[sv]=NeoChat
Name[uk]=NeoChat Name[uk]=NeoChat
Name[x-test]=xxNeoChatxx Name[x-test]=xxNeoChatxx