From 46e4c35bb016571b95d9cd6920b5bc7208f1b590 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 3 Oct 2016 14:40:52 +0300 Subject: [PATCH] [win-nix] changed lang name sp -> es --- common/loginpage/deploy/index.html | 2 +- common/loginpage/src/locale.js | 2 +- win-linux/defaults.pri | 2 +- win-linux/langs/{sp.qm => es.qm} | Bin win-linux/langs/{sp.ts => es.ts} | 0 win-linux/package/windows/associate_page.iss | 26 +++++++++---------- win-linux/package/windows/common.iss | 14 +++++----- win-linux/resources.qrc | 2 +- win-linux/src/version.h | 4 +-- 9 files changed, 26 insertions(+), 26 deletions(-) rename win-linux/langs/{sp.qm => es.qm} (100%) rename win-linux/langs/{sp.ts => es.ts} (100%) diff --git a/common/loginpage/deploy/index.html b/common/loginpage/deploy/index.html index 2a6527318..6a74a2ab2 100644 --- a/common/loginpage/deploy/index.html +++ b/common/loginpage/deploy/index.html @@ -158,5 +158,5 @@ .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(jQuery); - \ No newline at end of file diff --git a/common/loginpage/src/locale.js b/common/loginpage/src/locale.js index 3fa230a1c..1fbadcf63 100644 --- a/common/loginpage/src/locale.js +++ b/common/loginpage/src/locale.js @@ -230,7 +230,7 @@ var fr = { ,adsText3: 'Accédez aux documents n\'importe oů et n\'importe quand via tout type d\'appareil' }; -var sp = { +var es = { welWelcome: '¡Bienvenido a ONLYOFFICE Desktop Editors!', welDescr: 'Una nueva solución rápida para el trabajo con documentos utilizando su ONLYOFFICE.', btnConnect: 'Colaboración', diff --git a/win-linux/defaults.pri b/win-linux/defaults.pri index e0f6c9be7..ecb71f630 100644 --- a/win-linux/defaults.pri +++ b/win-linux/defaults.pri @@ -8,7 +8,7 @@ CONFIG += c++11 TRANSLATIONS = ./langs/en.ts \ ./langs/ru.ts \ ./langs/de.ts \ - ./langs/sp.ts \ + ./langs/es.ts \ ./langs/fr.ts CORE_SRC_PATH = ../../core/DesktopEditor diff --git a/win-linux/langs/sp.qm b/win-linux/langs/es.qm similarity index 100% rename from win-linux/langs/sp.qm rename to win-linux/langs/es.qm diff --git a/win-linux/langs/sp.ts b/win-linux/langs/es.ts similarity index 100% rename from win-linux/langs/sp.ts rename to win-linux/langs/es.ts diff --git a/win-linux/package/windows/associate_page.iss b/win-linux/package/windows/associate_page.iss index 8ff0401a8..bdca448d7 100644 --- a/win-linux/package/windows/associate_page.iss +++ b/win-linux/package/windows/associate_page.iss @@ -11,85 +11,85 @@ en.AssociateDescription =Associate office document file types with {#ASSC_APP_NA ru.AssociateDescription =Ассоциировать типы файлов офисных документов с {#ASSC_APP_NAME} de.AssociateDescription =Video- und Audiodateitypen mit AVS Media Player {#ASSC_APP_NAME} fr.AssociateDescription =Associer des types de fichiers vidйo et audio а {#ASSC_APP_NAME} -sp.AssociateDescription =Asociar tipos de archivos de vнdeo y audio con {#ASSC_APP_NAME} +es.AssociateDescription =Asociar tipos de archivos de vнdeo y audio con {#ASSC_APP_NAME} ;it.AssociateDescription =Associare i tipi di file video/audio ad {#ASSC_APP_NAME} en.AssociateCaption =File Associations ru.AssociateCaption =Ассоциации файлов de.AssociateCaption =Dateiassoziationen fr.AssociateCaption =Associations de fichiers -sp.AssociateCaption =Asociaciones de archivos +es.AssociateCaption =Asociaciones de archivos ;it.AssociateCaption =Associazioni dei file en.AssociateDont =Do not associate ru.AssociateDont =Не ассоциировать de.AssociateDont =Nicht assoziieren fr.AssociateDont =Ne pas associer -sp.AssociateDont =No asociar +es.AssociateDont =No asociar ;it.AssociateDont =Non associare en.AssociateAll =Associate all ru.AssociateAll =Ассоциировать все de.AssociateAll =Alle assoziieren fr.AssociateAll =Associer tous -sp.AssociateAll =Asociar todo +es.AssociateAll =Asociar todo ;it.AssociateAll =Associare tutto en.AssociateSel =Associate selected ru.AssociateSel =Ассоциировать выбранные de.AssociateSel =Ausgewдhlte assoziieren fr.AssociateSel =Associer sйlectionnйs -sp.AssociateSel =Asociar seleccionado +es.AssociateSel =Asociar seleccionado ;it.AssociateSel =Associare selezione en.AssociateAudio =File types ru.AssociateAudio =Типы файлов de.AssociateAudio =Audiodateitypen fr.AssociateAudio =Types de fichiers audio -sp.AssociateAudio =Tipos de archivos de audio +es.AssociateAudio =Tipos de archivos de audio ;it.AssociateAudio =Tipi di file audio en.extMSWord =Microsoft Word Document ru.extMSWord =Документ Microsoft Word de.extMSWord =Microsoft Word Dokument fr.extMSWord =Document Microsoft Word -sp.extMSWord =Documento de Microsoft Word +es.extMSWord =Documento de Microsoft Word en.extMSExcel =Microsoft Excel Workbook ru.extMSExcel =Книга Microsoft Excel de.extMSExcel =Microsoft Excel Arbeitsmappe fr.extMSExcel =Classeur Microsoft Excel -sp.extMSExcel =Libro de Microsoft Excel +es.extMSExcel =Libro de Microsoft Excel en.extMSPresentation =Microsoft PowerPoint Presentation ru.extMSPresentation =Презентация Microsoft PowerPoint de.extMSPresentation =Microsoft PowerPoint Präsentation fr.extMSPresentation =Présentation Microsoft PowerPoint -sp.extMSPresentation =Presentación de PowerPoint Microsoft +es.extMSPresentation =Presentación de PowerPoint Microsoft en.extMSSlideshow =Microsoft PowerPoint Slideshow ru.extMSSlideshow =Слайдшоу Microsoft PowerPoint de.extMSSlideshow =Microsoft PowerPoint Slideshow fr.extMSSlideshow =Diaporama Microsoft PowerPoint -sp.extMSSlideshow =Presentación de Microsoft PowerPoint +es.extMSSlideshow =Presentación de Microsoft PowerPoint en.extODT =OpenDocument Text Document ru.extODT =Текстовый документ OpenDocument de.extODT =OpenDocument Textdokument fr.extODT =Document OpenDocument Texte -sp.extODT =Documento de texto de OpenDocument +es.extODT =Documento de texto de OpenDocument en.extODS =OpenDocument Spreadsheet ru.extODS =Электронная таблица OpenDocument de.extODS =OpenDocument Tabelle fr.extODS =Classeur OpenDocument -sp.extODS =Hoja de cálculo de OpenDocument +es.extODS =Hoja de cálculo de OpenDocument en.extODP =OpenDocument Presentation ru.extODP =Презентация OpenDocument de.extODP =OpenDocument  Präsentation fr.extODP =Présentation OpenDocument -sp.extODP =Presentación de OpenDocument +es.extODP =Presentación de OpenDocument [Code] diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss index 988d83347..77f8c455f 100644 --- a/win-linux/package/windows/common.iss +++ b/win-linux/package/windows/common.iss @@ -51,7 +51,7 @@ Name: en; MessagesFile: compiler:Default.isl; LicenseFile: ..\..\..\ Name: ru; MessagesFile: compiler:Languages\Russian.isl; LicenseFile: ..\..\..\common\package\license\{#licfile}.rtf; Name: de; MessagesFile: compiler:Languages\German.isl; LicenseFile: ..\..\..\common\package\license\{#licfile}.rtf; Name: fr; MessagesFile: compiler:Languages\French.isl; LicenseFile: ..\..\..\common\package\license\{#licfile}.rtf; -Name: sp; MessagesFile: compiler:Languages\Spanish.isl; LicenseFile: ..\..\..\common\package\license\{#licfile}.rtf; +Name: es; MessagesFile: compiler:Languages\Spanish.isl; LicenseFile: ..\..\..\common\package\license\{#licfile}.rtf; ;Name: it; MessagesFile: compiler:Languages\Italian.isl; @@ -61,42 +61,42 @@ en.Launch =Launch %1 ru.Launch =Запустить %1 de.Launch =%1 starten fr.Launch =Lancer %1 -sp.Launch =Ejecutar %1 +es.Launch =Ejecutar %1 ;it.Launch =Eseguire %1 ;====================================================================================================== en.CreateDesktopIcon =Create %1 &desktop icon ru.CreateDesktopIcon =Создать иконку %1 на &рабочем столе de.CreateDesktopIcon =%1 &Desktop-Icon erstellen fr.CreateDesktopIcon =Crйer l'icфne du bureau pour %1 -sp.CreateDesktopIcon =Crear %1 &icono en el escritorio +es.CreateDesktopIcon =Crear %1 &icono en el escritorio ;it.CreateDesktopIcon =Creare un collegamento %1 sul &desktop ;====================================================================================================== en.InstallAdditionalComponents =Installing additional system components. Please wait... ru.InstallAdditionalComponents =Установка дополнительных системных компонентов. Пожалуйста, подождите... de.InstallAdditionalComponents =Installation zusдtzlicher Systemkomponenten. Bitte warten... fr.InstallAdditionalComponents =L'installation des composants supplйmentaires du systиme. Attendez... -sp.InstallAdditionalComponents =Instalando componentes adicionales del sistema. Por favor espere... +es.InstallAdditionalComponents =Instalando componentes adicionales del sistema. Por favor espere... ;it.InstallAdditionalComponents =Installazione dei componenti addizionali del sistema. Per favore, attendi... ;====================================================================================================== en.AdditionalTasks =Tasks: ru.AdditionalTasks =Задачи: de.AdditionalTasks =Aufgaben: fr.AdditionalTasks =Tвches: -sp.AdditionalTasks =Tareas: +es.AdditionalTasks =Tareas: ;it.AdditionalTasks =Compiti: ;====================================================================================================== en.Uninstall =Uninstall ru.Uninstall =Удаление de.Uninstall =Deinstallieren fr.Uninstall =Desinstaller -sp.Uninstall =Desinstalar +es.Uninstall =Desinstalar ;it.Uninstall =Disinstalla ;====================================================================================================== en.WarningWrongArchitecture =You are trying to install the %1-bit application version over the %2-bit version installed. Please uninstall the previous version first or download the correct version for installation. ru.WarningWrongArchitecture =Вы устанавливаете %1-битную версию приложения на уже установленную %2-битную. Пожалуйста, удалите предыдущую версию приложения или скачайте подходящую. de.WarningWrongArchitecture =Sie versuchen die %1-Bit-Version der Anwendung über die %2-Bit-Version, die schon installiert ist, zu installieren. Entfernen Sie bitte die Vorgängerversion zuerst oder laden Sie die richtige Version für die Installation herunter. fr.WarningWrongArchitecture =Vous essayez d'installer la version %1-bit sur la version %2-bit déjà installée. Veuillez désinstaller l'ancienne version d'abord ou télécharger la version correcte à installer. -sp.WarningWrongArchitecture =Usted está tratando de instalar la versión de la aplicación de %1 bits sobre la versión de %2 bits instalada. Por favor, desinstale la versión anterior primero o descargue la versión correcta para la instalación. +es.WarningWrongArchitecture =Usted está tratando de instalar la versión de la aplicación de %1 bits sobre la versión de %2 bits instalada. Por favor, desinstale la versión anterior primero o descargue la versión correcta para la instalación. ;it.Uninstall =Disinstalla ;====================================================================================================== diff --git a/win-linux/resources.qrc b/win-linux/resources.qrc index ee097a309..c85feea0f 100644 --- a/win-linux/resources.qrc +++ b/win-linux/resources.qrc @@ -59,7 +59,7 @@ langs/en.qm langs/ru.qm - langs/sp.qm + langs/es.qm langs/fr.qm langs/de.qm diff --git a/win-linux/src/version.h b/win-linux/src/version.h index 7c2c9f6a8..7b7fdb045 100644 --- a/win-linux/src/version.h +++ b/win-linux/src/version.h @@ -33,8 +33,8 @@ #ifndef VERSION_H #define VERSION_H -#define VER_FILEVERSION 4,1,1,254 -#define VER_FILEVERSION_STR "4.1.1.254\0" +#define VER_FILEVERSION 4,1,1,256 +#define VER_FILEVERSION_STR "4.1.1.256\0" #define VER_PRODUCTVERSION VER_FILEVERSION #define VER_PRODUCTVERSION_STR "4.1\0"