diff --git a/apps/documenteditor/main/locale/ca.json b/apps/documenteditor/main/locale/ca.json
index 6149232d60..62e28e7f06 100644
--- a/apps/documenteditor/main/locale/ca.json
+++ b/apps/documenteditor/main/locale/ca.json
@@ -2678,15 +2678,15 @@
"DE.Views.RoleDeleteDlg.textLabel": "Per suprimir aquesta funció, has de moure els camps associats a una altra funció.",
"DE.Views.RoleDeleteDlg.textSelect": "Seleccionar per a la funció de fusió de camp",
"DE.Views.RoleDeleteDlg.textTitle": "Suprimir la funció",
- "DE.Views.RoleEditDlg.capBtnManager": "Administrar les funcions",
+ "DE.Views.FormsTab.capBtnManager": "Administrar les funcions",
"DE.Views.RoleEditDlg.errNameExists": "Ja hi ha una funció amb aquest nom.",
"DE.Views.RoleEditDlg.textEmptyError": "El nom de la funció no pot estar en blanc",
"DE.Views.RoleEditDlg.textName": "Nom de la funció",
"DE.Views.RoleEditDlg.textNoHighlight": "Sense ressaltar",
- "DE.Views.RoleEditDlg.tipManager": "Administrar les funcions",
+ "DE.Views.FormsTab.tipManager": "Administrar les funcions",
"DE.Views.RoleEditDlg.txtTitleEdit": "Editar la funció",
"DE.Views.RoleEditDlg.txtTitleNew": "Crear una nova funció",
- "DE.Views.RolesManagerDlg.closeButtonText ": "Tancar",
+ "DE.Views.RolesManagerDlg.closeButtonText": "Tancar",
"DE.Views.RolesManagerDlg.textAnyone": "Qualsevol",
"DE.Views.RolesManagerDlg.textDelete": "Suprimir",
"DE.Views.RolesManagerDlg.textDeleteLast": "Segur que voleu eliminar la funció {0}?
Un cop eliminada, es podrà crear la funció predeterminada.",
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 43b71bd966..959420aeec 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -2172,6 +2172,8 @@
"DE.Views.FormsTab.txtInlineDesc": "Insert inline text field",
"DE.Views.FormsTab.txtInlineText": "Inline",
"DE.Views.FormsTab.txtUntitled": "Untitled",
+ "DE.Views.FormsTab.capBtnManager": "Manage Roles",
+ "DE.Views.FormsTab.tipManager": "Manage Roles",
"DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom center",
"DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom left",
"DE.Views.HeaderFooterSettings.textBottomPage": "Bottom of Page",
@@ -2678,15 +2680,16 @@
"DE.Views.RoleDeleteDlg.textLabel": "To delete this role, you need to move the fields associated with it to another role.",
"DE.Views.RoleDeleteDlg.textSelect": "Select for field merger role",
"DE.Views.RoleDeleteDlg.textTitle": "Delete Role",
- "DE.Views.RoleEditDlg.capBtnManager": "Manage Roles",
+ "del_DE.Views.RoleEditDlg.capBtnManager": "Manage Roles",
"DE.Views.RoleEditDlg.errNameExists": "Role with such a name already exists.",
"DE.Views.RoleEditDlg.textEmptyError": "Role name must not be empty.",
"DE.Views.RoleEditDlg.textName": "Role name",
"DE.Views.RoleEditDlg.textNoHighlight": "No highlighting",
- "DE.Views.RoleEditDlg.tipManager": "Manage Roles",
+ "del_DE.Views.RoleEditDlg.tipManager": "Manage Roles",
"DE.Views.RoleEditDlg.txtTitleEdit": "Edit Role",
"DE.Views.RoleEditDlg.txtTitleNew": "Create New Role",
- "DE.Views.RolesManagerDlg.closeButtonText ": "Close",
+ "del_DE.Views.RolesManagerDlg.closeButtonText": "Close",
+ "DE.Views.RolesManagerDlg.closeButtonText": "Close",
"DE.Views.RolesManagerDlg.textAnyone": "Anyone",
"DE.Views.RolesManagerDlg.textDelete": "Delete",
"DE.Views.RolesManagerDlg.textDeleteLast": "Are you sure you want to delete the role {0}?
Once deleted, the default role will be created.",
diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json
index f813cf8c53..7a92ec8c2f 100644
--- a/apps/documenteditor/main/locale/es.json
+++ b/apps/documenteditor/main/locale/es.json
@@ -2678,15 +2678,15 @@
"DE.Views.RoleDeleteDlg.textLabel": "Para eliminar este rol, es necesario mover los campos asociados a él a otro rol.",
"DE.Views.RoleDeleteDlg.textSelect": "Seleccione para el rol de fusión de campo",
"DE.Views.RoleDeleteDlg.textTitle": "Eliminar rol",
- "DE.Views.RoleEditDlg.capBtnManager": "Gestionar roles",
+ "DE.Views.FormsTab.capBtnManager": "Gestionar roles",
"DE.Views.RoleEditDlg.errNameExists": "Ya existe un rol con ese nombre.",
"DE.Views.RoleEditDlg.textEmptyError": "El nombre del rol no debe estar vacío.",
"DE.Views.RoleEditDlg.textName": "Nombre del rol",
"DE.Views.RoleEditDlg.textNoHighlight": "No resaltar",
- "DE.Views.RoleEditDlg.tipManager": "Gestionar roles",
+ "DE.Views.FormsTab.tipManager": "Gestionar roles",
"DE.Views.RoleEditDlg.txtTitleEdit": "Editar rol",
"DE.Views.RoleEditDlg.txtTitleNew": "Crear nuevo rol",
- "DE.Views.RolesManagerDlg.closeButtonText ": "Cerrar",
+ "DE.Views.RolesManagerDlg.closeButtonText": "Cerrar",
"DE.Views.RolesManagerDlg.textAnyone": "Cualquiera",
"DE.Views.RolesManagerDlg.textDelete": "Eliminar",
"DE.Views.RolesManagerDlg.textDeleteLast": "¿Está seguro de que desea eliminar el rol {0}?
Una vez eliminado, se creará el rol predeterminado.",
diff --git a/apps/documenteditor/main/locale/eu.json b/apps/documenteditor/main/locale/eu.json
index 16f776fb2d..51191a61e9 100644
--- a/apps/documenteditor/main/locale/eu.json
+++ b/apps/documenteditor/main/locale/eu.json
@@ -2678,15 +2678,15 @@
"DE.Views.RoleDeleteDlg.textLabel": "Rol hau ezabatzeko, berari lotutako eremu guztiak beste rol bati esleitu behar dizkiozu.",
"DE.Views.RoleDeleteDlg.textSelect": "Hautatu eremu-bateratzaile rolerako",
"DE.Views.RoleDeleteDlg.textTitle": "Ezabatu rola",
- "DE.Views.RoleEditDlg.capBtnManager": "Kudeatu rolak",
+ "DE.Views.FormsTab.capBtnManager": "Kudeatu rolak",
"DE.Views.RoleEditDlg.errNameExists": "Izen horretako rola badago dagoeneko.",
"DE.Views.RoleEditDlg.textEmptyError": "Rolaren izenak ezin du hutsik egon.",
"DE.Views.RoleEditDlg.textName": "Rolaren izena",
"DE.Views.RoleEditDlg.textNoHighlight": "Ez nabarmendu",
- "DE.Views.RoleEditDlg.tipManager": "Kudeatu rolak",
+ "DE.Views.FormsTab.tipManager": "Kudeatu rolak",
"DE.Views.RoleEditDlg.txtTitleEdit": "Editatu rola",
"DE.Views.RoleEditDlg.txtTitleNew": "Sortu rol berria",
- "DE.Views.RolesManagerDlg.closeButtonText ": "Itxi",
+ "DE.Views.RolesManagerDlg.closeButtonText": "Itxi",
"DE.Views.RolesManagerDlg.textAnyone": "Edonork",
"DE.Views.RolesManagerDlg.textDelete": "Ezabatu",
"DE.Views.RolesManagerDlg.textDeleteLast": "Ziur zaude {0} rola ezabatu nahi duzula?
Ezabatuz gero, rol lehenetsia sortuko da.",
diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json
index 2d97ecb7a4..180cba9bac 100644
--- a/apps/documenteditor/main/locale/fr.json
+++ b/apps/documenteditor/main/locale/fr.json
@@ -2678,15 +2678,15 @@
"DE.Views.RoleDeleteDlg.textLabel": "Pour supprimer ce rôle, il faut déplacer les champs qui lui sont associés vers un autre rôle.",
"DE.Views.RoleDeleteDlg.textSelect": "Sélectionner pour le rôle de fusion de champs",
"DE.Views.RoleDeleteDlg.textTitle": "Supprimer le rôle",
- "DE.Views.RoleEditDlg.capBtnManager": "Gérer les rôles",
+ "DE.Views.FormsTab.capBtnManager": "Gérer les rôles",
"DE.Views.RoleEditDlg.errNameExists": "Le rôle portant ce nom existe déjà.",
"DE.Views.RoleEditDlg.textEmptyError": "Le nom du rôle ne doit pas être vide.",
"DE.Views.RoleEditDlg.textName": "Nom du rôle",
"DE.Views.RoleEditDlg.textNoHighlight": "Pas de surbrillance ",
- "DE.Views.RoleEditDlg.tipManager": "Gérer les rôles",
+ "DE.Views.FormsTab.tipManager": "Gérer les rôles",
"DE.Views.RoleEditDlg.txtTitleEdit": "Modifier le rôle",
"DE.Views.RoleEditDlg.txtTitleNew": "Créer un nouveau rôle",
- "DE.Views.RolesManagerDlg.closeButtonText ": "Fermer",
+ "DE.Views.RolesManagerDlg.closeButtonText": "Fermer",
"DE.Views.RolesManagerDlg.textAnyone": "Tout le monde",
"DE.Views.RolesManagerDlg.textDelete": "Supprimer",
"DE.Views.RolesManagerDlg.textDeleteLast": "Êtes-vous sûr de vouloir supprimer le rôle {0}?
Une fois supprimé, le rôle par défaut sera créé.",
diff --git a/apps/documenteditor/main/locale/hy.json b/apps/documenteditor/main/locale/hy.json
index 849ebf5543..e3b54b66d7 100644
--- a/apps/documenteditor/main/locale/hy.json
+++ b/apps/documenteditor/main/locale/hy.json
@@ -2678,15 +2678,15 @@
"DE.Views.RoleDeleteDlg.textLabel": "Այս դերը ջնջելու համար հարկավոր է դրա հետ կապված դաշտերը տեղափոխել այլ դեր:",
"DE.Views.RoleDeleteDlg.textSelect": "Ընտրել դաշտի միաձուլման դերի համար",
"DE.Views.RoleDeleteDlg.textTitle": "Ջնջել Դերը",
- "DE.Views.RoleEditDlg.capBtnManager": "Կառավարել դերերը",
+ "DE.Views.FormsTab.capBtnManager": "Կառավարել դերերը",
"DE.Views.RoleEditDlg.errNameExists": "Նման անունով դեր արդեն գոյություն ունի։",
"DE.Views.RoleEditDlg.textEmptyError": "Դերի անվանումը չպետք է դատարկ լինի:",
"DE.Views.RoleEditDlg.textName": "Դերի անվանում",
"DE.Views.RoleEditDlg.textNoHighlight": "Առանց գունանշման",
- "DE.Views.RoleEditDlg.tipManager": "Կառավարել դերերը",
+ "DE.Views.FormsTab.tipManager": "Կառավարել դերերը",
"DE.Views.RoleEditDlg.txtTitleEdit": "Խմբագրել դերը",
"DE.Views.RoleEditDlg.txtTitleNew": "Ստեղծել նոր դեր",
- "DE.Views.RolesManagerDlg.closeButtonText ": "Փակել",
+ "DE.Views.RolesManagerDlg.closeButtonText": "Փակել",
"DE.Views.RolesManagerDlg.textAnyone": "Յուրաքանչյուրը",
"DE.Views.RolesManagerDlg.textDelete": "Ջնջել",
"DE.Views.RolesManagerDlg.textDeleteLast": "Համոզվա՞ծ եք, որ ցանկանում եք ջնջել {0} դերը:
Մեկ անգամ ջնջվելուց հետո, առաջադրված դերը կստեղծվի:",
diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json
index 5fc9d5d010..5529233d25 100644
--- a/apps/documenteditor/main/locale/pt.json
+++ b/apps/documenteditor/main/locale/pt.json
@@ -2677,15 +2677,15 @@
"DE.Views.RoleDeleteDlg.textLabel": "Para excluir esta função, você precisa mover os campos associados a ela para outra função.",
"DE.Views.RoleDeleteDlg.textSelect": "Selecione para função de fusão de campo",
"DE.Views.RoleDeleteDlg.textTitle": "Excluir função",
- "DE.Views.RoleEditDlg.capBtnManager": "Gerenciar funções",
+ "DE.Views.FormsTab.capBtnManager": "Gerenciar funções",
"DE.Views.RoleEditDlg.errNameExists": "A função com esse nome já existe.",
"DE.Views.RoleEditDlg.textEmptyError": "O nome da função não deve estar vazio.",
"DE.Views.RoleEditDlg.textName": "Nome do papel",
"DE.Views.RoleEditDlg.textNoHighlight": "Sem destaque",
- "DE.Views.RoleEditDlg.tipManager": "Gerenciar funções",
+ "DE.Views.FormsTab.tipManager": "Gerenciar funções",
"DE.Views.RoleEditDlg.txtTitleEdit": "Editar papel",
"DE.Views.RoleEditDlg.txtTitleNew": "Criar nova função",
- "DE.Views.RolesManagerDlg.closeButtonText ": "Fechar",
+ "DE.Views.RolesManagerDlg.closeButtonText": "Fechar",
"DE.Views.RolesManagerDlg.textAnyone": "Alguém",
"DE.Views.RolesManagerDlg.textDelete": "Excluir",
"DE.Views.RolesManagerDlg.textDescription": "Adicione funções e defina a ordem em que os responsáveis recebem e assinam o documento",
diff --git a/apps/documenteditor/main/locale/ro.json b/apps/documenteditor/main/locale/ro.json
index 8caa488237..bd41c0af65 100644
--- a/apps/documenteditor/main/locale/ro.json
+++ b/apps/documenteditor/main/locale/ro.json
@@ -2678,15 +2678,15 @@
"DE.Views.RoleDeleteDlg.textLabel": "Pentru a șterge acest rol, toate câmpurile asociate trebuie trecute la un alt rol.",
"DE.Views.RoleDeleteDlg.textSelect": "Selectați rol câmp de îmbinare",
"DE.Views.RoleDeleteDlg.textTitle": "Ștergere rol",
- "DE.Views.RoleEditDlg.capBtnManager": "Gestionare roluri",
+ "DE.Views.FormsTab.capBtnManager": "Gestionare roluri",
"DE.Views.RoleEditDlg.errNameExists": "Rol cu numele specificat există deja.",
"DE.Views.RoleEditDlg.textEmptyError": "Câmpul Nume rol nu trebuie să fie gol.",
"DE.Views.RoleEditDlg.textName": "Nume rol",
"DE.Views.RoleEditDlg.textNoHighlight": "Fără evidențiere",
- "DE.Views.RoleEditDlg.tipManager": "Gestionare roluri",
+ "DE.Views.FormsTab.tipManager": "Gestionare roluri",
"DE.Views.RoleEditDlg.txtTitleEdit": "Editare rol",
"DE.Views.RoleEditDlg.txtTitleNew": "Creați un rol nou",
- "DE.Views.RolesManagerDlg.closeButtonText ": "Închide",
+ "DE.Views.RolesManagerDlg.closeButtonText": "Închide",
"DE.Views.RolesManagerDlg.textAnyone": "Orice utilizator",
"DE.Views.RolesManagerDlg.textDelete": "Ștergere",
"DE.Views.RolesManagerDlg.textDeleteLast": " Sunteți sigur că doriți să ștergeți rolul {0}?
Odată șters, va fi creat un rol implicit.",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index 3834421f78..f68a5bed60 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -2678,15 +2678,15 @@
"DE.Views.RoleDeleteDlg.textLabel": "Чтобы удалить эту роль, надо перенести связанные с ней поля в другую роль.",
"DE.Views.RoleDeleteDlg.textSelect": "Выберите для роли слияния полей",
"DE.Views.RoleDeleteDlg.textTitle": "Удалить роль",
- "DE.Views.RoleEditDlg.capBtnManager": "Управление ролями",
+ "DE.Views.FormsTab.capBtnManager": "Управление ролями",
"DE.Views.RoleEditDlg.errNameExists": "Роль с таким названием уже существует.",
"DE.Views.RoleEditDlg.textEmptyError": "Название роли не может быть пустым.",
"DE.Views.RoleEditDlg.textName": "Название роли",
"DE.Views.RoleEditDlg.textNoHighlight": "Без подсветки",
- "DE.Views.RoleEditDlg.tipManager": "Управление ролями",
+ "DE.Views.FormsTab.tipManager": "Управление ролями",
"DE.Views.RoleEditDlg.txtTitleEdit": "Редактировать роль",
"DE.Views.RoleEditDlg.txtTitleNew": "Создать новую роль",
- "DE.Views.RolesManagerDlg.closeButtonText ": "Закрыть",
+ "DE.Views.RolesManagerDlg.closeButtonText": "Закрыть",
"DE.Views.RolesManagerDlg.textAnyone": "Любой",
"DE.Views.RolesManagerDlg.textDelete": "Удалить",
"DE.Views.RolesManagerDlg.textDeleteLast": "Вы действительно хотите удалить роль {0}?
После удаления будет создана роль по умолчанию.",
diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
index 44162d1c03..d4329bf28f 100644
--- a/apps/presentationeditor/main/app/controller/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -1248,6 +1248,10 @@ define([
offsetLeft += (sdkPanelLeft.css('display') !== 'none') ? sdkPanelLeft.width() : 0;
var showPoint = [Math.max(0, coord.asc_getX() + coord.asc_getWidth() + 3 - offsetLeft), coord.asc_getY() + coord.asc_getHeight() + 3];
+ if (me.btnSpecialPaste.menu.isVisible() && (parseInt(pasteContainer.css('left')) !== showPoint[0] || parseInt(pasteContainer.css('top')) !== showPoint[1])) {
+ me.btnSpecialPaste.menu.hide();
+ }
+
pasteContainer.css({left: showPoint[0], top : showPoint[1]});
pasteContainer.show();
setTimeout(function() {