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-05-25 02:21:15 +00:00
parent fc791d41fa
commit c5a3fc0431
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
neochat.notifyrc
View File

@@ -5,7 +5,10 @@ Name[ca]=NeoChat
Name[ca@valencia]=NeoChat
Name[es]=NeoChat
Name[fi]=NeoChat
Name[ia]=Neochat
Name[ko]=NeoChat
Name[nl]=NeoChat
Name[nn]=NeoChat
Name[pl]=NeoChat
Name[sv]=NeoChat
Name[uk]=NeoChat

3
org.kde.neochat.desktop
View File

@@ -4,7 +4,10 @@ Name[ca]=NeoChat
Name[ca@valencia]=NeoChat
Name[es]=NeoChat
Name[fi]=NeoChat
Name[ia]=Neochat
Name[ko]=NeoChat
Name[nl]=NeoChat
Name[nn]=NeoChat
Name[pl]=NeoChat
Name[sv]=NeoChat
Name[uk]=NeoChat