diff --git a/dev/Settings/Admin/Contacts.js b/dev/Settings/Admin/Contacts.js
index b05d5ab3b..ad65c8453 100644
--- a/dev/Settings/Admin/Contacts.js
+++ b/dev/Settings/Admin/Contacts.js
@@ -28,6 +28,8 @@ export class AdminSettingsContacts extends AbstractViewSettings {
this.addSetting('contactsMySQLSSLVerify');
this.addSetting('contactsMySQLSSLCiphers');
+ this.addSetting('contactsSQLiteGlobal');
+
addObservablesTo(this, {
testing: false,
testContactsSuccess: false,
@@ -102,7 +104,8 @@ export class AdminSettingsContacts extends AbstractViewSettings {
PdoPassword: this.contactsPdoPassword(),
MySQLSSLCA: this.contactsMySQLSSLCA(),
MySQLSSLVerify: this.contactsMySQLSSLVerify(),
- MySQLSSLCiphers: this.contactsMySQLSSLCiphers()
+ MySQLSSLCiphers: this.contactsMySQLSSLCiphers(),
+ SQLiteGlobal: this.contactsSQLiteGlobal()
}
);
}
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 42b56f9c3..10535e2d1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -649,6 +649,7 @@ class Actions
$aResult['contactsMySQLSSLCA'] = (string) $oConfig->Get('contacts', 'mysql_ssl_ca', '');
$aResult['contactsMySQLSSLVerify'] = !!$oConfig->Get('contacts', 'mysql_ssl_verify', true);
$aResult['contactsMySQLSSLCiphers'] = (string) $oConfig->Get('contacts', 'mysql_ssl_ciphers', '');
+ $aResult['contactsSQLiteGlobal'] = !!$oConfig->Get('contacts', 'sqlite_global', \is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite'));
$aResult['contactsSuggestionsLimit'] = (int)$oConfig->Get('contacts', 'suggestions_limit', 20);
$aResult['faviconUrl'] = $oConfig->Get('webmail', 'favicon_url', '');
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index 5d4ea5bf3..17d81eed9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -76,6 +76,7 @@ class ActionsAdmin extends Actions
$this->setConfigFromParams($oConfig, 'contactsMySQLSSLCA', 'contacts', 'mysql_ssl_ca', 'string');
$this->setConfigFromParams($oConfig, 'contactsMySQLSSLVerify', 'contacts', 'mysql_ssl_verify', 'bool');
$this->setConfigFromParams($oConfig, 'contactsMySQLSSLCiphers', 'contacts', 'mysql_ssl_ciphers', 'string');
+ $this->setConfigFromParams($oConfig, 'contactsSQLiteGlobal', 'contacts', 'sqlite_global', 'bool');
$this->setConfigFromParams($oConfig, 'contactsSuggestionsLimit', 'contacts', 'suggestions_limit', 'int');
$this->setConfigFromParams($oConfig, 'contactsPdoType', 'contacts', 'type', 'string', function ($sType) use ($self) {
return Providers\AddressBook\PdoAddressBook::validPdoType($sType);
@@ -153,6 +154,7 @@ class ActionsAdmin extends Actions
$this->setConfigFromParams($oConfig, 'MySQLSSLCA', 'contacts', 'mysql_ssl_ca', 'string');
$this->setConfigFromParams($oConfig, 'MySQLSSLVerify', 'contacts', 'mysql_ssl_verify', 'bool');
$this->setConfigFromParams($oConfig, 'MySQLSSLCiphers', 'contacts', 'mysql_ssl_ciphers', 'string');
+ $this->setConfigFromParams($oConfig, 'SQLiteGlobal', 'contacts', 'sqlite_global', 'bool');
$sTestMessage = '';
try {
@@ -391,6 +393,7 @@ class ActionsAdmin extends Actions
$aResult['contactsMySQLSSLCA'] = (string) $oConfig->Get('contacts', 'mysql_ssl_ca', '');
$aResult['contactsMySQLSSLVerify'] = !!$oConfig->Get('contacts', 'mysql_ssl_verify', true);
$aResult['contactsMySQLSSLCiphers'] = (string) $oConfig->Get('contacts', 'mysql_ssl_ciphers', '');
+ $aResult['contactsSQLiteGlobal'] = !!$oConfig->Get('contacts', 'sqlite_global', \is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite'));
$aResult['contactsSuggestionsLimit'] = (int)$oConfig->Get('contacts', 'suggestions_limit', 20);
$aResult['faviconUrl'] = $oConfig->Get('webmail', 'favicon_url', '');
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 29773aec8..1dcdd3fe0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -201,6 +201,7 @@ Warning: only enable when server does not do this, else double compression error
'mysql_ssl_ca' => array('', 'PEM format certificate'),
'mysql_ssl_verify' => array(true),
'mysql_ssl_ciphers' => array('', 'HIGH'),
+ 'sqlite_global' => array(\is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite')),
'suggestions_limit' => array(20)
),
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 d9caca409..2c26073fd 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
@@ -32,20 +32,20 @@ class PdoAddressBook
$oSettings->driver = static::validPdoType($oConfig->Get('contacts', 'type', 'sqlite'));
if ('sqlite' === $oSettings->driver) {
$sDsn = 'sqlite:' . APP_PRIVATE_DATA . 'AddressBook.sqlite';
-/*
- // TODO: use local db?
- $oAccount = \RainLoop\Api::Actions()->getMainAccountFromToken(false);
- if ($oAccount) {
- $homedir = \RainLoop\Api::Actions()->StorageProvider()->GenerateFilePath(
- $oAccount,
- \RainLoop\Providers\Storage\Enumerations\StorageType::ROOT
- );
- if (!\is_file($homedir . 'AddressBook.sqlite') && \is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite')) {
- \copy(APP_PRIVATE_DATA . '/AddressBook.sqlite', $homedir . 'AddressBook.sqlite');
+ if (!$oConfig->Get('contacts', 'sqlite_global', \is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite'))) {
+ $oAccount = \RainLoop\Api::Actions()->getMainAccountFromToken(false);
+ if ($oAccount) {
+ $homedir = \RainLoop\Api::Actions()->StorageProvider()->GenerateFilePath(
+ $oAccount,
+ \RainLoop\Providers\Storage\Enumerations\StorageType::ROOT
+ );
+ // TODO: sync data on switch?
+// if (!\is_file($homedir . 'AddressBook.sqlite') && \is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite')) {
+// \copy(APP_PRIVATE_DATA . '/AddressBook.sqlite', $homedir . 'AddressBook.sqlite');
+// }
+ $sDsn = 'sqlite:' . $homedir . 'AddressBook.sqlite';
}
- $sDsn = 'sqlite:' . $homedir . 'AddressBook.sqlite';
}
-*/
} else {
$sDsn = \trim($oConfig->Get('contacts', 'pdo_dsn', ''));
$oSettings->user = \trim($oConfig->Get('contacts', 'pdo_user', ''));
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 68f8dce38..3698b0538 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Uživatel",
"LABEL_STORAGE_PASSWORD": "Heslo",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Upozornění!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Nepoužívejte tento typ databáze při velkém počtu aktivních uživatelů.",
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 cf90f9b6a..95e7b1163 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Bruger",
"LABEL_STORAGE_PASSWORD": "Adgangskode",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Underretning!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Brug ikke denne database type med større antal af aktive brugere.",
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 13393e717..a576ca8b8 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "DSN",
"LABEL_STORAGE_USER": "Benutzer",
"LABEL_STORAGE_PASSWORD": "Passwort",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Hinweis!",
"SUGGESTIONS_LIMIT": "Limit für Empfehlungen",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Verwenden Sie diesen Datenbanktyp nicht bei einer hohen Anzahl aktiver Benutzer.",
diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json
index 890698e23..5032add7c 100644
--- a/snappymail/v/0.0.0/app/localization/en/admin.json
+++ b/snappymail/v/0.0.0/app/localization/en/admin.json
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Data Source Name (DSN)",
"LABEL_STORAGE_USER": "User",
"LABEL_STORAGE_PASSWORD": "Password",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Notice!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Don't use this database type with a large number of active users.",
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 3293bd14a..c824cd7ca 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Usuario",
"LABEL_STORAGE_PASSWORD": "Contraseña",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "¡Advertencia!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "No utilices este tipo de Base de Datos para un número grande de usuarios.",
diff --git a/snappymail/v/0.0.0/app/localization/eu/admin.json b/snappymail/v/0.0.0/app/localization/eu/admin.json
index 54176219b..a06de95f7 100644
--- a/snappymail/v/0.0.0/app/localization/eu/admin.json
+++ b/snappymail/v/0.0.0/app/localization/eu/admin.json
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Erabiltzailea",
"LABEL_STORAGE_PASSWORD": "Pasahitza",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Adi!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Ez erabili datubase hau erabiltzaile aktibo koputu handiarekin.",
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 50a582025..e683f1f2e 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "کاربر",
"LABEL_STORAGE_PASSWORD": "گذرواژه",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "توجه!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "از این پایگاه داده برای کاربران زیاد استفاده نکنید.",
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 d29e7b775..3d82e3cd5 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Käyttäjä",
"LABEL_STORAGE_PASSWORD": "Salasana",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Huomio!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Älä käytä tätä tietokantatyyppiä suurella määrällä aktiivisia käyttäjiä.",
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 a82855989..ad043e8f8 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Utilisateur",
"LABEL_STORAGE_PASSWORD": "Mot de passe",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Note !",
"SUGGESTIONS_LIMIT": "Limite de suggestions",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "N'utilisez pas ce type de base de données avec un grand nombre d'utilisateurs actifs.",
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 df7d58067..7355a96e5 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "DSN",
"LABEL_STORAGE_USER": "Felhasználó",
"LABEL_STORAGE_PASSWORD": "Jelszó",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Megjegyzés!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Ne használd ezt az adatbázis típust nagy számú aktív felhasználóval.",
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 c3ed39b8b..df50bc842 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "User",
"LABEL_STORAGE_PASSWORD": "Password",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Perhatian!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Jangan gunakan tipe database ini untuk jumlah user aktif yang besar.",
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 928c4cb5f..5f8240f28 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Utente",
"LABEL_STORAGE_PASSWORD": "Password",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Avviso!",
"SUGGESTIONS_LIMIT": "Limite suggerimenti",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Non usare questo tipo di database con un grande numero di utenti attivi.",
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 c8e8487c4..3917ed091 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "ユーザー",
"LABEL_STORAGE_PASSWORD": "パスワード",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "注意！",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "アクティブユーザーの数が多いとき、このデータベース・タイプを使用しないでください。",
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 42d2e14be..a27097da2 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Vartotojas",
"LABEL_STORAGE_PASSWORD": "Slaptažodis",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Pastaba!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Nenaudokite šio duomenų bazės tipo, jei turite daug aktyvių vartotojų",
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 12eb31321..71d356fab 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Bruker",
"LABEL_STORAGE_PASSWORD": "Passord",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Varsel!",
"SUGGESTIONS_LIMIT": "Forslagsbegrensning",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Ikke bruk denne databasetypen hvis dette systemet har mange brukere.",
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 c16f41000..7708260fa 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Gebruikersnaam",
"LABEL_STORAGE_PASSWORD": "Wachtwoord",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Aandacht!",
"SUGGESTIONS_LIMIT": "Suggesties limiet",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Gegruik deze database soort niet met een groot aantal actieve gebrukers.",
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 53d03dca4..8aeabbcb3 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
@@ -255,7 +255,7 @@
"TITLE_UPDATE_IDENTITY": "Identiteit bijwerken?",
"BUTTON_ADD_IDENTITY": "Toevoegen",
"BUTTON_UPDATE_IDENTITY": "Bijwerken",
- "LABEL_SIGNATURE_ADD": "Handtekening toevoegen/wijzigen",
+ "LABEL_SIGNATURE_ADD": "Handtekening toevoegen\/wijzigen",
"LABEL_SIGNATURE_INSERT_BEFORE": "Plaats deze handtekening vóór geciteerde tekst in antwoorden"
},
"POPUPS_CREATE_FOLDER": {
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 239a2c473..a214fe4f5 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Adres DSN",
"LABEL_STORAGE_USER": "Użytkownik",
"LABEL_STORAGE_PASSWORD": "Hasło",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Ostrzeżenie!",
"SUGGESTIONS_LIMIT": "Limit sugestii",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Nie używaj tej bazy danych z dużą ilością aktywnych użytkowników.",
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 0d40087e9..df8d04c66 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Usuário",
"LABEL_STORAGE_PASSWORD": "Senha",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Aviso!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Não use este tipo de banco de dados com um grande número de usuários ativos.",
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
index 9c87092b9..68b9a33aa 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Nome da Origem de Dados (DSN)",
"LABEL_STORAGE_USER": "Utilizador",
"LABEL_STORAGE_PASSWORD": "Palavra-passe",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Aviso!",
"SUGGESTIONS_LIMIT": "Limite de sugestões",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Não use este tipo de base de dados com uma grande quantidade de utilizadores ativos.",
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
index 9c87092b9..68b9a33aa 100644
--- a/snappymail/v/0.0.0/app/localization/pt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Nome da Origem de Dados (DSN)",
"LABEL_STORAGE_USER": "Utilizador",
"LABEL_STORAGE_PASSWORD": "Palavra-passe",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Aviso!",
"SUGGESTIONS_LIMIT": "Limite de sugestões",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Não use este tipo de base de dados com uma grande quantidade de utilizadores ativos.",
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 5df14f911..2152a41e2 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Пользователь",
"LABEL_STORAGE_PASSWORD": "Пароль",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Внимание!",
"SUGGESTIONS_LIMIT": "Лимит предложений",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Не используйте этот тип базы данных с большим числом активных пользователей.",
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 a0afdb98b..ea6c2c109 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Užívateľ",
"LABEL_STORAGE_PASSWORD": "Heslo",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Notice!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Nepoužívajte tento typ databázy, ak máte veľký počet aktívnych používateľov.",
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 0a0ddfb1f..96a273441 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Ime podatkovnega vira (DSN)",
"LABEL_STORAGE_USER": "Uporabnik",
"LABEL_STORAGE_PASSWORD": "Geslo",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Obvestilo!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Ta tip podatkovne baze ni priporočljiv za večje število uporabnikov.",
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 70e86c822..81f18360b 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Användare",
"LABEL_STORAGE_PASSWORD": "Lösenord",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Notis",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Använd inte denna typ av databas med ett stort antal aktiva användare.",
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
index a9a90a172..4ea995da8 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "Người dùng",
"LABEL_STORAGE_PASSWORD": "Mật khẩu",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "Chú ý!",
"SUGGESTIONS_LIMIT": "Suggestions limit",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Đừng nên sử dụng loại cơ sở dữ liệu này với lượng lớn người dùng mail đang hoạt động.",
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 e5807cf13..75172ffd1 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
@@ -68,6 +68,7 @@
"LABEL_STORAGE_DSN": "Dsn",
"LABEL_STORAGE_USER": "用户",
"LABEL_STORAGE_PASSWORD": "密码",
+ "SQLITE_GLOBAL": "Use a global DB instead of per account",
"ALERT_NOTICE": "提示!",
"SUGGESTIONS_LIMIT": "建议数量上限",
"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "如果有大量的活跃用户，请不要选择此数据库类型。",
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
index d15b120d4..10d342652 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
@@ -86,22 +86,23 @@
-
-
+