From 4b5b1cad5596758ee2f184eaba933e5f40eee947 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 29 Jan 2018 06:50:13 +0100 Subject: [PATCH] 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" --- .../csv/kaddressbook_importexportcsvplugin.json | 2 +- .../gmx/kaddressbook_importexportgmxplugin.json | 2 +- .../ldap/kaddressbook_importexportldapplugin.json | 2 +- .../ldif/kaddressbook_importexportldifplugin.json | 2 +- .../vcards/kaddressbook_importexportvcardplugin.json | 2 +- .../translatorplugin/pimcommon_translatorplugin.json | 2 +- .../messageviewer_longheaderstyleplugin.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kaddressbook/importexportplugins/csv/kaddressbook_importexportcsvplugin.json b/kaddressbook/importexportplugins/csv/kaddressbook_importexportcsvplugin.json index aaf991e0..043b96a4 100644 --- a/kaddressbook/importexportplugins/csv/kaddressbook_importexportcsvplugin.json +++ b/kaddressbook/importexportplugins/csv/kaddressbook_importexportcsvplugin.json @@ -12,7 +12,7 @@ "Description[it]": "Questa estensione permette di importare ed esportare CSV.", "Description[ko]": "이 플러그인은 CSV 파일에서 가져오거나 내보냅니다.", "Description[nl]": "Deze plug-in stelt u in staat CSV te importeren/exporteren.", - "Description[pl]": "Ta wtyczka umożliwia ci importowanie/eksportowanie CSV.", + "Description[pl]": "Ta wtyczka umożliwia importowanie/eksportowanie CSV.", "Description[pt]": "Este 'plugin' permite-lhe importar/exportar dados em CSV.", "Description[ru]": "Этот модуль позволяет импортировать и экспортировать из/в CSV.", "Description[sk]": "Tento plugin vám umožní importovať a exportovať CSV.", diff --git a/kaddressbook/importexportplugins/gmx/kaddressbook_importexportgmxplugin.json b/kaddressbook/importexportplugins/gmx/kaddressbook_importexportgmxplugin.json index d7d18dc6..491a07ce 100644 --- a/kaddressbook/importexportplugins/gmx/kaddressbook_importexportgmxplugin.json +++ b/kaddressbook/importexportplugins/gmx/kaddressbook_importexportgmxplugin.json @@ -12,7 +12,7 @@ "Description[it]": "Questa estensione permette di importare ed esportare GMX.", "Description[ko]": "이 플러그인은 GMX에서 가져오거나 내보냅니다.", "Description[nl]": "Deze plug-in stelt u in staat GMX te importeren/exporteren.", - "Description[pl]": "Ta wtyczka umożliwia ci importowanie/eksportowanie GMX.", + "Description[pl]": "Ta wtyczka umożliwia importowanie/eksportowanie GMX.", "Description[pt]": "Este 'plugin' permite-lhe importar/exportar dados em GMX.", "Description[ru]": "Этот модуль позволяет импортировать и экспортировать из/в GMX.", "Description[sk]": "Tento plugin vám umožní importovať a exportovať GMX.", diff --git a/kaddressbook/importexportplugins/ldap/kaddressbook_importexportldapplugin.json b/kaddressbook/importexportplugins/ldap/kaddressbook_importexportldapplugin.json index 1a78bf0b..e1cba9c2 100644 --- a/kaddressbook/importexportplugins/ldap/kaddressbook_importexportldapplugin.json +++ b/kaddressbook/importexportplugins/ldap/kaddressbook_importexportldapplugin.json @@ -12,7 +12,7 @@ "Description[it]": "Questa estensione permette di importare ed esportare contatti LDAP.", "Description[ko]": "이 플러그인은 LDAP 연락처를 가져오거나 내보냅니다.", "Description[nl]": "Deze plug-in stelt u in staat LDAP contactpersonen te importeren/exporteren.", - "Description[pl]": "Ta wtyczka umożliwia ci importowanie/eksportowanie kontaktów LDAP.", + "Description[pl]": "Ta wtyczka umożliwia importowanie/eksportowanie kontaktów LDAP.", "Description[pt]": "Este 'plugin' permite-lhe importar/exportar contactos da LDAP.", "Description[ru]": "Этот модуль позволяет импортировать и экспортировать контакты из/в LDAP.", "Description[sk]": "Tento plugin vám umožní importovať a exportovať LDAP kontakty.", diff --git a/kaddressbook/importexportplugins/ldif/kaddressbook_importexportldifplugin.json b/kaddressbook/importexportplugins/ldif/kaddressbook_importexportldifplugin.json index d44866c9..e1ac2b8f 100644 --- a/kaddressbook/importexportplugins/ldif/kaddressbook_importexportldifplugin.json +++ b/kaddressbook/importexportplugins/ldif/kaddressbook_importexportldifplugin.json @@ -12,7 +12,7 @@ "Description[it]": "Questa estensione permette di importare ed esportare LDIF.", "Description[ko]": "이 플러그인은 LDIF에서 가져오거나 내보냅니다.", "Description[nl]": "Deze plug-in stelt u in staat LDIF te importeren/exporteren.", - "Description[pl]": "Ta wtyczka umożliwia ci importowanie/eksportowanie LDIF.", + "Description[pl]": "Ta wtyczka umożliwia importowanie/eksportowanie LDIF.", "Description[pt]": "Este 'plugin' permite-lhe importar/exportar dados em LDIF.", "Description[ru]": "Этот модуль позволяет импортировать и экспортировать из/в LDIF.", "Description[sk]": "Tento plugin vám umožní importovať a exportovať LDIF.", diff --git a/kaddressbook/importexportplugins/vcards/kaddressbook_importexportvcardplugin.json b/kaddressbook/importexportplugins/vcards/kaddressbook_importexportvcardplugin.json index f9bcd4ba..fc89deee 100644 --- a/kaddressbook/importexportplugins/vcards/kaddressbook_importexportvcardplugin.json +++ b/kaddressbook/importexportplugins/vcards/kaddressbook_importexportvcardplugin.json @@ -12,7 +12,7 @@ "Description[it]": "Questa estensione permette di importare ed esportare vCard.", "Description[ko]": "이 플러그인은 vCard를 가져오거나 내보냅니다.", "Description[nl]": "Deze plug-in stelt u in staat vCards te importeren/exporteren.", - "Description[pl]": "Ta wtyczka umożliwia ci importowanie/eksportowanie wizytówek.", + "Description[pl]": "Ta wtyczka umożliwia importowanie/eksportowanie wizytówek.", "Description[pt]": "Este 'plugin' permite-lhe importar/exportar dados em vCard.", "Description[ru]": "Этот модуль позволяет импортировать и экспортировать контакты в формат vCard.", "Description[sk]": "Tento plugin vám umožní importovať a exportovať vCard.", diff --git a/plugins/customtoolsplugins/translatorplugin/pimcommon_translatorplugin.json b/plugins/customtoolsplugins/translatorplugin/pimcommon_translatorplugin.json index b32a8025..9effb877 100644 --- a/plugins/customtoolsplugins/translatorplugin/pimcommon_translatorplugin.json +++ b/plugins/customtoolsplugins/translatorplugin/pimcommon_translatorplugin.json @@ -11,7 +11,7 @@ "Description[it]": "Questa estensione permette di tradurre del testo.", "Description[ko]": "이 플러그인은 텍스트를 번역합니다.", "Description[nl]": "Deze plug-in stelt u in staat tekst te vertalen.", - "Description[pl]": "Ta wtyczka umożliwia ci tłumaczenie tekstu.", + "Description[pl]": "Ta wtyczka umożliwia tłumaczenie tekstu.", "Description[pt]": "Este 'plugin' permite-lhe traduzir o texto.", "Description[ru]": "Этот модуль позволяет переводить текста на другой язык.", "Description[sk]": "Tento plugin vám umožní preložiť text.", diff --git a/plugins/messageviewerheaderplugins/longheaderstyleplugin/messageviewer_longheaderstyleplugin.json b/plugins/messageviewerheaderplugins/longheaderstyleplugin/messageviewer_longheaderstyleplugin.json index e6bc4040..ed703df3 100644 --- a/plugins/messageviewerheaderplugins/longheaderstyleplugin/messageviewer_longheaderstyleplugin.json +++ b/plugins/messageviewerheaderplugins/longheaderstyleplugin/messageviewer_longheaderstyleplugin.json @@ -11,7 +11,7 @@ "Description[it]": "Questa estensione permette di mostrare tutte le intestazioni dei messaggi di posta.", "Description[ko]": "이 플러그인은 메일의 모든 헤더를 표시합니다.", "Description[nl]": "Deze plug-in stelt u in staat de gehele header van het e-mailbericht te tonen.", - "Description[pl]": "Ta wtyczka umożliwia ci pokazanie wszystkich nagłówków pocztowych.", + "Description[pl]": "Ta wtyczka umożliwia pokazanie wszystkich nagłówków pocztowych.", "Description[pt]": "Este 'plugin' permite-lhe ver todos os cabeçalhos a partir do e-mail.", "Description[ru]": "Этот модуль определяет подробный стиль заголовков.", "Description[sk]": "Tento plugin vám umožní zobraziť všetky hlavičky z mailu.", -- GitLab