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-24 02:13:42 +00:00
parent abd03299ec
commit 98672cf870
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
neochat.notifyrc
View File

@@ -1,6 +1,15 @@
[Global] [Global]
IconName=org.kde.neochat IconName=org.kde.neochat
Name=NeoChat Name=NeoChat
Name[ca]=NeoChat
Name[ca@valencia]=NeoChat
Name[es]=NeoChat
Name[fi]=NeoChat
Name[nl]=NeoChat
Name[pl]=NeoChat
Name[sv]=NeoChat
Name[uk]=NeoChat
Name[x-test]=xxNeoChatxx
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[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat

9
org.kde.neochat.desktop
View File

@@ -1,5 +1,14 @@
[Desktop Entry] [Desktop Entry]
Name=NeoChat Name=NeoChat
Name[ca]=NeoChat
Name[ca@valencia]=NeoChat
Name[es]=NeoChat
Name[fi]=NeoChat
Name[nl]=NeoChat
Name[pl]=NeoChat
Name[sv]=NeoChat
Name[uk]=NeoChat
Name[x-test]=xxNeoChatxx
GenericName=Matrix Client GenericName=Matrix Client
GenericName[ca]=Client del Matrix GenericName[ca]=Client del Matrix
GenericName[ca@valencia]=Client del Matrix GenericName[ca@valencia]=Client del Matrix