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-27 06:02:53 +01:00
parent 8c492cc23e
commit d631731fcf
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
neochat.notifyrc
View File

@@ -4,6 +4,7 @@ Name=NeoChat
Name[az]=NeoChat Name[az]=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[ca@valencia]=NeoChat Name[ca@valencia]=NeoChat
Name[cs]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat

2
org.kde.neochat.desktop
View File

@@ -3,6 +3,7 @@ Name=NeoChat
Name[az]=NeoChat Name[az]=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[ca@valencia]=NeoChat Name[ca@valencia]=NeoChat
Name[cs]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
@@ -18,6 +19,7 @@ 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
GenericName[ca@valencia]=Client del Matrix GenericName[ca@valencia]=Client del Matrix
GenericName[cs]=Klient protokolu Matrix
GenericName[de]=Matrix-Programm GenericName[de]=Matrix-Programm
GenericName[en_GB]=Matrix Client GenericName[en_GB]=Matrix Client
GenericName[es]=Cliente para Matrix GenericName[es]=Cliente para Matrix