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-16 01:23:20 +00:00
parent d5cd175d71
commit 9961483f5c
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neochat.notifyrc
View File

@@ -13,6 +13,7 @@ Name[fr]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
Name[it]=NeoChat Name[it]=NeoChat
Name[ko]=NeoChat Name[ko]=NeoChat
Name[lt]=NeoChat
Name[nl]=NeoChat Name[nl]=NeoChat
Name[nn]=NeoChat Name[nn]=NeoChat
Name[pa]=ਨਿਓ-ਚੈਟ Name[pa]=ਨਿਓ-ਚੈਟ
@@ -41,6 +42,7 @@ Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
Comment[ia]=Un cliente per Matrix, le protocollo de communication decentralisate Comment[ia]=Un cliente per Matrix, le protocollo de communication decentralisate
Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato
Comment[ko]=Matrix, 분산 대화 프로토콜 클라이언트 Comment[ko]=Matrix, 분산 대화 프로토콜 클라이언트
Comment[lt]=Matrix decentralizuoto bendravimo protokolo kliento programa
Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen. Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
Comment[pa]=ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ Comment[pa]=ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ
@@ -72,6 +74,7 @@ Name[hu]=Új üzenet
Name[ia]=Nove message Name[ia]=Nove message
Name[it]=Nuovo messaggio Name[it]=Nuovo messaggio
Name[ko]=새 메시지 Name[ko]=새 메시지
Name[lt]=Nauja žinutė
Name[nl]=Nieuw bericht Name[nl]=Nieuw bericht
Name[nn]=Ny melding Name[nn]=Ny melding
Name[pa]=ਨਵਾਂ ਸੁਨੇਹਾ Name[pa]=ਨਵਾਂ ਸੁਨੇਹਾ
@@ -100,6 +103,7 @@ Comment[hu]=Új üzenet érkezett
Comment[ia]=Il ha un nove message Comment[ia]=Il ha un nove message
Comment[it]=È presente un nuovo messaggio Comment[it]=È presente un nuovo messaggio
Comment[ko]=새 메시지가 있음 Comment[ko]=새 메시지가 있음
Comment[lt]=Yra nauja žinutė
Comment[nl]=Er is een nieuw bericht Comment[nl]=Er is een nieuw bericht
Comment[nn]=Du har ei ny melding Comment[nn]=Du har ei ny melding
Comment[pa]=ਨਵਾਂ ਸੁਨੇਹਾ ਹੈ Comment[pa]=ਨਵਾਂ ਸੁਨੇਹਾ ਹੈ

3
org.kde.neochat.desktop
View File

@@ -14,6 +14,7 @@ Name[fr]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
Name[it]=NeoChat Name[it]=NeoChat
Name[ko]=NeoChat Name[ko]=NeoChat
Name[lt]=NeoChat
Name[nl]=NeoChat Name[nl]=NeoChat
Name[nn]=NeoChat Name[nn]=NeoChat
Name[pa]=ਨਿਓ-ਚੈਟ Name[pa]=ਨਿਓ-ਚੈਟ
@@ -42,6 +43,7 @@ GenericName[hu]=Matrix kliens
GenericName[ia]=Cliente de Matrice GenericName[ia]=Cliente de Matrice
GenericName[it]=Client Matrix GenericName[it]=Client Matrix
GenericName[ko]=Matrix 클라이언트 GenericName[ko]=Matrix 클라이언트
GenericName[lt]=Matrix kliento programą
GenericName[nl]=Matrix-client GenericName[nl]=Matrix-client
GenericName[nn]=Matrix-klient GenericName[nn]=Matrix-klient
GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
@@ -70,6 +72,7 @@ Comment[hu]=Kliens a Matrix protokollhoz
Comment[ia]=Cliente per le protocollo de Matrix Comment[ia]=Cliente per le protocollo de Matrix
Comment[it]=Client per il protocollo Matrix Comment[it]=Client per il protocollo Matrix
Comment[ko]=Matrix 프로토콜용 클라이언트 Comment[ko]=Matrix 프로토콜용 클라이언트
Comment[lt]=Matrix protokolo kliento programa
Comment[nl]=Client voor het Matrix-protocol Comment[nl]=Client voor het Matrix-protocol
Comment[nn]=Lynmeldings­klient for Matrix-protokollen Comment[nn]=Lynmeldings­klient for Matrix-protokollen
Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