Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/DocSpace into release/v1.1.0

This commit is contained in:
Ilya Oleshko 2023-07-14 16:58:07 +03:00
commit 8e476b8c9f
9 changed files with 86 additions and 6 deletions

View File

@ -16,10 +16,12 @@ echo "LOCAL IP: $local_ip"
doceditor=${local_ip}:5013
login=${local_ip}:5011
client=${local_ip}:5001
portal_url="http://$local_ip:8092"
echo "SERVICE_DOCEDITOR: $doceditor"
echo "SERVICE_LOGIN: $login"
echo "SERVICE_CLIENT: $client"
echo "APP_URL_PORTAL: $portal_url"
# Stop all backend services"
$dir/build/start/stop.backend.docker.sh
@ -59,4 +61,5 @@ ROOT_DIR=$dir \
BUILD_PATH="/var/www" \
SRC_PATH="$dir/publish/services" \
DATA_DIR="$dir/Data" \
APP_URL_PORTAL=$portal_url \
docker-compose -f $dockerDir/docspace.profiles.yml -f $dockerDir/docspace.overcome.yml --profile migration-runner --profile backend-local up -d

View File

@ -50,6 +50,7 @@
<ROW Property="PS_DB_PORT" Value="5432"/>
<ROW Property="PS_DB_PWD" Value="onlyoffice"/>
<ROW Property="PS_DB_USER" Value="onlyoffice"/>
<ROW Property="Prereq_IAgree" Value="No"/>
<ROW Property="ProductCode" Value="1033:{9EB28D7F-9705-4DBB-97E1-FFCA1F5DBF12} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="[|PRODUCT_NAME]"/>
@ -331,6 +332,16 @@
<ROW Dialog_="PrepareDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="1048577" Text="[ButtonText_Back]" Order="700" TextLocId="-" MsiKey="PrepareDlg#Back" Options="1"/>
<ROW Dialog_="PreparePrereqDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="1" Text="[ButtonText_Back]" Order="300" TextLocId="-" MsiKey="PreparePrereqDlg#Back" Options="1"/>
<ROW Dialog_="PreparePrereqDlg" Control="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" Attributes="1048577" Text="dialog.bmp" Order="400" MsiKey="PreparePrereqDlg#Bitmap"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Next]" Order="100" TextLocId="-" Options="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Cancel]" Order="200" TextLocId="-" Options="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Back]" Order="300" TextLocId="-" Options="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="banner.bmp" Order="400"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="BannerLine" Type="Line" X="0" Y="44" Width="372" Height="0" Attributes="1" Order="500"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="BottomLine" Type="Line" X="0" Y="234" Width="368" Height="0" Attributes="1" Order="600"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Attributes="196611" Text="Please read the following license agreement carefully" Order="700"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Title" Type="Text" X="15" Y="6" Width="289" Height="15" Attributes="196611" Text="End-User License Agreement" TextStyle="[DlgTitleFont]" Order="800"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Attributes="7" Text="Resources\License_Redist.rtf" Order="900" TextLocId="-"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Buttons" Type="RadioButtonGroup" X="20" Y="187" Width="330" Height="40" Attributes="3" Property="Prereq_IAgree" Order="1000"/>
<ROW Dialog_="PrerequisitesDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Back]" Order="300" TextLocId="-" MsiKey="PrerequisitesDlg#Back" Options="1"/>
<ROW Dialog_="PrerequisitesDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="banner.bmp" Order="400" MsiKey="PrerequisitesDlg#BannerBitmap"/>
<ROW Dialog_="PrerequisitesDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Attributes="196611" Text="Select which prerequisites will be installed" Order="700" TextLocId="Control.Text.PrerequisitesDlg#Description" MsiKey="PrerequisitesDlg#Description"/>
@ -431,6 +442,10 @@
<ROW Dialog_="WelcomePrereqDlg" Control="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" Attributes="1048577" Text="dialog.bmp" Order="500" MsiKey="WelcomePrereqDlg#Bitmap"/>
<ATTRIBUTE name="DeletedRows" value="AdminBrowseDlg#Logo@AdminInstallPointDlg#Logo@BrowseDlg#Logo@CustomizeDlg#Logo@DiskCostDlg#Logo@FilesInUse#Logo@FolderDlg#Logo@MaintenanceTypeDlg#Logo@MsiRMFilesInUse#Logo@OutOfDiskDlg#Logo@OutOfRbDiskDlg#Logo@PrerequisitesDlg#Logo@ProgressDlg#Logo@ProgressPrereqDlg#Logo@SQLConnectionDlg#Logo@SQLConnectionDlg#OdbcResourceEdit@SQLConnectionDlg#OdbcResourceLabel@SQLConnectionDlg.aip@VerifyReadyDlg#Logo@VerifyRemoveDlg#Logo@VerifyRepairDlg#Logo"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiControlConditionComponent">
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Next" Action="Disable" Condition="Prereq_IAgree &lt;&gt; &quot;Yes&quot;"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Next" Action="Enable" Condition="Prereq_IAgree = &quot;Yes&quot;"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
<ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL AND ( OLDPRODUCTS = &quot;&quot; )" Ordering="19"/>
<ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="SQLConnectionDlg" Condition="AI_INSTALL AND ( SqlConnectionError &lt;&gt; &quot;&quot; )" Ordering="216"/>
@ -452,11 +467,14 @@
<ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
<ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
<ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
<ROW Dialog_="WelcomePrereqDlg" Control_="Next" Event="NewDialog" Argument="PrerequisitesDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="WelcomePrereqDlg" Control_="Next" Event="NewDialog" Argument="PrereqLicenseAgreementDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="PrerequisitesDlg" Control_="Next" Event="EndDialog" Argument="Return" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="PrerequisitesDlg" Control_="Back" Event="NewDialog" Argument="PrereqLicenseAgreementDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Cancel" Event="SpawnDialog" Argument="CancelDlg" Condition="1" Ordering="100"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Next" Event="NewDialog" Argument="PrerequisitesDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Back" Event="NewDialog" Argument="WelcomePrereqDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
<ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="205"/>
<ROW Dialog_="PrerequisitesDlg" Control_="Back" Event="NewDialog" Argument="WelcomePrereqDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="SQLConnectionDlg" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_5" Condition="AI_INSTALL AND ( SqlConnectionError &lt;&gt; &quot;&quot; )" Ordering="4"/>
<ROW Dialog_="SQLConnectionDlg" Control_="Next" Event="DoAction" Argument="TestSQLConnectionMsgBox" Condition="AI_INSTALL AND ( SqlConnectionError &lt;&gt; &quot;&quot; )" Ordering="5"/>
<ROW Dialog_="SQLConnectionDlg" Control_="SQLConnectionDlgDialogInitializer" Event="[DB_PWD]" Argument="{}" Condition="AI_INSTALL AND ( OLDPRODUCTS=&quot;&quot; AND SQLConnectionDlg_Cond )" Ordering="4"/>
@ -627,6 +645,7 @@
<COMPONENT cid="caphyon.advinst.msicomp.MsiDialogComponent">
<ROW Dialog="ELKConnectionDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
<ROW Dialog="PostgreSQLConnectionDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
<ROW Dialog="PrereqLicenseAgreementDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel" TitleLocId="-"/>
<ROW Dialog="RabbitMQConnectionDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
<ROW Dialog="RedisServerConnectionDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
</COMPONENT>
@ -710,6 +729,10 @@
<ROW Condition="SETUPEXEDIR OR (REMOVE=&quot;ALL&quot;)" Description="This package can only be run from a bootstrapper." DescriptionLocId="AI.LaunchCondition.RequireBootstrapper" IsPredefined="true" Builds="DefaultBuild"/>
<ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]." DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiRadioButtonComponent">
<ROW Property="Prereq_IAgree" Order="1" Value="Yes" X="5" Y="0" Width="250" Height="15" Text="I &amp;accept the terms in the License Agreement" TextStyle="DlgFont8" TextLocId="RadioButton.Text.IAgree#1"/>
<ROW Property="Prereq_IAgree" Order="2" Value="No" X="5" Y="20" Width="250" Height="15" Text="I &amp;do not accept the terms in the License Agreement" TextStyle="DlgFont8" TextLocId="RadioButton.Text.IAgree#2"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiRegLocatorComponent">
<ROW Signature_="AI_EXE_PATH_CU" Root="1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>
<ROW Signature_="AI_EXE_PATH_LM" Root="2" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>

