diff --git a/include/Webservices/DescribeObject.php b/include/Webservices/DescribeObject.php
index 2de2d89fc9ff78c99e22ffe0c58505b00502e078..af69a554b1e0bceb663531ec6c7fdfe943812732 100644
--- a/include/Webservices/DescribeObject.php
+++ b/include/Webservices/DescribeObject.php
@@ -10,7 +10,15 @@
function vtws_describe($elementType,$user){
- global $log,$adb;
+ global $log,$adb,$app_strings;
+
+ //setting $app_strings
+ if (!$app_strings) {
+ $currentLanguage = Vtiger_Language_Handler::getLanguage();
+ $moduleLanguageStrings = Vtiger_Language_Handler::getModuleStringsFromFile($currentLanguage);
+ $app_strings = $moduleLanguageStrings['languageStrings'];
+ }
+
$webserviceObject = VtigerWebserviceObject::fromName($adb,$elementType);
$handlerPath = $webserviceObject->getHandlerPath();
$handlerClass = $webserviceObject->getHandlerClass();
diff --git a/layouts/v7/modules/Documents/partials/SidebarHeader.tpl b/layouts/v7/modules/Documents/partials/SidebarHeader.tpl
index 1a44242bce1631445f576181b40966e43817b057..2c68620021ca92ad0d90c9c4f80d419b4bbdd5e8 100644
--- a/layouts/v7/modules/Documents/partials/SidebarHeader.tpl
+++ b/layouts/v7/modules/Documents/partials/SidebarHeader.tpl
@@ -15,7 +15,7 @@
]}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY} moduleIcon">
<div class="row" title="{vtranslate("Documents",$MODULE)}">
- <span>{$MODULE_MODEL->getModuleIcon()}</span>
+ <span class="app-indicator-icon fa vicon-documents"></span>
</div>
</div>
diff --git a/layouts/v7/modules/Settings/ModuleManager/resources/ModuleImport.js b/layouts/v7/modules/Settings/ModuleManager/resources/ModuleImport.js
index 5b11638a71ac7f859d0b8187d09cd2f38cd5b6b3..12433a385ac9398bea8d548787633cd6dba17c25 100644
--- a/layouts/v7/modules/Settings/ModuleManager/resources/ModuleImport.js
+++ b/layouts/v7/modules/Settings/ModuleManager/resources/ModuleImport.js
@@ -7,4 +7,4 @@
* All Rights Reserved.
*************************************************************************************/
-Settings_Module_Manager_Js('Settings_ModuleManager_ModuleImport_Js', {}, {});
\ No newline at end of file
+Settings_ModuleManager_List_Js('Settings_ModuleManager_ModuleImport_Js', {}, {});
\ No newline at end of file
diff --git a/layouts/v7/modules/Settings/ModuleManager/resources/ModuleManager.js b/layouts/v7/modules/Settings/ModuleManager/resources/ModuleManager.js
index f90107f19c0d400148a473a8561ddac04f47861d..1755ccd9f575ca9c5058809d9788d9407f745d44 100644
--- a/layouts/v7/modules/Settings/ModuleManager/resources/ModuleManager.js
+++ b/layouts/v7/modules/Settings/ModuleManager/resources/ModuleManager.js
@@ -7,7 +7,7 @@
* All Rights Reserved.
*************************************************************************************/
-Vtiger_Index_Js('Settings_Module_Manager_Js', {
+Vtiger_Index_Js('Settings_ModuleManager_List_Js', {
}, {
/*
* function to update the module status for the module
@@ -68,7 +68,7 @@ Vtiger_Index_Js('Settings_Module_Manager_Js', {
}
});
- container.on('click', '.finishButton', function() {
+ container.on('click', '.finishButton', function () {
window.location.href = jQuery('[data-name="VTLIB_LBL_MODULE_MANAGER"]').attr('href');
});
@@ -96,9 +96,9 @@ Vtiger_Index_Js('Settings_Module_Manager_Js', {
app.helper.showProgress();
- AppConnector.request(params).then(
- function (data) {
- app.helper.hideProgress();
+ AppConnector.request(params).then(
+ function (data) {
+ app.helper.hideProgress();
element.addClass('hide');
var headerMessage, containerMessage;
@@ -110,7 +110,7 @@ Vtiger_Index_Js('Settings_Module_Manager_Js', {
containerMessage = app.vtranslate('JS_IMPORTED_MODULE');
}
app.helper.showSuccessNotification({'title': headerMessage, 'message': data.result.importModuleName+' '+containerMessage});
- setTimeout(function() {
+ setTimeout(function () {
window.location.href = jQuery('[data-name="VTLIB_LBL_MODULE_MANAGER"]').attr('href');
}, 3000);
}
diff --git a/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateEntityTask.tpl b/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateEntityTask.tpl
index c07d53e5caebf7109acd66738eec4378c7e83be3..d59abbd21fdbd63f8b194abe92d8352eb87df922 100644
--- a/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateEntityTask.tpl
+++ b/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateEntityTask.tpl
@@ -35,7 +35,7 @@
</div>
</div>
</div><br>
- <div id="addCreateEntityContainer">
+ <div id="addCreateEntityContainer" style="margin-bottom: 70px;">
{include file="CreateEntity.tpl"|@vtemplate_path:$QUALIFIED_MODULE}
</div>
{/strip}
diff --git a/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateEventTask.tpl b/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateEventTask.tpl
index e11764ce2c1ba06525d25efed3e77dad65e5dc58..f67023b3189dac47e58694db7f535729e9d0961a 100644
--- a/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateEventTask.tpl
+++ b/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateEventTask.tpl
@@ -11,7 +11,7 @@
-->*}
{strip}
{assign var=SHOWN_FIELDS_LIST value=array()}
- <div class="row">
+ <div class="row" style="margin-bottom: 70px;">
<div class="col-sm-9 col-xs-9">
<div class="row form-group">
<div class="col-sm-2 col-xs-2">{vtranslate('LBL_EVENT_NAME',$QUALIFIED_MODULE)}<span class="redColor">*</span></div>
diff --git a/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateTodoTask.tpl b/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateTodoTask.tpl
index 63931b3e47fa6d08e7817a7008271bc7e2c445bd..c1149bd40d6bae7468fe6da6d86aff2721cf9162 100644
--- a/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateTodoTask.tpl
+++ b/layouts/v7/modules/Settings/Workflows/Tasks/VTCreateTodoTask.tpl
@@ -11,7 +11,7 @@
-->*}
{strip}
{assign var=SHOWN_FIELDS_LIST value=array()}
- <div class="row">
+ <div class="row" style="margin-bottom: 70px;">
<div class="col-sm-9 col-xs-9">
<div class="row form-group">
<div class="col-sm-2 col-xs-2">{vtranslate('LBL_TITLE',$QUALIFIED_MODULE)}<span class="redColor">*</span></div>
diff --git a/layouts/v7/modules/Settings/Workflows/Tasks/VTEmailTask.tpl b/layouts/v7/modules/Settings/Workflows/Tasks/VTEmailTask.tpl
index 0ce9eb6f1d8e1bbae35885189ce84209071b74eb..9a8e0697d4f1c44b9c28bb0f028734edc82471c0 100644
--- a/layouts/v7/modules/Settings/Workflows/Tasks/VTEmailTask.tpl
+++ b/layouts/v7/modules/Settings/Workflows/Tasks/VTEmailTask.tpl
@@ -10,7 +10,7 @@
{strip}
<div id="VtEmailTaskContainer">
<div class="row">
- <div class="col-sm-12 col-xs-12">
+ <div class="col-sm-12 col-xs-12" style="margin-bottom: 70px;">
<div class="row form-group" >
<div class="col-sm-6 col-xs-6">
<div class="row">
diff --git a/layouts/v7/modules/Settings/Workflows/Tasks/VTSMSTask.tpl b/layouts/v7/modules/Settings/Workflows/Tasks/VTSMSTask.tpl
index c6d7b18d8d4162d5f91d4d24c72493a184f04188..53e58c8a2b93e2ed0411c647d50cedfbf0a9b651 100644
--- a/layouts/v7/modules/Settings/Workflows/Tasks/VTSMSTask.tpl
+++ b/layouts/v7/modules/Settings/Workflows/Tasks/VTSMSTask.tpl
@@ -10,7 +10,7 @@
********************************************************************************/
-->*}
{strip}
- <div class="row">
+ <div class="row" style="margin-bottom: 70px;">
<div class="col-lg-9">
<div class="row form-group">
<div class="col-lg-2">{vtranslate('LBL_RECEPIENTS',$QUALIFIED_MODULE)}<span class="redColor">*</span></div>
diff --git a/layouts/v7/modules/Settings/Workflows/Tasks/VTUpdateFieldsTask.tpl b/layouts/v7/modules/Settings/Workflows/Tasks/VTUpdateFieldsTask.tpl
index 0f160d8a88e3c755eef3a813d378725b7688ab61..98e5d34ac7d798340d59f85480fd6ba9a128fb59 100644
--- a/layouts/v7/modules/Settings/Workflows/Tasks/VTUpdateFieldsTask.tpl
+++ b/layouts/v7/modules/Settings/Workflows/Tasks/VTUpdateFieldsTask.tpl
@@ -16,7 +16,7 @@
<div>
<button type="button" class="btn btn-default" id="addFieldBtn">{vtranslate('LBL_ADD_FIELD',$QUALIFIED_MODULE)}</button>
</div><br>
- <div class="conditionsContainer" id="save_fieldvaluemapping">
+ <div class="conditionsContainer" id="save_fieldvaluemapping" style="margin-bottom: 70px;">
{assign var=FIELD_VALUE_MAPPING value=ZEND_JSON::decode($TASK_OBJECT->field_value_mapping)}
<input type="hidden" id="fieldValueMapping" name="field_value_mapping" value='{Vtiger_Util_Helper::toSafeHTML($TASK_OBJECT->field_value_mapping)}' />
{foreach from=$FIELD_VALUE_MAPPING item=FIELD_MAP}
diff --git a/modules/Migration/schema/701_to_710.php b/modules/Migration/schema/701_to_710.php
index f1397e98e085542857aea347a7eba2cca964aabe..f0b0c03c289ad44fbfe032d21145b13852a248ae 100644
--- a/modules/Migration/schema/701_to_710.php
+++ b/modules/Migration/schema/701_to_710.php
@@ -169,6 +169,13 @@ if (defined('VTIGER_UPGRADE')) {
echo '<br>Succecssfully added source column vtiger tab table<br>';
//END::Differentiate custom modules from Vtiger modules
+ //START::Google calendar sync settings
+ if (!Vtiger_Utils::CheckTable('vtiger_google_event_calendar_mapping')) {
+ $db->pquery('CREATE TABLE vtiger_google_event_calendar_mapping (event_id varchar(255) DEFAULT NULL, calendar_id varchar(255) DEFAULT NULL, user_id int(11) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8', array());
+ echo '<br>Succecssfully vtiger_google_event_calendar_mapping table created<br>';
+ }
+ //END::Google calendar sync settings
+
//Update existing package modules
Install_Utils_Model::installModules();
diff --git a/modules/Vtiger/handlers/CheckDuplicateHandler.php b/modules/Vtiger/handlers/CheckDuplicateHandler.php
index 5247a637bcdad8336a4133dce2ad13cdcd82cd87..149f30db65c34720a9d0b0a728f595cc4066b630 100644
--- a/modules/Vtiger/handlers/CheckDuplicateHandler.php
+++ b/modules/Vtiger/handlers/CheckDuplicateHandler.php
@@ -154,8 +154,7 @@ class CheckDuplicateHandler extends VTEventHandler {
}
if (count($conditions) > 0) {
- $conditionGlue = ($moduleModel->duplicateCondition == 'all') ? 'AND' : 'OR';
- $conditionsSql = implode(" $conditionGlue ", $conditions);
+ $conditionsSql = implode(" AND ", $conditions);
$query .= " AND ($conditionsSql)";
}
diff --git a/modules/Vtiger/handlers/FollowRecordHandler.php b/modules/Vtiger/handlers/FollowRecordHandler.php
index dad1cd2264a74f31f07a01bb06c24a87cbbfa820..80952ca9e8f4db2a5ae22f574798f89f6058beeb 100644
--- a/modules/Vtiger/handlers/FollowRecordHandler.php
+++ b/modules/Vtiger/handlers/FollowRecordHandler.php
@@ -150,7 +150,7 @@ class FollowRecordHandler extends VTEventHandler {
$mailer->AddCustomHeader("In-Reply-To", $generatedMessageId);
$mailer->AddAddress($toEmailId);
- $response = $mailer->Send();
+ $response = $mailer->Send(true);
}
var $activeAdmin = '';
diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index 3625c8c96d3b2631eef15241b80d063ca180c93f..e56f22c20dc73fefeef2503bdcc6131e36d5e7ba 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/packages/vtiger/optional/Google.zip b/packages/vtiger/optional/Google.zip
index f0fa88f6e63fca659e3cdcf91b18fdfe77197290..04c41cd6d013a83f1b4b4b4ca071799cec2ebc4c 100644
Binary files a/packages/vtiger/optional/Google.zip and b/packages/vtiger/optional/Google.zip differ
diff --git a/pkg/vtiger/modules/Google/languages/en_us/Google.php b/pkg/vtiger/modules/Google/languages/en_us/Google.php
index ec2e76db46b05543a5649d09ffd616c4e9303773..3f3f77d9057fbb720a67ec357c5660864a7ae307 100644
--- a/pkg/vtiger/modules/Google/languages/en_us/Google.php
+++ b/pkg/vtiger/modules/Google/languages/en_us/Google.php
@@ -76,7 +76,8 @@
'LBL_CHANGE_USER' => 'Change User',
'LBL_SAVE_AND_IMPORT' => 'Save and Import',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google Import results',
-
+ 'LBL_REDIRECT_URL' => 'Redirect url',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Copy the following redirect url and paste in your google auth project as image shows',
);
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => 'Synchronize Now',
diff --git a/pkg/vtiger/modules/Google/layouts/v7/modules/Google/ExtensionSettings.tpl b/pkg/vtiger/modules/Google/layouts/v7/modules/Google/ExtensionSettings.tpl
index 5718b48f469a638175de841c8106a72cd323faa8..80c98bb5cd6641d9b277b5684f7f9335dae58c5c 100644
--- a/pkg/vtiger/modules/Google/layouts/v7/modules/Google/ExtensionSettings.tpl
+++ b/pkg/vtiger/modules/Google/layouts/v7/modules/Google/ExtensionSettings.tpl
@@ -126,6 +126,20 @@
</div>
</div>
{/if}
+ <br>
+ <div class="row">
+ <div class="col-sm-12 col-xs-12">
+ <div class="vt-default-callout vt-info-callout">
+ <h4 class="vt-callout-header"><span class="fa fa-info-circle"></span> Info </h4><br>
+ <div>
+ {vtranslate('LBL_REDIRECT_URL_MESSAGE', $MODULE)}<br><br>
+ {vtranslate('LBL_REDIRECT_URL', $MODULE)} : <span style="color: #15c !important">{Google_Config_Connector::getRedirectUrl()}</span>
+ </div>
+ <br>
+ <img src="modules/Google/images/redirect_uri.png" />
+ </div>
+ </div>
+ </div>
<div style="margin-top: 8%;">
<div>
<button id="saveSettings" type="submit" class="btn btn-success saveButton">{vtranslate('LBL_SAVE_SETTINGS', $MODULENAME)}</button>
diff --git a/pkg/vtiger/modules/Google/modules/Google/connectors/Config.php b/pkg/vtiger/modules/Google/modules/Google/connectors/Config.php
index cb471c30ed80b500de285e8d7e757f18a4e5ebc0..b709cc231c42fe217a42c94712fb734315229c9d 100644
--- a/pkg/vtiger/modules/Google/modules/Google/connectors/Config.php
+++ b/pkg/vtiger/modules/Google/modules/Google/connectors/Config.php
@@ -11,5 +11,9 @@
Class Google_Config_Connector {
static $clientId = '';
static $clientSecret = '';
- static $redirectUrl = '';
+
+ static function getRedirectUrl() {
+ global $site_URL;
+ return $site_URL.'index.php?module=Google&view=Authenticate&service=Google';
+ }
}
diff --git a/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php b/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php
index 501cec807a6f9c6a981b3ad5d1d878704405eac1..bbed6e2522a009dd6cf59217a8f8a15b6093fdf8 100644
--- a/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php
+++ b/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php
@@ -60,7 +60,7 @@ class Google_Oauth2_Connector {
$this->service_name = $this->service_provider . $module;
$this->client_id = Google_Config_Connector::$clientId;
$this->client_secret = Google_Config_Connector::$clientSecret;
- $this->redirect_uri = Google_Config_Connector::$redirectUrl;
+ $this->redirect_uri = Google_Config_Connector::getRedirectUrl();
$this->scope = $this->scopes[$this->source_module];
}
diff --git a/pkg/vtiger/modules/Google/modules/Google/images/redirect_uri.png b/pkg/vtiger/modules/Google/modules/Google/images/redirect_uri.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1039b233597e493bb07d31d4c54cee00523c3bd
Binary files /dev/null and b/pkg/vtiger/modules/Google/modules/Google/images/redirect_uri.png differ
diff --git a/pkg/vtiger/modules/Google/modules/Google/views/Authenticate.php b/pkg/vtiger/modules/Google/modules/Google/views/Authenticate.php
new file mode 100644
index 0000000000000000000000000000000000000000..208af4745b858d48a1a7c7add164aa69b1b1bf3a
--- /dev/null
+++ b/pkg/vtiger/modules/Google/modules/Google/views/Authenticate.php
@@ -0,0 +1,29 @@
+<?php
+/* +***********************************************************************************
+ * The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is: vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ * *********************************************************************************** */
+
+class Google_Authenticate_View extends Vtiger_Index_View {
+
+ public function checkPermission(Vtiger_Request $request) {
+ $moduleName = $request->getModule();
+
+ $recordPermission = Users_Privileges_Model::isPermitted($moduleName, 'index');
+ if(!$recordPermission) {
+ throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
+ }
+
+ return true;
+ }
+
+ public function process(Vtiger_Request $request) {
+ $moduleName = $request->getModule();
+ $oauth2Connector = new Google_Oauth2_Connector($moduleName);
+ $oauth2Connector->authorize();
+ }
+}
diff --git a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js
index 03030ec0f9ceb0f3c6da1cc93978dc493e0b7d8d..97d55852c944ee52efcb794d7b2e675783cde82c 100644
--- a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js
+++ b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js
@@ -308,21 +308,23 @@ Vtiger_List_Js("MailManager_List_Js", {}, {
*/
loadMailContents : function(folderName){
var mailids = jQuery('input[name="folderMailIds"]').val();
- mailids = mailids.split(",");
- var params = {
- 'module' : 'MailManager',
- 'action' : 'Folder',
- 'mode' : 'showMailContent',
- 'mailids' : mailids,
- 'folderName':folderName
- };
- app.request.post({"data" : params}).then(function(error, responseData) {
- for(var k in responseData){
- var messageContent = responseData[k];
- var messageEle = jQuery('#mmMailEntry_'+k);
- messageEle.find('.mmMailDesc').html(messageContent);
- }
- });
+ if (typeof mailids !== 'undefined') {
+ mailids = mailids.split(",");
+ var params = {
+ 'module' : 'MailManager',
+ 'action' : 'Folder',
+ 'mode' : 'showMailContent',
+ 'mailids' : mailids,
+ 'folderName':folderName
+ };
+ app.request.post({"data" : params}).then(function(error, responseData) {
+ for(var k in responseData){
+ var messageContent = responseData[k];
+ var messageEle = jQuery('#mmMailEntry_'+k);
+ messageEle.find('.mmMailDesc').html(messageContent);
+ }
+ });
+ }
},
registerFolderMailDeleteEvent : function() {
diff --git a/pkg/vtiger/translations/Arabic_ar_ae/modules/Google.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Google.php
index 84be1c74eff3a86f496876a602fd46d8b47b79a3..8097364d680392370529378af2bf26670265c224 100644
--- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Google.php
+++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'ØÙظ Ùˆ استيراد',
'LBL_IMPORT_RESULTS_GOOGLE' => 'جوجل استيراد النتائج',
+ 'LBL_REDIRECT_URL' => 'إعادة توجيه URL',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'انسخ الرابط توجيه التالية ولصقها ÙÙŠ مشروع المصادقة جوجل الخاص بك كما يظهر صورة',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "مزامنة الآن",
'LBL_SYNCRONIZING' => "مزامنة ....",
diff --git a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Google.php b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Google.php
index 7cd871e984a37ac3f114414d765888ba74163b55..080a3befa32d046494a857d93bb4619ba8522607 100644
--- a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Google.php
+++ b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Google.php
@@ -76,10 +76,12 @@
'LBL_CHANGE_USER' => 'Alterar Usuário',
'LBL_SAVE_AND_IMPORT' => 'Salvar e Importar',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Resultado Importação Google',
-
- );
+
+ 'LBL_REDIRECT_URL' => 'redirecionar url',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Copie o seguinte URL de redirecionamento e colar no seu projeto auth google como mostra a imagem',
+);
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => 'Sincronizar Agora',
'LBL_SYNCRONIZING' => 'Sincronizando....',
'LBL_NOT_SYNCRONIZE' => 'Você ainda não sincronizou'
- );
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Google.php b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Google.php
index e6b8ff88063d9fd7ebdfa24807813e54d60289cf..dbafdf4be50001b2d75f58fe748f0a6a8113b837 100644
--- a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Google.php
+++ b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Save and Import',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google Import results',
+ 'LBL_REDIRECT_URL' => 'Redirect url',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Copy the following redirect url and paste in your google auth project as image shows',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Synchronize Now",
'LBL_SYNCRONIZING' => "Synchronizing....",
diff --git a/pkg/vtiger/translations/Deutsch/modules/Google.php b/pkg/vtiger/translations/Deutsch/modules/Google.php
index bb790e4a7f646b97f3b7c5e42949fcc06fcc878b..7e49687c6493a857365c77f8298bd916776d17cb 100644
--- a/pkg/vtiger/translations/Deutsch/modules/Google.php
+++ b/pkg/vtiger/translations/Deutsch/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Speichern und Importieren',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google Importieren Ergebnisse',
+ 'LBL_REDIRECT_URL' => 'Umleitungs-uRL',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Kopieren Sie die folgende Umleitungs-URL und fügen Sie ihn in Ihrem Google-Auth-Projekt als Bild zeigt',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Jetzt synchronisieren",
'LBL_SYNCRONIZING' => "Synchronisieren ....",
diff --git a/pkg/vtiger/translations/Dutch/modules/Google.php b/pkg/vtiger/translations/Dutch/modules/Google.php
index 06ee1100d610ee2615b7b6bcb57c437ad709250a..93eaf72d74a30d02bac1b582975c5e7f98c6e5a2 100644
--- a/pkg/vtiger/translations/Dutch/modules/Google.php
+++ b/pkg/vtiger/translations/Dutch/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Opslaan en Importeren',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google Importeren resultaten',
+ 'LBL_REDIRECT_URL' => 'redirect url',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Kopieer de volgende redirect url en plakken in uw Google-authenticatie project als afbeelding laat zien',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Nu synchroniseren",
'LBL_SYNCRONIZING' => "Synchroniseren ....",
diff --git a/pkg/vtiger/translations/French/modules/Google.php b/pkg/vtiger/translations/French/modules/Google.php
index cadda34d96e9fc128a5192dcea1944566064f335..7075c848726b496ccff4b84ea18aceeaa5503d66 100755
--- a/pkg/vtiger/translations/French/modules/Google.php
+++ b/pkg/vtiger/translations/French/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Enregistrer et Importer',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google Importer les résultats',
+ 'LBL_REDIRECT_URL' => 'URL de redirection',
+ 'LBL_REDIRECT_URL_MESSAGE' => "Copiez l'URL de redirection suivant et coller dans votre projet google auth comme image montre",
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Synchroniser maintenant",
'LBL_SYNCRONIZING' => "Synchronisation ....",
diff --git a/pkg/vtiger/translations/Hungarian/modules/Google.php b/pkg/vtiger/translations/Hungarian/modules/Google.php
index 7b82ae2c7440c9e8f14cc2b0adbcdb900a303ed9..b1ac8b203d389be72875b4cb9d8ffa2ef8bc8be9 100644
--- a/pkg/vtiger/translations/Hungarian/modules/Google.php
+++ b/pkg/vtiger/translations/Hungarian/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'A mentés gombra, majd Importálja',
'LBL_IMPORT_RESULTS_GOOGLE' => 'A Google Import eredmények',
+ 'LBL_REDIRECT_URL' => 'átirányÃtási uRL-t',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Másold az alábbi átirányÃtási URL-t és illessze be a google auth projekt kép is mutatja',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Szinkronizálása most",
'LBL_SYNCRONIZING' => "Szinkronizálása ....",
diff --git a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Google.php b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Google.php
index 3fc7e6229e6a5dd89e9fc5c145ef356403e83ba4..33b5acdecf8390586df62f37a866ccbd46c4ba23 100644
--- a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Google.php
+++ b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Salvare e Importare',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google Importazione risultati',
+ 'LBL_REDIRECT_URL' => 'URL di reindirizzamento',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Copiare il seguente URL di reindirizzamento e incollare nel vostro progetto di autenticazione di Google come spettacoli di immagini',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Sincronizzare Ora",
'LBL_SYNCRONIZING' => "Sincronizzazione ....",
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Google.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Google.php
index 9c62f19897f7cdcb30ec9b89d0cb3f66535fb430..3d2355e663ac30017a7c83392abc0a75ffc57ca5 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Google.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Guardar e Importar',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google Importar los resultados',
+ 'LBL_REDIRECT_URL' => 'Redireccionar URL',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Copia el siguiente URL de redireccionamiento y pegar en su proyecto de autenticación Google como muestra la imagen',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Sincronizar Ahora",
'LBL_SYNCRONIZING' => "Sincronizar ....",
diff --git a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Google.php b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Google.php
index 5566915fb723ccbf7c5e77143c3f58c27365fd4c..76597b9318b4a94cb050a4e6a6a64de88fecd980 100755
--- a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Google.php
+++ b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Zapisz i importować',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google importu wyników',
+ 'LBL_REDIRECT_URL' => 'przekierowanie',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Skopiuj poniższy link i wklej przekierowania w projekcie auth google jak pokazuje obrazu',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Synchronizuj teraz",
'LBL_SYNCRONIZING' => "Synchronizacji ....",
diff --git a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Google.php b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Google.php
index dde026adf22cd746faca8f561d3ef378b19dcbfb..cfd320614a139687f870b376a6bccd9ae5e75253 100644
--- a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Google.php
+++ b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'De a păstra și de import',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google import rezultate',
+ 'LBL_REDIRECT_URL' => 'Adresă URL de redirecționare',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Copiați următorul URL de redirecționare și inserați în proiectul dvs. autorizare Google după cum arată imagine',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Sincroniza acum",
'LBL_SYNCRONIZING' => "Sincronizarea ....",
diff --git a/pkg/vtiger/translations/Russian/modules/Google.php b/pkg/vtiger/translations/Russian/modules/Google.php
index f0739f512e1de999100361f48c9ee4ec56fb4a03..12d71348dcef83a06911d9546321f891edba304e 100644
--- a/pkg/vtiger/translations/Russian/modules/Google.php
+++ b/pkg/vtiger/translations/Russian/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Сохранить и импортировать',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Гугле импорта результатов',
+ 'LBL_REDIRECT_URL' => 'Перенаправление URL',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Скопируйте Ñледующий URL Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ вÑтавьте в ваш Google Идент проект как изображение показывает',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¢ÐµÐ¿ÐµÑ€ÑŒ",
'LBL_SYNCRONIZING' => "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ ....",
diff --git a/pkg/vtiger/translations/Spanish/modules/Google.php b/pkg/vtiger/translations/Spanish/modules/Google.php
index 55036e6d6d1770cf5f30793bd1a7123b694e122f..f67a6b21f928d7098830ba71fd38a88775838d62 100644
--- a/pkg/vtiger/translations/Spanish/modules/Google.php
+++ b/pkg/vtiger/translations/Spanish/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Guardar e Importar',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google Importar los resultados',
+ 'LBL_REDIRECT_URL' => 'Redireccionar URL',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Copia el siguiente URL de redireccionamiento y pegar en su proyecto de autenticación Google como muestra la imagen',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Sincronizar Ahora",
'LBL_SYNCRONIZING' => "Sincronizar ....",
diff --git a/pkg/vtiger/translations/Sweden_sv_se/modules/Google.php b/pkg/vtiger/translations/Sweden_sv_se/modules/Google.php
index 16d4a8224fbf74aad9c94c1ca3e0329661a46823..4a0b479c4041e1f5a35566ed579e837ed32425a5 100644
--- a/pkg/vtiger/translations/Sweden_sv_se/modules/Google.php
+++ b/pkg/vtiger/translations/Sweden_sv_se/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Spara och Import',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google Importera resultat',
+ 'LBL_REDIRECT_URL' => 'omdirigera url',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Kopiera följande omdirigera url och klistra in i ditt Google auth projektet som bilden visar',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Synkronisera nu",
'LBL_SYNCRONIZING' => "Synkronisera ....",
diff --git a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Google.php b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Google.php
index 613fb7c141e1ca9f7f6cd664db4dd107786c0604..67a2c94fcf3d648c32554d2ab18096d6a03cd26e 100644
--- a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Google.php
+++ b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Google.php
@@ -77,8 +77,9 @@ $languageStrings = array(
'LBL_SAVE_AND_IMPORT' => 'Kaydet ve Ä°thalat',
'LBL_IMPORT_RESULTS_GOOGLE' => 'Google İthal sonuçlar',
+ 'LBL_REDIRECT_URL' => 'Yönlendirme bağlantısı',
+ 'LBL_REDIRECT_URL_MESSAGE' => 'Aşağıdaki yönlendirme url kopyalayıp görüntü gösterildiği gibi google auth projesinde yapıştırın',
);
-
$jsLanguageStrings = array(
'LBL_SYNC_BUTTON' => "Åžimdi senkronize",
'LBL_SYNCRONIZING' => "Senkronizasyon ....",