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-24 05:54:34 +01:00
parent 9b916edfdc
commit 05548bc8a9
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
neochat.notifyrc
View File

@@ -9,6 +9,7 @@ Name[ia]=Neochat
Name[nl]=NeoChat Name[nl]=NeoChat
Name[nn]=NeoChat Name[nn]=NeoChat
Name[pt]=NeoChat Name[pt]=NeoChat
Name[pt_BR]=NeoChat
Name[sl]=NeoChat Name[sl]=NeoChat
Name[sv]=NeoChat Name[sv]=NeoChat
Name[uk]=NeoChat Name[uk]=NeoChat

1
org.kde.neochat.desktop
View File

@@ -8,6 +8,7 @@ Name[ia]=Neochat
Name[nl]=NeoChat Name[nl]=NeoChat
Name[nn]=NeoChat Name[nn]=NeoChat
Name[pt]=NeoChat Name[pt]=NeoChat
Name[pt_BR]=NeoChat
Name[sl]=NeoChat Name[sl]=NeoChat
Name[sv]=NeoChat Name[sv]=NeoChat
Name[uk]=NeoChat Name[uk]=NeoChat