From c58c84b5041ef758ba5a5f0d3a5f9ef09e157499 Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Mon, 9 Nov 2015 10:38:54 +0000 Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1) 116374 jphuynh: ACE-4547: Removed the built-in messages translation. It breaks the whole localisation logic. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/bitrock/lang/alf-de.po | 5 ----- src/main/resources/bitrock/lang/alf-en.po | 5 ----- src/main/resources/bitrock/lang/alf-es.po | 5 ----- src/main/resources/bitrock/lang/alf-fr.po | 5 ----- src/main/resources/bitrock/lang/alf-it.po | 5 ----- src/main/resources/bitrock/lang/alf-nb_NO.po | 5 ----- src/main/resources/bitrock/lang/alf-nl.po | 5 ----- src/main/resources/bitrock/lang/alf-pt_BR.po | 5 ----- src/main/resources/bitrock/lang/alf-ru.po | 5 ----- src/main/resources/bitrock/lang/alf-zh_CN.po | 5 ----- 10 files changed, 50 deletions(-) diff --git a/src/main/resources/bitrock/lang/alf-de.po b/src/main/resources/bitrock/lang/alf-de.po index c86c5db11f..74771d7b06 100755 --- a/src/main/resources/bitrock/lang/alf-de.po +++ b/src/main/resources/bitrock/lang/alf-de.po @@ -666,8 +666,3 @@ msgstr "Port kann nicht an die angegebene Portnummer gebunden werden." msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port." msgstr "Port kann nicht an die angegebene Portnummer gebunden werden. Dieser Port wird bereits vom ${process_binding_port}-Prozess verwendet. Bitte wählen Sie einen anderen ${serverName}-Serverport." - -# Built-in messages -Installer.Installation.Question.Abort=Möchten Sie die Installation abbrechen? -Installer.LanguageSelection.Title=Sprachauswahl -Installer.LanguageSelection.Select=Wählen Sie die Installationssprache aus diff --git a/src/main/resources/bitrock/lang/alf-en.po b/src/main/resources/bitrock/lang/alf-en.po index c2d9d81f52..a607bb8b68 100755 --- a/src/main/resources/bitrock/lang/alf-en.po +++ b/src/main/resources/bitrock/lang/alf-en.po @@ -666,8 +666,3 @@ msgstr "Unable to bind to the given port number." msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port." msgstr "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port." - -# Built-in messages -Installer.Installation.Question.Abort=Do you want to cancel the installation? -Installer.LanguageSelection.Title=Language Selection -Installer.LanguageSelection.Select=Select the installation language diff --git a/src/main/resources/bitrock/lang/alf-es.po b/src/main/resources/bitrock/lang/alf-es.po index ee954da187..04d3c8d50b 100755 --- a/src/main/resources/bitrock/lang/alf-es.po +++ b/src/main/resources/bitrock/lang/alf-es.po @@ -666,8 +666,3 @@ msgstr "No se puede unir con el número de puerto dado." msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port." msgstr "No se puede unir con el número de puerto dado. Este puerto ya lo está utilizando el proceso ${process_binding_port}. Seleccione otro puerto de servidor ${serverName}." - -# Built-in messages -Installer.Installation.Question.Abort=¿Desea cancelar la instalación? -Installer.LanguageSelection.Title=Selección de idioma -Installer.LanguageSelection.Select=Seleccione el idioma de la instalación diff --git a/src/main/resources/bitrock/lang/alf-fr.po b/src/main/resources/bitrock/lang/alf-fr.po index b6339a1360..c2da701a10 100755 --- a/src/main/resources/bitrock/lang/alf-fr.po +++ b/src/main/resources/bitrock/lang/alf-fr.po @@ -666,8 +666,3 @@ msgstr "Liaison au numéro de port indiqué impossible." msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port." msgstr "Liaison au numéro de port indiqué impossible. Ce port est déjà utilisé par le processus ${process_binding_port}. Sélectionnez un autre port de serveur ${serverName}." - -# Built-in messages -Installer.Installation.Question.Abort=Voulez-vous annuler l'installation ? -Installer.LanguageSelection.Title=Sélection de la langue -Installer.LanguageSelection.Select=Sélectionnez la langue pour l'installation diff --git a/src/main/resources/bitrock/lang/alf-it.po b/src/main/resources/bitrock/lang/alf-it.po index d77a493b9b..2b6ab5ac36 100755 --- a/src/main/resources/bitrock/lang/alf-it.po +++ b/src/main/resources/bitrock/lang/alf-it.po @@ -666,8 +666,3 @@ msgstr "Impossibile stabilire un'associazione al numero di porta specificato." msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port." msgstr "Impossibile stabilire un'associazione al numero di porta specificato. Questa porta è già utilizzata dal processo ${process_binding_port}. Selezionare un'altra porta del server ${serverName}." - -# Built-in messages -Installer.Installation.Question.Abort=Annullare l'installazione? -Installer.LanguageSelection.Title=Selezione lingua -Installer.LanguageSelection.Select=Selezionare la lingua di installazione diff --git a/src/main/resources/bitrock/lang/alf-nb_NO.po b/src/main/resources/bitrock/lang/alf-nb_NO.po index 38ea4396da..868ffa7d86 100644 --- a/src/main/resources/bitrock/lang/alf-nb_NO.po +++ b/src/main/resources/bitrock/lang/alf-nb_NO.po @@ -666,8 +666,3 @@ msgstr "Klarer ikke å binde til et bestemt portnummer." msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Please select another ${serverName} Server Port." msgstr "Klarer ikke å binde til et bestemt portnummer. Denne porten brukes allerede av ${process_binding_port} prosessen. Vennligst velg en annen ${serverName} serverport." - -# Built-in messages -Installer.Installation.Question.Abort=Vil du avslutte installasjonen? -Installer.LanguageSelection.Title=Språkvalg -Installer.LanguageSelection.Select=Velg installasjonsspråk diff --git a/src/main/resources/bitrock/lang/alf-nl.po b/src/main/resources/bitrock/lang/alf-nl.po index c7afc9089c..218db74a5a 100644 --- a/src/main/resources/bitrock/lang/alf-nl.po +++ b/src/main/resources/bitrock/lang/alf-nl.po @@ -666,8 +666,3 @@ msgstr "Kan de poort niet binden aan het opgegeven poortnummer." msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port." msgstr "Kan de poort niet binden aan het opgegeven poortnummer. Deze poort wordt al gebruikt door het ${process_binding_port}-proces. Selecteer een andere ${serverName}-serverpoort." - -# Built-in messages -Installer.Installation.Question.Abort=Wilt u de installatie annuleren? -Installer.LanguageSelection.Title=Taal selecteren -Installer.LanguageSelection.Select=Selecteer de installatietaal diff --git a/src/main/resources/bitrock/lang/alf-pt_BR.po b/src/main/resources/bitrock/lang/alf-pt_BR.po index 28ac4ae1c6..5e5e9a3991 100644 --- a/src/main/resources/bitrock/lang/alf-pt_BR.po +++ b/src/main/resources/bitrock/lang/alf-pt_BR.po @@ -666,8 +666,3 @@ msgstr "Não é possível associar ao número da porta indicado." msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Please select another ${serverName} Server Port." msgstr "Não é possível associar ao número da porta indicado. Essa porta já está em uso pelo processo ${process_binding_port}. Selecione outra porta do servidor ${serverName}." - -# Built-in messages -Installer.Installation.Question.Abort=Você quer cancelar a instalação? -Installer.LanguageSelection.Title=Seleção de idioma -Installer.LanguageSelection.Select=Selecione o idioma de instalação diff --git a/src/main/resources/bitrock/lang/alf-ru.po b/src/main/resources/bitrock/lang/alf-ru.po index 479e1d7d8b..b5d49542ef 100644 --- a/src/main/resources/bitrock/lang/alf-ru.po +++ b/src/main/resources/bitrock/lang/alf-ru.po @@ -666,8 +666,3 @@ msgstr "Не удается выполнить привязку к заданн msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port." msgstr "Не удается выполнить привязку к заданному номеру порта. Этот порт уже используется процессом ${process_binding_port}. Выберите другой порт сервера ${serverName}." - -# Built-in messages -Installer.Installation.Question.Abort=Прервать установку? -Installer.LanguageSelection.Title=Выбор языка -Installer.LanguageSelection.Select=Выберите язык для использования в процессе установки diff --git a/src/main/resources/bitrock/lang/alf-zh_CN.po b/src/main/resources/bitrock/lang/alf-zh_CN.po index 852a39b7e4..9555585dbc 100644 --- a/src/main/resources/bitrock/lang/alf-zh_CN.po +++ b/src/main/resources/bitrock/lang/alf-zh_CN.po @@ -666,8 +666,3 @@ msgstr "无法绑定提供的服务器端口。" msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Please select another ${serverName} Server Port." msgstr "无法绑定提供的服务器端口。 此端口已被 ${process_binding_port} 进程使用。请选择其他 ${serverName} 服务器端口。" - -# Built-in messages -Installer.Installation.Question.Abort=是否要取消此安装？ -Installer.LanguageSelection.Title=语言选择 -Installer.LanguageSelection.Select=选择安装语言