diff --git a/assets/css/app.css b/assets/css/app.css index e152e62..a062f4b 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -395,6 +395,7 @@ header a { nav .active a { color: #333; font-weight: bold; + text-decoration: none; } .logo { diff --git a/controllers/config.php b/controllers/config.php index 94e7892..73453fd 100644 --- a/controllers/config.php +++ b/controllers/config.php @@ -179,7 +179,7 @@ Router\get_action('help', function() { 'config' => Model\Config\get_all(), 'nb_unread_items' => Model\Item\count_by_status('unread'), 'menu' => 'config', - 'title' => t('Help') + 'title' => t('Preferences') ))); }); @@ -191,7 +191,7 @@ Router\get_action('about', function() { 'config' => Model\Config\get_all(), 'nb_unread_items' => Model\Item\count_by_status('unread'), 'menu' => 'config', - 'title' => t('About') + 'title' => t('Preferences') ))); }); @@ -204,7 +204,7 @@ Router\get_action('database', function() { 'db_size' => filesize(\Model\Database\get_path()), 'nb_unread_items' => Model\Item\count_by_status('unread'), 'menu' => 'config', - 'title' => t('Database') + 'title' => t('Preferences') ))); }); @@ -215,7 +215,7 @@ Router\get_action('api', function() { 'config' => Model\Config\get_all(), 'nb_unread_items' => Model\Item\count_by_status('unread'), 'menu' => 'config', - 'title' => t('API') + 'title' => t('Preferences') ))); }); @@ -226,7 +226,7 @@ Router\get_action('services', function() { 'errors' => array(), 'values' => Model\Config\get_all() + array('csrf' => Model\Config\generate_csrf()), 'menu' => 'config', - 'title' => t('External services') + 'title' => t('Preferences') ))); }); diff --git a/locales/cs_CZ/translations.php b/locales/cs_CZ/translations.php index 648a54e..1b90ccc 100644 --- a/locales/cs_CZ/translations.php +++ b/locales/cs_CZ/translations.php @@ -84,7 +84,6 @@ return array( 'Confirmation' => 'Potvrzení', 'Language' => 'Jazyk', 'Save' => 'Uložit', - 'Database' => 'Databáze', 'Database size:' => 'Velikost databáze:', 'Optimize the database' => 'Optimalizovat databázi', '(VACUUM command)' => '(příkaz VACUUM)', @@ -204,7 +203,6 @@ return array( // 'FAQ' => '', // 'settings' => '', // 'help' => '', - // 'API' => '', // 'api' => '', // 'about' => '', // 'This action will update Miniflux with the last development version, are you sure?' => '', @@ -218,7 +216,6 @@ return array( // 'Remove automatically unread items' => '', // 'Toggle RTL mode' => '', // 'external services' => '', - // 'External services' => '', // 'Send bookmarks to Pinboard' => '', // 'Pinboard API token' => '', // 'Pinboard tags' => '', @@ -233,4 +230,5 @@ return array( // 'Enable image proxy' => '', // 'Avoid mixed content warnings with HTTPS' => '', // 'Download favicons' => '', + // 'general' => '', ); diff --git a/locales/de_DE/translations.php b/locales/de_DE/translations.php index 0359714..f7b05cf 100644 --- a/locales/de_DE/translations.php +++ b/locales/de_DE/translations.php @@ -84,7 +84,6 @@ return array( 'Confirmation' => 'Bestätigung', 'Language' => 'Sprache', 'Save' => 'Speichern', - 'Database' => 'Datenbank', 'Database size:' => 'Größe der Datenbank:', 'Optimize the database' => 'Datenbank optimieren', '(VACUUM command)' => '(Befehl: SQL VACUUM)', @@ -204,7 +203,6 @@ return array( 'FAQ' => 'FAQ', 'settings' => 'Einstellungen', 'help' => 'Hilfe', - 'API' => 'API', 'api' => 'api', 'about' => 'über', 'This action will update Miniflux with the last development version, are you sure?' => 'Miniflux wird auf die aktuelle Entwicklungsversion aktualisiert. Bist du sicher?', @@ -218,7 +216,6 @@ return array( 'Remove automatically unread items' => 'Ungelesene Artikel automatisch entfernen', 'Toggle RTL mode' => 'Textrichtung umschalten', 'external services' => 'externe Dienste', - 'External services' => 'Externe Dienste', 'Send bookmarks to Pinboard' => 'Sende Lesezeichen an Pinboard', 'Pinboard API token' => 'Pinboard API Token', 'Pinboard tags' => 'Pinboard Tags', @@ -233,4 +230,5 @@ return array( 'Enable image proxy' => 'Verwende Proxyserver für Bilder', 'Avoid mixed content warnings with HTTPS' => 'Vermeidet Warnungen wegen gemischtem Inhalt bei HTTPS', 'Download favicons' => 'Favicons herunterladen', + 'general' => 'allgemein', ); diff --git a/locales/es_ES/translations.php b/locales/es_ES/translations.php index dfef1d9..7945802 100644 --- a/locales/es_ES/translations.php +++ b/locales/es_ES/translations.php @@ -84,7 +84,6 @@ return array( 'Confirmation' => 'Confirmación', 'Language' => 'Idioma', 'Save' => 'Guardar', - 'Database' => 'Base de datos', 'Database size:' => 'Tamaño de la base de datos:', 'Optimize the database' => 'Optimizar la base de datos', '(VACUUM command)' => '(comando SQL VACUUM)', @@ -204,7 +203,6 @@ return array( // 'FAQ' => '', // 'settings' => '', // 'help' => '', - // 'API' => '', // 'api' => '', // 'about' => '', // 'This action will update Miniflux with the last development version, are you sure?' => '', @@ -218,7 +216,6 @@ return array( // 'Remove automatically unread items' => '', // 'Toggle RTL mode' => '', // 'external services' => '', - // 'External services' => '', // 'Send bookmarks to Pinboard' => '', // 'Pinboard API token' => '', // 'Pinboard tags' => '', @@ -233,4 +230,5 @@ return array( // 'Enable image proxy' => '', // 'Avoid mixed content warnings with HTTPS' => '', // 'Download favicons' => '', + // 'general' => '', ); diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php index ba9675d..b2e587f 100644 --- a/locales/fr_FR/translations.php +++ b/locales/fr_FR/translations.php @@ -84,7 +84,6 @@ return array( 'Confirmation' => 'Confirmation', 'Language' => 'Langue', 'Save' => 'Sauvegarder', - 'Database' => 'Base de données', 'Database size:' => 'Taille de la base de données :', 'Optimize the database' => 'Optimiser la base de données', '(VACUUM command)' => '(commande SQL VACUUM)', @@ -204,7 +203,6 @@ return array( 'FAQ' => 'Questions fréquentes', 'settings' => 'préférences', 'help' => 'aide', - 'API' => 'API', 'api' => 'api', 'about' => 'a propos', 'This action will update Miniflux with the last development version, are you sure?' => 'Cette action va mettre à jour Miniflux avec la dernière version en cours de développement, êtes-vous certain ?', @@ -218,7 +216,6 @@ return array( 'Remove automatically unread items' => 'Supprimer automatiquement les éléments non lus', 'Toggle RTL mode' => 'Basculer entre le mode RTL', 'external services' => 'services externes', - 'External services' => 'Services externes', 'Send bookmarks to Pinboard' => 'Envoyer les favoris vers Pinboard', 'Pinboard API token' => 'Jeton d\'accès à l\'API de Pinboard', 'Pinboard tags' => 'Tags Pinboard', @@ -233,4 +230,5 @@ return array( 'Enable image proxy' => 'Activer le proxy pour les images', 'Avoid mixed content warnings with HTTPS' => 'Évite les alertes du navigateur web en HTTPS', 'Download favicons' => 'Télécharger les icônes des sites web', + 'general' => 'general', ); diff --git a/locales/it_IT/translations.php b/locales/it_IT/translations.php index 32461eb..3660deb 100644 --- a/locales/it_IT/translations.php +++ b/locales/it_IT/translations.php @@ -84,7 +84,6 @@ return array( 'Confirmation' => 'Conferma', 'Language' => 'Lingua', 'Save' => 'Salva', - 'Database' => 'Database', 'Database size:' => 'Dimensione database:', 'Optimize the database' => 'Ottimizza il database', '(VACUUM command)' => '(comando VACUUM)', @@ -204,7 +203,6 @@ return array( // 'FAQ' => '', // 'settings' => '', // 'help' => '', - // 'API' => '', // 'api' => '', // 'about' => '', // 'This action will update Miniflux with the last development version, are you sure?' => '', @@ -218,7 +216,6 @@ return array( // 'Remove automatically unread items' => '', // 'Toggle RTL mode' => '', // 'external services' => '', - // 'External services' => '', // 'Send bookmarks to Pinboard' => '', // 'Pinboard API token' => '', // 'Pinboard tags' => '', @@ -233,4 +230,5 @@ return array( // 'Enable image proxy' => '', // 'Avoid mixed content warnings with HTTPS' => '', // 'Download favicons' => '', + // 'general' => '', ); diff --git a/locales/pt_BR/translations.php b/locales/pt_BR/translations.php index c374809..8ec86b5 100644 --- a/locales/pt_BR/translations.php +++ b/locales/pt_BR/translations.php @@ -84,7 +84,6 @@ return array( 'Confirmation' => 'Repetir Senha', 'Language' => 'Linguagem', 'Save' => 'Salvar', - 'Database' => 'Banco de dados', 'Database size:' => 'Tamanho do Banco de dados:', 'Optimize the database' => 'Otimizar o banco de dados', '(VACUUM command)' => '(Comando SQL VACUUM)', @@ -204,7 +203,6 @@ return array( 'FAQ' => 'FAQ', 'settings' => 'configurações', 'help' => 'ajuda', - 'API' => 'API', 'api' => 'api', 'about' => 'sobre', 'This action will update Miniflux with the last development version, are you sure?' => 'Esta ação irá atualizar o Miniflux com a última versão de desenvolvimento, você tem certeza?', @@ -218,7 +216,6 @@ return array( 'Remove automatically unread items' => 'Remover automaticamente itens não lidos', 'Toggle RTL mode' => 'Alternar modo RTL', 'external services' => 'serviços externos', - 'External services' => 'Serviços externos', 'Send bookmarks to Pinboard' => 'Enviar bookmarks para Pinboard', 'Pinboard API token' => 'Token da API Pinboard', 'Pinboard tags' => 'Tags Pinboard', @@ -233,4 +230,5 @@ return array( 'Enable image proxy' => 'Habilitar proxy de imagens', 'Avoid mixed content warnings with HTTPS' => 'Evita alertas de mistura de conteúdo HTTPS', 'Download favicons' => 'Download favicon', + // 'general' => '', ); diff --git a/locales/zh_CN/translations.php b/locales/zh_CN/translations.php index 2c2fe54..f0dc5f6 100644 --- a/locales/zh_CN/translations.php +++ b/locales/zh_CN/translations.php @@ -84,7 +84,6 @@ return array( 'Confirmation' => '确认密码', 'Language' => '语言', 'Save' => '保存', - 'Database' => '数据库', 'Database size:' => '数据库大小:', 'Optimize the database' => '数据库优化', '(VACUUM command)' => '(VACUUM 命令)', @@ -204,7 +203,6 @@ return array( // 'FAQ' => '', // 'settings' => '', // 'help' => '', - // 'API' => '', // 'api' => '', // 'about' => '', // 'This action will update Miniflux with the last development version, are you sure?' => '', @@ -218,7 +216,6 @@ return array( // 'Remove automatically unread items' => '', // 'Toggle RTL mode' => '', // 'external services' => '', - // 'External services' => '', // 'Send bookmarks to Pinboard' => '', // 'Pinboard API token' => '', // 'Pinboard tags' => '', @@ -233,4 +230,5 @@ return array( // 'Enable image proxy' => '', // 'Avoid mixed content warnings with HTTPS' => '', // 'Download favicons' => '', + // 'general' => '', ); diff --git a/templates/about.php b/templates/about.php index 3641f11..e951ba3 100644 --- a/templates/about.php +++ b/templates/about.php @@ -1,12 +1,15 @@
-

- +

+
diff --git a/templates/api.php b/templates/api.php index e5fea5a..3c90608 100644 --- a/templates/api.php +++ b/templates/api.php @@ -1,12 +1,15 @@
-

-
    -
    • -
    • -
    • -
    • -
    • -
+

+
diff --git a/templates/config.php b/templates/config.php index 161a4bf..9902f9d 100644 --- a/templates/config.php +++ b/templates/config.php @@ -1,12 +1,15 @@
-

-
    -
    • -
    • -
    • -
    • -
    • -
+

+
diff --git a/templates/database.php b/templates/database.php index bf9e990..0d927e9 100644 --- a/templates/database.php +++ b/templates/database.php @@ -1,12 +1,15 @@
-

-
    -
    • -
    • -
    • -
    • -
    • -
+

+
diff --git a/templates/help.php b/templates/help.php index f871ae3..669afc3 100644 --- a/templates/help.php +++ b/templates/help.php @@ -1,12 +1,15 @@
-

-
    -
    • -
    • -
    • -
    • -
    • -
+

+
diff --git a/templates/services.php b/templates/services.php index bfe6851..f867ebb 100644 --- a/templates/services.php +++ b/templates/services.php @@ -1,12 +1,15 @@
-

-
    -
    • -
    • -
    • -
    • -
    • -
+

+