View File

@ -64,6 +64,7 @@
<ROW Property="PS_DB_PORT" Value="5432"/>
<ROW Property="PS_DB_PWD" Value="onlyoffice"/>
<ROW Property="PS_DB_USER" Value="onlyoffice"/>
<ROW Property="Prereq_IAgree" Value="No"/>
<ROW Property="ProductCode" Value="1033:{3FABEB4A-D27F-4BA6-A40E-16BE47540727} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="[|PRODUCT_NAME]"/>
@ -669,6 +670,16 @@
<ROW Dialog_="PrepareDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="1048577" Text="[ButtonText_Back]" Order="700" TextLocId="-" MsiKey="PrepareDlg#Back" Options="1"/>
<ROW Dialog_="PreparePrereqDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="1" Text="[ButtonText_Back]" Order="300" TextLocId="-" MsiKey="PreparePrereqDlg#Back" Options="1"/>
<ROW Dialog_="PreparePrereqDlg" Control="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" Attributes="1048577" Text="dialog.bmp" Order="400" MsiKey="PreparePrereqDlg#Bitmap"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Next]" Order="100" TextLocId="-" Options="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Cancel]" Order="200" TextLocId="-" Options="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Back]" Order="300" TextLocId="-" Options="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="banner.bmp" Order="400"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="BannerLine" Type="Line" X="0" Y="44" Width="372" Height="0" Attributes="1" Order="500"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="BottomLine" Type="Line" X="0" Y="234" Width="368" Height="0" Attributes="1" Order="600"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Attributes="196611" Text="Please read the following license agreement carefully" Order="700"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Title" Type="Text" X="15" Y="6" Width="289" Height="15" Attributes="196611" Text="End-User License Agreement" TextStyle="[DlgTitleFont]" Order="800"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Attributes="7" Text="Resources\License_Redist.rtf" Order="900" TextLocId="-"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control="Buttons" Type="RadioButtonGroup" X="20" Y="187" Width="330" Height="40" Attributes="3" Property="Prereq_IAgree" Order="1000"/>
<ROW Dialog_="PrerequisitesDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Back]" Order="300" TextLocId="-" MsiKey="PrerequisitesDlg#Back" Options="1"/>
<ROW Dialog_="PrerequisitesDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="banner.bmp" Order="400" MsiKey="PrerequisitesDlg#BannerBitmap"/>
<ROW Dialog_="PrerequisitesDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Attributes="196611" Text="Select which prerequisites will be installed" Order="700" TextLocId="Control.Text.PrerequisitesDlg#Description" MsiKey="PrerequisitesDlg#Description"/>
@ -769,6 +780,10 @@
<ROW Dialog_="WelcomePrereqDlg" Control="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" Attributes="1048577" Text="dialog.bmp" Order="500" MsiKey="WelcomePrereqDlg#Bitmap"/>
<ATTRIBUTE name="DeletedRows" value="AdminBrowseDlg#Logo@AdminInstallPointDlg#Logo@BrowseDlg#Logo@CustomizeDlg#Logo@DiskCostDlg#Logo@FilesInUse#Logo@FolderDlg#Logo@MaintenanceTypeDlg#Logo@MsiRMFilesInUse#Logo@OutOfDiskDlg#Logo@OutOfRbDiskDlg#Logo@PrerequisitesDlg#Logo@ProgressDlg#Logo@ProgressPrereqDlg#Logo@SQLConnectionDlg#Logo@SQLConnectionDlg#OdbcResourceEdit@SQLConnectionDlg#OdbcResourceLabel@SQLConnectionDlg.aip@VerifyReadyDlg#Logo@VerifyRemoveDlg#Logo@VerifyRepairDlg#Logo"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiControlConditionComponent">
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Next" Action="Disable" Condition="Prereq_IAgree &lt;&gt; &quot;Yes&quot;"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Next" Action="Enable" Condition="Prereq_IAgree = &quot;Yes&quot;"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
<ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL AND ( OLDPRODUCTS = &quot;&quot; )" Ordering="19"/>
<ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="SQLConnectionDlg" Condition="AI_INSTALL AND ( SqlConnectionError &lt;&gt; &quot;&quot; )" Ordering="216"/>
@ -790,11 +805,14 @@
<ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
<ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
<ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
<ROW Dialog_="WelcomePrereqDlg" Control_="Next" Event="NewDialog" Argument="PrerequisitesDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="WelcomePrereqDlg" Control_="Next" Event="NewDialog" Argument="PrereqLicenseAgreementDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="PrerequisitesDlg" Control_="Next" Event="EndDialog" Argument="Return" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="PrerequisitesDlg" Control_="Back" Event="NewDialog" Argument="PrereqLicenseAgreementDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Cancel" Event="SpawnDialog" Argument="CancelDlg" Condition="1" Ordering="100"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Next" Event="NewDialog" Argument="PrerequisitesDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="PrereqLicenseAgreementDlg" Control_="Back" Event="NewDialog" Argument="WelcomePrereqDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
<ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="205"/>
<ROW Dialog_="PrerequisitesDlg" Control_="Back" Event="NewDialog" Argument="WelcomePrereqDlg" Condition="AI_BOOTSTRAPPER" Ordering="1"/>
<ROW Dialog_="SQLConnectionDlg" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_5" Condition="AI_INSTALL AND ( SqlConnectionError &lt;&gt; &quot;&quot; )" Ordering="4"/>
<ROW Dialog_="SQLConnectionDlg" Control_="Next" Event="DoAction" Argument="TestSQLConnectionMsgBox" Condition="AI_INSTALL AND ( SqlConnectionError &lt;&gt; &quot;&quot; )" Ordering="5"/>
<ROW Dialog_="SQLConnectionDlg" Control_="SQLConnectionDlgDialogInitializer" Event="[DB_PWD]" Argument="{}" Condition="AI_INSTALL AND ( OLDPRODUCTS=&quot;&quot; AND SQLConnectionDlg_Cond )" Ordering="4"/>
@ -1060,6 +1078,7 @@
<COMPONENT cid="caphyon.advinst.msicomp.MsiDialogComponent">
<ROW Dialog="ELKConnectionDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
<ROW Dialog="PostgreSQLConnectionDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
<ROW Dialog="PrereqLicenseAgreementDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel" TitleLocId="-"/>
<ROW Dialog="RabbitMQConnectionDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
<ROW Dialog="RedisServerConnectionDlg" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
</COMPONENT>
@ -1322,6 +1341,10 @@
<ROW LockObject="Data_Dir" Table="CreateFolder" User="[USR_LOCAL_SERVICE]" Permission="1180063" Flags="2"/>
<ROW LockObject="temp_16_Dir" Table="CreateFolder" User="[USR_LOCAL_SERVICE]" Permission="1180063" Flags="0"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiRadioButtonComponent">
<ROW Property="Prereq_IAgree" Order="1" Value="Yes" X="5" Y="0" Width="250" Height="15" Text="I &amp;accept the terms in the License Agreement" TextStyle="DlgFont8" TextLocId="RadioButton.Text.IAgree#1"/>
<ROW Property="Prereq_IAgree" Order="2" Value="No" X="5" Y="20" Width="250" Height="15" Text="I &amp;do not accept the terms in the License Agreement" TextStyle="DlgFont8" TextLocId="RadioButton.Text.IAgree#2"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiRegLocatorComponent">
<ROW Signature_="AI_EXE_PATH_CU" Root="1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>
<ROW Signature_="AI_EXE_PATH_LM" Root="2" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>

