Merge branch 'dev' into feature-permissions

src-ui/messages.xlf

@@ -3757,8 +3757,8 @@
           <context context-type="linenumber">574</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2105352414355663637" datatype="html">
-        <source>This operation will permanently this mail account.</source>
+      <trans-unit id="7176985344323395435" datatype="html">
+        <source>This operation will permanently delete this mail account.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
           <context context-type="linenumber">575</context>
@@ -3799,8 +3799,8 @@
           <context context-type="linenumber">633</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="6183247517597275616" datatype="html">
-        <source>This operation will permanently this mail rule.</source>
+      <trans-unit id="2250372580580310337" datatype="html">
+        <source>This operation will permanently delete this mail rule.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
           <context context-type="linenumber">634</context>

src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html

@@ -4,7 +4,7 @@
       <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
     </svg>
     <div class="d-none d-sm-inline">&nbsp;{{title}}</div>
-    <ng-container *ngIf="!editing && selectionModel.selectionSize() > 0">
+    <ng-container *ngIf="!editing && selectionModel.totalCount > 0">
       <app-clearable-badge [number]="multiple ? selectionModel.totalCount : undefined" [selected]="!multiple && selectionModel.selectionSize() > 0" (cleared)="reset()"></app-clearable-badge>
     </ng-container>
   </button>

src-ui/src/app/components/manage/settings/settings.component.ts

@@ -760,7 +760,7 @@ export class SettingsComponent
       backdrop: 'static',
     })
     modal.componentInstance.title = $localize`Confirm delete mail account`
-    modal.componentInstance.messageBold = $localize`This operation will permanently this mail account.`
+    modal.componentInstance.messageBold = $localize`This operation will permanently delete this mail account.`
     modal.componentInstance.message = $localize`This operation cannot be undone.`
     modal.componentInstance.btnClass = 'btn-danger'
     modal.componentInstance.btnCaption = $localize`Proceed`
@@ -819,7 +819,7 @@ export class SettingsComponent
       backdrop: 'static',
     })
     modal.componentInstance.title = $localize`Confirm delete mail rule`
-    modal.componentInstance.messageBold = $localize`This operation will permanently this mail rule.`
+    modal.componentInstance.messageBold = $localize`This operation will permanently delete this mail rule.`
     modal.componentInstance.message = $localize`This operation cannot be undone.`
     modal.componentInstance.btnClass = 'btn-danger'
     modal.componentInstance.btnCaption = $localize`Proceed`

src-ui/src/environments/environment.prod.ts

@@ -5,7 +5,7 @@ export const environment = {
   apiBaseUrl: document.baseURI + 'api/',
   apiVersion: '2',
   appTitle: 'Paperless-ngx',
-  version: '1.10.2-dev',
+  version: '1.11.0-dev',
   webSocketHost: window.location.host,
   webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
   webSocketBaseUrl: base_url.pathname + 'ws/',