release: merge back stable branch into default

docs/release-notes/release-notes-4.15.0.rst

@@ -78,4 +78,5 @@ Fixes
 Upgrade notes
 ^^^^^^^^^^^^^
 
-- LDAP cert dirs
+- In this release we introduced new options for cert directory and file for LDAP plugins.
+  In case of problems with LDAPS please verify the settings in the LDAP plugin configuration.

rhodecode/public/js/rhodecode/i18n/be.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'just now',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/de.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'jetzt gerade',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/en.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'just now',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/es.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'just now',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/fr.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'Désactivé',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'à l’instant',
     'loading...': 'Chargement…',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/it.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabilitato',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'proprio ora',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/ja.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': '{0} 件のみ選択できます',
     'You can only select {0} items': '{0} 件のみ選択できます',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': '無効',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'たったいま',
     'loading...': '読み込み中...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/js_translations.js

@@ -79,6 +79,7 @@ _gettext('User `{0}` already in reviewers');
 _gettext('User `{0}` not allowed to be a reviewer');
 _gettext('You can only select {0} item');
 _gettext('You can only select {0} items');
+_gettext('activated');
 _gettext('added manually by "{0}"');
 _gettext('date not in future');
 _gettext('disabled');
@@ -91,6 +92,7 @@ _gettext('in {0}, {1}');
 _gettext('just now');
 _gettext('loading...');
 _gettext('member of "{0}"');
+_gettext('not active');
 _gettext('resolve comment');
 _gettext('showing {0} out of {1} commit');
 _gettext('showing {0} out of {1} commits');

rhodecode/public/js/rhodecode/i18n/pl.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'przed chwilą',
     'loading...': 'wczytywanie...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/pt.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'desabilitado',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'agora há pouco',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/ru.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'отключено',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': 'прямо сейчас',
     'loading...': 'загрузка...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

rhodecode/public/js/rhodecode/i18n/zh.js

@@ -85,6 +85,7 @@ var _TM = {
     'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
+    'activated': 'activated',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': '禁用',
@@ -97,6 +98,7 @@ var _TM = {
     'just now': '刚刚',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
+    'not active': 'not active',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',