View File

@ -168,6 +168,7 @@
"SessionLifetimeDescription": "La sección <1>Duración de sesión</1> permite ajustar el tiempo (en minutos) antes de que los usuarios del espacio necesiten introducir las credenciales del espacio de nuevo para tener acceso al espacio. Después de guardar, todos los usuarios serán desconectados del espacio.",
"SessionLifetimeHelper": "Después de guardar, todos los usuarios se desconectarán del espacio.",
"SettingPasswordStrength": "Estableciendo la seguridad de la contraseña",
"SettingPasswordStrengthDescription": "<1>Ajustes de seguridad de contraseña</1> es un modo para determinar eficacia de la contraseña en resistir a los ataques de adivinanza y fuerza bruta. <br> Use barra de <2>longitud mínima de contraseña<2/> para determinar longitud óptima. Marque las casillas apropiadas debajo de la barra para determinar el conjunto de caracteres que se debe utilizar en la contraseña. <br> Para aplicar los cambios realizados pulse el botón <3>Guardar</3> en la parte inferior de la sección. ",
"SettingPasswordStrengthHelper": "Utilice la barra de longitud mínima de la contraseña para determinar la longitud que debe tener la contraseña. Marque las casillas correspondientes a continuación para determinar el conjunto de caracteres que debe utilizarse en la contraseña.",
"ShowFeedbackAndSupport": "Mostrar enlace al Feedback y Soporte",
"ShowHelpCenter": "Mostrar enlace al Centro de Ayuda",
@ -194,6 +195,7 @@
"ThirdPartyTitleDescription": "Con las claves de autorización, puede conectar servicios de terceros a su espacio. Inicie sesión fácilmente con Facebook, Google o LinkedIn; añada Dropbox, OneDrive, etc. para trabajar con los archivos almacenados allí desde el módulo Documentos.",
"TimeZone": "Zona horaria",
"TrustedMail": "Ajustes del dominio de correo confiado",
"TrustedMailDescription": "<1>Ajustes de dominio de correo confiado</1> es una forma de especificar los servidores de correo que pueden utilizarse para registrarse. <br> Usted puede revisar la opción <2>Dominios personalizados</2> e introducir servidor de correo electrónico confiado en el campo abajo para que cada persona que tiene la cuenta podrá registrarse pulsando el enlace <3>Iniciar seción</3> en la página o desactivar esta opción. <br> Para activar los parámetros ingresados pulse el botón <4>Guardar</4> en la parte inferior de la sección.",
"TrustedMailHelper": "Puede marcar la opción Dominios personalizados e introducir el servidor de correo de confianza en el campo de abajo para que una persona que tenga una cuenta en él pueda registrarse haciendo clic en el enlace Unirse de la página de inicio de sesión o desactivar esta opción.",
"TwoFactorAuth": "Autenticación de dos factores",
"TwoFactorAuthDescription": "<1>Autenticación de dos factores</1> es un modo más seguro de acceder a DocSpace para los usuarios. Cuando los datos de acceso estén introducidos, el usuario tendrá que introducir el código enviado por SMS al teléfono móvil con el número que fue especificado durante el primer ingreso al portal o el código de la aplicación de autenticador. <br> Active esta opción para el acceso a DocSpace más seguro para todos los usuarios de DocSpace. <br> Para aplicar los cambios realizados pulse el botón <2>Guardar</2> debajo de esta sección. <br> <3>Nota</3>: Solo se pueden enviar mensajes SMS si tiene saldo positivo. Siempre puede comprobar su saldo actual en su cuenta de proveedor de SMS. No olvide recargar su saldo a tiempo.",

