Merge branch 'develop' into steam-beta

src-ui/app/modules/translation/views/translation-editor-view/translation-editor-view.component.html

@@ -48,7 +48,7 @@
   <button class="btn btn-secondary btn-action btn-action-square" (click)="goPreviousPage()" [disabled]="paginationStart <= 0">
     <i class="material-icons">arrow_back_ios_new</i>
   </button>
-  <span class="pagination-label">{{paginationStart}}-{{paginationEnd - 1}} ({{entries.length}})</span>
+  <span class="pagination-label">{{paginationStart + 1}}-{{paginationEnd}} ({{entries.length}})</span>
   <button class="btn btn-secondary btn-action btn-action-square" (click)="goNextPage()" [disabled]="paginationEnd >= entries.length">
     <i class="material-icons">arrow_forward_ios</i>
   </button>

src-ui/assets/i18n/en.json

@@ -62,7 +62,7 @@
     "blacklist": "Player Blacklist",
     "clearPlayers": "Clear All",
     "conditions": {
-      "description": "Here you can configure OyasumiVR to only accept invite requests when certain conditions are",
+      "description": "Here you can configure OyasumiVR to only accept invite requests when certain conditions are met.",
       "title": "Conditions"
     },
     "description": "OyasumiVR can automatically accept invite requests you receive. By using the player whitelist or blacklist, you can make sure only the friends you pick will have their invite requests automatically accepted.",

src-ui/assets/i18n/ja.json

@@ -1283,7 +1283,7 @@
           "title": "ステータスの自動化"
         },
         "shutdownAutomations": {
-          "subtitle": "自動化が{triggerCount, plural, one {1つ} other {#つ}}設定されています",
+          "subtitle": "自動化が{triggerCount}つ設定されています",
           "title": "自動シャットダウン"
         },
         "sleepModeEnableForSleepDetector": {