i18n: translation string improvements

src/assets/index.html

@@ -193,7 +193,7 @@
             </div>
             <div class="p-2 toolbar d-flex align-items-center border-top flex-shrink-0" v-if="loading.feeds">
                 <span class="icon loading mx-2"></span>
-                <span class="text-truncate cursor-default noselect">{{ $t('refreshing') }} ({{ loading.feeds }} {{ $t('left') }})</span>
+                <span class="text-truncate cursor-default noselect">{{ $t('refreshing_progress', {count: loading.feeds}) }}</span>
             </div>
         </div>
         <!-- item list -->

src/assets/javascripts/app.js

@@ -590,7 +590,7 @@ var vm = new Vue({
       }
     },
     deleteFolder: function(folder) {
-      if (confirm(this.$t('confirm_delete_folder', {name: folder.title}))) {
+      if (confirm(this.$t('confirm_delete', {name: folder.title}))) {
         api.folders.delete(folder.id).then(function() {
           vm.feedSelected = null
           vm.refreshStats()
@@ -615,7 +615,7 @@ var vm = new Vue({
       }
     },
     deleteFeed: function(feed) {
-      if (confirm(this.$t('confirm_delete_feed', {name: feed.title}))) {
+      if (confirm(this.$t('confirm_delete', {name: feed.title}))) {
         api.feeds.delete(feed.id).then(function() {
           vm.feedSelected = null
           vm.refreshStats()

src/assets/javascripts/i18n.js

@@ -95,15 +95,10 @@
       "zh": "全部订阅",
       "ru": "Все ленты"
     },
-    "refreshing": {
+    "refreshing_progress": {
-      "en": "Refreshing",
+      "en": "Refreshing ({ $count } left)",
-      "zh": "正在刷新",
+      "zh": "正在刷新（剩余{ $count }）",
-      "ru": "Обновление"
+      "ru": "Обновление: осталось { $count }"
-    },
-    "left": {
-      "en": "left",
-      "zh": "剩余",
-      "ru": "осталось"
     },
     "show_feeds": {
       "en": "Show Feeds",
@@ -320,12 +315,7 @@
       "zh": "请输入订阅链接",
       "ru": "Введите ссылку на ленту"
     },
-    "confirm_delete_folder": {
+    "confirm_delete": {
-      "en": "Are you sure you want to delete { $name }?",
-      "zh": "确定要删除{ $name }？",
-      "ru": "Вы уверены, что хотите удалить { $name }?"
-    },
-    "confirm_delete_feed": {
       "en": "Are you sure you want to delete { $name }?",
       "zh": "确定要删除{ $name }？",
       "ru": "Вы уверены, что хотите удалить { $name }?"