SVN_SILENT made messages (.desktop file) - always resolve ours

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"
master
l10n daemon script 2021-05-10 01:18:36 +00:00
parent 8c9ab295f3
commit 13b648cf81
3 changed files with 9 additions and 0 deletions

View File

@ -19,6 +19,7 @@ Name[ko]=Kaidan
Name[nl]=Kaidan
Name[nn]=Kaidan
Name[pa]=ਕਾਇਦਾਂ
Name[pl]=Kaidan
Name[pt]=Kaidan
Name[pt_BR]=Kaidan
Name[ro]=Kaidan
@ -45,6 +46,7 @@ GenericName[ko]=Jabber IM 클라이언트
GenericName[nl]=Jabber IM-client
GenericName[nn]=Jabber-basert lynmeldingsklient
GenericName[pa]=ਜੱਬਰ IM ਕਲਾਂਇਟ
GenericName[pl]=Program do rozmów w Jabberze
GenericName[pt]=Cliente de MI em Jabber
GenericName[pt_BR]=Cliente Jabber
GenericName[ru]=Клиент Jabber
@ -69,6 +71,7 @@ Comment[ko]=QtQuick Jabber 클라이언트
Comment[nl]=Een QtQuick Jabber-client
Comment[nn]=Jabber-klient laga med QtQuick
Comment[pa]=QtQuick ਜੱਬਰ ਕਲਾਂਇਟ
Comment[pl]=Program do Jabbera w QtQuick
Comment[pt]=Um cliente de Jabber em QtQuick
Comment[pt_BR]=Um cliente Jabber em QtQuick
Comment[ru]=Клиент Jabber, основанный на QtQuick
@ -92,6 +95,7 @@ Keywords[ko]=chat;messaging;im;jabber;xmpp;qt;network;채팅;메시지;메시징
Keywords[nl]=chat;messaging;im;jabber;xmpp;qt;netwerk;
Keywords[nn]=nettprat;lynmeldingar;chat;meldingar;im;jabber;xmpp;qt;nettverk;
Keywords[pa]=ਗੱਲਬਾਤ;ਚੈਟ;ਚੈੱਟ;ਜੱਬਰ;ਜਬਰ;ਨੈੱਟਵਰਕ;ਸੁਨੇਹੇ;
Keywords[pl]=rozmowa;wiadomości;komunikator internetowy;jabber;xmpp;qt;sieć;
Keywords[pt]=conversação;mensagens;mi;jabber;xmpp;qt;rede;
Keywords[pt_BR]=bate-papo;chat;mensagem;mi;im;jabber;xmpp;qt;rede;
Keywords[ru]=chat;messaging;im;jabber;xmpp;qt;network;чат;сообщения;сеть;

View File

@ -17,6 +17,7 @@ Comment[ko]=모든 장치에서 사용할 수 있는 XMPP 클라이언트
Comment[nl]=Een gebruikersvriendelijke XMPP-client voor elk apparaat
Comment[nn]=Ein brukarvennleg XMPP-klient for alle typar eining
Comment[pa]=ਹਰ ਡਿਵਾਈਸ ਲਈ ਵਰਤੋਂਕਾਰਾਂ ਲਈ ਸੌਖਾ XMPP ਕਲਾਂਇਟ ਹੈ
Comment[pl]=Przyjazny użytkownikowi program do XMPP na każde urządzenie
Comment[pt]=Um cliente de XMPP amigável para todos os dispositivos
Comment[pt_BR]=Um cliente XMPP amigável para todos os dispositivos
Comment[ru]=Дружественный клиент XMPP для всех устройств
@ -42,6 +43,7 @@ Name[ko]=Kaidan
Name[nl]=Kaidan
Name[nn]=Kaidan
Name[pa]=ਕਾਇਦਾਂ
Name[pl]=Kaidan
Name[pt]=Kaidan
Name[pt_BR]=Kaidan
Name[ro]=Kaidan
@ -71,6 +73,7 @@ Name[ko]=새 메시지
Name[nl]=Nieuw bericht
Name[nn]=Ny melding
Name[pa]=ਨਵਾਂ ਸੁਨੇਹਾ
Name[pl]=Nowa wiadomość
Name[pt]=Nova mensagem
Name[pt_BR]=Nova mensagem
Name[ro]=Mesaj nou
@ -97,6 +100,7 @@ Comment[ko]=새 메시지를 받음
Comment[nl]=U hebt een nieuw bericht ontvangen
Comment[nn]=Du har fått ei ny melding
Comment[pa]=ਤੁਹਾਡੇ ਲਈ ਨਵਾਂ ਸੁਨੇਹਾ ਆਇਆ ਹੈ
Comment[pl]=Nadeszła nowa wiadomość
Comment[pt]=Recebeu uma mensagem nova
Comment[pt_BR]=Você recebeu uma nova mensagem
Comment[ro]=Ați primit un mesaj nou

View File

@ -18,6 +18,7 @@ Name[ko]=Kaidan
Name[nl]=Kaidan
Name[nn]=Kaidan
Name[pa]=ਕਾਇਦਾਂ
Name[pl]=Kaidan
Name[pt]=Kaidan
Name[pt_BR]=Kaidan
Name[ro]=Kaidan