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

4
neochat.notifyrc
View File

@@ -19,6 +19,7 @@ Name[nn]=Neochat
Name[pl]=Neochat Name[pl]=Neochat
Name[pt]=Neochat Name[pt]=Neochat
Name[pt_BR]=Neochat Name[pt_BR]=Neochat
Name[ro]=Neochat
Name[sk]=Neochat Name[sk]=Neochat
Name[sl]=Neochat Name[sl]=Neochat
Name[sv]=Neochat Name[sv]=Neochat
@@ -41,6 +42,7 @@ 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[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się Comment[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się
Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
Comment[ro]=Client pentru Matrix, protocolul de comunicare descentralizată
Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix
Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
@@ -67,6 +69,7 @@ Name[nn]=Ny melding
Name[pl]=Nowa wiadomość Name[pl]=Nowa wiadomość
Name[pt]=Nova mensagem Name[pt]=Nova mensagem
Name[pt_BR]=Nova mensagem Name[pt_BR]=Nova mensagem
Name[ro]=Mesaj nou
Name[sk]=Nová správa Name[sk]=Nová správa
Name[sl]=Novo sporočilo Name[sl]=Novo sporočilo
Name[sv]=Nytt meddelande Name[sv]=Nytt meddelande
@@ -90,6 +93,7 @@ Comment[nn]=Du har ei ny melding
Comment[pl]=Dostępna jest nowa wiadomość Comment[pl]=Dostępna jest nowa wiadomość
Comment[pt]=Tem uma mensagem nova Comment[pt]=Tem uma mensagem nova
Comment[pt_BR]=Existe uma nova mensagem Comment[pt_BR]=Existe uma nova mensagem
Comment[ro]=Este un mesaj nou
Comment[sk]=Je nová správa Comment[sk]=Je nová správa
Comment[sl]=Prišlo je novo sporočilo Comment[sl]=Prišlo je novo sporočilo
Comment[sv]=Det finns ett nytt meddelande Comment[sv]=Det finns ett nytt meddelande

3
org.kde.neochat.desktop
View File

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