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-07-20 02:18:30 +00:00
parent 9338567137
commit 1f7b1ad29f
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

@@ -24,6 +24,7 @@ Name[sv]=NeoChat
Name[ta]=நியோச்சாட் Name[ta]=நியோச்சாட்
Name[uk]=NeoChat Name[uk]=NeoChat
Name[x-test]=xxNeoChatxx Name[x-test]=xxNeoChatxx
Name[zh_CN]=NeoChat
DesktopEntry=org.kde.neochat DesktopEntry=org.kde.neochat
Comment=A client for matrix, the decentralized communication protocol Comment=A client for matrix, the decentralized communication protocol
Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu

1
org.kde.neochat.desktop
View File

@@ -23,6 +23,7 @@ Name[sv]=NeoChat
Name[ta]=நியோச்சாட் Name[ta]=நியோச்சாட்
Name[uk]=NeoChat Name[uk]=NeoChat
Name[x-test]=xxNeoChatxx Name[x-test]=xxNeoChatxx
Name[zh_CN]=NeoChat
GenericName=Matrix Client GenericName=Matrix Client
GenericName[az]=Matrix Müştərisi GenericName[az]=Matrix Müştərisi
GenericName[ca]=Client del Matrix GenericName[ca]=Client del Matrix