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-16 02:25:27 +00:00
parent 60e9587aa7
commit 4b0cefe7ff
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org.kde.neochat.desktop
View File

@@ -18,6 +18,7 @@ Name[nn]=Neochat
Name[pl]=Neochat
Name[pt]=Neochat
Name[pt_BR]=Neochat
Name[ro]=Neochat
Name[sk]=Neochat
Name[sl]=Neochat
Name[sv]=Neochat
@@ -42,6 +43,7 @@ GenericName[nn]=Matrix-klient
GenericName[pl]=Program Matriksa
GenericName[pt]=Cliente de Matrix
GenericName[pt_BR]=Cliente Matrix
GenericName[ro]=Client Matrix
GenericName[sk]=Matrix Client
GenericName[sl]=Odjemalec Matrix
GenericName[sv]=Matrix-klient
@@ -65,6 +67,7 @@ Comment[nn]=Lynmeldings­klient for Matrix-protokollen
Comment[pl]=Program obsługi protokołu Matriksa
Comment[pt]=Cliente para o protocolo Matrix
Comment[pt_BR]=Cliente para o protocolo Matrix
Comment[ro]=Client pentru protocolul Matrix
Comment[sk]=Klient protokolu Matrix
Comment[sl]=Odjemalec za protokol Matrix
Comment[sv]=Klient för protokollet Matrix