From 3453a9f1d4fb950478b349b32736d70b3c140144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <fred@miniflux.net>
Date: Sat, 26 Jul 2014 07:33:15 -0400
Subject: [PATCH] Improve usability (merge pull-request #226)

---
 locales/cs_CZ/translations.php     | 2 ++
 locales/de_DE/translations.php     | 2 ++
 locales/es_ES/translations.php     | 2 ++
 locales/fr_FR/translations.php     | 2 ++
 locales/it_IT/translations.php     | 2 ++
 locales/pt_BR/translations.php     | 2 ++
 locales/zh_CN/translations.php     | 2 ++
 templates/add.php                  | 1 +
 templates/confirm_disable_feed.php | 2 +-
 templates/confirm_flush_items.php  | 2 +-
 templates/confirm_remove_feed.php  | 2 +-
 templates/edit_feed.php            | 3 ++-
 templates/import.php               | 1 +
 templates/new_db.php               | 1 +
 14 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/locales/cs_CZ/translations.php b/locales/cs_CZ/translations.php
index c39611e..ad3e1bd 100644
--- a/locales/cs_CZ/translations.php
+++ b/locales/cs_CZ/translations.php
@@ -75,6 +75,7 @@ return array(
     'Do you really want to disable this subscription: "%s"?' => 'Opravdu chcete zakázet odběr "%s"?',
     'enable' => 'povolit',
     'disable' => 'zakázat',
+    'Disable' => 'Zakázat',
     // 'Subscription disabled' => '',
     'Listing' => 'Seznam',
     'content downloaded' => 'obsah stažen',
@@ -160,6 +161,7 @@ return array(
     'refresh all' => 'aktualizovat vše',
     'No subscription' => 'Žádné zdroje',
     'remove' => 'odstranit',
+    'Remove' => 'Odstranit',
     'refresh' => 'aktualizovat',
     'feed link' => 'odkaz zdroje',
     'New subscription' => 'Nový odběr',
diff --git a/locales/de_DE/translations.php b/locales/de_DE/translations.php
index 3ed16f1..5ae0a2f 100644
--- a/locales/de_DE/translations.php
+++ b/locales/de_DE/translations.php
@@ -75,6 +75,7 @@ return array(
     'Do you really want to disable this subscription: "%s"?' => 'Möchtest du wirklich dieses Abonnement deaktivieren: "%s"?',
     'enable' => 'aktivieren',
     'disable' => 'deaktivieren',
+    'Disable' => 'Deaktivieren',
     'Subscription disabled' => 'Abonnement deaktiviert',
     'Listing' => 'Liste',
     'content downloaded' => 'Inhalt heruntergeladen',
@@ -160,6 +161,7 @@ return array(
     'refresh all' => 'alle aktualisieren',
     'No subscription' => 'Kein Abonnement',
     'remove' => 'entfernen',
+    'Remove' => 'Entfernen',
     'refresh' => 'aktualisieren',
     'feed link' => 'Feed-URL',
     'New subscription' => 'Neues Abonnement',
diff --git a/locales/es_ES/translations.php b/locales/es_ES/translations.php
index c63b9bc..d786f6b 100644
--- a/locales/es_ES/translations.php
+++ b/locales/es_ES/translations.php
@@ -75,6 +75,7 @@ return array(
     'Do you really want to disable this subscription: "%s"?' => '¿De verdad quiere desactivar esta suscripción: "%s"?',
     'enable' => 'activar',
     'disable' => 'desactivar',
+    'Disable' => 'Desactivar',
     'Subscription disabled' => 'Suscripción desactivada',
     'Listing' => 'Listado',
     'content downloaded' => 'contenido descargado',
@@ -160,6 +161,7 @@ return array(
     'refresh all' => 'actualizar todo',
     'No subscription' => 'No hay suscripciones',
     'remove' => 'borrar',
+    'Remove' => 'Borrar',
     'refresh' => 'actualizar',
     'feed link' => 'enlace del canal',
     'New subscription' => 'Nueva suscripción',
diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php
index f6b6e6b..76599df 100644
--- a/locales/fr_FR/translations.php
+++ b/locales/fr_FR/translations.php
@@ -75,6 +75,7 @@ return array(
     'Do you really want to disable this subscription: "%s"?' => 'Voulez-vous vraiment désactiver cet abonnement : « %s » ?',
     'enable' => 'activer',
     'disable' => 'désactiver',
+    'Disable' => 'Désactiver',
     'Subscription disabled' => 'Abonnement désactivé',
     'Listing' => 'Liste',
     'content downloaded' => 'contenu téléchargé',
@@ -160,6 +161,7 @@ return array(
     'refresh all' => 'actualiser',
     'No subscription' => 'Aucun abonnement',
     'remove' => 'supprimer',
+    'Remove' => 'Supprimer',
     'refresh' => 'actualiser',
     'feed link' => 'lien du flux',
     'New subscription' => 'Nouvel abonnement',
diff --git a/locales/it_IT/translations.php b/locales/it_IT/translations.php
index 9b9477e..9751994 100644
--- a/locales/it_IT/translations.php
+++ b/locales/it_IT/translations.php
@@ -75,6 +75,7 @@ return array(
     // 'Do you really want to disable this subscription: "%s"?' => '',
     // 'enable' => '',
     // 'disable' => '',
+    // 'Disable' => '',
     // 'Subscription disabled' => '',
     // 'Listing' => '',
     // 'content downloaded' => '',
@@ -160,6 +161,7 @@ return array(
     'refresh all' => 'aggiorna tutti',
     'No subscription' => 'Nessuna sottoscrizione',
     'remove' => 'cancella',
+    'Remove' => 'Cancella',
     'refresh' => 'aggiorna',
     'feed link' => 'link feed',
     'New subscription' => 'Nuova sottoscrizione',
diff --git a/locales/pt_BR/translations.php b/locales/pt_BR/translations.php
index 456cf0f..03fbc80 100644
--- a/locales/pt_BR/translations.php
+++ b/locales/pt_BR/translations.php
@@ -75,6 +75,7 @@ return array(
     // 'Do you really want to disable this subscription: "%s"?' => '',
     // 'enable' => '',
     // 'disable' => '',
+    // 'Disable' => '',
     // 'Subscription disabled' => '',
     // 'Listing' => '',
     // 'content downloaded' => '',
@@ -160,6 +161,7 @@ return array(
     'refresh all' => 'atualizar todos',
     'No subscription' => 'Sem assinaturas',
     'remove' => 'remover',
+    'Remove' => 'Remover',
     'refresh' => 'atualizar',
     'feed link' => 'feed link',
     'New subscription' => 'Nova assinatura',
diff --git a/locales/zh_CN/translations.php b/locales/zh_CN/translations.php
index 9ef59e5..ef8e856 100644
--- a/locales/zh_CN/translations.php
+++ b/locales/zh_CN/translations.php
@@ -75,6 +75,7 @@ return array(
     // 'Do you really want to disable this subscription: "%s"?' => '',
     // 'enable' => '',
     // 'disable' => '',
+    // 'Disable' => '',
     // 'Subscription disabled' => '',
     // 'Listing' => '',
     // 'content downloaded' => '',
@@ -160,6 +161,7 @@ return array(
     'refresh all' => '全部刷新',
     'No subscription' => '没有订阅',
     'remove' => '移除',
+    'Remove' => '移除',
     'refresh' => '刷新',
     'feed link' => '订阅源地址',
     'New subscription' => '添加订阅源',
diff --git a/templates/add.php b/templates/add.php
index a0b9e53..10f9a17 100644
--- a/templates/add.php
+++ b/templates/add.php
@@ -14,5 +14,6 @@
     <p class="form-help"><?= t('Downloading full content is slower because Miniflux grab the content from the original website. You should use that for subscriptions that display only a summary. This feature doesn\'t work with all websites.') ?></p>
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Add') ?></button>
+        <?= t('or') ?> <a href="?action=feeds"><?= t('cancel') ?></a>
     </div>
 </form>
diff --git a/templates/confirm_disable_feed.php b/templates/confirm_disable_feed.php
index 70dcb3d..c8eba1b 100644
--- a/templates/confirm_disable_feed.php
+++ b/templates/confirm_disable_feed.php
@@ -5,6 +5,6 @@
 <p class="alert alert-info"><?= t('Do you really want to disable this subscription: "%s"?', Helper\escape($feed['title'])) ?></p>
 
 <div class="form-actions">
-    <a href="?action=disable-feed&amp;feed_id=<?= $feed['id'] ?>" class="btn btn-red"><?= t('Yes') ?></a>
+    <a href="?action=disable-feed&amp;feed_id=<?= $feed['id'] ?>" class="btn btn-red"><?= t('Disable') ?></a>
     <?= t('or') ?> <a href="?action=feeds"><?= t('cancel') ?></a>
 </div>
\ No newline at end of file
diff --git a/templates/confirm_flush_items.php b/templates/confirm_flush_items.php
index 44938cc..8a64d60 100644
--- a/templates/confirm_flush_items.php
+++ b/templates/confirm_flush_items.php
@@ -5,6 +5,6 @@
 <p class="alert alert-info"><?= t('Do you really want to remove these items from your history?') ?></p>
 
 <div class="form-actions">
-    <a href="?action=flush-history" class="btn btn-red"><?= t('Yes') ?></a>
+    <a href="?action=flush-history" class="btn btn-red"><?= t('Remove') ?></a>
     <?= t('or') ?> <a href="?action=history"><?= t('cancel') ?></a>
 </div>
\ No newline at end of file
diff --git a/templates/confirm_remove_feed.php b/templates/confirm_remove_feed.php
index 640b9de..3eda29f 100644
--- a/templates/confirm_remove_feed.php
+++ b/templates/confirm_remove_feed.php
@@ -5,6 +5,6 @@
 <p class="alert alert-info"><?= t('Do you really want to remove this subscription: "%s"?', Helper\escape($feed['title'])) ?></p>
 
 <div class="form-actions">
-    <a href="?action=remove-feed&amp;feed_id=<?= $feed['id'] ?>" class="btn btn-red"><?= t('Yes') ?></a>
+    <a href="?action=remove-feed&amp;feed_id=<?= $feed['id'] ?>" class="btn btn-red"><?= t('Remove') ?></a>
     <?= t('or') ?> <a href="?action=feeds"><?= t('cancel') ?></a>
 </div>
\ No newline at end of file
diff --git a/templates/edit_feed.php b/templates/edit_feed.php
index 364632f..789ff18 100644
--- a/templates/edit_feed.php
+++ b/templates/edit_feed.php
@@ -22,6 +22,7 @@
     <?= Helper\form_text('feed_url', $values, $errors, array('required', 'placeholder="http://..."')) ?>
 
     <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Edit') ?></button> <?= t('or') ?> <a href="?action=feeds"><?= t('cancel') ?></a>
+        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+        <?= t('or') ?> <a href="?action=feeds"><?= t('cancel') ?></a>
     </div>
 </form>
\ No newline at end of file
diff --git a/templates/import.php b/templates/import.php
index eca99a7..b1bbc9a 100644
--- a/templates/import.php
+++ b/templates/import.php
@@ -12,5 +12,6 @@
     <input type="file" name="file" required/>
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Import') ?></button>
+        <?= t('or') ?> <a href="?action=feeds"><?= t('cancel') ?></a>
     </div>
 </form>
\ No newline at end of file
diff --git a/templates/new_db.php b/templates/new_db.php
index 766d316..67102fa 100644
--- a/templates/new_db.php
+++ b/templates/new_db.php
@@ -21,5 +21,6 @@
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Create') ?></button>
+        <?= t('or') ?> <a href="?action=config"><?= t('cancel') ?></a>
     </div>
 </form>