View File

@ -165,6 +165,7 @@
"SessionLifetime": "Durée de vie de la session",
"SessionLifetimeHelper": "Après lenregistrement, tous les utilisateurs seront déconnectés de lespace.",
"SettingPasswordStrength": "Définition de la force du mot de passe",
"SettingPasswordStrengthDescription": "Les <1>paramètres de robustesse de mot de passe</1> vous permettent de déterminer l'efficacité d'un mot de passe pour résister aux attaques par force brute. <br> Utilisez la barre <2>Longueur minimale du mot de passe</2> pour définir la longueur du mot de passe pour qu'il puisse être considéré comme sûr. Cochez les cases appropriées au-dessous de la barre pour choisir les symboles qui doivent être utilisés dans le mot de passe. <br>Pour appliquer les modifications effectuées, utilisez le bouton <3>Enregistrer</3> en bas de la section.",
"SettingPasswordStrengthHelper": "Utilisez la barre Longueur minimale du mot de passe pour déterminer la longueur du mot de passe. Cochez les cases appropriées ci-dessous pour déterminer le jeu de caractères qui doit être utilisé dans le mot de passe.",
"ShowFeedbackAndSupport": "Afficher le lien Feedback & Support",
"ShowHelpCenter": "Afficher le lien vers le Centre daide",
@ -191,6 +192,7 @@
"ThirdPartyTitleDescription": "Avec les clés d'autorisation, vous pouvez connecter des services tiers à votre espace. Connectez vous facilement à Facebook, Google ou LinkedIn; travaillez avec des fichiers stockés sur Dropbox, Onedrive etc. depuis le module Documents.",
"TimeZone": "Fuseau horaire",
"TrustedMail": "Paramètres de domaines de messagerie autorisés",
"TrustedMailDescription": "Les <1>paramètres de domaines de messagerie autorisés</1> vous permettent de spécifier les serveurs de messagerie qui peuvent être utilisés par les utilisateurs lors de leur auto-inscription. <br> Vous pouvez sélectionner l'option <2>Domaines autorisés</2> et entrer les serveurs autorisés dans le champ au-dessous pour que la personne qui a un compte au serveur de messagerie spécifié puisse s'inscrire en cliquant sur le lien </3>Se joindre</3> sur la Page de connexion ou désactiver cette option. <br> Pour appliquer les modifications effectuées, utilisez le bouton <4>Enregistrer</4> en bas de la section.",
"TrustedMailHelper": "Vous pouvez soit cocher l'option Domaines personnalisés et entrer le serveur de messagerie de confiance dans le champ ci-dessous afin qu'une personne qui y a un compte puisse s'inscrire elle-même en cliquant sur le lien Rejoindre sur la page d'ouverture de session, soit désactiver cette option.",
"TwoFactorAuth": "Authentification à deux facteurs",
"TwoFactorAuthDescription": "L'<1>authentification à deux facteurs</1> est un moyen plus sécurisé pour les utilisateurs d'entrer dans DocSpace. Une fois les informations d'identification entrées, l'utilisateur doit entrer le code envoyé par SMS sur le téléphone portable avec le numéro spécifié lors du premier accès au portail ou le code d'une application d'authentification. <br> Activez cette option pour un accès plus sécurisé à DocSpace pour tous les utilisateurs de DocSpace. <br> Pour appliquer les modifications cliquez sur le bouton <2>Enregistrer</2> situé en bas de cette section. <br> <3>Note</3> : Les messages SMS ne peuvent être envoyés que si votre solde est positif. Vous pouvez toujours consulter votre solde actuel sur le compte de votre fournisseur de SMS. N'oubliez pas de réapprovisionner votre solde à temps.",

View File

@ -161,6 +161,7 @@
"SessionLifetime": "Durata della sessione",
"SessionLifetimeHelper": "Dopo il salvataggio, tutti gli utenti verranno disconnessi dallo spazio.",
"SettingPasswordStrength": "Impostazione della sicurezza della password",
"SettingPasswordStrengthDescription": "<1>Impostazioni di livello di sicurezza della password</1> ti permettono di determinare l'efficacia di una password nella difesa contro intrusi e impostori. <br> Utilizza la barra <2>Lunghezza della password minima</2> per impostare la lunghezza della password perché essa sia considerata sicura. Spunta le caselle adatte sotto la barra per determinare l'insieme dei caratteri da utilizzare nella password. <br> Per applicare i parametri impostati clicca su <3>Salva</3> nella parte inferiore della sezione.",
"SettingPasswordStrengthHelper": "Utilizza la barra Lunghezza minima password per determinare la lunghezza della password. Usa le caselle appropriate di seguito per determinare il set di caratteri che deve essere utilizzato nella password.",
"ShowFeedbackAndSupport": "Mostra il link a Feedback e assistenza",
"ShowHelpCenter": "Mostra il link al Centro assistenza",
@ -187,6 +188,7 @@
"ThirdPartyTitleDescription": "Con le chiavi di autorizzazione puoi connettere dei servizi di terze parti al tuo spazio. Puoi accedere facilmente tramite: Facebook, Google, LinkedIn; oppure puoi aggiungere l'utilizzo di Dropbox, OneDrive, ecc., per lavorare con i file archiviati con l'uso del modulo Documenti.",
"TimeZone": "Fuso orario",
"TrustedMail": "Dominio affidabile",
"TrustedMailDescription": "<1>Impostazioni di dominio affidabile</1> ti permettono di specificare i server di posta elettronica che si usano per la registrazione degli utenti. <br> Puoi sia spuntare l'opzione <2>Domini personalizzati</2> ed inserisci il server di posta elettronica nel campo di sotto perchè ogni persona che ha un account sul server specificato avrà la possibilità di registrarsi cliccando sul collegamento <3>Accedi</3> nella pagina di accesso o disattivare questa opzione. <br> Per applicare i parametri impostati clicca su <4>Salva</4> nella parte inferiore della sezione.",
"TrustedMailHelper": "Puoi controllare l'opzione Domini personalizzati e inserire il server di posta affidabile nel campo sottostante in modo che una persona che ha un account possa registrarsi facendo clic sul collegamento Iscriviti nella pagina di accesso o disabilitare questa opzione.",
"TwoFactorAuth": "Autenticazione a due fattori",
"TwoFactorAuthHelper": "Nota: Quando avrai terminato gli SMS l'opzione di accesso ai portali di autenticazione a due fattori sarà automaticamente disattivata. Non dimenticate di acquistare un pacchetto SMS aggiuntivo in tempo utile.",

View File

@ -1,6 +1,11 @@
{
"AdvancedDisplay": "Napredne nastavitve zaslona",
"APILink": "API knjižnica",
"Ascending": "Naraščajoče",
"Code": "Koda za vstavitev",
"CopyWindowCode": "Kopiraj kodo za vdelavo okna",
"CreateSampleHeader": "Ustvarite vzorec vdelave DocSpace",
"CustomizingDisplay": "Prilagajanje zaslona",
"DataDisplay": "Nastavitve prikaza podatkov",
"Descending": "Padajoče",
"Destroy": "Uniči",
@ -9,13 +14,21 @@
"EnterId": "Vnesi ID",
"EnterPage": "Vnesi številko strani",
"EnterWidth": "Vnesi širino",
"Filter": "Iskanje, filtriranje in razvrščanje",
"FolderId": "ID mape",
"FrameId": "ID okvirja",
"Header": "Glava",
"InterfaceElements": "Elementi vmesnika",
"ItemsCount": "Število elementov",
"ItemsCountDescription": "Specificirate lahko število datotek / map, prikazanih na eni strani, kot tudi to, katera stran naj se začne prikazovati",
"JavascriptSdk": "Javascript SDK",
"Menu": "Meni",
"MobileOnly": "samo mobilne naprave",
"Page": "Stran",
"RoomOrFolder": "Soba ali mapa",
"RoomOrFolderDescription": "Izberete lahko razdelek, sobo ali mapo, ki jo želite prikazati",
"SDKDescription": "Z uporabo JavaScript SDK lahko vdelate sobo ali mapo iz ONLYOFFICE DocSpace v svoj spletni vmesnik kot iframe. Tukaj lahko najdete nastavitve za ustvarjanje vzorca iframe in konfiguracijo CSP. Če želite uporabiti celoten SDK, si oglejte",
"SearchTerm": "Išči izraz",
"SortOrder": "Vrstni red"
"SortOrder": "Vrstni red",
"Title": "Navigacija in naslov"
}

View File

