From 5e8d47d92bd165404b66055df46367ca57f5d86c Mon Sep 17 00:00:00 2001 From: Jean-Pierre Huynh Date: Mon, 25 Jan 2016 08:35:18 +0000 Subject: [PATCH] Merged AOS-Module (5.1.0) to HEAD (5.1) 121293 jphuynh: ACE-5033: Removed unnecessary string from the localisation files. Corrected the module name for selection in the installer. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121379 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/bitrock/alfresco-aos-module.xml | 2 +- src/main/resources/bitrock/lang/alf-de.po | 3 --- src/main/resources/bitrock/lang/alf-en.po | 3 --- src/main/resources/bitrock/lang/alf-es.po | 3 --- src/main/resources/bitrock/lang/alf-fr.po | 3 --- src/main/resources/bitrock/lang/alf-it.po | 3 --- src/main/resources/bitrock/lang/alf-ja.po | 3 --- src/main/resources/bitrock/lang/alf-nb_NO.po | 3 --- src/main/resources/bitrock/lang/alf-nl.po | 3 --- src/main/resources/bitrock/lang/alf-pt_BR.po | 3 --- src/main/resources/bitrock/lang/alf-ru.po | 3 --- src/main/resources/bitrock/lang/alf-zh_CN.po | 3 --- 12 files changed, 1 insertion(+), 34 deletions(-) diff --git a/src/main/resources/bitrock/alfresco-aos-module.xml b/src/main/resources/bitrock/alfresco-aos-module.xml index 74fe418154..7877b0bcc5 100644 --- a/src/main/resources/bitrock/alfresco-aos-module.xml +++ b/src/main/resources/bitrock/alfresco-aos-module.xml @@ -1,6 +1,6 @@ aosmodule - Office Services Module + Alfresco Office Services Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco installation. 1 1 diff --git a/src/main/resources/bitrock/lang/alf-de.po b/src/main/resources/bitrock/lang/alf-de.po index 9adc8df65d..c05f6699b6 100755 --- a/src/main/resources/bitrock/lang/alf-de.po +++ b/src/main/resources/bitrock/lang/alf-de.po @@ -394,9 +394,6 @@ msgstr "Bestimmen Sie den Datenbankbenutzer." msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "Setup wird die neuen Datenbanken installieren und überschreibt dabei bereits bestehende identische Datenbanken. Möchten Sie fortfahren?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "Shortcut-Symbole" diff --git a/src/main/resources/bitrock/lang/alf-en.po b/src/main/resources/bitrock/lang/alf-en.po index 84dcb1e287..4009ae403e 100755 --- a/src/main/resources/bitrock/lang/alf-en.po +++ b/src/main/resources/bitrock/lang/alf-en.po @@ -394,9 +394,6 @@ msgstr "Set the database user." msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "Shortcuts Images" diff --git a/src/main/resources/bitrock/lang/alf-es.po b/src/main/resources/bitrock/lang/alf-es.po index 7cb8f56057..6f3f3065c7 100755 --- a/src/main/resources/bitrock/lang/alf-es.po +++ b/src/main/resources/bitrock/lang/alf-es.po @@ -394,9 +394,6 @@ msgstr "Establezca el usuario de la base de datos." msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "El programa de instalación intentará instalar nuevas bases de datos y sobrescribirá cualquier datos duplicado. ¿Desea continuar?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "Imágenes de accesos directos" diff --git a/src/main/resources/bitrock/lang/alf-fr.po b/src/main/resources/bitrock/lang/alf-fr.po index 36f0458d9f..fb44fc5979 100755 --- a/src/main/resources/bitrock/lang/alf-fr.po +++ b/src/main/resources/bitrock/lang/alf-fr.po @@ -394,9 +394,6 @@ msgstr "Définissez l'utilisateur de la base de données." msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "Le processus d'installation va tenter d'installer de nouvelles bases de données et écraser les éventuels doublons. Souhaitez-vous continuer ?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "Images des raccourcis" diff --git a/src/main/resources/bitrock/lang/alf-it.po b/src/main/resources/bitrock/lang/alf-it.po index e74500fc74..26a8de2243 100755 --- a/src/main/resources/bitrock/lang/alf-it.po +++ b/src/main/resources/bitrock/lang/alf-it.po @@ -394,9 +394,6 @@ msgstr "Impostare l'utente del database." msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "Il programma di installazione tenterà di installare nuovi database e sovrascriverà eventuali duplicati. Continuare?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "Immagini delle scorciatoie" diff --git a/src/main/resources/bitrock/lang/alf-ja.po b/src/main/resources/bitrock/lang/alf-ja.po index 1ac607afc8..1b87dbc2fb 100755 --- a/src/main/resources/bitrock/lang/alf-ja.po +++ b/src/main/resources/bitrock/lang/alf-ja.po @@ -394,9 +394,6 @@ msgstr "データベースユーザーを設定してください。" msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "新しいデータベースがインストールされ、同じ名前の既存のデータベースは上書きされます。操作を続けますか?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "ショートカット画像" diff --git a/src/main/resources/bitrock/lang/alf-nb_NO.po b/src/main/resources/bitrock/lang/alf-nb_NO.po index 10b3ca7bde..b6e8ed2776 100644 --- a/src/main/resources/bitrock/lang/alf-nb_NO.po +++ b/src/main/resources/bitrock/lang/alf-nb_NO.po @@ -394,9 +394,6 @@ msgstr "Velg databasebruker." msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "Installasjonen vil forsøke å installere nye databaser og vil overskrive duplikater. Ønsker du å fortsette?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "Bilder av snarveier" diff --git a/src/main/resources/bitrock/lang/alf-nl.po b/src/main/resources/bitrock/lang/alf-nl.po index 7d99e6805f..1be03ba187 100644 --- a/src/main/resources/bitrock/lang/alf-nl.po +++ b/src/main/resources/bitrock/lang/alf-nl.po @@ -394,9 +394,6 @@ msgstr "Stel de gebruiker van de database in." msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "Setup probeert nieuwe databases te installeren en duplicaten te overschrijven. Wilt u doorgaan?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "Snelkoppelingen afbeeldingen " diff --git a/src/main/resources/bitrock/lang/alf-pt_BR.po b/src/main/resources/bitrock/lang/alf-pt_BR.po index 32fdc8b379..c0a1dbea5c 100644 --- a/src/main/resources/bitrock/lang/alf-pt_BR.po +++ b/src/main/resources/bitrock/lang/alf-pt_BR.po @@ -394,9 +394,6 @@ msgstr "Defina o usuário do banco de dados." msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "A configuração tentará instalar novos bancos de dados e substituirá todas as cópias. Deseja continuar?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "Imagens de atalhos" diff --git a/src/main/resources/bitrock/lang/alf-ru.po b/src/main/resources/bitrock/lang/alf-ru.po index 96058201ea..4df95eb631 100644 --- a/src/main/resources/bitrock/lang/alf-ru.po +++ b/src/main/resources/bitrock/lang/alf-ru.po @@ -394,9 +394,6 @@ msgstr "Задайте пользователя базы данных." msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "Программа установки попытается установить новые базы данных и перезапишет любые копии. Продолжить?" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "Изображения ярлыков" diff --git a/src/main/resources/bitrock/lang/alf-zh_CN.po b/src/main/resources/bitrock/lang/alf-zh_CN.po index d9756cc82c..a6523f1cb2 100644 --- a/src/main/resources/bitrock/lang/alf-zh_CN.po +++ b/src/main/resources/bitrock/lang/alf-zh_CN.po @@ -394,9 +394,6 @@ msgstr "设置数据库用户。" msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?" msgstr "安装程序将尝试安装新数据库，并覆盖任何重复。是否继续？" -msgid "Office Services Module" -msgstr "Office Services Module" - msgid "Shortcuts Images" msgstr "快捷方式图像"