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-06-03 02:27:05 +00:00
parent 15137cd704
commit 03ec17366e
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

@@ -14,6 +14,7 @@ Name[nl]=NeoChat
Name[nn]=NeoChat Name[nn]=NeoChat
Name[pa]=ਨਿਓ-ਚੈਟ Name[pa]=ਨਿਓ-ਚੈਟ
Name[pl]=NeoChat Name[pl]=NeoChat
Name[pt_BR]=NeoChat
Name[sv]=NeoChat Name[sv]=NeoChat
Name[ta]=நியோச்சாட் Name[ta]=நியோச்சாட்
Name[uk]=NeoChat Name[uk]=NeoChat

1
org.kde.neochat.desktop
View File

@@ -13,6 +13,7 @@ Name[nl]=NeoChat
Name[nn]=NeoChat Name[nn]=NeoChat
Name[pa]=ਨਿਓ-ਚੈਟ Name[pa]=ਨਿਓ-ਚੈਟ
Name[pl]=NeoChat Name[pl]=NeoChat
Name[pt_BR]=NeoChat
Name[sv]=NeoChat Name[sv]=NeoChat
Name[ta]=நியோச்சாட் Name[ta]=நியோச்சாட்
Name[uk]=NeoChat Name[uk]=NeoChat