@ -11,6 +11,8 @@
"AddTrustedDomain": "Dodaj zaupanja vredno domeno",
"Admins": "Administratorji",
"AdminsMessage": "Nastavitve sporočil skrbnika",
"AdminsMessageDescription": "<1>Nastavitve sporočil administratorja</1> je način, kako kontaktirati administratorja portala DocSpace. <br> To možnost omogočite za prikaz kontaktnega obrazca na strain <2>Vpiši se</2>, da ljudje administratorju prostora lahko pošljejo sporočilo v primeru, da imajo težave z dostopanjem do prostora. <br> Za delovanje parametrov, ki ste jih nastavili, pritisnite gumb <3>shrani</3> na dnu tega oddelka.",
"AdminsMessageHelper": "To možnost omogočite za prikaz kontaktnega obrazca na strani Vpiši se, da ljudje administratorju lahko pošljejo sporočilo v primeru, da imajo težave z dostopanjem DocSpace.",
"AllDomains": "Kakršna koli domena",
"AmazonBucketTip": "Vnesite edinstveno ime košarice Amazon S3, kamor želite shraniti svoje varnostne kopije.",
"AmazonCSE": "Šifriranje na strani odjemalca",
@ -20,6 +22,9 @@
"AmazonServiceTip": "To je neobvezna lastnost; spremenite le, če želite poskusiti z drugo končno točko storitve.",
"AmazonSSE": "Šifriranje na strani strežnika",
"AmazonSSETip": "Algoritem za šifriranje na strani strežnika, uporabljen pri shranjevanju tega predmeta v S3.",
"Api": "Api",
"ApiPageDescription": "Ustvarite lastno produktivno platformo na osnovi ONLYOFFICE DocSpace in sodelujte pri dokumentih z ekipami, strankami in partnerji.",
"ApiPageHeader": "Zgradite lastno platformo za sodelovanje",
"Appearance": "Videz",
"AuditSubheader": "Podrazdelek vam omogoča brskanje po seznamu zadnjih sprememb (ustvarjanje, spreminjanje, brisanje itd.), ki so jih uporabniki naredili za entitete (sobe, priložnosti, datoteke itd.) v vašem prostoru DocSpace.",
"AuditTrailNav": "Revizijska pot",
@ -93,7 +98,9 @@
"EveryMonth": "Vsak mesec",
"EveryWeek": "Vsak teden",
"ForcePathStyle": "Stil vsiljene poti",
"IntegrationRequest": "Pogrešate uporabno integracijo ali komponento v ONLYOFFICE DocSpace? Zaupajte zahtevo naši ekipi in preučili jo bomo.",
"IPSecurity": "IP varnost",
"IPSecurityDescription": "<1>IP Varnost</1> je uporabljena za omejevanje vpisa v prostor z vseh IP naslovov razen določenih. Dovoljene IP naslove lahko nastavite z uporabo točnega IP naslova v IPc4 formatu (#.#.#.#, kjer # je numerična vrednost od 0 do 255) ali IP območjem (v #.#.#.#-#.#.#.# formatu) ali pa z maskiranjem CIDR (v formatu #.#.#.#/#). Varnost IP ne deluje za lastnike prostora, do prostora lahko dostopajo s katerega koli naslova IP. Pravila, določena v razdelku Za vse uporabnike, veljajo tudi za skrbnike s polnim dostopom. Hkrati lahko v ustreznem razdelku nastavite dodatna pravila za skrbnike s polnim dostopom.",
"IPSecurityHelper": "Dovoljene IP naslove lahko nastavite z natančnimi naslovi IP v formatu IPv4 (#.#.#.#, kjer je # numerična vrednost 0 do 255) ali IP območje (v formatu #.#.#.#-#.#.#.#).",
"IPSecurityWarningHelper": "Najprej morate specificirati vaš trenutni IP ali obseg IP naslovov, ki mu pripada vaš trenutni naslov IP, sicer bo vaš dostop do prostora blokiran takoj, ko boste shranili nastavitve. Lastnik prostora bo imel dostop do prostora iz katerega koli naslova IP.",
"LanguageAndTimeZoneSettingsDescription": "Spremenite jezik za vse uporabnike prostora in nastavite časovni pas tako, da bodo vsi dogodki v prostoru prikazani s pravilnim datumom in uro.",
@ -158,8 +165,10 @@
"ServerSideEncryptionMethod": "Šifrirna metoda na strani strežnika",
"ServiceUrl": "Url storitve",
"SessionLifetime": "Tempo da sessão",
"SessionLifetimeDescription": "<1>Življenjska doba seje</1> omogoča nastavitev časa (v minutah), preden bodo morali uporabniki prostora znova vnesti poverilnice prostora za dostop. Po shranjevanju bodo vsi uporabniki odjavljeni iz prostora.",
"SessionLifetimeHelper": "Po shranjevanju bodo vsi uporabniki odjavljeni iz prostora.",
"SettingPasswordStrength": "Nastavitev moči gesla",
"SettingPasswordStrengthDescription": "<1>Nastavitve moči gesla</1> je način, kako določiti učinkovitost gesla, ki se je zmožen upirati sklepanju in napadom. <br>Uporabite palico za <2>Minimalno dolžino gesla</2> in z njo določite, kako dolgo mora geslo biti. Obkljukajte ustrezne prostote spodaj in določite znake, ki morajo v geslu biti uporabljeni. <br> Za začetek delovanja izbranih parametrov pritisnite gumb <3>Shrani</3> na dnu tega oddelka.",
"SettingPasswordStrengthHelper": "Uporabite opcijo Najmanjša dolžina gesla, da določite, kako dolgo naj bo geslo. Označite ustrezna polja spodaj, da določite nabor znakov, ki jih je potrebno uporabiti v geslu.",
"ShowFeedbackAndSupport": "Prikaži povezavo za povratne informacije in podporo",
"ShowHelpCenter": "Prikaži povezavo do centra za pomoč",
@ -169,6 +178,7 @@
"SMTPSettingsDescription": "SMTP nastavitve so potrebne za nastavitev email računa, ki bo uporabljen za pošiljanje obvestil s portala z uporabo SMTP strežnika namesto ene {{organizationName}} uporabe. Prosim izpolnite vsa polja in pritisnite gumb \"Shrani\". Gumb 'Pošli testno sporočilo' lahko uporabite za preverjanje, če vse vnesene nastavitve delujejo pravilno.",
"StoragePeriod": "Obdobje shranjevanja",
"StudioTimeLanguageSettings": "Nastavi jezik in časovni pas",
"Submit": "Pošlji",
"SuccessfullySaveGreetingSettingsMessage": "Nastavitve strani dobrodošlice so bile uspešno shranjene",
"SuccessfullySavePortalNameMessage": "Prostor je bil uspešno preimenovan",
"SuccessfullySaveSettingsMessage": "Nastavitve so bile uspešno posodobljene",
@ -185,8 +195,10 @@
"ThirdPartyTitleDescription": "S ključi za avtorizacijo lahko v svoj prostor povežete storitve tretjih oseb. Enostavno se prijavite s Facebook, Google ali LinkedIn; dodajte Dropbox, OneDrive itd. za delo z datotekami, shranjenimi v modulu Dokumenti.",
"TimeZone": "Časovni pas",
"TrustedMail": "Nastavitve zaupanja vredne poštne domene",
"TrustedMailDescription": "<1>Nastavitve zaupanja vredne poštne domene</1> je način, kako opredeliti poštne strežnike za uporabniško samo-registracijo. <br> Možnost lahko omogočite <2>Domene po-meri</2> in v spodnje polje vnesete zaupanja vreden poštni strežnik, da se bo oseba, ki ima račun, lahko registrirala s pritiskom na pridružitveno povezavo na <3>Prijava</3> strani, ali pa to možnost onemogočite. <br> Da bodo izbrani parametri začeli delovati, prosim pritisnite gumb <4>Shrani</4> na dnu oddelka.",
"TrustedMailHelper": "Označite lahko možnost domen po meri in v spodnje polje vnesete zaupanja vreden poštni strežnik, da se bo oseba z računom lahko registrirala s klikom na povezavo Pridruži se na strani za prijavo ali pa onemogočite to možnost.",
"TwoFactorAuth": "Dvofaktorska avtentikacija",
"TwoFactorAuthDescription": "<1>Dvo-faktorska avtentikacija</1> je varnejši način uporabniškega dostopa do DocSpace. Po vnosu poverilnic bo uporabnik preko SMS na telefon prejel kodo s številko, ki je določena ob prvem vpisu na portal preko dvo-faktorske avtentikacije. <br> Za varnejšo uporabo DocSpace vseh uporabnikov DocSpace omogočite to možnost.<br> Za potrditev sprememb pritisnite na gumb <2>Shrani</2> pod tem razdelkom.<br> <3>Opomba</3>: SMS sporočila lahko pošiljate le, če imate pozitivno stanje na računu. Svoje trenutno stanje lahko vedno preverite v svojem računu ponudnika SMS. Ne pozabite pravočasno napolniti svojega stanja.",
"TwoFactorAuthHelper": "Opomba: SMS sporočila lahko pošiljate samo, če imate pozitivno stanje. Vaše trenutno stanje lahko vedno preverite na računu vašega ponudnika SMS. Ne pozabite pravočasno napolniti svojega stanja.",
"UseAsLogoButton": "Uporabi kot logo",
"UseDigits": "Uporabi številke",

View File

@ -410,7 +410,7 @@
<value>Datoteka ni več osnutek za izpolnjevanje obrazca.</value>
</data>
<data name="ProductDescriptionEx" xml:space="preserve">
<value>Urejanje, delitev in sodelovanje pri dokumentih v realnem času. Ustvarjanje in upravljanje skupnih dokumentov, do katerih lahko dostopa celotna ekipa.
<value>Urejajte, delite in sodelujte pri dokumentih v realnem času. Ustvarjajte in upravljajte skupne dokumente, do katerih lahko dostopa celotna ekipa.
Najvišja združljivost z docx, xlsx, pptx.</value>
</data>
<data name="ProductDescriptionShort" xml:space="preserve">