Merge branch 'soon' into staging

CHANGELOG.md

@@ -135,7 +135,7 @@ Our team has limited resources, so we've chosen to introduce the new (and **expe
 
 To enable the use of the OnlyOffice Document and Presentation editor for everyone on your instance, edit your [customize/application_config.js](https://docs.cryptpad.fr/en/admin_guide/customization.html#application-config) file to include `AppConfig.enableEarlyAccess = true;`.
 
-If you wish to avoid a rush of support tickets from your users by limiting early access to users with custom quota increases, add another line like so `Constants.earlyAccessApps = ['doc', 'presentation'];`.
+If you wish to avoid a rush of support tickets from your users by limiting early access to users with custom quota increases, add another line like so `AppConfig.premiumTypes = ['doc', 'presentation'];`.
 
 As these editors become more stable we plan to enable them by default on third-party instances. Keep in mind, these editors may be unstable and users may lose their work. Our team will fix bugs given sufficient information to reproduce them, but we will not take the time to help you recover lost data unless you have taken a support contract with us.
 

www/common/translations/messages.ja.json

@@ -1422,5 +1422,10 @@
     "form_conditional_addAnd": "「かつ」の条件を追加",
     "form_conditional_add": "「あるいは」の条件を追加",
     "form_condition_isnot": "等しくない",
-    "form_condition_is": "等しい"
+    "form_condition_is": "等しい",
+    "form_template_poll": "スケジュールの投票のテンプレート",
+    "bounce_danger": "クリックしたリンクは、ウェブページではなく、悪質かもしれないコードやデータに結びついています。\n\n(\"{0}\")\n\nセキュリティー上の理由で、CryptPadはこのデータをブロックしています。OKをクリックするとタブが閉じます。",
+    "bounce_confirm": "このページから退出しようとしています： {0}\n\n次のページを開いてよろしいですか？：{1}",
+    "form_condition_hasnot": "含まない",
+    "form_condition_has": "含む"
 }

www/form/inner.js

@@ -706,7 +706,7 @@ define([
             }
             var day = _date && allDays[_date.getDay()];
             return h('div.cp-poll-cell.cp-form-poll-option', {
-                title: Util.fixHTML(data)
+                title: data,
             }, [
                 opts.type === 'day' ? h('span.cp-form-weekday', day) : undefined,
                 opts.type === 'day' ? h('span.cp-form-weekday-separator', ' - ') : undefined,
@@ -865,7 +865,7 @@ define([
             if (totalMax.value) {
                 $total.find('[data-id]').removeClass('cp-poll-best');
                 totalMax.data.forEach(function (k) {
-                    $total.find('[data-id="'+k+'"]').addClass('cp-poll-best');
+                    $total.find('[data-id="'+ (k.replace(/"/g, '\\"')) + '"]').addClass('cp-poll-best');
                 });
             }
         };