Commit a31924c2 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 7565f524
Pipeline #40432 skipped
...@@ -16,6 +16,7 @@ Name[ia]=Fornitores de posta ...@@ -16,6 +16,7 @@ Name[ia]=Fornitores de posta
Name[it]=Fornitori di posta elettronica Name[it]=Fornitori di posta elettronica
Name[ko]=이메일 공급자 Name[ko]=이메일 공급자
Name[nl]=E-mailleveranciers Name[nl]=E-mailleveranciers
Name[nn]=Epost-leverandørar
Name[pl]=Dostawcy poczty Name[pl]=Dostawcy poczty
Name[pt]=Fornecedores de E-Mail Name[pt]=Fornecedores de E-Mail
Name[pt_BR]=Fornecedores de e-mail Name[pt_BR]=Fornecedores de e-mail
......
...@@ -18,6 +18,7 @@ Name[it]=Procedura guidata per la creazione di account ...@@ -18,6 +18,7 @@ Name[it]=Procedura guidata per la creazione di account
Name[ko]=계정 마법사 Name[ko]=계정 마법사
Name[nb]=Konto-veiviser Name[nb]=Konto-veiviser
Name[nl]=Accountassistent Name[nl]=Accountassistent
Name[nn]=Kontovegvisar
Name[pl]=Pomocnik konta Name[pl]=Pomocnik konta
Name[pt]=Assistente de Contas Name[pt]=Assistente de Contas
Name[pt_BR]=Assistente de Contas Name[pt_BR]=Assistente de Contas
...@@ -58,6 +59,7 @@ Comment[ko]=PIM 계정을 설정하는 계정 마법사를 실행합니다. ...@@ -58,6 +59,7 @@ Comment[ko]=PIM 계정을 설정하는 계정 마법사를 실행합니다.
Comment[nb]=Start kontoveiviseren for å sette opp PIM-kontoer. Comment[nb]=Start kontoveiviseren for å sette opp PIM-kontoer.
Comment[nds]=Konto-Hölper för't Inrichten vun PIM-Kontos starten Comment[nds]=Konto-Hölper för't Inrichten vun PIM-Kontos starten
Comment[nl]=Start de accountassistent om PIM-accounts in te stellen. Comment[nl]=Start de accountassistent om PIM-accounts in te stellen.
Comment[nn]=Start vegvisar for oppsett av PIM-kontoar.
Comment[pl]=Wywołaj pomocnika konta, aby ustawić konta ZIO. Comment[pl]=Wywołaj pomocnika konta, aby ustawić konta ZIO.
Comment[pt]=Invocar o assistente de contas para configurar as contas de PIM. Comment[pt]=Invocar o assistente de contas para configurar as contas de PIM.
Comment[pt_BR]=Executa o assistente para configuração das contas PIM. Comment[pt_BR]=Executa o assistente para configuração das contas PIM.
......
...@@ -18,6 +18,7 @@ Name[it]=Server di groupware Tine 2.0 ...@@ -18,6 +18,7 @@ Name[it]=Server di groupware Tine 2.0
Name[ko]=Tine 2.0 그룹웨어 서버 Name[ko]=Tine 2.0 그룹웨어 서버
Name[nb]=Tine 2.0 gruppevare-tjener Name[nb]=Tine 2.0 gruppevare-tjener
Name[nl]=Tine 2.0 groupwareserver Name[nl]=Tine 2.0 groupwareserver
Name[nn]=Tine 2.0-gruppevare-tenar
Name[pl]=Serwer Groupware Tine 2.0 Name[pl]=Serwer Groupware Tine 2.0
Name[pt]=Servidor de 'Groupware' Tine 2.0 Name[pt]=Servidor de 'Groupware' Tine 2.0
Name[pt_BR]=Servidor Groupware Tine 2.0 Name[pt_BR]=Servidor Groupware Tine 2.0
...@@ -54,6 +55,7 @@ Comment[it]=Server di groupware Tine 2.0 ...@@ -54,6 +55,7 @@ Comment[it]=Server di groupware Tine 2.0
Comment[ko]=Tine 2.0 그룹웨어 서버 Comment[ko]=Tine 2.0 그룹웨어 서버
Comment[nb]=Tine 2.0 gruppevare-tjener Comment[nb]=Tine 2.0 gruppevare-tjener
Comment[nl]=Tine 2.0 groupwareserver Comment[nl]=Tine 2.0 groupwareserver
Comment[nn]=Tine 2.0-gruppevare-tenar
Comment[pl]=Serwer Groupware Tine 2.0 Comment[pl]=Serwer Groupware Tine 2.0
Comment[pt]=Servidor de 'Groupware' Tine 2.0 Comment[pt]=Servidor de 'Groupware' Tine 2.0
Comment[pt_BR]=Servidor Groupware Tine 2.0 Comment[pt_BR]=Servidor Groupware Tine 2.0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment