diff --git a/dev/Settings/User/Contacts.js b/dev/Settings/User/Contacts.js index 22be1cdbe..a274873e3 100644 --- a/dev/Settings/User/Contacts.js +++ b/dev/Settings/User/Contacts.js @@ -2,6 +2,7 @@ import ko from 'ko'; import { koComputable } from 'External/ko'; import { SettingsGet } from 'Common/Globals'; +import { i18n, trigger as translatorTrigger } from 'Common/Translator'; import { ContactUserStore } from 'Stores/User/Contact'; import Remote from 'Remote/User/Fetch'; @@ -10,14 +11,24 @@ export class UserSettingsContacts /*extends AbstractViewSettings*/ { this.contactsAutosave = ko.observable(!!SettingsGet('ContactsAutosave')); this.allowContactsSync = ContactUserStore.allowSync; - this.enableContactsSync = ContactUserStore.enableSync; - this.contactsSyncUrl = ContactUserStore.syncUrl; - this.contactsSyncUser = ContactUserStore.syncUser; - this.contactsSyncPass = ContactUserStore.syncPass; + this.syncMode = ContactUserStore.syncMode; + this.syncUrl = ContactUserStore.syncUrl; + this.syncUser = ContactUserStore.syncUser; + this.syncPass = ContactUserStore.syncPass; + + const i18nSyncMode = key => i18n('SETTINGS_CONTACTS/SYNC_' + key); + this.syncModeOptions = koComputable(() => { + translatorTrigger(); + return [ + { id: 0, name: i18nSyncMode('NO') }, + { id: 1, name: i18nSyncMode('YES') }, + { id: 2, name: i18nSyncMode('READ') }, + ]; + }); this.saveTrigger = koComputable(() => [ - ContactUserStore.enableSync() ? '1' : '0', + ContactUserStore.syncMode(), ContactUserStore.syncUrl(), ContactUserStore.syncUser(), ContactUserStore.syncPass() @@ -31,7 +42,7 @@ export class UserSettingsContacts /*extends AbstractViewSettings*/ { this.saveTrigger.subscribe(() => Remote.request('SaveContactsSyncData', null, { - Enable: ContactUserStore.enableSync() ? 1 : 0, + Mode: ContactUserStore.syncMode(), Url: ContactUserStore.syncUrl(), User: ContactUserStore.syncUser(), Password: ContactUserStore.syncPass() diff --git a/dev/Stores/User/Contact.js b/dev/Stores/User/Contact.js index e2e19f8f5..1b171bdd6 100644 --- a/dev/Stores/User/Contact.js +++ b/dev/Stores/User/Contact.js @@ -12,7 +12,7 @@ ContactUserStore.syncing = ko.observable(false).extend({ debounce: 200 }); addObservablesTo(ContactUserStore, { allowSync: false, // Admin setting - enableSync: false, + syncMode: 0, syncUrl: '', syncUser: '', syncPass: '' @@ -23,7 +23,7 @@ addObservablesTo(ContactUserStore, { * @returns {void} */ ContactUserStore.sync = fResultFunc => { - if (ContactUserStore.enableSync() + if (ContactUserStore.syncMode() && !ContactUserStore.importing() && !ContactUserStore.syncing() ) { @@ -39,7 +39,7 @@ ContactUserStore.init = () => { let value = !!SettingsGet('ContactsSyncIsAllowed'); ContactUserStore.allowSync(value); if (value) { - ContactUserStore.enableSync(!!SettingsGet('EnableContactsSync')); + ContactUserStore.syncMode(SettingsGet('ContactsSyncMode')); ContactUserStore.syncUrl(SettingsGet('ContactsSyncUrl')); ContactUserStore.syncUser(SettingsGet('ContactsSyncUser')); ContactUserStore.syncPass(SettingsGet('ContactsSyncPassword')); diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js index bc654e85c..41b272222 100644 --- a/dev/View/Popup/Contacts.js +++ b/dev/View/Popup/Contacts.js @@ -37,9 +37,6 @@ export class ContactsPopupView extends AbstractViewPopup { this.bBackToCompose = false; this.sLastComposeFocusedField = ''; - this.allowContactsSync = ContactUserStore.allowSync; - this.enableContactsSync = ContactUserStore.enableSync; - this.addObservables({ search: '', contactsCount: 0, @@ -124,6 +121,8 @@ export class ContactsPopupView extends AbstractViewPopup { contactsCheckedOrSelectedUids: () => this.contactsCheckedOrSelected().map(contact => contact.id), + contactsSyncEnabled: () => ContactUserStore.allowSync() && ContactUserStore.syncMode(), + viewHash: () => '' + this.viewProperties.map(property => property.value && property.value()).join('') }); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 72d4efb22..0ccc325c7 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -803,7 +803,7 @@ class Actions $aResult['ContactsSyncIsAllowed'] = (bool)$oConfig->Get('contacts', 'allow_sync', false); $aResult['ContactsSyncInterval'] = (int)$oConfig->Get('contacts', 'sync_interval', 20); - $aResult['EnableContactsSync'] = false; + $aResult['ContactsSyncMode'] = 0; $aResult['ContactsSyncUrl'] = ''; $aResult['ContactsSyncUser'] = ''; $aResult['ContactsSyncPassword'] = ''; @@ -811,7 +811,7 @@ class Actions if ($aResult['ContactsIsAllowed'] && $aResult['ContactsSyncIsAllowed']) { $mData = $this->getContactsSyncData($oAccount); if (\is_array($mData)) { - $aResult['EnableContactsSync'] = isset($mData['Enable']) ? !!$mData['Enable'] : false; + $aResult['ContactsSyncMode'] = isset($mData['Mode']) ? $mData['Mode'] : 0; $aResult['ContactsSyncUrl'] = isset($mData['Url']) ? \trim($mData['Url']) : ''; $aResult['ContactsSyncUser'] = isset($mData['User']) ? \trim($mData['User']) : ''; $aResult['ContactsSyncPassword'] = APP_DUMMY; diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php index 7f251fd41..d3992f3dd 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php @@ -15,19 +15,16 @@ trait Contacts return $this->FalseResponse(__FUNCTION__); } - $bEnabled = '1' === (string) $this->GetActionParam('Enable', '0'); - $sUrl = $this->GetActionParam('Url', ''); - $sUser = $this->GetActionParam('User', ''); $sPassword = $this->GetActionParam('Password', ''); $mData = $this->getContactsSyncData($oAccount); $bResult = $this->setContactsSyncData($oAccount, array( - 'Enable' => $bEnabled, - 'User' => $sUser, + 'Mode' => \intval($this->GetActionParam('Mode', '0')), + 'User' => $this->GetActionParam('User', ''), 'Password' => APP_DUMMY === $sPassword && isset($mData['Password']) ? $mData['Password'] : (APP_DUMMY === $sPassword ? '' : $sPassword), - 'Url' => $sUrl + 'Url' => $this->GetActionParam('Url', '') )); return $this->DefaultResponse(__FUNCTION__, $bResult); @@ -42,11 +39,16 @@ trait Contacts if ($oAddressBookProvider && $oAddressBookProvider->IsActive()) { $mData = $this->getContactsSyncData($oAccount); - if (isset($mData['Enable'], $mData['User'], $mData['Password'], $mData['Url']) && $mData['Enable']) + if (isset($mData['User'], $mData['Password'], $mData['Url']) && !empty($mData['Mode'])) { - $bResult = $oAddressBookProvider->Sync( - $this->GetMainEmail($oAccount), - $mData['Url'], $mData['User'], $mData['Password']); + $bResult = $oAddressBookProvider->Sync([ + 'Email' => $this->GetMainEmail($oAccount), + 'Url' => $mData['Url'], + 'User' => $mData['User'], + 'Password' => $mData['Password'], + 'Mode' => $mData['Mode'], + 'Proxy' => '' + ]); } } @@ -236,6 +238,9 @@ trait Contacts public function setContactsSyncData(\RainLoop\Model\Account $oAccount, array $aData) : bool { + if (!isset($aData['Mode'])) { + $aData['Mode'] = empty($aData['Enable']) ? 0 : 1; + } $oMainAccount = $this->getMainAccountFromToken(); if ($aData['Password']) { $aData['Password'] = \SnappyMail\Crypt::EncryptToJSON($aData['Password'], $oMainAccount->CryptKey()); @@ -272,6 +277,9 @@ trait Contacts ); } } + if (!isset($aData['Mode'])) { + $aData['Mode'] = empty($aData['Enable']) ? 0 : 1; + } return $aData; } diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php index dd36d5974..cccb7c5ad 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php @@ -41,9 +41,9 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider $this->oDriver->IsSharingAllowed(); } - public function Sync(string $sEmail, string $sUrl, string $sUser, string $sPassword) : bool + public function Sync(array $oConfig) : bool { - return $this->IsActive() ? $this->oDriver->Sync($sEmail, $sUrl, $sUser, $sPassword) : false; + return $this->IsActive() ? $this->oDriver->Sync($oConfig) : false; } public function Export(string $sEmail, string $sType = 'vcf') : bool diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php index 5393d5c18..2a4148df9 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php @@ -112,18 +112,18 @@ class PdoAddressBook return $aResult; } - public function Sync(string $sEmail, string $sUrl, string $sUser, string $sPassword, string $sProxy = '') : bool + public function Sync(array $oConfig) : bool { $this->SyncDatabase(); - $iUserID = $this->getUserId($sEmail); + $iUserID = $this->getUserId($oConfig['Email']); if (0 >= $iUserID) { \SnappyMail\Log::warning('PdoAddressBook', 'Sync() invalid $iUserID'); return false; } - $oClient = $this->getDavClient($sUrl, $sUser, $sPassword, $sProxy); + $oClient = $this->getDavClient($oConfig['Url'], $oConfig['User'], $oConfig['Password'], $oConfig['Proxy']); if (!$oClient) { \SnappyMail\Log::warning('PdoAddressBook', 'Sync() invalid DavClient'); @@ -144,18 +144,18 @@ class PdoAddressBook // $this->oLogger->WriteDump($aRemoteSyncData); // $this->oLogger->WriteDump($aDatabaseSyncData); - //+++del (from carddav) - foreach ($aDatabaseSyncData as $sKey => $aData) - { - if ($aData['deleted'] && - isset($aRemoteSyncData[$sKey], $aRemoteSyncData[$sKey]['vcf'])) + // Delete remote when Mode = read + write + if (1 === $oConfig['Mode']) { + foreach ($aDatabaseSyncData as $sKey => $aData) { - $this->davClientRequest($oClient, 'DELETE', $sPath.$aRemoteSyncData[$sKey]['vcf']); + if ($aData['deleted'] && isset($aRemoteSyncData[$sKey], $aRemoteSyncData[$sKey]['vcf'])) + { + $this->davClientRequest($oClient, 'DELETE', $sPath.$aRemoteSyncData[$sKey]['vcf']); + } } } - //---del - //+++del (from db) + // Delete from db $aIdsForDeletedion = array(); foreach ($aDatabaseSyncData as $sKey => $aData) { @@ -164,12 +164,10 @@ class PdoAddressBook $aIdsForDeletedion[] = $aData['id_contact']; } } - if (\count($aIdsForDeletedion)) { - $this->DeleteContacts($sEmail, $aIdsForDeletedion, false); + $this->DeleteContacts($oConfig['Email'], $aIdsForDeletedion, false); } - //---del $this->flushDeletedContacts($iUserID); @@ -186,7 +184,7 @@ class PdoAddressBook ) { $mID = $aData['id_contact']; - $oContact = $this->GetContactByID($sEmail, $mID, false); + $oContact = $this->GetContactByID($oConfig['Email'], $mID, false); if ($oContact) { $sExsistensBody = ''; @@ -202,17 +200,20 @@ class PdoAddressBook // $this->oLogger->WriteDump($sExsistensBody); } - $oResponse = $this->davClientRequest($oClient, 'PUT', - $sPath.(\strlen($mExsistenRemoteID) ? $mExsistenRemoteID : $oContact->CardDavNameUri()), - $oContact->ToVCard($sExsistensBody, $this->oLogger)."\r\n\r\n"); - if ($oResponse) - { - $sEtag = \trim(\trim($oResponse->getHeader('etag')), '"\''); - $sDate = \trim($oResponse->getHeader('date')); - if (!empty($sEtag)) + // Add remote when Mode = read + write + if (1 === $oConfig['Mode']) { + $oResponse = $this->davClientRequest($oClient, 'PUT', + $sPath.(\strlen($mExsistenRemoteID) ? $mExsistenRemoteID : $oContact->CardDavNameUri()), + $oContact->ToVCard($sExsistensBody, $this->oLogger)."\r\n\r\n"); + if ($oResponse) { - $iChanged = empty($sDate) ? \time() : \MailSo\Base\DateTimeHelper::ParseRFC2822DateString($sDate); - $this->updateContactEtagAndTime($iUserID, $mID, $sEtag, $iChanged); + $sEtag = \trim(\trim($oResponse->getHeader('etag')), '"\''); + $sDate = \trim($oResponse->getHeader('date')); + if (!empty($sEtag)) + { + $iChanged = empty($sDate) ? \time() : \MailSo\Base\DateTimeHelper::ParseRFC2822DateString($sDate); + $this->updateContactEtagAndTime($iUserID, $mID, $sEtag, $iChanged); + } } } } @@ -268,7 +269,7 @@ class PdoAddressBook $oContact = null; if ($mExsistenContactID) { - $oContact = $this->GetContactByID($sEmail, $mExsistenContactID); + $oContact = $this->GetContactByID($oConfig['Email'], $mExsistenContactID); } if (!$oContact) { @@ -280,7 +281,7 @@ class PdoAddressBook \trim(\trim($oResponse->getHeader('etag')), '"\'') ); - $this->ContactSave($sEmail, $oContact); + $this->ContactSave($oConfig['Email'], $oContact); unset($oContact); // } else if ($this->oLogger) { // $this->oLogger->WriteDump($sBody); diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json index ff59a618c..40d9d6dfb 100644 --- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json +++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "تفعيل التزامن عن بعد", "LABEL_CONTACTS_SYNC_SERVER": "المخدم", "LABEL_CONTACTS_SYNC_AB_URL": "وصلة دفتر العناوين", - "LABEL_CONTACTS_SYNC_USER": "المستخدم" + "LABEL_CONTACTS_SYNC_USER": "المستخدم", + "SYNC_NO": "لا", + "SYNC_YES": "نعم", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "المظاهر العامة", diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json index 07dbf890f..1bdbbed92 100644 --- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json +++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Разрешаване на отдалечено синхронизиране", "LABEL_CONTACTS_SYNC_SERVER": "Сървър", "LABEL_CONTACTS_SYNC_AB_URL": "URL на адресната книга", - "LABEL_CONTACTS_SYNC_USER": "Потребител" + "LABEL_CONTACTS_SYNC_USER": "Потребител", + "SYNC_NO": "Не", + "SYNC_YES": "Да", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Теми", diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json index 9faca8f75..fa5db6928 100644 --- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json +++ b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Všechna práva vyhrazena.", "HINT_READ_CHANGE_LOG": "Přečtěte si prosím change log předtím, než budete chtít provést aktualizaci.", "HINT_IS_UP_TO_DATE": "RainLoop je v aktuální verzi.", - "HTML_NEW_VERSION": "Nová verze %VERSION% je k dispozici.", + "HTML_NEW_VERSION": "Nová verze %VERSION%<\/b> je k dispozici.", "LABEL_UPDATING": "Aktualizuji", "LABEL_CHECKING": "Kontroluji nové aktualizace", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json index e5a4efe0f..2338320f0 100644 --- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json +++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Povolit vzdálenou synchronizaci", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "URL adresáře", - "LABEL_CONTACTS_SYNC_USER": "Uživatel" + "LABEL_CONTACTS_SYNC_USER": "Uživatel", + "SYNC_NO": "Ne", + "SYNC_YES": "Ano", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Motivy", diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da-DK/admin.json index 85166175d..1ced8c846 100644 --- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json +++ b/snappymail/v/0.0.0/app/localization/da-DK/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "alle rettigheder forbeholdes.", "HINT_READ_CHANGE_LOG": "Læs ændrings listen før der opdateres.", "HINT_IS_UP_TO_DATE": "RainLoop is up to date.", - "HTML_NEW_VERSION": "Ny %VERSION% version tilgængelig", + "HTML_NEW_VERSION": "Ny %VERSION%<\/b> version tilgængelig", "LABEL_UPDATING": "Opdatere", "LABEL_CHECKING": "Tjekker for opdateringer", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json index b4db94f1d..6f2e3b515 100644 --- a/snappymail/v/0.0.0/app/localization/da-DK/user.json +++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Aktivér synkronisering", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Adressebogs URL", - "LABEL_CONTACTS_SYNC_USER": "Bruger" + "LABEL_CONTACTS_SYNC_USER": "Bruger", + "SYNC_NO": "Nej", + "SYNC_YES": "Ja", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Temaer", diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json index 81dccf0f2..468c31851 100644 --- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json +++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Alle Rechte vorbehalten.", "HINT_READ_CHANGE_LOG": "Bitte Lesen Sie das Änderungsprotokoll vor dem Update.", "HINT_IS_UP_TO_DATE": "RainLoop ist auf dem neusten Stand.", - "HTML_NEW_VERSION": "Neue Version %VERSION% verfügbar.", + "HTML_NEW_VERSION": "Neue Version %VERSION%<\/b> verfügbar.", "LABEL_UPDATING": "Aktualisiere", "LABEL_CHECKING": "Prüfe auf Aktualisierungen", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json index 92116c2e6..57b4e8e42 100644 --- a/snappymail/v/0.0.0/app/localization/de-DE/user.json +++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Remote-Synchronisierung aktivieren", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Adressbuch-URL", - "LABEL_CONTACTS_SYNC_USER": "Benutzer" + "LABEL_CONTACTS_SYNC_USER": "Benutzer", + "SYNC_NO": "Nein", + "SYNC_YES": "Ja", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Themen", diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json index 5f32b403e..b0c482281 100644 --- a/snappymail/v/0.0.0/app/localization/el-GR/user.json +++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Ενεργοποίηση απομακρυσμένου συγχρονισμού", "LABEL_CONTACTS_SYNC_SERVER": "Εξυπηρετητής", "LABEL_CONTACTS_SYNC_AB_URL": "URL του καταλόγου διεθύνσεων", - "LABEL_CONTACTS_SYNC_USER": "Χρήστης" + "LABEL_CONTACTS_SYNC_USER": "Χρήστης", + "SYNC_NO": "Όχι", + "SYNC_YES": "Ναι", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Θέματα", diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json index cbb78553c..980f29db5 100644 --- a/snappymail/v/0.0.0/app/localization/en/user.json +++ b/snappymail/v/0.0.0/app/localization/en/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Enable remote synchronization", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Addressbook URL", - "LABEL_CONTACTS_SYNC_USER": "User" + "LABEL_CONTACTS_SYNC_USER": "User", + "SYNC_NO": "No", + "SYNC_YES": "Yes", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Themes", diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json index da6d44a65..86e27f4dc 100644 --- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json +++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Todos los Derechos Reservados.", "HINT_READ_CHANGE_LOG": "Revisa la lista de cambios antes de actualizar.", "HINT_IS_UP_TO_DATE": "RainLoop está actualizado.", - "HTML_NEW_VERSION": "Nueva versión ( %VERSION% ) está disponible.", + "HTML_NEW_VERSION": "Nueva versión ( %VERSION%<\/b> ) está disponible.", "LABEL_UPDATING": "Actualizando", "LABEL_CHECKING": "Buscando actualizaciones", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json index 6d4762bd1..fa48afbd2 100644 --- a/snappymail/v/0.0.0/app/localization/es-ES/user.json +++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Activar la sincronización remota", "LABEL_CONTACTS_SYNC_SERVER": "Servidor", "LABEL_CONTACTS_SYNC_AB_URL": "Libreta de direcciones URL", - "LABEL_CONTACTS_SYNC_USER": "Usuario" + "LABEL_CONTACTS_SYNC_USER": "Usuario", + "SYNC_NO": "No", + "SYNC_YES": "Sí", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Temas", diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json index 94b9cd75c..44d961e23 100644 --- a/snappymail/v/0.0.0/app/localization/et-EE/user.json +++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Luba väline sünkroniseerimine", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Aadressiraamatu URL", - "LABEL_CONTACTS_SYNC_USER": "Kasutaja" + "LABEL_CONTACTS_SYNC_USER": "Kasutaja", + "SYNC_NO": "Ei", + "SYNC_YES": "Jah", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Teemad", diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json index 4de8a1d73..e48ecfa91 100644 --- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json +++ b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "همه حقوق محفوظ هست", "HINT_READ_CHANGE_LOG": "فایل وقایع را قبل از بروزرسانی بخوانید.", "HINT_IS_UP_TO_DATE": "RainLoop بروز هست", - "HTML_NEW_VERSION": "نسخه %VERSION% در دسترس هست", + "HTML_NEW_VERSION": "نسخه %VERSION%<\/b> در دسترس هست", "LABEL_UPDATING": "در حال بروزرسانی", "LABEL_CHECKING": "چک کردن برای بروزرسانی", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json index a93843339..a81dff528 100644 --- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json +++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "فعال‌سازی همگام‌سازی از راه دور", "LABEL_CONTACTS_SYNC_SERVER": "سرور", "LABEL_CONTACTS_SYNC_AB_URL": "تارنمای آدرس‌بوک", - "LABEL_CONTACTS_SYNC_USER": "کاربر" + "LABEL_CONTACTS_SYNC_USER": "کاربر", + "SYNC_NO": "خیر", + "SYNC_YES": "بلی", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "پوسته‌ها", diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json index 29fb52b21..71aa0663b 100644 --- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json +++ b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Kaikki oikeudet pidätetään.", "HINT_READ_CHANGE_LOG": "Lue muutosloki ennen päivitystä.", "HINT_IS_UP_TO_DATE": "RainLoop on ajan tasalla.", - "HTML_NEW_VERSION": "Uusi versio %VERSION% on saatavissa.", + "HTML_NEW_VERSION": "Uusi versio %VERSION%<\/b> on saatavissa.", "LABEL_UPDATING": "Päivitetään", "LABEL_CHECKING": "Tarkastetaan päivityksiä", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json index cdefdfcfa..505dfdf9b 100644 --- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json +++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Aktivoi etä-synkronointi", "LABEL_CONTACTS_SYNC_SERVER": "Palvelin", "LABEL_CONTACTS_SYNC_AB_URL": "Osoitekirjan URL", - "LABEL_CONTACTS_SYNC_USER": "Käyttäjä" + "LABEL_CONTACTS_SYNC_USER": "Käyttäjä", + "SYNC_NO": "Ei", + "SYNC_YES": "Kyllä", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Teemat", diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json index 6942abeb6..f2d7968dd 100644 --- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json +++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Tous droits réservés.", "HINT_READ_CHANGE_LOG": "Veuillez lire le journal des modifications avant de faire la mise à jour.", "HINT_IS_UP_TO_DATE": "Rainloop est à jour.", - "HTML_NEW_VERSION": "Une nouvelle version %VERSION% est disponible.", + "HTML_NEW_VERSION": "Une nouvelle version %VERSION%<\/b> est disponible.", "LABEL_UPDATING": "Mise à jour", "LABEL_CHECKING": "Vérification des mises à jour", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json index 859988bca..9beb59b13 100644 --- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json +++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Activer la synchronisation à distance", "LABEL_CONTACTS_SYNC_SERVER": "Serveur", "LABEL_CONTACTS_SYNC_AB_URL": "URL du carnet d'adresses", - "LABEL_CONTACTS_SYNC_USER": "Utilisateur" + "LABEL_CONTACTS_SYNC_USER": "Utilisateur", + "SYNC_NO": "Non", + "SYNC_YES": "Oui", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Thèmes", diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json index 913439d05..759fd1b00 100644 --- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json +++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Minden jog fenntartva.", "HINT_READ_CHANGE_LOG": "Frissítés előtt kérlek olvasd el a változások listáját.", "HINT_IS_UP_TO_DATE": "A RainLoop naprakész.", - "HTML_NEW_VERSION": "Új verzió érhető el: %VERSION%", + "HTML_NEW_VERSION": "Új verzió érhető el: %VERSION%<\/b>", "LABEL_UPDATING": "Frissítés", "LABEL_CHECKING": "Frissítések ellenőrzése", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json index ce055910f..2eaf094d1 100644 --- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json +++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Távoli szinkronizálás engedélyezése", "LABEL_CONTACTS_SYNC_SERVER": "Szerver", "LABEL_CONTACTS_SYNC_AB_URL": "Címtár URL", - "LABEL_CONTACTS_SYNC_USER": "Felhasználó" + "LABEL_CONTACTS_SYNC_USER": "Felhasználó", + "SYNC_NO": "Nem", + "SYNC_YES": "Igen", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Témák", diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id-ID/admin.json index f2c201e95..03d4c8d3b 100644 --- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json +++ b/snappymail/v/0.0.0/app/localization/id-ID/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Hak Cipta", "HINT_READ_CHANGE_LOG": "Mohon baca log perubahan sebelum melakukan pembaruan", "HINT_IS_UP_TO_DATE": "RainLoop sudah terbaru", - "HTML_NEW_VERSION": "Versi %VERSION% baru tersedia", + "HTML_NEW_VERSION": "Versi %VERSION%<\/b> baru tersedia", "LABEL_UPDATING": "Memperbarui", "LABEL_CHECKING": "Memeriksa pembaruan", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json index d189a87ad..6c9479604 100644 --- a/snappymail/v/0.0.0/app/localization/id-ID/user.json +++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Nyalakan sinkronisasi remote", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "URL Buku alamat", - "LABEL_CONTACTS_SYNC_USER": "User" + "LABEL_CONTACTS_SYNC_USER": "User", + "SYNC_NO": "Tidak", + "SYNC_YES": "Ya", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Tema", diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json index 167927a12..e15e0f27d 100644 --- a/snappymail/v/0.0.0/app/localization/is-IS/user.json +++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Virkja fjartengda samstillingu", "LABEL_CONTACTS_SYNC_SERVER": "Þjónn", "LABEL_CONTACTS_SYNC_AB_URL": "Slóð á nafnaskrá", - "LABEL_CONTACTS_SYNC_USER": "Notandi" + "LABEL_CONTACTS_SYNC_USER": "Notandi", + "SYNC_NO": "Nei", + "SYNC_YES": "Já", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Þemu", diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json index ef6ae4d10..103ac2470 100644 --- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json +++ b/snappymail/v/0.0.0/app/localization/it-IT/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "All Rights Reserved.", "HINT_READ_CHANGE_LOG": "Leggere il changelog prima di effettuare l'aggiornamento.", "HINT_IS_UP_TO_DATE": "RainLoop è aggiornato.", - "HTML_NEW_VERSION": "La nuova versione %VERSION% è disponibile.", + "HTML_NEW_VERSION": "La nuova versione %VERSION%<\/b> è disponibile.", "LABEL_UPDATING": "Aggiornamento in corso...", "LABEL_CHECKING": "Controllo della presenza di aggiornamenti...", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json index 342748c09..ae25ae145 100644 --- a/snappymail/v/0.0.0/app/localization/it-IT/user.json +++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Abilita sincronizzazione remota", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Indirizzo della rubrica", - "LABEL_CONTACTS_SYNC_USER": "Utente" + "LABEL_CONTACTS_SYNC_USER": "Utente", + "SYNC_NO": "No", + "SYNC_YES": "Sì", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Temi", diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json index ef1a84ef5..f1358b943 100644 --- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json +++ b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "All Rights Reserved.", "HINT_READ_CHANGE_LOG": "更新する前に変更ログをお読みください。", "HINT_IS_UP_TO_DATE": "RainLoopは最新のものです。", - "HTML_NEW_VERSION": "新しいバージョン %VERSION% があります", + "HTML_NEW_VERSION": "新しいバージョン %VERSION%<\/b> があります", "LABEL_UPDATING": "更新中", "LABEL_CHECKING": "アップデートの確認", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json index 72e527d52..a7584ead4 100644 --- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json +++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "リモート同期を有効化", "LABEL_CONTACTS_SYNC_SERVER": "サーバー", "LABEL_CONTACTS_SYNC_AB_URL": "アドレス帳 URL", - "LABEL_CONTACTS_SYNC_USER": "ユーザー" + "LABEL_CONTACTS_SYNC_USER": "ユーザー", + "SYNC_NO": "いいえ", + "SYNC_YES": "はい", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "テーマ", diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json index d2beb8d03..1604ff2b7 100644 --- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json +++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "원격 동기화 활성화", "LABEL_CONTACTS_SYNC_SERVER": "서버", "LABEL_CONTACTS_SYNC_AB_URL": "주소록 URL", - "LABEL_CONTACTS_SYNC_USER": "사용자" + "LABEL_CONTACTS_SYNC_USER": "사용자", + "SYNC_NO": "아니요", + "SYNC_YES": "예", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "테마", diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json index a957154cb..8b05f59ad 100644 --- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json +++ b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Visos teisės saugomos.", "HINT_READ_CHANGE_LOG": "Prašom perskaityti pasikeitimų eigą prieš atnaujinant.", "HINT_IS_UP_TO_DATE": "RainLoop naujausios laidos.", - "HTML_NEW_VERSION": "Nauja %VERSION% versija jau prieinama.", + "HTML_NEW_VERSION": "Nauja %VERSION%<\/b> versija jau prieinama.", "LABEL_UPDATING": "Atnaujinama", "LABEL_CHECKING": "Ieškau atnaujinimų", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json index 674ddd19b..a11fcf475 100644 --- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json +++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Įjungti nuotolinį sinchronizavimą", "LABEL_CONTACTS_SYNC_SERVER": "Serveris", "LABEL_CONTACTS_SYNC_AB_URL": "Adresų knygos URL adresas", - "LABEL_CONTACTS_SYNC_USER": "Vartotojas" + "LABEL_CONTACTS_SYNC_USER": "Vartotojas", + "SYNC_NO": "Ne", + "SYNC_YES": "Taip", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Temos", diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json index 531b54100..a6b5489bc 100644 --- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json +++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Enable remote synchronization", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Addressbook URL", - "LABEL_CONTACTS_SYNC_USER": "User" + "LABEL_CONTACTS_SYNC_USER": "User", + "SYNC_NO": "Nē", + "SYNC_YES": "Jā", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Tēmas", diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json index 104f57f72..da5d9c1e5 100644 --- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json +++ b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "All Rights Reserved.", "HINT_READ_CHANGE_LOG": "Les endringslogg før du oppdaterer.", "HINT_IS_UP_TO_DATE": "RainLoop er oppdatert.", - "HTML_NEW_VERSION": "Versjon %VERSION% er nå tilgjengelig.", + "HTML_NEW_VERSION": "Versjon %VERSION%<\/b> er nå tilgjengelig.", "LABEL_UPDATING": "Oppdaterer", "LABEL_CHECKING": "Ser etter oppdateringer", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json index 085b9891b..b8faead65 100644 --- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json +++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Slå på fjernstyrt synkronisering", "LABEL_CONTACTS_SYNC_SERVER": "Tjener", "LABEL_CONTACTS_SYNC_AB_URL": "Nettadresse til adressebok", - "LABEL_CONTACTS_SYNC_USER": "Bruker" + "LABEL_CONTACTS_SYNC_USER": "Bruker", + "SYNC_NO": "Nei", + "SYNC_YES": "Ja", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Tema", diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json index 429b40811..e26ab48cd 100644 --- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json +++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Alle rechten voorbehouden.", "HINT_READ_CHANGE_LOG": "Lees a.u.b. het veranderingen logboek alvorens te updaten.", "HINT_IS_UP_TO_DATE": "De laatste versie van RainLoop is geïnstalleerd.", - "HTML_NEW_VERSION": "Een nieuwe versie %VERSION% is beschikbaar.", + "HTML_NEW_VERSION": "Een nieuwe versie %VERSION%<\/b> is beschikbaar.", "LABEL_UPDATING": "Bezig met updaten", "LABEL_CHECKING": "Controleren op updates", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json index 65965962a..91d4b6c42 100644 --- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json +++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Server synchronisatie inschakelen", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Adresboek URL", - "LABEL_CONTACTS_SYNC_USER": "Gebruikersnaam" + "LABEL_CONTACTS_SYNC_USER": "Gebruikersnaam", + "SYNC_NO": "Nee", + "SYNC_YES": "Ja", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Thema's", diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json index 0fd38599c..6cd9480fa 100644 --- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json +++ b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Wszystkie prawa zastrzeżone.", "HINT_READ_CHANGE_LOG": "Przed aktualizacją przeczytaj proszę listę zmian.", "HINT_IS_UP_TO_DATE": "RainLoop jest aktualny.", - "HTML_NEW_VERSION": "Dostępna jest nowa wersja: %VERSION%.", + "HTML_NEW_VERSION": "Dostępna jest nowa wersja: %VERSION%<\/b>.", "LABEL_UPDATING": "Aktualizacja w toku...", "LABEL_CHECKING": "Szukanie aktualizacji...", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json index b0c60d5f4..b678380ee 100644 --- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json +++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Włącz zdalną synchronizację", "LABEL_CONTACTS_SYNC_SERVER": "Serwer", "LABEL_CONTACTS_SYNC_AB_URL": "URL książki adresowej", - "LABEL_CONTACTS_SYNC_USER": "Użytkownik" + "LABEL_CONTACTS_SYNC_USER": "Użytkownik", + "SYNC_NO": "Nie", + "SYNC_YES": "Tak", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Motywy", diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json index 22fb8c90c..9562e5153 100644 --- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json +++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Todos os direitos reservados.", "HINT_READ_CHANGE_LOG": "Por favor, leia o registro de alterações antes de atualizar.", "HINT_IS_UP_TO_DATE": "RainLoop está atualizado.", - "HTML_NEW_VERSION": "Está disponível uma nova versão: %VERSION%.", + "HTML_NEW_VERSION": "Está disponível uma nova versão: %VERSION%<\/b>.", "LABEL_UPDATING": "Atualizando", "LABEL_CHECKING": "Checar por atualizações", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json index 9ee86eac1..58e732400 100644 --- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json +++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Habilitar sincronização remota", "LABEL_CONTACTS_SYNC_SERVER": "Servidor", "LABEL_CONTACTS_SYNC_AB_URL": "URL da lista de contatos", - "LABEL_CONTACTS_SYNC_USER": "Usuário" + "LABEL_CONTACTS_SYNC_USER": "Usuário", + "SYNC_NO": "Não", + "SYNC_YES": "Sim", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Temas", diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json index e9d916dd3..1516bd1b3 100644 --- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json +++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Ativar sincronização remota", "LABEL_CONTACTS_SYNC_SERVER": "Servidor", "LABEL_CONTACTS_SYNC_AB_URL": "URL do livro de endereços", - "LABEL_CONTACTS_SYNC_USER": "Utilizador" + "LABEL_CONTACTS_SYNC_USER": "Utilizador", + "SYNC_NO": "Não", + "SYNC_YES": "Sim", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Temas", diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json index 17306313e..dc0ea891f 100644 --- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json +++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Enable remote synchronization", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Addressbook URL", - "LABEL_CONTACTS_SYNC_USER": "User" + "LABEL_CONTACTS_SYNC_USER": "User", + "SYNC_NO": "Nu", + "SYNC_YES": "Da", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Tematică", diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json index afeba4071..af5bcefd5 100644 --- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json +++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Все права защищены.", "HINT_READ_CHANGE_LOG": "Пожалуйста, ознакомьтесь с изменениями перед обновлением.\n", "HINT_IS_UP_TO_DATE": "Версия RainLoop актуальна.", - "HTML_NEW_VERSION": "Новая %VERSION% версия доступна.", + "HTML_NEW_VERSION": "Новая %VERSION%<\/b> версия доступна.", "LABEL_UPDATING": "Обновление", "LABEL_CHECKING": "Проверка", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json index 4d9f7c8e3..51ad3e1e6 100644 --- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json +++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Включить синхронизация", "LABEL_CONTACTS_SYNC_SERVER": "Сервер", "LABEL_CONTACTS_SYNC_AB_URL": "Адресная книга (URL)", - "LABEL_CONTACTS_SYNC_USER": "Пользователь" + "LABEL_CONTACTS_SYNC_USER": "Пользователь", + "SYNC_NO": "Нет", + "SYNC_YES": "Да", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Темы Оформления", diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json index 553846b51..605805b2c 100644 --- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json +++ b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Všetky práva vyhradené.", "HINT_READ_CHANGE_LOG": "Prosím prečítajte si zoznam zmien pred aktualizáciou.", "HINT_IS_UP_TO_DATE": "RainLoop je aktuálny.", - "HTML_NEW_VERSION": "Dostupná nová %VERSION% verzia.", + "HTML_NEW_VERSION": "Dostupná nová %VERSION%<\/b> verzia.", "LABEL_UPDATING": "Aktualizujem", "LABEL_CHECKING": "Kontrolujem aktualizácie", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json index 4534e5ffa..7957d2a20 100644 --- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json +++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Enable remote synchronization", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Addressbook URL", - "LABEL_CONTACTS_SYNC_USER": "User" + "LABEL_CONTACTS_SYNC_USER": "User", + "SYNC_NO": "Nie", + "SYNC_YES": "Áno", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Motívy", diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json index 90f966e34..3e75c931e 100644 --- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json +++ b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Vse pravice pridržane.", "HINT_READ_CHANGE_LOG": "Preberite dnevnik sprememb pred posodobitvijo.", "HINT_IS_UP_TO_DATE": "Ni novih posodobitev.", - "HTML_NEW_VERSION": "Na voljo je nova verzija %VERSION%.", + "HTML_NEW_VERSION": "Na voljo je nova verzija %VERSION%<\/b>.", "LABEL_UPDATING": "Posodabljanje", "LABEL_CHECKING": "Preverjanje za posdodobitve", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json index 06baa82c3..befc692bd 100644 --- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json +++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Omogoči oddaljeno sinhronizacijo", "LABEL_CONTACTS_SYNC_SERVER": "Strežnik", "LABEL_CONTACTS_SYNC_AB_URL": "URL imenika", - "LABEL_CONTACTS_SYNC_USER": "Uporabnik" + "LABEL_CONTACTS_SYNC_USER": "Uporabnik", + "SYNC_NO": "Ne", + "SYNC_YES": "Da", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Teme", diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json index 86b801e97..ed8bbfea1 100644 --- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json +++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "Alla rättigheter förbehållna.", "HINT_READ_CHANGE_LOG": "Vänligen läs ändringsloggen innan du uppdaterar.", "HINT_IS_UP_TO_DATE": "RainLoop är aktuell.", - "HTML_NEW_VERSION": "Ny %VERSION% version är tillgänglig", + "HTML_NEW_VERSION": "Ny %VERSION%<\/b> version är tillgänglig", "LABEL_UPDATING": "Uppdaterar", "LABEL_CHECKING": "Letar efter uppdaterar", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json index 3aeb470ea..b26b104de 100644 --- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json +++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Aktivera fjärrsynkronisering", "LABEL_CONTACTS_SYNC_SERVER": "Server", "LABEL_CONTACTS_SYNC_AB_URL": "Adressboks-URL", - "LABEL_CONTACTS_SYNC_USER": "Användare" + "LABEL_CONTACTS_SYNC_USER": "Användare", + "SYNC_NO": "Nej", + "SYNC_YES": "Ja", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Teman", diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json index 62ce83894..b18310800 100644 --- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json +++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Uzaktan eşleştirme etkin", "LABEL_CONTACTS_SYNC_SERVER": "Sunucu", "LABEL_CONTACTS_SYNC_AB_URL": "Adres Defteri URL", - "LABEL_CONTACTS_SYNC_USER": "Kullanıcı Adı" + "LABEL_CONTACTS_SYNC_USER": "Kullanıcı Adı", + "SYNC_NO": "Hayır", + "SYNC_YES": "Evet", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Temalar", diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json index ab3f76c59..955e1e1d5 100644 --- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json +++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "Увімкнути синхронизацію", "LABEL_CONTACTS_SYNC_SERVER": "Сервер", "LABEL_CONTACTS_SYNC_AB_URL": "Адресна книга (URL)", - "LABEL_CONTACTS_SYNC_USER": "Користувач" + "LABEL_CONTACTS_SYNC_USER": "Користувач", + "SYNC_NO": "Ні", + "SYNC_YES": "Так", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "Теми Оформлення", diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json index 2acbe250d..1d8501628 100644 --- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json +++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json @@ -104,7 +104,7 @@ "LABEL_ALL_RIGHTS_RESERVED": "保留所有权利", "HINT_READ_CHANGE_LOG": "请在更新前阅读更新日志", "HINT_IS_UP_TO_DATE": "RainLoop已经是最新版本的", - "HTML_NEW_VERSION": "有新的%VERSION% 版本可用.", + "HTML_NEW_VERSION": "有新的%VERSION%<\/b> 版本可用.", "LABEL_UPDATING": "更新中", "LABEL_CHECKING": "检查更新", "BUTTON_RELEASES": "Releases" diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json index 41f6fef35..9ae4680ad 100644 --- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json +++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "启用远程同步", "LABEL_CONTACTS_SYNC_SERVER": "服务器", "LABEL_CONTACTS_SYNC_AB_URL": "地址簿 URL", - "LABEL_CONTACTS_SYNC_USER": "用户名" + "LABEL_CONTACTS_SYNC_USER": "用户名", + "SYNC_NO": "否", + "SYNC_YES": "是", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "主题", diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json index 39a7d00d3..bc9b6ffeb 100644 --- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json +++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json @@ -404,7 +404,10 @@ "LABEL_CONTACTS_SYNC_ENABLE": "啟用遠程同步", "LABEL_CONTACTS_SYNC_SERVER": "伺服器", "LABEL_CONTACTS_SYNC_AB_URL": "地址簿URL", - "LABEL_CONTACTS_SYNC_USER": "用戶名" + "LABEL_CONTACTS_SYNC_USER": "用戶名", + "SYNC_NO": "否", + "SYNC_YES": "是", + "SYNC_READ": "Read only" }, "SETTINGS_THEMES": { "LEGEND_THEMES": "主題", diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html index e69bd2678..2d463b9ff 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html @@ -31,7 +31,7 @@ -