Use unique translation IDs instead of English text as key

locale/language.go

@@ -9,7 +9,7 @@ import "fmt"
 // Language represents a language in the system.
 type Language struct {
 	language     string
-	translations Translation
+	translations catalogMessages
 }
 
 // Get fetch the translation for the given key.

locale/locale.go

@@ -6,13 +6,7 @@ package locale // import "miniflux.app/locale"
 
 import "miniflux.app/logger"
 
-// Translation is the translation mapping table.
-type Translation map[string]interface{}
-
-// Locales represents locales supported by the system.
-type Locales map[string]Translation
-
-// Load prepare the locale system by loading all translations.
+// Load loads all translations.
 func Load() *Translator {
 	translator := NewTranslator()
 

locale/parser.go

@@ -0,0 +1,21 @@
+// Copyright 2018 Frédéric Guillot. All rights reserved.
+// Use of this source code is governed by the Apache 2.0
+// license that can be found in the LICENSE file.
+
+package locale // import "miniflux.app/locale"
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+type catalogMessages map[string]interface{}
+type catalog map[string]catalogMessages
+
+func parseCatalogMessages(data string) (catalogMessages, error) {
+	var translations catalogMessages
+	if err := json.Unmarshal([]byte(data), &translations); err != nil {
+		return nil, fmt.Errorf("invalid translation file: %v", err)
+	}
+	return translations, nil
+}

locale/parser_test.go

@@ -0,0 +1,34 @@
+// Copyright 2018 Frédéric Guillot. All rights reserved.
+// Use of this source code is governed by the Apache 2.0
+// license that can be found in the LICENSE file.
+
+package locale // import "miniflux.app/locale"
+
+import "testing"
+
+func TestParserWithInvalidData(t *testing.T) {
+	_, err := parseCatalogMessages(`{`)
+	if err == nil {
+		t.Fatal(`An error should be returned when parsing invalid data`)
+	}
+}
+
+func TestParser(t *testing.T) {
+	translations, err := parseCatalogMessages(`{"k": "v"}`)
+	if err != nil {
+		t.Fatalf(`Unexpected parsing error: %v`, err)
+	}
+
+	if translations == nil {
+		t.Fatal(`Translations should not be nil`)
+	}
+
+	value, found := translations["k"]
+	if !found {
+		t.Fatal(`The translation should contains the defined key`)
+	}
+
+	if value.(string) != "v" {
+		t.Fatal(`The translation key should contains the defined value`)
+	}
+}

locale/translations/de_DE.json

@@ -1,245 +1,284 @@
 {
-    "plural.feed.error_count": [
+    "confirm.question": "Sind Sie sicher?",
+    "confirm.yes": "ja",
+    "confirm.no": "nein",
+    "confirm.loading": "In Arbeit...",
+    "action.subscribe": "Abonnieren",
+    "action.save": "Speichern",
+    "action.or": "oder",
+    "action.cancel": "abbrechen",
+    "action.remove": "Entfernen",
+    "action.remove_feed": "Dieses Abonnement entfernen",
+    "action.update": "Aktualisieren",
+    "action.edit": "Bearbeiten",
+    "action.download": "Herunterladen",
+    "action.import": "Importieren",
+    "action.login": "Anmelden",
+    "tooltip.keyboard_shortcuts": "Tastenkürzel: %s",
+    "tooltip.logged_user": "Angemeldet als %s",
+    "menu.unread": "Ungelesen",
+    "menu.starred": "Starred",
+    "menu.history": "Verlauf",
+    "menu.feeds": "Abonnements",
+    "menu.categories": "Kategorien",
+    "menu.settings": "Einstellungen",
+    "menu.logout": "Abmelden",
+    "menu.preferences": "Einstellungen",
+    "menu.integrations": "Dienste",
+    "menu.sessions": "Sitzungen",
+    "menu.users": "Benutzer",
+    "menu.about": "Über",
+    "menu.export": "Exportieren",
+    "menu.import": "Importieren",
+    "menu.create_category": "Kategorie anlegen",
+    "menu.mark_page_as_read": "Diese seite als gelesen markieren",
+    "menu.mark_all_as_read": "Alle als gelesen markieren",
+    "menu.refresh_feed": "Aktualisieren",
+    "menu.refresh_all_feeds": "Alle Abonnements im Hintergrund aktualisieren",
+    "menu.edit_feed": "Bearbeiten",
+    "menu.add_feed": "Abonnement hinzufügen",
+    "menu.add_user": "Benutzer anlegen",
+    "menu.flush_history": "Verlauf leeren",
+    "search.label": "Suche",
+    "search.placeholder": "Suche...",
+    "pagination.next": "Nächste",
+    "pagination.previous": "Vorherige",
+    "entry.status.unread": "Ungelesen",
+    "entry.status.read": "Gelesen",
+    "entry.status.title": "Status des Artikels ändern",
+    "entry.bookmark.toggle.on": "Lesezeichen hinzufügen",
+    "entry.bookmark.toggle.off": "Lesezeichen entfernen",
+    "entry.state.saving": "Speichern...",
+    "entry.state.loading": "Lade...",
+    "entry.save.label": "Speichern",
+    "entry.save.title": "Diesen Artikel speichern",
+    "entry.save.completed": "Erledigt!",
+    "entry.scraper.label": "Inhalt herunterladen",
+    "entry.scraper.title": "Inhalt herunterladen",
+    "entry.scraper.completed": "Erledigt!",
+    "entry.original.label": "Original-Artikel",
+    "entry.comments.label": "Kommentare",
+    "entry.comments.title": "Kommentare anzeigen",
+    "page.unread.title": "Ungelesen",
+    "page.starred.title": "Lesezeichen",
+    "page.categories.title": "Kategorien",
+    "page.categories.feed_count": [
+        "Es gibt %d Abonnement.",
+        "Es gibt %d Abonnements."
+    ],
+    "page.new_category.title": "Neue Kategorie",
+    "page.new_user.title": "Neuer Benutzer",
+    "page.edit_category.title": "Kategorie bearbeiten: %s",
+    "page.edit_user.title": "Benutzer bearbeiten: %s",
+    "page.feeds.title": "Abonnements",
+    "page.feeds.last_check": "Letzte Aktualisierung:",
+    "page.feeds.error_count": [
         "%d Fehler",
         "%d Fehler"
     ],
-    "plural.categories.feed_count": [
-        "Es gibt %d Abonnement.",
-        "Es gibt %d Abonnements."
+    "page.history.title": "Verlauf",
+    "page.import.title": "Importieren",
+    "page.search.title": "Suchergebnisse",
+    "page.users.title": "Benutzer",
+    "page.about.title": "Über",
+    "page.about.credits": "Urheberrechte",
+    "page.about.version": "Version:",
+    "page.about.build_date": "Datum der Kompilierung:",
+    "page.about.author": "Autor:",
+    "page.about.license": "Lizenz:",
+    "page.add_feed.title": "Neues Abonnement",
+    "page.add_feed.no_category": "Es ist keine Kategorie vorhanden. Wenigstens eine Kategorie muss angelegt sein.",
+    "page.add_feed.label.url": "URL",
+    "page.add_feed.submit": "Abonnement suchen",
+    "page.add_feed.legend.advanced_options": "Erweiterte Optionen",
+    "page.add_feed.choose_feed": "Abonnement auswählen",
+    "page.edit_feed.title": "Abonnement bearbeiten: %s",
+    "page.edit_feed.last_check": "Letzte Aktualisierung:",
+    "page.edit_feed.last_modified_header": "Zuletzt geändert:",
+    "page.edit_feed.etag_header": "ETag-Kopfzeile:",
+    "page.edit_feed.no_header": "Nicht verfügbar",
+    "page.edit_feed.last_parsing_error": "Letzter Analysefehler",
+    "page.keyboard_shortcuts.title": "Tastenkürzel",
+    "page.keyboard_shortcuts.subtitle.sections": "Navigation zwischen den Menüpunkten",
+    "page.keyboard_shortcuts.subtitle.items": "Navigation zwischen den Artikeln",
+    "page.keyboard_shortcuts.subtitle.pages": "Navigation zwischen den Seiten",
+    "page.keyboard_shortcuts.subtitle.actions": "Actions",
+    "page.keyboard_shortcuts.go_to_unread": "Zu den ungelesenen Artikeln gehen",
+    "page.keyboard_shortcuts.go_to_starred": "Zu den Lesezeichen gehen",
+    "page.keyboard_shortcuts.go_to_history": "Zum Verlauf gehen",
+    "page.keyboard_shortcuts.go_to_feeds": "Zu den Abonnements gehen",
+    "page.keyboard_shortcuts.go_to_categories": "Zu den Kategorien gehen",
+    "page.keyboard_shortcuts.go_to_settings": "Zu den Einstellungen gehen",
+    "page.keyboard_shortcuts.show_keyboard_shortcuts": "Liste der Tastenkürzel anzeigen",
+    "page.keyboard_shortcuts.go_to_previous_item": "Zum vorherigen Artikel gehen",
+    "page.keyboard_shortcuts.go_to_next_item": "Zum nächsten Artikel gehen",
+    "page.keyboard_shortcuts.go_to_previous_page": "Zur vorherigen Seite gehen",
+    "page.keyboard_shortcuts.go_to_next_page": "Zur nächsten Seite gehen",
+    "page.keyboard_shortcuts.open_item": "Gewählten Artikel öffnen",
+    "page.keyboard_shortcuts.open_original": "Original-Artikel öffnen",
+    "page.keyboard_shortcuts.toggle_read_status": "Gewählten Artikel als gelesen/ungelesen markieren",
+    "page.keyboard_shortcuts.mark_page_as_read": "Aktuelle Seite als gelesen markieren",
+    "page.keyboard_shortcuts.download_content": "Vollständigen Inhalt herunterladen",
+    "page.keyboard_shortcuts.toggle_bookmark_status": "Lesezeichen hinzufügen/entfernen",
+    "page.keyboard_shortcuts.save_article": "Save article",
+    "page.keyboard_shortcuts.go_to_search": "Fokus auf das Suchformular setzen",
+    "page.keyboard_shortcuts.close_modal": "Liste der Tastenkürzel schließen",
+    "page.users.never_logged": "Niemals",
+    "page.users.admin.yes": "Ja",
+    "page.users.admin.no": "Nein",
+    "page.users.actions": "Aktionen",
+    "page.users.last_login": "Letzte Anmeldung",
+    "page.users.is_admin": "Administrator",
+    "page.settings.title": "Einstellungen",
+    "page.settings.link_google_account": "Google Konto verknüpfen",
+    "page.settings.unlink_google_account": "Diese Kategorie existiert nicht für diesen Benutzer",
+    "page.login.title": "Anmeldung",
+    "page.login.google_signin": "Anmeldung mit Google",
+    "page.integrations.title": "Dienste",
+    "page.integration.miniflux_api": "Miniflux API",
+    "page.integration.miniflux_api_endpoint": "API Endpunkt",
+    "page.integration.miniflux_api_username": "Nutzername",
+    "page.integration.miniflux_api_password": "Passwort",
+    "page.integration.miniflux_api_password_value": "Ihr Konto Passwort",
+    "page.integration.bookmarklet": "Bookmarklet",
+    "page.integration.bookmarklet.name": "Mit Miniflux abonnieren",
+    "page.integration.bookmarklet.instructions": "Ziehen Sie diesen Link in Ihre Lesezeichen.",
+    "page.integration.bookmarklet.help": "Dieser spezielle Link ermöglicht es, eine Webseite direkt über ein Lesezeichen im Browser zu abonnieren.",
+    "page.sessions.title": "Sitzungen",
+    "page.sessions.table.date": "Datum",
+    "page.sessions.table.ip": "IP Addresse",
+    "page.sessions.table.user_agent": "Benutzeragent",
+    "page.sessions.table.actions": "Aktionen",
+    "page.sessions.table.current_session": "Aktuelle Sitzung",
+    "alert.no_bookmark": "Es existiert derzeit kein Lesezeichen.",
+    "alert.no_category": "Es ist keine Kategorie vorhanden.",
+    "alert.no_category_entry": "Es befindet sich kein Artikel in dieser Kategorie.",
+    "alert.no_feed_entry": "Es existiert kein Artikel für dieses Abonnement.",
+    "alert.no_feed": "Es sind keine Abonnements vorhanden.",
+    "alert.no_history": "Es exisitiert zur Zeit kein Verlauf.",
+    "alert.feed_error": "Es gibt ein Problem mit diesem Abonnement",
+    "alert.no_search_result": "Es gibt kein Ergebnis für diese Suche.",
+    "alert.no_unread_entry": "Es existiert kein ungelesener Artikel.",
+    "alert.no_user": "Sie sind der einzige Benutzer.",
+    "alert.account_unlinked": "Ihr externer Account ist jetzt getrennt!",
+    "alert.account_linked": "Ihr externes Konto wurde verknüpft!",
+    "alert.pocket_linked": "Ihr Pocket Konto ist jetzt verknüpft!",
+    "alert.prefs_saved": "Einstellungen gespeichert!",
+    "error.unlink_account_without_password": "Sie müssen ein Passwort festlegen, sonst können Sie sich nicht erneut anmelden.",
+    "error.duplicate_linked_account": "Es ist bereits jemand mit diesem Anbieter assoziiert!",
+    "error.duplicate_fever_username": "Es existiert bereits jemand mit diesem Fever Benutzernamen!",
+    "error.pocket_request_token": "Anfrage-Token konnte nicht von Pocket abgerufen werden!",
+    "error.pocket_access_token": "Zugriffstoken konnte nicht von Pocket abgerufen werden!",
+    "error.category_already_exists": "Diese Kategorie existiert bereits.",
+    "error.unable_to_create_category": "Diese Kategorie konnte nicht angelegt werden.",
+    "error.unable_to_update_category": "Diese Kategorie konnte nicht aktualisiert werden.",
+    "error.user_already_exists": "Dieser Benutzer existiert bereits.",
+    "error.unable_to_create_user": "Dieser Benutzer kann nicht erstellt werden.",
+    "error.unable_to_update_user": "Dieser Benutzer konnte nicht aktualisiert werden.",
+    "error.unable_to_update_feed": "Dieser Feed konnte nicht aktualisiert werden.",
+    "error.subscription_not_found": "Es wurden keine Abonnements gefunden.",
+    "error.empty_file": "Diese Datei ist leer.",
+    "error.bad_credentials": "Benutzername oder Passwort ungültig.",
+    "error.fields_mandatory": "Alle Felder sind obligatorisch.",
+    "error.title_required": "Der Titel ist obligatorisch.",
+    "error.different_passwords": "Passwörter stimmen nicht überein.",
+    "error.password_min_length": "Wenigstens 6 Zeichen müssen genutzt werden.",
+    "error.settings_mandatory_fields": "Die Felder für Benutzername, Thema, Sprache und Zeitzone sind obligatorisch.",
+    "error.feed_mandatory_fields": "Die URL und die Kategorie sind obligatorisch.",
+    "error.user_mandatory_fields": "Der Benutzername ist obligatorisch.",
+    "form.feed.label.title": "Titel",
+    "form.feed.label.site_url": "Webseite-URL",
+    "form.feed.label.feed_url": "Abonnement-URL",
+    "form.feed.label.category": "Kategorie",
+    "form.feed.label.crawler": "Inhalt herunterladen",
+    "form.feed.label.feed_username": "Benutzername des Abonnements",
+    "form.feed.label.feed_password": "Passwort des Abonnements",
+    "form.feed.label.user_agent": "Standardbenutzeragenten überschreiben",
+    "form.feed.label.scraper_rules": "Extraktionsregeln",
+    "form.feed.label.rewrite_rules": "Umschreiberegeln",
+    "form.category.label.title": "Titel",
+    "form.user.label.username": "Anmeldung",
+    "form.user.label.password": "Passwort",
+    "form.user.label.confirmation": "Passwort Bestätigung",
+    "form.user.label.admin": "Administrator",
+    "form.prefs.label.language": "Sprache",
+    "form.prefs.label.timezone": "Zeitzone",
+    "form.prefs.label.theme": "Thema",
+    "form.prefs.label.entry_sorting": "Sortierung der Artikel",
+    "form.prefs.select.older_first": "Älteste Artikel zuerst",
+    "form.prefs.select.recent_first": "Neueste Artikel zuerst",
+    "form.import.label.file": "OPML Datei",
+    "form.integration.fever_activate": "Fever API aktivieren",
+    "form.integration.fever_username": "Fever Benutzername",
+    "form.integration.fever_password": "Fever Passwort",
+    "form.integration.fever_endpoint": "Fever API Endpunkt:",
+    "form.integration.pinboard_activate": "Artikel in Pinboard speichern",
+    "form.integration.pinboard_token": "Pinboard API Token",
+    "form.integration.pinboard_tags": "Pinboard Tags",
+    "form.integration.pinboard_bookmark": "Lesezeichen als ungelesen markieren",
+    "form.integration.instapaper_activate": "Artikel in Instapaper speichern",
+    "form.integration.instapaper_username": "Instapaper Benutzername",
+    "form.integration.instapaper_password": "Instapaper Passwort",
+    "form.integration.pocket_activate": "Artikel in Pocket speichern",
+    "form.integration.pocket_consumer_key": "Pocket Consumer Key",
+    "form.integration.pocket_access_token": "Pocket Access Token",
+    "form.integration.pocket_connect_link": "Verbinden Sie Ihr Pocket Konto",
+    "form.integration.wallabag_activate": "Artikel in Wallabag speichern",
+    "form.integration.wallabag_endpoint": "Wallabag URL",
+    "form.integration.wallabag_client_id": "Wallabag Client-ID",
+    "form.integration.wallabag_client_secret": "Wallabag Client-Secret",
+    "form.integration.wallabag_username": "Wallabag Benutzername",
+    "form.integration.wallabag_password": "Wallabag Passwort",
+    "form.integration.nunux_keeper_activate": "Artikel in Nunux Keeper speichern",
+    "form.integration.nunux_keeper_endpoint": "Nunux Keeper API-Endpunkt",
+    "form.integration.nunux_keeper_api_key": "Nunux Keeper API-Schlüssel",
+    "form.submit.loading": "Lade...",
+    "form.submit.saving": "Speichern...",
+    "time_elapsed.not_yet": "noch nicht",
+    "time_elapsed.yesterday": "gestern",
+    "time_elapsed.now": "gerade",
+    "time_elapsed.minutes": [
+        "vor %d Minute",
+        "vor %d Minuten"
+    ],
+    "time_elapsed.hours": [
+        "vor %d Stunde",
+        "vor %d Stunden"
+    ],
+    "time_elapsed.days": [
+        "vor %d Tag",
+        "vor %d Tagen"
+    ],
+    "time_elapsed.weeks": [
+        "vor %d Woche",
+        "vor %d Wochen"
+    ],
+    "time_elapsed.months": [
+        "vor %d Monat",
+        "vor %d Monaten"
+    ],
+    "time_elapsed.years": [
+        "vor %d Jahr",
+        "vor %d Jahren"
     ],
-    "Username": "Benutzername",
-    "Password": "Passwort",
-    "Unread": "Ungelesen",
-    "History": "Verlauf",
-    "Feeds": "Abonnements",
-    "Categories": "Kategorien",
-    "Settings": "Einstellungen",
-    "Logout": "Abmelden",
-    "Next": "Nächste",
-    "Previous": "Vorherige",
-    "New Subscription": "Neues Abonnement",
-    "Import": "Importieren",
-    "Export": "Exportieren",
-    "There is no category. You must have at least one category.": "Es ist keine Kategorie vorhanden. Wenigstens eine Kategorie muss angelegt sein.",
-    "URL": "URL",
-    "Category": "Kategorie",
-    "Find a subscription": "Abonnement suchen",
-    "Loading...": "Lade...",
-    "Create a category": "Kategorie anlegen",
-    "There is no category.": "Es ist keine Kategorie vorhanden.",
-    "Edit": "Bearbeiten",
-    "Remove": "Entfernen",
-    "No feed.": "Kein Abonnement.",
-    "There is no article in this category.": "Es befindet sich kein Artikel in dieser Kategorie.",
-    "Original": "Original-Artikel",
-    "Mark this page as read": "Diese Seite als gelesen markieren",
-    "not yet": "noch nicht",
-    "just now": "gerade",
-    "1 minute ago": "vor einer Minute",
-    "%d minutes ago": "vor %d Minuten",
-    "1 hour ago": "vor einer Stunde",
-    "%d hours ago": "vor %d Stunden",
-    "yesterday": "gestern",
-    "%d days ago": "vor %d Tagen",
-    "%d weeks ago": "vor %d Wochen",
-    "%d months ago": "vor %d Monaten",
-    "%d years ago": "vor %d Jahren",
-    "Date": "Datum",
-    "IP Address": "IP Adresse",
-    "User Agent": "Benutzeragent",
-    "Actions": "Aktionen",
-    "Current session": "Aktuelle Sitzung",
-    "Sessions": "Sitzungen",
-    "Users": "Benutzer",
-    "Add user": "Benutzer anlegen",
-    "Choose a Subscription": "Abonnement auswählen",
-    "Subscribe": "Abonnieren",
-    "New Category": "Neue Kategorie",
-    "Title": "Titel",
-    "Save": "Speichern",
-    "or": "oder",
-    "cancel": "abbrechen",
-    "New User": "Neuer Benutzer",
-    "Confirmation": "Bestätigung",
-    "Administrator": "Administrator",
-    "Edit Category: %s": "Kategorie bearbeiten: %s",
-    "Update": "Aktualisieren",
-    "Edit Feed: %s": "Abonnement bearbeiten: %s",
-    "There is no category!": "Es ist keine Kategorie vorhanden!",
-    "Edit user: %s": "Benutzer bearbeiten: %s",
-    "There is no article for this feed.": "Es existiert kein Artikel für dieses Abonnement.",
-    "Add subscription": "Abonnement hinzufügen",
-    "You don't have any subscription.": "Es sind keine Abonnements vorhanden",
-    "Last check:": "Letzte Aktualisierung:",
-    "Refresh": "Aktualisieren",
-    "There is no history at the moment.": "Es exisitiert zur Zeit kein Verlauf.",
-    "OPML file": "OPML Datei",
-    "Sign In": "Anmeldung",
-    "Sign in": "Anmelden",
-    "Theme": "Thema",
-    "Timezone": "Zeitzone",
-    "Language": "Sprache",
-    "There is no unread article.": "Es existiert kein ungelesener Artikel.",
-    "You are the only user.": "Sie sind der einzige Benutzer.",
-    "Last Login": "Letzte Anmeldung",
-    "Yes": "Ja",
-    "No": "Nein",
     "This feed already exists (%s)": "Diese Abonnement existiert bereits (%s)",
     "Unable to fetch feed (Status Code = %d)": "Abonnement konnte nicht abgerufen werden (code=%d)",
     "Unable to open this link: %v": "Dieser Link konnte nicht geöffnet werden: %v",
     "Unable to analyze this page: %v": "Diese Seite konnte nicht analysiert werden: %v",
-    "Unable to find any subscription.": "Es wurden keine Abonnements gefunden.",
-    "The URL and the category are mandatory.": "Die URL und die Kategorie sind obligatorisch.",
-    "All fields are mandatory.": "Alle Felder sind obligatorisch.",
-    "Passwords are not the same.": "Passwörter stimmen nicht überein.",
-    "You must use at least 6 characters.": "Wenigstens 6 Zeichen müssen genutzt werden.",
-    "The username is mandatory.": "Der Benutzername ist obligatorisch.",
-    "The username, theme, language and timezone fields are mandatory.": "Die Felder für Benutzername, Thema, Sprache und Zeitzone sind obligatorisch.",
-    "The title is mandatory.": "Der Titel ist obligatorisch.",
-    "About": "Über",
-    "Version": "Version",
-    "Version:": "Version:",
-    "Build Date:": "Datum der Kompilierung:",
-    "Author:": "Autor:",
-    "Authors": "Autoren",
-    "License:": "Lizenz:",
-    "Attachments": "Anhänge",
-    "Download": "Herunterladen",
-    "Invalid username or password.": "Benutzername oder Passwort ungültig.",
-    "Never": "Niemals",
     "Unable to execute request: %v": "Diese Anfrage konnte nicht ausgeführt werden: %v",
-    "Last Parsing Error": "Letzter Analysefehler",
-    "There is a problem with this feed": "Es gibt ein Problem mit diesem Abonnement",
     "Unable to parse OPML file: %q": "OPML Datei konnte nicht gelesen werden: %q",
     "Unable to parse RSS feed: %q": "RSS Abonnement konnte nicht gelesen werden: %q",
     "Unable to parse Atom feed: %q": "Atom Abonnement konnte nicht gelesen werden: %q",
     "Unable to parse JSON feed: %q": "JSON Abonnement konnte nicht gelesen werden: %q",
     "Unable to parse RDF feed: %q": "RDF Abonnement konnte nicht gelesen werden: %q",
     "Unable to normalize encoding: %q": "Zeichenkodierung konnte nicht normalisiert werden: %q",
-    "Unable to create this category.": "Diese Kategorie konnte nicht angelegt werden.",
-    "yes": "ja",
-    "no": "nein",
-    "Are you sure?": "Sind Sie sicher?",
-    "Work in progress...": "In Arbeit...",
-    "This user already exists.": "Dieser Benutzer existiert bereits.",
-    "This category already exists.": "Diese Kategorie existiert bereits.",
-    "Unable to update this category.": "Diese Kategorie konnte nicht aktualisiert werden.",
-    "Integrations": "Dienste",
-    "Bookmarklet": "Bookmarklet",
-    "Drag and drop this link to your bookmarks.": "Ziehen Sie diesen Link in Ihre Lesezeichen.",
-    "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.": "Dieser spezielle Link ermöglicht es, eine Webseite direkt über ein Lesezeichen im Browser zu abonnieren.",
-    "Add to Miniflux": "Mit Miniflux abonnieren",
-    "Refresh all feeds in background": "Alle Abonnements im Hintergrund aktualisieren",
-    "Sign in with Google": "Anmeldung mit Google",
-    "Unlink my Google account": "Google Konto abmelden",
-    "Link my Google account": "Google Konto verknüpfen",
-    "Category not found for this user": "Diese Kategorie existiert nicht für diesen Benutzer",
-    "Invalid theme.": "Dieses Thema ist fehlerhaft.",
-    "Entry Sorting": "Sortierung der Artikel",
-    "Older entries first": "Älteste Artikel zuerst",
-    "Recent entries first": "Neueste Artikel zuerst",
-    "Saving...": "Speichern...",
-    "Done!": "Erledigt!",
-    "Save this article": "Diesen Artikel speichern",
-    "Mark bookmark as unread": "Lesezeichen als ungelesen markieren",
-    "Pinboard Tags": "Pinboard Tags",
-    "Pinboard API Token": "Pinboard API Token",
-    "Save articles to Pinboard": "Artikel in Pinboard speichern",
-    "Save articles to Instapaper": "Artikel in Instapaper speichern",
-    "Instapaper Username": "Instapaper Benutzername",
-    "Instapaper Password": "Instapaper Passwort",
-    "Activate Fever API": "Fever API aktivieren",
-    "Fever Username": "Fever Benutzername",
-    "Fever Password": "Fever Passwort",
-    "Fetch original content": "Inhalt herunterladen",
-    "Scraper Rules": "Extraktionsregeln",
-    "Rewrite Rules": "Umschreiberegeln",
-    "Preferences saved!": "Einstellungen gespeichert!",
-    "Your external account is now linked!": "Ihr externes Konto wurde verknüpft!",
-    "Save articles to Wallabag": "Artikel in Wallabag speichern",
-    "Wallabag API Endpoint": "Wallabag URL",
-    "Wallabag Client ID": "Wallabag Client-ID",
-    "Wallabag Client Secret": "Wallabag Client-Secret",
-    "Wallabag Username": "Wallabag Benutzername",
-    "Wallabag Password": "Wallabag Passwort",
-    "Save articles to Nunux Keeper": "Artikel in Nunux Keeper speichern",
-    "Nunux Keeper API Endpoint": "Nunux Keeper API-Endpunkt",
-    "Nunux Keeper API key": "Nunux Keeper API-Schlüssel",
-    "Keyboard Shortcut: %s": "Tastenkürzel: %s",
-    "Favorites": "Lesezeichen",
-    "Star": "Lesezeichen hinzufügen",
-    "Unstar": "Lesezeichen entfernen",
-    "Starred": "Lesezeichen",
-    "There is no bookmark at the moment.": "Es existiert derzeit kein Lesezeichen.",
-    "Last checked:": "Zuletzt geprüft:",
-    "ETag header:": "ETag-Kopfzeile:",
-    "LastModified header:": "Zuletzt geändert:",
-    "None": "Nicht verfügbar",
-    "Keyboard Shortcuts": "Tastenkürzel",
-    "Sections Navigation": "Navigation zwischen den Menüpunkten",
-    "Go to unread": "Zu den ungelesenen Artikeln gehen",
-    "Go to bookmarks": "Zu den Lesezeichen gehen",
-    "Go to history": "Zum Verlauf gehen",
-    "Go to feeds": "Zu den Abonnements gehen",
-    "Go to categories": "Zu den Kategorien gehen",
-    "Go to settings": "Zu den Einstellungen gehen",
-    "Show keyboard shortcuts": "Liste der Tastenkürzel anzeigen",
-    "Items Navigation": "Navigation zwischen den Artikeln",
-    "Go to previous item": "Zum vorherigen Artikel gehen",
-    "Go to next item": "Zum nächsten Artikel gehen",
-    "Pages Navigation": "Navigation zwischen den Seiten",
-    "Go to previous page": "Zur vorherigen Seite gehen",
-    "Go to next page": "Zur nächsten Seite gehen",
-    "Open selected item": "Gewählten Artikel öffnen",
-    "Open original link": "Original-Artikel öffnen",
-    "Toggle read/unread": "Gewählten Artikel als gelesen/ungelesen markieren",
-    "Mark current page as read": "Aktuelle Seite als gelesen markieren",
-    "Download original content": "Vollständigen Inhalt herunterladen",
-    "Toggle bookmark": "Lesezeichen hinzufügen/entfernen",
-    "Close modal dialog": "Liste der Tastenkürzel schließen",
-    "Save article": "Artikel speichern",
-    "There is already someone associated with this provider!": "Es ist bereits jemand mit diesem Anbieter assoziiert!",
-    "There is already someone else with the same Fever username!": "Es existiert bereits jemand mit diesem Fever Benutzernamen!",
-    "Mark all as read": "Alle als gelesen markieren",
     "This feed is empty": "Dieses Abonnement ist leer",
-    "Flush history": "Verlauf leeren",
-    "Site URL": "Webseite-URL",
-    "Feed URL": "Abonnement-URL",
-    "Logged as %s": "Angemeldet als %s",
-    "Unread Items": "Ungelesen",
-    "Change entry status": "Status des Artikels ändern",
-    "Read": "Gelesen",
-    "Fever API endpoint:": "Fever API Endpunkt:",
-    "Miniflux API": "Miniflux API",
-    "API Endpoint": "API Endpunkt",
-    "Your account password": "Ihr Konto Passwort",
     "This web page is empty": "Diese Webseite ist leer",
     "Invalid SSL certificate (original error: %q)": "Ungültiges SSL-Zertifikat (ursprünglicher Fehler: %q)",
     "This website is temporarily unreachable (original error: %q)": "Diese Webseite ist vorübergehend nicht erreichbar (ursprünglicher Fehler: %q)",
     "This website is permanently unreachable (original error: %q)": "Diese Webseite ist dauerhaft nicht erreichbar (ursprünglicher Fehler: %q)",
     "Website unreachable, the request timed out after %d seconds": "Webseite nicht erreichbar, die Anfrage endete nach %d Sekunden",
-    "Comments": "Kommentare",
-    "View Comments": "Kommentare anzeigen",
-    "This file is empty": "Diese Datei ist leer",
-    "Your external account is now dissociated!": "Ihr externer Account ist jetzt getrennt!",
-    "You must define a password otherwise you won't be able to login again.": "Sie müssen ein Passwort festlegen, sonst können Sie sich nicht erneut anmelden.",
-    "Save articles to Pocket": "Artikel in Pocket speichern",
-    "Connect your Pocket account": "Verbinden Sie Ihr Pocket Konto",
-    "Pocket Consumer Key": "« Pocket Consumer Key »",
-    "Pocket Access Token": "« Pocket Access Token »",
-    "Your Pocket account is now linked!": "Ihr Pocket Konto ist jetzt verknüpft!",
-    "Unable to fetch access token from Pocket!": "Zugriffstoken konnte nicht von Pocket abgerufen werden!",
-    "Unable to fetch request token from Pocket!": "Anfrage-Token konnte nicht von Pocket abgerufen werden!",
-    "Advanced Options": "Erweiterte Optionen",
-    "Feed Username": "Benutzername des Abonnements",
-    "Feed Password": "Passwort des Abonnements",
     "You are not authorized to access this resource (invalid username/password)": "Sie sind nicht berechtigt, auf diese Ressource zuzugreifen (Benutzername/Passwort ungültig)",
     "Unable to fetch this resource (Status Code = %d)": "Ressource konnte nicht abgerufen werden (code=%d)",
-    "Resource not found (404), this feed doesn't exists anymore, check the feed URL": "Ressource nicht gefunden (404), dieses Abonnement existiert nicht mehr, überprüfen Sie die Abonnement-URL",
-    "Search Results": "Suchergebnisse",
-    "There is no result for this search.": "Es gibt kein Ergebnis für diese Suche.",
-    "Search...": "Suche...",
-    "Set focus on search form": "Fokus auf das Suchformular setzen",
-    "Search": "Suche",
-    "Remove this feed": "Dieses Abonnement entfernen"
+    "Resource not found (404), this feed doesn't exists anymore, check the feed URL": "Ressource nicht gefunden (404), dieses Abonnement existiert nicht mehr, überprüfen Sie die Abonnement-URL"
 }

locale/translations/en_US.json

@@ -1,10 +1,264 @@
 {
-    "plural.feed.error_count": [
+    "confirm.question": "Are you sure?",
+    "confirm.yes": "yes",
+    "confirm.no": "no",
+    "confirm.loading": "In progress...",
+    "action.subscribe": "Subscribe",
+    "action.save": "Save",
+    "action.or": "or",
+    "action.cancel": "cancel",
+    "action.remove": "Remove",
+    "action.remove_feed": "Remove this feed",
+    "action.update": "Update",
+    "action.edit": "Edit",
+    "action.download": "Download",
+    "action.import": "Import",
+    "action.login": "Login",
+    "tooltip.keyboard_shortcuts": "Keyboard Shortcut: %s",
+    "tooltip.logged_user": "Logged as %s",
+    "menu.unread": "Unread",
+    "menu.starred": "Starred",
+    "menu.history": "History",
+    "menu.feeds": "Feeds",
+    "menu.categories": "Categories",
+    "menu.settings": "Settings",
+    "menu.logout": "Logout",
+    "menu.preferences": "Preferences",
+    "menu.integrations": "Integrations",
+    "menu.sessions": "Sessions",
+    "menu.users": "Users",
+    "menu.about": "About",
+    "menu.export": "Export",
+    "menu.import": "Import",
+    "menu.create_category": "Create a category",
+    "menu.mark_page_as_read": "Mark this page as read",
+    "menu.mark_all_as_read": "Mark all as read",
+    "menu.refresh_feed": "Refresh",
+    "menu.refresh_all_feeds": "Refresh all feeds in background",
+    "menu.edit_feed": "Edit",
+    "menu.add_feed": "Add subscription",
+    "menu.add_user": "Add user",
+    "menu.flush_history": "Flush history",
+    "search.label": "Search",
+    "search.placeholder": "Search...",
+    "pagination.next": "Next",
+    "pagination.previous": "Previous",
+    "entry.status.unread": "Unread",
+    "entry.status.read": "Read",
+    "entry.status.title": "Change entry status",
+    "entry.bookmark.toggle.on": "Star",
+    "entry.bookmark.toggle.off": "Unstar",
+    "entry.state.saving": "Saving...",
+    "entry.state.loading": "Loading...",
+    "entry.save.label": "Save",
+    "entry.save.title": "Save this article",
+    "entry.save.completed": "Done!",
+    "entry.scraper.label": "Fetch original content",
+    "entry.scraper.title": "Fetch original content",
+    "entry.scraper.completed": "Done!",
+    "entry.original.label": "Original",
+    "entry.comments.label": "Comments",
+    "entry.comments.title": "View Comments",
+    "page.unread.title": "Unread",
+    "page.starred.title": "Starred",
+    "page.categories.title": "Categories",
+    "page.categories.feed_count": [
+        "There is %d feed.",
+        "There are %d feeds."
+    ],
+    "page.new_category.title": "New Category",
+    "page.new_user.title": "New User",
+    "page.edit_category.title": "Edit Category: %s",
+    "page.edit_user.title": "Edit User: %s",
+    "page.feeds.title": "Feeds",
+    "page.feeds.last_check": "Last check:",
+    "page.feeds.error_count": [
         "%d error",
         "%d errors"
     ],
-    "plural.categories.feed_count": [
-        "There is %d feed.",
-        "There are %d feeds."
+    "page.history.title": "History",
+    "page.import.title": "Import",
+    "page.search.title": "Search Results",
+    "page.about.title": "About",
+    "page.about.credits": "Credits",
+    "page.about.version": "Version:",
+    "page.about.build_date": "Build Date:",
+    "page.about.author": "Author:",
+    "page.about.license": "License:",
+    "page.add_feed.title": "New Subscription",
+    "page.add_feed.no_category": "There is no category. You must have at least one category.",
+    "page.add_feed.label.url": "URL",
+    "page.add_feed.submit": "Find a subscription",
+    "page.add_feed.legend.advanced_options": "Advanced Options",
+    "page.add_feed.choose_feed": "Choose a Subscription",
+    "page.edit_feed.title": "Edit Feed: %s",
+    "page.edit_feed.last_check": "Last check:",
+    "page.edit_feed.last_modified_header": "LastModified header:",
+    "page.edit_feed.etag_header": "ETag header:",
+    "page.edit_feed.no_header": "None",
+    "page.edit_feed.last_parsing_error": "Last Parsing Error",
+    "page.keyboard_shortcuts.title": "Keyboard Shortcuts",
+    "page.keyboard_shortcuts.subtitle.sections": "Sections Navigation",
+    "page.keyboard_shortcuts.subtitle.items": "Items Navigation",
+    "page.keyboard_shortcuts.subtitle.pages": "Pages Navigation",
+    "page.keyboard_shortcuts.subtitle.actions": "Actions",
+    "page.keyboard_shortcuts.go_to_unread": "Go to unread",
+    "page.keyboard_shortcuts.go_to_starred": "Go to bookmarks",
+    "page.keyboard_shortcuts.go_to_history": "Go to history",
+    "page.keyboard_shortcuts.go_to_feeds": "Go to feeds",
+    "page.keyboard_shortcuts.go_to_categories": "Go to categories",
+    "page.keyboard_shortcuts.go_to_settings": "Go to settings",
+    "page.keyboard_shortcuts.show_keyboard_shortcuts": "Show keyboard shortcuts",
+    "page.keyboard_shortcuts.go_to_previous_item": "Go to previous item",
+    "page.keyboard_shortcuts.go_to_next_item": "Go to next item",
+    "page.keyboard_shortcuts.go_to_previous_page": "Go to previous page",
+    "page.keyboard_shortcuts.go_to_next_page": "Go to next page",
+    "page.keyboard_shortcuts.open_item": "Open selected item",
+    "page.keyboard_shortcuts.open_original": "Open original link",
+    "page.keyboard_shortcuts.toggle_read_status": "Toggle read/unread",
+    "page.keyboard_shortcuts.mark_page_as_read": "Mark current page as read",
+    "page.keyboard_shortcuts.download_content": "Download original content",
+    "page.keyboard_shortcuts.toggle_bookmark_status": "Toggle bookmark",
+    "page.keyboard_shortcuts.save_article": "Save article",
+    "page.keyboard_shortcuts.go_to_search": "Set focus on search form",
+    "page.keyboard_shortcuts.close_modal": "Close modal dialog",
+    "page.users.title": "Users",
+    "page.users.never_logged": "Never",
+    "page.users.admin.yes": "Yes",
+    "page.users.admin.no": "No",
+    "page.users.actions": "Actions",
+    "page.users.last_login": "Last Login",
+    "page.users.is_admin": "Administrator",
+    "page.settings.title": "Settings",
+    "page.settings.link_google_account": "Link my Google account",
+    "page.settings.unlink_google_account": "Unlink my Google account",
+    "page.login.title": "Sign In",
+    "page.login.google_signin": "Sign in with Google",
+    "page.integrations.title": "Integrations",
+    "page.integration.miniflux_api": "Miniflux API",
+    "page.integration.miniflux_api_endpoint": "API Endpoint",
+    "page.integration.miniflux_api_username": "Username",
+    "page.integration.miniflux_api_password": "Password",
+    "page.integration.miniflux_api_password_value": "Your account password",
+    "page.integration.bookmarklet": "Bookmarklet",
+    "page.integration.bookmarklet.name": "Add to Miniflux",
+    "page.integration.bookmarklet.instructions": "Drag and drop this link to your bookmarks.",
+    "page.integration.bookmarklet.help": "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.",
+    "page.sessions.title": "Sessions",
+    "page.sessions.table.date": "Date",
+    "page.sessions.table.ip": "IP Address",
+    "page.sessions.table.user_agent": "User Agent",
+    "page.sessions.table.actions": "Actions",
+    "page.sessions.table.current_session": "Current Session",
+    "alert.no_bookmark": "There is no bookmark at the moment.",
+    "alert.no_category": "There is no category.",
+    "alert.no_category_entry": "There is no article in this category.",
+    "alert.no_feed_entry": "There is no article for this feed.",
+    "alert.no_feed": "You don't have any subscription.",
+    "alert.no_history": "There is no history at the moment.",
+    "alert.feed_error": "There is a problem with this feed",
+    "alert.no_search_result": "There is no result for this search.",
+    "alert.no_unread_entry": "There is no unread article.",
+    "alert.no_user": "You are the only user.",
+    "alert.account_unlinked": "Your external account is now dissociated!",
+    "alert.account_linked": "Your external account is now linked!",
+    "alert.pocket_linked": "Your Pocket account is now linked!",
+    "alert.prefs_saved": "Preferences saved!",
+    "error.unlink_account_without_password": "You must define a password otherwise you won't be able to login again.",
+    "error.duplicate_linked_account": "There is already someone associated with this provider!",
+    "error.duplicate_fever_username": "There is already someone else with the same Fever username!",
+    "error.pocket_request_token": "Unable to fetch request token from Pocket!",
+    "error.pocket_access_token": "Unable to fetch access token from Pocket!",
+    "error.category_already_exists": "This category already exists.",
+    "error.unable_to_create_category": "Unable to create this category.",
+    "error.unable_to_update_category": "Unable to update this category.",
+    "error.user_already_exists": "This user already exists.",
+    "error.unable_to_create_user": "Unable to create this user.",
+    "error.unable_to_update_user": "Unable to update this user.",
+    "error.unable_to_update_feed": "Unable to update this feed.",
+    "error.subscription_not_found": "Unable to find any subscription.",
+    "error.empty_file": "This file is empty.",
+    "error.bad_credentials": "Invalid username or password.",
+    "error.fields_mandatory": "All fields are mandatory.",
+    "error.title_required": "The title is mandatory.",
+    "error.different_passwords": "Passwords are not the same.",
+    "error.password_min_length": "You must use at least 6 characters.",
+    "error.settings_mandatory_fields": "The username, theme, language and timezone fields are mandatory.",
+    "error.feed_mandatory_fields": "The URL and the category are mandatory.",
+    "error.user_mandatory_fields": "The username is mandatory.",
+    "form.feed.label.title": "Title",
+    "form.feed.label.site_url": "Site URL",
+    "form.feed.label.feed_url": "Feed URL",
+    "form.feed.label.category": "Category",
+    "form.feed.label.crawler": "Fetch original content",
+    "form.feed.label.feed_username": "Feed Username",
+    "form.feed.label.feed_password": "Feed Password",
+    "form.feed.label.user_agent": "Override Default User Agent",
+    "form.feed.label.scraper_rules": "Scraper Rules",
+    "form.feed.label.rewrite_rules": "Rewrite Rules",
+    "form.category.label.title": "Title",
+    "form.user.label.username": "Login",
+    "form.user.label.password": "Password",
+    "form.user.label.confirmation": "Password Confirmation",
+    "form.user.label.admin": "Administrator",
+    "form.prefs.label.language": "Language",
+    "form.prefs.label.timezone": "Timezone",
+    "form.prefs.label.theme": "Theme",
+    "form.prefs.label.entry_sorting": "Entry Sorting",
+    "form.prefs.select.older_first": "Older entries first",
+    "form.prefs.select.recent_first": "Recent entries first",
+    "form.import.label.file": "OPML file",
+    "form.integration.fever_activate": "Activate Fever API",
+    "form.integration.fever_username": "Fever Username",
+    "form.integration.fever_password": "Fever Password",
+    "form.integration.fever_endpoint": "Fever API endpoint:",
+    "form.integration.pinboard_activate": "Save articles to Pinboard",
+    "form.integration.pinboard_token": "Pinboard API Token",
+    "form.integration.pinboard_tags": "Pinboard Tags",
+    "form.integration.pinboard_bookmark": "Mark bookmark as unread",
+    "form.integration.instapaper_activate": "Save articles to Instapaper",
+    "form.integration.instapaper_username": "Instapaper Username",
+    "form.integration.instapaper_password": "Instapaper Password",
+    "form.integration.pocket_activate": "Save articles to Pocket",
+    "form.integration.pocket_consumer_key": "Pocket Consumer Key",
+    "form.integration.pocket_access_token": "Pocket Access Token",
+    "form.integration.pocket_connect_link": "Connect your Pocket account",
+    "form.integration.wallabag_activate": "Save articles to Wallabag",
+    "form.integration.wallabag_endpoint": "Wallabag API Endpoint",
+    "form.integration.wallabag_client_id": "Wallabag Client ID",
+    "form.integration.wallabag_client_secret": "Wallabag Client Secret",
+    "form.integration.wallabag_username": "Wallabag Username",
+    "form.integration.wallabag_password": "Wallabag Password",
+    "form.integration.nunux_keeper_activate": "Save articles to Nunux Keeper",
+    "form.integration.nunux_keeper_endpoint": "Nunux Keeper API Endpoint",
+    "form.integration.nunux_keeper_api_key": "Nunux Keeper API key",
+    "form.submit.loading": "Loading...",
+    "form.submit.saving": "Saving...",
+    "time_elapsed.not_yet": "not yet",
+    "time_elapsed.yesterday": "yesterday",
+    "time_elapsed.now": "just now",
+    "time_elapsed.minutes": [
+        "%d minute ago",
+        "%d minutes ago"
+    ],
+    "time_elapsed.hours": [
+        "%d hour ago",
+        "%d hours ago"
+    ],
+    "time_elapsed.days": [
+        "%d day ago",
+        "%d days ago"
+    ],
+    "time_elapsed.weeks": [
+        "%d week ago",
+        "%d weeks ago"
+    ],
+    "time_elapsed.months": [
+        "%d month ago",
+        "%d months ago"
+    ],
+    "time_elapsed.years": [
+        "%d year ago",
+        "%d years ago"
     ]
 }

locale/translations/fr_FR.json

@@ -1,245 +1,284 @@
 {
-    "plural.feed.error_count": [
+    "confirm.question": "Êtes-vous sûr ?",
+    "confirm.yes": "oui",
+    "confirm.no": "non",
+    "confirm.loading": "En cours...",
+    "action.subscribe": "S'abonner",
+    "action.save": "Sauvegarder",
+    "action.or": "ou",
+    "action.cancel": "annuler",
+    "action.remove": "Supprimer",
+    "action.remove_feed": "Supprimer ce flux",
+    "action.update": "Mettre à jour",
+    "action.edit": "Modifier",
+    "action.download": "Télécharger",
+    "action.import": "Importer",
+    "action.login": "Se connecter",
+    "tooltip.keyboard_shortcuts": "Raccourci clavier : %s",
+    "tooltip.logged_user": "Connecté en tant que %s",
+    "menu.unread": "Non lus",
+    "menu.starred": "Favoris",
+    "menu.history": "Historique",
+    "menu.feeds": "Abonnements",
+    "menu.categories": "Catégories",
+    "menu.settings": "Réglages",
+    "menu.logout": "Se déconnecter",
+    "menu.preferences": "Préférences",
+    "menu.integrations": "Intégrations",
+    "menu.sessions": "Sessions",
+    "menu.users": "Uilisateurs",
+    "menu.about": "A propos",
+    "menu.export": "Export",
+    "menu.import": "Import",
+    "menu.create_category": "Créer une catégorie",
+    "menu.mark_page_as_read": "Marquer cette page comme lu",
+    "menu.mark_all_as_read": "Tout marquer comme lu",
+    "menu.refresh_feed": "Actualiser",
+    "menu.refresh_all_feeds": "Actualiser les abonnements en arrière-plan",
+    "menu.edit_feed": "Modifier",
+    "menu.add_feed": "Ajouter un abonnement",
+    "menu.add_user": "Ajouter un utilisateur",
+    "menu.flush_history": "Supprimer l'historique",
+    "search.label": "Recherche",
+    "search.placeholder": "Recherche...",
+    "pagination.next": "Suivant",
+    "pagination.previous": "Précédent",
+    "entry.status.unread": "Non lu",
+    "entry.status.read": "Lu",
+    "entry.status.title": "Changer le statut de l'entrée",
+    "entry.bookmark.toggle.on": "Favoris",
+    "entry.bookmark.toggle.off": "Enlever favoris",
+    "entry.state.saving": "Sauvegarde en cours...",
+    "entry.state.loading": "Chargement...",
+    "entry.save.label": "Sauvegarder",
+    "entry.save.title": "Sauvegarder cet article",
+    "entry.save.completed": "Terminé !",
+    "entry.scraper.label": "Contenu original",
+    "entry.scraper.title": "Récupérer le contenu original",
+    "entry.scraper.completed": "Terminé !",
+    "entry.original.label": "Original",
+    "entry.comments.label": "Commentaires",
+    "entry.comments.title": "Voir les commentaires",
+    "page.unread.title": "Non lus",
+    "page.starred.title": "Favoris",
+    "page.categories.title": "Catégories",
+    "page.categories.feed_count": [
+        "Il y a %d abonnement.",
+        "Il y a %d abonnements."
+    ],
+    "page.new_category.title": "Nouvelle catégorie",
+    "page.new_user.title": "Nouvel Utilisateur",
+    "page.edit_category.title": "Modification de la catégorie : %s",
+    "page.edit_user.title": "Modifier l'utilisateur : %s",
+    "page.feeds.title": "Abonnements",
+    "page.feeds.last_check": "Dernière vérification :",
+    "page.feeds.error_count": [
         "%d erreur",
         "%d erreurs"
     ],
-    "plural.categories.feed_count": [
-        "Il y a %d abonnement.",
-        "Il y a %d abonnements."
+    "page.history.title": "Historique",
+    "page.import.title": "Importation",
+    "page.search.title": "Résultats de la recherche",
+    "page.about.title": "A propos",
+    "page.about.credits": "Crédits",
+    "page.about.version": "Version :",
+    "page.about.build_date": "Date de la compilation :",
+    "page.about.author": "Auteur :",
+    "page.about.license": "Licence :",
+    "page.add_feed.title": "Nouvel Abonnement",
+    "page.add_feed.no_category": "Il n'y a aucune catégorie. Vous devez avoir au moins une catégorie.",
+    "page.add_feed.label.url": "Lien",
+    "page.add_feed.submit": "Trouver un abonnement",
+    "page.add_feed.legend.advanced_options": "Options avancées",
+    "page.add_feed.choose_feed": "Choisissez un abonnement",
+    "page.edit_feed.title": "Modification de l'abonnement : %s",
+    "page.edit_feed.last_check": "Dernière vérification :",
+    "page.edit_feed.last_modified_header": "En-tête LastModified :",
+    "page.edit_feed.etag_header": "En-tête ETag :",
+    "page.edit_feed.no_header": "Aucune",
+    "page.edit_feed.last_parsing_error": "Dernière erreur d'analyse",
+    "page.keyboard_shortcuts.title": "Raccourcis clavier",
+    "page.keyboard_shortcuts.subtitle.sections": "Naviguation entre les sections",
+    "page.keyboard_shortcuts.subtitle.items": "Naviguation entre les éléments",
+    "page.keyboard_shortcuts.subtitle.pages": "Naviguation entre les pages",
+    "page.keyboard_shortcuts.subtitle.actions": "Actions",
+    "page.keyboard_shortcuts.go_to_unread": "Aller aux éléments non lus",
+    "page.keyboard_shortcuts.go_to_starred": "Voir les favoris",
+    "page.keyboard_shortcuts.go_to_history": "Voir l'historique",
+    "page.keyboard_shortcuts.go_to_feeds": "Voir les abonnements",
+    "page.keyboard_shortcuts.go_to_categories": "Voir les catégories",
+    "page.keyboard_shortcuts.go_to_settings": "Voir les réglages",
+    "page.keyboard_shortcuts.show_keyboard_shortcuts": "Voir les raccourcis clavier",
+    "page.keyboard_shortcuts.go_to_previous_item": "Élément précédent",
+    "page.keyboard_shortcuts.go_to_next_item": "Élément suivant",
+    "page.keyboard_shortcuts.go_to_previous_page": "Page précédente",
+    "page.keyboard_shortcuts.go_to_next_page": "Page suivante",
+    "page.keyboard_shortcuts.open_item": "Ouvrir élément sélectionné",
+    "page.keyboard_shortcuts.open_original": "Ouvrir lien original",
+    "page.keyboard_shortcuts.toggle_read_status": "Basculer entre lu/non lu",
+    "page.keyboard_shortcuts.mark_page_as_read": "Marquer la page actuelle comme lu",
+    "page.keyboard_shortcuts.download_content": "Télécharger le contenu original",
+    "page.keyboard_shortcuts.toggle_bookmark_status": "Ajouter/Enlever favoris",
+    "page.keyboard_shortcuts.save_article": "Sauvegarder l'article",
+    "page.keyboard_shortcuts.go_to_search": "Mettre le focus sur le champ de recherche",
+    "page.keyboard_shortcuts.close_modal": "Fermer la boite de dialogue",
+    "page.users.title": "Utilisateurs",
+    "page.users.never_logged": "Jamais",
+    "page.users.admin.yes": "Oui",
+    "page.users.admin.no": "Non",
+    "page.users.actions": "Actions",
+    "page.users.last_login": "Dernière connexion",
+    "page.users.is_admin": "Administrateur",
+    "page.settings.title": "Réglages",
+    "page.settings.link_google_account": "Associer mon compte Google",
+    "page.settings.unlink_google_account": "Dissocier mon compte Google",
+    "page.login.title": "Connexion",
+    "page.login.google_signin": "Se connecter avec Google",
+    "page.integrations.title": "Intégrations",
+    "page.integration.miniflux_api": "API de Miniflux",
+    "page.integration.miniflux_api_endpoint": "Point de terminaison de l'API",
+    "page.integration.miniflux_api_username": "Nom d'utilisateur",
+    "page.integration.miniflux_api_password": "Mot de passe",
+    "page.integration.miniflux_api_password_value": "Le mot de passe de votre compte",
+    "page.integration.bookmarklet": "Bookmarklet",
+    "page.integration.bookmarklet.name": "Ajouter à Miniflux",
+    "page.integration.bookmarklet.instructions": "Glisser-déposer ce lien dans vos favoris.",
+    "page.integration.bookmarklet.help": "Ce lien spécial vous permet de vous abonner à un site web directement en utilisant un marque page dans votre navigateur web.",
+    "page.sessions.title": "Sessions",
+    "page.sessions.table.date": "Date",
+    "page.sessions.table.ip": "Adresse IP",
+    "page.sessions.table.user_agent": "Navigateur Web",
+    "page.sessions.table.actions": "Actions",
+    "page.sessions.table.current_session": "Session actuelle",
+    "alert.no_bookmark": "Il n'y a aucun favoris pour le moment.",
+    "alert.no_category": "Il n'y a aucune catégorie.",
+    "alert.no_category_entry": "Il n'y a aucun article dans cette catégorie.",
+    "alert.no_feed_entry": "Il n'y a aucun article pour cet abonnement.",
+    "alert.no_feed": "Vous n'avez aucun abonnement.",
+    "alert.no_history": "Il n'y a aucun historique pour le moment.",
+    "alert.feed_error": "Il y a un problème avec cet abonnement",
+    "alert.no_search_result": "Il n'y a aucun résultat pour cette recherche.",
+    "alert.no_unread_entry": "Il n'y a rien de nouveau à lire.",
+    "alert.no_user": "Vous êtes le seul utilisateur.",
+    "alert.account_unlinked": "Votre compte externe est maintenant dissocié !",
+    "alert.account_linked": "Votre compte externe est maintenant associé !",
+    "alert.pocket_linked": "Votre compte Pocket est maintenant connecté !",
+    "alert.prefs_saved": "Préférences sauvegardées !",
+    "error.unlink_account_without_password": "Vous devez définir un mot de passe sinon vous ne pourrez plus vous connecter par la suite.",
+    "error.duplicate_linked_account": "Il y a déjà quelqu'un d'associé avec ce provider !",
+    "error.duplicate_fever_username": "Il y a déjà quelqu'un d'autre avec le même nom d'utilisateur Fever !",
+    "error.pocket_request_token": "Impossible de récupérer le jeton d'accès depuis Pocket !",
+    "error.pocket_access_token": "Impossible de récupérer le jeton d'accès depuis Pocket !",
+    "error.category_already_exists": "Cette catégorie existe déjà.",
+    "error.unable_to_create_category": "Impossible de créer cette catégorie.",
+    "error.unable_to_update_category": "Impossible de mettre à jour cette catégorie.",
+    "error.user_already_exists": "Cet utilisateur existe déjà.",
+    "error.unable_to_create_user": "Impossible de créer cet utilisateur.",
+    "error.unable_to_update_user": "Impossible de mettre à jour cet utilisateur.",
+    "error.unable_to_update_feed": "Impossible de mettre à jour cet abonnement.",
+    "error.subscription_not_found": "Impossible de trouver un abonnement.",
+    "error.empty_file": "Ce fichier est vide.",
+    "error.bad_credentials": "Mauvais identifiant ou mot de passe.",
+    "error.fields_mandatory": "Tous les champs sont obligatoire.",
+    "error.title_required": "Le titre est obligatoire.",
+    "error.different_passwords": "Les mots de passe ne sont pas les mêmes.",
+    "error.password_min_length": "Vous devez utiliser au moins 6 caractères.",
+    "error.settings_mandatory_fields": "Le nom d'utilisateur, le thème, la langue et le fuseau horaire sont obligatoire.",
+    "error.feed_mandatory_fields": "L'URL et la catégorie sont obligatoire.",
+    "error.user_mandatory_fields": "Le nom d'utilisateur est obligatoire.",
+    "form.feed.label.title": "Titre",
+    "form.feed.label.site_url": "URL du flux",
+    "form.feed.label.feed_url": "URL du site web",
+    "form.feed.label.category": "Catégorie",
+    "form.feed.label.crawler": "Récupérer le contenu original",
+    "form.feed.label.feed_username": "Nom d'utilisateur du flux",
+    "form.feed.label.feed_password": "Mot de passe du flux",
+    "form.feed.label.user_agent": "Remplacer l'agent utilisateur par défaut",
+    "form.feed.label.scraper_rules": "Règles pour récupérer le contenu original",
+    "form.feed.label.rewrite_rules": "Règles de réécriture",
+    "form.category.label.title": "Titre",
+    "form.user.label.username": "Identifiant",
+    "form.user.label.password": "Mot de passe",
+    "form.user.label.confirmation": "Confirmation du mot de passe",
+    "form.user.label.admin": "Administrateur",
+    "form.prefs.label.language": "Langue",
+    "form.prefs.label.timezone": "Fuseau horaire",
+    "form.prefs.label.theme": "Thème",
+    "form.prefs.label.entry_sorting": "Ordre des éléments",
+    "form.prefs.select.older_first": "Ancien éléments en premier",
+    "form.prefs.select.recent_first": "Éléments récents en premier",
+    "form.import.label.file": "Fichier OPML",
+    "form.integration.fever_activate": "Activer l'API de Fever",
+    "form.integration.fever_username": "Nom d'utilisateur pour l'API de Fever",
+    "form.integration.fever_password": "Mot de passe pour l'API de Fever",
+    "form.integration.fever_endpoint": "Point de terminaison de l'API Fever :",
+    "form.integration.pinboard_activate": "Sauvegarder les articles vers Pinboard",
+    "form.integration.pinboard_token": "Jeton de sécurité de l'API de Pinboard",
+    "form.integration.pinboard_tags": "Libellés de Pinboard",
+    "form.integration.pinboard_bookmark": "Marquer le lien comme non lu",
+    "form.integration.instapaper_activate": "Sauvegarder les articles vers Instapaper",
+    "form.integration.instapaper_username": "Nom d'utilisateur Instapaper",
+    "form.integration.instapaper_password": "Mot de passe Instapaper",
+    "form.integration.pocket_activate": "Sauvegarder les articles vers Pocket",
+    "form.integration.pocket_consumer_key": "Clé de l'API de Pocket",
+    "form.integration.pocket_access_token": "Jeton d'accès de l'API de Pocket",
+    "form.integration.pocket_connect_link": "Connectez votre compte Pocket",
+    "form.integration.wallabag_activate": "Sauvegarder les articles vers Wallabag",
+    "form.integration.wallabag_endpoint": "URL de l'API de Wallabag",
+    "form.integration.wallabag_client_id": "Identifiant du client Wallabag",
+    "form.integration.wallabag_client_secret": "Clé secrète du client Wallabag",
+    "form.integration.wallabag_username": "Mot de passe de Wallabag",
+    "form.integration.wallabag_password": "Wallabag Password",
+    "form.integration.nunux_keeper_activate": "Sauvegarder les articles vers Nunux Keeper",
+    "form.integration.nunux_keeper_endpoint": "URL de l'API de Nunux Keeper",
+    "form.integration.nunux_keeper_api_key": "Clé d'API de Nunux Keeper",
+    "form.submit.loading": "Chargement...",
+    "form.submit.saving": "Sauvegarde en cours...",
+    "time_elapsed.not_yet": "pas encore",
+    "time_elapsed.yesterday": "hier",
+    "time_elapsed.now": "à l'instant",
+    "time_elapsed.minutes": [
+        "il y a %d minute",
+        "il y a %d minutes"
+    ],
+    "time_elapsed.hours": [
+        "il y a %d heure",
+        "il y a %d heures"
+    ],
+    "time_elapsed.days": [
+        "il y a %d jour",
+        "il y a %d jours"
+    ],
+    "time_elapsed.weeks": [
+        "il y a %d semaine",
+        "il y a %d semaines"
+    ],
+    "time_elapsed.months": [
+        "il y a %d mois",
+        "il y a %d mois"
+    ],
+    "time_elapsed.years": [
+        "il y a %d an",
+        "il y a %d ans"
     ],
-    "Username": "Nom d'utilisateur",
-    "Password": "Mot de passe",
-    "Unread": "Non lus",
-    "History": "Historique",
-    "Feeds": "Abonnements",
-    "Categories": "Catégories",
-    "Settings": "Réglages",
-    "Logout": "Se déconnecter",
-    "Next": "Suivant",
-    "Previous": "Précédent",
-    "New Subscription": "Nouvel Abonnment",
-    "Import": "Importation",
-    "Export": "Exportation",
-    "There is no category. You must have at least one category.": "Il n'y a aucune catégorie. Vous devez avoir au moins une catégorie.",
-    "URL": "URL",
-    "Category": "Catégorie",
-    "Find a subscription": "Trouver un abonnement",
-    "Loading...": "Chargement...",
-    "Create a category": "Créer une catégorie",
-    "There is no category.": "Il n'y a aucune catégorie.",
-    "Edit": "Modifier",
-    "Remove": "Supprimer",
-    "No feed.": "Aucun abonnement.",
-    "There is no article in this category.": "Il n'y a aucun article dans cette catégorie.",
-    "Original": "Original",
-    "Mark this page as read": "Marquer cette page comme lu",
-    "not yet": "pas encore",
-    "just now": "à l'instant",
-    "1 minute ago": "il y a une minute",
-    "%d minutes ago": "il y a %d minutes",
-    "1 hour ago": "il y a une heure",
-    "%d hours ago": "il y a %d heures",
-    "yesterday": "hier",
-    "%d days ago": "il y a %d jours",
-    "%d weeks ago": "il y a %d semaines",
-    "%d months ago": "il y a %d mois",
-    "%d years ago": "il y a %d ans",
-    "Date": "Date",
-    "IP Address": "Adresse IP",
-    "User Agent": "Navigateur Web",
-    "Actions": "Actions",
-    "Current session": "Session actuelle",
-    "Sessions": "Sessions",
-    "Users": "Utilisateurs",
-    "Add user": "Ajouter un utilisateur",
-    "Choose a Subscription": "Choisissez un abonnement",
-    "Subscribe": "S'abonner",
-    "New Category": "Nouvelle Catégorie",
-    "Title": "Titre",
-    "Save": "Sauvegarder",
-    "or": "ou",
-    "cancel": "annuler",
-    "New User": "Nouvel Utilisateur",
-    "Confirmation": "Confirmation",
-    "Administrator": "Administrateur",
-    "Edit Category: %s": "Modification de la catégorie : %s",
-    "Update": "Mettre à jour",
-    "Edit Feed: %s": "Modification de l'abonnement : %s",
-    "There is no category!": "Il n'y a aucune catégorie !",
-    "Edit user: %s": "Modification de l'utilisateur : %s",
-    "There is no article for this feed.": "Il n'y a aucun article pour cet abonnement.",
-    "Add subscription": "Ajouter un abonnement",
-    "You don't have any subscription.": "Vous n'avez aucun abonnement",
-    "Last check:": "Dernière vérification :",
-    "Refresh": "Actualiser",
-    "There is no history at the moment.": "Il n'y a aucun historique pour le moment.",
-    "OPML file": "Fichier OPML",
-    "Sign In": "Connexion",
-    "Sign in": "Connexion",
-    "Theme": "Thème",
-    "Timezone": "Fuseau horaire",
-    "Language": "Langue",
-    "There is no unread article.": "Il n'y a rien de nouveau à lire.",
-    "You are the only user.": "Vous êtes le seul utilisateur.",
-    "Last Login": "Dernière connexion",
-    "Yes": "Oui",
-    "No": "Non",
     "This feed already exists (%s)": "Cet abonnement existe déjà (%s)",
     "Unable to fetch feed (Status Code = %d)": "Impossible de récupérer cet abonnement (code=%d)",
     "Unable to open this link: %v": "Impossible d'ouvrir ce lien : %v",
     "Unable to analyze this page: %v": "Impossible d'analyzer cette page : %v",
-    "Unable to find any subscription.": "Impossible de trouver un abonnement.",
-    "The URL and the category are mandatory.": "L'URL et la catégorie sont obligatoire.",
-    "All fields are mandatory.": "Tous les champs sont obligatoire.",
-    "Passwords are not the same.": "Les mots de passe ne sont pas les mêmes.",
-    "You must use at least 6 characters.": "Vous devez utiliser au moins 6 caractères.",
-    "The username is mandatory.": "Le nom d'utilisateur est obligatoire.",
-    "The username, theme, language and timezone fields are mandatory.": "Le nom d'utilisateur, le thème, la langue et le fuseau horaire sont obligatoire.",
-    "The title is mandatory.": "Le titre est obligatoire.",
-    "About": "A propos",
-    "Version": "Version",
-    "Version:": "Version :",
-    "Build Date:": "Date de la compilation :",
-    "Author:": "Auteur :",
-    "Authors": "Auteurs",
-    "License:": "Licence :",
-    "Attachments": "Pièces jointes",
-    "Download": "Télécharger",
-    "Invalid username or password.": "Mauvais identifiant ou mot de passe.",
-    "Never": "Jamais",
     "Unable to execute request: %v": "Impossible d'exécuter cette requête: %v",
-    "Last Parsing Error": "Dernière erreur d'analyse",
-    "There is a problem with this feed": "Il y a un problème avec cet abonnement",
     "Unable to parse OPML file: %q": "Impossible de lire ce fichier OPML : %q",
     "Unable to parse RSS feed: %q": "Impossible de lire ce flux RSS : %q",
     "Unable to parse Atom feed: %q": "Impossible de lire ce flux Atom : %q",
     "Unable to parse JSON feed: %q": "Impossible de lire ce flux JSON : %q",
     "Unable to parse RDF feed: %q": "Impossible de lire ce flux RDF : %q",
     "Unable to normalize encoding: %q": "Impossible de normaliser l'encodage : %q",
-    "Unable to create this category.": "Impossible de créer cette catégorie.",
-    "yes": "oui",
-    "no": "non",
-    "Are you sure?": "Êtes-vous sûr ?",
-    "Work in progress...": "Travail en cours...",
-    "This user already exists.": "Cet utilisateur existe déjà.",
-    "This category already exists.": "Cette catégorie existe déjà.",
-    "Unable to update this category.": "Impossible de mettre à jour cette catégorie.",
-    "Integrations": "Intégrations",
-    "Bookmarklet": "Bookmarklet",
-    "Drag and drop this link to your bookmarks.": "Glisser-déposer ce lien dans vos favoris.",
-    "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.": "Ce lien spécial vous permet de vous abonner à un site web directement en utilisant un marque page dans votre navigateur web.",
-    "Add to Miniflux": "Ajouter à Miniflux",
-    "Refresh all feeds in background": "Actualiser les abonnements en arrière-plan",
-    "Sign in with Google": "Se connecter avec Google",
-    "Unlink my Google account": "Dissocier mon compte Google",
-    "Link my Google account": "Associer mon compte Google",
-    "Category not found for this user": "Cette catégorie n'existe pas pour cet utilisateur",
-    "Invalid theme.": "Le thème est invalide.",
-    "Entry Sorting": "Ordre des éléments",
-    "Older entries first": "Ancien éléments en premier",
-    "Recent entries first": "Éléments récents en premier",
-    "Saving...": "Enregistrement...",
-    "Done!": "Terminé !",
-    "Save this article": "Sauvegarder cet article",
-    "Mark bookmark as unread": "Marquer le lien comme non lu",
-    "Pinboard Tags": "Libellés de Pinboard",
-    "Pinboard API Token": "Jeton de sécurité de l'API de Pinboard",
-    "Save articles to Pinboard": "Sauvegarder les articles vers Pinboard",
-    "Save articles to Instapaper": "Sauvegarder les articles vers Instapaper",
-    "Instapaper Username": "Nom d'utilisateur Instapaper",
-    "Instapaper Password": "Mot de passe Instapaper",
-    "Activate Fever API": "Activer l'API de Fever",
-    "Fever Username": "Nom d'utilisateur pour l'API de Fever",
-    "Fever Password": "Mot de passe pour l'API de Fever",
-    "Fetch original content": "Récupérer le contenu original",
-    "Scraper Rules": "Règles pour récupérer le contenu original",
-    "Rewrite Rules": "Règles de réécriture",
-    "Preferences saved!": "Préférences sauvegardées !",
-    "Your external account is now linked!": "Votre compte externe est maintenant associé !",
-    "Save articles to Wallabag": "Sauvegarder les articles vers Wallabag",
-    "Wallabag API Endpoint": "URL de l'API de Wallabag",
-    "Wallabag Client ID": "Identifiant du client Wallabag",
-    "Wallabag Client Secret": "Clé secrète du client Wallabag",
-    "Wallabag Username": "Nom d'utilisateur de Wallabag",
-    "Wallabag Password": "Mot de passe de Wallabag",
-    "Save articles to Nunux Keeper": "Sauvegarder les articles vers Nunux Keeper",
-    "Nunux Keeper API Endpoint": "URL de l'API de Nunux Keeper",
-    "Nunux Keeper API key": "Clé d'API de Nunux Keeper",
-    "Keyboard Shortcut: %s": "Raccourci clavier : %s",
-    "Favorites": "Favoris",
-    "Star": "Favoris",
-    "Unstar": "Enlever favoris",
-    "Starred": "Favoris",
-    "There is no bookmark at the moment.": "Il n'y a aucun favoris pour le moment.",
-    "Last checked:": "Dernière vérification :",
-    "ETag header:": "En-tête ETag :",
-    "LastModified header:": "En-tête LastModified :",
-    "None": "Aucun/Aucune",
-    "Keyboard Shortcuts": "Raccourcis clavier",
-    "Sections Navigation": "Naviguation entre les sections",
-    "Go to unread": "Aller aux éléments non lus",
-    "Go to bookmarks": "Aller aux favoris",
-    "Go to history": "Voir l'historique",
-    "Go to feeds": "Voir les abonnements",
-    "Go to categories": "Voir les catégories",
-    "Go to settings": "Voir les réglages",
-    "Show keyboard shortcuts": "Voir les raccourcis clavier",
-    "Items Navigation": "Naviguation entre les éléments",
-    "Go to previous item": "Élément précédent",
-    "Go to next item": "Élément suivant",
-    "Pages Navigation": "Naviguation entre les pages",
-    "Go to previous page": "Page précédente",
-    "Go to next page": "Page suivante",
-    "Open selected item": "Ouvrir élément sélectionné",
-    "Open original link": "Ouvrir lien original",
-    "Toggle read/unread": "Basculer entre lu/non lu",
-    "Mark current page as read": "Marquer la page actuelle comme lu",
-    "Download original content": "Télécharger le contenu original",
-    "Toggle bookmark": "Ajouter/Enlever favoris",
-    "Close modal dialog": "Fermer la boite de dialogue",
-    "Save article": "Sauvegarder l'article",
-    "There is already someone associated with this provider!": "Il y a déjà quelqu'un d'associé avec ce provider !",
-    "There is already someone else with the same Fever username!": "Il y a déjà quelqu'un d'autre avec le même nom d'utilisateur Fever !",
-    "Mark all as read": "Tout marquer comme lu",
     "This feed is empty": "Cet abonnement est vide",
-    "Flush history": "Supprimer l'historique",
-    "Site URL": "URL du site web",
-    "Feed URL": "URL du flux",
-    "Logged as %s": "Connecté en tant que %s",
-    "Unread Items": "Éléments non lus",
-    "Change entry status": "Changer le statut de l'élément",
-    "Read": "Lu",
-    "Fever API endpoint:": "Point de terminaison de l'API Fever :",
-    "Miniflux API": "API de Miniflux",
-    "API Endpoint": "Point de terminaison de l'API",
-    "Your account password": "Le mot de passe de votre compte",
     "This web page is empty": "Cette page web est vide",
     "Invalid SSL certificate (original error: %q)": "Certificat SSL invalide (erreur originale : %q)",
     "This website is temporarily unreachable (original error: %q)": "Ce site web est temporairement injoignable (erreur originale : %q)",
     "This website is permanently unreachable (original error: %q)": "Ce site web n'est pas joignable de façon permanente (erreur originale : %q)",
     "Website unreachable, the request timed out after %d seconds": "Site web injoignable, la requête à échouée après %d secondes",
-    "Comments": "Commentaires",
-    "View Comments": "Voir les commentaires",
-    "This file is empty": "Ce fichier est vide",
-    "Your external account is now dissociated!": "Votre compte externe est maintenant dissocié !",
-    "You must define a password otherwise you won't be able to login again.": "Vous devez définir un mot de passe sinon vous ne pourrez plus vous connecter par la suite.",
-    "Save articles to Pocket": "Sauvegarder les articles vers Pocket",
-    "Connect your Pocket account": "Connectez votre compte Pocket",
-    "Pocket Consumer Key": "« Pocket Consumer Key »",
-    "Pocket Access Token": "« Pocket Access Token »",
-    "Your Pocket account is now linked!": "Votre compte Pocket est maintenant connecté !",
-    "Unable to fetch access token from Pocket!": "Impossible de récupérer le jeton d'accès depuis Pocket !",
-    "Unable to fetch request token from Pocket!": "Impossible de récupérer le jeton d'accès depuis Pocket !",
-    "Advanced Options": "Options avancées",
-    "Feed Username": "Nom d'utilisateur du flux",
-    "Feed Password": "Mot de passe du flux",
     "You are not authorized to access this resource (invalid username/password)": "Vous n'êtes pas autorisé à accéder à cette ressource (nom d'utilisateur / mot de passe incorrect)",
     "Unable to fetch this resource (Status Code = %d)": "Impossible de récupérer cette ressource (code=%d)",
-    "Resource not found (404), this feed doesn't exists anymore, check the feed URL": "Page introuvable (404), cet abonnement n'existe plus, vérifiez l'adresse du flux",
-    "Search Results": "Résultats de la recherche",
-    "There is no result for this search.": "Il n'y a aucun résultat pour cette recherche.",
-    "Search...": "Recherche...",
-    "Set focus on search form": "Mettre le focus sur le champ de recherche",
-    "Search": "Recherche",
-    "Remove this feed": "Supprimer cet abonnement"
+    "Resource not found (404), this feed doesn't exists anymore, check the feed URL": "Page introuvable (404), cet abonnement n'existe plus, vérifiez l'adresse du flux"
 }

locale/translations/nl_NL.json

@@ -1,114 +1,271 @@
 {
-    "plural.feed.error_count": [
+    "confirm.question": "Weet je het zeker?",
+    "confirm.yes": "ja",
+    "confirm.no": "nee",
+    "confirm.loading": "Bezig...",
+    "action.subscribe": "Abboneren",
+    "action.save": "Opslaan",
+    "action.or": "of",
+    "action.cancel": "annuleren",
+    "action.remove": "Verwijderen",
+    "action.remove_feed": "Verwijder deze feed",
+    "action.update": "Updaten",
+    "action.edit": "Bewerken",
+    "action.download": "Download",
+    "action.import": "Importeren",
+    "action.login": "Inloggen",
+    "tooltip.keyboard_shortcuts": "Sneltoets: %s",
+    "tooltip.logged_user": "Ingelogd als %s",
+    "menu.unread": "Ongelezen",
+    "menu.starred": "Favorieten",
+    "menu.history": "Geschiedenis",
+    "menu.feeds": "Feeds",
+    "menu.categories": "Categorieën",
+    "menu.settings": "Instellingen",
+    "menu.logout": "Uitloggen",
+    "menu.preferences": "Voorkeuren",
+    "menu.integrations": "Integraties",
+    "menu.sessions": "Sessies",
+    "menu.users": "Users",
+    "menu.about": "Over",
+    "menu.export": "Exporteren",
+    "menu.import": "Importeren",
+    "menu.create_category": "Categorie toevoegen",
+    "menu.mark_page_as_read": "Markeer deze pagina als gelezen",
+    "menu.mark_all_as_read": "Markeer alle items als gelezen",
+    "menu.refresh_feed": "Vernieuwen",
+    "menu.refresh_all_feeds": "Vernieuw alle feeds in de achtergrond",
+    "menu.edit_feed": "Bewerken",
+    "menu.add_feed": "Feed toevoegen",
+    "menu.add_user": "Gebruiker toevoegen",
+    "menu.flush_history": "Verwijder geschiedenis",
+    "search.label": "Zoeken",
+    "search.placeholder": "Zoeken...",
+    "pagination.next": "Volgende",
+    "pagination.previous": "Vorige",
+    "entry.status.unread": "Ongelezen",
+    "entry.status.read": "Gelezen",
+    "entry.status.title": "Verander status van item",
+    "entry.bookmark.toggle.on": "Ster toevoegen",
+    "entry.bookmark.toggle.off": "Ster weghalen",
+    "entry.state.saving": "Opslaag...",
+    "entry.state.loading": "Laden...",
+    "entry.save.label": "Opslaan",
+    "entry.save.title": "Artikel opslaan",
+    "entry.save.completed": "Done!",
+    "entry.scraper.label": "Fetch original content",
+    "entry.scraper.title": "Fetch original content",
+    "entry.scraper.completed": "Klaar!",
+    "entry.original.label": "Origineel",
+    "entry.comments.label": "Comments",
+    "entry.comments.title": "Bekijk de reacties",
+    "page.unread.title": "Ongelezen",
+    "page.starred.title": "Favorieten",
+    "page.categories.title": "Categorieën",
+    "page.categories.feed_count": [
+        "Er is %d feed.",
+        "Er zijn %d feeds."
+    ],
+    "page.new_category.title": "Nieuwe categorie",
+    "page.new_user.title": "Nieuwe gebruiker",
+    "page.edit_category.title": "Bewerken van categorie: %s",
+    "page.edit_user.title": "Bewerk gebruiker: %s",
+    "page.feeds.title": "Feeds",
+    "page.feeds.last_check": "Laatste update:",
+    "page.feeds.error_count": [
         "%d error",
         "%d errors"
     ],
-    "plural.categories.feed_count": [
-        "Er is %d feed.",
-        "Er zijn %d feeds."
+    "page.history.title": "Geschiedenis",
+    "page.import.title": "Importeren",
+    "page.login.title": "Inloggen",
+    "page.search.title": "Zoekresultaten",
+    "page.about.title": "Over",
+    "page.about.credits": "Copyrights",
+    "page.about.version": "Versie:",
+    "page.about.build_date": "Datum build:",
+    "page.about.author": "Auteur:",
+    "page.about.license": "Licentie:",
+    "page.add_feed.title": "Nieuwe feed",
+    "page.add_feed.no_category": "Er zijn geen categorieën. Je moet op zijn minst één caterogie hebben.",
+    "page.add_feed.label.url": "URL",
+    "page.add_feed.submit": "Feed zoeken",
+    "page.add_feed.legend.advanced_options": "Geavanceerde mogelijkheden",
+    "page.add_feed.choose_feed": "Feed kiezen",
+    "page.edit_feed.title": "Bewerken van feed: %s",
+    "page.edit_feed.last_check": "Laatste update:",
+    "page.edit_feed.last_modified_header": "LastModified-header:",
+    "page.edit_feed.etag_header": "ETAG-header:",
+    "page.edit_feed.no_header": "Geen",
+    "page.edit_feed.last_parsing_error": "Laatste parse error",
+    "page.keyboard_shortcuts.title": "Sneltoetsen",
+    "page.keyboard_shortcuts.subtitle.sections": "Naviguatie tussen menu's",
+    "page.keyboard_shortcuts.subtitle.items": "Navigatie tussen items",
+    "page.keyboard_shortcuts.subtitle.pages": "Naviguatie tussen pagina's",
+    "page.keyboard_shortcuts.subtitle.actions": "Actions",
+    "page.keyboard_shortcuts.go_to_unread": "Ga naar ongelezen",
+    "page.keyboard_shortcuts.go_to_starred": "Ga naar favorieten",
+    "page.keyboard_shortcuts.go_to_history": "Ga naar geschiedenis",
+    "page.keyboard_shortcuts.go_to_feeds": "Ga naar feeds",
+    "page.keyboard_shortcuts.go_to_categories": "Ga naar categorieën",
+    "page.keyboard_shortcuts.go_to_settings": "Ga naar instellingen",
+    "page.keyboard_shortcuts.show_keyboard_shortcuts": "Laat sneltoetsen zien",
+    "page.keyboard_shortcuts.go_to_previous_item": "Vorige item",
+    "page.keyboard_shortcuts.go_to_next_item": "Volgende item",
+    "page.keyboard_shortcuts.go_to_previous_page": "Vorige pagina",
+    "page.keyboard_shortcuts.go_to_next_page": "Volgende pagina",
+    "page.keyboard_shortcuts.open_item": "Open geselecteerde link",
+    "page.keyboard_shortcuts.open_original": "Open originele link",
+    "page.keyboard_shortcuts.toggle_read_status": "Markeer gelezen/ongelezen",
+    "page.keyboard_shortcuts.mark_page_as_read": "Markeer deze pagina als gelezen",
+    "page.keyboard_shortcuts.download_content": "Download originele content",
+    "page.keyboard_shortcuts.toggle_bookmark_status": "Ster toevoegen/weghalen",
+    "page.keyboard_shortcuts.save_article": "Artikel opslaan",
+    "page.keyboard_shortcuts.go_to_search": "Focus instellen op zoekformulier",
+    "page.keyboard_shortcuts.close_modal": "Sluit dialoogscherm",
+    "page.users.title": "Gebruikers",
+    "page.users.never_logged": "Nooit",
+    "page.users.admin.yes": "Ja",
+    "page.users.admin.no": "Nee",
+    "page.users.actions": "Acties",
+    "page.users.last_login": "Laatste login",
+    "page.users.is_admin": "Administrator",
+    "page.settings.title": "Instellingen",
+    "page.settings.link_google_account": "Koppel mijn Google-account",
+    "page.settings.unlink_google_account": "Ontkoppel mijn Google-account",
+    "page.login.google_signin": "Inloggen via Google",
+    "page.integrations.title": "Integraties",
+    "page.integration.miniflux_api": "Miniflux API",
+    "page.integration.miniflux_api_endpoint": "API-URL",
+    "page.integration.miniflux_api_username": "Gebruikersnaam",
+    "page.integration.miniflux_api_password": "Wachtwoord",
+    "page.integration.miniflux_api_password_value": "Wachtwoord van jouw account",
+    "page.integration.bookmarklet": "Bookmarklet",
+    "page.integration.bookmarklet.name": "Toevoegen aan Miniflux",
+    "page.integration.bookmarklet.instructions": "Sleep deze link naar je bookmarks.",
+    "page.integration.bookmarklet.help": "Gebruik deze link als bookmark in je browser om je direct te abboneren op een website.",
+    "page.sessions.title": "Sessies",
+    "page.sessions.table.date": "Datum",
+    "page.sessions.table.ip": "IP-adres",
+    "page.sessions.table.user_agent": "User-agent",
+    "page.sessions.table.actions": "Acties",
+    "page.sessions.table.current_session": "Huidige sessie",
+    "alert.no_bookmark": "Er zijn op dit moment geen favorieten.",
+    "alert.no_category": "Er zijn geen categorieën.",
+    "alert.no_category_entry": "Deze categorie bevat geen feeds.",
+    "alert.no_feed_entry": "Er zijn geen artikelen in deze feed.",
+    "alert.no_feed": "Je hebt nog geen feeds geabboneerd staan.",
+    "alert.no_history": "Geschiedenis is op dit moment leeg.",
+    "alert.feed_error": "Er is een probleem met deze feed",
+    "alert.no_search_result": "Er is geen resultaat voor deze zoekopdracht.",
+    "alert.no_unread_entry": "Er zijn geen ongelezen artikelen.",
+    "alert.no_user": "Je bent de enige gebruiker.",
+    "alert.account_unlinked": "Uw externe account is nu gedissocieerd!",
+    "alert.account_linked": "Uw externe account is nu gekoppeld!",
+    "alert.pocket_linked": "Uw Pocket-account is nu gekoppeld!",
+    "alert.prefs_saved": "Instellingen opgeslagen!",
+    "error.unlink_account_without_password": "U moet een wachtwoord definiëren anders kunt u zich niet opnieuw aanmelden.",
+    "error.duplicate_linked_account": "Er is al iemand geregistreerd met deze provider!",
+    "error.duplicate_fever_username": "Er is al iemand met dezelfde Fever gebruikersnaam!",
+    "error.pocket_request_token": "Kon geen aanvraagtoken ophalen van Pocket!",
+    "error.pocket_access_token": "Kon geen toegangstoken ophalen van Pocket!",
+    "error.category_already_exists": "Deze categorie bestaat al.",
+    "error.unable_to_create_category": "Kan deze categorie niet maken.",
+    "error.unable_to_update_category": "Kon categorie niet updaten.",
+    "error.user_already_exists": "Deze gebruiker bestaat al.",
+    "error.unable_to_create_user": "Kan deze gebruiker niet maken.",
+    "error.unable_to_update_user": "Kan deze gebruiker niet updaten.",
+    "error.unable_to_update_feed": "Kan deze feed niet bijwerken.",
+    "error.subscription_not_found": "Kon geen feeds vinden.",
+    "error.empty_file": "Dit bestand is leeg.",
+    "error.bad_credentials": "Onjuiste gebruikersnaam of wachtwoord.",
+    "error.fields_mandatory": "Alle velden moeten ingevuld zijn.",
+    "error.title_required": "Naam van categorie is verplicht.",
+    "error.different_passwords": "Wachtwoorden zijn niet hetzelfde.",
+    "error.password_min_length": "Je moet minstens 6 tekens gebruiken.",
+    "error.settings_mandatory_fields": "Gebruikersnaam, skin, taal en tijdzone zijn verplicht.",
+    "error.feed_mandatory_fields": "The URL en de categorie zijn verplicht.",
+    "error.user_mandatory_fields": "Gebruikersnaam is verplicht",
+    "form.feed.label.title": "Naam",
+    "form.feed.label.site_url": "Website URL",
+    "form.feed.label.feed_url": "Feed URL",
+    "form.feed.label.category": "Categorie",
+    "form.feed.label.crawler": "Download originele content",
+    "form.feed.label.feed_username": "Feed-gebruikersnaam",
+    "form.feed.label.feed_password": "Feed wachtwoord",
+    "form.feed.label.user_agent": "Standaard User Agent overschrijven",
+    "form.feed.label.scraper_rules": "Scraper regels",
+    "form.feed.label.rewrite_rules": "Rewrite regels",
+    "form.category.label.title": "Naam",
+    "form.user.label.username": "Gebruikersnaam",
+    "form.user.label.password": "Wachtwoord",
+    "form.user.label.confirmation": "Bevestig wachtwoord",
+    "form.user.label.admin": "Administrator",
+    "form.prefs.label.language": "Taal",
+    "form.prefs.label.timezone": "Tijdzone",
+    "form.prefs.label.theme": "Skin",
+    "form.prefs.label.entry_sorting": "Volgorde van items",
+    "form.prefs.select.older_first": "Oudere items eerst",
+    "form.prefs.select.recent_first": "Recente items eerst",
+    "form.import.label.file": "OPML-bestand",
+    "form.integration.fever_activate": "Activeer Fever API",
+    "form.integration.fever_username": "Fever gebruikersnaam",
+    "form.integration.fever_password": "Fever wachtwoord",
+    "form.integration.fever_endpoint": "Fever URL:",
+    "form.integration.pinboard_activate": "Artikelen opslaan naar Pinboard",
+    "form.integration.pinboard_token": "Pinboard API token",
+    "form.integration.pinboard_tags": "Pinboard tags",
+    "form.integration.pinboard_bookmark": "Markeer bookmark als gelezen",
+    "form.integration.instapaper_activate": "Artikelen opstaan naar Instapaper",
+    "form.integration.instapaper_username": "Instapaper gebruikersnaam",
+    "form.integration.instapaper_password": "Instapaper wachtwoord",
+    "form.integration.pocket_activate": "Bewaar artikelen in Pocket",
+    "form.integration.pocket_consumer_key": "Pocket Consumer Key",
+    "form.integration.pocket_access_token": "Pocket Access Token",
+    "form.integration.pocket_connect_link": "Verbind je Pocket-account",
+    "form.integration.wallabag_activate": "Opslaan naar Wallabag",
+    "form.integration.wallabag_endpoint": "Wallabag URL",
+    "form.integration.wallabag_client_id": "Wallabag Client-ID",
+    "form.integration.wallabag_client_secret": "Wallabag Client-Secret",
+    "form.integration.wallabag_username": "Wallabag gebruikersnaam",
+    "form.integration.wallabag_password": "Wallabag wachtwoord",
+    "form.integration.nunux_keeper_activate": "Opslaan naar Nunux Keeper",
+    "form.integration.nunux_keeper_endpoint": "Nunux Keeper URL",
+    "form.integration.nunux_keeper_api_key": "Nunux Keeper API-sleutel",
+    "form.submit.loading": "Laden...",
+    "form.submit.saving": "Opslaag...",
+    "time_elapsed.not_yet": "in de toekomst",
+    "time_elapsed.yesterday": "gisteren",
+    "time_elapsed.now": "minder dan een minuut geleden",
+    "time_elapsed.minutes": [
+        "%d minuut geleden",
+        "%d minuten geleden"
+    ],
+    "time_elapsed.hours": [
+        "%d uur geleden",
+        "%d uur geleden"
+    ],
+    "time_elapsed.days": [
+        "%d dag geleden",
+        "%d dagen geleden"
+    ],
+    "time_elapsed.weeks": [
+        "%d week geleden",
+        "%d weken geleden"
+    ],
+    "time_elapsed.months": [
+        "%d maand geleden",
+        "%d maanden geleden"
+    ],
+    "time_elapsed.years": [
+        "%d jaar geleden",
+        "%d jaar geleden"
     ],
-    "Username": "Gebruikersnaam",
-    "Password": "Wachtwoord",
-    "Unread": "Ongelezen",
-    "History": "Geschiedenis",
-    "Feeds": "Feeds",
-    "Categories": "Categorieën",
-    "Settings": "Instellingen",
-    "Logout": "Uitloggen",
-    "Next": "Volgende",
-    "Previous": "Vorige",
-    "New Subscription": "Nieuwe feed",
-    "Import": "Importeren",
-    "Export": "Exporteren",
-    "There is no category. You must have at least one category.": "Er zijn geen categorieën. Je moet op zijn minst één caterogie hebben.",
-    "URL": "URL",
-    "Category": "Categorie",
-    "Find a subscription": "Feed zoeken",
-    "Loading...": "Laden...",
-    "Create a category": "Categorie toevoegen",
-    "There is no category.": "Er zijn geen categorieën.",
-    "Edit": "Bewerken",
-    "Remove": "Verwijderen",
-    "No feed.": "Geen feeds.",
-    "There is no article in this category.": "Deze categorie bevat geen feeds.",
-    "Original": "Origineel",
-    "Mark this page as read": "Markeer deze pagina als gelezen",
-    "not yet": "in de toekomst",
-    "just now": "minder dan een minuut geleden",
-    "1 minute ago": "een minuut geleden",
-    "%d minutes ago": "%d minuten geleden",
-    "1 hour ago": "een uur geleden",
-    "%d hours ago": "%d uur geleden",
-    "yesterday": "gisteren",
-    "%d days ago": "%d dagen geleden",
-    "%d weeks ago": "%d weken geleden",
-    "%d months ago": "%d maanden geleden",
-    "%d years ago": "%d jaar geleden",
-    "Date": "Datum",
-    "IP Address": "IP-adres",
-    "User Agent": "User-agent",
-    "Actions": "Acties",
-    "Current session": "Huidige sessie",
-    "Sessions": "Sessies",
-    "Users": "Gebruikers",
-    "Add user": "Gebruiker toevoegen",
-    "Choose a Subscription": "Feed kiezen",
-    "Subscribe": "Abboneren",
-    "New Category": "Nieuwe categorie",
-    "Title": "Naam",
-    "Save": "Opslaan",
-    "or": "of",
-    "cancel": "annuleren",
-    "New User": "Nieuwe gebruiker",
-    "Confirmation": "Bevestig wachtwoord",
-    "Administrator": "Administrator",
-    "Edit Category: %s": "Bewerken van categorie: %s",
-    "Update": "Updaten",
-    "Edit Feed: %s": "Bewerken van feed: %s",
-    "There is no category!": "Er zijn geen categorieën!",
-    "Edit user: %s": "Gebruiker aanpassen: %s",
-    "There is no article for this feed.": "Er zijn geen artikelen in deze feed.",
-    "Add subscription": "Feed toevoegen",
-    "You don't have any subscription.": "Je hebt nog geen feeds geabboneerd staan.",
-    "Last check:": "Laatste update:",
-    "Refresh": "Vernieuwen",
-    "There is no history at the moment.": "Geschiedenis is op dit moment leeg.",
-    "OPML file": "OPML-bestand",
-    "Sign In": "Inloggen",
-    "Theme": "Skin",
-    "Timezone": "Tijdzone",
-    "Language": "Taal",
-    "There is no unread article.": "Er zijn geen ongelezen artikelen.",
-    "You are the only user.": "Je bent de enige gebruiker.",
-    "Last Login": "Laatste login",
-    "Yes": "Ja",
-    "No": "Nee",
     "This feed already exists (%s)": "Deze feed bestaat al (%s)",
     "Unable to fetch feed (Status Code = %d)": "Kon feed niet updaten (statuscode = %d)",
     "Unable to open this link: %v": "Kon link niet volgen: %v",
     "Unable to analyze this page: %v": "Kon pagina niet analyseren: %v",
-    "Unable to find any subscription.": "Kon geen feeds vinden.",
-    "The URL and the category are mandatory.": "The URL en de categorie zijn verplicht.",
-    "All fields are mandatory.": "Alle velden moeten ingevuld zijn.",
-    "Passwords are not the same.": "Wachtwoorden zijn niet hetzelfde.",
-    "You must use at least 6 characters.": "Je moet minstens 6 tekens gebruiken.",
-    "The username is mandatory.": "Gebruikersnaam is verplicht",
-    "The username, theme, language and timezone fields are mandatory.": "Gebruikersnaam, skin, taal en tijdzone zijn verplicht.",
-    "The title is mandatory.": "Naam van categorie is verplicht.",
-    "About": "Over Miniflux",
-    "Version": "Versie",
-    "Version:": "Versie:",
-    "Build Date:": "Datum build:",
-    "Author:": "Auteur:",
-    "Authors": "Auteurs",
-    "License:": "Licentie:",
-    "Attachments": "Bijlages",
-    "Download": "Download",
-    "Invalid username or password.": "Onjuiste gebruikersnaam of wachtwoord.",
-    "Never": "Nooit",
     "Unable to execute request: %v": "Kon request niet uitvoeren: %v",
-    "Last Parsing Error": "Laatste parse error",
-    "There is a problem with this feed": "Er is een probleem met deze feed",
     "Unable to parse OPML file: %q": "Kon OPML niet parsen: %q",
     "Unable to parse RSS feed: %q": "Kon RSS-feed niet parsen: %q",
     "Unable to parse Atom feed: %q": "Kon Atom-feed niet parsen: %q",
@@ -116,102 +273,7 @@
     "Unable to parse RDF feed: %q": "Kon RDF-feed niet parsen: %q",
     "Unable to normalize encoding: %q": "Kon encoding niet normaliseren: %q",
     "Unable to create this category.": "Kon categorie niet aanmaken.",
-    "yes": "ja",
-    "no": "nee",
-    "Are you sure?": "Weet je het zeker?",
-    "Work in progress...": "Bezig...",
-    "This user already exists.": "Deze gebruiker bestaat al.",
-    "This category already exists.": "Deze categorie bestaat al.",
-    "Unable to update this category.": "Kon categorie niet updaten.",
-    "Integrations": "Integraties",
-    "Bookmarklet": "Bookmarklet",
-    "Drag and drop this link to your bookmarks.": "Sleep deze link naar je bookmarks.",
-    "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.": "Gebruik deze link als bookmark in je browser om je direct te abboneren op een website.",
-    "Add to Miniflux": "Toevoegen aan Miniflux",
-    "Refresh all feeds in background": "Vernieuw alle feeds in de achtergrond",
-    "Sign in with Google": "Inloggen via Google",
-    "Unlink my Google account": "Ontkoppel mijn Google-account",
-    "Link my Google account": "Koppel mijn Google-account",
     "Category not found for this user": "Categorie niet gevonden voor deze gebruiker",
-    "Invalid theme.": "Ongeldige skin.",
-    "Entry Sorting": "Volgorde van items",
-    "Older entries first": "Oudere items eerst",
-    "Recent entries first": "Recente items eerst",
-    "Saving...": "Opslaag...",
-    "Done!": "Klaar!",
-    "Save this article": "Artikel opslaan",
-    "Mark bookmark as unread": "Markeer bookmark als gelezen",
-    "Pinboard Tags": "Pinboard tags",
-    "Pinboard API Token": "Pinboard API token",
-    "Save articles to Pinboard": "Artikelen opslaan naar Pinboard",
-    "Save articles to Instapaper": "Artikelen opstaan naar Instapaper",
-    "Instapaper Username": "Instapaper gebruikersnaam",
-    "Instapaper Password": "Instapaper wachtwoord",
-    "Activate Fever API": "Activeer Fever API",
-    "Fever Username": "Fever gebruikersnaam",
-    "Fever Password": "Fever wachtwoord",
-    "Fetch original content": "Download originele content",
-    "Scraper Rules": "Scraper regels",
-    "Rewrite Rules": "Rewrite regels",
-    "Preferences saved!": "Instellingen opgeslagen!",
-    "Your external account is now linked!": "Je externe account is nu gekoppeld!",
-    "Save articles to Wallabag": "Sauvegarder les articles vers Wallabag",
-    "Wallabag API Endpoint": "Wallabag URL",
-    "Wallabag Client ID": "Wallabag Client-ID",
-    "Wallabag Client Secret": "Wallabag Client-Secret",
-    "Wallabag Username": "Wallabag gebruikersnaam",
-    "Wallabag Password": "Wallabag wachtwoord",
-    "Save articles to Nunux Keeper": "Opslaan naar Nunux Keeper",
-    "Nunux Keeper API Endpoint": "Nunux Keeper URL",
-    "Nunux Keeper API key": "Nunux Keeper API-sleutel",
-    "Keyboard Shortcut: %s": "Sneltoets: %s",
-    "Favorites": "Favorieten",
-    "Star": "Ster toevoegen",
-    "Unstar": "Ster weghalen",
-    "Starred": "Favorieten",
-    "There is no bookmark at the moment.": "Er zijn op dit moment geen favorieten.",
-    "Last checked:": "Laatste update:",
-    "ETag header:": "ETAG-header:",
-    "LastModified header:": "LastModified-header:",
-    "None": "Geen",
-    "Keyboard Shortcuts": "Sneltoetsen",
-    "Sections Navigation": "Naviguatie tussen menu's",
-    "Go to unread": "Ga naar ongelezen",
-    "Go to bookmarks": "Ga naar favorieten",
-    "Go to history": "Ga naar geschiedenis",
-    "Go to feeds": "Ga naar feeds",
-    "Go to categories": "Ga naar categorieën",
-    "Go to settings": "Ga naar instellingen",
-    "Show keyboard shortcuts": "Laat sneltoetsen zien",
-    "Items Navigation": "Navigatie tussen items",
-    "Go to previous item": "Vorige item",
-    "Go to next item": "Volgende item",
-    "Pages Navigation": "Naviguatie tussen pagina's",
-    "Go to previous page": "Vorige pagina",
-    "Go to next page": "Volgende pagina",
-    "Open selected item": "Open geselecteerde link",
-    "Open original link": "Open originele link",
-    "Toggle read/unread": "Markeer gelezen/ongelezen",
-    "Mark current page as read": "Markeer deze pagina als gelezen",
-    "Download original content": "Download originele content",
-    "Toggle bookmark": "Ster toevoegen/weghalen",
-    "Close modal dialog": "Sluit dialoogscherm",
-    "Save article": "Artikel opslaan",
-    "There is already someone associated with this provider!": "Er is al iemand geregistreerd met deze provider!",
-    "There is already someone else with the same Fever username!": "Er is al iemand met dezelfde Fever gebruikersnaam!",
-    "Mark all as read": "Markeer alle items als gelezen",
-    "This feed is empty": "Deze feed is leeg",
-    "Flush history": "Verwijder geschiedenis",
-    "Site URL": "Website URL",
-    "Feed URL": "Feed URL",
-    "Logged as %s": "Ingelogd als %s",
-    "Unread Items": "Ongelezen items",
-    "Change entry status": "Verander status van item",
-    "Read": "Gelezen",
-    "Fever API endpoint:": "Fever URL:",
-    "Miniflux API": "Miniflux API",
-    "API Endpoint": "API-URL",
-    "Your account password": "Wachtwoord van jouw account",
     "This web page is empty": "Deze webpagina is leeg",
     "Invalid SSL certificate (original error: %q)": "Ongeldig SSL-certificaat (originele error: %q)",
     "This website is temporarily unreachable (original error: %q)": "Deze website is tijdelijk onbereikbaar (originele error: %q)",

locale/translations/pl_PL.json

@@ -1,223 +1,290 @@
-{
-    "plural.feed.error_count": [
-        "%d błąd",
-        "%d błąd",
-        "%d błędów"
-    ],
-    "plural.categories.feed_count": [
-        "Jest %d kanał.",
-        "Są %d kanały.",
-        "Jest %d kanałów."
-    ],
-    "Username": "Nazwa użytkownika",
-    "Password": "Hasło",
-    "Unread": "Nieprzeczytane",
-    "History": "Historia",
-    "Feeds": "Kanały",
-    "Categories": "Kategorie",
-    "Settings": "Ustawienia",
-    "Logout": "Wyloguj się",
-    "Next": "Następny",
-    "Previous": "Poprzedni",
-    "New Subscription": "Nowa subskrypcja",
-    "Import": "Importuj",
-    "Export": "Eksportuj",
-    "There is no category. You must have at least one category.": "Nie ma żadnej kategorii. Musisz mieć co najmniej jedną kategorię",
-    "URL": "URL",
-    "Category": "Kategoria",
-    "Find a subscription": "Znajdź subskrypcję",
-    "Loading...": "Ładowanie...",
-    "Create a category": "Utwórz kategorię",
-    "There is no category.": "Nie masz żadnej kategorii",
-    "Edit": "Edytuj",
-    "Remove": "Usuń",
-    "No feed.": "Brak kanałów.",
-    "There is no article in this category.": "W tej kategorii nie ma żadnych artykułów",
-    "Original": "Oryginalny artykuł",
-    "Mark this page as read": "Oznacz jako przeczytane",
-    "not yet": "jeszcze nie",
-    "just now": "przed chwilą",
-    "1 minute ago": "minutę temu",
-    "%d minutes ago": "%d minut temu",
-    "1 hour ago": "godzinę temu",
-    "%d hours ago": "%d godzin temu",
-    "yesterday": "wczoraj",
-    "%d days ago": "%d dni temu",
-    "%d weeks ago": "%d tygodni temu",
-    "%d months ago": "%d miesięcy temu",
-    "%d years ago": "%d lat temu",
-    "Date": "Data",
-    "IP Address": "Adres IP",
-    "User Agent": "User Agent",
-    "Actions": "Działania",
-    "Current session": "Bieżąca sesja",
-    "Sessions": "Sesje",
-    "Users": "Użytkownicy",
-    "Add user": "Dodaj użytkownika",
-    "Choose a Subscription": "Wybierz subskrypcję",
-    "Subscribe": "Subskrypcja",
-    "New Category": "Nowa kategoria",
-    "Title": "Tytuł",
-    "Save": "Zapisz",
-    "or": "lub",
-    "cancel": "anuluj",
-    "New User": "Nowy użytkownik",
-    "Confirmation": "Potwierdź",
-    "Administrator": "Administrator",
-    "Edit Category: %s": "Edycja Kategorii: %s",
-    "Update": "Zaktualizuj",
-    "Edit Feed: %s": "Edytuj kanał: %s",
-    "There is no category!": "Nie ma żadnej kategorii!",
-    "Edit user: %s": "Edytuj użytkownika: %s",
-    "There is no article for this feed.": "Nie ma artykułu dla tego kanału.",
-    "Add subscription": "Dodaj subskrypcję",
-    "You don't have any subscription.": "Nie masz żadnej subskrypcji",
-    "Last check:": "Ostatnia aktualizacja:",
-    "Refresh": "Odśwież",
-    "There is no history at the moment.": "Obecnie nie ma żadnej historii.",
-    "OPML file": "Plik OPML",
-    "Sign In": "Zaloguj się",
-    "Sign in": "Zaloguj się",
-    "Theme": "Wygląd",
-    "Timezone": "Strefa czasowa",
-    "Language": "Język",
-    "There is no unread article.": "Nie ma żadnych nieprzeczytanych artykułów.",
-    "You are the only user.": "Jesteś jedynym użytkownikiem.",
-    "Last Login": "Ostatnie logowanie",
-    "Yes": "Tak",
-    "No": "Nie",
-    "This feed already exists (%s)": "Ten kanał już istnieje (%s)",
-    "Unable to fetch feed (Status Code = %d)": "Kanał nie mógł zostać pobrany (kod=%d)",
-    "Unable to open this link: %v": "Nie można było otworzyć tego linku: %v",
-    "Unable to analyze this page: %v": "Nie można przeanalizować tej strony: %v",
-    "Unable to find any subscription.": "Nie znaleziono żadnych subskrypcji.",
-    "The URL and the category are mandatory.": "URL i kategoria są obowiązkowe.",
-    "All fields are mandatory.": "Wszystkie pola są obowiązkowe.",
-    "Passwords are not the same.": "Hasła nie są identyczne.",
-    "You must use at least 6 characters.": "Musisz użyć co najmniej 6 znaków.",
-    "The username is mandatory.": "Nazwa użytkownika jest obowiązkowa.",
-    "The username, theme, language and timezone fields are mandatory.": "Pola nazwy użytkownika, tematu, języka i strefy czasowej są obowiązkowe.",
-    "The title is mandatory.": "Tytuł jest obowiązkowy.",
-    "About": "O stronie",
-    "Version": "Wersja",
-    "Version:": "Wersja :",
-    "Build Date:": "Data opracowania:",
-    "Author:": "Autor:",
-    "Authors": "Autorzy",
-    "License:": "Licencja:",
-    "Attachments": "Załączniki",
-    "Download": "Pobierz",
-    "Invalid username or password.": "Nieprawidłowa nazwa użytkownika lub hasło.",
-    "Never": "Nigdy",
-    "Unable to execute request: %v": "To polecenie nie mogło zostać wykonane: %v",
-    "Last Parsing Error": "Ostatni błąd analizy",
-    "There is a problem with this feed": "Z tym kanałem jest problem",
-    "Unable to parse OPML file: %q": "Plik OPML nie mógł zostać odczytany: %q",
-    "Unable to parse RSS feed: %q": "Nie można było odczytać kanału RSS: %q",
-    "Unable to parse Atom feed: %q": "Nie można było odczytać kanału Atom: %q",
-    "Unable to parse JSON feed: %q": "Nie można było odczytać kanału JSON: %q",
-    "Unable to parse RDF feed: %q": "Nie można było odczytać kanału RDF: %q",
-    "Unable to normalize encoding: %q": "Kodowanie znaków nie mogło zostać znormalizowane: %q",
-    "Unable to create this category.": "Ta kategoria nie mogła zostać utworzona.",
-    "yes": "tak",
-    "no": "nie",
-    "Are you sure?": "Czy jesteś pewny?",
-    "Work in progress...": "W toku...",
-    "This user already exists.": "Ten użytkownik już istnieje.",
-    "This category already exists.": "Ta kategoria już istnieje.",
-    "Unable to update this category.": "Ta kategoria nie mogła zostać zaktualizowana.",
-    "Integrations": "Usługi",
-    "Bookmarklet": "Bookmarklet",
-    "Drag and drop this link to your bookmarks.": "Przeciągnij i upuść to łącze do zakładek.",
-    "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.": "Ten link umożliwia subskrypcję strony internetowej bezpośrednio za pomocą zakładki w przeglądarce internetowej",
-    "Add to Miniflux": "Dodaj do Miniflux",
-    "Refresh all feeds in background": "Odśwież wszystkie subskrypcje w tle",
-    "Sign in with Google": "Zaloguj przez Google",
-    "Unlink my Google account": "Odłącz moje konto Google",
-    "Link my Google account": "Połącz z moim kontem Google",
-    "Category not found for this user": "Kategoria nie znaleziona dla tego użytkownika",
-    "Invalid theme.": "Ten temat jest nieprawidłowy.",
-    "Entry Sorting": "Sortowanie artykułów",
-    "Older entries first": "Najstarsze wpisy jako pierwsze",
-    "Recent entries first": "Najnowsze wpisy jako pierwsze",
-    "Saving...": "Zapisywanie...",
-    "Done!": "Gotowe!",
-    "Save this article": "Zapisz ten artykuł",
-    "Mark bookmark as unread": "Zaznacz zakładkę jako nieprzeczytaną",
-    "Pinboard Tags": "Pinboard Tags",
-    "Pinboard API Token": "Token Pinboard API",
-    "Save articles to Pinboard": "Zapisz artykuł w Pinboard",
-    "Save articles to Instapaper": "Zapisz artykuł w Instapaper",
-    "Instapaper Username": "Login do Instapaper",
-    "Instapaper Password": "Hasło do Instapaper",
-    "Activate Fever API": "Aktywuj Fever API",
-    "Fever Username": "Login do Fever",
-    "Fever Password": "Hasło do Fever",
-    "Fetch original content": "Pobierz oryginalną treść",
-    "Scraper Rules": "Zasady ekstrakcji",
-    "Rewrite Rules": "Reguły zapisu",
-    "Preferences saved!": "Ustawienia zapisane!",
-    "Your external account is now linked!": "Twoje zewnętrzne konto jest teraz połączone!",
-    "Save articles to Wallabag": "Zapisz artykuły do Wallabag",
-    "Wallabag API Endpoint": "Wallabag URL",
-    "Wallabag Client ID": "Wallabag Client-ID",
-    "Wallabag Client Secret": "Wallabag Client Secret",
-    "Wallabag Username": "Login do Wallabag",
-    "Wallabag Password": "Hasło do Wallabag",
-    "Save articles to Nunux Keeper": "Zapisz artykuly do Nunux Keeper",
-    "Nunux Keeper API Endpoint": "Nunux Keeper URL",
-    "Nunux Keeper API key": "Nunux Keeper API key",
-    "Keyboard Shortcut: %s": "Skróty klawiszowe: %s",
-    "Favorites": "Ulubione",
-    "Star": "Oznacz gwiazdką",
-    "Unstar": "Usuń gwiazdkę",
-    "Starred": "Oznaczone gwiazdką",
-    "There is no bookmark at the moment.": "Obecnie nie ma żadnych zakładek.",
-    "Last checked:": "Ostatnio sprawdzone:",
-    "ETag header:": "Nagłówek ETag:",
-    "LastModified header:": "Ostatnio zmienione:",
-    "None": "Brak",
-    "Keyboard Shortcuts": "Skróty klawiszowe",
-    "Sections Navigation": "Nawigacja między punktami menu",
-    "Go to unread": "Przejdź do nieprzeczytanych artykułów",
-    "Go to bookmarks": "Przejdź do zakładek",
-    "Go to history": "Przejdź do historii",
-    "Go to feeds": "Przejdź do kanałów",
-    "Go to categories": "Przejdź do kategorii",
-    "Go to settings": "Przejdź do ustawień",
-    "Show keyboard shortcuts": "Pokaż listę skrótów klawiszowych",
-    "Items Navigation": "Nawigacja między artykułami",
-    "Go to previous item": "Przejdź do poprzedniego artykułu",
-    "Go to next item": "Przejdź do następnego punktu artykułu",
-    "Pages Navigation": "Nawigacja między stronami",
-    "Go to previous page": "Przejdź do poprzedniej strony",
-    "Go to next page": "Przejdź do następnej strony",
-    "Open selected item": "Otwórz zaznaczony artykuł",
-    "Open original link": "Otwórz oryginalny artykuł",
-    "Toggle read/unread": "Oznacz jako przeczytane/nieprzeczytane",
-    "Mark current page as read": "Zaznacz aktualną stronę jako przeczytaną",
-    "Download original content": "Pobierz oryginalną zawartość",
-    "Toggle bookmark": "Dodaj/usuń zakładki",
-    "Close modal dialog": "Zamknij listę skrótów klawiszowych",
-    "Save article": "Zapisz artykuł",
-    "There is already someone associated with this provider!": "Już ktoś jest powiązany z tym dostawcą!",
-    "There is already someone else with the same Fever username!": "Już ktoś inny używa tej nazwy użytkownika Fever!",
-    "Mark all as read": "Oznacz wszystko jako przeczytane",
-    "This feed is empty": "Ten kanał jest pusty",
-    "Flush history": "Usuń historię",
-    "Site URL": "URL strony",
-    "Feed URL": "URL kanału",
-    "Logged as %s": "Zalogowany jako %s",
-    "Unread Items": "Nieprzeczytane",
-    "Change entry status": "Zmień status artykułu",
-    "Read": "Przeczytane",
-    "Fever API endpoint:": "Fever API endpoint:",
-    "Miniflux API": "Miniflux API",
-    "API Endpoint": "API endpoint",
-    "Your account password": "Hasło konta",
-    "This web page is empty": "Ta strona jest pusta",
-    "Invalid SSL certificate (original error: %q)": "Certyfikat SSL jest nieprawidłowy (błąd: %q)",
-    "This website is temporarily unreachable (original error: %q)": "Ta strona jest tymczasowo niedostępna (błąd: %q)",
-    "This website is permanently unreachable (original error: %q)": "Ta strona jest niedostępna (błąd: %q)",
-    "Website unreachable, the request timed out after %d seconds": "Strona internetowa nieosiągalna, żądanie wygasło po %d sekundach"
-}
+{
+    "confirm.question": "Czy jesteś pewny?",
+    "confirm.yes": "tak",
+    "confirm.no": "nie",
+    "confirm.loading": "W toku...",
+    "action.subscribe": "Subskrypcja",
+    "action.save": "Zapisz",
+    "action.or": "lub",
+    "action.cancel": "anuluj",
+    "action.remove": "Usuń",
+    "action.remove_feed": "Usuń ten kanał",
+    "action.update": "Zaktualizuj",
+    "action.edit": "Edytuj",
+    "action.download": "Pobierz",
+    "action.import": "Importuj",
+    "action.login": "Zaloguj się",
+    "tooltip.keyboard_shortcuts": "Skróty klawiszowe: %s",
+    "tooltip.logged_user": "Zalogowany jako %s",
+    "menu.unread": "Nieprzeczytane",
+    "menu.starred": "Ulubione",
+    "menu.history": "Historia",
+    "menu.feeds": "Kanały",
+    "menu.categories": "Kategorie",
+    "menu.settings": "Ustawienia",
+    "menu.logout": "Wyloguj się",
+    "menu.preferences": "Preferencje",
+    "menu.integrations": "Usługi",
+    "menu.sessions": "Sesje",
+    "menu.users": "Użytkownicy",
+    "menu.about": "O stronie",
+    "menu.export": "Eksportuj",
+    "menu.import": "Importuj",
+    "menu.create_category": "Utwórz kategorię",
+    "menu.mark_page_as_read": "Oznacz jako przeczytane",
+    "menu.mark_all_as_read": "Oznacz wszystko jako przeczytane",
+    "menu.refresh_feed": "Odśwież",
+    "menu.refresh_all_feeds": "Odśwież wszystkie subskrypcje w tle",
+    "menu.edit_feed": "Edytuj",
+    "menu.add_feed": "Dodaj subskrypcję",
+    "menu.add_user": "Dodaj użytkownika",
+    "menu.flush_history": "Usuń historię",
+    "search.label": "Szukaj",
+    "search.placeholder": "Szukaj...",
+    "pagination.next": "Następny",
+    "pagination.previous": "Poprzedni",
+    "entry.status.unread": "Nieprzeczytane",
+    "entry.status.read": "Przeczytane",
+    "entry.status.title": "Zmień status artykułu",
+    "entry.bookmark.toggle.on": "Oznacz gwiazdką",
+    "entry.bookmark.toggle.off": "Usuń gwiazdkę",
+    "entry.state.saving": "Zapisywanie...",
+    "entry.state.loading": "Ładowanie...",
+    "entry.save.label": "Zapisz",
+    "entry.save.title": "Zapisz ten artykuł",
+    "entry.save.completed": "Gotowe!",
+    "entry.scraper.label": "Pobierz treść",
+    "entry.scraper.title": "Pobierz oryginalną treść",
+    "entry.scraper.completed": "Gotowe!",
+    "entry.original.label": "Oryginalny artykuł",
+    "entry.comments.label": "Komentarze",
+    "entry.comments.title": "Zobacz komentarze",
+    "page.unread.title": "Nieprzeczytane",
+    "page.starred.title": "Oznaczone gwiazdką",
+    "page.categories.title": "Kategorie",
+    "page.categories.feed_count": [
+        "Jest %d kanał.",
+        "Są %d kanały.",
+        "Jest %d kanałów."
+    ],
+    "page.new_category.title": "Nowa kategoria",
+    "page.new_user.title": "Nowy użytkownik",
+    "page.edit_category.title": "Edycja Kategorii: %s",
+    "page.edit_user.title": "Edytuj użytkownika: %s",
+    "page.feeds.title": "Kanały",
+    "page.feeds.last_check": "Ostatnia aktualizacja:",
+    "page.feeds.error_count": [
+        "%d błąd",
+        "%d błąd",
+        "%d błędów"
+    ],
+    "page.history.title": "Historia",
+    "page.import.title": "Importuj",
+    "page.search.title": "Wyniki wyszukiwania",
+    "page.about.title": "O",
+    "page.about.credits": "Prawa autorskie",
+    "page.about.version": "Wersja:",
+    "page.about.build_date": "Data opracowania:",
+    "page.about.author": "Autor:",
+    "page.about.license": "Licencja:",
+    "page.add_feed.title": "Nowa subskrypcja",
+    "page.add_feed.no_category": "Nie ma żadnej kategorii. Musisz mieć co najmniej jedną kategorię.",
+    "page.add_feed.label.url": "URL",
+    "page.add_feed.submit": "Znajdź subskrypcję",
+    "page.add_feed.legend.advanced_options": "Zaawansowane opcje",
+    "page.add_feed.choose_feed": "Wybierz subskrypcję",
+    "page.edit_feed.title": "Edytuj kanał: %s",
+    "page.edit_feed.last_check": "Ostatnia aktualizacja:",
+    "page.edit_feed.last_modified_header": "Ostatnio zmienione:",
+    "page.edit_feed.etag_header": "Nagłówek ETag:",
+    "page.edit_feed.no_header": "Brak",
+    "page.edit_feed.last_parsing_error": "Ostatni błąd analizy",
+    "page.keyboard_shortcuts.title": "Skróty klawiszowe",
+    "page.keyboard_shortcuts.subtitle.sections": "Nawigacja między punktami menu",
+    "page.keyboard_shortcuts.subtitle.items": "Nawigacja między artykułami",
+    "page.keyboard_shortcuts.subtitle.pages": "Nawigacja między stronami",
+    "page.keyboard_shortcuts.subtitle.actions": "Działania",
+    "page.keyboard_shortcuts.go_to_unread": "Przejdź do nieprzeczytanych artykułów",
+    "page.keyboard_shortcuts.go_to_starred": "Przejdź do zakładek",
+    "page.keyboard_shortcuts.go_to_history": "Przejdź do historii",
+    "page.keyboard_shortcuts.go_to_feeds": "Przejdź do kanałów",
+    "page.keyboard_shortcuts.go_to_categories": "Przejdź do kategorii",
+    "page.keyboard_shortcuts.go_to_settings": "Przejdź do ustawień",
+    "page.keyboard_shortcuts.show_keyboard_shortcuts": "Pokaż listę skrótów klawiszowych",
+    "page.keyboard_shortcuts.go_to_previous_item": "Przejdź do poprzedniego artykułu",
+    "page.keyboard_shortcuts.go_to_next_item": "Przejdź do następnego punktu artykułu",
+    "page.keyboard_shortcuts.go_to_previous_page": "Przejdź do poprzedniej strony",
+    "page.keyboard_shortcuts.go_to_next_page": "Przejdź do następnej strony",
+    "page.keyboard_shortcuts.open_item": "Otwórz zaznaczony artykuł",
+    "page.keyboard_shortcuts.open_original": "Otwórz oryginalny artykuł",
+    "page.keyboard_shortcuts.toggle_read_status": "Oznacz jako przeczytane/nieprzeczytane",
+    "page.keyboard_shortcuts.mark_page_as_read": "Zaznacz aktualną stronę jako przeczytaną",
+    "page.keyboard_shortcuts.download_content": "Pobierz oryginalną zawartość",
+    "page.keyboard_shortcuts.toggle_bookmark_status": "Dodaj/usuń zakładki",
+    "page.keyboard_shortcuts.save_article": "Zapisz artykuł",
+    "page.keyboard_shortcuts.go_to_search": "Ustaw fokus na formularzu wyszukiwania",
+    "page.keyboard_shortcuts.close_modal": "Zamknij listę skrótów klawiszowych",
+    "page.users.title": "Użytkownicy",
+    "page.users.never_logged": "Nigdy",
+    "page.users.admin.yes": "Tak",
+    "page.users.admin.no": "Nie",
+    "page.users.actions": "Działania",
+    "page.users.last_login": "Ostatnie logowanie",
+    "page.users.is_admin": "Administrator",
+    "page.settings.title": "Ustawienia",
+    "page.settings.link_google_account": "Połącz z moim kontem Google",
+    "page.settings.unlink_google_account": "Odłącz moje konto Google",
+    "page.login.title": "Zaloguj się",
+    "page.login.google_signin": "Zaloguj przez Google",
+    "page.integrations.title": "Usługi",
+    "page.integration.miniflux_api": "Miniflux API",
+    "page.integration.miniflux_api_endpoint": "Punkt końcowy API",
+    "page.integration.miniflux_api_username": "Nazwa Użytkownika",
+    "page.integration.miniflux_api_password": "Hasło",
+    "page.integration.miniflux_api_password_value": "Hasło konta",
+    "page.integration.bookmarklet": "Bookmarklet",
+    "page.integration.bookmarklet.name": "Dodaj do Miniflux",
+    "page.integration.bookmarklet.instructions": "Przeciągnij i upuść to łącze do zakładek.",
+    "page.integration.bookmarklet.help": "Ten link umożliwia subskrypcję strony internetowej bezpośrednio za pomocą zakładki w przeglądarce internetowej.",
+    "page.sessions.title": "Sesje",
+    "page.sessions.table.date": "Data",
+    "page.sessions.table.ip": "Adres IP",
+    "page.sessions.table.user_agent": "Agent użytkownika",
+    "page.sessions.table.actions": "Działania",
+    "page.sessions.table.current_session": "Bieżąca sesja",
+    "alert.no_bookmark": "Obecnie nie ma żadnych zakładek.",
+    "alert.no_category": "Nie ma żadnej kategorii!",
+    "alert.no_category_entry": "W tej kategorii nie ma żadnych artykułów",
+    "alert.no_feed_entry": "Nie ma artykułu dla tego kanału.",
+    "alert.no_feed": "Nie masz żadnej subskrypcji.",
+    "alert.no_history": "Obecnie nie ma żadnej historii.",
+    "alert.feed_error": "Z tym kanałem jest problem",
+    "alert.no_search_result": "Brak wyników dla tego wyszukiwania.",
+    "alert.no_unread_entry": "Nie ma żadnych nieprzeczytanych artykułów.",
+    "alert.no_user": "Jesteś jedynym użytkownikiem.",
+    "alert.account_unlinked": "Twoje konto zewnętrzne jest teraz zdysocjowane!",
+    "alert.account_linked": "Twoje konto zewnętrzne jest teraz połączone!",
+    "alert.pocket_linked": "Twoje konto Pocket jest teraz połączone!",
+    "alert.prefs_saved": "Ustawienia zapisane!",
+    "error.unlink_account_without_password": "Musisz zdefiniować hasło, inaczej nie będziesz mógł się ponownie zalogować.",
+    "error.duplicate_linked_account": "Już ktoś jest powiązany z tym dostawcą!",
+    "error.duplicate_fever_username": "Już ktoś inny używa tej nazwy użytkownika Fever!",
+    "error.pocket_request_token": "Nie można pobrać tokena żądania z Pocket!",
+    "error.pocket_access_token": "Nie można pobrać tokena dostępu z Pocket!",
+    "error.category_already_exists": "Ta kategoria już istnieje.",
+    "error.unable_to_create_category": "Ta kategoria nie mogła zostać utworzona.",
+    "error.unable_to_update_category": "Ta kategoria nie mogła zostać zaktualizowana.",
+    "error.user_already_exists": "Ten użytkownik już istnieje.",
+    "error.unable_to_create_user": "Nie można utworzyć tego użytkownika.",
+    "error.unable_to_update_user": "Nie można zaktualizować tego użytkownika.",
+    "error.unable_to_update_feed": "Nie można zaktualizować tego kanału.",
+    "error.subscription_not_found": "Nie znaleziono żadnych subskrypcji.",
+    "error.empty_file": "Ten plik jest pusty.",
+    "error.bad_credentials": "Nieprawidłowa nazwa użytkownika lub hasło.",
+    "error.fields_mandatory": "Wszystkie pola są obowiązkowe.",
+    "error.title_required": "Tytuł jest obowiązkowy.",
+    "error.different_passwords": "Hasła nie są identyczne.",
+    "error.password_min_length": "Musisz użyć co najmniej 6 znaków.",
+    "error.settings_mandatory_fields": "Pola nazwy użytkownika, tematu, języka i strefy czasowej są obowiązkowe.",
+    "error.feed_mandatory_fields": "URL i kategoria są obowiązkowe.",
+    "error.user_mandatory_fields": "Nazwa użytkownika jest obowiązkowa.",
+    "form.feed.label.title": "Tytuł",
+    "form.feed.label.site_url": "URL strony",
+    "form.feed.label.feed_url": "URL kanału",
+    "form.feed.label.category": "Kategoria",
+    "form.feed.label.crawler": "Pobierz oryginalną treść",
+    "form.feed.label.feed_username": "Subskrypcję nazwa użytkownika",
+    "form.feed.label.feed_password": "Subskrypcję Hasło",
+    "form.feed.label.user_agent": "Zastąp domyślny agent użytkownika",
+    "form.feed.label.scraper_rules": "Zasady ekstrakcji",
+    "form.feed.label.rewrite_rules": "Reguły zapisu",
+    "form.category.label.title": "Tytuł",
+    "form.user.label.username": "Nazwa użytkownika",
+    "form.user.label.password": "Hasło",
+    "form.user.label.confirmation": "Potwierdzenie hasła",
+    "form.user.label.admin": "Administrator",
+    "form.prefs.label.language": "Język",
+    "form.prefs.label.timezone": "Strefa czasowa",
+    "form.prefs.label.theme": "Wygląd",
+    "form.prefs.label.entry_sorting": "Sortowanie artykułów",
+    "form.prefs.select.older_first": "Najstarsze wpisy jako pierwsze",
+    "form.prefs.select.recent_first": "Najnowsze wpisy jako pierwsze",
+    "form.import.label.file": "Plik OPML",
+    "form.integration.fever_activate": "Aktywuj Fever API",
+    "form.integration.fever_username": "Login do Fever",
+    "form.integration.fever_password": "Hasło do Fever",
+    "form.integration.fever_endpoint": "Punkt końcowy API gorączka:",
+    "form.integration.pinboard_activate": "Zapisz artykuł w Pinboard",
+    "form.integration.pinboard_token": "Token Pinboard API",
+    "form.integration.pinboard_tags": "Pinboard Tags",
+    "form.integration.pinboard_bookmark": "Zaznacz zakładkę jako nieprzeczytaną",
+    "form.integration.instapaper_activate": "Zapisz artykuł w Instapaper",
+    "form.integration.instapaper_username": "Login do Instapaper",
+    "form.integration.instapaper_password": "Hasło do Instapaper",
+    "form.integration.pocket_activate": "Zapisz artykuły w Pocket",
+    "form.integration.pocket_consumer_key": "Pocket Consumer Key",
+    "form.integration.pocket_access_token": "Token dostępu kieszeń",
+    "form.integration.pocket_connect_link": "Połącz swoje konto Pocket",
+    "form.integration.wallabag_activate": "Zapisz artykuły do Wallabag",
+    "form.integration.wallabag_endpoint": "Wallabag URL",
+    "form.integration.wallabag_client_id": "Wallabag Client-ID",
+    "form.integration.wallabag_client_secret": "Wallabag Client Secret",
+    "form.integration.wallabag_username": "Login do Wallabag",
+    "form.integration.wallabag_password": "Hasło do Wallabag",
+    "form.integration.nunux_keeper_activate": "Zapisz artykuly do Nunux Keeper",
+    "form.integration.nunux_keeper_endpoint": "Nunux Keeper URL",
+    "form.integration.nunux_keeper_api_key": "Nunux Keeper API key",
+    "form.submit.loading": "Ładowanie...",
+    "form.submit.saving": "Zapisywanie...",
+    "time_elapsed.not_yet": "jeszcze nie",
+    "time_elapsed.yesterday": "wczoraj",
+    "time_elapsed.now": "przed chwilą",
+    "time_elapsed.minutes": [
+        "%d minuta temu",
+        "%d minuty temu",
+        "%d minut temu"
+    ],
+    "time_elapsed.hours": [
+        "%d godzinę temu",
+        "%d godziny temu",
+        "%d godzin temu"
+    ],
+    "time_elapsed.days": [
+        "%d dzień temu",
+        "%d dni temu",
+        "%d dni temu"
+    ],
+    "time_elapsed.weeks": [
+        "%d tydzień temu",
+        "%d tygodni temu",
+        "%d tygodni temu"
+    ],
+    "time_elapsed.months": [
+        "%d miesiąc temu",
+        "%d miesięcy temu",
+        "%d miesięcy temu"
+    ],
+    "time_elapsed.years": [
+        "%d rok temu",
+        "%d lat temu",
+        "%d lat temu"
+    ],
+    "This feed already exists (%s)": "Ten kanał już istnieje (%s)",
+    "Unable to fetch feed (Status Code = %d)": "Kanał nie mógł zostać pobrany (kod=%d)",
+    "Unable to open this link: %v": "Nie można było otworzyć tego linku: %v",
+    "Unable to analyze this page: %v": "Nie można przeanalizować tej strony: %v",
+    "Unable to execute request: %v": "To polecenie nie mogło zostać wykonane: %v",
+    "Unable to parse OPML file: %q": "Plik OPML nie mógł zostać odczytany: %q",
+    "Unable to parse RSS feed: %q": "Nie można było odczytać kanału RSS: %q",
+    "Unable to parse Atom feed: %q": "Nie można było odczytać kanału Atom: %q",
+    "Unable to parse JSON feed: %q": "Nie można było odczytać kanału JSON: %q",
+    "Unable to parse RDF feed: %q": "Nie można było odczytać kanału RDF: %q",
+    "Unable to normalize encoding: %q": "Kodowanie znaków nie mogło zostać znormalizowane: %q",
+    "Category not found for this user": "Kategoria nie znaleziona dla tego użytkownika",
+    "This feed is empty": "Ten kanał jest pusty",
+    "This web page is empty": "Ta strona jest pusta",
+    "Invalid SSL certificate (original error: %q)": "Certyfikat SSL jest nieprawidłowy (błąd: %q)",
+    "This website is temporarily unreachable (original error: %q)": "Ta strona jest tymczasowo niedostępna (błąd: %q)",
+    "This website is permanently unreachable (original error: %q)": "Ta strona jest niedostępna (błąd: %q)",
+    "Website unreachable, the request timed out after %d seconds": "Strona internetowa nieosiągalna, żądanie wygasło po %d sekundach"
+}

locale/translations/zh_CN.json

@@ -1,218 +1,271 @@
 {
-    "plural.feed.error_count": [
-        "%d 错误",
+    "confirm.question": "您确认吗?",
+    "confirm.yes": "是",
+    "confirm.no": "否",
+    "confirm.loading": "执行中...",
+    "action.subscribe": "订阅",
+    "action.save": "保存",
+    "action.or": "或",
+    "action.cancel": "取消",
+    "action.remove": "删除",
+    "action.remove_feed": "删除此Feed",
+    "action.update": "更新",
+    "action.edit": "编辑",
+    "action.download": "下载",
+    "action.import": "导入",
+    "action.login": "登陆",
+    "tooltip.keyboard_shortcuts": "快捷键: %s",
+    "tooltip.logged_user": "当前登录 %s",
+    "menu.unread": "未读",
+    "menu.starred": "星标",
+    "menu.history": "历史",
+    "menu.feeds": "源",
+    "menu.categories": "分类",
+    "menu.settings": "设置",
+    "menu.logout": "登出",
+    "menu.preferences": "优先",
+    "menu.integrations": "集成",
+    "menu.sessions": "会话",
+    "menu.users": "用户",
+    "menu.about": "关于",
+    "menu.export": "导出",
+    "menu.import": "导入",
+    "menu.create_category": "新建分类",
+    "menu.mark_page_as_read": "标记为已读",
+    "menu.mark_all_as_read": "全标记为已读",
+    "menu.refresh_feed": "更新",
+    "menu.refresh_all_feeds": "在后台更新全部源",
+    "menu.edit_feed": "编辑",
+    "menu.add_feed": "新增订阅",
+    "menu.add_user": "新建用户",
+    "menu.flush_history": "清理历史",
+    "search.label": "搜索",
+    "search.placeholder": "搜索...",
+    "pagination.next": "下一页",
+    "pagination.previous": "上一页",
+    "entry.status.unread": "未读",
+    "entry.status.read": "标为已读",
+    "entry.status.title": "更改状态",
+    "entry.bookmark.toggle.on": "标记星标",
+    "entry.bookmark.toggle.off": "去掉星标",
+    "entry.state.saving": "保存中...",
+    "entry.state.loading": "载入中...",
+    "entry.save.label": "保存",
+    "entry.save.title": "保存这篇文章",
+    "entry.save.completed": "完成",
+    "entry.scraper.label": "抓取原内容",
+    "entry.scraper.title": "抓取原内容",
+    "entry.scraper.completed": "完成",
+    "entry.original.label": "原版的",
+    "entry.comments.label": "注释",
+    "entry.comments.title": "查看评论",
+    "page.unread.title": "未读",
+    "page.starred.title": "星标",
+    "page.categories.title": "分类",
+    "page.categories.feed_count": [
+        "有 %d 个源."
+    ],
+    "page.new_category.title": "新分类",
+    "page.new_user.title": "新用户",
+    "page.edit_category.title": "编辑分类 : %s",
+    "page.edit_user.title": "编辑用户 : %s",
+    "page.feeds.title": "源",
+    "page.feeds.last_check": "最后检查时间:",
+    "page.feeds.error_count": [
         "%d 错误"
     ],
-    "plural.categories.feed_count": [
-        "有 %d 个源.",
-        "有 %d 个源."
+    "page.history.title": "历史",
+    "page.import.title": "导入",
+    "page.search.title": "搜索结果",
+    "page.about.title": "关于",
+    "page.about.credits": "版权",
+    "page.about.version": "版：",
+    "page.about.build_date": "建造日期：",
+    "page.about.author": "作者：",
+    "page.about.license": "执照：",
+    "page.add_feed.title": "新订阅",
+    "page.add_feed.no_category": "没有类别。 您必须至少有一个类别。",
+    "page.add_feed.label.url": "网址",
+    "page.add_feed.submit": "查找订阅",
+    "page.add_feed.legend.advanced_options": "高级选项",
+    "page.add_feed.choose_feed": "选择一个订阅",
+    "page.edit_feed.title": "编辑源 : %s",
+    "page.edit_feed.last_check": "最后检查时间:",
+    "page.edit_feed.last_modified_header": "最后修改的Header:",
+    "page.edit_feed.etag_header": "ETag标题:",
+    "page.edit_feed.no_header": "无",
+    "page.edit_feed.last_parsing_error": "最后一次解析错误",
+    "page.keyboard_shortcuts.title": "快捷键",
+    "page.keyboard_shortcuts.subtitle.sections": "分区导航",
+    "page.keyboard_shortcuts.subtitle.items": "条目导航",
+    "page.keyboard_shortcuts.subtitle.pages": "页面导航",
+    "page.keyboard_shortcuts.subtitle.actions": "操作",
+    "page.keyboard_shortcuts.go_to_unread": "去往未读",
+    "page.keyboard_shortcuts.go_to_starred": "去往书签",
+    "page.keyboard_shortcuts.go_to_history": "去往历史",
+    "page.keyboard_shortcuts.go_to_feeds": "去往源",
+    "page.keyboard_shortcuts.go_to_categories": "去往分类",
+    "page.keyboard_shortcuts.go_to_settings": "去往设定",
+    "page.keyboard_shortcuts.show_keyboard_shortcuts": "显示快捷键",
+    "page.keyboard_shortcuts.go_to_previous_item": "上一条目",
+    "page.keyboard_shortcuts.go_to_next_item": "下一条目",
+    "page.keyboard_shortcuts.go_to_previous_page": "上一页",
+    "page.keyboard_shortcuts.go_to_next_page": "下一页",
+    "page.keyboard_shortcuts.open_item": "打开选定的条目",
+    "page.keyboard_shortcuts.open_original": "打开原始链接",
+    "page.keyboard_shortcuts.toggle_read_status": "切换已读/未读状态",
+    "page.keyboard_shortcuts.mark_page_as_read": "标记当前",
+    "page.keyboard_shortcuts.download_content": "下载原始内容",
+    "page.keyboard_shortcuts.toggle_bookmark_status": "切换收藏状态",
+    "page.keyboard_shortcuts.save_article": "保存文章",
+    "page.keyboard_shortcuts.go_to_search": "将重点放在搜索表单上",
+    "page.keyboard_shortcuts.close_modal": "关闭模态对话窗口",
+    "page.users.title": "用户",
+    "page.users.never_logged": "永不",
+    "page.users.admin.yes": "是",
+    "page.users.admin.no": "否",
+    "page.users.actions": "操作",
+    "page.users.last_login": "最后登录时间",
+    "page.users.is_admin": "管理员",
+    "page.settings.title": "设置",
+    "page.settings.link_google_account": "关联我的Google账户",
+    "page.settings.unlink_google_account": "去除Google账号关联",
+    "page.login.title": "登陆",
+    "page.login.google_signin": "使用Google登陆",
+    "page.integrations.title": "集成",
+    "page.integration.miniflux_api": "Miniflux API",
+    "page.integration.miniflux_api_endpoint": "API端点",
+    "page.integration.miniflux_api_username": "用户名",
+    "page.integration.miniflux_api_password": "密码",
+    "page.integration.miniflux_api_password_value": "您账户的密码",
+    "page.integration.bookmarklet": "书签小应用",
+    "page.integration.bookmarklet.name": "新增到Miniflux",
+    "page.integration.bookmarklet.instructions": "拖动这个链接到书签.",
+    "page.integration.bookmarklet.help": "你可以打开这个特殊的书签来直接订阅网站.",
+    "page.sessions.title": "会话",
+    "page.sessions.table.date": "日期",
+    "page.sessions.table.ip": "IP地址",
+    "page.sessions.table.user_agent": "用户代理",
+    "page.sessions.table.actions": "操作",
+    "page.sessions.table.current_session": "当前会话",
+    "alert.no_bookmark": "目前没有书签。",
+    "alert.no_category": "目前没有分类.",
+    "alert.no_category_entry": "该分类下没有文章.",
+    "alert.no_feed_entry": "这个源中没有文章.",
+    "alert.no_feed": "当前没有订阅.",
+    "alert.no_history": "当前没有历史.",
+    "alert.feed_error": "这一源存在问题",
+    "alert.no_search_result": "此搜索没有结果。",
+    "alert.no_unread_entry": "目前没有未读文章.",
+    "alert.no_user": "你是目前仅有的用户.",
+    "alert.account_unlinked": "您的外部帐户现已解散！",
+    "alert.account_linked": "您的外部账号已关联!",
+    "alert.pocket_linked": "您的Pocket帐户现已关联",
+    "alert.prefs_saved": "偏好已存储!",
+    "error.unlink_account_without_password": "您必须定义密码，否则您将无法再次登录。",
+    "error.duplicate_linked_account": "该Provider已被关联!",
+    "error.duplicate_fever_username": "Fever用户名已被占用!",
+    "error.pocket_request_token": "无法从Pocket获取请求令牌！",
+    "error.pocket_access_token": "无法从Pocket获取访问令牌！",
+    "error.category_already_exists": "分类已存在.",
+    "error.unable_to_create_category": "无法建立这个分类.",
+    "error.unable_to_update_category": "无法更新该分类.",
+    "error.user_already_exists": "用户已存在.",
+    "error.unable_to_create_user": "无法创建此用户。",
+    "error.unable_to_update_user": "无法更新此用户。",
+    "error.unable_to_update_feed": "无法更新此Feed。",
+    "error.subscription_not_found": "找不到任何订阅.",
+    "error.empty_file": "此文件为空。",
+    "error.bad_credentials": "用户名或密码无效.",
+    "error.fields_mandatory": "必须填写全部信息.",
+    "error.title_required": "必须填写标题.",
+    "error.different_passwords": "两次输入的密码不同.",
+    "error.password_min_length": "请至少使用6个字符.",
+    "error.settings_mandatory_fields": "必须填写用户名,主题,语言和时区.",
+    "error.feed_mandatory_fields": "必须填写URL和分类.",
+    "error.user_mandatory_fields": "必须填写用户名.",
+    "form.feed.label.title": "标题",
+    "form.feed.label.site_url": "站点URL",
+    "form.feed.label.feed_url": "源URL",
+    "form.feed.label.category": "类别",
+    "form.feed.label.crawler": "获取原始内容",
+    "form.feed.label.feed_username": "Feed用户名",
+    "form.feed.label.feed_password": "Feed密码",
+    "form.feed.label.user_agent": "覆盖默认用户代理",
+    "form.feed.label.scraper_rules": "Scraper规则",
+    "form.feed.label.rewrite_rules": "重写规则",
+    "form.category.label.title": "标题",
+    "form.user.label.username": "用户名",
+    "form.user.label.password": "密码",
+    "form.user.label.confirmation": "确认",
+    "form.user.label.admin": "管理员",
+    "form.prefs.label.language": "语言",
+    "form.prefs.label.timezone": "时区",
+    "form.prefs.label.theme": "主题",
+    "form.prefs.label.entry_sorting": "内容排序",
+    "form.prefs.select.older_first": "旧->新",
+    "form.prefs.select.recent_first": "新->旧",
+    "form.import.label.file": "OPML 文件",
+    "form.integration.fever_activate": "启用 Fever API",
+    "form.integration.fever_username": "Fever 用户名",
+    "form.integration.fever_password": "Fever 密码",
+    "form.integration.fever_endpoint": "Fever API endpoint:",
+    "form.integration.pinboard_activate": "保存文章到Pinboard",
+    "form.integration.pinboard_token": "Pinboard API Token",
+    "form.integration.pinboard_tags": "Pinboard 标签",
+    "form.integration.pinboard_bookmark": "标记为未读",
+    "form.integration.instapaper_activate": "保存文章到Instapaper",
+    "form.integration.instapaper_username": "Instapaper 用户名",
+    "form.integration.instapaper_password": "Instapaper 密码",
+    "form.integration.pocket_activate": "将文章保存到Pocket",
+    "form.integration.pocket_consumer_key": "口袋消费者密钥",
+    "form.integration.pocket_access_token": "口袋访问令牌",
+    "form.integration.pocket_connect_link": "连接您的Pocket帐户",
+    "form.integration.wallabag_activate": "保存文章到Wallabag",
+    "form.integration.wallabag_endpoint": "Wallabag URL",
+    "form.integration.wallabag_client_id": "Wallabag 客户端ID",
+    "form.integration.wallabag_client_secret": "Wallabag 客户端Secret",
+    "form.integration.wallabag_username": "Wallabag 用户名",
+    "form.integration.wallabag_password": "Wallabag 密码",
+    "form.integration.nunux_keeper_activate": "保存文章到Nunux Keeper",
+    "form.integration.nunux_keeper_endpoint": "Nunux Keeper API Endpoint",
+    "form.integration.nunux_keeper_api_key": "Nunux Keeper API key",
+    "form.submit.loading": "载入中...",
+    "form.submit.saving": "保存中...",
+    "time_elapsed.not_yet": "尚未",
+    "time_elapsed.yesterday": "昨天",
+    "time_elapsed.now": "刚刚",
+    "time_elapsed.minutes": [
+        "%d 分钟前"
+    ],
+    "time_elapsed.hours": [
+        "%d 小时前"
+    ],
+    "time_elapsed.days": [
+        "%d 天前"
+    ],
+    "time_elapsed.weeks": [
+        "%d 周前"
+    ],
+    "time_elapsed.months": [
+        "%d 月前"
+    ],
+    "time_elapsed.years": [
+        "%d 年前"
     ],
-    "Username": "用户名",
-    "Password": "密码",
-    "Unread": "未读",
-    "History": "历史",
-    "Feeds": "源",
-    "Categories": "分类",
-    "Settings": "设置",
-    "Logout": "登出",
-    "Next": "下一页",
-    "Previous": "上一页",
-    "New Subscription": "新订阅",
-    "Import": "导入",
-    "Export": "导出",
-    "There is no category. You must have at least one category.": "目前没有分类.需要有一个已有的分类存在.",
-    "URL": "URL",
-    "Category": "分类",
-    "Find a subscription": "寻找订阅",
-    "Loading...": "载入中...",
-    "Create a category": "新建分类",
-    "There is no category.": "目前没有分类.",
-    "Edit": "编辑",
-    "Remove": "删除",
-    "No feed.": "没有源.",
-    "There is no article in this category.": "该分类下没有文章.",
-    "Original": "原始链接",
-    "Mark this page as read": "标记为已读",
-    "not yet": "尚未",
-    "just now": "刚刚",
-    "1 minute ago": "1 分钟前",
-    "%d minutes ago": "%d 分钟前",
-    "1 hour ago": "1 小时前",
-    "%d hours ago": "%d 小时前",
-    "yesterday": "昨天",
-    "%d days ago": "%d 天前",
-    "%d weeks ago": "%d 周前",
-    "%d months ago": "%d 月前",
-    "%d years ago": "%d 年前",
-    "Date": "日期",
-    "IP Address": "IP地址",
-    "User Agent": "User Agent",
-    "Actions": "操作",
-    "Current session": "当前会话",
-    "Sessions": "会话",
-    "Users": "用户",
-    "Add user": "新建用户",
-    "Choose a Subscription": "选择一个订阅",
-    "Subscribe": "订阅",
-    "New Category": "新分类",
-    "Title": "标题",
-    "Save": "保存",
-    "or": "或",
-    "cancel": "取消",
-    "New User": "新用户",
-    "Confirmation": "确认",
-    "Administrator": "管理员",
-    "Edit Category: %s": "编辑分类 : %s",
-    "Update": "更新",
-    "Edit Feed: %s": "编辑源 : %s",
-    "There is no category!": "没有分类!",
-    "Edit user: %s": "编辑用户: %s",
-    "There is no article for this feed.": "这个源中没有文章.",
-    "Add subscription": "新增订阅",
-    "You don't have any subscription.": "当前没有订阅",
-    "Last check:": "最后检查时间:",
-    "Refresh": "更新",
-    "There is no history at the moment.": "当前没有历史.",
-    "OPML file": "OPML 文件",
-    "Sign In": "登陆",
-    "Sign in": "登陆",
-    "Theme": "主题",
-    "Timezone": "时区",
-    "Language": "语言",
-    "There is no unread article.": "目前没有未读文章.",
-    "You are the only user.": "你是目前仅有的用户.",
-    "Last Login": "最后登录时间",
-    "Yes": "是",
-    "No": "否",
     "This feed already exists (%s)": "源已存在 (%s)",
     "Unable to fetch feed (Status Code = %d)": "无法获取源 (错误代码=%d)",
     "Unable to open this link: %v": "无法打开这一链接: %v",
     "Unable to analyze this page: %v": "无法分析这一页面: %v",
-    "Unable to find any subscription.": "找不到任何订阅.",
-    "The URL and the category are mandatory.": "必须填写URL和分类.",
-    "All fields are mandatory.": "必须填写全部信息.",
-    "Passwords are not the same.": "两次输入的密码不同.",
-    "You must use at least 6 characters.": "请至少使用6个字符.",
-    "The username is mandatory.": "必须填写用户名.",
-    "The username, theme, language and timezone fields are mandatory.": "必须填写用户名,主题,语言和时区.",
-    "The title is mandatory.": "必须填写标题.",
-    "About": "关于",
-    "Version": "版本",
-    "Version:": "版本:",
-    "Build Date:": "构建日期:",
-    "Author:": "作者:",
-    "Authors": "作者",
-    "License:": "协议:",
-    "Attachments": "附件",
-    "Download": "下载",
-    "Invalid username or password.": "用户名或密码无效.",
-    "Never": "永不",
     "Unable to execute request: %v": "无法执行这一请求: %v",
-    "Last Parsing Error": "最后一次解析错误",
-    "There is a problem with this feed": "这一源存在问题",
     "Unable to parse OPML file: %q": "无法解析OPML文件: %q",
     "Unable to parse RSS feed: %q": "无法解析RSS源: %q",
     "Unable to parse Atom feed: %q": "无法解析Atom源: %q",
     "Unable to parse JSON feed: %q": "无法解析JSON源: %q",
     "Unable to parse RDF feed: %q": "无法解析RDF源: %q",
     "Unable to normalize encoding: %q": "无法正则化编码: %q",
-    "Unable to create this category.": "无法建立这个分类.",
-    "yes": "是",
-    "no": "否",
-    "Are you sure?": "您确认吗?",
-    "Work in progress...": "执行中...",
-    "This user already exists.": "用户已存在.",
-    "This category already exists.": "分类已存在.",
-    "Unable to update this category.": "无法更新该分类.",
-    "Integrations": "集成",
-    "Bookmarklet": "书签小应用",
-    "Drag and drop this link to your bookmarks.": "拖动这个链接到书签.",
-    "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.": "你可以打开这个特殊的书签来直接订阅网站.",
-    "Add to Miniflux": "新增到Miniflux",
-    "Refresh all feeds in background": "在后台更新全部源",
-    "Sign in with Google": "使用Google登陆",
-    "Unlink my Google account": "去除Google账号关联",
-    "Link my Google account": "关联我的Google账户",
     "Category not found for this user": "未找到该用户的这一分类",
-    "Invalid theme.": "无效的主题.",
-    "Entry Sorting": "内容排序",
-    "Older entries first": "旧->新",
-    "Recent entries first": "新->旧",
-    "Saving...": "保存中",
-    "Done!": "完成!",
-    "Save this article": "保存这篇文章",
-    "Mark bookmark as unread": "标记为未读",
-    "Pinboard Tags": "Pinboard 标签",
-    "Pinboard API Token": "Pinboard API Token",
-    "Save articles to Pinboard": "保存文章到Pinboard",
-    "Save articles to Instapaper": "保存文章到Instapaper",
-    "Instapaper Username": "Instapaper 用户名",
-    "Instapaper Password": "Instapaper 密码",
-    "Activate Fever API": "启用 Fever API",
-    "Fever Username": "Fever 用户名",
-    "Fever Password": "Fever 密码",
-    "Fetch original content": "抓取原内容",
-    "Scraper Rules": "Scraper规则",
-    "Rewrite Rules": "重写规则",
-    "Preferences saved!": "偏好已存储!",
-    "Your external account is now linked!": "您的外部账号已关联!",
-    "Save articles to Wallabag": "保存文章到Wallabag",
-    "Wallabag API Endpoint": "Wallabag URL",
-    "Wallabag Client ID": "Wallabag 客户端ID",
-    "Wallabag Client Secret": "Wallabag 客户端Secret",
-    "Wallabag Username": "Wallabag 用户名",
-    "Wallabag Password": "Wallabag 密码",
-    "Save articles to Nunux Keeper": "保存文章到Nunux Keeper",
-    "Nunux Keeper API Endpoint": "Nunux Keeper API Endpoint",
-    "Nunux Keeper API key": "Nunux Keeper API key",
-    "Keyboard Shortcut: %s": "快捷键: %s",
-    "Favorites": "收藏",
-    "Star": "标记星标",
-    "Unstar": "去掉星标",
-    "Starred": "星标",
-    "There is no bookmark at the moment.": "当前没有书签.",
-    "Last checked:": "上次检查:",
-    "ETag header:": "ETag header:",
-    "LastModified header:": "最后修改的Header:",
-    "None": "无",
-    "Keyboard Shortcuts": "快捷键",
-    "Sections Navigation": "分区导航",
-    "Go to unread": "去往未读",
-    "Go to bookmarks": "去往书签",
-    "Go to history": "去往历史",
-    "Go to feeds": "去往源",
-    "Go to categories": "去往分类",
-    "Go to settings": "去往设定",
-    "Show keyboard shortcuts": "显示快捷键",
-    "Items Navigation": "条目导航",
-    "Go to previous item": "上一条目",
-    "Go to next item": "下一条目",
-    "Pages Navigation": "页面导航",
-    "Go to previous page": "上一页",
-    "Go to next page": "下一页",
-    "Open selected item": "打开选定的条目",
-    "Open original link": "打开原始链接",
-    "Toggle read/unread": "切换已读/未读状态",
-    "Mark current page as read": "标记当前",
-    "Download original content": "下载原始内容",
-    "Toggle bookmark": "切换收藏状态",
-    "Close modal dialog": "关闭模态对话窗口",
-    "Save article": "保存文章",
-    "There is already someone associated with this provider!": "该Provider已被关联!",
-    "There is already someone else with the same Fever username!": "Fever用户名已被占用!",
-    "Mark all as read": "全标记为已读",
     "This feed is empty": "该源是空的",
-    "Flush history": "清理历史",
-    "Site URL": "站点URL",
-    "Feed URL": "源URL",
-    "Logged as %s": "当前登录 %s",
-    "Unread Items": "未读条目",
-    "Change entry status": "更改状态",
-    "Read": "标为已读",
-    "Fever API endpoint:": "Fever API Endpoint:",
-    "Miniflux API": "Miniflux API",
-    "API Endpoint": "API Endpoint",
-    "Your account password": "您账户的密码",
     "This web page is empty": "该网页是空的",
     "Invalid SSL certificate (original error: %q)": "无效的SSL证书 (原始错误: %q)",
     "This website is temporarily unreachable (original error: %q)": "该网站暂时不可达 (原始错误: %q)",

locale/translations_test.go

@@ -0,0 +1,66 @@
+// Copyright 2018 Frédéric Guillot. All rights reserved.
+// Use of this source code is governed by the Apache 2.0
+// license that can be found in the LICENSE file.
+
+package locale // import "miniflux.app/locale"
+
+import "testing"
+
+func TestAllLanguagesHaveCatalog(t *testing.T) {
+	for language := range AvailableLanguages() {
+		if _, found := translations[language]; !found {
+			t.Fatalf(`This language do not have a catalog: %s`, language)
+		}
+	}
+}
+
+func TestAllKeysHaveValue(t *testing.T) {
+	for language := range AvailableLanguages() {
+		messages, err := parseCatalogMessages(translations[language])
+		if err != nil {
+			t.Fatalf(`Parsing error language %s`, language)
+		}
+
+		if len(messages) == 0 {
+			t.Fatalf(`The language %q doesn't have any messages`, language)
+		}
+
+		for k, v := range messages {
+			switch value := v.(type) {
+			case string:
+				if value == "" {
+					t.Fatalf(`The key %q for the language %q have an empty string as value`, k, language)
+				}
+			case []string:
+				if len(value) == 0 {
+					t.Fatalf(`The key %q for the language %q have an empty list as value`, k, language)
+				}
+			}
+		}
+	}
+}
+
+func TestMissingTranslations(t *testing.T) {
+	refLang := "en_US"
+	references, err := parseCatalogMessages(translations[refLang])
+	if err != nil {
+		t.Fatal(`Unable to parse reference language`)
+	}
+
+	for language := range AvailableLanguages() {
+		if language == refLang {
+			continue
+		}
+
+		messages, err := parseCatalogMessages(translations[language])
+		if err != nil {
+			t.Fatalf(`Parsing error language %s`, language)
+		}
+
+		for key := range references {
+			if _, found := messages[key]; !found {
+				t.Fatalf(`Translation key %q not found in language %q`, key, language)
+			}
+		}
+	}
+}

locale/translator.go

@@ -4,28 +4,15 @@
 
 package locale // import "miniflux.app/locale"
 
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
 // Translator manage supported locales.
 type Translator struct {
-	locales Locales
+	locales catalog
 }
 
 // AddLanguage loads a new language into the system.
-func (t *Translator) AddLanguage(language, translations string) error {
-	var decodedTranslations Translation
-
-	decoder := json.NewDecoder(strings.NewReader(translations))
-	if err := decoder.Decode(&decodedTranslations); err != nil {
-		return fmt.Errorf("Invalid JSON file: %v", err)
-	}
-
-	t.locales[language] = decodedTranslations
-	return nil
+func (t *Translator) AddLanguage(language, data string) (err error) {
+	t.locales[language], err = parseCatalogMessages(data)
+	return err
 }
 
 // GetLanguage returns the given language handler.
@@ -40,5 +27,5 @@ func (t *Translator) GetLanguage(language string) *Language {
 
 // NewTranslator creates a new Translator.
 func NewTranslator() *Translator {
-	return &Translator{locales: make(Locales)}
+	return &Translator{locales: make(catalog)}
 }

reader/feed/parser.go

@@ -72,7 +72,7 @@ func parseFeed(r io.Reader) (*model.Feed, *errors.LocalizedError) {
 	var buffer bytes.Buffer
 	size, _ := io.Copy(&buffer, r)
 	if size == 0 {
-		return nil, errors.NewLocalizedError("This feed is empty")
+		return nil, errors.NewLocalizedError(errEmptyFeed)
 	}
 
 	str := stripInvalidXMLCharacters(buffer.String())

template/common.go

@@ -7,17 +7,17 @@ var templateCommonMap = map[string]string{
 <div class="pagination">
     <div class="pagination-prev">
         {{ if .prevEntry }}
-            <a href="{{ .prevEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .prevEntry.Title }}" data-page="previous">{{ t "Previous" }}</a>
+            <a href="{{ .prevEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .prevEntry.Title }}" data-page="previous">{{ t "pagination.previous" }}</a>
         {{ else }}
-            {{ t "Previous" }}
+            {{ t "pagination.previous" }}
         {{ end }}
     </div>
 
     <div class="pagination-next">
         {{ if .nextEntry }}
-            <a href="{{ .nextEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .nextEntry.Title }}" data-page="next">{{ t "Next" }}</a>
+            <a href="{{ .nextEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .nextEntry.Title }}" data-page="next">{{ t "pagination.next" }}</a>
         {{ else }}
-            {{ t "Next" }}
+            {{ t "pagination.next" }}
         {{ end }}
     </div>
 </div>
@@ -34,40 +34,40 @@ var templateCommonMap = map[string]string{
         {{ if .hasSaveEntry }}
             <li>
                 <a href="#"
-                    title="{{ t "Save this article" }}"
+                    title="{{ t "entry.save.title" }}"
                     data-save-entry="true"
                     data-save-url="{{ route "saveEntry" "entryID" .entry.ID }}"
-                    data-label-loading="{{ t "Saving..." }}"
-                    data-label-done="{{ t "Done!" }}"
-                    >{{ t "Save" }}</a>
+                    data-label-loading="{{ t "entry.state.saving" }}"
+                    data-label-done="{{ t "entry.save.completed" }}"
+                    >{{ t "entry.save.label" }}</a>
             </li>
         {{ end }}
         <li>
-            <a href="{{ .entry.URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "Original" }}</a>
+            <a href="{{ .entry.URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "entry.original.label" }}</a>
         </li>
         {{ if .entry.CommentsURL }}
             <li>
-                <a href="{{ .entry.CommentsURL }}" title="{{ t "View Comments" }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ t "Comments" }}</a>
+                <a href="{{ .entry.CommentsURL }}" title="{{ t "entry.comments.title" }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ t "entry.comments.label" }}</a>
             </li>
         {{ end }}
         <li>
             <a href="#"
                 data-toggle-bookmark="true"
                 data-bookmark-url="{{ route "toggleBookmark" "entryID" .entry.ID }}"
-                data-label-loading="{{ t "Saving..." }}"
-                data-label-star="☆&nbsp;{{ t "Star" }}"
-                data-label-unstar="★&nbsp;{{ t "Unstar" }}"
+                data-label-loading="{{ t "entry.state.saving" }}"
+                data-label-star="☆&nbsp;{{ t "entry.bookmark.toggle.on" }}"
+                data-label-unstar="★&nbsp;{{ t "entry.bookmark.toggle.off" }}"
                 data-value="{{ if .entry.Starred }}star{{ else }}unstar{{ end }}"
-                >{{ if .entry.Starred }}★&nbsp;{{ t "Unstar" }}{{ else }}☆&nbsp;{{ t "Star" }}{{ end }}</a>
+                >{{ if .entry.Starred }}★&nbsp;{{ t "entry.bookmark.toggle.off" }}{{ else }}☆&nbsp;{{ t "entry.bookmark.toggle.on" }}{{ end }}</a>
         </li>
         <li>
             <a href="#"
-                title="{{ t "Change entry status" }}"
+                title="{{ t "entry.status.title" }}"
                 data-toggle-status="true"
-                data-label-read="✔&#xfe0e;&nbsp;{{ t "Read" }}"
-                data-label-unread="✘&nbsp;{{ t "Unread" }}"
+                data-label-read="✔&#xfe0e;&nbsp;{{ t "entry.status.read" }}"
+                data-label-unread="✘&nbsp;{{ t "entry.status.unread" }}"
                 data-value="{{ if eq .entry.Status "read" }}read{{ else }}unread{{ end }}"
-                >{{ if eq .entry.Status "read" }}✘&nbsp;{{ t "Unread" }}{{ else }}✔&#xfe0e;&nbsp;{{ t "Read" }}{{ end }}</a>
+                >{{ if eq .entry.Status "read" }}✘&nbsp;{{ t "entry.status.unread" }}{{ else }}✔&#xfe0e;&nbsp;{{ t "entry.status.read" }}{{ end }}</a>
         </li>
     </ul>
 </div>
@@ -120,42 +120,42 @@ var templateCommonMap = map[string]string{
                 <a href="{{ route "unread" }}">Mini<span>flux</span></a>
             </div>
             <ul>
-                <li {{ if eq .menu "unread" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g u" }}">
-                    <a href="{{ route "unread" }}" data-page="unread">{{ t "Unread" }}
+                <li {{ if eq .menu "unread" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g u" }}">
+                    <a href="{{ route "unread" }}" data-page="unread">{{ t "menu.unread" }}
                       {{ if gt .countUnread 0 }}
                           <span class="unread-counter-wrapper">(<span class="unread-counter">{{ .countUnread }}</span>)</span>
                       {{ end }}
                     </a>
                 </li>
-                <li {{ if eq .menu "starred" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g b" }}">
-                    <a href="{{ route "starred" }}" data-page="starred">{{ t "Starred" }}</a>
+                <li {{ if eq .menu "starred" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g b" }}">
+                    <a href="{{ route "starred" }}" data-page="starred">{{ t "menu.starred" }}</a>
                 </li>
-                <li {{ if eq .menu "history" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g h" }}">
-                    <a href="{{ route "history" }}" data-page="history">{{ t "History" }}</a>
+                <li {{ if eq .menu "history" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g h" }}">
+                    <a href="{{ route "history" }}" data-page="history">{{ t "menu.history" }}</a>
                 </li>
-                <li {{ if eq .menu "feeds" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g f" }}">
-                    <a href="{{ route "feeds" }}" data-page="feeds">{{ t "Feeds" }}
+                <li {{ if eq .menu "feeds" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g f" }}">
+                    <a href="{{ route "feeds" }}" data-page="feeds">{{ t "menu.feeds" }}
                       {{ if gt .countErrorFeeds 0 }}
                           <span class="error-feeds-counter-wrapper">(<span class="error-feeds-counter">{{ .countErrorFeeds }}</span>)</span>
                       {{ end }}
                     </a>
                 </li>
-                <li {{ if eq .menu "categories" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g c" }}">
-                    <a href="{{ route "categories" }}" data-page="categories">{{ t "Categories" }}</a>
+                <li {{ if eq .menu "categories" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g c" }}">
+                    <a href="{{ route "categories" }}" data-page="categories">{{ t "menu.categories" }}</a>
                 </li>
-                <li {{ if eq .menu "settings" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g s" }}">
-                    <a href="{{ route "settings" }}" data-page="settings">{{ t "Settings" }}</a>
+                <li {{ if eq .menu "settings" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g s" }}">
+                    <a href="{{ route "settings" }}" data-page="settings">{{ t "menu.settings" }}</a>
                 </li>
                 <li>
-                    <a href="{{ route "logout" }}" title="{{ t "Logged as %s" .user.Username }}">{{ t "Logout" }}</a>
+                    <a href="{{ route "logout" }}" title="{{ t "tooltip.logged_user" .user.Username }}">{{ t "menu.logout" }}</a>
                 </li>
             </ul>
             <div class="search">
                 <div class="search-toggle-switch {{ if $.searchQuery }}has-search-query{{ end }}">
-                    <a href="#" data-action="search">&laquo;&nbsp;{{ t "Search" }}</a>
+                    <a href="#" data-action="search">&laquo;&nbsp;{{ t "search.label" }}</a>
                 </div>
                 <form action="{{ route "searchEntries" }}" class="search-form {{ if $.searchQuery }}has-search-query{{ end }}">
-                    <input type="search" name="q" id="search-input" placeholder="{{ t "Search..." }}" {{ if $.searchQuery }}value="{{ .searchQuery }}"{{ end }} required>
+                    <input type="search" name="q" id="search-input" placeholder="{{ t "search.placeholder" }}" {{ if $.searchQuery }}value="{{ .searchQuery }}"{{ end }} required>
                 </form>
             </div>
         </nav>
@@ -173,43 +173,43 @@ var templateCommonMap = map[string]string{
     <template id="keyboard-shortcuts">
         <div id="modal-left">
             <a href="#" class="btn-close-modal">x</a>
-            <h3>{{ t "Keyboard Shortcuts" }}</h3>
+            <h3>{{ t "page.keyboard_shortcuts.title" }}</h3>
 
             <div class="keyboard-shortcuts">
-                <p>{{ t "Sections Navigation" }}</p>
+                <p>{{ t "page.keyboard_shortcuts.subtitle.sections" }}</p>
                 <ul>
-                    <li>{{ t "Go to unread" }} = <strong>g + u</strong></li>
-                    <li>{{ t "Go to bookmarks" }} = <strong>g + b</strong></li>
-                    <li>{{ t "Go to history" }} = <strong>g + h</strong></li>
-                    <li>{{ t "Go to feeds" }} = <strong>g + f</strong></li>
-                    <li>{{ t "Go to categories" }} = <strong>g + c</strong></li>
-                    <li>{{ t "Go to settings" }} = <strong>g + s</strong></li>
-                    <li>{{ t "Show keyboard shortcuts" }} = <strong>?</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_unread" }} = <strong>g + u</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_starred" }} = <strong>g + b</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_history" }} = <strong>g + h</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_feeds" }} = <strong>g + f</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_categories" }} = <strong>g + c</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_settings" }} = <strong>g + s</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.show_keyboard_shortcuts" }} = <strong>?</strong></li>
                 </ul>
 
-                <p>{{ t "Items Navigation" }}</p>
+                <p>{{ t "page.keyboard_shortcuts.subtitle.items" }}</p>
                 <ul>
-                    <li>{{ t "Go to previous item" }} = <strong>p {{ t "or" }} j {{ t "or" }} ◄</strong></li>
-                    <li>{{ t "Go to next item" }} = <strong>n {{ t "or" }} k {{ t "or" }} ►</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_previous_item" }} = <strong>p</strong>, <strong>j</strong>, <strong>◄</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_next_item" }} = <strong>n</strong>, <strong>k</strong>, <strong>►</strong></li>
                 </ul>
 
-                <p>{{ t "Pages Navigation" }}</p>
+                <p>{{ t "page.keyboard_shortcuts.subtitle.pages" }}</p>
                 <ul>
-                    <li>{{ t "Go to previous page" }} = <strong>h</strong></li>
-                    <li>{{ t "Go to next page" }} = <strong>l</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_previous_page" }} = <strong>h</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_next_page" }} = <strong>l</strong></li>
                 </ul>
 
-                <p>{{ t "Actions" }}</p>
+                <p>{{ t "page.keyboard_shortcuts.subtitle.actions" }}</p>
                 <ul>
-                    <li>{{ t "Open selected item" }} = <strong>o</strong></li>
-                    <li>{{ t "Open original link" }} = <strong>v</strong></li>
-                    <li>{{ t "Toggle read/unread" }} = <strong>m</strong></li>
-                    <li>{{ t "Mark current page as read" }} = <strong>A</strong></li>
-                    <li>{{ t "Download original content" }} = <strong>d</strong></li>
-                    <li>{{ t "Toggle bookmark" }} = <strong>f</strong></li>
-                    <li>{{ t "Save article" }} = <strong>s</strong></li>
-                    <li>{{ t "Set focus on search form" }} = <strong>/</strong></li>
-                    <li>{{ t "Close modal dialog" }} = <strong>Esc</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.open_item" }} = <strong>o</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.open_original" }} = <strong>v</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.toggle_read_status" }} = <strong>m</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.mark_page_as_read" }} = <strong>A</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.download_content" }} = <strong>d</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.toggle_bookmark_status" }} = <strong>f</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.save_article" }} = <strong>s</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_search" }} = <strong>/</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.close_modal" }} = <strong>Esc</strong></li>
                 </ul>
             </div>
         </div>
@@ -222,17 +222,17 @@ var templateCommonMap = map[string]string{
 <div class="pagination">
     <div class="pagination-prev">
         {{ if .ShowPrev }}
-            <a href="{{ .Route }}{{ if gt .PrevOffset 0 }}?offset={{ .PrevOffset }}{{ if .SearchQuery }}&amp;q={{ .SearchQuery }}{{ end }}{{ else }}{{ if .SearchQuery }}?q={{ .SearchQuery }}{{ end }}{{ end }}" data-page="previous">{{ t "Previous" }}</a>
+            <a href="{{ .Route }}{{ if gt .PrevOffset 0 }}?offset={{ .PrevOffset }}{{ if .SearchQuery }}&amp;q={{ .SearchQuery }}{{ end }}{{ else }}{{ if .SearchQuery }}?q={{ .SearchQuery }}{{ end }}{{ end }}" data-page="previous">{{ t "pagination.previous" }}</a>
         {{ else }}
-            {{ t "Previous" }}
+            {{ t "pagination.previous" }}
         {{ end }}
     </div>
 
     <div class="pagination-next">
         {{ if .ShowNext }}
-            <a href="{{ .Route }}?offset={{ .NextOffset }}{{ if .SearchQuery }}&amp;q={{ .SearchQuery }}{{ end }}" data-page="next">{{ t "Next" }}</a>
+            <a href="{{ .Route }}?offset={{ .NextOffset }}{{ if .SearchQuery }}&amp;q={{ .SearchQuery }}{{ end }}" data-page="next">{{ t "pagination.next" }}</a>
         {{ else }}
-            {{ t "Next" }}
+            {{ t "pagination.next" }}
         {{ end }}
     </div>
 </div>
@@ -241,8 +241,8 @@ var templateCommonMap = map[string]string{
 }
 
 var templateCommonMapChecksums = map[string]string{
-	"entry_pagination": "756ef122f3ebc73754b5fc4304bf05e59da0ab4af030b2509ff4c9b4a74096ce",
-	"item_meta":        "d7459aa616b15095eadf382299a62e46c33b63ac214cbe15bab20156b7f9ed43",
-	"layout":           "2491695e33a496c9bd902a2cb5bc3a6a540f98ac7c24591d503a77ba0f5f0ebe",
-	"pagination":       "b592d58ea9d6abf2dc0b158621404cbfaeea5413b1c8b8b9818725963096b196",
+	"entry_pagination": "4faa91e2eae150c5e4eab4d258e039dfdd413bab7602f0009360e6d52898e353",
+	"item_meta":        "34deb081a054f2948ad808bdb2c8603d6ab00c58f2f50c4ead0b47ae092888eb",
+	"layout":           "d1795cedbbc0fc6ec7a5e31039e10b8361b7a74bcca74d860f127ac159036ab6",
+	"pagination":       "3386e90c6e1230311459e9a484629bc5d5bf39514a75ef2e73bbbc61142f7abb",
 }

template/elapsed.go

@@ -1,70 +0,0 @@
-// Copyright (c) 2017 Hervé Gouchet. All rights reserved.
-// Use of this source code is governed by the MIT License
-// that can be found in the LICENSE file.
-
-package template // import "miniflux.app/template"
-
-import (
-	"math"
-	"time"
-
-	"miniflux.app/locale"
-	"miniflux.app/timezone"
-)
-
-// Texts to be translated if necessary.
-var (
-	NotYet     = `not yet`
-	JustNow    = `just now`
-	LastMinute = `1 minute ago`
-	Minutes    = `%d minutes ago`
-	LastHour   = `1 hour ago`
-	Hours      = `%d hours ago`
-	Yesterday  = `yesterday`
-	Days       = `%d days ago`
-	Weeks      = `%d weeks ago`
-	Months     = `%d months ago`
-	Years      = `%d years ago`
-)
-
-// ElapsedTime returns in a human readable format the elapsed time
-// since the given datetime.
-func elapsedTime(language *locale.Language, tz string, t time.Time) string {
-	if t.IsZero() {
-		return language.Get(NotYet)
-	}
-
-	now := timezone.Now(tz)
-	t = timezone.Convert(tz, t)
-	if now.Before(t) {
-		return language.Get(NotYet)
-	}
-
-	diff := now.Sub(t)
-	// Duration in seconds
-	s := diff.Seconds()
-	// Duration in days
-	d := int(s / 86400)
-	switch {
-	case s < 60:
-		return language.Get(JustNow)
-	case s < 120:
-		return language.Get(LastMinute)
-	case s < 3600:
-		return language.Get(Minutes, int(diff.Minutes()))
-	case s < 7200:
-		return language.Get(LastHour)
-	case s < 86400:
-		return language.Get(Hours, int(diff.Hours()))
-	case d == 1:
-		return language.Get(Yesterday)
-	case d < 7:
-		return language.Get(Days, d)
-	case d < 31:
-		return language.Get(Weeks, int(math.Ceil(float64(d)/7)))
-	case d < 365:
-		return language.Get(Months, int(math.Ceil(float64(d)/30)))
-	default:
-		return language.Get(Years, int(math.Ceil(float64(d)/365)))
-	}
-}

template/elapsed_test.go

@@ -1,38 +0,0 @@
-// Copyright (c) 2017 Hervé Gouchet. All rights reserved.
-// Use of this source code is governed by the MIT License
-// that can be found in the LICENSE file.
-
-package template // import "miniflux.app/template"
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"miniflux.app/locale"
-)
-
-func TestElapsedTime(t *testing.T) {
-	var dt = []struct {
-		in  time.Time
-		out string
-	}{
-		{time.Time{}, NotYet},
-		{time.Now().Add(time.Hour), NotYet},
-		{time.Now(), JustNow},
-		{time.Now().Add(-time.Minute), LastMinute},
-		{time.Now().Add(-time.Minute * 40), fmt.Sprintf(Minutes, 40)},
-		{time.Now().Add(-time.Hour), LastHour},
-		{time.Now().Add(-time.Hour * 3), fmt.Sprintf(Hours, 3)},
-		{time.Now().Add(-time.Hour * 32), Yesterday},
-		{time.Now().Add(-time.Hour * 24 * 3), fmt.Sprintf(Days, 3)},
-		{time.Now().Add(-time.Hour * 24 * 14), fmt.Sprintf(Weeks, 2)},
-		{time.Now().Add(-time.Hour * 24 * 60), fmt.Sprintf(Months, 2)},
-		{time.Now().Add(-time.Hour * 24 * 365 * 3), fmt.Sprintf(Years, 3)},
-	}
-	for i, tt := range dt {
-		if out := elapsedTime(&locale.Language{}, "Local", tt.in); out != tt.out {
-			t.Errorf(`%d. content mismatch for "%v": expected=%q got=%q`, i, tt.in, tt.out, out)
-		}
-	}
-}

template/functions.go

@@ -6,6 +6,7 @@ package template // import "miniflux.app/template"
 
 import (
 	"fmt"
+	"math"
 	"html/template"
 	"net/mail"
 	"strings"
@@ -15,7 +16,9 @@ import (
 	"miniflux.app/config"
 	"miniflux.app/filter"
 	"miniflux.app/http/route"
+	"miniflux.app/locale"
 	"miniflux.app/model"
+	"miniflux.app/timezone"
 	"miniflux.app/url"
 )
 
@@ -130,4 +133,45 @@ func isEmail(str string) bool {
 		return false
 	}
 	return true
-}
+}
+
+func elapsedTime(language *locale.Language, tz string, t time.Time) string {
+	if t.IsZero() {
+		return language.Get("time_elapsed.not_yet")
+	}
+
+	now := timezone.Now(tz)
+	t = timezone.Convert(tz, t)
+	if now.Before(t) {
+		return language.Get("time_elapsed.not_yet")
+	}
+
+	diff := now.Sub(t)
+	// Duration in seconds
+	s := diff.Seconds()
+	// Duration in days
+	d := int(s / 86400)
+	switch {
+	case s < 60:
+		return language.Get("time_elapsed.now")
+	case s < 3600:
+		minutes := int(diff.Minutes())
+		return language.Plural("time_elapsed.minutes", minutes, minutes)
+	case s < 86400:
+		hours := int(diff.Hours())
+		return language.Plural("time_elapsed.hours", hours, hours)
+	case d == 1:
+		return language.Get("time_elapsed.yesterday")
+	case d < 7:
+		return language.Plural("time_elapsed.days", d, d)
+	case d < 31:
+		weeks := int(math.Ceil(float64(d) / 7))
+		return language.Plural("time_elapsed.weeks", weeks, weeks)
+	case d < 365:
+		months := int(math.Ceil(float64(d) / 30))
+		return language.Plural("time_elapsed.months", months, months)
+	default:
+		years := int(math.Ceil(float64(d) / 365))
+		return language.Plural("time_elapsed.years", years, years)
+	}
+}

template/functions_test.go

@@ -6,6 +6,9 @@ package template // import "miniflux.app/template"
 
 import (
 	"testing"
+	"time"
+
+	"miniflux.app/locale"
 )
 
 func TestDict(t *testing.T) {
@@ -92,3 +95,31 @@ func TestIsEmail(t *testing.T) {
 		t.Fatal(`This email is not valid and should returns false`)
 	}
 }
+
+func TestElapsedTime(t *testing.T) {
+	translator := locale.Load()
+	language := translator.GetLanguage("fr_FR")
+
+	var dt = []struct {
+		in  time.Time
+		out string
+	}{
+		{time.Time{}, language.Get("time_elapsed.not_yet")},
+		{time.Now().Add(time.Hour), language.Get("time_elapsed.not_yet")},
+		{time.Now(), language.Get("time_elapsed.now")},
+		{time.Now().Add(-time.Minute), language.Plural("time_elapsed.minutes", 1, 1)},
+		{time.Now().Add(-time.Minute * 40), language.Plural("time_elapsed.minutes", 40, 40)},
+		{time.Now().Add(-time.Hour), language.Plural("time_elapsed.hours", 1, 1)},
+		{time.Now().Add(-time.Hour * 3), language.Plural("time_elapsed.hours", 3, 3)},
+		{time.Now().Add(-time.Hour * 32), language.Get("time_elapsed.yesterday")},
+		{time.Now().Add(-time.Hour * 24 * 3), language.Plural("time_elapsed.days", 3, 3)},
+		{time.Now().Add(-time.Hour * 24 * 14), language.Plural("time_elapsed.weeks", 2, 2)},
+		{time.Now().Add(-time.Hour * 24 * 60), language.Plural("time_elapsed.months", 2, 2)},
+		{time.Now().Add(-time.Hour * 24 * 365 * 3), language.Plural("time_elapsed.years", 3, 3)},
+	}
+	for i, tt := range dt {
+		if out := elapsedTime(language, "Local", tt.in); out != tt.out {
+			t.Errorf(`%d. content mismatch for "%v": expected=%q got=%q`, i, tt.in, tt.out, out)
+		}
+	}
+}

template/html/about.html

@@ -1,39 +1,39 @@
-{{ define "title"}}{{ t "About" }}{{ end }}
+{{ define "title"}}{{ t "page.about.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "About" }}</h1>
+    <h1>{{ t "page.about.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "settings" }}">{{ t "Settings" }}</a>
+            <a href="{{ route "settings" }}">{{ t "menu.preferences" }}</a>
         </li>
         <li>
-            <a href="{{ route "integrations" }}">{{ t "Integrations" }}</a>
+            <a href="{{ route "integrations" }}">{{ t "menu.integrations" }}</a>
         </li>
         <li>
-            <a href="{{ route "sessions" }}">{{ t "Sessions" }}</a>
+            <a href="{{ route "sessions" }}">{{ t "menu.sessions" }}</a>
         </li>
         {{ if .user.IsAdmin }}
         <li>
-            <a href="{{ route "users" }}">{{ t "Users" }}</a>
+            <a href="{{ route "users" }}">{{ t "menu.users" }}</a>
         </li>
         {{ end }}
     </ul>
 </section>
 
 <div class="panel">
-    <h3>{{ t "Version" }}</h3>
+    <h3>Miniflux</h3>
     <ul>
-        <li><strong>{{ t "Version:" }}</strong> {{ .version }}</li>
-        <li><strong>{{ t "Build Date:" }}</strong> {{ .build_date }}</li>
+        <li><strong>{{ t "page.about.version" }}</strong> {{ .version }}</li>
+        <li><strong>{{ t "page.about.build_date" }}</strong> {{ .build_date }}</li>
     </ul>
 </div>
 
 <div class="panel">
-    <h3>{{ t "Authors" }}</h3>
+    <h3>{{ t "page.about.credits" }}</h3>
     <ul>
-        <li><strong>{{ t "Author:" }}</strong> Frédéric Guillot</li>
-        <li><strong>{{ t "License:" }}</strong> Apache 2.0</li>
+        <li><strong>{{ t "page.about.author" }}</strong> Frédéric Guillot</li>
+        <li><strong>{{ t "page.about.license" }}</strong> Apache 2.0</li>
     </ul>
 </div>
 

template/html/add_subscription.html

@@ -1,23 +1,23 @@
-{{ define "title"}}{{ t "New Subscription" }}{{ end }}
+{{ define "title"}}{{ t "page.add_feed.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "New Subscription" }}</h1>
+    <h1>{{ t "page.add_feed.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "feeds" }}">{{ t "Feeds" }}</a>
+            <a href="{{ route "feeds" }}">{{ t "menu.feeds" }}</a>
         </li>
         <li>
-            <a href="{{ route "export" }}">{{ t "Export" }}</a>
+            <a href="{{ route "export" }}">{{ t "menu.export" }}</a>
         </li>
         <li>
-            <a href="{{ route "import" }}">{{ t "Import" }}</a>
+            <a href="{{ route "import" }}">{{ t "menu.import" }}</a>
         </li>
     </ul>
 </section>
 
 {{ if not .categories }}
-    <p class="alert alert-error">{{ t "There is no category. You must have at least one category." }}</p>
+    <p class="alert alert-error">{{ t "page.add_feed.no_category" }}</p>
 {{ else }}
     <form action="{{ route "submitSubscription" }}" method="post" autocomplete="off">
         <input type="hidden" name="csrf" value="{{ .csrf }}">
@@ -26,10 +26,10 @@
             <div class="alert alert-error">{{ t .errorMessage }}</div>
         {{ end }}
 
-        <label for="form-url">{{ t "URL" }}</label>
+        <label for="form-url">{{ t "page.add_feed.label.url" }}</label>
         <input type="url" name="url" id="form-url" placeholder="https://domain.tld/" value="{{ .form.URL }}" required autofocus>
 
-        <label for="form-category">{{ t "Category" }}</label>
+        <label for="form-category">{{ t "form.feed.label.category" }}</label>
         <select id="form-category" name="category_id">
             {{ range .categories }}
                 <option value="{{ .ID }}">{{ .Title }}</option>
@@ -37,17 +37,17 @@
         </select>
 
         <fieldset>
-            <legend>{{ t "Advanced Options" }}</legend>
+            <legend>{{ t "page.add_feed.legend.advanced_options" }}</legend>
 
-            <label><input type="checkbox" name="crawler" value="1" {{ if .form.Crawler }}checked{{ end }}> {{ t "Fetch original content" }}</label>
+            <label><input type="checkbox" name="crawler" value="1" {{ if .form.Crawler }}checked{{ end }}> {{ t "form.feed.label.crawler" }}</label>
 
-	        <label for="form-user-agent">{{ t "User-Agent" }}</label>
-	        <input type="text" name="user_agent" id="form-user-agent" placeholder="{{ .defaultUserAgent }}" value="{{ .form.UserAgent }}">
+            <label for="form-user-agent">{{ t "form.feed.label.user_agent" }}</label>
+            <input type="text" name="user_agent" id="form-user-agent" placeholder="{{ .defaultUserAgent }}" value="{{ .form.UserAgent }}" autocomplete="off">
 
-            <label for="form-feed-username">{{ t "Feed Username" }}</label>
+            <label for="form-feed-username">{{ t "form.feed.label.feed_username" }}</label>
             <input type="text" name="feed_username" id="form-feed-username" value="{{ .form.Username }}">
 
-            <label for="form-feed-password">{{ t "Feed Password" }}</label>
+            <label for="form-feed-password">{{ t "form.feed.label.feed_password" }}</label>
             <!--
                 We are using the type "text" otherwise Firefox always autocomplete this password:
 
@@ -59,7 +59,7 @@
         </fieldset>
 
         <div class="buttons">
-            <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Find a subscription" }}</button>
+            <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.loading" }}">{{ t "page.add_feed.submit" }}</button>
         </div>
     </form>
 {{ end }}

template/html/bookmark_entries.html

@@ -1,12 +1,12 @@
-{{ define "title"}}{{ t "Favorites" }} ({{ .total }}){{ end }}
+{{ define "title"}}{{ t "page.starred.title" }} ({{ .total }}){{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Favorites" }} ({{ .total }})</h1>
+    <h1>{{ t "page.starred.title" }} ({{ .total }})</h1>
 </section>
 
 {{ if not .entries }}
-    <p class="alert alert-info">{{ t "There is no bookmark at the moment." }}</p>
+    <p class="alert alert-info">{{ t "alert.no_bookmark" }}</p>
 {{ else }}
     <div class="items">
         {{ range .entries }}

template/html/categories.html

@@ -1,17 +1,17 @@
-{{ define "title"}}{{ t "Categories" }} ({{ .total }}){{ end }}
+{{ define "title"}}{{ t "page.categories.title" }} ({{ .total }}){{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Categories" }} ({{ .total }})</h1>
+    <h1>{{ t "page.categories.title" }} ({{ .total }})</h1>
     <ul>
         <li>
-            <a href="{{ route "createCategory" }}">{{ t "Create a category" }}</a>
+            <a href="{{ route "createCategory" }}">{{ t "menu.create_category" }}</a>
         </li>
     </ul>
 </section>
 
 {{ if not .categories }}
-    <p class="alert alert-error">{{ t "There is no category." }}</p>
+    <p class="alert alert-error">{{ t "page.categories.no_category" }}</p>
 {{ else }}
     <div class="items">
         {{ range .categories }}
@@ -27,7 +27,7 @@
                         {{ if eq .FeedCount 0 }}
                             {{ t "No feed." }}
                         {{ else }}
-                            {{ plural "plural.categories.feed_count" .FeedCount .FeedCount }}
+                            {{ plural "page.categories.feed_count" .FeedCount .FeedCount }}
                         {{ end }}
                     </li>
                 </ul>
@@ -39,11 +39,11 @@
                     <li>
                         <a href="#"
                             data-confirm="true"
-                            data-label-question="{{ t "Are you sure?" }}"
-                            data-label-yes="{{ t "yes" }}"
-                            data-label-no="{{ t "no" }}"
-                            data-label-loading="{{ t "Work in progress..." }}"
-                            data-url="{{ route "removeCategory" "categoryID" .ID }}">{{ t "Remove" }}</a>
+                            data-label-question="{{ t "confirm.question" }}"
+                            data-label-yes="{{ t "confirm.yes" }}"
+                            data-label-no="{{ t "confirm.no" }}"
+                            data-label-loading="{{ t "confirm.loading" }}"
+                            data-url="{{ route "removeCategory" "categoryID" .ID }}">{{ t "action.remove" }}</a>
                     </li>
                     {{ end }}
                 </ul>

template/html/category_entries.html

@@ -6,14 +6,14 @@
     {{ if .entries }}
     <ul>
         <li>
-            <a href="#" data-on-click="markPageAsRead">{{ t "Mark this page as read" }}</a>
+            <a href="#" data-on-click="markPageAsRead">{{ t "menu.mark_page_as_read" }}</a>
         </li>
     </ul>
     {{ end }}
 </section>
 
 {{ if not .entries }}
-    <p class="alert">{{ t "There is no article in this category." }}</p>
+    <p class="alert">{{ t "alert.no_category" }}</p>
 {{ else }}
     <div class="items">
         {{ range .entries }}
@@ -35,7 +35,7 @@
         {{ if .entries }}
         <ul>
             <li>
-                <a href="#" data-on-click="markPageAsRead">{{ t "Mark this page as read" }}</a>
+                <a href="#" data-on-click="markPageAsRead">{{ t "menu.mark_page_as_read" }}</a>
             </li>
         </ul>
         {{ end }}

template/html/choose_subscription.html

@@ -1,17 +1,17 @@
-{{ define "title"}}{{ t "Choose a Subscription" }}{{ end }}
+{{ define "title"}}{{ t "page.add_feed.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "New Subscription" }}</h1>
+    <h1>{{ t "page.add_feed.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "feeds" }}">{{ t "Feeds" }}</a>
+            <a href="{{ route "feeds" }}">{{ t "menu.feeds" }}</a>
         </li>
         <li>
-            <a href="{{ route "export" }}">{{ t "Export" }}</a>
+            <a href="{{ route "export" }}">{{ t "menu.export" }}</a>
         </li>
         <li>
-            <a href="{{ route "import" }}">{{ t "Import" }}</a>
+            <a href="{{ route "import" }}">{{ t "menu.import" }}</a>
         </li>
     </ul>
 </section>
@@ -26,7 +26,7 @@
         <input type="hidden" name="crawler" value="1">
     {{ end }}
 
-    <h3>{{ t "Choose a Subscription" }}</h3>
+    <h3>{{ t "page.add_feed.choose_feed" }}</h3>
 
     {{ range .subscriptions }}
         <div class="radio-group">
@@ -36,7 +36,7 @@
     {{ end }}
 
     <div class="buttons">
-        <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Subscribe" }}</button>
+        <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.loading" }}">{{ t "action.subscribe" }}</button>
     </div>
 </form>
 {{ end }}

template/html/common/entry_pagination.html

@@ -2,17 +2,17 @@
 <div class="pagination">
     <div class="pagination-prev">
         {{ if .prevEntry }}
-            <a href="{{ .prevEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .prevEntry.Title }}" data-page="previous">{{ t "Previous" }}</a>
+            <a href="{{ .prevEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .prevEntry.Title }}" data-page="previous">{{ t "pagination.previous" }}</a>
         {{ else }}
-            {{ t "Previous" }}
+            {{ t "pagination.previous" }}
         {{ end }}
     </div>
 
     <div class="pagination-next">
         {{ if .nextEntry }}
-            <a href="{{ .nextEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .nextEntry.Title }}" data-page="next">{{ t "Next" }}</a>
+            <a href="{{ .nextEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .nextEntry.Title }}" data-page="next">{{ t "pagination.next" }}</a>
         {{ else }}
-            {{ t "Next" }}
+            {{ t "pagination.next" }}
         {{ end }}
     </div>
 </div>

template/html/common/item_meta.html

@@ -10,40 +10,40 @@
         {{ if .hasSaveEntry }}
             <li>
                 <a href="#"
-                    title="{{ t "Save this article" }}"
+                    title="{{ t "entry.save.title" }}"
                     data-save-entry="true"
                     data-save-url="{{ route "saveEntry" "entryID" .entry.ID }}"
-                    data-label-loading="{{ t "Saving..." }}"
-                    data-label-done="{{ t "Done!" }}"
-                    >{{ t "Save" }}</a>
+                    data-label-loading="{{ t "entry.state.saving" }}"
+                    data-label-done="{{ t "entry.save.completed" }}"
+                    >{{ t "entry.save.label" }}</a>
             </li>
         {{ end }}
         <li>
-            <a href="{{ .entry.URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "Original" }}</a>
+            <a href="{{ .entry.URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "entry.original.label" }}</a>
         </li>
         {{ if .entry.CommentsURL }}
             <li>
-                <a href="{{ .entry.CommentsURL }}" title="{{ t "View Comments" }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ t "Comments" }}</a>
+                <a href="{{ .entry.CommentsURL }}" title="{{ t "entry.comments.title" }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ t "entry.comments.label" }}</a>
             </li>
         {{ end }}
         <li>
             <a href="#"
                 data-toggle-bookmark="true"
                 data-bookmark-url="{{ route "toggleBookmark" "entryID" .entry.ID }}"
-                data-label-loading="{{ t "Saving..." }}"
-                data-label-star="☆&nbsp;{{ t "Star" }}"
-                data-label-unstar="★&nbsp;{{ t "Unstar" }}"
+                data-label-loading="{{ t "entry.state.saving" }}"
+                data-label-star="☆&nbsp;{{ t "entry.bookmark.toggle.on" }}"
+                data-label-unstar="★&nbsp;{{ t "entry.bookmark.toggle.off" }}"
                 data-value="{{ if .entry.Starred }}star{{ else }}unstar{{ end }}"
-                >{{ if .entry.Starred }}★&nbsp;{{ t "Unstar" }}{{ else }}☆&nbsp;{{ t "Star" }}{{ end }}</a>
+                >{{ if .entry.Starred }}★&nbsp;{{ t "entry.bookmark.toggle.off" }}{{ else }}☆&nbsp;{{ t "entry.bookmark.toggle.on" }}{{ end }}</a>
         </li>
         <li>
             <a href="#"
-                title="{{ t "Change entry status" }}"
+                title="{{ t "entry.status.title" }}"
                 data-toggle-status="true"
-                data-label-read="✔&#xfe0e;&nbsp;{{ t "Read" }}"
-                data-label-unread="✘&nbsp;{{ t "Unread" }}"
+                data-label-read="✔&#xfe0e;&nbsp;{{ t "entry.status.read" }}"
+                data-label-unread="✘&nbsp;{{ t "entry.status.unread" }}"
                 data-value="{{ if eq .entry.Status "read" }}read{{ else }}unread{{ end }}"
-                >{{ if eq .entry.Status "read" }}✘&nbsp;{{ t "Unread" }}{{ else }}✔&#xfe0e;&nbsp;{{ t "Read" }}{{ end }}</a>
+                >{{ if eq .entry.Status "read" }}✘&nbsp;{{ t "entry.status.unread" }}{{ else }}✔&#xfe0e;&nbsp;{{ t "entry.status.read" }}{{ end }}</a>
         </li>
     </ul>
 </div>

template/html/common/layout.html

@@ -46,42 +46,42 @@
                 <a href="{{ route "unread" }}">Mini<span>flux</span></a>
             </div>
             <ul>
-                <li {{ if eq .menu "unread" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g u" }}">
-                    <a href="{{ route "unread" }}" data-page="unread">{{ t "Unread" }}
+                <li {{ if eq .menu "unread" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g u" }}">
+                    <a href="{{ route "unread" }}" data-page="unread">{{ t "menu.unread" }}
                       {{ if gt .countUnread 0 }}
                           <span class="unread-counter-wrapper">(<span class="unread-counter">{{ .countUnread }}</span>)</span>
                       {{ end }}
                     </a>
                 </li>
-                <li {{ if eq .menu "starred" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g b" }}">
-                    <a href="{{ route "starred" }}" data-page="starred">{{ t "Starred" }}</a>
+                <li {{ if eq .menu "starred" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g b" }}">
+                    <a href="{{ route "starred" }}" data-page="starred">{{ t "menu.starred" }}</a>
                 </li>
-                <li {{ if eq .menu "history" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g h" }}">
-                    <a href="{{ route "history" }}" data-page="history">{{ t "History" }}</a>
+                <li {{ if eq .menu "history" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g h" }}">
+                    <a href="{{ route "history" }}" data-page="history">{{ t "menu.history" }}</a>
                 </li>
-                <li {{ if eq .menu "feeds" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g f" }}">
-                    <a href="{{ route "feeds" }}" data-page="feeds">{{ t "Feeds" }}
+                <li {{ if eq .menu "feeds" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g f" }}">
+                    <a href="{{ route "feeds" }}" data-page="feeds">{{ t "menu.feeds" }}
                       {{ if gt .countErrorFeeds 0 }}
                           <span class="error-feeds-counter-wrapper">(<span class="error-feeds-counter">{{ .countErrorFeeds }}</span>)</span>
                       {{ end }}
                     </a>
                 </li>
-                <li {{ if eq .menu "categories" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g c" }}">
-                    <a href="{{ route "categories" }}" data-page="categories">{{ t "Categories" }}</a>
+                <li {{ if eq .menu "categories" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g c" }}">
+                    <a href="{{ route "categories" }}" data-page="categories">{{ t "menu.categories" }}</a>
                 </li>
-                <li {{ if eq .menu "settings" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g s" }}">
-                    <a href="{{ route "settings" }}" data-page="settings">{{ t "Settings" }}</a>
+                <li {{ if eq .menu "settings" }}class="active"{{ end }} title="{{ t "tooltip.keyboard_shortcuts" "g s" }}">
+                    <a href="{{ route "settings" }}" data-page="settings">{{ t "menu.settings" }}</a>
                 </li>
                 <li>
-                    <a href="{{ route "logout" }}" title="{{ t "Logged as %s" .user.Username }}">{{ t "Logout" }}</a>
+                    <a href="{{ route "logout" }}" title="{{ t "tooltip.logged_user" .user.Username }}">{{ t "menu.logout" }}</a>
                 </li>
             </ul>
             <div class="search">
                 <div class="search-toggle-switch {{ if $.searchQuery }}has-search-query{{ end }}">
-                    <a href="#" data-action="search">&laquo;&nbsp;{{ t "Search" }}</a>
+                    <a href="#" data-action="search">&laquo;&nbsp;{{ t "search.label" }}</a>
                 </div>
                 <form action="{{ route "searchEntries" }}" class="search-form {{ if $.searchQuery }}has-search-query{{ end }}">
-                    <input type="search" name="q" id="search-input" placeholder="{{ t "Search..." }}" {{ if $.searchQuery }}value="{{ .searchQuery }}"{{ end }} required>
+                    <input type="search" name="q" id="search-input" placeholder="{{ t "search.placeholder" }}" {{ if $.searchQuery }}value="{{ .searchQuery }}"{{ end }} required>
                 </form>
             </div>
         </nav>
@@ -99,43 +99,43 @@
     <template id="keyboard-shortcuts">
         <div id="modal-left">
             <a href="#" class="btn-close-modal">x</a>
-            <h3>{{ t "Keyboard Shortcuts" }}</h3>
+            <h3>{{ t "page.keyboard_shortcuts.title" }}</h3>
 
             <div class="keyboard-shortcuts">
-                <p>{{ t "Sections Navigation" }}</p>
+                <p>{{ t "page.keyboard_shortcuts.subtitle.sections" }}</p>
                 <ul>
-                    <li>{{ t "Go to unread" }} = <strong>g + u</strong></li>
-                    <li>{{ t "Go to bookmarks" }} = <strong>g + b</strong></li>
-                    <li>{{ t "Go to history" }} = <strong>g + h</strong></li>
-                    <li>{{ t "Go to feeds" }} = <strong>g + f</strong></li>
-                    <li>{{ t "Go to categories" }} = <strong>g + c</strong></li>
-                    <li>{{ t "Go to settings" }} = <strong>g + s</strong></li>
-                    <li>{{ t "Show keyboard shortcuts" }} = <strong>?</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_unread" }} = <strong>g + u</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_starred" }} = <strong>g + b</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_history" }} = <strong>g + h</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_feeds" }} = <strong>g + f</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_categories" }} = <strong>g + c</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_settings" }} = <strong>g + s</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.show_keyboard_shortcuts" }} = <strong>?</strong></li>
                 </ul>
 
-                <p>{{ t "Items Navigation" }}</p>
+                <p>{{ t "page.keyboard_shortcuts.subtitle.items" }}</p>
                 <ul>
-                    <li>{{ t "Go to previous item" }} = <strong>p {{ t "or" }} j {{ t "or" }} ◄</strong></li>
-                    <li>{{ t "Go to next item" }} = <strong>n {{ t "or" }} k {{ t "or" }} ►</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_previous_item" }} = <strong>p</strong>, <strong>j</strong>, <strong>◄</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_next_item" }} = <strong>n</strong>, <strong>k</strong>, <strong>►</strong></li>
                 </ul>
 
-                <p>{{ t "Pages Navigation" }}</p>
+                <p>{{ t "page.keyboard_shortcuts.subtitle.pages" }}</p>
                 <ul>
-                    <li>{{ t "Go to previous page" }} = <strong>h</strong></li>
-                    <li>{{ t "Go to next page" }} = <strong>l</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_previous_page" }} = <strong>h</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_next_page" }} = <strong>l</strong></li>
                 </ul>
 
-                <p>{{ t "Actions" }}</p>
+                <p>{{ t "page.keyboard_shortcuts.subtitle.actions" }}</p>
                 <ul>
-                    <li>{{ t "Open selected item" }} = <strong>o</strong></li>
-                    <li>{{ t "Open original link" }} = <strong>v</strong></li>
-                    <li>{{ t "Toggle read/unread" }} = <strong>m</strong></li>
-                    <li>{{ t "Mark current page as read" }} = <strong>A</strong></li>
-                    <li>{{ t "Download original content" }} = <strong>d</strong></li>
-                    <li>{{ t "Toggle bookmark" }} = <strong>f</strong></li>
-                    <li>{{ t "Save article" }} = <strong>s</strong></li>
-                    <li>{{ t "Set focus on search form" }} = <strong>/</strong></li>
-                    <li>{{ t "Close modal dialog" }} = <strong>Esc</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.open_item" }} = <strong>o</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.open_original" }} = <strong>v</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.toggle_read_status" }} = <strong>m</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.mark_page_as_read" }} = <strong>A</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.download_content" }} = <strong>d</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.toggle_bookmark_status" }} = <strong>f</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.save_article" }} = <strong>s</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.go_to_search" }} = <strong>/</strong></li>
+                    <li>{{ t "page.keyboard_shortcuts.close_modal" }} = <strong>Esc</strong></li>
                 </ul>
             </div>
         </div>

template/html/common/pagination.html

@@ -2,17 +2,17 @@
 <div class="pagination">
     <div class="pagination-prev">
         {{ if .ShowPrev }}
-            <a href="{{ .Route }}{{ if gt .PrevOffset 0 }}?offset={{ .PrevOffset }}{{ if .SearchQuery }}&amp;q={{ .SearchQuery }}{{ end }}{{ else }}{{ if .SearchQuery }}?q={{ .SearchQuery }}{{ end }}{{ end }}" data-page="previous">{{ t "Previous" }}</a>
+            <a href="{{ .Route }}{{ if gt .PrevOffset 0 }}?offset={{ .PrevOffset }}{{ if .SearchQuery }}&amp;q={{ .SearchQuery }}{{ end }}{{ else }}{{ if .SearchQuery }}?q={{ .SearchQuery }}{{ end }}{{ end }}" data-page="previous">{{ t "pagination.previous" }}</a>
         {{ else }}
-            {{ t "Previous" }}
+            {{ t "pagination.previous" }}
         {{ end }}
     </div>
 
     <div class="pagination-next">
         {{ if .ShowNext }}
-            <a href="{{ .Route }}?offset={{ .NextOffset }}{{ if .SearchQuery }}&amp;q={{ .SearchQuery }}{{ end }}" data-page="next">{{ t "Next" }}</a>
+            <a href="{{ .Route }}?offset={{ .NextOffset }}{{ if .SearchQuery }}&amp;q={{ .SearchQuery }}{{ end }}" data-page="next">{{ t "pagination.next" }}</a>
         {{ else }}
-            {{ t "Next" }}
+            {{ t "pagination.next" }}
         {{ end }}
     </div>
 </div>

template/html/create_category.html

@@ -1,11 +1,11 @@
-{{ define "title"}}{{ t "New Category" }}{{ end }}
+{{ define "title"}}{{ t "page.new_category.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "New Category" }}</h1>
+    <h1>{{ t "page.new_category.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "categories" }}">{{ t "Categories" }}</a>
+            <a href="{{ route "categories" }}">{{ t "menu.categories" }}</a>
         </li>
     </ul>
 </section>
@@ -17,11 +17,11 @@
         <div class="alert alert-error">{{ t .errorMessage }}</div>
     {{ end }}
 
-    <label for="form-title">{{ t "Title" }}</label>
+    <label for="form-title">{{ t "form.category.label.title" }}</label>
     <input type="text" name="title" id="form-title" value="{{ .form.Title }}" required autofocus>
 
     <div class="buttons">
-        <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Save" }}</button> {{ t "or" }} <a href="{{ route "categories" }}">{{ t "cancel" }}</a>
+        <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.save" }}</button> {{ t "action.or" }} <a href="{{ route "categories" }}">{{ t "action.cancel" }}</a>
     </div>
 </form>
 {{ end }}

template/html/create_user.html

@@ -1,23 +1,23 @@
-{{ define "title"}}{{ t "New User" }}{{ end }}
+{{ define "title"}}{{ t "page.new_user.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "New User" }}</h1>
+    <h1>{{ t "page.new_user.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "settings" }}">{{ t "Settings" }}</a>
+            <a href="{{ route "settings" }}">{{ t "menu.settings" }}</a>
         </li>
         <li>
-            <a href="{{ route "integrations" }}">{{ t "Integrations" }}</a>
+            <a href="{{ route "integrations" }}">{{ t "menu.integrations" }}</a>
         </li>
         <li>
-            <a href="{{ route "sessions" }}">{{ t "Sessions" }}</a>
+            <a href="{{ route "sessions" }}">{{ t "menu.sessions" }}</a>
         </li>
         <li>
-            <a href="{{ route "users" }}">{{ t "Users" }}</a>
+            <a href="{{ route "users" }}">{{ t "menu.users" }}</a>
         </li>
         <li>
-            <a href="{{ route "about" }}">{{ t "About" }}</a>
+            <a href="{{ route "about" }}">{{ t "menu.about" }}</a>
         </li>
     </ul>
 </section>
@@ -29,19 +29,19 @@
         <div class="alert alert-error">{{ t .errorMessage }}</div>
     {{ end }}
 
-    <label for="form-username">{{ t "Username" }}</label>
+    <label for="form-username">{{ t "form.user.label.username" }}</label>
     <input type="text" name="username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password" required autofocus>
 
-    <label for="form-password">{{ t "Password" }}</label>
+    <label for="form-password">{{ t "form.user.label.password" }}</label>
     <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password" required>
 
-    <label for="form-confirmation">{{ t "Confirmation" }}</label>
+    <label for="form-confirmation">{{ t "form.user.label.confirmation" }}</label>
     <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" required>
 
-    <label><input type="checkbox" name="is_admin" value="1" {{ if .form.IsAdmin }}checked{{ end }}> {{ t "Administrator" }}</label>
+    <label><input type="checkbox" name="is_admin" value="1" {{ if .form.IsAdmin }}checked{{ end }}> {{ t "form.user.label.admin" }}</label>
 
     <div class="buttons">
-        <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Save" }}</button> {{ t "or" }} <a href="{{ route "users" }}">{{ t "cancel" }}</a>
+        <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.save" }}</button> {{ t "action.or" }} <a href="{{ route "users" }}">{{ t "action.cancel" }}</a>
     </div>
 </form>
 {{ end }}

template/html/edit_category.html

@@ -1,14 +1,14 @@
-{{ define "title"}}{{ t "Edit Category: %s" .category.Title }}{{ end }}
+{{ define "title"}}{{ t "page.edit_category.title" .category.Title }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Edit Category: %s" .category.Title }}</h1>
+    <h1>{{ t "page.edit_category.title" .category.Title }}</h1>
     <ul>
         <li>
-            <a href="{{ route "categories" }}">{{ t "Categories" }}</a>
+            <a href="{{ route "categories" }}">{{ t "menu.categories" }}</a>
         </li>
         <li>
-            <a href="{{ route "createCategory" }}">{{ t "Create a category" }}</a>
+            <a href="{{ route "createCategory" }}">{{ t "menu.create_category" }}</a>
         </li>
     </ul>
 </section>
@@ -20,11 +20,11 @@
         <div class="alert alert-error">{{ t .errorMessage }}</div>
     {{ end }}
 
-    <label for="form-title">{{ t "Title" }}</label>
+    <label for="form-title">{{ t "form.category.label.title" }}</label>
     <input type="text" name="title" id="form-title" value="{{ .form.Title }}" required autofocus>
 
     <div class="buttons">
-        <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Update" }}</button> {{ t "or" }} <a href="{{ route "categories" }}">{{ t "cancel" }}</a>
+        <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.update" }}</button> {{ t "action.or" }} <a href="{{ route "categories" }}">{{ t "action.cancel" }}</a>
     </div>
 </form>
 {{ end }}

template/html/edit_feed.html

@@ -1,30 +1,30 @@
-{{ define "title"}}{{ t "Edit Feed: %s" .feed.Title }}{{ end }}
+{{ define "title"}}{{ t "page.edit_feed.title" .feed.Title }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
     <h1>{{ .feed.Title }}</h1>
     <ul>
         <li>
-            <a href="{{ route "feeds" }}">{{ t "Feeds" }}</a>
+            <a href="{{ route "feeds" }}">{{ t "menu.feeds" }}</a>
         </li>
         <li>
-            <a href="{{ route "addSubscription" }}">{{ t "Add subscription" }}</a>
+            <a href="{{ route "addSubscription" }}">{{ t "menu.add_feed" }}</a>
         </li>
         <li>
-            <a href="{{ route "export" }}">{{ t "Export" }}</a>
+            <a href="{{ route "export" }}">{{ t "menu.export" }}</a>
         </li>
         <li>
-            <a href="{{ route "import" }}">{{ t "Import" }}</a>
+            <a href="{{ route "import" }}">{{ t "menu.import" }}</a>
         </li>
     </ul>
 </section>
 
 {{ if not .categories }}
-    <p class="alert alert-error">{{ t "There is no category!" }}</p>
+    <p class="alert alert-error">{{ t "page.add_feed.no_category" }}</p>
 {{ else }}
     {{ if ne .feed.ParsingErrorCount 0 }}
     <div class="alert alert-error">
-        <h3>{{ t "Last Parsing Error" }}</h3>
+        <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
         <p>{{ t .feed.ParsingErrorMsg }}</p>
     </div>
     {{ end }}
@@ -36,19 +36,19 @@
             <div class="alert alert-error">{{ t .errorMessage }}</div>
         {{ end }}
 
-        <label for="form-title">{{ t "Title" }}</label>
+        <label for="form-title">{{ t "form.feed.label.title" }}</label>
         <input type="text" name="title" id="form-title" value="{{ .form.Title }}" required autofocus>
 
-        <label for="form-site-url">{{ t "Site URL" }}</label>
+        <label for="form-site-url">{{ t "form.feed.label.site_url" }}</label>
         <input type="url" name="site_url" id="form-site-url" placeholder="https://domain.tld/" value="{{ .form.SiteURL }}" required>
 
-        <label for="form-feed-url">{{ t "Feed URL" }}</label>
+        <label for="form-feed-url">{{ t "form.feed.label.feed_url" }}</label>
         <input type="url" name="feed_url" id="form-feed-url" placeholder="https://domain.tld/" value="{{ .form.FeedURL }}" required>
 
-        <label for="form-feed-username">{{ t "Feed Username" }}</label>
+        <label for="form-feed-username">{{ t "form.feed.label.feed_username" }}</label>
         <input type="text" name="feed_username" id="form-feed-username" value="{{ .form.Username }}">
 
-        <label for="form-feed-password">{{ t "Feed Password" }}</label>
+        <label for="form-feed-password">{{ t "form.feed.label.feed_password" }}</label>
         <!--
             We are using the type "text" otherwise Firefox always autocomplete this password:
 
@@ -58,46 +58,46 @@
         -->
         <input type="text" name="feed_password" id="form-feed-password" value="{{ .form.Password }}">
 
-	    <label for="form-user-agent">{{ t "User-Agent" }}</label>
+	    <label for="form-user-agent">{{ t "form.feed.label.user_agent" }}</label>
 	    <input type="text" name="user_agent" id="form-user-agent" placeholder="{{ .defaultUserAgent }}" value="{{ .form.UserAgent }}">
 
-        <label for="form-scraper-rules">{{ t "Scraper Rules" }}</label>
+        <label for="form-scraper-rules">{{ t "form.feed.label.scraper_rules" }}</label>
         <input type="text" name="scraper_rules" id="form-scraper-rules" value="{{ .form.ScraperRules }}">
 
-        <label for="form-rewrite-rules">{{ t "Rewrite Rules" }}</label>
+        <label for="form-rewrite-rules">{{ t "form.feed.label.rewrite_rules" }}</label>
         <input type="text" name="rewrite_rules" id="form-rewrite-rules" value="{{ .form.RewriteRules }}">
 
-        <label for="form-category">{{ t "Category" }}</label>
+        <label for="form-category">{{ t "form.feed.label.category" }}</label>
         <select id="form-category" name="category_id">
         {{ range .categories }}
             <option value="{{ .ID }}" {{ if eq .ID $.form.CategoryID }}selected="selected"{{ end }}>{{ .Title }}</option>
         {{ end }}
         </select>
 
-        <label><input type="checkbox" name="crawler" value="1" {{ if .form.Crawler }}checked{{ end }}> {{ t "Fetch original content" }}</label>
+        <label><input type="checkbox" name="crawler" value="1" {{ if .form.Crawler }}checked{{ end }}> {{ t "form.feed.label.crawler" }}</label>
 
         <div class="buttons">
-            <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Update" }}</button> {{ t "or" }} <a href="{{ route "feeds" }}">{{ t "cancel" }}</a>
+            <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.update" }}</button> {{ t "action.or" }} <a href="{{ route "feeds" }}">{{ t "action.cancel" }}</a>
         </div>
     </form>
 
     <div class="panel">
         <ul>
-            <li><strong>{{ t "Last checked:" }} </strong><time datetime="{{ isodate .feed.CheckedAt }}" title="{{ isodate .feed.CheckedAt }}">{{ elapsed $.user.Timezone .feed.CheckedAt }}</time></li>
-            <li><strong>{{ t "ETag header:" }} </strong>{{ if .feed.EtagHeader }}{{ .feed.EtagHeader }}{{ else }}{{ t "None" }}{{ end }}</li>
-            <li><strong>{{ t "LastModified header:" }} </strong>{{ if .feed.LastModifiedHeader }}{{ .feed.LastModifiedHeader }}{{ else }}{{ t "None" }}{{ end }}</li>
+            <li><strong>{{ t "page.edit_feed.last_check" }} </strong><time datetime="{{ isodate .feed.CheckedAt }}" title="{{ isodate .feed.CheckedAt }}">{{ elapsed $.user.Timezone .feed.CheckedAt }}</time></li>
+            <li><strong>{{ t "page.edit_feed.etag_header" }} </strong>{{ if .feed.EtagHeader }}{{ .feed.EtagHeader }}{{ else }}{{ t "page.edit_feed.no_header" }}{{ end }}</li>
+            <li><strong>{{ t "page.edit_feed.last_modified_header" }} </strong>{{ if .feed.LastModifiedHeader }}{{ .feed.LastModifiedHeader }}{{ else }}{{ t "page.edit_feed.no_header" }}{{ end }}</li>
         </ul>
     </div>
 
     <div class="alert alert-error">
         <a href="#"
             data-confirm="true"
-            data-label-question="{{ t "Are you sure?" }}"
-            data-label-yes="{{ t "yes" }}"
-            data-label-no="{{ t "no" }}"
-            data-label-loading="{{ t "Work in progress..." }}"
+            data-label-question="{{ t "confirm.question" }}"
+            data-label-yes="{{ t "confirm.yes" }}"
+            data-label-no="{{ t "confirm.no" }}"
+            data-label-loading="{{ t "confirm.loading" }}"
             data-url="{{ route "removeFeed" "feedID" .feed.ID }}"
-            data-redirect-url="{{ route "feeds" }}">{{ t "Remove this feed" }}</a>
+            data-redirect-url="{{ route "feeds" }}">{{ t "action.remove_feed" }}</a>
     </div>
 {{ end }}
 

template/html/edit_user.html

@@ -1,26 +1,26 @@
-{{ define "title"}}{{ t "Edit user: %s" .selected_user.Username }}{{ end }}
+{{ define "title"}}{{ t "page.edit_user.title" .selected_user.Username }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Edit user %s" .selected_user.Username }}</h1>
+    <h1>{{ t "page.edit_user.title" .selected_user.Username }}</h1>
     <ul>
         <li>
-            <a href="{{ route "settings" }}">{{ t "Settings" }}</a>
+            <a href="{{ route "settings" }}">{{ t "menu.settings" }}</a>
         </li>
         <li>
-            <a href="{{ route "integrations" }}">{{ t "Integrations" }}</a>
+            <a href="{{ route "integrations" }}">{{ t "menu.integrations" }}</a>
         </li>
         <li>
-            <a href="{{ route "sessions" }}">{{ t "Sessions" }}</a>
+            <a href="{{ route "sessions" }}">{{ t "menu.sessions" }}</a>
         </li>
         <li>
-            <a href="{{ route "users" }}">{{ t "Users" }}</a>
+            <a href="{{ route "users" }}">{{ t "menu.users" }}</a>
         </li>
         <li>
-            <a href="{{ route "createUser" }}">{{ t "Add user" }}</a>
+            <a href="{{ route "createUser" }}">{{ t "menu.add_user" }}</a>
         </li>
         <li>
-            <a href="{{ route "about" }}">{{ t "About" }}</a>
+            <a href="{{ route "about" }}">{{ t "menu.about" }}</a>
         </li>
     </ul>
 </section>
@@ -32,19 +32,19 @@
         <div class="alert alert-error">{{ t .errorMessage }}</div>
     {{ end }}
 
-    <label for="form-username">{{ t "Username" }}</label>
+    <label for="form-username">{{ t "form.user.label.username" }}</label>
     <input type="text" name="username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password" required autofocus>
 
-    <label for="form-password">{{ t "Password" }}</label>
+    <label for="form-password">{{ t "form.user.label.password" }}</label>
     <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
 
-    <label for="form-confirmation">{{ t "Confirmation" }}</label>
+    <label for="form-confirmation">{{ t "form.user.label.confirmation" }}</label>
     <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" autocomplete="new-password">
 
-    <label><input type="checkbox" name="is_admin" value="1" {{ if .form.IsAdmin }}checked{{ end }}> {{ t "Administrator" }}</label>
+    <label><input type="checkbox" name="is_admin" value="1" {{ if .form.IsAdmin }}checked{{ end }}> {{ t "form.user.label.admin" }}</label>
 
     <div class="buttons">
-        <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Update" }}</button> {{ t "or" }} <a href="{{ route "users" }}">{{ t "cancel" }}</a>
+        <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.update" }}</button> {{ t "action.or" }} <a href="{{ route "users" }}">{{ t "action.cancel" }}</a>
     </div>
 </form>
 {{ end }}

template/html/entry.html

@@ -10,46 +10,46 @@
             <ul>
                 <li>
                     <a href="#"
-                        title="{{ t "Change entry status" }}"
+                        title="{{ t "entry.status.title" }}"
                         data-toggle-status="true"
-                        data-label-read="✔&#xfe0e;&nbsp;{{ t "Read" }}"
-                        data-label-unread="✘&nbsp;{{ t "Unread" }}"
+                        data-label-read="✔&#xfe0e;&nbsp;{{ t "entry.status.read" }}"
+                        data-label-unread="✘&nbsp;{{ t "entry.status.unread" }}"
                         data-value="{{ if eq .entry.Status "read" }}read{{ else }}unread{{ end }}"
-                        >{{ if eq .entry.Status "read" }}✘&nbsp;{{ t "Unread" }}{{ else }}✔&#xfe0e;&nbsp;{{ t "Read" }}{{ end }}</a>
+                        >{{ if eq .entry.Status "read" }}✘&nbsp;{{ t "entry.status.unread" }}{{ else }}✔&#xfe0e;&nbsp;{{ t "entry.status.read" }}{{ end }}</a>
                 </li>
                 <li>
                     <a href="#"
                         data-toggle-bookmark="true"
                         data-bookmark-url="{{ route "toggleBookmark" "entryID" .entry.ID }}"
-                        data-label-loading="{{ t "Saving..." }}"
-                        data-label-star="☆&nbsp;{{ t "Star" }}"
-                        data-label-unstar="★&nbsp;{{ t "Unstar" }}"
+                        data-label-loading="{{ t "entry.state.saving" }}"
+                        data-label-star="☆&nbsp;{{ t "entry.bookmark.toggle.on" }}"
+                        data-label-unstar="★&nbsp;{{ t "entry.bookmark.toggle.off" }}"
                         data-value="{{ if .entry.Starred }}star{{ else }}unstar{{ end }}"
-                        >{{ if .entry.Starred }}★&nbsp;{{ t "Unstar" }}{{ else }}☆&nbsp;{{ t "Star" }}{{ end }}</a>
+                        >{{ if .entry.Starred }}★&nbsp;{{ t "entry.bookmark.toggle.off" }}{{ else }}☆&nbsp;{{ t "entry.bookmark.toggle.on" }}{{ end }}</a>
                 </li>
                 {{ if .hasSaveEntry }}
                     <li>
                         <a href="#"
-                            title="{{ t "Save this article" }}"
+                            title="{{ t "entry.save.title" }}"
                             data-save-entry="true"
                             data-save-url="{{ route "saveEntry" "entryID" .entry.ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-done="{{ t "Done!" }}"
-                            >{{ t "Save" }}</a>
+                            data-label-loading="{{ t "entry.state.saving" }}"
+                            data-label-done="{{ t "entry.save.completed" }}"
+                            >{{ t "entry.save.title" }}</a>
                     </li>
                 {{ end }}
                 <li>
                     <a href="#"
-                        title="{{ t "Fetch original content" }}"
+                        title="{{ t "entry.scraper.title" }}"
                         data-fetch-content-entry="true"
                         data-fetch-content-url="{{ route "fetchContent" "entryID" .entry.ID }}"
-                        data-label-loading="{{ t "Loading..." }}"
-                        data-label-done="{{ t "Done!" }}"
-                        >{{ t "Fetch original content" }}</a>
+                        data-label-loading="{{ t "entry.state.loading" }}"
+                        data-label-done="{{ t "entry.scraper.completed" }}"
+                        >{{ t "entry.scraper.label" }}</a>
                 </li>
                 {{ if .entry.CommentsURL }}
                     <li>
-                        <a href="{{ .entry.CommentsURL }}" title="{{ t "View Comments" }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ t "Comments" }}</a>
+                        <a href="{{ .entry.CommentsURL }}" title="{{ t "entry.comments.title" }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ t "entry.comments.label" }}</a>
                     </li>
                 {{ end }}
             </ul>
@@ -110,7 +110,7 @@
                 {{ end }}
 
                 <div class="entry-enclosure-download">
-                    <a href="{{ .URL }}" title="{{ .URL }} ({{ .MimeType }})" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ t "Download" }}</a>
+                    <a href="{{ .URL }}" title="{{ .URL }} ({{ .MimeType }})" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ t "action.download" }}</a>
                     <small>({{ .URL }})</small>
                 </div>
             </div>

template/html/feed_entries.html

@@ -6,25 +6,25 @@
     <ul>
         {{ if .entries }}
         <li>
-            <a href="#" data-on-click="markPageAsRead">{{ t "Mark this page as read" }}</a>
+            <a href="#" data-on-click="markPageAsRead">{{ t "menu.mark_page_as_read" }}</a>
         </li>
         {{ end }}
         <li>
-            <a href="{{ route "refreshFeed" "feedID" .feed.ID }}">{{ t "Refresh" }}</a>
+            <a href="{{ route "refreshFeed" "feedID" .feed.ID }}">{{ t "menu.refresh_feed" }}</a>
         </li>
         <li>
-            <a href="{{ route "editFeed" "feedID" .feed.ID }}">{{ t "Edit" }}</a>
+            <a href="{{ route "editFeed" "feedID" .feed.ID }}">{{ t "menu.edit_feed" }}</a>
         </li>
     </ul>
 </section>
 
 {{ if ne .feed.ParsingErrorCount 0 }}
 <div class="alert alert-error">
-    <h3>{{ t "There is a problem with this feed" }}</h3>
+    <h3>{{ t "alert.feed_error" }}</h3>
     <p>{{ t .feed.ParsingErrorMsg }}</p>
 </div>
 {{ else if not .entries }}
-    <p class="alert">{{ t "There is no article for this feed." }}</p>
+    <p class="alert">{{ t "alert.no_feed_entry" }}</p>
 {{ else }}
     <div class="items">
         {{ range .entries }}
@@ -46,7 +46,7 @@
         {{ if .entries }}
         <ul>
             <li>
-                <a href="#" data-on-click="markPageAsRead">{{ t "Mark this page as read" }}</a>
+                <a href="#" data-on-click="markPageAsRead">{{ t "menu.mark_page_as_read" }}</a>
             </li>
         </ul>
         {{ end }}

template/html/feeds.html

@@ -1,26 +1,26 @@
-{{ define "title"}}{{ t "Feeds" }} ({{ .total }}){{ end }}
+{{ define "title"}}{{ t "page.feeds.title" }} ({{ .total }}){{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Feeds" }} ({{ .total }})</h1>
+    <h1>{{ t "page.feeds.title" }} ({{ .total }})</h1>
     <ul>
         <li>
-            <a href="{{ route "addSubscription" }}">{{ t "Add subscription" }}</a>
+            <a href="{{ route "addSubscription" }}">{{ t "menu.add_feed" }}</a>
         </li>
         <li>
-            <a href="{{ route "export" }}">{{ t "Export" }}</a>
+            <a href="{{ route "export" }}">{{ t "menu.export" }}</a>
         </li>
         <li>
-            <a href="{{ route "import" }}">{{ t "Import" }}</a>
+            <a href="{{ route "import" }}">{{ t "menu.import" }}</a>
         </li>
         <li>
-            <a href="{{ route "refreshAllFeeds" }}">{{ t "Refresh all feeds in background" }}</a>
+            <a href="{{ route "refreshAllFeeds" }}">{{ t "menu.refresh_all_feeds" }}</a>
         </li>
     </ul>
 </section>
 
 {{ if not .feeds }}
-    <p class="alert">{{ t "You don't have any subscription." }}</p>
+    <p class="alert">{{ t "alert.no_feed" }}</p>
 {{ else }}
     <div class="items">
         {{ range .feeds }}
@@ -42,7 +42,7 @@
                         <a href="{{ .SiteURL }}" title="{{ .SiteURL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ domain .SiteURL }}</a>
                     </li>
                     <li>
-                        {{ t "Last check:" }} <time datetime="{{ isodate .CheckedAt }}" title="{{ isodate .CheckedAt }}">{{ elapsed $.user.Timezone .CheckedAt }}</time>
+                        {{ t "page.feeds.last_check" }} <time datetime="{{ isodate .CheckedAt }}" title="{{ isodate .CheckedAt }}">{{ elapsed $.user.Timezone .CheckedAt }}</time>
                     </li>
                 </ul>
                 <ul>
@@ -55,17 +55,17 @@
                     <li>
                         <a href="#"
                             data-confirm="true"
-                            data-label-question="{{ t "Are you sure?" }}"
-                            data-label-yes="{{ t "yes" }}"
-                            data-label-no="{{ t "no" }}"
-                            data-label-loading="{{ t "Work in progress..." }}"
-                            data-url="{{ route "removeFeed" "feedID" .ID }}">{{ t "Remove" }}</a>
+                            data-label-question="{{ t "confirm.question" }}"
+                            data-label-yes="{{ t "confirm.yes" }}"
+                            data-label-no="{{ t "confirm.no" }}"
+                            data-label-loading="{{ t "confirm.loading" }}"
+                            data-url="{{ route "removeFeed" "feedID" .ID }}">{{ t "action.remove" }}</a>
                     </li>
                 </ul>
             </div>
             {{ if ne .ParsingErrorCount 0 }}
                 <div class="parsing-error">
-                    <strong title="{{ .ParsingErrorMsg }}" class="parsing-error-count">{{ plural "plural.feed.error_count" .ParsingErrorCount .ParsingErrorCount }}</strong>
+                    <strong title="{{ .ParsingErrorMsg }}" class="parsing-error-count">{{ plural "page.feeds.error_count" .ParsingErrorCount .ParsingErrorCount }}</strong>
                     - <small class="parsing-error-message">{{ .ParsingErrorMsg }}</small>
                 </div>
             {{ end }}

template/html/history_entries.html

@@ -1,19 +1,19 @@
-{{ define "title"}}{{ t "History" }} ({{ .total }}){{ end }}
+{{ define "title"}}{{ t "page.history.title" }} ({{ .total }}){{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "History" }} ({{ .total }})</h1>
+    <h1>{{ t "page.history.title" }} ({{ .total }})</h1>
     {{ if .entries }}
     <ul>
         <li>
-            <a href="{{ route "flushHistory" }}">{{ t "Flush history" }}</a>
+            <a href="{{ route "flushHistory" }}">{{ t "menu.flush_history" }}</a>
         </li>
     </ul>
     {{ end }}
 </section>
 
 {{ if not .entries }}
-    <p class="alert alert-info">{{ t "There is no history at the moment." }}</p>
+    <p class="alert alert-info">{{ t "alert.no_history" }}</p>
 {{ else }}
     <div class="items">
         {{ range .entries }}

template/html/import.html

@@ -1,17 +1,17 @@
-{{ define "title"}}{{ t "Import" }}{{ end }}
+{{ define "title"}}{{ t "page.import.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Import" }}</h1>
+    <h1>{{ t "page.import.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "feeds" }}">{{ t "Feeds" }}</a>
+            <a href="{{ route "feeds" }}">{{ t "menu.feeds" }}</a>
         </li>
         <li>
-            <a href="{{ route "addSubscription" }}">{{ t "Add subscription" }}</a>
+            <a href="{{ route "addSubscription" }}">{{ t "menu.add_feed" }}</a>
         </li>
         <li>
-            <a href="{{ route "export" }}">{{ t "Export" }}</a>
+            <a href="{{ route "export" }}">{{ t "menu.export" }}</a>
         </li>
     </ul>
 </section>
@@ -23,11 +23,11 @@
         <div class="alert alert-error">{{ t .errorMessage }}</div>
     {{ end }}
 
-    <label for="form-file">{{ t "OPML file" }}</label>
+    <label for="form-file">{{ t "form.import.label.file" }}</label>
     <input type="file" name="file" id="form-file">
 
     <div class="buttons">
-        <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Import" }}</button>
+        <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.import" }}</button>
     </div>
 </form>
 

template/html/integrations.html

@@ -1,22 +1,22 @@
-{{ define "title"}}{{ t "Integrations" }}{{ end }}
+{{ define "title"}}{{ t "page.integrations.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Integrations" }}</h1>
+    <h1>{{ t "page.integrations.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "settings" }}">{{ t "Settings" }}</a>
+            <a href="{{ route "settings" }}">{{ t "menu.settings" }}</a>
         </li>
         <li>
-            <a href="{{ route "sessions" }}">{{ t "Sessions" }}</a>
+            <a href="{{ route "sessions" }}">{{ t "menu.sessions" }}</a>
         </li>
         {{ if .user.IsAdmin }}
         <li>
-            <a href="{{ route "users" }}">{{ t "Users" }}</a>
+            <a href="{{ route "users" }}">{{ t "menu.users" }}</a>
         </li>
         {{ end }}
         <li>
-            <a href="{{ route "about" }}">{{ t "About" }}</a>
+            <a href="{{ route "about" }}">{{ t "menu.about" }}</a>
         </li>
     </ul>
 </section>
@@ -31,131 +31,131 @@
     <h3>Fever</h3>
     <div class="form-section">
         <label>
-            <input type="checkbox" name="fever_enabled" value="1" {{ if .form.FeverEnabled }}checked{{ end }}> {{ t "Activate Fever API" }}
+            <input type="checkbox" name="fever_enabled" value="1" {{ if .form.FeverEnabled }}checked{{ end }}> {{ t "form.integration.fever_activate" }}
         </label>
 
-        <label for="form-fever-username">{{ t "Fever Username" }}</label>
+        <label for="form-fever-username">{{ t "form.integration.fever_username" }}</label>
         <input type="text" name="fever_username" id="form-fever-username" value="{{ .form.FeverUsername }}">
 
-        <label for="form-fever-password">{{ t "Fever Password" }}</label>
+        <label for="form-fever-password">{{ t "form.integration.fever_password" }}</label>
         <input type="password" name="fever_password" id="form-fever-password" value="{{ .form.FeverPassword }}" autocomplete="new-password">
 
-        <p>{{ t "Fever API endpoint:" }} <strong>{{ rootURL }}{{ route "feverEndpoint" }}</strong></p>
+        <p>{{ t "form.integration.fever_endpoint" }} <strong>{{ rootURL }}{{ route "feverEndpoint" }}</strong></p>
     </div>
 
     <h3>Pinboard</h3>
     <div class="form-section">
         <label>
-            <input type="checkbox" name="pinboard_enabled" value="1" {{ if .form.PinboardEnabled }}checked{{ end }}> {{ t "Save articles to Pinboard" }}
+            <input type="checkbox" name="pinboard_enabled" value="1" {{ if .form.PinboardEnabled }}checked{{ end }}> {{ t "form.integration.pinboard_activate" }}
         </label>
 
-        <label for="form-pinboard-token">{{ t "Pinboard API Token" }}</label>
+        <label for="form-pinboard-token">{{ t "form.integration.pinboard_token" }}</label>
         <input type="password" name="pinboard_token" id="form-pinboard-token" value="{{ .form.PinboardToken }}" autocomplete="new-password">
 
-        <label for="form-pinboard-tags">{{ t "Pinboard Tags" }}</label>
+        <label for="form-pinboard-tags">{{ t "form.integration.pinboard_tags" }}</label>
         <input type="text" name="pinboard_tags" id="form-pinboard-tags" value="{{ .form.PinboardTags }}">
 
         <label>
-            <input type="checkbox" name="pinboard_mark_as_unread" value="1" {{ if .form.PinboardMarkAsUnread }}checked{{ end }}> {{ t "Mark bookmark as unread" }}
+            <input type="checkbox" name="pinboard_mark_as_unread" value="1" {{ if .form.PinboardMarkAsUnread }}checked{{ end }}> {{ t "form.integration.pinboard_bookmark" }}
         </label>
     </div>
 
     <h3>Instapaper</h3>
     <div class="form-section">
         <label>
-            <input type="checkbox" name="instapaper_enabled" value="1" {{ if .form.InstapaperEnabled }}checked{{ end }}> {{ t "Save articles to Instapaper" }}
+            <input type="checkbox" name="instapaper_enabled" value="1" {{ if .form.InstapaperEnabled }}checked{{ end }}> {{ t "form.integration.instapaper_activate" }}
         </label>
 
-        <label for="form-instapaper-username">{{ t "Instapaper Username" }}</label>
+        <label for="form-instapaper-username">{{ t "form.integration.instapaper_username" }}</label>
         <input type="text" name="instapaper_username" id="form-instapaper-username" value="{{ .form.InstapaperUsername }}">
 
-        <label for="form-instapaper-password">{{ t "Instapaper Password" }}</label>
+        <label for="form-instapaper-password">{{ t "form.integration.instapaper_password" }}</label>
         <input type="password" name="instapaper_password" id="form-instapaper-password" value="{{ .form.InstapaperPassword }}" autocomplete="new-password">
     </div>
 
     <h3>Pocket</h3>
     <div class="form-section">
         <label>
-            <input type="checkbox" name="pocket_enabled" value="1" {{ if .form.PocketEnabled }}checked{{ end }}> {{ t "Save articles to Pocket" }}
+            <input type="checkbox" name="pocket_enabled" value="1" {{ if .form.PocketEnabled }}checked{{ end }}> {{ t "form.integration.pocket_activate" }}
         </label>
 
         {{ if not .hasPocketConsumerKeyConfigured }}
-            <label for="form-pocket-consumer-key">{{ t "Pocket Consumer Key" }}</label>
+            <label for="form-pocket-consumer-key">{{ t "form.integration.pocket_consumer_key" }}</label>
             <input type="text" name="pocket_consumer_key" id="form-pocket-consumer-key" value="{{ .form.PocketConsumerKey }}">
         {{ end }}
 
-        <label for="form-pocket-access-token">{{ t "Pocket Access Token" }}</label>
+        <label for="form-pocket-access-token">{{ t "form.integration.pocket_access_token" }}</label>
         <input type="password" name="pocket_access_token" id="form-pocket-access-token" value="{{ .form.PocketAccessToken }}" autocomplete="new-password">
 
         {{ if not .form.PocketAccessToken }}
-            <p><a href="{{ route "pocketAuthorize" }}">{{ t "Connect your Pocket account" }}</a></p>
+            <p><a href="{{ route "pocketAuthorize" }}">{{ t "form.integration.pocket_connect_link" }}</a></p>
         {{ end }}
     </div>
 
     <h3>Wallabag</h3>
     <div class="form-section">
         <label>
-            <input type="checkbox" name="wallabag_enabled" value="1" {{ if .form.WallabagEnabled }}checked{{ end }}> {{ t "Save articles to Wallabag" }}
+            <input type="checkbox" name="wallabag_enabled" value="1" {{ if .form.WallabagEnabled }}checked{{ end }}> {{ t "form.integration.wallabag_activate" }}
         </label>
 
-        <label for="form-wallabag-url">{{ t "Wallabag API Endpoint" }}</label>
+        <label for="form-wallabag-url">{{ t "form.integration.wallabag_endpoint" }}</label>
         <input type="url" name="wallabag_url" id="form-wallabag-url" value="{{ .form.WallabagURL }}" placeholder="http://v2.wallabag.org/">
 
-        <label for="form-wallabag-client-id">{{ t "Wallabag Client ID" }}</label>
+        <label for="form-wallabag-client-id">{{ t "form.integration.wallabag_client_id" }}</label>
         <input type="text" name="wallabag_client_id" id="form-wallabag-client-id" value="{{ .form.WallabagClientID }}">
 
-        <label for="form-wallabag-client-secret">{{ t "Wallabag Client Secret" }}</label>
+        <label for="form-wallabag-client-secret">{{ t "form.integration.wallabag_client_secret" }}</label>
         <input type="password" name="wallabag_client_secret" id="form-wallabag-client-secret" value="{{ .form.WallabagClientSecret }}" autocomplete="new-password">
 
-        <label for="form-wallabag-username">{{ t "Wallabag Username" }}</label>
+        <label for="form-wallabag-username">{{ t "form.integration.wallabag_username" }}</label>
         <input type="text" name="wallabag_username" id="form-wallabag-username" value="{{ .form.WallabagUsername }}">
 
-        <label for="form-wallabag-password">{{ t "Wallabag Password" }}</label>
+        <label for="form-wallabag-password">{{ t "form.integration.wallabag_password" }}</label>
         <input type="password" name="wallabag_password" id="form-wallabag-password" value="{{ .form.WallabagPassword }}" autocomplete="new-password">
     </div>
 
     <h3>Nunux Keeper</h3>
     <div class="form-section">
         <label>
-            <input type="checkbox" name="nunux_keeper_enabled" value="1" {{ if .form.NunuxKeeperEnabled }}checked{{ end }}> {{ t "Save articles to Nunux Keeper" }}
+            <input type="checkbox" name="nunux_keeper_enabled" value="1" {{ if .form.NunuxKeeperEnabled }}checked{{ end }}> {{ t "form.integration.nunux_keeper_activate" }}
         </label>
 
-        <label for="form-nunux-keeper-url">{{ t "Nunux Keeper API Endpoint" }}</label>
+        <label for="form-nunux-keeper-url">{{ t "form.integration.nunux_keeper_endpoint" }}</label>
         <input type="url" name="nunux_keeper_url" id="form-nunux-keeper-url" value="{{ .form.NunuxKeeperURL }}" placeholder="https://api.nunux.org/keeper">
 
-        <label for="form-nunux-keeper-api-key">{{ t "Nunux Keeper API key" }}</label>
+        <label for="form-nunux-keeper-api-key">{{ t "form.integration.nunux_keeper_api_key" }}</label>
         <input type="text" name="nunux_keeper_api_key" id="form-nunux-keeper-api-key" value="{{ .form.NunuxKeeperAPIKey }}">
     </div>
 
     <div class="buttons">
-        <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Update" }}</button>
+        <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.update" }}</button>
     </div>
 </form>
 
-<h3>{{ t "Miniflux API" }}</h3>
+<h3>{{ t "page.integration.miniflux_api" }}</h3>
 <div class="panel">
     <ul>
         <li>
-            {{ t "API Endpoint" }} = <strong>{{ baseURL }}/v1/</strong>
+            {{ t "page.integration.miniflux_api_endpoint" }} = <strong>{{ baseURL }}/v1/</strong>
         </li>
         <li>
-            {{ t "Username" }} = <strong>{{ .user.Username }}</strong>
+            {{ t "page.integration.miniflux_api_username" }} = <strong>{{ .user.Username }}</strong>
         </li>
         <li>
-            {{ t "Password" }} = <strong>{{ t "Your account password" }}</strong>
+            {{ t "page.integration.miniflux_api_password" }} = <strong>{{ t "page.integration.miniflux_api_password_value" }}</strong>
         </li>
     </ul>
 </div>
 
-<h3>{{ t "Bookmarklet" }}</h3>
+<h3>{{ t "page.integration.bookmarklet" }}</h3>
 <div class="panel">
-    <p>{{ t "This special link allows you to subscribe to a website directly by using a bookmark in your web browser." }}</p>
+    <p>{{ t "page.integration.bookmarklet.help" }}</p>
 
     <div class="bookmarklet">
-        <a href="javascript:location.href='{{ rootURL }}{{ route "bookmarklet" }}?uri='+encodeURIComponent(window.location.href)">{{ t "Add to Miniflux" }}</a>
+        <a href="javascript:location.href='{{ rootURL }}{{ route "bookmarklet" }}?uri='+encodeURIComponent(window.location.href)">{{ t "page.integration.bookmarklet.name" }}</a>
     </div>
 
-    <p>{{ t "Drag and drop this link to your bookmarks." }}</p>
+    <p>{{ t "page.integration.bookmarklet.instructions" }}</p>
 </div>
 
 {{ end }}

template/html/login.html

@@ -1,4 +1,4 @@
-{{ define "title"}}{{ t "Sign In" }}{{ end }}
+{{ define "title"}}{{ t "page.login.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="login-form">
@@ -9,19 +9,19 @@
             <div class="alert alert-error">{{ t .errorMessage }}</div>
         {{ end }}
 
-        <label for="form-username">{{ t "Username" }}</label>
+        <label for="form-username">{{ t "form.user.label.username" }}</label>
         <input type="text" name="username" id="form-username" value="{{ .form.Username }}" required autofocus>
 
-        <label for="form-password">{{ t "Password" }}</label>
+        <label for="form-password">{{ t "form.user.label.password" }}</label>
         <input type="password" name="password" id="form-password" value="{{ .form.Password }}" required>
 
         <div class="buttons">
-            <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Sign in" }}</button>
+            <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.login" }}</button>
         </div>
     </form>
     {{ if hasOAuth2Provider "google" }}
     <div class="oauth2">
-        <a href="{{ route "oauth2Redirect" "provider" "google" }}">{{ t "Sign in with Google" }}</a>
+        <a href="{{ route "oauth2Redirect" "provider" "google" }}">{{ t "page.login.google_signin" }}</a>
     </div>
     {{ end }}
 </section>

template/html/search_entries.html

@@ -1,12 +1,12 @@
-{{ define "title"}}{{ t "Search Results" }} ({{ .total }}){{ end }}
+{{ define "title"}}{{ t "page.search.title" }} ({{ .total }}){{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Search Results" }} ({{ .total }})</h1>
+    <h1>{{ t "page.search.title" }} ({{ .total }})</h1>
 </section>
 
 {{ if not .entries }}
-    <p class="alert alert-info">{{ t "There is no result for this search." }}</p>
+    <p class="alert alert-info">{{ t "alert.no_search_result" }}</p>
 {{ else }}
     <div class="items">
         {{ range .entries }}

template/html/sessions.html

@@ -1,35 +1,35 @@
-{{ define "title"}}{{ t "Sessions" }}{{ end }}
+{{ define "title"}}{{ t "page.sessions.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Sessions" }}</h1>
+    <h1>{{ t "page.sessions.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "settings" }}">{{ t "Settings" }}</a>
+            <a href="{{ route "settings" }}">{{ t "menu.settings" }}</a>
         </li>
         <li>
-            <a href="{{ route "integrations" }}">{{ t "Integrations" }}</a>
+            <a href="{{ route "integrations" }}">{{ t "menu.integrations" }}</a>
         </li>
         {{ if .user.IsAdmin }}
         <li>
-            <a href="{{ route "users" }}">{{ t "Users" }}</a>
+            <a href="{{ route "users" }}">{{ t "menu.users" }}</a>
         </li>
         <li>
-            <a href="{{ route "createUser" }}">{{ t "Add user" }}</a>
+            <a href="{{ route "createUser" }}">{{ t "menu.add_user" }}</a>
         </li>
         {{ end }}
         <li>
-            <a href="{{ route "about" }}">{{ t "About" }}</a>
+            <a href="{{ route "about" }}">{{ t "menu.about" }}</a>
         </li>
     </ul>
 </section>
 
 <table>
     <tr>
-        <th>{{ t "Date" }}</th>
-        <th>{{ t "IP Address" }}</th>
-        <th>{{ t "User Agent" }}</th>
-        <th>{{ t "Actions" }}</th>
+        <th>{{ t "page.sessions.table.date" }}</th>
+        <th>{{ t "page.sessions.table.ip" }}</th>
+        <th>{{ t "page.sessions.table.user_agent" }}</th>
+        <th>{{ t "page.sessions.table.actions" }}</th>
     </tr>
     {{ range .sessions }}
     <tr {{ if eq .Token $.currentSessionToken }}class="row-highlighted"{{ end }}>
@@ -38,15 +38,15 @@
         <td title="{{ .UserAgent }}">{{ .UserAgent }}</td>
         <td class="column-20">
             {{ if eq .Token $.currentSessionToken }}
-                {{ t "Current session" }}
+                {{ t "page.sessions.table.current_session" }}
             {{ else }}
                 <a href="#"
                     data-confirm="true"
-                    data-label-question="{{ t "Are you sure?" }}"
-                    data-label-yes="{{ t "yes" }}"
-                    data-label-no="{{ t "no" }}"
-                    data-label-loading="{{ t "Work in progress..." }}"
-                    data-url="{{ route "removeSession" "sessionID" .ID }}">{{ t "Remove" }}</a>
+                    data-label-question="{{ t "confirm.question" }}"
+                    data-label-yes="{{ t "confirm.yes" }}"
+                    data-label-no="{{ t "confirm.no" }}"
+                    data-label-loading="{{ t "confirm.loading" }}"
+                    data-url="{{ route "removeSession" "sessionID" .ID }}">{{ t "action.remove" }}</a>
             {{ end }}
         </td>
     </tr>

template/html/settings.html

@@ -1,22 +1,22 @@
-{{ define "title"}}{{ t "Settings" }}{{ end }}
+{{ define "title"}}{{ t "page.settings.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Settings" }}</h1>
+    <h1>{{ t "page.settings.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "integrations" }}">{{ t "Integrations" }}</a>
+            <a href="{{ route "integrations" }}">{{ t "menu.integrations" }}</a>
         </li>
         <li>
-            <a href="{{ route "sessions" }}">{{ t "Sessions" }}</a>
+            <a href="{{ route "sessions" }}">{{ t "menu.sessions" }}</a>
         </li>
         {{ if .user.IsAdmin }}
         <li>
-            <a href="{{ route "users" }}">{{ t "Users" }}</a>
+            <a href="{{ route "users" }}">{{ t "menu.users" }}</a>
         </li>
         {{ end }}
         <li>
-            <a href="{{ route "about" }}">{{ t "About" }}</a>
+            <a href="{{ route "about" }}">{{ t "menu.about" }}</a>
         </li>
     </ul>
 </section>
@@ -28,53 +28,53 @@
         <div class="alert alert-error">{{ t .errorMessage }}</div>
     {{ end }}
 
-    <label for="form-username">{{ t "Username" }}</label>
+    <label for="form-username">{{ t "form.user.label.username" }}</label>
     <input type="text" name="username" id="form-username" value="{{ .form.Username }}" required>
 
-    <label for="form-password">{{ t "Password" }}</label>
+    <label for="form-password">{{ t "form.user.label.password" }}</label>
     <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
 
-    <label for="form-confirmation">{{ t "Confirmation" }}</label>
+    <label for="form-confirmation">{{ t "form.user.label.confirmation" }}</label>
     <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" autocomplete="new-password">
 
-    <label for="form-language">{{ t "Language" }}</label>
+    <label for="form-language">{{ t "form.prefs.label.language" }}</label>
     <select id="form-language" name="language">
     {{ range $key, $value := .languages }}
         <option value="{{ $key }}" {{ if eq $key $.form.Language }}selected="selected"{{ end }}>{{ $value }}</option>
     {{ end }}
     </select>
 
-    <label for="form-timezone">{{ t "Timezone" }}</label>
+    <label for="form-timezone">{{ t "form.prefs.label.timezone" }}</label>
     <select id="form-timezone" name="timezone">
     {{ range $key, $value := .timezones }}
         <option value="{{ $key }}" {{ if eq $key $.form.Timezone }}selected="selected"{{ end }}>{{ $value }}</option>
     {{ end }}
     </select>
 
-    <label for="form-theme">{{ t "Theme" }}</label>
+    <label for="form-theme">{{ t "form.prefs.label.theme" }}</label>
     <select id="form-theme" name="theme">
     {{ range $key, $value := .themes }}
         <option value="{{ $key }}" {{ if eq $key $.form.Theme }}selected="selected"{{ end }}>{{ $value }}</option>
     {{ end }}
     </select>
 
-    <label for="form-entry-direction">{{ t "Entry Sorting" }}</label>
+    <label for="form-entry-direction">{{ t "form.prefs.label.entry_sorting" }}</label>
     <select id="form-entry-direction" name="entry_direction">
-        <option value="asc" {{ if eq "asc" $.form.EntryDirection }}selected="selected"{{ end }}>{{ t "Older entries first" }}</option>
-        <option value="desc" {{ if eq "desc" $.form.EntryDirection }}selected="selected"{{ end }}>{{ t "Recent entries first" }}</option>
+        <option value="asc" {{ if eq "asc" $.form.EntryDirection }}selected="selected"{{ end }}>{{ t "form.prefs.select.older_first" }}</option>
+        <option value="desc" {{ if eq "desc" $.form.EntryDirection }}selected="selected"{{ end }}>{{ t "form.prefs.select.recent_first" }}</option>
     </select>
 
     <div class="buttons">
-        <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Update" }}</button>
+        <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.update" }}</button>
     </div>
 </form>
 
 {{ if hasOAuth2Provider "google" }}
 <div class="panel">
     {{ if hasKey .user.Extra "google_id" }}
-        <a href="{{ route "oauth2Unlink" "provider" "google" }}">{{ t "Unlink my Google account" }}</a>
+        <a href="{{ route "oauth2Unlink" "provider" "google" }}">{{ t "page.settings.unlink_google_account" }}</a>
     {{ else }}
-        <a href="{{ route "oauth2Redirect" "provider" "google" }}">{{ t "Link my Google account" }}</a>
+        <a href="{{ route "oauth2Redirect" "provider" "google" }}">{{ t "page.settings.link_google_account" }}</a>
     {{ end }}
 </div>
 {{ end }}

template/html/unread_entries.html

@@ -1,22 +1,22 @@
-{{ define "title"}}{{ t "Unread Items" }} {{ if gt .countUnread 0 }}({{ .countUnread }}){{ end }} {{ end }}
+{{ define "title"}}{{ t "page.unread.title" }} {{ if gt .countUnread 0 }}({{ .countUnread }}){{ end }} {{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Unread" }} (<span class="unread-counter">{{ .countUnread }}</span>)</h1>
+    <h1>{{ t "page.unread.title" }} (<span class="unread-counter">{{ .countUnread }}</span>)</h1>
     {{ if .entries }}
     <ul>
         <li>
-            <a href="#" data-on-click="markPageAsRead">{{ t "Mark this page as read" }}</a>
+            <a href="#" data-on-click="markPageAsRead">{{ t "menu.mark_page_as_read" }}</a>
         </li>
         <li>
-            <a href="{{ route "markAllAsRead" }}">{{ t "Mark all as read" }}</a>
+            <a href="{{ route "markAllAsRead" }}">{{ t "menu.mark_all_as_read" }}</a>
         </li>
     </ul>
     {{ end }}
 </section>
 
 {{ if not .entries }}
-    <p class="alert">{{ t "There is no unread article." }}</p>
+    <p class="alert">{{ t "alert.no_unread_entry" }}</p>
 {{ else }}
     <div class="items hide-read-items">
         {{ range .entries }}
@@ -38,7 +38,7 @@
         {{ if .entries }}
         <ul>
             <li>
-                <a href="#" data-on-click="markPageAsRead">{{ t "Mark this page as read" }}</a>
+                <a href="#" data-on-click="markPageAsRead">{{ t "menu.mark_page_as_read" }}</a>
             </li>
         </ul>
         {{ end }}

template/html/users.html

@@ -1,58 +1,58 @@
-{{ define "title"}}{{ t "Users" }}{{ end }}
+{{ define "title"}}{{ t "page.users.title" }}{{ end }}
 
 {{ define "content"}}
 <section class="page-header">
-    <h1>{{ t "Users" }}</h1>
+    <h1>{{ t "page.users.title" }}</h1>
     <ul>
         <li>
-            <a href="{{ route "settings" }}">{{ t "Settings" }}</a>
+            <a href="{{ route "settings" }}">{{ t "menu.settings" }}</a>
         </li>
         <li>
-            <a href="{{ route "integrations" }}">{{ t "Integrations" }}</a>
+            <a href="{{ route "integrations" }}">{{ t "menu.integrations" }}</a>
         </li>
         <li>
-            <a href="{{ route "sessions" }}">{{ t "Sessions" }}</a>
+            <a href="{{ route "sessions" }}">{{ t "menu.sessions" }}</a>
         </li>
         <li>
-            <a href="{{ route "createUser" }}">{{ t "Add user" }}</a>
+            <a href="{{ route "createUser" }}">{{ t "menu.add_user" }}</a>
         </li>
         <li>
-            <a href="{{ route "about" }}">{{ t "About" }}</a>
+            <a href="{{ route "about" }}">{{ t "menu.about" }}</a>
         </li>
     </ul>
 </section>
 
 {{ if eq (len .users) 1 }}
-    <p class="alert">{{ t "You are the only user." }}</p>
+    <p class="alert">{{ t "alert.no_user" }}</p>
 {{ else }}
     <table>
         <tr>
             <th class="column-20">{{ t "Username" }}</th>
-            <th>{{ t "Administrator" }}</th>
-            <th>{{ t "Last Login" }}</th>
-            <th>{{ t "Actions" }}</th>
+            <th>{{ t "page.users.is_admin" }}</th>
+            <th>{{ t "page.users.last_login" }}</th>
+            <th>{{ t "page.users.actions" }}</th>
         </tr>
         {{ range .users }}
             {{ if ne .ID $.user.ID }}
             <tr>
                 <td>{{ .Username }}</td>
-                <td>{{ if eq .IsAdmin true }}{{ t "Yes" }}{{ else }}{{ t "No" }}{{ end }}</td>
+                <td>{{ if eq .IsAdmin true }}{{ t "page.users.admin.yes" }}{{ else }}{{ t "page.users.admin.no" }}{{ end }}</td>
                 <td>
                     {{ if .LastLoginAt }}
                         <time datetime="{{ isodate .LastLoginAt }}" title="{{ isodate .LastLoginAt }}">{{ elapsed $.user.Timezone .LastLoginAt }}</time>
                     {{ else }}
-                        {{ t "Never" }}
+                        {{ t "page.users.never_logged" }}
                     {{ end }}
                 </td>
                 <td>
-                    <a href="{{ route "editUser" "userID" .ID }}">{{ t "Edit" }}</a>,
+                    <a href="{{ route "editUser" "userID" .ID }}">{{ t "action.edit" }}</a>,
                     <a href="#"
                         data-confirm="true"
-                        data-label-question="{{ t "Are you sure?" }}"
-                        data-label-yes="{{ t "yes" }}"
-                        data-label-no="{{ t "no" }}"
-                        data-label-loading="{{ t "Work in progress..." }}"
-                        data-url="{{ route "removeUser" "userID" .ID }}">{{ t "Remove" }}</a>
+                        data-label-question="{{ t "confirm.question" }}"
+                        data-label-yes="{{ t "confirm.yes" }}"
+                        data-label-no="{{ t "confirm.no" }}"
+                        data-label-loading="{{ t "confirm.loading" }}"
+                        data-url="{{ route "removeUser" "userID" .ID }}">{{ t "action.remove" }}</a>
                 </td>
             </tr>
             {{ end }}

ui/category_save.go

@@ -49,7 +49,7 @@ func (c *Controller) SaveCategory(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if duplicateCategory != nil {
-		view.Set("errorMessage", "This category already exists.")
+		view.Set("errorMessage", "error.category_already_exists")
 		html.OK(w, r, view.Render("create_category"))
 		return
 	}
@@ -61,7 +61,7 @@ func (c *Controller) SaveCategory(w http.ResponseWriter, r *http.Request) {
 
 	if err = c.store.CreateCategory(&category); err != nil {
 		logger.Error("[Controller:CreateCategory] %v", err)
-		view.Set("errorMessage", "Unable to create this category.")
+		view.Set("errorMessage", "error.unable_to_create_category")
 		html.OK(w, r, view.Render("create_category"))
 		return
 	}

ui/category_update.go

@@ -60,7 +60,7 @@ func (c *Controller) UpdateCategory(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if c.store.AnotherCategoryExists(user.ID, category.ID, categoryForm.Title) {
-		view.Set("errorMessage", "This category already exists.")
+		view.Set("errorMessage", "error.category_already_exists")
 		html.OK(w, r, view.Render("edit_category"))
 		return
 	}
@@ -68,7 +68,7 @@ func (c *Controller) UpdateCategory(w http.ResponseWriter, r *http.Request) {
 	err = c.store.UpdateCategory(categoryForm.Merge(category))
 	if err != nil {
 		logger.Error("[Controller:UpdateCategory] %v", err)
-		view.Set("errorMessage", "Unable to update this category.")
+		view.Set("errorMessage", "error.unable_to_update_category")
 		html.OK(w, r, view.Render("edit_category"))
 		return
 	}

ui/feed_update.go

@@ -71,7 +71,7 @@ func (c *Controller) UpdateFeed(w http.ResponseWriter, r *http.Request) {
 	err = c.store.UpdateFeed(feedForm.Merge(feed))
 	if err != nil {
 		logger.Error("[Controller:EditFeed] %v", err)
-		view.Set("errorMessage", "Unable to update this feed.")
+		view.Set("errorMessage", "error.unable_to_update_feed")
 		html.OK(w, r, view.Render("edit_feed"))
 		return
 	}

ui/form/auth.go

@@ -19,7 +19,7 @@ type AuthForm struct {
 // Validate makes sure the form values are valid.
 func (a AuthForm) Validate() error {
 	if a.Username == "" || a.Password == "" {
-		return errors.NewLocalizedError("All fields are mandatory.")
+		return errors.NewLocalizedError("error.fields_mandatory")
 	}
 
 	return nil

ui/form/category.go

@@ -19,7 +19,7 @@ type CategoryForm struct {
 // Validate makes sure the form values are valid.
 func (c CategoryForm) Validate() error {
 	if c.Title == "" {
-		return errors.NewLocalizedError("The title is mandatory.")
+		return errors.NewLocalizedError("error.title_required")
 	}
 	return nil
 }

ui/form/feed.go

@@ -29,7 +29,7 @@ type FeedForm struct {
 // ValidateModification validates FeedForm fields
 func (f FeedForm) ValidateModification() error {
 	if f.FeedURL == "" || f.SiteURL == "" || f.Title == "" || f.CategoryID == 0 {
-		return errors.NewLocalizedError("All fields are mandatory.")
+		return errors.NewLocalizedError("error.fields_mandatory")
 	}
 	return nil
 }

ui/form/settings.go

@@ -40,16 +40,16 @@ func (s *SettingsForm) Merge(user *model.User) *model.User {
 // Validate makes sure the form values are valid.
 func (s *SettingsForm) Validate() error {
 	if s.Username == "" || s.Theme == "" || s.Language == "" || s.Timezone == "" || s.EntryDirection == "" {
-		return errors.NewLocalizedError("The username, theme, language and timezone fields are mandatory.")
+		return errors.NewLocalizedError("error.settings_mandatory_fields")
 	}
 
 	if s.Password != "" {
 		if s.Password != s.Confirmation {
-			return errors.NewLocalizedError("Passwords are not the same.")
+			return errors.NewLocalizedError("error.different_passwords")
 		}
 
 		if len(s.Password) < 6 {
-			return errors.NewLocalizedError("You must use at least 6 characters")
+			return errors.NewLocalizedError("error.password_min_length")
 		}
 	}
 

ui/form/subscription.go

@@ -24,7 +24,7 @@ type SubscriptionForm struct {
 // Validate makes sure the form values are valid.
 func (s *SubscriptionForm) Validate() error {
 	if s.URL == "" || s.CategoryID == 0 {
-		return errors.NewLocalizedError("The URL and the category are mandatory.")
+		return errors.NewLocalizedError("error.feed_mandatory_fields")
 	}
 
 	return nil

ui/form/user.go

@@ -22,15 +22,15 @@ type UserForm struct {
 // ValidateCreation validates user creation.
 func (u UserForm) ValidateCreation() error {
 	if u.Username == "" || u.Password == "" || u.Confirmation == "" {
-		return errors.NewLocalizedError("All fields are mandatory.")
+		return errors.NewLocalizedError("error.fields_mandatory")
 	}
 
 	if u.Password != u.Confirmation {
-		return errors.NewLocalizedError("Passwords are not the same.")
+		return errors.NewLocalizedError("error.different_passwords")
 	}
 
 	if len(u.Password) < 6 {
-		return errors.NewLocalizedError("You must use at least 6 characters.")
+		return errors.NewLocalizedError("error.password_min_length")
 	}
 
 	return nil
@@ -39,16 +39,16 @@ func (u UserForm) ValidateCreation() error {
 // ValidateModification validates user modification.
 func (u UserForm) ValidateModification() error {
 	if u.Username == "" {
-		return errors.NewLocalizedError("The username is mandatory.")
+		return errors.NewLocalizedError("error.user_mandatory_fields")
 	}
 
 	if u.Password != "" {
 		if u.Password != u.Confirmation {
-			return errors.NewLocalizedError("Passwords are not the same.")
+			return errors.NewLocalizedError("error.different_passwords")
 		}
 
 		if len(u.Password) < 6 {
-			return errors.NewLocalizedError("You must use at least 6 characters.")
+			return errors.NewLocalizedError("error.password_min_length")
 		}
 	}
 

ui/integration_pocket.go

@@ -36,7 +36,7 @@ func (c *Controller) PocketAuthorize(w http.ResponseWriter, r *http.Request) {
 	requestToken, err := connector.RequestToken(redirectURL)
 	if err != nil {
 		logger.Error("[Pocket:Authorize] %v", err)
-		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Unable to fetch request token from Pocket!"))
+		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("error.pocket_request_token"))
 		response.Redirect(w, r, route.Path(c.router, "integrations"))
 		return
 	}
@@ -65,7 +65,7 @@ func (c *Controller) PocketCallback(w http.ResponseWriter, r *http.Request) {
 	accessToken, err := connector.AccessToken(request.PocketRequestToken(r))
 	if err != nil {
 		logger.Error("[Pocket:Callback] %v", err)
-		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Unable to fetch access token from Pocket!"))
+		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("error.pocket_access_token"))
 		response.Redirect(w, r, route.Path(c.router, "integrations"))
 		return
 	}
@@ -79,6 +79,6 @@ func (c *Controller) PocketCallback(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Your Pocket account is now linked!"))
+	sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("alert.pocket_linked"))
 	response.Redirect(w, r, route.Path(c.router, "integrations"))
 }

ui/integration_update.go

@@ -36,7 +36,7 @@ func (c *Controller) UpdateIntegration(w http.ResponseWriter, r *http.Request) {
 	integrationForm.Merge(integration)
 
 	if integration.FeverUsername != "" && c.store.HasDuplicateFeverUsername(user.ID, integration.FeverUsername) {
-		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("There is already someone else with the same Fever username!"))
+		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("error.duplicate_fever_username"))
 		response.Redirect(w, r, route.Path(c.router, "integrations"))
 		return
 	}
@@ -53,6 +53,6 @@ func (c *Controller) UpdateIntegration(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Preferences saved!"))
+	sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("alert.prefs_saved"))
 	response.Redirect(w, r, route.Path(c.router, "integrations"))
 }

ui/login_check.go

@@ -21,7 +21,7 @@ func (c *Controller) CheckLogin(w http.ResponseWriter, r *http.Request) {
 	authForm := form.NewAuthForm(r)
 
 	view := view.New(c.tpl, r, sess)
-	view.Set("errorMessage", "Invalid username or password.")
+	view.Set("errorMessage", "error.bad_credentials")
 	view.Set("form", authForm)
 
 	if err := authForm.Validate(); err != nil {

ui/oauth2_callback.go

@@ -65,7 +65,7 @@ func (c *Controller) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
 
 		if user != nil {
 			logger.Error("[OAuth2] User #%d cannot be associated because %s is already associated", request.UserID(r), user.Username)
-			sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("There is already someone associated with this provider!"))
+			sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("error.duplicate_linked_account"))
 			response.Redirect(w, r, route.Path(c.router, "settings"))
 			return
 		}
@@ -75,7 +75,7 @@ func (c *Controller) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Your external account is now linked!"))
+		sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("alert.account_linked"))
 		response.Redirect(w, r, route.Path(c.router, "settings"))
 		return
 	}

ui/oauth2_unlink.go

@@ -40,7 +40,7 @@ func (c *Controller) OAuth2Unlink(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if !hasPassword {
-		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("You must define a password otherwise you won't be able to login again."))
+		sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("error.unlink_account_without_password"))
 		response.Redirect(w, r, route.Path(c.router, "settings"))
 		return
 	}
@@ -50,6 +50,6 @@ func (c *Controller) OAuth2Unlink(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Your external account is now dissociated!"))
+	sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("alert.account_unlinked"))
 	response.Redirect(w, r, route.Path(c.router, "settings"))
 }

ui/opml_upload.go

@@ -48,7 +48,7 @@ func (c *Controller) UploadOPML(w http.ResponseWriter, r *http.Request) {
 	view.Set("countErrorFeeds", c.store.CountErrorFeeds(user.ID))
 
 	if fileHeader.Size == 0 {
-		view.Set("errorMessage", "This file is empty")
+		view.Set("errorMessage", "error.empty_file")
 		html.OK(w, r, view.Render("import"))
 		return
 	}

ui/settings_update.go

@@ -54,7 +54,7 @@ func (c *Controller) UpdateSettings(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if c.store.AnotherUserExists(user.ID, settingsForm.Username) {
-		view.Set("errorMessage", "This user already exists.")
+		view.Set("errorMessage", "error.user_already_exists")
 		html.OK(w, r, view.Render("settings"))
 		return
 	}
@@ -62,13 +62,13 @@ func (c *Controller) UpdateSettings(w http.ResponseWriter, r *http.Request) {
 	err = c.store.UpdateUser(settingsForm.Merge(user))
 	if err != nil {
 		logger.Error("[Controller:UpdateSettings] %v", err)
-		view.Set("errorMessage", "Unable to update this user.")
+		view.Set("errorMessage", "error.unable_to_update_user")
 		html.OK(w, r, view.Render("settings"))
 		return
 	}
 
 	sess.SetLanguage(user.Language)
 	sess.SetTheme(user.Theme)
-	sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("Preferences saved!"))
+	sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("alert.prefs_saved"))
 	response.Redirect(w, r, route.Path(c.router, "settings"))
 }

ui/subscription_submit.go

@@ -71,7 +71,7 @@ func (c *Controller) SubmitSubscription(w http.ResponseWriter, r *http.Request)
 	switch {
 	case n == 0:
 		v.Set("form", subscriptionForm)
-		v.Set("errorMessage", "Unable to find any subscription.")
+		v.Set("errorMessage", "error.subscription_not_found")
 		html.OK(w, r, v.Render("add_subscription"))
 	case n == 1:
 		feed, err := c.feedHandler.CreateFeed(

ui/user_save.go

@@ -47,7 +47,7 @@ func (c *Controller) SaveUser(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if c.store.UserExists(userForm.Username) {
-		view.Set("errorMessage", "This user already exists.")
+		view.Set("errorMessage", "error.user_already_exists")
 		html.OK(w, r, view.Render("create_user"))
 		return
 	}
@@ -55,7 +55,7 @@ func (c *Controller) SaveUser(w http.ResponseWriter, r *http.Request) {
 	newUser := userForm.ToUser()
 	if err := c.store.CreateUser(newUser); err != nil {
 		logger.Error("[Controller:SaveUser] %v", err)
-		view.Set("errorMessage", "Unable to create this user.")
+		view.Set("errorMessage", "error.unable_to_create_user")
 		html.OK(w, r, view.Render("create_user"))
 		return
 	}

ui/user_update.go

@@ -65,7 +65,7 @@ func (c *Controller) UpdateUser(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if c.store.AnotherUserExists(selectedUser.ID, userForm.Username) {
-		view.Set("errorMessage", "This user already exists.")
+		view.Set("errorMessage", "error.user_already_exists")
 		html.OK(w, r, view.Render("edit_user"))
 		return
 	}
@@ -73,7 +73,7 @@ func (c *Controller) UpdateUser(w http.ResponseWriter, r *http.Request) {
 	userForm.Merge(selectedUser)
 	if err := c.store.UpdateUser(selectedUser); err != nil {
 		logger.Error("[Controller:UpdateUser] %v", err)
-		view.Set("errorMessage", "Unable to update this user.")
+		view.Set("errorMessage", "error.unable_to_update_user")
 		html.OK(w, r, view.Render("edit_user"))
 		return
 	}