Update i18n cli tools (#2673)

* Update i18n cli tools

Few things were bugging me when using the cli tool for i18n. So I've modified
the tools to be easier to use.

First, the tool automatically adds missing keys to all languages. This way, we
always have all keys in all languages.
Second, the tool detects all untranslated keys and adds automatically the todo
comment after the value.
Third, when adding a new key, the key is pushed to all languages at once. There
is no need to duplicate it manually. Thus making the duplication process obsolete.
Fourth, translation and ignore keys are manipulated at the same time. Thus we
don't have obsolete ignored strings anymore.

* Add i18n rules

I find that having the common rules in the Makefile is easier to use,
as long as you know they are here. As it is self documented, people
will see the new rules when using make.

* Use long parameters in Makefile

I find that using long parameters in scripts makes it easier to understand
what's going on. So I've switched all short parameters to long one.

* Format all i18n files

I've used the updated version of the cli tools to have some output
that can be consistently formated. This commit is a huge formating
commit. Nothing was added but some comments were removed in the
process.

Makefile

@@ -5,6 +5,7 @@ ifndef TAG
 endif
 
 PORT ?= 8080
+PHP := $(shell sh -c 'which php')
 
 ifeq ($(findstring alpine,$(TAG)),alpine)
 	DOCKERFILE=Dockerfile-Alpine
@@ -14,20 +15,23 @@ else
 	DOCKERFILE=Dockerfile
 endif
 
+############
+## Docker ##
+############
 .PHONY: build
 build: ## Build a Docker image
 	docker build \
 		--pull \
 		--tag freshrss/freshrss:$(TAG) \
-		-f Docker/$(DOCKERFILE) .
+		--file Docker/$(DOCKERFILE) .
 
 .PHONY: start
 start: ## Start the development environment (use Docker)
 	docker run \
 		--rm \
-		-v $(shell pwd):/var/www/FreshRSS:z \
-		-p $(PORT):80 \
-		-e FRESHRSS_ENV=development \
+		--volume $(shell pwd):/var/www/FreshRSS:z \
+		--publish $(PORT):80 \
+		--env FRESHRSS_ENV=development \
 		--name freshrss-dev \
 		freshrss/freshrss:$(TAG)
 
@@ -35,6 +39,61 @@ start: ## Start the development environment (use Docker)
 stop: ## Stop FreshRSS container if any
 	docker stop freshrss-dev
 
+##########
+## I18N ##
+##########
+.PHONY: i18n-format
+i18n-format: ## Format I18N files
+	@$(PHP) ./cli/manipulate.translation.php -a format
+	@echo Files formatted.
+
+.PHONY: i18n-add-language
+i18n-add-language: ## Add a new supported language
+ifndef lang
+	@echo To add a new language, you need to provide one in the "lang" variable.
+	@exit 10
+endif
+	@$(PHP) ./cli/manipulate.translation.php -a add -l $(lang)
+	@echo Language added.
+
+.PHONY: i18n-add-key
+i18n-add-key: ## Add a translation key to all supported languages
+ifndef key
+	@echo To add a key, you need to provide one in the "key" variable.
+	@exit 10
+endif
+ifndef value
+	@echo To add a key, you need to provide its value in the "value" variable.
+	@exit 10
+endif
+	@$(PHP) ./cli/manipulate.translation.php -a add -k $(key) -v $(value)
+	@echo Key added.
+
+.PHONY: i18n-remove-key
+i18n-remove-key: ## Remove a translation key from all supported languages
+ifndef key
+	@echo To remove a key, you need to provide one in the "key" variable.
+	@exit 10
+endif
+	@$(PHP) ./cli/manipulate.translation.php -a delete -k $(key)
+	@echo Key removed.
+
+.PHONY: i18n-ignore-key
+i18n-ignore-key: ## Ignore a translation key for the selected language
+ifndef lang
+	@echo To ignore a key, you need to provide a language in the "lang" variable.
+	@exit 10
+endif
+ifndef key
+	@echo To ignore a key, you need to provide one in the "key" variable.
+	@exit 10
+endif
+	@$(PHP) ./cli/manipulate.translation.php -a ignore -k $(key) -l $(lang)
+	@echo Key ignored.
+
+##########
+## HELP ##
+##########
 .PHONY: help
 help:
-	@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@grep --extended-regexp '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

app/i18n/cz/admin.php

@@ -67,8 +67,8 @@ return array(
 			'ok' => 'Máte rozšíření JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'Nemáte framework Minz.',
@@ -83,9 +83,9 @@ return array(
 			'ok' => 'Máte PDO a alespoň jeden z podporovaných ovladačů (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'PHP instalace',
 			'nok' => 'Vaše verze PHP je %s, ale FreshRSS vyžaduje alespoň verzi %s.',
 			'ok' => 'Vaše verze PHP je %s a je kompatibilní s FreshRSS.',
+			'_' => 'PHP instalace',
 		),
 		'tables' => array(
 			'nok' => 'V databázi chybí jedna nevo více tabulek.',
@@ -106,26 +106,25 @@ return array(
 		),
 	),
 	'extensions' => array(
-		'author' => 'Author',	//TODO - Translation
-		'community' => 'Available community extensions',	//TODO - Translation
-		'description' => 'Description',	//TODO - Translation
+		'author' => 'Author',	// TODO - Translation
+		'community' => 'Available community extensions',	// TODO - Translation
+		'description' => 'Description',	// TODO - Translation
 		'disabled' => 'Vypnuto',
 		'empty_list' => 'Není naistalováno žádné rozšíření',
 		'enabled' => 'Zapnuto',
-		'latest' => 'Installed',	//TODO - Translation
-		'name' => 'Name',	//TODO - Translation
+		'latest' => 'Installed',	// TODO - Translation
+		'name' => 'Name',	// TODO - Translation
 		'no_configure_view' => 'Toto rozšíření nemá žádné možnosti nastavení.',
 		'system' => array(
-			'_' => 'Systémová rozšíření',
 			'no_rights' => 'Systémová rozšíření (na ně nemáte oprávnění)',
+			'_' => 'Systémová rozšíření',
 		),
 		'title' => 'Rozšíření',
-		'update' => 'Update available',	//TODO - Translation
+		'update' => 'Update available',	// TODO - Translation
 		'user' => 'Uživatelská rozšíření',
-		'version' => 'Version',	//TODO - Translation
+		'version' => 'Version',	// TODO - Translation
 	),
 	'stats' => array(
-		'_' => 'Statistika',
 		'all_feeds' => 'Všechny kanály',
 		'category' => 'Kategorie',
 		'entry_count' => 'Počet článků',
@@ -155,31 +154,32 @@ return array(
 		'status_unread' => 'Nepřečtené',
 		'title' => 'Statistika',
 		'top_feed' => 'Top ten kanálů',
+		'_' => 'Statistika',
 	),
 	'system' => array(
-		'_' => 'System configuration', //TODO - Translation
-		'auto-update-url' => 'Auto-update server URL', //TODO - Translation
+		'auto-update-url' => 'Auto-update server URL',	// TODO - Translation
 		'cookie-duration' => array(
-			'help' => 'in seconds', //TODO - Translation
-			'number' => 'Duration to keep logged in', //TODO - Translation
+			'help' => 'in seconds',	// TODO - Translation
+			'number' => 'Duration to keep logged in',	// TODO - Translation
 		),
-		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
-		'instance-name' => 'Instance name', //TODO - Translation
-		'max-categories' => 'Categories per user limit', //TODO - Translation
-		'max-feeds' => 'Feeds per user limit', //TODO - Translation
+		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'instance-name' => 'Instance name',	// TODO - Translation
+		'max-categories' => 'Categories per user limit',	// TODO - Translation
+		'max-feeds' => 'Feeds per user limit',	// TODO - Translation
 		'registration' => array(
 			'help' => '0 znamená žádná omezení účtu',
 			'number' => 'Maximální počet účtů',
 		),
+		'_' => 'System configuration',	// TODO - Translation
 	),
 	'update' => array(
-		'_' => 'Aktualizace systému',
 		'apply' => 'Použít',
 		'check' => 'Zkontrolovat aktualizace',
 		'current_version' => 'Vaše instalace FreshRSS je verze %s.',
 		'last' => 'Poslední kontrola: %s',
 		'none' => 'Žádné nové aktualizace',
 		'title' => 'Aktualizovat systém',
+		'_' => 'Aktualizace systému',
 	),
 	'user' => array(
 		'articles_and_size' => '%s článků (%s)',
@@ -187,19 +187,19 @@ return array(
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'Vytvořit nového uživatele',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	//TODO - Translation
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'delete_users' => 'Delete user',	// TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Jazyk',
 		'list' => 'User list',	// TODO - Translation
 		'number' => 'Zatím je vytvořen %d účet',
 		'numbers' => 'Zatím je vytvořeno %d účtů',
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
 		'password_format' => 'Alespoň 7 znaků',
-		'selected' => 'Selected user',	//TODO - Translation
+		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Správa uživatelů',
-		'update_users' => 'Update user',	//TODO - Translation
-		'user_list' => 'Seznam uživatelů',
+		'update_users' => 'Update user',	// TODO - Translation
 		'username' => 'Přihlašovací jméno',
 		'users' => 'Uživatelé',
+		'user_list' => 'Seznam uživatelů',
 	),
 );

app/i18n/cz/conf.php

@@ -2,34 +2,33 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archivace',
 		'delete_after' => 'Smazat články starší než',
-		'exception' => 'Purge exception',	//TODO - Translation
+		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'Více možností je dostupných v nastavení jednotlivých kanálů',
-		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
+		'keep_labels' => 'Never delete labels',	// TODO - Translation
+		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Zachovat tento minimální počet článků v každém kanálu',
-		'keep_labels' => 'Never delete labels',	//TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
-		'maintenance' => 'Maintenance',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Optimalizovat databázi',
 		'optimize_help' => 'Občasná údržba zmenší velikost databáze',
-		'policy' => 'Purge policy',	//TODO - Translation
-		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
+		'policy' => 'Purge policy',	// TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	// TODO - Translation
 		'purge_now' => 'Vyčistit nyní',
-		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
-		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Archivace',
 		'ttl' => 'Neaktualizovat častěji než',
+		'_' => 'Archivace',
 	),
 	'display' => array(
-		'_' => 'Zobrazení',
 		'icon' => array(
 			'bottom_line' => 'Spodní řádek',
+			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'Ikony článků',
 			'publication_date' => 'Datum vydání',
-			'related_tags' => 'Související tagy',	//TODO - Translation
+			'related_tags' => 'Související tagy',
 			'sharing' => 'Sdílení',
-			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Horní řádek',
 		),
 		'language' => 'Jazyk',
@@ -37,7 +36,7 @@ return array(
 			'seconds' => 'sekund (0 znamená žádný timeout)',
 			'timeout' => 'Timeout HTML5 notifikací',
 		),
-		'show_nav_buttons' => 'Show the navigation buttons',	//TODO - Translation
+		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'Vzhled',
 		'title' => 'Zobrazení',
 		'width' => array(
@@ -47,35 +46,35 @@ return array(
 			'no_limit' => 'Bez limitu',
 			'thin' => 'Tenká',
 		),
+		'_' => 'Zobrazení',
 	),
 	'profile' => array(
-		'_' => 'Správa profilu',
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Smazání účtu',
 			'warn' => 'Váš účet bude smazán spolu se všemi souvisejícími daty',
+			'_' => 'Smazání účtu',
 		),
 		'email' => 'Email',
 		'password_api' => 'Password API<br /><small>(tzn. pro mobilní aplikace)</small>',
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
 		'password_format' => 'Alespoň 7 znaků',
 		'title' => 'Profil',
+		'_' => 'Správa profilu',
 	),
 	'query' => array(
-		'_' => 'Uživatelské dotazy',
 		'deprecated' => 'Tento dotaz již není platný. Odkazovaná kategorie nebo kanál byly smazány.',
-		'display' => 'Display user query results',	//TODO - Translation
+		'display' => 'Display user query results',	// TODO - Translation
 		'filter' => 'Filtr aplikován:',
 		'get_all' => 'Zobrazit všechny články',
 		'get_category' => 'Zobrazit "%s" kategorii',
 		'get_favorite' => 'Zobrazit oblíbené články',
 		'get_feed' => 'Zobrazit "%s" článkek',
-		'no_filter' => 'Zrušit filtr',
 		'none' => 'Ještě jste nevytvořil žádný uživatelský dotaz.',
+		'no_filter' => 'Zrušit filtr',
 		'number' => 'Dotaz n°%d',
 		'order_asc' => 'Zobrazit nejdříve nejstarší články',
 		'order_desc' => 'Zobrazit nejdříve nejnovější články',
-		'remove' => 'Remove user query',	//TODO - Translation
+		'remove' => 'Remove user query',	// TODO - Translation
 		'search' => 'Hledat "%s"',
 		'state_0' => 'Zobrazit všechny články',
 		'state_1' => 'Zobrazit přečtené články',
@@ -86,17 +85,17 @@ return array(
 		'state_6' => 'Zobrazit oblíbené nepřečtené články',
 		'state_7' => 'Zobrazit oblíbené články',
 		'state_8' => 'Zobrazit všechny články vyjma oblíbených',
-		'state_9' => 'Zobrazit všechny přečtené články vyjma  oblíbených',
-		'state_10' => 'Zobrazit všechny nepřečtené články vyjma  oblíbených',
+		'state_9' => 'Zobrazit všechny přečtené články vyjma oblíbených',
+		'state_10' => 'Zobrazit všechny nepřečtené články vyjma oblíbených',
 		'state_11' => 'Zobrazit všechny články vyjma oblíbených',
 		'state_12' => 'Zobrazit všechny články',
 		'state_13' => 'Zobrazit přečtené články',
 		'state_14' => 'Zobrazit nepřečtené články',
 		'state_15' => 'Zobrazit všechny články',
 		'title' => 'Uživatelské dotazy',
+		'_' => 'Uživatelské dotazy',
 	),
 	'reading' => array(
-		'_' => 'Čtení',
 		'after_onread' => 'Po “označit vše jako přečtené”,',
 		'articles_per_page' => 'Počet článků na stranu',
 		'auto_load_more' => 'Načítat další články dole na stránce',
@@ -117,16 +116,16 @@ return array(
 			'when' => 'Označit článek jako přečtený…',
 		),
 		'show' => array(
-			'_' => 'Počet zobrazených článků',
 			'adaptive' => 'Vyberte zobrazení',
 			'all_articles' => 'Zobrazit všechny články',
 			'unread' => 'Zobrazit jen nepřečtené',
+			'_' => 'Počet zobrazených článků',
 		),
-		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO - Translation
+		'sides_close_article' => 'Clicking outside of article text area closes the article',	// TODO - Translation
 		'sort' => array(
-			'_' => 'Řazení',
 			'newer_first' => 'Nejdříve nejnovější',
 			'older_first' => 'Nejdříve nejstarší',
+			'_' => 'Řazení',
 		),
 		'sticky_post' => 'Při otevření posunout článek nahoru',
 		'title' => 'Čtení',
@@ -136,26 +135,26 @@ return array(
 			'normal' => 'Normální',
 			'reader' => 'Čtení',
 		),
+		'_' => 'Čtení',
 	),
 	'sharing' => array(
-		'_' => 'Sdílení',
-		'add' => 'Add a sharing method',	//TODO - Translation
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
+		'add' => 'Add a sharing method',	// TODO - Translation
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
 		'more_information' => 'Více informací',
 		'print' => 'Tisk',
-		'remove' => 'Remove sharing method',	//TODO - Translation
-		'shaarli' => 'Shaarli',
+		'remove' => 'Remove sharing method',	// TODO - Translation
+		'shaarli' => 'Shaarli',	// TODO - Translation
 		'share_name' => 'Jméno pro zobrazení',
 		'share_url' => 'Jakou URL použít pro sdílení',
 		'title' => 'Sdílení',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag',	// TODO - Translation
+		'_' => 'Sdílení',
 	),
 	'shortcut' => array(
-		'_' => 'Zkratky',
 		'article_action' => 'Články - akce',
 		'auto_share' => 'Sdílet',
 		'auto_share_help' => 'Je-li nastavena pouze jedna možnost sdílení, bude použita. Další možnosti jsou dostupné pomocí jejich čísla.',
@@ -163,7 +162,7 @@ return array(
 		'collapse_article' => 'Srolovat',
 		'first_article' => 'Skočit na první článek',
 		'focus_search' => 'Hledání',
-		'global_view' => 'Switch to global view',	//TODO - Translation
+		'global_view' => 'Switch to global view',	// TODO - Translation
 		'help' => 'Zobrazit documentaci',
 		'javascript' => 'Pro použití zkratek musí být povolen JavaScript',
 		'last_article' => 'Skočit na poslední článek',
@@ -172,21 +171,22 @@ return array(
 		'mark_read' => 'Označit jako přečtené',
 		'navigation' => 'Navigace',
 		'navigation_help' => 'Pomocí přepínače "Shift" fungují navigační zkratky v rámci kanálů.<br/>Pomocí přepínače "Alt" fungují v rámci kategorií.',
-		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	//TODO - Translation
+		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	// TODO - Translation
 		'next_article' => 'Skočit na další článek',
-		'normal_view' => 'Switch to normal view',	//TODO - Translation
+		'normal_view' => 'Switch to normal view',	// TODO - Translation
 		'other_action' => 'Ostatní akce',
 		'previous_article' => 'Skočit na předchozí článek',
-		'reading_view' => 'Switch to reading view',	//TODO - Translation
-		'rss_view' => 'Open RSS view in a new tab',	//TODO - Translation
+		'reading_view' => 'Switch to reading view',	// TODO - Translation
+		'rss_view' => 'Open RSS view in a new tab',	// TODO - Translation
 		'see_on_website' => 'Navštívit původní webovou stránku',
 		'shift_for_all_read' => '+ <code>shift</code> označí vše jako přečtené',
-		'skip_next_article' => 'Focus next without opening',	//TODO - Translation
-		'skip_previous_article' => 'Focus previous without opening',	//TODO - Translation
+		'skip_next_article' => 'Focus next without opening',	// TODO - Translation
+		'skip_previous_article' => 'Focus previous without opening',	// TODO - Translation
 		'title' => 'Zkratky',
 		'user_filter' => 'Aplikovat uživatelské filtry',
 		'user_filter_help' => 'Je-li nastaven pouze jeden filtr, bude použit. Další filtry jsou dostupné pomocí jejich čísla.',
-		'views' => 'Views',	//TODO - Translation
+		'views' => 'Views',	// TODO - Translation
+		'_' => 'Zkratky',
 	),
 	'user' => array(
 		'articles_and_size' => '%s článků (%s)',

app/i18n/cz/feedback.php

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimalizace dokončena',
-	),
 	'access' => array(
 		'denied' => 'Nemáte oprávnění přistupovat na tuto stránku',
 		'not_found' => 'Tato stránka neexistuje',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Optimalizace dokončena',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s nelze zapnout. Pro více detailů <a href="%s">zkontrolujte logy FreshRSS</a>.',
 			'ok' => '%s je nyní zapnut',
 		),
-		'no_access' => 'Nemáte přístup k %s',
 		'not_enabled' => '%s není ještě zapnut',
 		'not_found' => '%s neexistuje',
+		'no_access' => 'Nemáte přístup k %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'Na serveru není naistalována podpora ZIP. Zkuste prosím exportovat soubory jeden po druhém.',
@@ -63,8 +63,8 @@ return array(
 	'sub' => array(
 		'actualize' => 'Aktualizovat',
 		'articles' => array(
-			'marked_read' => 'The selected articles have been marked as read.',	//TODO - Translation
-			'marked_unread' => 'The articles have been marked as unread.',	//TODO - Translation
+			'marked_read' => 'The selected articles have been marked as read.',	// TODO - Translation
+			'marked_unread' => 'The articles have been marked as unread.',	// TODO - Translation
 		),
 		'category' => array(
 			'created' => 'Kategorie %s byla vytvořena.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'Kategorie byla vyprázdněna',
 			'error' => 'Kategorii nelze aktualizovat',
 			'name_exists' => 'Název kategorie již existuje.',
-			'no_id' => 'Musíte upřesnit id kategorie.',
-			'no_name' => 'Název kategorie nemůže být prázdný.',
 			'not_delete_default' => 'Nelze smazat výchozí kategorii!',
 			'not_exist' => 'Tato kategorie neexistuje!',
+			'no_id' => 'Musíte upřesnit id kategorie.',
+			'no_name' => 'Název kategorie nemůže být prázdný.',
 			'over_max' => 'Dosáhl jste maximálního počtu kategorií (%d)',
 			'updated' => 'Kategorie byla aktualizována.',
 		),
@@ -86,12 +86,12 @@ return array(
 			'already_subscribed' => 'Již jste přihlášen k odběru <em>%s</em>',
 			'deleted' => 'Kanál byl smazán',
 			'error' => 'Kanál nelze aktualizovat',
-			'internal_problem' => 'RSS kanál nelze přidat. Pro detaily <a href="%s">zkontrolujte logy FreshRSS</a>.',	//TODO - Translation
+			'internal_problem' => 'RSS kanál nelze přidat. Pro detaily <a href="%s">zkontrolujte logy FreshRSS</a>.',
 			'invalid_url' => 'URL <em>%s</em> není platné',
+			'not_added' => '<em>%s</em> nemůže být přidán',
+			'no_refresh' => 'Nelze obnovit žádné kanály…',
 			'n_actualized' => '%d kanálů bylo aktualizováno',
 			'n_entries_deleted' => '%d článků bylo smazáno',
-			'no_refresh' => 'Nelze obnovit žádné kanály…',
-			'not_added' => '<em>%s</em> nemůže být přidán',
 			'over_max' => 'Dosáhl jste maximálního počtu kanálů (%d)',
 			'updated' => 'Kanál byl aktualizován',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'Uživatel %s byl vytvořen',
 			'error' => 'Uživatele %s nelze vytvořit',
+			'_' => 'Uživatel %s byl vytvořen',
 		),
 		'deleted' => array(
-			'_' => 'Uživatel %s byl smazán',
 			'error' => 'Uživatele %s nelze smazat',
+			'_' => 'Uživatel %s byl smazán',
 		),
 		'updated' => array(
-			'_' => 'User %s has been updated',	//TODO - Translation
-			'error' => 'User %s has not been updated',	//TODO - Translation
+			'error' => 'User %s has not been updated',	// TODO - Translation
+			'_' => 'User %s has been updated',	// TODO - Translation
 		),
 	),
 );

app/i18n/cz/gen.php

@@ -3,16 +3,16 @@
 return array(
 	'action' => array(
 		'actualize' => 'Aktualizovat',
-		'back' => '← Go back', //TODO - Translation
+		'back' => '← Go back',	// TODO - Translation
 		'back_to_rss_feeds' => '← Zpět na seznam RSS kanálů',
 		'cancel' => 'Zrušit',
 		'create' => 'Vytvořit',
 		'disable' => 'Zakázat',
 		'empty' => 'Vyprázdnit',
 		'enable' => 'Povolit',
-		'export' => 'Export',
+		'export' => 'Export',	// TODO - Translation
 		'filter' => 'Filtrovat',
-		'import' => 'Import',
+		'import' => 'Import',	// TODO - Translation
 		'manage' => 'Spravovat',
 		'mark_favorite' => 'Označit jako oblíbené',
 		'mark_read' => 'Označit jako přečtené',
@@ -21,28 +21,28 @@ return array(
 		'see_website' => 'Navštívit WWW stránku',
 		'submit' => 'Odeslat',
 		'truncate' => 'Smazat všechny články',
-		'update' => 'Update',	//TODO - Translation
+		'update' => 'Update',	// TODO - Translation
 	),
 	'auth' => array(
-		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.',	// TODO - Translation
 		'email' => 'Email',
 		'keep_logged_in' => 'Zapamatovat přihlášení <small>(%s dny)</small>',
-		'login' => 'Login',
+		'login' => 'Login',	// TODO - Translation
 		'logout' => 'Odhlášení',
 		'password' => array(
-			'_' => 'Heslo',
 			'format' => '<small>Alespoň 7 znaků</small>',
+			'_' => 'Heslo',
 		),
 		'registration' => array(
-			'_' => 'Nový účet',
 			'ask' => 'Vytvořit účet?',
 			'title' => 'Vytvoření účtu',
+			'_' => 'Nový účet',
 		),
 		'reset' => 'Reset přihlášení',
 		'username' => array(
-			'_' => 'Uživatel',
 			'admin' => 'Název administrátorského účtu',
 			'format' => '<small>maximálně 16 alfanumerických znaků</small>',
+			'_' => 'Uživatel',
 		),
 	),
 	'date' => array(
@@ -65,8 +65,8 @@ return array(
 		'Jan' => '\\L\\e\\d\\e\\n',
 		'jan' => 'led',
 		'january' => 'Led',
-		'Jul' => '\\Č\\e\\r\\v\\e\\n\\e\\c',
 		'jul' => 'čvn',
+		'Jul' => '\\Č\\e\\r\\v\\e\\n\\e\\c',
 		'july' => 'Čvn',
 		'Jun' => '\\Č\\e\\r\\v\\e\\n',
 		'jun' => 'čer',
@@ -76,8 +76,8 @@ return array(
 		'last_month' => 'Minulý měsíc',
 		'last_week' => 'Minulý týden',
 		'last_year' => 'Minulý rok',
-		'Mar' => '\\B\\ř\\e\\z\\e\\n',
 		'mar' => 'bře',
+		'Mar' => '\\B\\ř\\e\\z\\e\\n',
 		'march' => 'Bře',
 		'May' => '\\K\\v\\ě\\t\\e\\n',
 		'may' => 'Květen',
@@ -102,8 +102,8 @@ return array(
 		'yesterday' => 'Včera',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => 'O FreshRSS',
+		'_' => 'FreshRSS',	// TODO - Translation
 	),
 	'js' => array(
 		'category_empty' => 'Prázdná kategorie',
@@ -118,20 +118,21 @@ return array(
 		'should_be_activated' => 'JavaScript musí být povolen',
 	),
 	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'es' => 'Español',
-		'fr' => 'Français',
-		'he' => 'עברית',
-		'it' => 'Italiano',
-		'kr' => '한국어',
-		'nl' => 'Nederlands',
-		'oc' => 'Occitan',
-		'pt-br' => 'Português (Brasil)',
-		'ru' => 'Русский',
-		'tr' => 'Türkçe',
-		'zh-cn' => '简体中文',
+		'cz' => 'Čeština',	// TODO - Translation
+		'de' => 'Deutsch',	// TODO - Translation
+		'en' => 'English',	// TODO - Translation
+		'es' => 'Español',	// TODO - Translation
+		'fr' => 'Français',	// TODO - Translation
+		'he' => 'עברית',	// TODO - Translation
+		'it' => 'Italiano',	// TODO - Translation
+		'kr' => '한국어',	// TODO - Translation
+		'nl' => 'Nederlands',	// TODO - Translation
+		'oc' => 'Occitan',	// TODO - Translation
+		'pt-br' => 'Português (Brasil)',	// TODO - Translation
+		'ru' => 'Русский',	// TODO - Translation
+		'sk' => 'Slovenčina',	// TODO - Translation
+		'tr' => 'Türkçe',	// TODO - Translation
+		'zh-cn' => '简体中文',	// TODO - Translation
 	),
 	'menu' => array(
 		'about' => 'O aplikaci',
@@ -149,7 +150,7 @@ return array(
 		'sharing' => 'Sdílení',
 		'shortcuts' => 'Zkratky',
 		'stats' => 'Statistika',
-		'system' => 'System configuration',	//TODO - Translation
+		'system' => 'System configuration',	// TODO - Translation
 		'update' => 'Aktualizace',
 		'user_management' => 'Správa uživatelů',
 		'user_profile' => 'Profil',
@@ -164,31 +165,31 @@ return array(
 		'previous' => 'Předchozí',
 	),
 	'period' => array(
-		'days' => 'days',	//TODO - Translation
-		'hours' => 'hours',	//TODO - Translation
-		'months' => 'months',	//TODO - Translation
-		'weeks' => 'weeks',	//TODO - Translation
-		'years' => 'years',	//TODO - Translation
+		'days' => 'days',	// TODO - Translation
+		'hours' => 'hours',	// TODO - Translation
+		'months' => 'months',	// TODO - Translation
+		'weeks' => 'weeks',	// TODO - Translation
+		'years' => 'years',	// TODO - Translation
 	),
 	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'gnusocial' => 'GNU social',
-		'jdh' => 'Journal du hacker',
-		'Known' => 'Known based sites',
-		'lemmy' => 'Lemmy',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
-		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
+		'gnusocial' => 'GNU social',	// TODO - Translation
+		'jdh' => 'Journal du hacker',	// TODO - Translation
+		'Known' => 'Known based sites',	// TODO - Translation
+		'lemmy' => 'Lemmy',	// TODO - Translation
+		'linkedin' => 'LinkedIn',	// TODO - Translation
+		'mastodon' => 'Mastodon',	// TODO - Translation
+		'movim' => 'Movim',	// TODO - Translation
+		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pocket' => 'Pocket',	// TODO - Translation
 		'print' => 'Tisk',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag v1',
-		'wallabagv2' => 'wallabag v2',
+		'shaarli' => 'Shaarli',	// TODO - Translation
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag v1',	// TODO - Translation
+		'wallabagv2' => 'wallabag v2',	// TODO - Translation
 	),
 	'short' => array(
 		'attention' => 'Upozornění!',
@@ -198,8 +199,8 @@ return array(
 		'damn' => 'Sakra!',
 		'default_category' => 'Nezařazeno',
 		'no' => 'Ne',
-		'not_applicable' => 'Not available',	//TODO - Translation
-		'ok' => 'Ok!',
+		'not_applicable' => 'Not available',	// TODO - Translation
+		'ok' => 'Ok!',	// TODO - Translation
 		'or' => 'nebo',
 		'yes' => 'Ano',
 	),

app/i18n/cz/index.php

@@ -2,8 +2,7 @@
 
 return array(
 	'about' => array(
-		'_' => 'O FreshRSS',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
 		'bugs_reports' => 'Hlášení chyb',
 		'credits' => 'Poděkování',
 		'credits_content' => 'Některé designové prvky pocházejí z <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, FreshRSS ale tuto platformu nevyužívá. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ikony</a> pocházejí z <a href="https://www.gnome.org/">GNOME projektu</a>. Font <em>Open Sans</em> vytvořil <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS je založen na PHP framework <a href="https://github.com/marienfressinaud/MINZ">Minz</a>.',
@@ -14,23 +13,21 @@ return array(
 		'title' => 'O FreshRSS',
 		'version' => 'Verze',
 		'website' => 'Webové stránka',
-	),
-	'tos' => array(
-		'title' => 'Terms of Service', // TODO - Translation
+		'_' => 'O FreshRSS',
 	),
 	'feed' => array(
 		'add' => 'Můžete přidat kanály.',
 		'empty' => 'Žádné články k zobrazení.',
 		'rss_of' => 'RSS kanál %s',
 		'title' => 'RSS kanály',
-		'title_global' => 'Přehled',
 		'title_fav' => 'Oblíbené',
+		'title_global' => 'Přehled',
 	),
 	'log' => array(
-		'_' => 'Logy',
 		'clear' => 'Vymazat logy',
 		'empty' => 'Log je prázdný',
 		'title' => 'Logy',
+		'_' => 'Logy',
 	),
 	'menu' => array(
 		'about' => 'O FreshRSS',
@@ -43,7 +40,7 @@ return array(
 		'mark_all_read' => 'Označit vše jako přečtené',
 		'mark_cat_read' => 'Označit kategorii jako přečtenou',
 		'mark_feed_read' => 'Označit kanál jako přečtený',
-		'mark_selection_unread' => 'Mark selection as unread',	//TODO - Translation
+		'mark_selection_unread' => 'Mark selection as unread',	// TODO - Translation
 		'newer_first' => 'Nové nejdříve',
 		'non-starred' => 'Zobrazit vše vyjma oblíbených',
 		'normal_view' => 'Normální',
@@ -56,11 +53,14 @@ return array(
 		'starred' => 'Zobrazit oblíbené',
 		'stats' => 'Statistika',
 		'subscription' => 'Správa subskripcí',
-		'tags' => 'My labels',	//TODO - Translation
+		'tags' => 'My labels',	// TODO - Translation
 		'unread' => 'Zobrazovat nepřečtené',
 	),
 	'share' => 'Sdílet',
 	'tag' => array(
-		'related' => 'Související tagy',	//TODO - Translation
+		'related' => 'Související tagy',
+	),
+	'tos' => array(
+		'title' => 'Terms of Service',	// TODO - Translation
 	),
 );

app/i18n/cz/install.php

@@ -17,20 +17,19 @@ return array(
 		'type' => 'Způsob přihlášení',
 	),
 	'bdd' => array(
-		'_' => 'Databáze',
 		'conf' => array(
-			'_' => 'Nastavení databáze',
 			'ko' => 'Ověřte informace o databázi.',
 			'ok' => 'Nastavení databáze bylo uloženo.',
+			'_' => 'Nastavení databáze',
 		),
 		'host' => 'Hostitel',
 		'password' => 'Heslo',
 		'prefix' => 'Prefix tabulky',
 		'type' => 'Typ databáze',
 		'username' => 'Uživatel',
+		'_' => 'Databáze',
 	),
 	'check' => array(
-		'_' => 'Kontrola',
 		'already_installed' => 'Zjistili jsme, že FreshRSS je již nainstalován!',
 		'cache' => array(
 			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/cache</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
@@ -69,8 +68,8 @@ return array(
 			'ok' => 'Máte doporučenou knihovnu pro parsování JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'Nemáte framework Minz.',
@@ -96,10 +95,11 @@ return array(
 			'nok' => 'Pro parsování XML chybí požadovaná knihovna.',
 			'ok' => 'Máte požadovanou knihovnu pro parsování XML.',
 		),
+		'_' => 'Kontrola',
 	),
 	'conf' => array(
-		'_' => 'Obecná nastavení',
 		'ok' => 'Nastavení bylo uloženo.',
+		'_' => 'Obecná nastavení',
 	),
 	'congratulations' => 'Gratulujeme!',
 	'default_user' => 'Jméno výchozího uživatele <small>(maximálně 16 alfanumerických znaků)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'Reinstalací FreshRSS ztratíte předchozí konfiguraci. Opravdu chcete pokračovat?',
 	),
 	'language' => array(
-		'_' => 'Jazyk',
 		'choose' => 'Vyberte jazyk FreshRSS',
 		'defined' => 'Jazyk byl nastaven.',
+		'_' => 'Jazyk',
 	),
 	'not_deleted' => 'Nastala chyba, soubor <em>%s</em> musíte smazat ručně.',
 	'ok' => 'Instalace byla úspěšná.',
 	'step' => 'krok %d',
 	'steps' => 'Kroky',
-	'title' => 'Instalace · FreshRSS',
 	'this_is_the_end' => 'Konec',
+	'title' => 'Instalace · FreshRSS',
 );

app/i18n/cz/sub.php

@@ -2,24 +2,24 @@
 
 return array(
 	'api' => array(
-		'documentation' => 'Copy the following URL to use it within an external tool.',	//TODO - Translation
-		'title' => 'API',	//TODO - Translation
+		'documentation' => 'Copy the following URL to use it within an external tool.',	// TODO - Translation
+		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	//TODO - Translation
-		'label' => 'Subscribe',	//TODO - Translation
-		'title' => 'Bookmarklet',	//TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'label' => 'Subscribe',	// TODO - Translation
+		'title' => 'Bookmarklet',	// TODO - Translation
 	),
 	'category' => array(
-		'_' => 'Kategorie',
 		'add' => 'Přidat kategorii',
 		'archiving' => 'Archivace',
 		'empty' => 'Vyprázdit kategorii',
 		'information' => 'Informace',
 		'new' => 'Nová kategorie',
-		'position' => 'Display position',	//TODO - Translation
-		'position_help' => 'To control category sort order',	//TODO - Translation
+		'position' => 'Display position',	// TODO - Translation
+		'position_help' => 'To control category sort order',	// TODO - Translation
 		'title' => 'Název',
+		'_' => 'Kategorie',
 	),
 	'feed' => array(
 		'add' => 'Přidat RSS kanál',
@@ -32,73 +32,73 @@ return array(
 			'password' => 'Heslo',
 			'username' => 'Přihlašovací jméno',
 		),
-		'clear_cache' => 'Always clear cache',	//TODO - Translation
+		'clear_cache' => 'Always clear cache',	// TODO - Translation
 		'css_help' => 'Stáhne zkrácenou verzi RSS kanálů (pozor, náročnější na čas!)',
 		'css_path' => 'Původní CSS soubor článku z webových stránek',
 		'description' => 'Popis',
 		'empty' => 'Kanál je prázdný. Ověřte prosím zda je ještě autorem udržován.',
 		'error' => 'Vyskytl se problém s kanálem. Ověřte že je vždy dostupný, prosím, a poté jej aktualizujte.',
 		'filteractions' => array(
-			'_' => 'Filter actions',	//TODO - Translation
-			'help' => 'Write one search filter per line.',	//TODO - Translation
+			'help' => 'Write one search filter per line.',	// TODO - Translation
+			'_' => 'Filter actions',	// TODO - Translation
 		),
 		'information' => 'Informace',
 		'keep_min' => 'Zachovat tento minimální počet článků',
 		'moved_category_deleted' => 'Po smazání kategorie budou v ní obsažené kanály automaticky přesunuty do <em>%s</em>.',
-		'mute' => 'mute',	//TODO - Translation
+		'mute' => 'mute',	// TODO - Translation
 		'no_selected' => 'Nejsou označeny žádné kanály.',
 		'number_entries' => '%d článků',
 		'priority' => array(
-			'_' => 'Visibility',	//TODO - Translation
-			'archived' => 'Do not show (archived)',	//TODO - Translation
+			'archived' => 'Do not show (archived)',	// TODO - Translation
 			'main_stream' => 'Zobrazit ve “Všechny kanály”',
-			'normal' => 'Show in its category',	//TODO - Translation
+			'normal' => 'Show in its category',	// TODO - Translation
+			'_' => 'Visibility',	// TODO - Translation
 		),
-		'websub' => 'Okamžité oznámení s WebSub',
 		'show' => array(
-			'all' => 'Show all feeds',	//TODO - Translation
-			'error' => 'Show only feeds with error',	//TODO - Translation
+			'all' => 'Show all feeds',	// TODO - Translation
+			'error' => 'Show only feeds with error',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	//TODO - Translation
+			'error' => 'Showing only feeds with error',	// TODO - Translation
 		),
-		'ssl_verify' => 'Verify SSL security',	//TODO - Translation
+		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'Statistika',
 		'think_to_add' => 'Můžete přidat kanály.',
-		'timeout' => 'Timeout in seconds',	//TODO - Translation
+		'timeout' => 'Timeout in seconds',	// TODO - Translation
 		'title' => 'Název',
 		'title_add' => 'Přidat RSS kanál',
 		'ttl' => 'Neobnovovat častěji než',
 		'url' => 'URL kanálu',
 		'validator' => 'Zkontrolovat platnost kanálu',
 		'website' => 'URL webové stránky',
+		'websub' => 'Okamžité oznámení s WebSub',
 	),
 	'firefox' => array(
-		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',// TODO
-		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
-		'title' => 'Firefox feed reader',	//TODO - Translation
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	// TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	// TODO - Translation
+		'title' => 'Firefox feed reader',	// TODO - Translation
 	),
 	'import_export' => array(
-		'export' => 'Export',
+		'export' => 'Export',	// TODO - Translation
+		'export_labelled' => 'Export your labelled articles',	// TODO - Translation
 		'export_opml' => 'Exportovat seznam kanálů (OPML)',
 		'export_starred' => 'Exportovat oblíbené',
-		'export_labelled' => 'Export your labelled articles',	//TODO
 		'feed_list' => 'Seznam %s článků',
 		'file_to_import' => 'Soubor k importu<br />(OPML, JSON nebo ZIP)',
 		'file_to_import_no_zip' => 'Soubor k importu<br />(OPML nebo JSON)',
-		'import' => 'Import',
+		'import' => 'Import',	// TODO - Translation
 		'starred_list' => 'Seznam oblíbených článků',
-		'title' => 'Import / export',
+		'title' => 'Import / export',	// TODO - Translation
 	),
 	'menu' => array(
 		'bookmark' => 'Přihlásit (FreshRSS bookmark)',
-		'import_export' => 'Import / export',
+		'import_export' => 'Import / export',	// TODO - Translation
 		'subscription_management' => 'Správa subskripcí',
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 	'title' => array(
-		'_' => 'Správa subskripcí',
 		'feed_management' => 'Správa RSS kanálů',
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
+		'_' => 'Správa subskripcí',
 	),
 );

app/i18n/cz/user.php

@@ -3,35 +3,35 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.', //TODO - Translation
-			'required' => 'The email address is required.', //TODO - Translation
+			'invalid' => 'The email address is invalid.',	// TODO - Translation
+			'required' => 'The email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
-			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
-				'email_sent' => 'An email has been sent to your address.', //TODO - Translation
-				'error' => 'The email address failed to be validated.', //TODO - Translation
-				'ok' => 'The email address has been validated.', //TODO - Translation
-				'unneccessary' => 'The email address was already validated.', //TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
+				'error' => 'The email address failed to be validated.',	// TODO - Translation
+				'ok' => 'The email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
-			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
-			'resend_email' => 'Resend the email', //TODO - Translation
-			'title' => 'Email address validation', //TODO - Translation
-		),
-	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
+			'resend_email' => 'Resend the email',	// TODO - Translation
+			'title' => 'Email address validation',	// TODO - Translation
 		),
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'title' => 'You need to validate your account', //TODO - Translation
-			'welcome' => 'Welcome %s,', //TODO - Translation
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'title' => 'You need to validate your account',	// TODO - Translation
+			'welcome' => 'Welcome %s,',	// TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.',	// TODO - Translation
 		),
 	),
 );

app/i18n/de/admin.php

@@ -83,9 +83,9 @@ return array(
 			'ok' => 'Sie haben PDO und mindestens einen der unterstützten Treiber (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'PHP-Installation',
 			'nok' => 'Ihre PHP-Version ist %s aber FreshRSS benötigt mindestens Version %s.',
 			'ok' => 'Ihre PHP-Version ist %s, welche kompatibel mit FreshRSS ist.',
+			'_' => 'PHP-Installation',
 		),
 		'tables' => array(
 			'nok' => 'Es fehlen eine oder mehrere Tabellen in der Datenbank.',
@@ -113,19 +113,18 @@ return array(
 		'empty_list' => 'Es gibt keine installierte Erweiterung.',
 		'enabled' => 'Aktiviert',
 		'latest' => 'Installiert',
-		'name' => 'Name',
+		'name' => 'Name',	// TODO - Translation
 		'no_configure_view' => 'Diese Erweiterung kann nicht konfiguriert werden.',
 		'system' => array(
-			'_' => 'System-Erweiterungen',
 			'no_rights' => 'System-Erweiterung (Sie haben keine Berechtigung dafür)',
+			'_' => 'System-Erweiterungen',
 		),
 		'title' => 'Erweiterungen',
 		'update' => 'Update verfügbar',
 		'user' => 'Benutzer-Erweiterungen',
-		'version' => 'Version',
+		'version' => 'Version',	// TODO - Translation
 	),
 	'stats' => array(
-		'_' => 'Statistiken',
 		'all_feeds' => 'Alle Feeds',
 		'category' => 'Kategorie',
 		'entry_count' => 'Anzahl der Einträge',
@@ -135,7 +134,7 @@ return array(
 		'entry_per_hour' => 'Pro Stunde (Durchschnitt: %.2f Nachrichten)',
 		'entry_per_month' => 'Pro Monat (Durchschnitt: %.2f Nachrichten)',
 		'entry_repartition' => 'Einträge-Verteilung',
-		'feed' => 'Feed',
+		'feed' => 'Feed',	// TODO - Translation
 		'feed_per_category' => 'Feeds pro Kategorie',
 		'idle' => 'Inaktive Feeds',
 		'main' => 'Haupt-Statistiken',
@@ -155,31 +154,32 @@ return array(
 		'status_unread' => 'Ungelesen',
 		'title' => 'Statistiken',
 		'top_feed' => 'Top 10-Feeds',
+		'_' => 'Statistiken',
 	),
 	'system' => array(
-		'_' => 'Systemeinstellungen',
 		'auto-update-url' => 'Auto-update URL',
-		'force_email_validation' => 'E-Mail Adressvalidierung erzwingen',
-		'instance-name' => 'Dein Reader Name',
-		'max-categories' => 'Anzahl erlaubter Kategorien pro Benutzer',
-		'max-feeds' => 'Anzahl erlaubter Feeds pro Benutzer',
 		'cookie-duration' => array(
 			'help' => 'in Sekunden',
 			'number' => 'Eingeloggt bleiben für',
 		),
+		'force_email_validation' => 'E-Mail Adressvalidierung erzwingen',
+		'instance-name' => 'Dein Reader Name',
+		'max-categories' => 'Anzahl erlaubter Kategorien pro Benutzer',
+		'max-feeds' => 'Anzahl erlaubter Feeds pro Benutzer',
 		'registration' => array(
 			'help' => '0 meint, dass es kein Account Limit gibt',
 			'number' => 'Maximale Anzahl von Accounts',
 		),
+		'_' => 'Systemeinstellungen',
 	),
 	'update' => array(
-		'_' => 'System aktualisieren',
 		'apply' => 'Anwenden',
 		'check' => 'Auf neue Aktualisierungen prüfen',
 		'current_version' => 'Ihre aktuelle Version von FreshRSS ist %s.',
 		'last' => 'Letzte Überprüfung: %s',
 		'none' => 'Keine ausstehende Aktualisierung',
 		'title' => 'System aktualisieren',
+		'_' => 'System aktualisieren',
 	),
 	'user' => array(
 		'articles_and_size' => '%s Artikel (%s)',
@@ -188,7 +188,7 @@ return array(
 		'create' => 'Neuen Benutzer erstellen',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Lösche Benutzer',
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Sprache',
 		'list' => 'User list',	// TODO - Translation
 		'number' => 'Es wurde bis jetzt %d Account erstellt',
@@ -198,8 +198,8 @@ return array(
 		'selected' => 'Ausgewählter Benutzer',
 		'title' => 'Benutzer verwalten',
 		'update_users' => 'Aktualisiere Benutzer',
-		'user_list' => 'Liste der Benutzer',
 		'username' => 'Nutzername',
 		'users' => 'Benutzer',
+		'user_list' => 'Liste der Benutzer',
 	),
 );

app/i18n/de/conf.php

@@ -2,13 +2,14 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archivierung',
 		'delete_after' => 'Entferne Artikel nach',
 		'exception' => 'Archivierungsausnahmen',
 		'help' => 'Weitere Optionen sind in den Einstellungen der individuellen Feeds verfügbar.',
 		'keep_favourites' => 'Lieblingsartikel behalten',
-		'keep_min_by_feed' => 'Minimale Anzahl an Artikeln, die pro Feed behalten werden',
 		'keep_labels' => 'Artikel mit Label behalten',
+		'keep_max' => 'Maximale Anzahl an Artikeln die behalten werden',
+		'keep_min_by_feed' => 'Minimale Anzahl an Artikeln, die pro Feed behalten werden',
+		'keep_period' => 'Maximales Alter der zu behaltenden Artikel',
 		'keep_unreads' => 'Ungelesene Artikel behalten',
 		'maintenance' => 'Wartung',
 		'optimize' => 'Datenbank optimieren',
@@ -16,20 +17,18 @@ return array(
 		'policy' => 'Archivierungsrichtlinien',
 		'policy_warning' => 'Ohne Archivierungsrichtlinien werden alle Artikel behalten',
 		'purge_now' => 'Jetzt bereinigen',
-		'keep_max' => 'Maximale Anzahl an Artikeln die behalten werden',
-		'keep_period' => 'Maximales Alter der zu behaltenden Artikel',
 		'title' => 'Archivierung',
 		'ttl' => 'Aktualisiere automatisch nicht öfter als',
+		'_' => 'Archivierung',
 	),
 	'display' => array(
-		'_' => 'Anzeige',
 		'icon' => array(
 			'bottom_line' => 'Fußzeile',
+			'display_authors' => 'Autoren',
 			'entry' => 'Artikel-Symbole',
 			'publication_date' => 'Datum der Veröffentlichung',
 			'related_tags' => 'Verwandte Tags',
 			'sharing' => 'Teilen',
-			'display_authors' => 'Autoren',
 			'top_line' => 'Kopfzeile',
 		),
 		'language' => 'Sprache',
@@ -47,22 +46,22 @@ return array(
 			'no_limit' => 'Keine Begrenzung',
 			'thin' => 'Klein',
 		),
+		'_' => 'Anzeige',
 	),
 	'profile' => array(
-		'_' => 'Profil-Verwaltung',
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Accountlöschung',
 			'warn' => 'Dein Account und alle damit bezogenen Daten werden gelöscht.',
+			'_' => 'Accountlöschung',
 		),
 		'email' => 'E-Mail-Adresse',
 		'password_api' => 'Passwort-API<br /><small>(z. B. für mobile Anwendungen)</small>',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
 		'password_format' => 'mindestens 7 Zeichen',
 		'title' => 'Profil',
+		'_' => 'Profil-Verwaltung',
 	),
 	'query' => array(
-		'_' => 'Benutzerabfragen',
 		'deprecated' => 'Diese Abfrage ist nicht länger gültig. Die referenzierte Kategorie oder der Feed ist gelöscht worden.',
 		'display' => 'Zeige Abfrage Ergebnisse',
 		'filter' => 'Angewendeter Filter:',
@@ -70,8 +69,8 @@ return array(
 		'get_category' => 'Kategorie "%s" anzeigen',
 		'get_favorite' => 'Lieblingsartikel anzeigen',
 		'get_feed' => 'Feed "%s" anzeigen',
-		'no_filter' => 'Kein Filter',
 		'none' => 'Sie haben bisher keine Benutzerabfrage erstellt.',
+		'no_filter' => 'Kein Filter',
 		'number' => 'Abfrage Nr. %d',
 		'order_asc' => 'Älteste Artikel zuerst anzeigen',
 		'order_desc' => 'Neueste Artikel zuerst anzeigen',
@@ -94,9 +93,9 @@ return array(
 		'state_14' => 'Ungelesene Artikel anzeigen',
 		'state_15' => 'Alle Artikel anzeigen',
 		'title' => 'Benutzerabfragen',
+		'_' => 'Benutzerabfragen',
 	),
 	'reading' => array(
-		'_' => 'Lesen',
 		'after_onread' => 'Nach „Alle als gelesen markieren“,',
 		'articles_per_page' => 'Anzahl der Artikel pro Seite',
 		'auto_load_more' => 'Die nächsten Artikel am Seitenende laden',
@@ -117,16 +116,16 @@ return array(
 			'when' => 'Artikel als gelesen markieren…',
 		),
 		'show' => array(
-			'_' => 'Artikel zum Anzeigen',
 			'adaptive' => 'Anzeige anpassen',
 			'all_articles' => 'Alle Artikel zeigen',
 			'unread' => 'Nur ungelesene zeigen',
+			'_' => 'Artikel zum Anzeigen',
 		),
 		'sides_close_article' => 'Klick außerhalb des Artikel-Textes schließt den Artikel',
 		'sort' => array(
-			'_' => 'Sortierreihenfolge',
 			'newer_first' => 'Neuere zuerst',
 			'older_first' => 'Ältere zuerst',
+			'_' => 'Sortierreihenfolge',
 		),
 		'sticky_post' => 'Wenn geöffnet, den Artikel ganz oben anheften',
 		'title' => 'Lesen',
@@ -136,26 +135,26 @@ return array(
 			'normal' => 'Normale Ansicht',
 			'reader' => 'Lese-Ansicht',
 		),
+		'_' => 'Lesen',
 	),
 	'sharing' => array(
-		'_' => 'Teilen',
 		'add' => 'Füge eine Teilen-Dienst hinzu',
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
 		'email' => 'E-Mail',
-		'facebook' => 'Facebook',
+		'facebook' => 'Facebook',	// TODO - Translation
 		'more_information' => 'Weitere Informationen',
 		'print' => 'Drucken',
 		'remove' => 'Entferne Teilen-Dienst',
-		'shaarli' => 'Shaarli',
+		'shaarli' => 'Shaarli',	// TODO - Translation
 		'share_name' => 'Anzuzeigender Teilen-Name',
 		'share_url' => 'Zu verwendende Teilen-URL',
 		'title' => 'Teilen',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag',	// TODO - Translation
+		'_' => 'Teilen',
 	),
 	'shortcut' => array(
-		'_' => 'Tastenkombination',
 		'article_action' => 'Artikel',
 		'auto_share' => 'Teilen',
 		'auto_share_help' => 'Wenn es nur eine Option zum Teilen gibt, wird diese verwendet. Ansonsten sind die Optionen über ihre Nummer erreichbar.',
@@ -170,7 +169,7 @@ return array(
 		'load_more' => 'Weitere Artikel laden',
 		'mark_favorite' => 'Als Favorit markieren',
 		'mark_read' => 'Als gelesen markieren',
-		'navigation' => 'Navigation',
+		'navigation' => 'Navigation',	// TODO - Translation
 		'navigation_help' => 'Mit der "Umschalttaste" finden die Tastenkombination auf Feeds Anwendung.<br/>Mit der "Alt-Taste" finden die Tastenkombination auf Kategorien Anwendung.',
 		'navigation_no_mod_help' => 'Die folgenden Navigationsverknüpfungen unterstützen keine Modifikatoren.',
 		'next_article' => 'Zum nächsten Artikel springen',
@@ -187,6 +186,7 @@ return array(
 		'user_filter' => 'Auf Benutzerfilter zugreifen',
 		'user_filter_help' => 'Wenn es nur einen Benutzerfilter gibt, wird dieser verwendet. Ansonsten sind die Filter über ihre Nummer erreichbar.',
 		'views' => 'Ansichten',
+		'_' => 'Tastenkombination',
 	),
 	'user' => array(
 		'articles_and_size' => '%s Artikel (%s)',

app/i18n/de/feedback.php

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimierung abgeschlossen',
-	),
 	'access' => array(
 		'denied' => 'Sie haben nicht die Berechtigung, diese Seite aufzurufen',
 		'not_found' => 'Sie suchen nach einer Seite, die nicht existiert',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Optimierung abgeschlossen',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s kann nicht aktiviert werden. Für Details <a href="%s">prüfen Sie die FreshRSS-Protokolle</a>.',
 			'ok' => '%s ist jetzt aktiviert',
 		),
-		'no_access' => 'Sie haben keinen Zugang zu %s',
 		'not_enabled' => '%s ist noch nicht aktiviert',
 		'not_found' => '%s existiert nicht',
+		'no_access' => 'Sie haben keinen Zugang zu %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'Die ZIP-Erweiterung fehlt auf Ihrem Server. Bitte versuchen Sie die Dateien eine nach der anderen zu exportieren.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'Die Kategorie ist geleert worden.',
 			'error' => 'Die Kategorie kann nicht aktualisiert werden',
 			'name_exists' => 'Der Kategorie-Name existiert bereits.',
-			'no_id' => 'Sie müssen die ID der Kategorie präzisieren.',
-			'no_name' => 'Der Kategorie-Name kann nicht leer sein.',
 			'not_delete_default' => 'Sie können die Vorgabe-Kategorie nicht löschen!',
 			'not_exist' => 'Die Kategorie existiert nicht!',
+			'no_id' => 'Sie müssen die ID der Kategorie präzisieren.',
+			'no_name' => 'Der Kategorie-Name kann nicht leer sein.',
 			'over_max' => 'Sie haben Ihre Kategorien-Limite erreicht (%d)',
 			'updated' => 'Die Kategorie ist aktualisiert worden.',
 		),
@@ -88,10 +88,10 @@ return array(
 			'error' => 'Der Feed kann nicht aktualisiert werden',
 			'internal_problem' => 'Der RSS-Feed konnte nicht hinzugefügt werden. Für Details <a href="%s">prüfen Sie die FreshRSS-Protokolle</a>.',
 			'invalid_url' => 'Die URL <em>%s</em> ist ungültig',
+			'not_added' => '<em>%s</em> konnte nicht hinzugefügt werden',
+			'no_refresh' => 'Es gibt keinen Feed zum Aktualisieren…',
 			'n_actualized' => 'Die %d Feeds sind aktualisiert worden',
 			'n_entries_deleted' => 'Die %d Artikel sind gelöscht worden',
-			'no_refresh' => 'Es gibt keinen Feed zum Aktualisieren…',
-			'not_added' => '<em>%s</em> konnte nicht hinzugefügt werden',
 			'over_max' => 'Sie haben Ihre Feeds-Limite erreicht (%d)',
 			'updated' => 'Der Feed ist aktualisiert worden',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'Der Benutzer %s ist erstellt worden',
 			'error' => 'Der Benutzer %s kann nicht erstellt werden',
+			'_' => 'Der Benutzer %s ist erstellt worden',
 		),
 		'deleted' => array(
-			'_' => 'Der Benutzer %s ist gelöscht worden',
 			'error' => 'Der Benutzer %s kann nicht gelöscht werden',
+			'_' => 'Der Benutzer %s ist gelöscht worden',
 		),
 		'updated' => array(
-			'_' => 'Benutzer %s wurde aktualisiert',
 			'error' => 'Benutzer %s wurde nicht aktualisiert',
+			'_' => 'Benutzer %s wurde aktualisiert',
 		),
 	),
 );

app/i18n/de/gen.php

@@ -30,28 +30,28 @@ return array(
 		'login' => 'Anmelden',
 		'logout' => 'Abmelden',
 		'password' => array(
-			'_' => 'Passwort',
 			'format' => '<small>mindestens 7 Zeichen</small>',
+			'_' => 'Passwort',
 		),
 		'registration' => array(
-			'_' => 'Neuer Account',
 			'ask' => 'Erstelle einen Account?',
 			'title' => 'Accounterstellung',
+			'_' => 'Neuer Account',
 		),
 		'reset' => 'Zurücksetzen der Authentifizierung',
 		'username' => array(
-			'_' => 'Nutzername',
 			'admin' => 'Administrator-Nutzername',
 			'format' => '<small>maximal 16 alphanumerische Zeichen</small>',
+			'_' => 'Nutzername',
 		),
 	),
 	'date' => array(
-		'Apr' => '\\A\\p\\r\\i\\l',
+		'Apr' => '\\A\\p\\r\\i\\l',	// TODO - Translation
 		'apr' => 'Apr',
-		'april' => 'April',
-		'Aug' => '\\A\\u\\g\\u\\s\\t',
+		'april' => 'April',	// TODO - Translation
+		'Aug' => '\\A\\u\\g\\u\\s\\t',	// TODO - Translation
 		'aug' => 'Aug',
-		'august' => 'August',
+		'august' => 'August',	// TODO - Translation
 		'before_yesterday' => 'Ältere Beiträge',
 		'Dec' => '\\D\\e\\z\\e\\m\\b\\e\\r',
 		'dec' => 'Dez',
@@ -65,8 +65,8 @@ return array(
 		'Jan' => '\\J\\a\\n\\u\\a\\r',
 		'jan' => 'Jan',
 		'january' => 'Januar',
-		'Jul' => '\\J\\u\\l\\i',
 		'jul' => 'Jul',
+		'Jul' => '\\J\\u\\l\\i',
 		'july' => 'Juli',
 		'Jun' => '\\J\\u\\n\\i',
 		'jun' => 'Jun',
@@ -76,24 +76,24 @@ return array(
 		'last_month' => 'Letzter Monat',
 		'last_week' => 'Letzte Woche',
 		'last_year' => 'Letztes Jahr',
-		'Mar' => '\\M\\ä\\r\\z',
 		'mar' => 'Mär',
+		'Mar' => '\\M\\ä\\r\\z',
 		'march' => 'März',
 		'May' => '\\M\\a\\i',
 		'may' => 'Mai',
 		'may_' => 'Mai',
 		'mon' => 'Mo',
 		'month' => 'Monat(en)',
-		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',	// TODO - Translation
 		'nov' => 'Nov',
-		'november' => 'November',
+		'november' => 'November',	// TODO - Translation
 		'Oct' => '\\O\\k\\t\\o\\b\\e\\r',
 		'oct' => 'Okt',
 		'october' => 'Oktober',
 		'sat' => 'Sa',
-		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',	// TODO - Translation
 		'sep' => 'Sep',
-		'september' => 'September',
+		'september' => 'September',	// TODO - Translation
 		'sun' => 'So',
 		'thu' => 'Do',
 		'today' => 'Heute',
@@ -102,8 +102,8 @@ return array(
 		'yesterday' => 'Gestern',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => 'Über FreshRSS',
+		'_' => 'FreshRSS',	// TODO - Translation
 	),
 	'js' => array(
 		'category_empty' => 'Kategorie leeren',
@@ -118,24 +118,25 @@ return array(
 		'should_be_activated' => 'JavaScript muss aktiviert sein',
 	),
 	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'es' => 'Español',
-		'fr' => 'Français',
-		'he' => 'עברית',
-		'it' => 'Italiano',
-		'kr' => '한국어',
-		'nl' => 'Nederlands',
-		'oc' => 'Occitan',
-		'pt-br' => 'Português (Brasil)',
-		'ru' => 'Русский',
-		'tr' => 'Türkçe',
-		'zh-cn' => '简体中文',
+		'cz' => 'Čeština',	// TODO - Translation
+		'de' => 'Deutsch',	// TODO - Translation
+		'en' => 'English',	// TODO - Translation
+		'es' => 'Español',	// TODO - Translation
+		'fr' => 'Français',	// TODO - Translation
+		'he' => 'עברית',	// TODO - Translation
+		'it' => 'Italiano',	// TODO - Translation
+		'kr' => '한국어',	// TODO - Translation
+		'nl' => 'Nederlands',	// TODO - Translation
+		'oc' => 'Occitan',	// TODO - Translation
+		'pt-br' => 'Português (Brasil)',	// TODO - Translation
+		'ru' => 'Русский',	// TODO - Translation
+		'sk' => 'Slovenčina',	// TODO - Translation
+		'tr' => 'Türkçe',	// TODO - Translation
+		'zh-cn' => '简体中文',	// TODO - Translation
 	),
 	'menu' => array(
 		'about' => 'Über',
-		'admin' => 'Administration',
+		'admin' => 'Administration',	// TODO - Translation
 		'archiving' => 'Archivierung',
 		'authentication' => 'Authentifizierung',
 		'check_install' => 'Installationsüberprüfung',
@@ -171,24 +172,24 @@ return array(
 		'years' => 'Jahre',
 	),
 	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
 		'email' => 'E-Mail',
-		'facebook' => 'Facebook',
-		'gnusocial' => 'GNU social',
-		'jdh' => 'Journal du hacker',
+		'facebook' => 'Facebook',	// TODO - Translation
+		'gnusocial' => 'GNU social',	// TODO - Translation
+		'jdh' => 'Journal du hacker',	// TODO - Translation
 		'Known' => 'Known-Seite (https://withknown.com)',
-		'lemmy' => 'Lemmy',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
-		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
+		'lemmy' => 'Lemmy',	// TODO - Translation
+		'linkedin' => 'LinkedIn',	// TODO - Translation
+		'mastodon' => 'Mastodon',	// TODO - Translation
+		'movim' => 'Movim',	// TODO - Translation
+		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pocket' => 'Pocket',	// TODO - Translation
 		'print' => 'Drucken',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag v1',
-		'wallabagv2' => 'wallabag v2',
+		'shaarli' => 'Shaarli',	// TODO - Translation
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag v1',	// TODO - Translation
+		'wallabagv2' => 'wallabag v2',	// TODO - Translation
 	),
 	'short' => array(
 		'attention' => 'Achtung!',

app/i18n/de/index.php

@@ -2,35 +2,32 @@
 
 return array(
 	'about' => array(
-		'_' => 'Über',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
 		'bugs_reports' => 'Fehlerberichte',
-		'credits' => 'Credits',
+		'credits' => 'Credits',	// TODO - Translation
 		'credits_content' => 'Einige Designelemente stammen von <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, obwohl FreshRSS dieses Framework nicht nutzt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> stammen vom <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> Font wurde von <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> erstellt. FreshRSS basiert auf <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, einem PHP-Framework.',
 		'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten wie zum Beispiel <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> oder <a href="https://github.com/LeedRSS/Leed">Leed</a>. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.',
-		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',	// TODO - Translation
 		'license' => 'Lizenz',
 		'project_website' => 'Projekt-Webseite',
 		'title' => 'Über',
-		'version' => 'Version',
+		'version' => 'Version',	// TODO - Translation
 		'website' => 'Webseite',
-	),
-	'tos' => array(
-		'title' => 'Nutzungsbedingungen',
+		'_' => 'Über',
 	),
 	'feed' => array(
 		'add' => 'Sie können Feeds hinzufügen.',
 		'empty' => 'Es gibt keinen Artikel zum Anzeigen.',
 		'rss_of' => 'RSS-Feed von %s',
 		'title' => 'Ihre RSS-Feeds',
-		'title_global' => 'Globale Ansicht',
 		'title_fav' => 'Ihre Favoriten',
+		'title_global' => 'Globale Ansicht',
 	),
 	'log' => array(
-		'_' => 'Protokolle',
 		'clear' => 'Protokolle leeren',
 		'empty' => 'Protokolldatei ist leer.',
 		'title' => 'Protokolle',
+		'_' => 'Protokolle',
 	),
 	'menu' => array(
 		'about' => 'Über FreshRSS',
@@ -63,4 +60,7 @@ return array(
 	'tag' => array(
 		'related' => 'Verwandte Tags',
 	),
+	'tos' => array(
+		'title' => 'Nutzungsbedingungen',
+	),
 );

app/i18n/de/install.php

@@ -17,20 +17,19 @@ return array(
 		'type' => 'Authentifizierungsmethode',
 	),
 	'bdd' => array(
-		'_' => 'Datenbank',
 		'conf' => array(
-			'_' => 'Datenbank-Konfiguration',
 			'ko' => 'Überprüfen Sie Ihre Datenbank-Information.',
 			'ok' => 'Datenbank-Konfiguration ist gespeichert worden.',
+			'_' => 'Datenbank-Konfiguration',
 		),
-		'host' => 'Host',
+		'host' => 'Host',	// TODO - Translation
 		'password' => 'SQL-Password',
 		'prefix' => 'Tabellen-Präfix',
 		'type' => 'Datenbank-Typ',
 		'username' => 'SQL-Nutzername',
+		'_' => 'Datenbank',
 	),
 	'check' => array(
-		'_' => 'Überprüfungen',
 		'already_installed' => 'Wir haben festgestellt, dass FreshRSS bereits installiert wurde!',
 		'cache' => array(
 			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/cache</em>. Der HTTP-Server muss Schreibrechte besitzen.',
@@ -96,10 +95,11 @@ return array(
 			'nok' => 'Ihnen fehlt die benötigte Bibliothek um XML zu parsen.',
 			'ok' => 'Sie haben die benötigte Bibliothek um XML zu parsen.',
 		),
+		'_' => 'Überprüfungen',
 	),
 	'conf' => array(
-		'_' => 'Allgemeine Konfiguration',
 		'ok' => 'Die allgemeine Konfiguration ist gespeichert worden.',
+		'_' => 'Allgemeine Konfiguration',
 	),
 	'congratulations' => 'Glückwunsch!',
 	'default_user' => 'Nutzername des Standardbenutzers <small>(maximal 16 alphanumerische Zeichen)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'Du wirst deine vorherige Konfiguration (Daten) verlieren FreshRSS. Bist du sicher, dass du fortfahren willst?',
 	),
 	'language' => array(
-		'_' => 'Sprache',
 		'choose' => 'Wählen Sie eine Sprache für FreshRSS',
 		'defined' => 'Die Sprache ist festgelegt worden.',
+		'_' => 'Sprache',
 	),
 	'not_deleted' => 'Etwas ist schiefgelaufen; Sie müssen die Datei <em>%s</em> manuell löschen.',
 	'ok' => 'Der Installationsvorgang war erfolgreich.',
 	'step' => 'Schritt %d',
 	'steps' => 'Schritte',
-	'title' => 'Installation · FreshRSS',
 	'this_is_the_end' => 'Das ist das Ende',
+	'title' => 'Installation · FreshRSS',	// TODO - Translation
 );

app/i18n/de/sub.php

@@ -3,23 +3,23 @@
 return array(
 	'api' => array(
 		'documentation' => 'Kopieren Sie die folgende URL, um sie in einem externen Tool zu verwenden.',
-		'title' => 'API',
+		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
 		'documentation' => 'Ziehen Sie diese Schaltfläche auf Ihre Lesezeichen-Symbolleiste oder klicken Sie mit der rechten Maustaste darauf und wählen Sie "Als Lesezeichen hinzufügen". Klicken Sie dann auf einer beliebigen Seite, die Sie abonnieren möchten, auf die Schaltfläche "Abonnieren".',
 		'label' => 'Abonnieren',
-		'title' => 'Bookmarklet',
+		'title' => 'Bookmarklet',	// TODO - Translation
 	),
 	'category' => array(
-		'_' => 'Kategorie',
 		'add' => 'Eine Kategorie hinzufügen',
 		'archiving' => 'Archivierung',
 		'empty' => 'Leere Kategorie',
-		'information' => 'Information',
+		'information' => 'Information',	// TODO - Translation
 		'new' => 'Neue Kategorie',
 		'position' => 'Reihenfolge',
 		'position_help' => 'Steuert die Kategoriesortierung',
 		'title' => 'Titel',
+		'_' => 'Kategorie',
 	),
 	'feed' => array(
 		'add' => 'Einen RSS-Feed hinzufügen',
@@ -39,22 +39,21 @@ return array(
 		'empty' => 'Dieser Feed ist leer. Bitte stellen Sie sicher, dass er noch gepflegt wird.',
 		'error' => 'Dieser Feed ist auf ein Problem gestoßen. Bitte stellen Sie sicher, dass er immer lesbar ist und aktualisieren Sie ihn dann.',
 		'filteractions' => array(
-			'_' => 'Filteraktionen',
 			'help' => 'Ein Suchfilter pro Zeile',
+			'_' => 'Filteraktionen',
 		),
-		'information' => 'Information',
+		'information' => 'Information',	// TODO - Translation
 		'keep_min' => 'Minimale Anzahl an Artikeln, die behalten wird',
 		'moved_category_deleted' => 'Wenn Sie eine Kategorie entfernen, werden deren Feeds automatisch in die Kategorie <em>%s</em> eingefügt.',
 		'mute' => 'Stumm schalten',
 		'no_selected' => 'Kein Feed ausgewählt.',
 		'number_entries' => '%d Artikel',
 		'priority' => array(
-			'_' => 'Sichtbarkeit',
 			'archived' => 'Nicht anzeigen (archiviert)',
 			'main_stream' => 'In Haupt-Feeds zeigen',
 			'normal' => 'Zeige in eigener Kategorie',
+			'_' => 'Sichtbarkeit',
 		),
-		'websub' => 'Sofortbenachrichtigung mit WebSub',
 		'show' => array(
 			'all' => 'Alle Feeds zeigen',
 			'error' => 'Nur Feeds mit Fehlern zeigen',
@@ -72,6 +71,7 @@ return array(
 		'url' => 'Feed-URL',
 		'validator' => 'Überprüfen Sie die Gültigkeit des Feeds',
 		'website' => 'Webseiten-URL',
+		'websub' => 'Sofortbenachrichtigung mit WebSub',
 	),
 	'firefox' => array(
 		'documentation' => 'Folge den <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">hier</a> beschriebenen Schritten um FreshRSS zu Deiner Firefox RSS-Reader Liste hinzuzufügen.',
@@ -80,9 +80,9 @@ return array(
 	),
 	'import_export' => array(
 		'export' => 'Exportieren',
+		'export_labelled' => 'Artikel mit Labeln exportieren',
 		'export_opml' => 'Liste der Feeds exportieren (OPML)',
 		'export_starred' => 'Ihre Favoriten exportieren',
-		'export_labelled' => 'Artikel mit Labeln exportieren',
 		'feed_list' => 'Liste von %s Artikeln',
 		'file_to_import' => 'Zu importierende Datei<br />(OPML, JSON oder ZIP)',
 		'file_to_import_no_zip' => 'Zu importierende Datei<br />(OPML oder JSON)',
@@ -97,8 +97,8 @@ return array(
 		'subscription_tools' => 'Abonnement-Tools',
 	),
 	'title' => array(
-		'_' => 'Abonnementverwaltung',
 		'feed_management' => 'Verwaltung der RSS-Feeds',
 		'subscription_tools' => 'Abonnement-Tools',
+		'_' => 'Abonnementverwaltung',
 	),
 );

app/i18n/de/user.php

@@ -12,7 +12,7 @@ return array(
 			'feedback' => array(
 				'email_failed' => 'Wir konnten Ihnen aufgrund einer Fehlkonfiguration des Servers keine E-Mail schicken.',
 				'email_sent' => 'Wir haben Ihnen eine E-Mail geschickt.',
-				'error' => 'Die E-Mail Adresse konnte nicht  veifiziert werden.',
+				'error' => 'Die E-Mail Adresse konnte nicht veifiziert werden.',
 				'ok' => 'Die E-Mail Adresse wurde verifiziert',
 				'unneccessary' => 'Die E-Mail Adresse wurde bereits verifiziert.',
 				'wrong_token' => 'Die E-Mail Adresse konnte aufgrund eines ungültigen Sicherheitstokens nicht verifiziert werden.',
@@ -22,16 +22,16 @@ return array(
 			'title' => 'E-Mail Adressvalidierung',
 		),
 	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'Sie müssen die Nutzungsbedingungen akzeptieren um sich zu registrieren.',
-		),
-	),
 	'mailer' => array(
 		'email_need_validation' => array(
+			'body' => 'Sie haben Sich gerade bei %s registriert und müssen nun nur noch Ihre E-Mail Adresse verifizieren. Bitte klicken Sie hier:',
 			'title' => 'Sie müssen Ihr Konto verifizieren',
 			'welcome' => 'Willkommen, %s,',
-			'body' => 'Sie haben Sich gerade bei %s registriert und müssen nun nur noch Ihre E-Mail Adresse verifizieren. Bitte klicken Sie hier:',
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'Sie müssen die Nutzungsbedingungen akzeptieren um sich zu registrieren.',
 		),
 	),
 );

app/i18n/en/admin.php

@@ -83,9 +83,9 @@ return array(
 			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'PHP installation',
 			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
 			'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
+			'_' => 'PHP installation',
 		),
 		'tables' => array(
 			'nok' => 'There are one or more missing tables in the database.',
@@ -116,8 +116,8 @@ return array(
 		'name' => 'Name',
 		'no_configure_view' => 'This extension cannot be configured.',
 		'system' => array(
-			'_' => 'System extensions',
 			'no_rights' => 'System extension (you have no rights on it)',
+			'_' => 'System extensions',
 		),
 		'title' => 'Extensions',
 		'update' => 'Update available',
@@ -125,7 +125,6 @@ return array(
 		'version' => 'Version',
 	),
 	'stats' => array(
-		'_' => 'Statistics',
 		'all_feeds' => 'All feeds',
 		'category' => 'Category',
 		'entry_count' => 'Entry count',
@@ -155,31 +154,32 @@ return array(
 		'status_unread' => 'Unread',
 		'title' => 'Statistics',
 		'top_feed' => 'Top ten feeds',
+		'_' => 'Statistics',
 	),
 	'system' => array(
-		'_' => 'System configuration',
 		'auto-update-url' => 'Auto-update server URL',
-		'force_email_validation' => 'Force email addresses validation',
-		'instance-name' => 'Instance name',
-		'max-categories' => 'Categories per user limit',
-		'max-feeds' => 'Feeds per user limit',
 		'cookie-duration' => array(
 			'help' => 'in seconds',
 			'number' => 'Duration to keep logged in',
 		),
+		'force_email_validation' => 'Force email addresses validation',
+		'instance-name' => 'Instance name',
+		'max-categories' => 'Categories per user limit',
+		'max-feeds' => 'Feeds per user limit',
 		'registration' => array(
 			'help' => '0 means that there is no account limit',
 			'number' => 'Max number of accounts',
 		),
+		'_' => 'System configuration',
 	),
 	'update' => array(
-		'_' => 'Update system',
 		'apply' => 'Apply',
 		'check' => 'Check for new updates',
 		'current_version' => 'Your current version of FreshRSS is %s.',
 		'last' => 'Last verification: %s',
 		'none' => 'No update to apply',
 		'title' => 'Update system',
+		'_' => 'Update system',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
@@ -198,8 +198,8 @@ return array(
 		'selected' => 'Selected user',
 		'title' => 'Manage users',
 		'update_users' => 'Update user',
-		'user_list' => 'List of users',
 		'username' => 'Username',
 		'users' => 'Users',
+		'user_list' => 'List of users',
 	),
 );

app/i18n/en/conf.php

@@ -2,13 +2,14 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archiving',
 		'delete_after' => 'Remove articles after',
 		'exception' => 'Purge exception',
 		'help' => 'More options are available in the individual feed settings',
 		'keep_favourites' => 'Never delete favourites',
-		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',
 		'keep_labels' => 'Never delete labels',
+		'keep_max' => 'Maximum number of articles to keep',
+		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',
+		'keep_period' => 'Maximum age of articles to keep',
 		'keep_unreads' => 'Never delete unreads',
 		'maintenance' => 'Maintenance',
 		'optimize' => 'Optimise database',
@@ -16,20 +17,18 @@ return array(
 		'policy' => 'Purge policy',
 		'policy_warning' => 'If no purge policy is selected, every article will be kept.',
 		'purge_now' => 'Purge now',
-		'keep_max' => 'Maximum number of articles to keep',
-		'keep_period' => 'Maximum age of articles to keep',
 		'title' => 'Archiving',
 		'ttl' => 'Do not automatically refresh more often than',
+		'_' => 'Archiving',
 	),
 	'display' => array(
-		'_' => 'Display',
 		'icon' => array(
 			'bottom_line' => 'Bottom line',
+			'display_authors' => 'Authors',
 			'entry' => 'Article icons',
 			'publication_date' => 'Date of publication',
 			'related_tags' => 'Article tags',
 			'sharing' => 'Sharing',
-			'display_authors' => 'Authors',
 			'top_line' => 'Top line',
 		),
 		'language' => 'Language',
@@ -47,22 +46,22 @@ return array(
 			'no_limit' => 'No limit',
 			'thin' => 'Thin',
 		),
+		'_' => 'Display',
 	),
 	'profile' => array(
-		'_' => 'Profile management',
 		'api' => 'API management',
 		'delete' => array(
-			'_' => 'Account deletion',
 			'warn' => 'Your account and all related data will be deleted.',
+			'_' => 'Account deletion',
 		),
 		'email' => 'Email address',
 		'password_api' => 'API password<br /><small>(e.g., for mobile apps)</small>',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'password_format' => 'At least 7 characters',
 		'title' => 'Profile',
+		'_' => 'Profile management',
 	),
 	'query' => array(
-		'_' => 'User queries',
 		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
 		'display' => 'Display user query results',
 		'filter' => 'Filter applied:',
@@ -70,8 +69,8 @@ return array(
 		'get_category' => 'Display "%s" category',
 		'get_favorite' => 'Display favourite articles',
 		'get_feed' => 'Display "%s" feed',
-		'no_filter' => 'No filter',
 		'none' => 'You haven’t created any user queries yet.',
+		'no_filter' => 'No filter',
 		'number' => 'Query n°%d',
 		'order_asc' => 'Display oldest articles first',
 		'order_desc' => 'Display newest articles first',
@@ -94,9 +93,9 @@ return array(
 		'state_14' => 'Display unread articles',
 		'state_15' => 'Display all articles',
 		'title' => 'User queries',
+		'_' => 'User queries',
 	),
 	'reading' => array(
-		'_' => 'Reading',
 		'after_onread' => 'After “mark all as read”,',
 		'articles_per_page' => 'Number of articles per page',
 		'auto_load_more' => 'Load more articles at the page bottom',
@@ -117,16 +116,16 @@ return array(
 			'when' => 'Mark article as read…',
 		),
 		'show' => array(
-			'_' => 'Articles to display',
 			'adaptive' => 'Adjust showing',
 			'all_articles' => 'Show all articles',
 			'unread' => 'Show only unread',
+			'_' => 'Articles to display',
 		),
 		'sides_close_article' => 'Clicking outside of article text area closes the article',
 		'sort' => array(
-			'_' => 'Sort order',
 			'newer_first' => 'Newest first',
 			'older_first' => 'Oldest first',
+			'_' => 'Sort order',
 		),
 		'sticky_post' => 'Stick the article to the top when opened',
 		'title' => 'Reading',
@@ -136,9 +135,9 @@ return array(
 			'normal' => 'Normal view',
 			'reader' => 'Reading view',
 		),
+		'_' => 'Reading',
 	),
 	'sharing' => array(
-		'_' => 'Sharing',
 		'add' => 'Add a sharing method',
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
@@ -153,9 +152,9 @@ return array(
 		'title' => 'Sharing',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'_' => 'Sharing',
 	),
 	'shortcut' => array(
-		'_' => 'Shortcuts',
 		'article_action' => 'Article actions',
 		'auto_share' => 'Share',
 		'auto_share_help' => 'If there is only one sharing mode, it is used. Otherwise, modes are accessible by their number.',
@@ -187,6 +186,7 @@ return array(
 		'user_filter' => 'Access user queries',
 		'user_filter_help' => 'If there is only one user query, it is used. Otherwise, queries are accessible by their number.',
 		'views' => 'Views',
+		'_' => 'Shortcuts',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',

app/i18n/en/feedback.php

@@ -1,13 +1,13 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimization complete',
-	),
 	'access' => array(
 		'denied' => 'You don’t have permission to access this page',
 		'not_found' => 'You are looking for a page which doesn’t exist',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Optimization complete',
+	),
 	'api' => array(
 		'password' => array(
 			'failed' => 'Your password cannot be modified',
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s cannot be enabled. <a href="%s">Check FreshRSS logs</a> for details.',
 			'ok' => '%s is now enabled',
 		),
-		'no_access' => 'You have no access on %s',
 		'not_enabled' => '%s is not enabled',
 		'not_found' => '%s does not exist',
+		'no_access' => 'You have no access on %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'Category has been emptied',
 			'error' => 'Category cannot be updated',
 			'name_exists' => 'Category name already exists.',
-			'no_id' => 'You must specify the id of the category.',
-			'no_name' => 'Category name cannot be empty.',
 			'not_delete_default' => 'You cannot delete the default category!',
 			'not_exist' => 'The category does not exist!',
+			'no_id' => 'You must specify the id of the category.',
+			'no_name' => 'Category name cannot be empty.',
 			'over_max' => 'You have reached your limit of categories (%d)',
 			'updated' => 'Category has been updated.',
 		),
@@ -88,10 +88,10 @@ return array(
 			'error' => 'Feed cannot be updated',
 			'internal_problem' => 'The newsfeed could not be added. <a href="%s">Check FreshRSS logs</a> for details. You can try force adding by appending <code>#force_feed</code> to the URL.',
 			'invalid_url' => 'URL <em>%s</em> is invalid',
+			'not_added' => '<em>%s</em> could not be added',
+			'no_refresh' => 'There is no feed to refresh…',
 			'n_actualized' => '%d feeds have been updated',
 			'n_entries_deleted' => '%d articles have been deleted',
-			'no_refresh' => 'There is no feed to refresh…',
-			'not_added' => '<em>%s</em> could not be added',
 			'over_max' => 'You have reached your limit of feeds (%d)',
 			'updated' => 'Feed has been updated',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'User %s has been created',
 			'error' => 'User %s cannot be created',
+			'_' => 'User %s has been created',
 		),
 		'deleted' => array(
-			'_' => 'User %s has been deleted',
 			'error' => 'User %s cannot be deleted',
+			'_' => 'User %s has been deleted',
 		),
 		'updated' => array(
-			'_' => 'User %s has been updated',
 			'error' => 'User %s has not been updated',
+			'_' => 'User %s has been updated',
 		),
 	),
 );

app/i18n/en/gen.php

@@ -30,19 +30,19 @@ return array(
 		'login' => 'Login',
 		'logout' => 'Logout',
 		'password' => array(
-			'_' => 'Password',
 			'format' => '<small>At least 7 characters</small>',
+			'_' => 'Password',
 		),
 		'registration' => array(
-			'_' => 'New account',
 			'ask' => 'Create an account?',
 			'title' => 'Account creation',
+			'_' => 'New account',
 		),
 		'reset' => 'Authentication reset',
 		'username' => array(
-			'_' => 'Username',
 			'admin' => 'Administrator username',
 			'format' => '<small>maximum 16 alphanumeric characters</small>',
+			'_' => 'Username',
 		),
 	),
 	'date' => array(
@@ -65,8 +65,8 @@ return array(
 		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
 		'jan' => 'Jan.',
 		'january' => 'January',
-		'Jul' => '\\J\\u\\l\\y',
 		'jul' => 'July',
+		'Jul' => '\\J\\u\\l\\y',
 		'july' => 'July',
 		'Jun' => '\\J\\u\\n\\e',
 		'jun' => 'June',
@@ -76,8 +76,8 @@ return array(
 		'last_month' => 'Last month',
 		'last_week' => 'Last week',
 		'last_year' => 'Last year',
-		'Mar' => '\\M\\a\\r\\c\\h',
 		'mar' => 'Mar.',
+		'Mar' => '\\M\\a\\r\\c\\h',
 		'march' => 'March',
 		'May' => '\\M\\a\\y',
 		'may' => 'May',
@@ -90,8 +90,8 @@ return array(
 		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
 		'oct' => 'Oct.',
 		'october' => 'October',
-		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
 		'sat' => 'Sat',
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
 		'sep' => 'Sept.',
 		'september' => 'September',
 		'sun' => 'Sun',
@@ -102,8 +102,8 @@ return array(
 		'yesterday' => 'Yesterday',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => 'About FreshRSS',
+		'_' => 'FreshRSS',
 	),
 	'js' => array(
 		'category_empty' => 'Empty category',

app/i18n/en/index.php

@@ -2,7 +2,6 @@
 
 return array(
 	'about' => array(
-		'_' => 'About',
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => 'Bugs reports',
 		'credits' => 'Credits',
@@ -14,23 +13,21 @@ return array(
 		'title' => 'About',
 		'version' => 'Version',
 		'website' => 'Website',
-	),
-	'tos' => array(
-		'title' => 'Terms of Service',
+		'_' => 'About',
 	),
 	'feed' => array(
 		'add' => 'You may add some feeds.',
 		'empty' => 'There is no article to show.',
 		'rss_of' => 'RSS feed of %s',
 		'title' => 'Your RSS feeds',
-		'title_global' => 'Global view',
 		'title_fav' => 'Your favourites',
+		'title_global' => 'Global view',
 	),
 	'log' => array(
-		'_' => 'Logs',
 		'clear' => 'Clear the logs',
 		'empty' => 'Log file is empty',
 		'title' => 'Logs',
+		'_' => 'Logs',
 	),
 	'menu' => array(
 		'about' => 'About FreshRSS',
@@ -63,4 +60,7 @@ return array(
 	'tag' => array(
 		'related' => 'Article tags',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service',
+	),
 );

app/i18n/en/install.php

@@ -17,20 +17,19 @@ return array(
 		'type' => 'Authentication method',
 	),
 	'bdd' => array(
-		'_' => 'Database',
 		'conf' => array(
-			'_' => 'Database configuration',
 			'ko' => 'Verify your database information.',
 			'ok' => 'Database configuration has been saved.',
+			'_' => 'Database configuration',
 		),
 		'host' => 'Host',
 		'password' => 'Database password',
 		'prefix' => 'Table prefix',
 		'type' => 'Type of database',
 		'username' => 'Database username',
+		'_' => 'Database',
 	),
 	'check' => array(
-		'_' => 'Checks',
 		'already_installed' => 'We have detected that FreshRSS is already installed!',
 		'cache' => array(
 			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
@@ -96,10 +95,11 @@ return array(
 			'nok' => 'Cannot find the required library to parse XML.',
 			'ok' => 'You have the required library to parse XML.',
 		),
+		'_' => 'Checks',
 	),
 	'conf' => array(
-		'_' => 'General configuration',
 		'ok' => 'General configuration has been saved.',
+		'_' => 'General configuration',
 	),
 	'congratulations' => 'Congratulations!',
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',
 	),
 	'language' => array(
-		'_' => 'Language',
 		'choose' => 'Choose a language for FreshRSS',
 		'defined' => 'Language has been defined.',
+		'_' => 'Language',
 	),
 	'not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
 	'ok' => 'The installation process was successful.',
 	'step' => 'step %d',
 	'steps' => 'Steps',
-	'title' => 'Installation · FreshRSS',
 	'this_is_the_end' => 'This is the end',
+	'title' => 'Installation · FreshRSS',
 );

app/i18n/en/sub.php

@@ -11,7 +11,6 @@ return array(
 		'title' => 'Bookmarklet',
 	),
 	'category' => array(
-		'_' => 'Category',
 		'add' => 'Add a category',
 		'archiving' => 'Archiving',
 		'empty' => 'Empty category',
@@ -20,6 +19,7 @@ return array(
 		'position' => 'Display position',
 		'position_help' => 'To control category sort order',
 		'title' => 'Title',
+		'_' => 'Category',
 	),
 	'feed' => array(
 		'add' => 'Add a RSS feed',
@@ -39,8 +39,8 @@ return array(
 		'empty' => 'This feed is empty. Please verify that it is still maintained.',
 		'error' => 'This feed has encountered a problem. Please verify that it is always reachable then update it.',
 		'filteractions' => array(
-			'_' => 'Filter actions',
 			'help' => 'Write one search filter per line.',
+			'_' => 'Filter actions',
 		),
 		'information' => 'Information',
 		'keep_min' => 'Minimum number of articles to keep',
@@ -49,12 +49,11 @@ return array(
 		'no_selected' => 'No feed selected.',
 		'number_entries' => '%d articles',
 		'priority' => array(
-			'_' => 'Visibility',
 			'archived' => 'Do not show (archived)',
 			'main_stream' => 'Show in main stream',
 			'normal' => 'Show in its category',
+			'_' => 'Visibility',
 		),
-		'websub' => 'Instant notification with WebSub',
 		'show' => array(
 			'all' => 'Show all feeds',
 			'error' => 'Show only feeds with error',
@@ -72,6 +71,7 @@ return array(
 		'url' => 'Feed URL',
 		'validator' => 'Check the validity of the feed',
 		'website' => 'Website URL',
+		'websub' => 'Instant notification with WebSub',
 	),
 	'firefox' => array(
 		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
@@ -80,9 +80,9 @@ return array(
 	),
 	'import_export' => array(
 		'export' => 'Export',
+		'export_labelled' => 'Export your labelled articles',
 		'export_opml' => 'Export list of feeds (OPML)',
 		'export_starred' => 'Export your favourites',
-		'export_labelled' => 'Export your labelled articles',
 		'feed_list' => 'List of %s articles',
 		'file_to_import' => 'File to import<br />(OPML, JSON or ZIP)',
 		'file_to_import_no_zip' => 'File to import<br />(OPML or JSON)',
@@ -97,8 +97,8 @@ return array(
 		'subscription_tools' => 'Subscription tools',
 	),
 	'title' => array(
-		'_' => 'Subscriptions management',
 		'feed_management' => 'RSS feeds management',
 		'subscription_tools' => 'Subscription tools',
+		'_' => 'Subscriptions management',
 	),
 );

app/i18n/en/user.php

@@ -22,16 +22,16 @@ return array(
 			'title' => 'Email address validation',
 		),
 	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'You must accept the Terms of Service to be able to register.',
-		),
-	),
 	'mailer' => array(
 		'email_need_validation' => array(
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',
 			'title' => 'You need to validate your account',
 			'welcome' => 'Welcome %s,',
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.',
 		),
 	),
 );

app/i18n/es/admin.php

@@ -67,8 +67,8 @@ return array(
 			'ok' => 'Dispones de la extensión JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'No se ha podido localizar el entorno Minz.',
@@ -83,9 +83,9 @@ return array(
 			'ok' => 'Dispones de PDO y, al menos, de uno de los controladores compatibles (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'Instalación PHP',
 			'nok' => 'Dispones de la versión PHP %s pero FreshRSS requiere de, al menos, la versión %s.',
 			'ok' => 'Dispones de la versión PHP %s, que es compatible con FreshRSS.',
+			'_' => 'Instalación PHP',
 		),
 		'tables' => array(
 			'nok' => 'Falta al menos una tabla en la base de datos.',
@@ -106,26 +106,25 @@ return array(
 		),
 	),
 	'extensions' => array(
-		'author' => 'Author',	//TODO - Translation
-		'community' => 'Available community extensions',	//TODO - Translation
-		'description' => 'Description',	//TODO - Translation
+		'author' => 'Author',	// TODO - Translation
+		'community' => 'Available community extensions',	// TODO - Translation
+		'description' => 'Description',	// TODO - Translation
 		'disabled' => 'Desactivado',
 		'empty_list' => 'No hay extensiones instaladas',
 		'enabled' => 'Activado',
-		'latest' => 'Installed',	//TODO - Translation
-		'name' => 'Name',	//TODO - Translation
+		'latest' => 'Installed',	// TODO - Translation
+		'name' => 'Name',	// TODO - Translation
 		'no_configure_view' => 'Esta extensión no puede ser configurada.',
 		'system' => array(
-			'_' => 'Sistema de extensiones',
 			'no_rights' => 'Sistema de extensiones (careces de los permisos necesarios)',
+			'_' => 'Sistema de extensiones',
 		),
 		'title' => 'Extensiones',
-		'update' => 'Update available',	//TODO - Translation
+		'update' => 'Update available',	// TODO - Translation
 		'user' => 'Extensiones de usuario',
-		'version' => 'Version',	//TODO - Translation
+		'version' => 'Version',	// TODO - Translation
 	),
 	'stats' => array(
-		'_' => 'Estadísticas',
 		'all_feeds' => 'Todas las fuentes',
 		'category' => 'Categoría',
 		'entry_count' => 'Cómputo total',
@@ -151,55 +150,56 @@ return array(
 		'repartition' => 'Reprto de artículos',
 		'status_favorites' => 'Favoritos',
 		'status_read' => 'Leídos',
-		'status_total' => 'Total',
+		'status_total' => 'Total',	// TODO - Translation
 		'status_unread' => 'Pendientes',
 		'title' => 'Estadísticas',
 		'top_feed' => 'Las 10 fuentes más activas',
+		'_' => 'Estadísticas',
 	),
 	'system' => array(
-		'_' => 'Configuración del sistema',
 		'auto-update-url' => 'URL de auto-actualización',
-		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
+		'cookie-duration' => array(
+			'help' => 'in seconds',	// TODO - Translation
+			'number' => 'Duration to keep logged in',	// TODO - Translation
+		),
+		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
 		'instance-name' => 'Nombre de la fuente',
 		'max-categories' => 'Límite de categorías por usuario',
 		'max-feeds' => 'Límite de fuentes por usuario',
-		'cookie-duration' => array(
-			'help' => 'in seconds', // @todo translate
-			'number' => 'Duration to keep logged in', // @todo translate
-		),
 		'registration' => array(
 			'help' => '0 significa que no hay límite en la cuenta',
 			'number' => 'Número máximo de cuentas',
 		),
+		'_' => 'Configuración del sistema',
 	),
 	'update' => array(
-		'_' => 'Actualizar sistema',
 		'apply' => 'Aplicar',
 		'check' => 'Buscar actualizaciones',
 		'current_version' => 'Dispones de la versión %s de FreshRSS.',
 		'last' => 'Última comprobación: %s',
 		'none' => 'No hay actualizaciones disponibles',
 		'title' => 'Actualizar sistema',
+		'_' => 'Actualizar sistema',
 	),
 	'user' => array(
-		'articles_and_size' => '%s articles (%s)',
+		'articles_and_size' => '%s articles (%s)',	// TODO - Translation
 		'article_count' => 'Articles',	// TODO - Translation
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'Crear nuevo usuario',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	//TODO - Translation
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'delete_users' => 'Delete user',	// TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Idioma',
 		'list' => 'User list',	// TODO - Translation
 		'number' => 'Hay %d cuenta creada',
 		'numbers' => 'Hay %d cuentas creadas',
 		'password_form' => 'Contraseña<br /><small>(para el método de identificación por formulario web)</small>',
 		'password_format' => 'Mínimo de 7 caracteres',
-		'selected' => 'Selected user',	//TODO - Translation
+		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Administrar usuarios',
-		'update_users' => 'Update user',	//TODO - Translation
-		'user_list' => 'Lista de usuarios',
+		'update_users' => 'Update user',	// TODO - Translation
 		'username' => 'Nombre de usuario',
 		'users' => 'Usuarios',
+		'user_list' => 'Lista de usuarios',
 	),
 );

app/i18n/es/conf.php

@@ -2,34 +2,33 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archivo',
 		'delete_after' => 'Eliminar artículos tras',
-		'exception' => 'Purge exception',	//TODO - Translation
+		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'Hay más opciones disponibles en los ajustes de la fuente',
-		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
+		'keep_labels' => 'Never delete labels',	// TODO - Translation
+		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Número mínimo de artículos a conservar por fuente',
-		'keep_labels' => 'Never delete labels',	//TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
-		'maintenance' => 'Maintenance',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Optimizar la base de datos',
 		'optimize_help' => 'Ejecuta la optimización de vez en cuando para reducir el tamaño de la base de datos',
-		'policy' => 'Purge policy',	//TODO - Translation
-		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
+		'policy' => 'Purge policy',	// TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	// TODO - Translation
 		'purge_now' => 'Limpiar ahora',
-		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
-		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Archivo',
 		'ttl' => 'No actualizar automáticamente más de',
+		'_' => 'Archivo',
 	),
 	'display' => array(
-		'_' => 'Visualización',
 		'icon' => array(
 			'bottom_line' => 'Línea inferior',
+			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'Iconos de artículos',
 			'publication_date' => 'Fecha de publicación',
 			'related_tags' => 'Etiquetas relacionadas',
 			'sharing' => 'Compartir',
-			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Línea superior',
 		),
 		'language' => 'Idioma',
@@ -37,7 +36,7 @@ return array(
 			'seconds' => 'segundos (0 significa sin límite de espera)',
 			'timeout' => 'Notificación de fin de espera HTML5',
 		),
-		'show_nav_buttons' => 'Show the navigation buttons',	//TODO - Translation
+		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'Tema',
 		'title' => 'Visualización',
 		'width' => array(
@@ -47,35 +46,35 @@ return array(
 			'no_limit' => 'Sin límite',
 			'thin' => 'Estrecho',
 		),
+		'_' => 'Visualización',
 	),
 	'profile' => array(
-		'_' => 'Administración de perfiles',
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Borrar cuenta',
 			'warn' => 'Tu cuenta y todos los datos asociados serán eliminados.',
+			'_' => 'Borrar cuenta',
 		),
 		'email' => 'Correo electrónico',
 		'password_api' => 'Contraseña API <br /><small>(para apps móviles, por ej.)</small>',
 		'password_form' => 'Contraseña<br /><small>(para el método de identificación por formulario web)</small>',
 		'password_format' => 'Mínimo de 7 caracteres',
 		'title' => 'Perfil',
+		'_' => 'Administración de perfiles',
 	),
 	'query' => array(
-		'_' => 'Consultas de usuario',
 		'deprecated' => 'Esta consulta ya no es válida. La categoría referenciada o fuente ha sido eliminada.',
-		'display' => 'Display user query results',	//TODO - Translation
+		'display' => 'Display user query results',	// TODO - Translation
 		'filter' => 'Filtro aplicado:',
 		'get_all' => 'Mostrar todos los artículos',
 		'get_category' => 'Mostrar la categoría "%s"',
 		'get_favorite' => 'Mostrar artículos favoritos',
 		'get_feed' => 'Mostrar fuente "%s"',
-		'no_filter' => 'Sin filtro',
 		'none' => 'Todavía no has creado ninguna consulta de usuario.',
+		'no_filter' => 'Sin filtro',
 		'number' => 'Consulta n° %d',
 		'order_asc' => 'Mostrar primero los artículos más antiguos',
 		'order_desc' => 'Mostrar primero los artículos más recientes',
-		'remove' => 'Remove user query',	//TODO - Translation
+		'remove' => 'Remove user query',	// TODO - Translation
 		'search' => 'Buscar "%s"',
 		'state_0' => 'Mostrar todos los artículos',
 		'state_1' => 'Mostrar artículos leídos',
@@ -94,9 +93,9 @@ return array(
 		'state_14' => 'Mostrar artículos sin leer',
 		'state_15' => 'Mostrar todos los artículos',
 		'title' => 'Consultas de usuario',
+		'_' => 'Consultas de usuario',
 	),
 	'reading' => array(
-		'_' => 'Lectura',
 		'after_onread' => 'Tras “marcar todo como leído”,',
 		'articles_per_page' => 'Número de artículos por página',
 		'auto_load_more' => 'Cargar más artículos al final de la página',
@@ -117,16 +116,16 @@ return array(
 			'when' => 'Marcar el artículo como leído…',
 		),
 		'show' => array(
-			'_' => 'Artículos a mostrar',
 			'adaptive' => 'Ajustar la visualización',
 			'all_articles' => 'Mostrar todos los artículos',
 			'unread' => 'Mostrar solo pendientes',
+			'_' => 'Artículos a mostrar',
 		),
 		'sides_close_article' => 'Pinchar fuera del área de texto del artículo lo cerrará',
 		'sort' => array(
-			'_' => 'Orden',
 			'newer_first' => 'Nuevos primero',
 			'older_first' => 'Antiguos primero',
+			'_' => 'Orden',
 		),
 		'sticky_post' => 'Pegar el artículo a la parte superior al abrirlo',
 		'title' => 'Lectura',
@@ -136,26 +135,26 @@ return array(
 			'normal' => 'Vista Normal',
 			'reader' => 'Vista de Lectura',
 		),
+		'_' => 'Lectura',
 	),
 	'sharing' => array(
-		'_' => 'Compartir',
-		'add' => 'Add a sharing method',	//TODO - Translation
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
+		'add' => 'Add a sharing method',	// TODO - Translation
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
 		'more_information' => 'Más información',
-		'print' => 'Print',
-		'remove' => 'Remove sharing method',	//TODO - Translation
-		'shaarli' => 'Shaarli',
+		'print' => 'Print',	// TODO - Translation
+		'remove' => 'Remove sharing method',	// TODO - Translation
+		'shaarli' => 'Shaarli',	// TODO - Translation
 		'share_name' => 'Compartir nombre a mostrar',
 		'share_url' => 'Compatir URL a usar',
 		'title' => 'Compartir',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag',	// TODO - Translation
+		'_' => 'Compartir',
 	),
 	'shortcut' => array(
-		'_' => 'Atajos de teclado',
 		'article_action' => 'Acciones de artículo',
 		'auto_share' => 'Compartir',
 		'auto_share_help' => 'Si solo hay un modo para compartir, ese será el que se use. En caso contrario los modos quedarán accesibles por su numeración.',
@@ -163,7 +162,7 @@ return array(
 		'collapse_article' => 'Contraer',
 		'first_article' => 'Saltar al primer artículo',
 		'focus_search' => 'Acceso a la casilla de búsqueda',
-		'global_view' => 'Switch to global view',	//TODO - Translation
+		'global_view' => 'Switch to global view',	// TODO - Translation
 		'help' => 'Mostrar documentación',
 		'javascript' => 'JavaScript debe estar activado para poder usar atajos de teclado',
 		'last_article' => 'Saltar al último artículo',
@@ -172,21 +171,22 @@ return array(
 		'mark_read' => 'Marcar como leído',
 		'navigation' => 'Navegación',
 		'navigation_help' => 'Con el modificador "Mayúsculas" es posible usar los atajos de teclado en las fuentes.<br/>Con el modificador "Alt" es posible aplicar los atajos de teclado en las categorías.',
-		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	//TODO - Translation
+		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	// TODO - Translation
 		'next_article' => 'Saltar al siguiente artículo',
-		'normal_view' => 'Switch to normal view',	//TODO - Translation
+		'normal_view' => 'Switch to normal view',	// TODO - Translation
 		'other_action' => 'Otras acciones',
 		'previous_article' => 'Saltar al artículo anterior',
-		'reading_view' => 'Switch to reading view',	//TODO - Translation
-		'rss_view' => 'Open RSS view in a new tab',	//TODO - Translation
+		'reading_view' => 'Switch to reading view',	// TODO - Translation
+		'rss_view' => 'Open RSS view in a new tab',	// TODO - Translation
 		'see_on_website' => 'Ver en la web original',
 		'shift_for_all_read' => '+ <code>mayúsculas</code> para marcar todos los artículos como leídos',
-		'skip_next_article' => 'Focus next without opening',	//TODO - Translation
-		'skip_previous_article' => 'Focus previous without opening',	//TODO - Translation
+		'skip_next_article' => 'Focus next without opening',	// TODO - Translation
+		'skip_previous_article' => 'Focus previous without opening',	// TODO - Translation
 		'title' => 'Atajos de teclado',
 		'user_filter' => 'Acceso a filtros de usuario',
 		'user_filter_help' => 'Si solo hay un filtro de usuario, ese será el que se use. En caso contrario, los filtros están accesibles por su númeración.',
-		'views' => 'Views',	//TODO - Translation
+		'views' => 'Views',	// TODO - Translation
+		'_' => 'Atajos de teclado',
 	),
 	'user' => array(
 		'articles_and_size' => '%s artículos (%s)',

app/i18n/es/feedback.php

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimimización completada',
-	),
 	'access' => array(
 		'denied' => 'No dispones de permiso para acceder a esta página',
 		'not_found' => 'La página que buscas no existe',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Optimimización completada',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s no se puede activar. <a href="%s">Revisa el registro de FreshRSS</a> para más información.',
 			'ok' => '%s ha quedado activado',
 		),
-		'no_access' => 'No tienes acceso a %s',
 		'not_enabled' => '%s no está activado',
 		'not_found' => '%s no existe',
+		'no_access' => 'No tienes acceso a %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'La extensión ZIP no está disponible en tu servidor. Por favor, exporta estos archivos uno a uno.',
@@ -63,8 +63,8 @@ return array(
 	'sub' => array(
 		'actualize' => 'Actualización',
 		'articles' => array(
-			'marked_read' => 'The selected articles have been marked as read.',	//TODO - Translation
-			'marked_unread' => 'The articles have been marked as unread.',	//TODO - Translation
+			'marked_read' => 'The selected articles have been marked as read.',	// TODO - Translation
+			'marked_unread' => 'The articles have been marked as unread.',	// TODO - Translation
 		),
 		'category' => array(
 			'created' => 'Se ha creado la categoría %s.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'Se ha vaciado la categoría',
 			'error' => 'No es posible actualizar la categoría',
 			'name_exists' => 'Ya existe una categoría con ese nombre.',
-			'no_id' => 'Debes especificar la id de la categoría.',
-			'no_name' => '¡El nombre de la categoría no puede dejarse en blanco!.',
 			'not_delete_default' => '¡No puedes borrar la categoría por defecto!',
 			'not_exist' => 'La categoría no existe',
+			'no_id' => 'Debes especificar la id de la categoría.',
+			'no_name' => '¡El nombre de la categoría no puede dejarse en blanco!.',
 			'over_max' => 'Has alcanzado el límite de categorías (%d)',
 			'updated' => 'La categoría se ha actualizado.',
 		),
@@ -86,12 +86,12 @@ return array(
 			'already_subscribed' => 'Ya estás suscrito a <em>%s</em>',
 			'deleted' => 'Fuente eliminada',
 			'error' => 'No es posible actualizar la fuente',
-			'internal_problem' => 'No ha sido posible agregar la fuente RSS. <a href="%s">Revisa el registro de FreshRSS </a> para más información.',	//TODO - Translation
+			'internal_problem' => 'No ha sido posible agregar la fuente RSS. <a href="%s">Revisa el registro de FreshRSS </a> para más información.',
 			'invalid_url' => 'La URL <em>%s</em> es inválida',
+			'not_added' => '<em>%s</em> no ha podido se añadida',
+			'no_refresh' => 'No hay fuente a actualizar…',
 			'n_actualized' => 'Se han actualiado %d fuentes',
 			'n_entries_deleted' => 'Se han eliminado %d artículos',
-			'no_refresh' => 'No hay fuente a actualizar…',
-			'not_added' => '<em>%s</em> no ha podido se añadida',
 			'over_max' => 'Has alcanzado tu límite de fuentes (%d)',
 			'updated' => 'Fuente actualizada',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'Se ha creado el usuario %s',
 			'error' => 'No se ha podido crear al usuario %s',
+			'_' => 'Se ha creado el usuario %s',
 		),
 		'deleted' => array(
-			'_' => 'El usuario %s ha sido eliminado',
 			'error' => 'El usuario %s no ha podido ser eliminado',
+			'_' => 'El usuario %s ha sido eliminado',
 		),
 		'updated' => array(
-			'_' => 'User %s has been updated',	//TODO - Translation
-			'error' => 'User %s has not been updated',	//TODO - Translation
+			'error' => 'User %s has not been updated',	// TODO - Translation
+			'_' => 'User %s has been updated',	// TODO - Translation
 		),
 	),
 );

app/i18n/es/gen.php

@@ -3,7 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Actualizar',
-		'back' => '← Go back', //TODO - Translation
+		'back' => '← Go back',	// TODO - Translation
 		'back_to_rss_feeds' => '← regresar a tus fuentes RSS',
 		'cancel' => 'Cancelar',
 		'create' => 'Crear',
@@ -21,28 +21,28 @@ return array(
 		'see_website' => 'Ver web',
 		'submit' => 'Enviar',
 		'truncate' => 'Borrar todos los artículos',
-		'update' => 'Update',	//TODO - Translation
+		'update' => 'Update',	// TODO - Translation
 	),
 	'auth' => array(
-		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.',	// TODO - Translation
 		'email' => 'Correo electrónico',
 		'keep_logged_in' => 'Mantenerme identificado <small>(%s días)</small>',
 		'login' => 'Conectar',
 		'logout' => 'Desconectar',
 		'password' => array(
-			'_' => 'Contraseña',
 			'format' => '<small>Mínimo de 7 caracteres</small>',
+			'_' => 'Contraseña',
 		),
 		'registration' => array(
-			'_' => 'Nueva cuenta',
 			'ask' => '¿Crear una cuenta?',
 			'title' => 'Creación de cuenta',
+			'_' => 'Nueva cuenta',
 		),
 		'reset' => 'Reinicar identificación',
 		'username' => array(
-			'_' => 'Nombre de usuario',
 			'admin' => 'Nombre de usuario del Administrador',
 			'format' => '<small>máximo 16 caracteres alfanuméricos</small>',
+			'_' => 'Nombre de usuario',
 		),
 	),
 	'date' => array(
@@ -59,14 +59,14 @@ return array(
 		'Feb' => '\\F\\e\\b\\r\\e\\r\\o',
 		'feb' => 'feb',
 		'february' => 'febrero',
-		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
-		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',	// TODO - Translation
+		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',	// TODO - Translation
 		'fri' => 'Vie',
 		'Jan' => '\\E\\n\\e\\r\\o',
 		'jan' => 'ene',
 		'january' => 'ene',
-		'Jul' => '\\J\\u\\l\\i\\o',
 		'jul' => 'jul',
+		'Jul' => '\\J\\u\\l\\i\\o',
 		'july' => 'julio',
 		'Jun' => '\\J\\u\\n\\i\\o',
 		'jun' => 'jun',
@@ -76,8 +76,8 @@ return array(
 		'last_month' => 'Mes pasado',
 		'last_week' => 'Semana pasada',
 		'last_year' => 'Año pasado',
-		'Mar' => '\\M\\a\\r\\z\\o',
 		'mar' => 'mar',
+		'Mar' => '\\M\\a\\r\\z\\o',
 		'march' => 'marzo',
 		'May' => '\\M\\a\\y\\o',
 		'may' => 'mayo',
@@ -102,8 +102,8 @@ return array(
 		'yesterday' => 'Ayer',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => 'Acerca de FreshRSS',
+		'_' => 'FreshRSS',	// TODO - Translation
 	),
 	'js' => array(
 		'category_empty' => 'Vaciar categoría',
@@ -118,20 +118,21 @@ return array(
 		'should_be_activated' => 'JavaScript debe estar activado',
 	),
 	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'es' => 'Español',
-		'fr' => 'Français',
-		'he' => 'עברית',
-		'it' => 'Italiano',
-		'kr' => '한국어',
-		'nl' => 'Nederlands',
-		'oc' => 'Occitan',
-		'pt-br' => 'Português (Brasil)',
-		'ru' => 'Русский',
-		'tr' => 'Türkçe',
-		'zh-cn' => '简体中文',
+		'cz' => 'Čeština',	// TODO - Translation
+		'de' => 'Deutsch',	// TODO - Translation
+		'en' => 'English',	// TODO - Translation
+		'es' => 'Español',	// TODO - Translation
+		'fr' => 'Français',	// TODO - Translation
+		'he' => 'עברית',	// TODO - Translation
+		'it' => 'Italiano',	// TODO - Translation
+		'kr' => '한국어',	// TODO - Translation
+		'nl' => 'Nederlands',	// TODO - Translation
+		'oc' => 'Occitan',	// TODO - Translation
+		'pt-br' => 'Português (Brasil)',	// TODO - Translation
+		'ru' => 'Русский',	// TODO - Translation
+		'sk' => 'Slovenčina',	// TODO - Translation
+		'tr' => 'Türkçe',	// TODO - Translation
+		'zh-cn' => '简体中文',	// TODO - Translation
 	),
 	'menu' => array(
 		'about' => 'Acerca de',
@@ -164,31 +165,31 @@ return array(
 		'previous' => 'Anterior',
 	),
 	'period' => array(
-		'days' => 'days',	//TODO - Translation
-		'hours' => 'hours',	//TODO - Translation
-		'months' => 'months',	//TODO - Translation
-		'weeks' => 'weeks',	//TODO - Translation
-		'years' => 'years',	//TODO - Translation
+		'days' => 'days',	// TODO - Translation
+		'hours' => 'hours',	// TODO - Translation
+		'months' => 'months',	// TODO - Translation
+		'weeks' => 'weeks',	// TODO - Translation
+		'years' => 'years',	// TODO - Translation
 	),
 	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'gnusocial' => 'GNU social',
-		'jdh' => 'Journal du hacker',
-		'Known' => 'Known based sites',
-		'lemmy' => 'Lemmy',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
-		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
-		'print' => 'Print',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag v1',
-		'wallabagv2' => 'wallabag v2',
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
+		'gnusocial' => 'GNU social',	// TODO - Translation
+		'jdh' => 'Journal du hacker',	// TODO - Translation
+		'Known' => 'Known based sites',	// TODO - Translation
+		'lemmy' => 'Lemmy',	// TODO - Translation
+		'linkedin' => 'LinkedIn',	// TODO - Translation
+		'mastodon' => 'Mastodon',	// TODO - Translation
+		'movim' => 'Movim',	// TODO - Translation
+		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pocket' => 'Pocket',	// TODO - Translation
+		'print' => 'Print',	// TODO - Translation
+		'shaarli' => 'Shaarli',	// TODO - Translation
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag v1',	// TODO - Translation
+		'wallabagv2' => 'wallabag v2',	// TODO - Translation
 	),
 	'short' => array(
 		'attention' => '¡Aviso!',
@@ -197,7 +198,7 @@ return array(
 		'by_default' => 'Por defecto',
 		'damn' => '¡Córcholis!',
 		'default_category' => 'Sin categorizar',
-		'no' => 'No',
+		'no' => 'No',	// TODO - Translation
 		'not_applicable' => 'No disponible',
 		'ok' => '¡Vale!',
 		'or' => 'o',

app/i18n/es/index.php

@@ -2,8 +2,7 @@
 
 return array(
 	'about' => array(
-		'_' => 'Acerca de',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
 		'bugs_reports' => 'Informe de fallos',
 		'credits' => 'Créditos',
 		'credits_content' => 'Aunque FreshRSS no usa ese entorno, algunos elementos del diseño están obtenidos de <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>. Los <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Iconos</a> han sido obtenidos del <a href="https://www.gnome.org/">proyecto GNOME</a>. La fuente <em>Open Sans</em> es una creación de <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS usa el entorno PHP <a href="https://github.com/marienfressinaud/MINZ">Minz</a>.',
@@ -14,23 +13,21 @@ return array(
 		'title' => 'Acerca de',
 		'version' => 'Versión',
 		'website' => 'Web',
-	),
-	'tos' => array(
-		'title' => 'Terms of Service', // TODO - Translation
+		'_' => 'Acerca de',
 	),
 	'feed' => array(
 		'add' => 'Puedes añadir fuentes.',
 		'empty' => 'No hay artículos a mostrar.',
 		'rss_of' => 'Fuente RSS de %s',
 		'title' => 'Tus fuentes RSS',
-		'title_global' => 'Vista global',
 		'title_fav' => 'Tus favoritos',
+		'title_global' => 'Vista global',
 	),
 	'log' => array(
-		'_' => 'Registros',
 		'clear' => 'Limpiar registros',
 		'empty' => 'El archivo de registro está vacío',
 		'title' => 'Registros',
+		'_' => 'Registros',
 	),
 	'menu' => array(
 		'about' => 'Acerca de FreshRSS',
@@ -43,7 +40,7 @@ return array(
 		'mark_all_read' => 'Marcar todo como leído',
 		'mark_cat_read' => 'Marcar categoría como leída',
 		'mark_feed_read' => 'Marcar fuente como leída',
-		'mark_selection_unread' => 'Mark selection as unread',	//TODO - Translation
+		'mark_selection_unread' => 'Mark selection as unread',	// TODO - Translation
 		'newer_first' => 'Nuevos primero',
 		'non-starred' => 'Mostrar todos menos los favoritos',
 		'normal_view' => 'Vista normal',
@@ -56,11 +53,14 @@ return array(
 		'starred' => 'Mostrar solo los favoritos',
 		'stats' => 'Estadísticas',
 		'subscription' => 'Administración de suscripciones',
-		'tags' => 'My labels',	//TODO - Translation
+		'tags' => 'My labels',	// TODO - Translation
 		'unread' => 'Mostar solo no leídos',
 	),
 	'share' => 'Compartir',
 	'tag' => array(
-		'related' => 'Etiquetas relacionadas',	//TODO - Translation
+		'related' => 'Etiquetas relacionadas',
+	),
+	'tos' => array(
+		'title' => 'Terms of Service',	// TODO - Translation
 	),
 );

app/i18n/es/install.php

@@ -17,20 +17,19 @@ return array(
 		'type' => 'Método de identificación',
 	),
 	'bdd' => array(
-		'_' => 'Base de datos',
 		'conf' => array(
-			'_' => 'Configuración de la base de datos',
 			'ko' => 'Verificar la información de tu base de datos.',
 			'ok' => 'La configuración de la base de datos ha sido guardada.',
+			'_' => 'Configuración de la base de datos',
 		),
 		'host' => 'Servidor',
 		'password' => 'Contraseña de la base de datos',
 		'prefix' => 'Prefijo de la tabla',
 		'type' => 'Tipo de base de datos',
 		'username' => 'Nombre de usuario de la base de datos',
+		'_' => 'Base de datos',
 	),
 	'check' => array(
-		'_' => 'Verificaciones',
 		'already_installed' => '¡FreshRSS ya está instalado!',
 		'cache' => array(
 			'nok' => 'Comprueba los permisos en el directorio <em>./data/cache</em>. El servidor HTTP debe contar con permisos de escritura.',
@@ -69,8 +68,8 @@ return array(
 			'ok' => 'Dispones de la librería recomendada para procesar JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'No se ha podido localizar el entorno Minz.',
@@ -96,10 +95,11 @@ return array(
 			'nok' => 'No se ha podido localizar la librería necesaria para procesar XML.',
 			'ok' => 'Dispones de la librería necesaria para procesar XML.',
 		),
+		'_' => 'Verificaciones',
 	),
 	'conf' => array(
-		'_' => 'Configuración general',
 		'ok' => 'La configuración general se ha guardado.',
+		'_' => 'Configuración general',
 	),
 	'congratulations' => '¡Enhorabuena!',
 	'default_user' => 'Nombre de usuario para el usuario por defecto <small>(máximo de 16 caracteres alfanuméricos)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'Al reinstalar FreshRSS perderás cualquier configuración anterior. ¿Seguro que quieres continuar?',
 	),
 	'language' => array(
-		'_' => 'Idioma',
 		'choose' => 'Selecciona el idioma para FreshRSS',
 		'defined' => 'Idioma seleccionado.',
+		'_' => 'Idioma',
 	),
 	'not_deleted' => 'Parece que ha habido un error. Debes eliminar el archivo <em>%s</em> de forma manual.',
 	'ok' => 'La instalación se ha completado correctamente.',
 	'step' => 'paso %d',
 	'steps' => 'Pasos',
-	'title' => 'Instalación · FreshRSS',
 	'this_is_the_end' => '¡Terminamos!',
+	'title' => 'Instalación · FreshRSS',
 );

app/i18n/es/sub.php

@@ -2,24 +2,24 @@
 
 return array(
 	'api' => array(
-		'documentation' => 'Copy the following URL to use it within an external tool.',	//TODO - Translation
-		'title' => 'API',	//TODO - Translation
+		'documentation' => 'Copy the following URL to use it within an external tool.',	// TODO - Translation
+		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	//TODO - Translation
-		'label' => 'Subscribe',	//TODO - Translation
-		'title' => 'Bookmarklet',	//TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'label' => 'Subscribe',	// TODO - Translation
+		'title' => 'Bookmarklet',	// TODO - Translation
 	),
 	'category' => array(
-		'_' => 'Categoría',
 		'add' => 'Añadir a la categoría',
 		'archiving' => 'Archivo',
 		'empty' => 'Vaciar categoría',
 		'information' => 'Información',
 		'new' => 'Nueva categoría',
-		'position' => 'Display position',	//TODO - Translation
-		'position_help' => 'To control category sort order',	//TODO - Translation
+		'position' => 'Display position',	// TODO - Translation
+		'position_help' => 'To control category sort order',	// TODO - Translation
 		'title' => 'Título',
+		'_' => 'Categoría',
 	),
 	'feed' => array(
 		'add' => 'Añadir fuente RSS',
@@ -32,57 +32,57 @@ return array(
 			'password' => 'Contraseña HTTP',
 			'username' => 'Nombre de usuario HTTP',
 		),
-		'clear_cache' => 'Always clear cache',	//TODO - Translation
+		'clear_cache' => 'Always clear cache',	// TODO - Translation
 		'css_help' => 'Recibir fuentes RSS truncadas (aviso, ¡necesita más tiempo!)',
 		'css_path' => 'Ruta a la CSS de los artículos en la web original',
 		'description' => 'Descripción',
 		'empty' => 'La fuente está vacía. Por favor, verifica que siga activa.',
 		'error' => 'Hay un problema con esta fuente. Por favor, veritica que esté disponible y prueba de nuevo.',
 		'filteractions' => array(
-			'_' => 'Filter actions',	//TODO - Translation
-			'help' => 'Write one search filter per line.',	//TODO - Translation
+			'help' => 'Write one search filter per line.',	// TODO - Translation
+			'_' => 'Filter actions',	// TODO - Translation
 		),
 		'information' => 'Información',
 		'keep_min' => 'Número mínimo de artículos a conservar',
 		'moved_category_deleted' => 'Al borrar una categoría todas sus fuentes pasan automáticamente a la categoría <em>%s</em>.',
-		'mute' => 'mute',	//TODO - Translation
+		'mute' => 'mute',	// TODO - Translation
 		'no_selected' => 'No hay funentes seleccionadas.',
 		'number_entries' => '%d artículos',
 		'priority' => array(
-			'_' => 'Visibility',	//TODO - Translation
-			'archived' => 'Do not show (archived)',	//TODO - Translation
+			'archived' => 'Do not show (archived)',	// TODO - Translation
 			'main_stream' => 'Mostrar en salida principal',
-			'normal' => 'Show in its category',	//TODO - Translation
+			'normal' => 'Show in its category',	// TODO - Translation
+			'_' => 'Visibility',	// TODO - Translation
 		),
-		'websub' => 'Notificación inmedaiata con WebSub',
 		'show' => array(
-			'all' => 'Show all feeds',	//TODO - Translation
-			'error' => 'Show only feeds with error',	//TODO - Translation
+			'all' => 'Show all feeds',	// TODO - Translation
+			'error' => 'Show only feeds with error',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	//TODO - Translation
+			'error' => 'Showing only feeds with error',	// TODO - Translation
 		),
-		'ssl_verify' => 'Verify SSL security',	//TODO - Translation
+		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'Estadísticas',
 		'think_to_add' => 'Puedes añadir fuentes.',
-		'timeout' => 'Timeout in seconds',	//TODO - Translation
+		'timeout' => 'Timeout in seconds',	// TODO - Translation
 		'title' => 'Título',
 		'title_add' => 'Añadir fuente RSS',
 		'ttl' => 'No actualizar de forma automática con una frecuencia mayor a',
 		'url' => 'URL de la fuente',
 		'validator' => 'Verifica la validez de la fuente',
 		'website' => 'Web de la URL',
+		'websub' => 'Notificación inmedaiata con WebSub',
 	),
 	'firefox' => array(
-		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
-		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
-		'title' => 'Firefox feed reader',	//TODO - Translation
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	// TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	// TODO - Translation
+		'title' => 'Firefox feed reader',	// TODO - Translation
 	),
 	'import_export' => array(
 		'export' => 'Exportar',
+		'export_labelled' => 'Export your labelled articles',	// TODO - Translation
 		'export_opml' => 'Exportar la lista de fuentes (OPML)',
 		'export_starred' => 'Exportar tus favoritos',
-		'export_labelled' => 'Export your labelled articles',	//TODO
 		'feed_list' => 'Lista de %s artículos',
 		'file_to_import' => 'Archivo a importar<br />(OPML, JSON o ZIP)',
 		'file_to_import_no_zip' => 'Archivo a importar<br />(OPML o JSON)',
@@ -94,11 +94,11 @@ return array(
 		'bookmark' => 'Suscribirse (favorito FreshRSS)',
 		'import_export' => 'Importar / exportar',
 		'subscription_management' => 'Administración de suscripciones',
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 	'title' => array(
-		'_' => 'Administración de suscripciones',
 		'feed_management' => 'Administración de fuentes RSS',
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
+		'_' => 'Administración de suscripciones',
 	),
 );

app/i18n/es/user.php

@@ -3,35 +3,35 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.', //TODO - Translation
-			'required' => 'The email address is required.', //TODO - Translation
+			'invalid' => 'The email address is invalid.',	// TODO - Translation
+			'required' => 'The email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
-			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
-				'email_sent' => 'An email has been sent to your address.', //TODO - Translation
-				'error' => 'The email address failed to be validated.', //TODO - Translation
-				'ok' => 'The email address has been validated.', //TODO - Translation
-				'unneccessary' => 'The email address was already validated.', //TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
+				'error' => 'The email address failed to be validated.',	// TODO - Translation
+				'ok' => 'The email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
-			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
-			'resend_email' => 'Resend the email', //TODO - Translation
-			'title' => 'Email address validation', //TODO - Translation
-		),
-	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
+			'resend_email' => 'Resend the email',	// TODO - Translation
+			'title' => 'Email address validation',	// TODO - Translation
 		),
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'title' => 'You need to validate your account', //TODO - Translation
-			'welcome' => 'Welcome %s,', //TODO - Translation
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'title' => 'You need to validate your account',	// TODO - Translation
+			'welcome' => 'Welcome %s,',	// TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.',	// TODO - Translation
 		),
 	),
 );

app/i18n/fr/admin.php

@@ -83,9 +83,9 @@ return array(
 			'ok' => 'Vous disposez de PDO et d’au moins un des drivers supportés (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'Installation de PHP',
 			'nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
 			'ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS.',
+			'_' => 'Installation de PHP',
 		),
 		'tables' => array(
 			'nok' => 'Impossible de trouver une ou plusieurs tables en base de données.',
@@ -108,7 +108,7 @@ return array(
 	'extensions' => array(
 		'author' => 'Auteur',
 		'community' => 'Extensions utilisateur disponibles',
-		'description' => 'Description',
+		'description' => 'Description',	// TODO - Translation
 		'disabled' => 'Désactivée',
 		'empty_list' => 'Aucune extension installée',
 		'enabled' => 'Activée',
@@ -116,16 +116,15 @@ return array(
 		'name' => 'Nom',
 		'no_configure_view' => 'Cette extension n’a pas à être configurée',
 		'system' => array(
-			'_' => 'Extensions système',
 			'no_rights' => 'Extensions système (contrôlées par l’administrateur)',
+			'_' => 'Extensions système',
 		),
 		'title' => 'Extensions',
 		'update' => 'Mise à jour disponible',
 		'user' => 'Extensions utilisateur',
-		'version' => 'Version',
+		'version' => 'Version',	// TODO - Translation
 	),
 	'stats' => array(
-		'_' => 'Statistiques',
 		'all_feeds' => 'Tous les flux',
 		'category' => 'Catégorie',
 		'entry_count' => 'Nombre d’articles',
@@ -155,35 +154,36 @@ return array(
 		'status_unread' => 'non lus',
 		'title' => 'Statistiques',
 		'top_feed' => 'Les dix plus gros flux',
+		'_' => 'Statistiques',
 	),
 	'system' => array(
-		'_' => 'Configuration du système',
 		'auto-update-url' => 'URL du service de mise à jour',
-		'force_email_validation' => 'Forcer la validation des adresses email',
-		'instance-name' => 'Nom de l’instance',
-		'max-categories' => 'Limite de catégories par utilisateur',
-		'max-feeds' => 'Limite de flux par utilisateur',
 		'cookie-duration' => array(
 			'help' => 'en secondes',
 			'number' => 'Durée avant expiration de la session',
 		),
+		'force_email_validation' => 'Forcer la validation des adresses email',
+		'instance-name' => 'Nom de l’instance',
+		'max-categories' => 'Limite de catégories par utilisateur',
+		'max-feeds' => 'Limite de flux par utilisateur',
 		'registration' => array(
 			'help' => 'Un chiffre de 0 signifie que l’on peut créer un nombre infini de comptes',
 			'number' => 'Nombre max de comptes',
 		),
+		'_' => 'Configuration du système',
 	),
 	'update' => array(
-		'_' => 'Système de mise à jour',
 		'apply' => 'Appliquer la mise à jour',
 		'check' => 'Vérifier les mises à jour',
 		'current_version' => 'Votre version actuelle de FreshRSS est la %s.',
 		'last' => 'Dernière vérification : %s',
 		'none' => 'Aucune mise à jour à appliquer',
 		'title' => 'Système de mise à jour',
+		'_' => 'Système de mise à jour',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
-		'article_count' => 'Articles',
+		'article_count' => 'Articles',	// TODO - Translation
 		'back_to_manage' => '← Revenir à la liste des utilisateurs',
 		'create' => 'Créer un nouvel utilisateur',
 		'database_size' => 'Volumétrie',
@@ -198,8 +198,8 @@ return array(
 		'selected' => 'Utilisateur sélectionné',
 		'title' => 'Gestion des utilisateurs',
 		'update_users' => 'Mettre à jour un utilisateur',
-		'user_list' => 'Liste des utilisateurs',
 		'username' => 'Nom d’utilisateur',
 		'users' => 'Utilisateurs',
+		'user_list' => 'Liste des utilisateurs',
 	),
 );

app/i18n/fr/conf.php

@@ -2,34 +2,33 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archivage',
 		'delete_after' => 'Supprimer les articles après',
 		'exception' => 'Exception de nettoyage',
 		'help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 		'keep_favourites' => 'Ne jamais supprimer les articles favoris',
-		'keep_min_by_feed' => 'Nombre minimum d’articles à conserver par flux',
 		'keep_labels' => 'Ne jamais supprimer les articles étiquetés',
+		'keep_max' => 'Nombre maximum d’articles à conserver',
+		'keep_min_by_feed' => 'Nombre minimum d’articles à conserver par flux',
+		'keep_period' => 'Âge maximum des articles à conserver',
 		'keep_unreads' => 'Ne jamais supprimer les articles non lus',
-		'maintenance' => 'Maintenance',
+		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Optimiser la base de données',
 		'optimize_help' => 'À faire de temps en temps pour réduire la taille de la BDD',
 		'policy' => 'Politique de nettoyage',
 		'policy_warning' => 'Si aucune politique de nettoyage n’est sélectionnée, tous les articles seront conservés.',
 		'purge_now' => 'Purger maintenant',
-		'keep_max' => 'Nombre maximum d’articles à conserver',
-		'keep_period' => 'Âge maximum des articles à conserver',
 		'title' => 'Archivage',
 		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
+		'_' => 'Archivage',
 	),
 	'display' => array(
-		'_' => 'Affichage',
 		'icon' => array(
 			'bottom_line' => 'Ligne du bas',
+			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'Icônes d’article',
 			'publication_date' => 'Date de publication',
 			'related_tags' => 'Tags de l’article',
 			'sharing' => 'Partage',
-			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Ligne du haut',
 		),
 		'language' => 'Langue',
@@ -47,22 +46,22 @@ return array(
 			'no_limit' => 'Pas de limite',
 			'thin' => 'Fine',
 		),
+		'_' => 'Affichage',
 	),
 	'profile' => array(
-		'_' => 'Gestion du profil',
 		'api' => 'Gestion de l’API',
 		'delete' => array(
-			'_' => 'Suppression du compte',
 			'warn' => 'Le compte et toutes les données associées vont être supprimées.',
+			'_' => 'Suppression du compte',
 		),
 		'email' => 'Adresse email',
 		'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 		'password_format' => '7 caractères minimum',
 		'title' => 'Profil',
+		'_' => 'Gestion du profil',
 	),
 	'query' => array(
-		'_' => 'Filtres utilisateurs',
 		'deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
 		'display' => 'Afficher les résultats du filtre',
 		'filter' => 'Filtres appliqués :',
@@ -70,8 +69,8 @@ return array(
 		'get_category' => 'Afficher la catégorie "%s"',
 		'get_favorite' => 'Afficher les articles favoris',
 		'get_feed' => 'Afficher le flux "%s"',
-		'no_filter' => 'Aucun filtre appliqué',
 		'none' => 'Vous n’avez pas encore créé de filtre.',
+		'no_filter' => 'Aucun filtre appliqué',
 		'number' => 'Filtre n°%d',
 		'order_asc' => 'Afficher les articles les plus anciens en premier',
 		'order_desc' => 'Afficher les articles les plus récents en premier',
@@ -94,9 +93,9 @@ return array(
 		'state_14' => 'Afficher les articles non lus',
 		'state_15' => 'Afficher tous les articles',
 		'title' => 'Filtres utilisateurs',
+		'_' => 'Filtres utilisateurs',
 	),
 	'reading' => array(
-		'_' => 'Lecture',
 		'after_onread' => 'Après “marquer tout comme lu”,',
 		'articles_per_page' => 'Nombre d’articles par page',
 		'auto_load_more' => 'Charger les articles suivants en bas de page',
@@ -117,16 +116,16 @@ return array(
 			'when' => 'Marquer un article comme lu…',
 		),
 		'show' => array(
-			'_' => 'Articles à afficher',
 			'adaptive' => 'Adapter l’affichage',
 			'all_articles' => 'Afficher tous les articles',
 			'unread' => 'Afficher les non lus',
+			'_' => 'Articles à afficher',
 		),
 		'sides_close_article' => 'Cliquer hors de la zone de texte ferme l’article',
 		'sort' => array(
-			'_' => 'Ordre de tri',
 			'newer_first' => 'Plus récents en premier',
 			'older_first' => 'Plus anciens en premier',
+			'_' => 'Ordre de tri',
 		),
 		'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
 		'title' => 'Lecture',
@@ -136,9 +135,9 @@ return array(
 			'normal' => 'Vue normale',
 			'reader' => 'Vue lecture',
 		),
+		'_' => 'Lecture',
 	),
 	'sharing' => array(
-		'_' => 'Partage',
 		'add' => 'Ajouter une méthode de partage',
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
@@ -153,9 +152,9 @@ return array(
 		'title' => 'Partage',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'_' => 'Partage',
 	),
 	'shortcut' => array(
-		'_' => 'Raccourcis',
 		'article_action' => 'Actions associées à l’article courant',
 		'auto_share' => 'Partager',
 		'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
@@ -187,6 +186,7 @@ return array(
 		'user_filter' => 'Accéder aux filtres utilisateur',
 		'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 		'views' => 'Vues',
+		'_' => 'Raccourcis',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',

app/i18n/fr/feedback.php

@@ -1,13 +1,13 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimisation terminée.',
-	),
 	'access' => array(
 		'denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
 		'not_found' => 'La page que vous cherchez n’existe pas !',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Optimisation terminée.',
+	),
 	'api' => array(
 		'password' => array(
 			'failed' => 'Votre mot de passe n’a pas pu être mis à jour',
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s ne peut pas être activée. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
 			'ok' => '%s est désormais activée',
 		),
-		'no_access' => 'Vous n’avez aucun accès sur %s',
 		'not_enabled' => '%s n’est pas encore activée',
 		'not_found' => '%s n’existe pas',
+		'no_access' => 'Vous n’avez aucun accès sur %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'L’extension ZIP n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'La catégorie a été vidée.',
 			'error' => 'La catégorie n’a pas pu être modifiée',
 			'name_exists' => 'Une catégorie possède déjà ce nom.',
-			'no_id' => 'Vous devez préciser l’id de la catégorie.',
-			'no_name' => 'Vous devez préciser un nom pour la catégorie.',
 			'not_delete_default' => 'Vous ne pouvez pas supprimer la catégorie par défaut !',
 			'not_exist' => 'Cette catégorie n’existe pas !',
+			'no_id' => 'Vous devez préciser l’id de la catégorie.',
+			'no_name' => 'Vous devez préciser un nom pour la catégorie.',
 			'over_max' => 'Vous avez atteint votre limite de catégories (%d)',
 			'updated' => 'La catégorie a été mise à jour.',
 		),
@@ -88,10 +88,10 @@ return array(
 			'error' => 'Une erreur est survenue',
 			'internal_problem' => 'Le flux ne peut pas être ajouté. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails. Vous pouvez essayer de forcer l’ajout par addition de <code>#force_feed</code> à l’URL.',
 			'invalid_url' => 'L’url <em>%s</em> est invalide.',
+			'not_added' => '<em>%s</em> n’a pas pu être ajouté.',
+			'no_refresh' => 'Il n’y a aucun flux à actualiser…',
 			'n_actualized' => '%d flux ont été mis à jour.',
 			'n_entries_deleted' => '%d articles ont été supprimés.',
-			'no_refresh' => 'Il n’y a aucun flux à actualiser…',
-			'not_added' => '<em>%s</em> n’a pas pu être ajouté.',
 			'over_max' => 'Vous avez atteint votre limite de flux (%d)',
 			'updated' => 'Le flux a été mis à jour',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'L’utilisateur %s a été créé.',
 			'error' => 'L’utilisateur %s ne peut pas être créé.',
+			'_' => 'L’utilisateur %s a été créé.',
 		),
 		'deleted' => array(
-			'_' => 'L’utilisateur %s a été supprimé.',
 			'error' => 'L’utilisateur %s ne peut pas être supprimé.',
+			'_' => 'L’utilisateur %s a été supprimé.',
 		),
 		'updated' => array(
-			'_' => 'L’utilisateur %s a été mis à jour',
 			'error' => 'L’utilisateur %s n’a pas été mis à jour',
+			'_' => 'L’utilisateur %s a été mis à jour',
 		),
 	),
 );

app/i18n/fr/gen.php

@@ -30,19 +30,19 @@ return array(
 		'login' => 'Connexion',
 		'logout' => 'Déconnexion',
 		'password' => array(
-			'_' => 'Mot de passe',
 			'format' => '<small>7 caractères minimum</small>',
+			'_' => 'Mot de passe',
 		),
 		'registration' => array(
-			'_' => 'Nouveau compte',
 			'ask' => 'Créer un compte ?',
 			'title' => 'Création de compte',
+			'_' => 'Nouveau compte',
 		),
 		'reset' => 'Réinitialisation de l’authentification',
 		'username' => array(
-			'_' => 'Nom d’utilisateur',
 			'admin' => 'Nom d’utilisateur administrateur',
 			'format' => '<small>16 caractères alphanumériques maximum</small>',
+			'_' => 'Nom d’utilisateur',
 		),
 	),
 	'date' => array(
@@ -65,8 +65,8 @@ return array(
 		'Jan' => '\\j\\a\\n\\v\\i\\e\\r',
 		'jan' => 'jan.',
 		'january' => 'janvier',
-		'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
 		'jul' => 'jui.',
+		'Jul' => '\\j\\u\\i\\l\\l\\e\\t',
 		'july' => 'juillet',
 		'Jun' => '\\j\\u\\i\\n',
 		'jun' => 'juin',
@@ -76,8 +76,8 @@ return array(
 		'last_month' => 'Depuis le mois dernier',
 		'last_week' => 'Depuis la semaine dernière',
 		'last_year' => 'Depuis l’année dernière',
-		'Mar' => '\\m\\a\\r\\s',
 		'mar' => 'mars',
+		'Mar' => '\\m\\a\\r\\s',
 		'march' => 'mars',
 		'May' => '\\m\\a\\i',
 		'may' => 'mai',
@@ -102,8 +102,8 @@ return array(
 		'yesterday' => 'Hier',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => 'À propos de FreshRSS',
+		'_' => 'FreshRSS',
 	),
 	'js' => array(
 		'category_empty' => 'Catégorie vide',
@@ -123,13 +123,14 @@ return array(
 		'en' => 'English',
 		'es' => 'Español',
 		'fr' => 'Français',
-		'he' => 'עברית',
+		'he' => 'עברית',	// TODO - Translation
 		'it' => 'Italiano',
 		'kr' => '한국어',
 		'nl' => 'Nederlands',
-		'oc' => 'Occitan',
+		'oc' => 'Occitan',	// TODO - Translation
 		'pt-br' => 'Português (Brasil)',
 		'ru' => 'Русский',
+		'sk' => 'Slovenčina',	// TODO - Translation
 		'tr' => 'Türkçe',
 		'zh-cn' => '简体中文',
 	),
@@ -179,11 +180,11 @@ return array(
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Sites basés sur Known',
 		'lemmy' => 'Lemmy',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
+		'linkedin' => 'LinkedIn',	// TODO - Translation
+		'mastodon' => 'Mastodon',	// TODO - Translation
 		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
+		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pocket' => 'Pocket',	// TODO - Translation
 		'print' => 'Imprimer',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',

app/i18n/fr/index.php

@@ -2,7 +2,6 @@
 
 return array(
 	'about' => array(
-		'_' => 'À propos',
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => 'Rapports de bugs',
 		'credits' => 'Crédits',
@@ -14,23 +13,21 @@ return array(
 		'title' => 'À propos',
 		'version' => 'Version',
 		'website' => 'Site Internet',
-	),
-	'tos' => array(
-		'title' => 'Conditions Générales d’Utilisation',
+		'_' => 'À propos',
 	),
 	'feed' => array(
 		'add' => 'Vous pouvez ajouter des flux.',
 		'empty' => 'Il n’y a aucun article à afficher.',
 		'rss_of' => 'Flux RSS de %s',
 		'title' => 'Vos flux RSS',
-		'title_global' => 'Vue globale',
 		'title_fav' => 'Vos favoris',
+		'title_global' => 'Vue globale',
 	),
 	'log' => array(
-		'_' => 'Logs',
 		'clear' => 'Effacer les logs',
 		'empty' => 'Les logs sont vides.',
 		'title' => 'Logs',
+		'_' => 'Logs',
 	),
 	'menu' => array(
 		'about' => 'À propos de FreshRSS',
@@ -63,4 +60,7 @@ return array(
 	'tag' => array(
 		'related' => 'Tags de l’article',
 	),
+	'tos' => array(
+		'title' => 'Conditions Générales d’Utilisation',
+	),
 );

app/i18n/fr/install.php

@@ -17,20 +17,19 @@ return array(
 		'type' => 'Méthode d’authentification',
 	),
 	'bdd' => array(
-		'_' => 'Base de données',
 		'conf' => array(
-			'_' => 'Configuration de la base de données',
 			'ko' => 'Vérifiez les informations d’accès à la base de données.',
 			'ok' => 'La configuration de la base de données a été enregistrée.',
+			'_' => 'Configuration de la base de données',
 		),
 		'host' => 'Hôte',
 		'password' => 'Mot de passe pour base de données',
 		'prefix' => 'Préfixe des tables',
 		'type' => 'Type de base de données',
 		'username' => 'Nom d’utilisateur pour base de données',
+		'_' => 'Base de données',
 	),
 	'check' => array(
-		'_' => 'Vérifications',
 		'already_installed' => 'FreshRSS semble avoir déjà été installé !',
 		'cache' => array(
 			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/cache</em>. Le serveur HTTP doit être capable d’écrire dedans',
@@ -96,10 +95,11 @@ return array(
 			'nok' => 'Impossible de trouver une librairie requise pour XML.',
 			'ok' => 'Vouz disposez de la librairie requise pour XML.',
 		),
+		'_' => 'Vérifications',
 	),
 	'conf' => array(
-		'_' => 'Configuration générale',
 		'ok' => 'La configuration générale a été enregistrée.',
+		'_' => 'Configuration générale',
 	),
 	'congratulations' => 'Félicitations !',
 	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'Réinstaller FreshRSS vous fera perdre la configuration précédente. Êtes-vous sûr de vouloir continuer ?',
 	),
 	'language' => array(
-		'_' => 'Langue',
 		'choose' => 'Choisissez la langue pour FreshRSS',
 		'defined' => 'La langue a bien été définie.',
+		'_' => 'Langue',
 	),
 	'not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
 	'ok' => 'L’installation s’est bien passée.',
 	'step' => 'étape %d',
 	'steps' => 'Étapes',
-	'title' => 'Installation · FreshRSS',
 	'this_is_the_end' => 'This is the end',
+	'title' => 'Installation · FreshRSS',
 );

app/i18n/fr/sub.php

@@ -3,7 +3,7 @@
 return array(
 	'api' => array(
 		'documentation' => 'Copier l’URL suivante dans l’outil qui utilisera l’API.',
-		'title' => 'API',
+		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
 		'documentation' => 'Glisser ce bouton dans la barre des favoris ou cliquer droit dessus et choisir "Enregistrer ce lien". Ensuite, cliquer sur le bouton "S’abonner" sur les pages auxquelles vous voulez vous abonner.',
@@ -11,7 +11,6 @@ return array(
 		'title' => 'Bookmarklet',
 	),
 	'category' => array(
-		'_' => 'Catégorie',
 		'add' => 'Ajouter une catégorie',
 		'archiving' => 'Archivage',
 		'empty' => 'Catégorie vide',
@@ -20,6 +19,7 @@ return array(
 		'position' => 'Position d’affichage',
 		'position_help' => 'Pour contrôler l’ordre de tri des catégories',
 		'title' => 'Titre',
+		'_' => 'Catégorie',
 	),
 	'feed' => array(
 		'add' => 'Ajouter un flux RSS',
@@ -39,8 +39,8 @@ return array(
 		'empty' => 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
 		'error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
 		'filteractions' => array(
-			'_' => 'Filtres d’action',
 			'help' => 'Écrivez une recherche par ligne.',
+			'_' => 'Filtres d’action',
 		),
 		'information' => 'Informations',
 		'keep_min' => 'Nombre minimum d’articles à conserver',
@@ -49,12 +49,11 @@ return array(
 		'no_selected' => 'Aucun flux sélectionné.',
 		'number_entries' => '%d articles',
 		'priority' => array(
-			'_' => 'Visibilité',
 			'archived' => 'Ne pas afficher (archivé)',
 			'main_stream' => 'Afficher dans le flux principal',
 			'normal' => 'Afficher dans sa catégorie',
+			'_' => 'Visibilité',
 		),
-		'websub' => 'Notification instantanée par WebSub',
 		'show' => array(
 			'all' => 'Montrer tous les flux',
 			'error' => 'Montrer seulement les flux en erreur',
@@ -72,6 +71,7 @@ return array(
 		'url' => 'URL du flux',
 		'validator' => 'Vérifier la validité du flux',
 		'website' => 'URL du site',
+		'websub' => 'Notification instantanée par WebSub',
 	),
 	'firefox' => array(
 		'documentation' => 'Suivre les étapes décrites <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">ici</a> pour ajouter FreshRSS à la liste des lecteurs de flux dans Firefox.',
@@ -80,9 +80,9 @@ return array(
 	),
 	'import_export' => array(
 		'export' => 'Exporter',
+		'export_labelled' => 'Exporter les articles étiquetés',
 		'export_opml' => 'Exporter la liste des flux (OPML)',
 		'export_starred' => 'Exporter les favoris',
-		'export_labelled' => 'Exporter les articles étiquetés',
 		'feed_list' => 'Liste des articles de %s',
 		'file_to_import' => 'Fichier à importer<br />(OPML, JSON ou ZIP)',
 		'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou JSON)',
@@ -97,8 +97,8 @@ return array(
 		'subscription_tools' => 'Outils d’abonnement',
 	),
 	'title' => array(
-		'_' => 'Gestion des abonnements',
 		'feed_management' => 'Gestion des flux RSS',
 		'subscription_tools' => 'Outils d’abonnement',
+		'_' => 'Gestion des abonnements',
 	),
 );

app/i18n/fr/user.php

@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'Un email a été envoyé à votre adresse.',
 				'error' => 'L’adresse email n’a pas pu être validée.',
 				'ok' => 'L’adresse email a été validée.',
-				'unnecessary' => 'L’adresse email a déjà été validée.',
+				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
 				'wrong_token' => 'L’adresse email n’a pas pu être validée à cause d’un mauvais token.',
 			),
 			'need_to' => 'Vous devez valider votre adresse email avant de pouvoir utiliser %s.',
@@ -22,16 +22,16 @@ return array(
 			'title' => 'Validation de l’adresse email',
 		),
 	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'Vous devez accepter les conditions générales d’utilisation pour pouvoir vous inscrire.',
-		),
-	),
 	'mailer' => array(
 		'email_need_validation' => array(
+			'body' => 'Vous venez de vous inscrire sur %s mais vous devez encore valider votre adresse email. Pour cela, veuillez cliquer sur ce lien :',
 			'title' => 'Vous devez valider votre compte',
 			'welcome' => 'Bienvenue %s,',
-			'body' => 'Vous venez de vous inscrire sur %s mais vous devez encore valider votre adresse email. Pour cela, veuillez cliquer sur ce lien :',
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'Vous devez accepter les conditions générales d’utilisation pour pouvoir vous inscrire.',
 		),
 	),
 );

app/i18n/he/admin.php

@@ -8,10 +8,10 @@ return array(
 		'form' => 'טופס אינטרנטי (מסורתי, דורש JavaScript)',
 		'http' => 'HTTP (למשתמשים מתקדמים עם HTTPS)',
 		'none' => 'ללא (מסוכן)',
-		'title' => 'Authentication',	//TODO - Translation
+		'title' => 'Authentication',	// TODO - Translation
 		'title_reset' => 'איפוס אימות',
 		'token' => 'מחרוזת אימות',
-		'token_help' => 'Allows to access RSS output of the default user without authentication:',	//TODO - Translation
+		'token_help' => 'Allows to access RSS output of the default user without authentication:',
 		'type' => 'שיטת אימות',
 		'unsafe_autologin' => 'הרשאה להתחברות אוטומטית בפורמט: ',
 	),
@@ -21,12 +21,12 @@ return array(
 			'ok' => 'ההרשאות בתיקיית המטמון תקינות',
 		),
 		'categories' => array(
-			'nok' => 'Category table is bad configured.',	//TODO - Translation
-			'ok' => 'Category table is ok.',	//TODO - Translation
+			'nok' => 'Category table is bad configured.',
+			'ok' => 'Category table is ok.',	// TODO - Translation
 		),
 		'connection' => array(
-			'nok' => 'Connection to the database cannot being established.',	//TODO - Translation
-			'ok' => 'Connection to the database is ok.',	//TODO - Translation
+			'nok' => 'Connection to the database cannot being established.',
+			'ok' => 'Connection to the database is ok.',	// TODO - Translation
 		),
 		'ctype' => array(
 			'nok' => 'הספרייה הנדרשת ל character type checking (php-ctype) אינה מותקנת',
@@ -34,44 +34,44 @@ return array(
 		),
 		'curl' => array(
 			'nok' => 'בURL לא מותקן (php-curl package)',
-			'ok' => 'You have cURL extension.',	//TODO - Translation
+			'ok' => 'You have cURL extension.',
 		),
 		'data' => array(
 			'nok' => 'יש לבדוק את ההרשאות בתיקייה <em>%s</em>. שרת הHTTP חייב להיות בעל הרשאות כתיבה.',
 			'ok' => 'ההרשאות בתיקיית הדאטא תקינות',
 		),
-		'database' => 'Database installation',	//TODO - Translation
+		'database' => 'Database installation',	// TODO - Translation
 		'dom' => array(
-			'nok' => 'הספרייה הנדרשת לסיור ב DOM אינה מותקנת  (php-xml package)',
+			'nok' => 'הספרייה הנדרשת לסיור ב DOM אינה מותקנת	(php-xml package)',
 			'ok' => 'הספרייה הנדרשת לסיור ב DOM מותקנת',
 		),
 		'entries' => array(
-			'nok' => 'Entry table is bad configured.',	//TODO - Translation
-			'ok' => 'Entry table is ok.',	//TODO - Translation
+			'nok' => 'Entry table is bad configured.',
+			'ok' => 'Entry table is ok.',	// TODO - Translation
 		),
 		'favicons' => array(
-			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',	//TODO - Translation
+			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',	// TODO - Translation
 			'ok' => 'ההרשאות בתיקיית הfavicons תקינות',
 		),
 		'feeds' => array(
-			'nok' => 'Feed table is bad configured.',	//TODO - Translation
-			'ok' => 'Feed table is ok.',	//TODO - Translation
+			'nok' => 'Feed table is bad configured.',
+			'ok' => 'Feed table is ok.',	// TODO - Translation
 		),
 		'fileinfo' => array(
-			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',	//TODO - Translation
-			'ok' => 'You have the fileinfo library.',	//TODO - Translation
+			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',	// TODO - Translation
+			'ok' => 'You have the fileinfo library.',	// TODO - Translation
 		),
-		'files' => 'File installation',	//TODO - Translation
+		'files' => 'File installation',	// TODO - Translation
 		'json' => array(
-			'nok' => 'You lack JSON (php-json package).',	//TODO - Translation
-			'ok' => 'You have JSON extension.',	//TODO - Translation
+			'nok' => 'You lack JSON (php-json package).',
+			'ok' => 'You have JSON extension.',	// TODO - Translation
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
-			'nok' => 'You lack the Minz framework.',	//TODO - Translation
+			'nok' => 'You lack the Minz framework.',
 			'ok' => 'יש לכם את תשתית Minz',
 		),
 		'pcre' => array(
@@ -83,57 +83,56 @@ return array(
 			'ok' => 'PDO מותקן ולפחות אחד ממנהלי ההתקן הנתמכים מותקן (pdo_mysql, pdo_sqlite)',
 		),
 		'php' => array(
-			'_' => 'PHP installation',	//TODO - Translation
 			'nok' => 'גירסת PHP שלכם היא %s אך FreshRSS דורש לפחות את גירסה %s',
 			'ok' => 'גירסת PHP שלכם היא %s, שתואמת ל FreshRSS',
+			'_' => 'PHP installation',	// TODO - Translation
 		),
 		'tables' => array(
-			'nok' => 'There is one or more lacking tables in the database.',	//TODO - Translation
-			'ok' => 'Tables are existing in the database.',	//TODO - Translation
+			'nok' => 'There is one or more lacking tables in the database.',
+			'ok' => 'Tables are existing in the database.',
 		),
-		'title' => 'Installation checking',	//TODO - Translation
+		'title' => 'Installation checking',	// TODO - Translation
 		'tokens' => array(
-			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',	//TODO - Translation
-			'ok' => 'Permissions on tokens directory are good.',	//TODO - Translation
+			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',	// TODO - Translation
+			'ok' => 'Permissions on tokens directory are good.',	// TODO - Translation
 		),
 		'users' => array(
-			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',	//TODO - Translation
-			'ok' => 'Permissions on users directory are good.',	//TODO - Translation
+			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',	// TODO - Translation
+			'ok' => 'Permissions on users directory are good.',	// TODO - Translation
 		),
 		'zip' => array(
-			'nok' => 'You lack ZIP extension (php-zip package).',	//TODO - Translation
-			'ok' => 'You have ZIP extension.',	//TODO - Translation
+			'nok' => 'You lack ZIP extension (php-zip package).',
+			'ok' => 'You have ZIP extension.',	// TODO - Translation
 		),
 	),
 	'extensions' => array(
-		'author' => 'Author',	//TODO - Translation
-		'community' => 'Available community extensions',	//TODO - Translation
-		'description' => 'Description',	//TODO - Translation
-		'disabled' => 'Disabled',	//TODO - Translation
-		'empty_list' => 'There is no installed extension',	//TODO - Translation
-		'enabled' => 'Enabled',	//TODO - Translation
-		'latest' => 'Installed',	//TODO - Translation
-		'name' => 'Name',	//TODO - Translation
-		'no_configure_view' => 'This extension cannot be configured.',	//TODO - Translation
+		'author' => 'Author',	// TODO - Translation
+		'community' => 'Available community extensions',	// TODO - Translation
+		'description' => 'Description',	// TODO - Translation
+		'disabled' => 'Disabled',	// TODO - Translation
+		'empty_list' => 'There is no installed extension',
+		'enabled' => 'Enabled',	// TODO - Translation
+		'latest' => 'Installed',	// TODO - Translation
+		'name' => 'Name',	// TODO - Translation
+		'no_configure_view' => 'This extension cannot be configured.',	// TODO - Translation
 		'system' => array(
-			'_' => 'System extensions',	//TODO - Translation
-			'no_rights' => 'System extension (you have no rights on it)',	//TODO - Translation
+			'no_rights' => 'System extension (you have no rights on it)',	// TODO - Translation
+			'_' => 'System extensions',	// TODO - Translation
 		),
-		'title' => 'Extensions',	//TODO - Translation
-		'update' => 'Update available',	//TODO - Translation
-		'user' => 'User extensions',	//TODO - Translation
-		'version' => 'Version',	//TODO - Translation
+		'title' => 'Extensions',	// TODO - Translation
+		'update' => 'Update available',	// TODO - Translation
+		'user' => 'User extensions',	// TODO - Translation
+		'version' => 'Version',	// TODO - Translation
 	),
 	'stats' => array(
-		'_' => 'סטטיסטיקות',
 		'all_feeds' => 'כל ההזנות',
 		'category' => 'קטגוריה',
 		'entry_count' => 'סכום המאמרים',
 		'entry_per_category' => 'מאמרים על פי קטגוריה',
 		'entry_per_day' => 'מספר מאמרים ליום (30 ימים אחרונים)',
-		'entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',	//TODO - Translation
-		'entry_per_hour' => 'Per hour (average: %.2f messages)',	//TODO - Translation
-		'entry_per_month' => 'Per month (average: %.2f messages)',	//TODO - Translation
+		'entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',	// TODO - Translation
+		'entry_per_hour' => 'Per hour (average: %.2f messages)',	// TODO - Translation
+		'entry_per_month' => 'Per month (average: %.2f messages)',	// TODO - Translation
 		'entry_repartition' => 'חלוקת המאמרים',
 		'feed' => 'הזנה',
 		'feed_per_category' => 'הזנות על פי קטגוריה',
@@ -155,51 +154,52 @@ return array(
 		'status_unread' => 'לא נקרא',
 		'title' => 'סטטיסטיקות',
 		'top_feed' => 'עשרת ההזנות המובילות',
+		'_' => 'סטטיסטיקות',
 	),
 	'system' => array(
-		'_' => 'System configuration', //TODO - Translation
-		'auto-update-url' => 'Auto-update server URL', //TODO - Translation
+		'auto-update-url' => 'Auto-update server URL',	// TODO - Translation
 		'cookie-duration' => array(
-			'help' => 'in seconds', //TODO - Translation
-			'number' => 'Duration to keep logged in', //TODO - Translation
+			'help' => 'in seconds',	// TODO - Translation
+			'number' => 'Duration to keep logged in',	// TODO - Translation
 		),
-		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
-		'instance-name' => 'Instance name', //TODO - Translation
-		'max-categories' => 'Categories per user limit', //TODO - Translation
-		'max-feeds' => 'Feeds per user limit', //TODO - Translation
+		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'instance-name' => 'Instance name',	// TODO - Translation
+		'max-categories' => 'Categories per user limit',	// TODO - Translation
+		'max-feeds' => 'Feeds per user limit',	// TODO - Translation
 		'registration' => array(
-			'help' => '0 means that there is no account limit',	//TODO - Translation
-			'number' => 'Max number of accounts',	//TODO - Translation
+			'help' => '0 means that there is no account limit',	// TODO - Translation
+			'number' => 'Max number of accounts',	// TODO - Translation
 		),
+		'_' => 'System configuration',	// TODO - Translation
 	),
 	'update' => array(
-		'_' => 'מערכת העדכון',
 		'apply' => 'החלת העדכון',
 		'check' => 'בדיקת עדכונים חדשים',
-		'current_version' => 'Your current version of FreshRSS is the %s.',	//TODO - Translation
+		'current_version' => 'Your current version of FreshRSS is the %s.',
 		'last' => 'תאריך בדיקה אחרון: %s',
 		'none' => 'אין עדכון להחלה',
 		'title' => 'מערכת העדכון',
+		'_' => 'מערכת העדכון',
 	),
 	'user' => array(
-		'articles_and_size' => '%s articles (%s)',	//TODO - Translation
+		'articles_and_size' => '%s articles (%s)',	// TODO - Translation
 		'article_count' => 'Articles',	// TODO - Translation
-		'back_to_manage' => '← Return to user list',
+		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'יצירת משתמש חדש',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	//TODO - Translation
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'delete_users' => 'Delete user',	// TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'שפה',
 		'list' => 'User list',	// TODO - Translation
-		'number' => 'There is %d account created',	//TODO - Translation
-		'numbers' => 'There are %d accounts created',	//TODO - Translation
+		'number' => 'There is %d account created',	// TODO - Translation
+		'numbers' => 'There are %d accounts created',	// TODO - Translation
 		'password_form' => 'סיסמה<br /><small>(לשימוש בטפוס ההרשמה)</small>',
-		'password_format' => 'At least 7 characters',	//TODO - Translation
-		'selected' => 'Selected user',	//TODO - Translation
-		'title' => 'Manage users',	//TODO - Translation
-		'update_users' => 'Update user',	//TODO - Translation
-		'user_list' => 'רשימת משתמשים',
+		'password_format' => 'At least 7 characters',	// TODO - Translation
+		'selected' => 'Selected user',	// TODO - Translation
+		'title' => 'Manage users',	// TODO - Translation
+		'update_users' => 'Update user',	// TODO - Translation
 		'username' => 'שם משתמש',
 		'users' => 'משתמשים',
+		'user_list' => 'רשימת משתמשים',
 	),
 );

app/i18n/he/conf.php

@@ -2,34 +2,33 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'ארכוב',
 		'delete_after' => 'מחיקת מאמרים לאחר',
-		'exception' => 'Purge exception',	//TODO - Translation
+		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'אפשרויות נוספות זמינות בזרמים ספציפיים',
-		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
-		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',
-		'keep_labels' => 'Never delete labels',	//TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
-		'maintenance' => 'Maintenance',	//TODO - Translation
+		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
+		'keep_labels' => 'Never delete labels',	// TODO - Translation
+		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
+		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',	// TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'מיטוב בסיס הנתונים',
 		'optimize_help' => 'ביצוע לעיתים קרובות על מנת למטב את בסיס הנתונים',
-		'policy' => 'Purge policy',	//TODO - Translation
-		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
+		'policy' => 'Purge policy',	// TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	// TODO - Translation
 		'purge_now' => 'ניקוי עכשיו',
-		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
-		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'ארכוב',
 		'ttl' => 'אין לרענן אוטומטית יותר מ',
+		'_' => 'ארכוב',
 	),
 	'display' => array(
-		'_' => 'תצוגה',
 		'icon' => array(
 			'bottom_line' => 'שורה תחתונה',
+			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'סמלילי מאמרים',
 			'publication_date' => 'תאריך הפרסום',
-			'related_tags' => 'תגיות קשורות',	//TODO - Translation
+			'related_tags' => 'תגיות קשורות',
 			'sharing' => 'שיתוף',
-			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'שורה עליונה',
 		),
 		'language' => 'שפה',
@@ -37,7 +36,7 @@ return array(
 			'seconds' => 'שניות (0 משמעותה ללא פג תוקף)',
 			'timeout' => 'HTML5 התראה פג תוקף',
 		),
-		'show_nav_buttons' => 'Show the navigation buttons',	//TODO - Translation
+		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'ערכת נושא',
 		'title' => 'תצוגה',
 		'width' => array(
@@ -47,35 +46,35 @@ return array(
 			'no_limit' => 'ללא הגבלה',
 			'thin' => 'צר',
 		),
+		'_' => 'תצוגה',
 	),
 	'profile' => array(
-		'_' => 'Profile management',	//TODO - Translation
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Account deletion',	//TODO - Translation
-			'warn' => 'Your account and all related data will be deleted.',	//TODO - Translation
+			'warn' => 'Your account and all related data will be deleted.',	// TODO - Translation
+			'_' => 'Account deletion',	// TODO - Translation
 		),
-		'email' => 'Email address',	//TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
 		'password_api' => 'סיסמת API<br /><small>(לדוגמה ליישומים סלולריים)</small>',
 		'password_form' => 'סיסמה<br /><small>(לשימוש בטפוס ההרשמה)</small>',
-		'password_format' => 'At least 7 characters',	//TODO - Translation
-		'title' => 'Profile',	//TODO - Translation
+		'password_format' => 'At least 7 characters',	// TODO - Translation
+		'title' => 'Profile',	// TODO - Translation
+		'_' => 'Profile management',	// TODO - Translation
 	),
 	'query' => array(
-		'_' => 'שאילתות',
 		'deprecated' => 'שאילתה זו אינה בתוקף יותר, הפיד או הקטגוריה לייחוס נמחקו.',
-		'display' => 'Display user query results',	//TODO - Translation
+		'display' => 'Display user query results',	// TODO - Translation
 		'filter' => 'מסננים בשימוש:',
 		'get_all' => 'הצגת כל המאמרים',
 		'get_category' => 'הצגת קטגוריה "%s"',
 		'get_favorite' => 'הצגת מאמרים מועדפים',
 		'get_feed' => 'הצגת הזנה %s',
-		'no_filter' => 'ללא סינון',
 		'none' => 'אף שאילתה לא נוצרה עדיין.',
+		'no_filter' => 'ללא סינון',
 		'number' => 'שאילתה מספר °%d',
 		'order_asc' => 'הצגת מאמרים ישנים בראש',
 		'order_desc' => 'הצגת מאמרים חדשים בראש',
-		'remove' => 'Remove user query',	//TODO - Translation
+		'remove' => 'Remove user query',	// TODO - Translation
 		'search' => 'חיפוש "%s"',
 		'state_0' => 'הצגת כל המאמרים',
 		'state_1' => 'הצגת מאמרים שנקראו',
@@ -92,22 +91,22 @@ return array(
 		'state_12' => 'הצגת כל המאמרים',
 		'state_13' => 'הצגת מאמרים שנקראו',
 		'state_14' => 'הצגת מאמרים שלא נקראו',
-		'state_15' => 'הצגת  כל המאמרים',
+		'state_15' => 'הצגת	כל המאמרים',
 		'title' => 'שאילתות',
+		'_' => 'שאילתות',
 	),
 	'reading' => array(
-		'_' => 'קריאה',
 		'after_onread' => 'לאחר “סימון הכל כנקרא”,',
 		'articles_per_page' => 'מספר המאמרים בעמוד',
 		'auto_load_more' => 'טעינת המאמר הבא סוף העמוד',
-		'auto_remove_article' => 'Hide articles after reading',	//TODO - Translation
+		'auto_remove_article' => 'Hide articles after reading',	// TODO - Translation
 		'confirm_enabled' => 'הצגת דו-שיח לאישור “סימון הכל כנקרא” ',
 		'display_articles_unfolded' => 'הצגת מאמרים בשלמותם כברירת מחדל',
 		'display_categories_unfolded' => 'הצגת קטגוריות בשלמותן כברירת מחדל',
 		'hide_read_feeds' => 'הסתרת קטגוריות &amp; הזנות ללא מאמרים שלא נקראו (לא עובד יחד עם “הצגת כל המאמרים”)',
 		'img_with_lazyload' => 'שימוש ב "טעינה עצלה" על מנת לטעון תמונות',
 		'jump_next' => 'קפיצה לפריט הבא שלא נקרא (הזנה או קטגוריה)',
-		'mark_updated_article_unread' => 'Mark updated articles as unread',	//TODO - Translation
+		'mark_updated_article_unread' => 'Mark updated articles as unread',	// TODO - Translation
 		'number_divided_when_reader' => 'חלוקה ב2 במצב קריאה.',
 		'read' => array(
 			'article_open_on_website' => 'כאשר מאמר נפתח באתר המקורי',
@@ -117,16 +116,16 @@ return array(
 			'when' => 'סימון מאמרים כנקראו…',
 		),
 		'show' => array(
-			'_' => 'מאמרים להצגה',
 			'adaptive' => 'תצוגה מתעדכנת',
 			'all_articles' => 'הצגת כל המאמרים',
 			'unread' => 'הצגת מאמרים שלא נקראו בלבד',
+			'_' => 'מאמרים להצגה',
 		),
-		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO - Translation
+		'sides_close_article' => 'Clicking outside of article text area closes the article',	// TODO - Translation
 		'sort' => array(
-			'_' => 'סדר המיון',
 			'newer_first' => 'חדשים בראש',
 			'older_first' => 'ישנים יותר בראש',
+			'_' => 'סדר המיון',
 		),
 		'sticky_post' => 'הצמדת המאמר לחלק העליון כאשר הוא פתוח',
 		'title' => 'קריאה',
@@ -136,34 +135,34 @@ return array(
 			'normal' => 'תצוגה רגילה',
 			'reader' => 'תצוגת קריאה',
 		),
+		'_' => 'קריאה',
 	),
 	'sharing' => array(
-		'_' => 'שיתוף',
-		'add' => 'Add a sharing method',	//TODO - Translation
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
+		'add' => 'Add a sharing method',	// TODO - Translation
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
 		'email' => 'דואר אלקטרוני',
-		'facebook' => 'Facebook',
+		'facebook' => 'Facebook',	// TODO - Translation
 		'more_information' => 'מידע נוסף',
 		'print' => 'הדפסה',
-		'remove' => 'Remove sharing method',	//TODO - Translation
-		'shaarli' => 'Shaarli',
+		'remove' => 'Remove sharing method',	// TODO - Translation
+		'shaarli' => 'Shaarli',	// TODO - Translation
 		'share_name' => 'שיתוף שם לתצוגה',
 		'share_url' => 'לשימוש שתפו URL',
 		'title' => 'שיתוף',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag',	// TODO - Translation
+		'_' => 'שיתוף',
 	),
 	'shortcut' => array(
-		'_' => 'קיצורי דרך',
 		'article_action' => 'פעולות על מאמרים',
 		'auto_share' => 'שיתוף',
 		'auto_share_help' => 'אם יש רק מצב שיתוף אחד, הוא מופעל. אחרת המצבים נבחרים על בסיס המספר שלהם.',
-		'close_dropdown' => 'Close menus',	//TODO - Translation
+		'close_dropdown' => 'Close menus',	// TODO - Translation
 		'collapse_article' => 'כיווץ',
 		'first_article' => 'דילוג למאמר הראשון',
 		'focus_search' => 'גישה לתיבת החיפוש',
-		'global_view' => 'Switch to global view',	//TODO - Translation
+		'global_view' => 'Switch to global view',	// TODO - Translation
 		'help' => 'הצגת התיעוד',
 		'javascript' => 'חובה להפעיל JavaScript על מנת לעשות שימוש בקיצורי דרך',
 		'last_article' => 'דילוג למאמר האחרון',
@@ -172,24 +171,25 @@ return array(
 		'mark_read' => 'סימון כנקרא',
 		'navigation' => 'ניווט',
 		'navigation_help' => 'בעזרת מקש השיפט קיצורי דרך חלים על הזנות .<br/>עם מקש האלט הם חלים על קטגוריות.',
-		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	//TODO - Translation
+		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	// TODO - Translation
 		'next_article' => 'דילוג למאמר הבא',
-		'normal_view' => 'Switch to normal view',	//TODO - Translation
+		'normal_view' => 'Switch to normal view',	// TODO - Translation
 		'other_action' => 'פעולות אחרות',
 		'previous_article' => 'דילוג למאמר הקודם',
-		'reading_view' => 'Switch to reading view',	//TODO - Translation
-		'rss_view' => 'Open RSS view in a new tab',	//TODO - Translation
+		'reading_view' => 'Switch to reading view',	// TODO - Translation
+		'rss_view' => 'Open RSS view in a new tab',	// TODO - Translation
 		'see_on_website' => 'ראו את המקור באתר',
 		'shift_for_all_read' => '+ <code>shift</code> על מנת לסמן את כל המאמרים כנקראו',
-		'skip_next_article' => 'Focus next without opening',	//TODO - Translation
-		'skip_previous_article' => 'Focus previous without opening',	//TODO - Translation
+		'skip_next_article' => 'Focus next without opening',	// TODO - Translation
+		'skip_previous_article' => 'Focus previous without opening',	// TODO - Translation
 		'title' => 'קיצורי דרך',
 		'user_filter' => 'גישה למססנים',
 		'user_filter_help' => 'אם יש רק מזנן אחד הוא יהיה בשימוש. אחרת המסננים ישמשו על בסיס המספר שלהם.',
-		'views' => 'Views',	//TODO - Translation
+		'views' => 'Views',	// TODO - Translation
+		'_' => 'קיצורי דרך',
 	),
 	'user' => array(
-		'articles_and_size' => '%s articles (%s)',	//TODO - Translation
+		'articles_and_size' => '%s articles (%s)',	// TODO - Translation
 		'current' => 'משתמש נוכחי',
 		'is_admin' => 'מנהל',
 		'users' => 'משתמשים',

app/i18n/he/feedback.php

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'המיטוב הושלם',
-	),
 	'access' => array(
 		'denied' => 'אין לך הרשאות לצפות בדף זה',
 		'not_found' => 'הדף הזה לא נמצא',
 	),
+	'admin' => array(
+		'optimization_complete' => 'המיטוב הושלם',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -21,32 +21,32 @@ return array(
 		),
 		'login' => array(
 			'invalid' => 'הכניסה לחשבון שגויה',
-			'success' => 'You are connected', // @todo
+			'success' => 'You are connected',	// TODO - Translation
 		),
 		'logout' => array(
-			'success' => 'You are disconnected', // @todo
+			'success' => 'You are disconnected',	// TODO - Translation
 		),
 		'no_password_set' => 'לא הוגדרה סיסמת מנהל. תכונה זו אינה זמינה.',
 	),
 	'conf' => array(
-		'error' => 'An error occurred during configuration saving', // @todo
+		'error' => 'An error occurred during configuration saving',	// TODO - Translation
 		'query_created' => 'השאילתה "%s" נוצרה.',
 		'shortcuts_updated' => 'קיצורי הדרך עודכנו',
 		'updated' => 'ההגדרות עודכנו',
 	),
 	'extensions' => array(
-		'already_enabled' => '%s is already enabled', // @todo
+		'already_enabled' => '%s is already enabled',	// TODO - Translation
 		'disable' => array(
-			'ko' => '%s cannot be disabled. <a href="%s">Check FreshRSS logs</a> for details.', // @todo
-			'ok' => '%s is now disabled', // @todo
+			'ko' => '%s cannot be disabled. <a href="%s">Check FreshRSS logs</a> for details.',	// TODO - Translation
+			'ok' => '%s is now disabled',	// TODO - Translation
 		),
 		'enable' => array(
-			'ko' => '%s cannot be enabled. <a href="%s">Check FreshRSS logs</a> for details.', // @todo
-			'ok' => '%s is now enabled', // @todo
+			'ko' => '%s cannot be enabled. <a href="%s">Check FreshRSS logs</a> for details.',	// TODO - Translation
+			'ok' => '%s is now enabled',	// TODO - Translation
 		),
-		'no_access' => 'You have no access on %s', // @todo
-		'not_enabled' => '%s is not enabled yet', // @todo
-		'not_found' => '%s does not exist', // @todo
+		'not_enabled' => '%s is not enabled yet',
+		'not_found' => '%s does not exist',	// TODO - Translation
+		'no_access' => 'You have no access on %s',	// TODO - Translation
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'הרחבת ZIP אינה מותקנת על השרת.',
@@ -57,27 +57,27 @@ return array(
 		'zip_error' => 'אירעה שגיאה במהלך ייבוא קובץ הZIP.',
 	),
 	'profile' => array(
-		'error' => 'Your profile cannot be modified', // @todo
-		'updated' => 'Your profile has been modified', // @todo
+		'error' => 'Your profile cannot be modified',	// TODO - Translation
+		'updated' => 'Your profile has been modified',	// TODO - Translation
 	),
 	'sub' => array(
 		'actualize' => 'מימוש',
 		'articles' => array(
-			'marked_read' => 'The selected articles have been marked as read.',	//TODO - Translation
-			'marked_unread' => 'The articles have been marked as unread.',	//TODO - Translation
+			'marked_read' => 'The selected articles have been marked as read.',	// TODO - Translation
+			'marked_unread' => 'The articles have been marked as unread.',	// TODO - Translation
 		),
 		'category' => array(
-			'created' => 'Category %s has been created.',	//TODO - Translation
-			'deleted' => 'Category has been deleted.',	//TODO - Translation
+			'created' => 'Category %s has been created.',	// TODO - Translation
+			'deleted' => 'Category has been deleted.',	// TODO - Translation
 			'emptied' => 'הקטגוריה רוקנה',
-			'error' => 'Category cannot be updated',	//TODO - Translation
-			'name_exists' => 'Category name already exists.',	//TODO - Translation
-			'no_id' => 'You must precise the id of the category.',	//TODO - Translation
-			'no_name' => 'Category name cannot be empty.',	//TODO - Translation
-			'not_delete_default' => 'You cannot delete the default category!',	//TODO - Translation
-			'not_exist' => 'The category does not exist!',	//TODO - Translation
-			'over_max' => 'You have reached your limit of categories (%d)',	//TODO - Translation
-			'updated' => 'Category has been updated.',	//TODO - Translation
+			'error' => 'Category cannot be updated',	// TODO - Translation
+			'name_exists' => 'Category name already exists.',	// TODO - Translation
+			'not_delete_default' => 'You cannot delete the default category!',	// TODO - Translation
+			'not_exist' => 'The category does not exist!',	// TODO - Translation
+			'no_id' => 'You must precise the id of the category.',
+			'no_name' => 'Category name cannot be empty.',	// TODO - Translation
+			'over_max' => 'You have reached your limit of categories (%d)',	// TODO - Translation
+			'updated' => 'Category has been updated.',	// TODO - Translation
 		),
 		'feed' => array(
 			'actualized' => '<em>%s</em> עודכן',
@@ -85,20 +85,20 @@ return array(
 			'added' => 'RSS הזנת <em>%s</em> נוספה',
 			'already_subscribed' => 'אתה כבר רשום ל <em>%s</em>',
 			'deleted' => 'ההזנה נמחקה',
-			'error' => 'Feed cannot be updated',	//TODO - Translation
-			'internal_problem' => 'אין אפשרות להוסיף את ההזנה. <a href="%s">בדקו את הלוגים</a> לפרטים.',	//TODO - Translation
+			'error' => 'Feed cannot be updated',	// TODO - Translation
+			'internal_problem' => 'אין אפשרות להוסיף את ההזנה. <a href="%s">בדקו את הלוגים</a> לפרטים.',
 			'invalid_url' => 'URL <em>%s</em> אינו תקין',
+			'not_added' => '<em>%s</em> אין אפשרות להוסיף את',
+			'no_refresh' => 'אין הזנה שניתן לרענן…',
 			'n_actualized' => '%d הזנות עודכנו',
 			'n_entries_deleted' => '%d המאמרים נמחקו',
-			'no_refresh' => 'אין הזנה שניתן לרענן…',
-			'not_added' => '<em>%s</em> אין אפשרות להוסיף את',
-			'over_max' => 'You have reached your limit of feeds (%d)',	//TODO - Translation
+			'over_max' => 'You have reached your limit of feeds (%d)',	// TODO - Translation
 			'updated' => 'ההזנה התעדכנה',
 		),
 		'purge_completed' => 'הניקוי הושלם (%d מאמרים נמחקו)',
 	),
 	'update' => array(
-		'can_apply' => 'FreshRSS will be now updated to the <strong>version %s</strong>.',	//TODO - Translation
+		'can_apply' => 'FreshRSS will be now updated to the <strong>version %s</strong>.',
 		'error' => 'תהליך העדכון נתקל בשגיאה: %s',
 		'file_is_nok' => 'יש לבדוק את ההרשאות בתיקייה <em>%s</em>. שרת הHTTP חייב להיות בעל הרשאות כתיבה.',
 		'finished' => 'העדכון הושלם!',
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
+			'error' => 'User %s cannot be created',	// TODO - Translation
 			'_' => 'המשתמש %s נוצר',
-			'error' => 'User %s cannot be created',	//TODO - Translation
 		),
 		'deleted' => array(
+			'error' => 'User %s cannot be deleted',	// TODO - Translation
 			'_' => 'המשתמש %s נמחק',
-			'error' => 'User %s cannot be deleted',	//TODO - Translation
 		),
 		'updated' => array(
-			'_' => 'User %s has been updated',	//TODO - Translation
-			'error' => 'User %s has not been updated',	//TODO - Translation
+			'error' => 'User %s has not been updated',	// TODO - Translation
+			'_' => 'User %s has been updated',	// TODO - Translation
 		),
 	),
 );

app/i18n/he/gen.php

@@ -3,72 +3,72 @@
 return array(
 	'action' => array(
 		'actualize' => 'מימוש',
-		'back' => '← Go back', //TODO - Translation
+		'back' => '← Go back',	// TODO - Translation
 		'back_to_rss_feeds' => '← חזרה להזנות הRSS שלך',
 		'cancel' => 'ביטול',
 		'create' => 'יצירה',
-		'disable' => 'Disable',	//TODO - Translation
-		'empty' => 'Empty',	//TODO - Translation
-		'enable' => 'Enable',	//TODO - Translation
+		'disable' => 'Disable',	// TODO - Translation
+		'empty' => 'Empty',	// TODO - Translation
+		'enable' => 'Enable',	// TODO - Translation
 		'export' => 'ייצוא',
 		'filter' => 'מסנן',
 		'import' => 'ייבוא',
 		'manage' => 'ניהול',
-		'mark_read' => 'סימון כנקרא',
 		'mark_favorite' => 'סימון כמועדף',
+		'mark_read' => 'סימון כנקרא',
 		'purge' => 'Purge',	// TODO - Translation
-		'remove' => 'Remove',	//TODO - Translation
+		'remove' => 'Remove',	// TODO - Translation
 		'see_website' => 'ראו אתר',
 		'submit' => 'אישור',
 		'truncate' => 'מחיקת כל המאמרים',
-		'update' => 'Update',	//TODO - Translation
+		'update' => 'Update',	// TODO - Translation
 	),
 	'auth' => array(
-		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
-		'email' => 'Email address',	//TODO - Translation
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.',	// TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
 		'keep_logged_in' => 'השאר מחובר <small>חודש</small>',
 		'login' => 'כניסה לחשבון',
 		'logout' => 'יציאה מהחשבון',
 		'password' => array(
+			'format' => '<small>At least 7 characters</small>',	// TODO - Translation
 			'_' => 'סיסמה',
-			'format' => '<small>At least 7 characters</small>',
 		),
 		'registration' => array(
-			'_' => 'New account',	//TODO - Translation
-			'ask' => 'Create an account?',	//TODO - Translation
-			'title' => 'Account creation',	//TODO - Translation
+			'ask' => 'Create an account?',	// TODO - Translation
+			'title' => 'Account creation',	// TODO - Translation
+			'_' => 'New account',	// TODO - Translation
 		),
 		'reset' => 'איפוס אימות',
 		'username' => array(
-			'_' => 'שם משתמש',
 			'admin' => 'שם משתמש של המנהל',
-			'format' => '<small>maximum 16 alphanumeric characters</small>',	//TODO - Translation
+			'format' => '<small>maximum 16 alphanumeric characters</small>',	// TODO - Translation
+			'_' => 'שם משתמש',
 		),
 	),
 	'date' => array(
-		'Apr' => '\\A\\p\\r\\i\\l',
+		'Apr' => '\\A\\p\\r\\i\\l',	// TODO - Translation
 		'apr' => 'apr',
 		'april' => 'Apr',
-		'Aug' => '\\A\\u\\g\\u\\s\\t',
+		'Aug' => '\\A\\u\\g\\u\\s\\t',	// TODO - Translation
 		'aug' => 'aug',
 		'august' => 'Aug',
 		'before_yesterday' => 'ישן יותר',
-		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
+		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',	// TODO - Translation
 		'dec' => 'dec',
 		'december' => 'Dec',
-		'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
+		'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',	// TODO - Translation
 		'feb' => 'feb',
 		'february' => 'Feb',
-		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
-		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
-		'fri' => 'Fri',
-		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
+		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',	// TODO - Translation
+		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',	// TODO - Translation
+		'fri' => 'Fri',	// TODO - Translation
+		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',	// TODO - Translation
 		'jan' => 'jan',
 		'january' => 'Jan',
-		'Jul' => '\\J\\u\\l\\y',
 		'jul' => 'jul',
+		'Jul' => '\\J\\u\\l\\y',	// TODO - Translation
 		'july' => 'Jul',
-		'Jun' => '\\J\\u\\n\\e',
+		'Jun' => '\\J\\u\\n\\e',	// TODO - Translation
 		'jun' => 'jun',
 		'june' => 'Jun',
 		'last_3_month' => 'בשלושת החודשים האחרונים',
@@ -76,72 +76,73 @@ return array(
 		'last_month' => 'בחודש שעבר',
 		'last_week' => 'בשבוע שעבר',
 		'last_year' => 'בשנה האחרונה',
-		'Mar' => '\\M\\a\\r\\c\\h',
 		'mar' => 'mar',
+		'Mar' => '\\M\\a\\r\\c\\h',	// TODO - Translation
 		'march' => 'Mar',
-		'May' => '\\M\\a\\y',
-		'may' => 'May',
-		'may_' => 'May',
-		'mon' => 'Mon',
+		'May' => '\\M\\a\\y',	// TODO - Translation
+		'may' => 'May',	// TODO - Translation
+		'may_' => 'May',	// TODO - Translation
+		'mon' => 'Mon',	// TODO - Translation
 		'month' => 'חודשים',
-		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',	// TODO - Translation
 		'nov' => 'nov',
 		'november' => 'Nov',
-		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
+		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',	// TODO - Translation
 		'oct' => 'oct',
 		'october' => 'Oct',
-		'sat' => 'Sat',
-		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+		'sat' => 'Sat',	// TODO - Translation
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',	// TODO - Translation
 		'sep' => 'sep',
 		'september' => 'Sep',
-		'sun' => 'Sun',
-		'thu' => 'Thu',
+		'sun' => 'Sun',	// TODO - Translation
+		'thu' => 'Thu',	// TODO - Translation
 		'today' => 'היום',
-		'tue' => 'Tue',
-		'wed' => 'Wed',
+		'tue' => 'Tue',	// TODO - Translation
+		'wed' => 'Wed',	// TODO - Translation
 		'yesterday' => 'אתמול',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => 'אודות FreshRSS',
+		'_' => 'FreshRSS',	// TODO - Translation
 	),
 	'js' => array(
-		'category_empty' => 'Empty category',	//TODO - Translation
+		'category_empty' => 'Empty category',	// TODO - Translation
 		'confirm_action' => 'האם אתם בטוחים שברצונכם לבצע פעולה זו? אין אפשרות לבטל אותה!',
 		'confirm_action_feed_cat' => 'האם אתם בטוחים שברצוניכם לבצע פעולה זו? מועדפים ושאילתות עשויות לאבוד. אין אפשרות לבטל אותה!',
 		'feedback' => array(
-			'body_new_articles' => 'ישנם  \d מאמרים חדשים לקרוא ב FreshRSS.',
-			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',	//TODO - Translation
+			'body_new_articles' => 'ישנם	\\d מאמרים חדשים לקרוא ב FreshRSS.',
+			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',	// TODO - Translation
 			'title_new_articles' => 'FreshRSS: מאמרים חדשים!',
 		),
 		'new_article' => 'מאמרים חדשים זמינים, לחצו לרענון העמוד.',
 		'should_be_activated' => 'חובה להפעיל JavaScript',
 	),
 	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'es' => 'Español',
-		'fr' => 'Français',
-		'he' => 'עברית',
-		'it' => 'Italiano',
-		'kr' => '한국어',
-		'nl' => 'Nederlands',
-		'oc' => 'Occitan',
-		'pt-br' => 'Português (Brasil)',
-		'ru' => 'Русский',
-		'tr' => 'Türkçe',
-		'zh-cn' => '简体中文',
+		'cz' => 'Čeština',	// TODO - Translation
+		'de' => 'Deutsch',	// TODO - Translation
+		'en' => 'English',	// TODO - Translation
+		'es' => 'Español',	// TODO - Translation
+		'fr' => 'Français',	// TODO - Translation
+		'he' => 'עברית',	// TODO - Translation
+		'it' => 'Italiano',	// TODO - Translation
+		'kr' => '한국어',	// TODO - Translation
+		'nl' => 'Nederlands',	// TODO - Translation
+		'oc' => 'Occitan',	// TODO - Translation
+		'pt-br' => 'Português (Brasil)',	// TODO - Translation
+		'ru' => 'Русский',	// TODO - Translation
+		'sk' => 'Slovenčina',	// TODO - Translation
+		'tr' => 'Türkçe',	// TODO - Translation
+		'zh-cn' => '简体中文',	// TODO - Translation
 	),
 	'menu' => array(
 		'about' => 'אודות',
 		'admin' => 'ניהול',
 		'archiving' => 'ארכוב',
-		'authentication' => 'Authentication',	//TODO - Translation
-		'check_install' => 'Installation checking',	//TODO - Translation
+		'authentication' => 'Authentication',	// TODO - Translation
+		'check_install' => 'Installation checking',	// TODO - Translation
 		'configuration' => 'הגדרות',
 		'display' => 'תצוגה',
-		'extensions' => 'Extensions',	//TODO - Translation
+		'extensions' => 'Extensions',	// TODO - Translation
 		'logs' => 'לוגים',
 		'queries' => 'שאילתות',
 		'reading' => 'קריאה',
@@ -149,10 +150,10 @@ return array(
 		'sharing' => 'שיתוף',
 		'shortcuts' => 'קיצורי דרך',
 		'stats' => 'סטטיסטיקות',
-		'system' => 'System configuration',	//TODO - Translation
+		'system' => 'System configuration',	// TODO - Translation
 		'update' => 'עדכון',
-		'user_management' => 'Manage users',	//TODO - Translation
-		'user_profile' => 'Profile',	//TODO - Translation
+		'user_management' => 'Manage users',	// TODO - Translation
+		'user_profile' => 'Profile',	// TODO - Translation
 	),
 	'pagination' => array(
 		'first' => 'הראשון',
@@ -164,31 +165,31 @@ return array(
 		'previous' => 'הקודם',
 	),
 	'period' => array(
-		'days' => 'days',	//TODO - Translation
-		'hours' => 'hours',	//TODO - Translation
-		'months' => 'months',	//TODO - Translation
-		'weeks' => 'weeks',	//TODO - Translation
-		'years' => 'years',	//TODO - Translation
+		'days' => 'days',	// TODO - Translation
+		'hours' => 'hours',	// TODO - Translation
+		'months' => 'months',	// TODO - Translation
+		'weeks' => 'weeks',	// TODO - Translation
+		'years' => 'years',	// TODO - Translation
 	),
 	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
 		'email' => 'דואר אלקטרוני',
-		'facebook' => 'Facebook',
-		'gnusocial' => 'GNU social',
-		'jdh' => 'Journal du hacker',
-		'Known' => 'Known based sites',
-		'lemmy' => 'Lemmy',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
-		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
+		'facebook' => 'Facebook',	// TODO - Translation
+		'gnusocial' => 'GNU social',	// TODO - Translation
+		'jdh' => 'Journal du hacker',	// TODO - Translation
+		'Known' => 'Known based sites',	// TODO - Translation
+		'lemmy' => 'Lemmy',	// TODO - Translation
+		'linkedin' => 'LinkedIn',	// TODO - Translation
+		'mastodon' => 'Mastodon',	// TODO - Translation
+		'movim' => 'Movim',	// TODO - Translation
+		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pocket' => 'Pocket',	// TODO - Translation
 		'print' => 'הדפסה',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag v1',
-		'wallabagv2' => 'wallabag v2',
+		'shaarli' => 'Shaarli',	// TODO - Translation
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag v1',	// TODO - Translation
+		'wallabagv2' => 'wallabag v2',	// TODO - Translation
 	),
 	'short' => array(
 		'attention' => 'זהירות!',
@@ -198,7 +199,7 @@ return array(
 		'damn' => 'הו לא!',
 		'default_category' => 'ללא קטגוריה',
 		'no' => 'לא',
-		'not_applicable' => 'Not available',	//TODO - Translation
+		'not_applicable' => 'Not available',	// TODO - Translation
 		'ok' => 'כן!',
 		'or' => 'או',
 		'yes' => 'כן',

app/i18n/he/index.php

@@ -2,8 +2,7 @@
 
 return array(
 	'about' => array(
-		'_' => 'אודות',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
 		'bugs_reports' => 'דיווח באגים',
 		'credits' => 'קרדיטים',
 		'credits_content' => 'מאפייני עיצוב מסויימים הגיעו מ <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> אף על פי ש FreshRSS אינו משתמש בתשתית הזו. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">סמלילים</a> הגיעו מ <a href="https://www.gnome.org/"> פרוייקט GNOME </a>. <em>Open Sans</em> הגופן police נוצר על ידי <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons נאספים בעזרת <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS מבוסס על <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, תשתית PHP.',
@@ -14,23 +13,21 @@ return array(
 		'title' => 'אודות',
 		'version' => 'גרסה',
 		'website' => 'אתר',
-	),
-	'tos' => array(
-		'title' => 'Terms of Service', // TODO - Translation
+		'_' => 'אודות',
 	),
 	'feed' => array(
 		'add' => 'ניתן להוסיף הזנות חדשות.',
 		'empty' => 'אין מאמר להצגה.',
 		'rss_of' => 'הזנת RSS של %s',
 		'title' => 'ההזנות שלך',
-		'title_global' => 'תצוגה גלובלית',
 		'title_fav' => 'המועדפים שלך',
+		'title_global' => 'תצוגה גלובלית',
 	),
 	'log' => array(
-		'_' => 'לוגים',
 		'clear' => 'ניקוי הלוגים',
 		'empty' => 'קובץ הלוג ריק',
 		'title' => 'לוגים',
+		'_' => 'לוגים',
 	),
 	'menu' => array(
 		'about' => 'אודות FreshRSS',
@@ -43,7 +40,7 @@ return array(
 		'mark_all_read' => 'סימון הכל כנקרא',
 		'mark_cat_read' => 'סימון קטגוריה כנקראה',
 		'mark_feed_read' => 'סימון הזנה כנקראה',
-		'mark_selection_unread' => 'Mark selection as unread',	//TODO - Translation
+		'mark_selection_unread' => 'Mark selection as unread',	// TODO - Translation
 		'newer_first' => 'חדשים בראש',
 		'non-starred' => 'הצגת הכל פרט למועדפים',
 		'normal_view' => 'תצוגה רגילה',
@@ -56,11 +53,14 @@ return array(
 		'starred' => 'הצגת מועדפים בלבד',
 		'stats' => 'סטטיסטיקות',
 		'subscription' => 'ניהול הרשמות',
-		'tags' => 'My labels',	//TODO - Translation
+		'tags' => 'My labels',	// TODO - Translation
 		'unread' => 'הצגת מאמרים שלא נקראו בלבד',
 	),
 	'share' => 'שיתוף',
 	'tag' => array(
-		'related' => 'תגיות קשורות',	//TODO - Translation
+		'related' => 'תגיות קשורות',
+	),
+	'tos' => array(
+		'title' => 'Terms of Service',	// TODO - Translation
 	),
 );

app/i18n/he/install.php

@@ -4,36 +4,35 @@ return array(
 	'action' => array(
 		'finish' => 'השלמת ההתקנה',
 		'fix_errors_before' => 'יש לתקן את השגיאות לפני המעבר לשלב הבא.',
-		'keep_install' => 'Keep previous configuration',	//TODO - Translation
+		'keep_install' => 'Keep previous configuration',	// TODO - Translation
 		'next_step' => 'לשלב הבא',
-		'reinstall' => 'Reinstall FreshRSS',	//TODO - Translation
+		'reinstall' => 'Reinstall FreshRSS',	// TODO - Translation
 	),
 	'auth' => array(
 		'form' => 'טופס אינטרנטי (מסורתי, דורש JavaScript)',
 		'http' => 'HTTP (למשתמשים מתקדמים עם HTTPS)',
 		'none' => 'ללא (מסוכן)',
 		'password_form' => 'סיסמה<br /><small>(לשימוש בטפוס ההרשמה)</small>',
-		'password_format' => 'At least 7 characters',	//TODO - Translation
+		'password_format' => 'At least 7 characters',	// TODO - Translation
 		'type' => 'שיטת אימות',
 	),
 	'bdd' => array(
-		'_' => 'בסיס נתונים',
 		'conf' => array(
-			'_' => 'הגדרות בסיס נתונים',
 			'ko' => 'נא לוודא את הגדרות בסיס הנתונים.',
 			'ok' => 'הגדרות בסיס הנתונים נשמרו.',
+			'_' => 'הגדרות בסיס נתונים',
 		),
 		'host' => 'מארח',
 		'password' => 'HTTP סיסמה',
 		'prefix' => 'קידומת הטבלה',
 		'type' => 'סוג בסיס הנתונים',
 		'username' => 'HTTP שם משתמש',
+		'_' => 'בסיס נתונים',
 	),
 	'check' => array(
-		'_' => 'בדיקות',
-		'already_installed' => 'We have detected that FreshRSS is already installed!',	//TODO - Translation
+		'already_installed' => 'We have detected that FreshRSS is already installed!',	// TODO - Translation
 		'cache' => array(
-			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',	//TODO - Translation
+			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',	// TODO - Translation
 			'ok' => 'ההרשאות בתיקיית המטמון תקינות',
 		),
 		'ctype' => array(
@@ -45,35 +44,35 @@ return array(
 			'ok' => 'יש לכם את גירסת %s של cURL',
 		),
 		'data' => array(
-			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',	//TODO - Translation
+			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',	// TODO - Translation
 			'ok' => 'ההרשאות בתיקיית הדאטא תקינות',
 		),
 		'dom' => array(
-			'nok' => 'הספרייה הנדרשת לסיור ב DOM אינה מותקנת  (php-xml package)',
+			'nok' => 'הספרייה הנדרשת לסיור ב DOM אינה מותקנת	(php-xml package)',
 			'ok' => 'הספרייה הנדרשת לסיור ב DOM מותקנת',
 		),
 		'favicons' => array(
-			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',	//TODO - Translation
+			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',	// TODO - Translation
 			'ok' => 'ההרשאות בתיקיית הfavicons תקינות',
 		),
 		'fileinfo' => array(
-			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',	//TODO - Translation
-			'ok' => 'You have the fileinfo library.',	//TODO - Translation
+			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',	// TODO - Translation
+			'ok' => 'You have the fileinfo library.',	// TODO - Translation
 		),
 		'http_referer' => array(
 			'nok' => 'נא לדבוק שאינך פוגעת ב HTTP REFERER שלך.',
 			'ok' => 'הHTTP REFERER ידוע ותאם לשרת שלך.',
 		),
 		'json' => array(
-			'nok' => 'Cannot find a recommended library to parse JSON.',	//TODO - Translation
-			'ok' => 'You have a recommended library to parse JSON.',	//TODO - Translation
+			'nok' => 'Cannot find a recommended library to parse JSON.',	// TODO - Translation
+			'ok' => 'You have a recommended library to parse JSON.',	// TODO - Translation
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
-			'nok' => 'You lack the Minz framework.',	//TODO - Translation
+			'nok' => 'You lack the Minz framework.',
 			'ok' => 'יש לכם את תשתית Minz',
 		),
 		'pcre' => array(
@@ -89,17 +88,18 @@ return array(
 			'ok' => 'גירסת PHP שלכם היא %s, שתואמת ל FreshRSS',
 		),
 		'users' => array(
-			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',	//TODO - Translation
-			'ok' => 'Permissions on users directory are good.',	//TODO - Translation
+			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',	// TODO - Translation
+			'ok' => 'Permissions on users directory are good.',	// TODO - Translation
 		),
 		'xml' => array(
-			'nok' => 'Cannot find the required library to parse XML.',	//TODO - Translation
-			'ok' => 'You have the required library to parse XML.',	//TODO - Translation
+			'nok' => 'Cannot find the required library to parse XML.',	// TODO - Translation
+			'ok' => 'You have the required library to parse XML.',	// TODO - Translation
 		),
+		'_' => 'בדיקות',
 	),
 	'conf' => array(
-		'_' => 'הגדרות כלליות',
 		'ok' => 'ההגדרות הכלליות נשמרו.',
+		'_' => 'הגדרות כלליות',
 	),
 	'congratulations' => 'מזל טוב!',
 	'default_user' => 'שם המשתמש של משתמש ברירת המחדל <small>(לכל היותר 16 תווים אלפאנומריים)</small>',
@@ -107,17 +107,17 @@ return array(
 	'fix_errors_before' => 'יש לתקן את השגיאות לפני המעבר לשלב הבא.',
 	'javascript_is_better' => 'FreshRSS מעדיף שתאפשרו JavaScript',
 	'js' => array(
-		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',	//TODO - Translation
+		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',	// TODO - Translation
 	),
 	'language' => array(
-		'_' => 'שפה',
 		'choose' => 'בחירת שפה ל FreshRSS',
 		'defined' => 'השפה הוגדרה.',
+		'_' => 'שפה',
 	),
 	'not_deleted' => 'משהו נכשל; יש צורך למחוק את הקובץ <em>%s</em> ידנית.',
-	'ok' => 'The installation process was successful.',	//TODO - Translation
-	'step' => 'step %d',	//TODO - Translation
+	'ok' => 'The installation process was successful.',	// TODO - Translation
+	'step' => 'step %d',	// TODO - Translation
 	'steps' => 'שלבים',
-	'title' => 'התקנה · FreshRSS',
 	'this_is_the_end' => 'סיום',
+	'title' => 'התקנה · FreshRSS',
 );

app/i18n/he/sub.php

@@ -2,24 +2,24 @@
 
 return array(
 	'api' => array(
-		'documentation' => 'Copy the following URL to use it within an external tool.',	//TODO - Translation
-		'title' => 'API',	//TODO - Translation
+		'documentation' => 'Copy the following URL to use it within an external tool.',	// TODO - Translation
+		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	//TODO - Translation
-		'label' => 'Subscribe',	//TODO - Translation
-		'title' => 'Bookmarklet',	//TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'label' => 'Subscribe',	// TODO - Translation
+		'title' => 'Bookmarklet',	// TODO - Translation
 	),
 	'category' => array(
-		'_' => 'קטגוריה',
 		'add' => 'הוספת קטגוריה',
 		'archiving' => 'ארכוב',
-		'empty' => 'Empty category',	//TODO - Translation
+		'empty' => 'Empty category',	// TODO - Translation
 		'information' => 'מידע',
 		'new' => 'קטגוריה חדשה',
-		'position' => 'Display position',	//TODO - Translation
-		'position_help' => 'To control category sort order',	//TODO - Translation
+		'position' => 'Display position',	// TODO - Translation
+		'position_help' => 'To control category sort order',	// TODO - Translation
 		'title' => 'כותרת',
+		'_' => 'קטגוריה',
 	),
 	'feed' => array(
 		'add' => 'הוספת הזנה',
@@ -32,57 +32,57 @@ return array(
 			'password' => 'HTTP סיסמה',
 			'username' => 'HTTP שם משתמש',
 		),
-		'clear_cache' => 'Always clear cache',	//TODO - Translation
-		'css_help' => 'קבלת הזנות RSS קטומות  (זהירות, לוקח זמן רב יותר!)',
+		'clear_cache' => 'Always clear cache',	// TODO - Translation
+		'css_help' => 'קבלת הזנות RSS קטומות	(זהירות, לוקח זמן רב יותר!)',
 		'css_path' => 'נתיב הCSS של המאמר באתר המקורי',
 		'description' => 'תיאור',
 		'empty' => 'הזנה זו ריקה. אנא ודאו שהיא עדיין מתוחזקת.',
 		'error' => 'הזנה זו נתקלה בשגיאה, אנא ודאו שהיא תקינה ואז נסו שנית.',
 		'filteractions' => array(
-			'_' => 'Filter actions',	//TODO - Translation
-			'help' => 'Write one search filter per line.',	//TODO - Translation
+			'help' => 'Write one search filter per line.',	// TODO - Translation
+			'_' => 'Filter actions',	// TODO - Translation
 		),
 		'information' => 'מידע',
 		'keep_min' => 'מסםר מינימלי של מאמרים לשמור',
-		'moved_category_deleted' => 'כאשר הקטגוריה נמחקת ההזנות שבתוכה אוטומטית מקוטלגות תחת  <em>%s</em>.',
-		'mute' => 'mute',	//TODO - Translation
+		'moved_category_deleted' => 'כאשר הקטגוריה נמחקת ההזנות שבתוכה אוטומטית מקוטלגות תחת	<em>%s</em>.',
+		'mute' => 'mute',	// TODO - Translation
 		'no_selected' => 'אף הזנה לא נבחרה.',
 		'number_entries' => '%d מאמרים',
 		'priority' => array(
-			'_' => 'Visibility',	//TODO - Translation
-			'archived' => 'Do not show (archived)',	//TODO - Translation
+			'archived' => 'Do not show (archived)',	// TODO - Translation
 			'main_stream' => 'הצגה בזרם המרכזי',
-			'normal' => 'Show in its category',	//TODO - Translation
+			'normal' => 'Show in its category',	// TODO - Translation
+			'_' => 'Visibility',	// TODO - Translation
 		),
-		'websub' => 'Instant notification with WebSub',	//TODO - Translation
 		'show' => array(
-			'all' => 'Show all feeds',	//TODO - Translation
-			'error' => 'Show only feeds with error',	//TODO - Translation
+			'all' => 'Show all feeds',	// TODO - Translation
+			'error' => 'Show only feeds with error',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	//TODO - Translation
+			'error' => 'Showing only feeds with error',	// TODO - Translation
 		),
-		'ssl_verify' => 'Verify SSL security',	//TODO - Translation
+		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'סטטיסטיקות',
 		'think_to_add' => 'ניתן להוסיף הזנות חדשות.',
-		'timeout' => 'Timeout in seconds',	//TODO - Translation
+		'timeout' => 'Timeout in seconds',	// TODO - Translation
 		'title' => 'כותרת',
 		'title_add' => 'הוספת הזנה',
 		'ttl' => 'אין לרענן אוטומטית יותר מ',
 		'url' => 'הזנה URL',
 		'validator' => 'בדיקות תקינות ההזנה',
 		'website' => 'אתר URL',
+		'websub' => 'Instant notification with WebSub',	// TODO - Translation
 	),
 	'firefox' => array(
-		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
-		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
-		'title' => 'Firefox feed reader',	//TODO - Translation
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	// TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	// TODO - Translation
+		'title' => 'Firefox feed reader',	// TODO - Translation
 	),
 	'import_export' => array(
 		'export' => 'ייצוא',
+		'export_labelled' => 'Export your labelled articles',	// TODO - Translation
 		'export_opml' => 'ייצוא רשימת הזנות (OPML)',
 		'export_starred' => 'ייצוא מועדפים',
-		'export_labelled' => 'Export your labelled articles',	//TODO
 		'feed_list' => 'רשימה של %s מאמרים',
 		'file_to_import' => 'קובץ לייבוא<br />(OPML, Json or Zip)',
 		'file_to_import_no_zip' => 'קובץ לייבוא<br />(OPML or Json)',
@@ -94,11 +94,11 @@ return array(
 		'bookmark' => 'הרשמה (FreshRSS סימניית)',
 		'import_export' => 'יבוא / יצוא ',
 		'subscription_management' => 'ניהול הרשמות',
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 	'title' => array(
-		'_' => 'ניהול הרשמות',
 		'feed_management' => 'ניהול הזנות RSS',
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
+		'_' => 'ניהול הרשמות',
 	),
 );

app/i18n/he/user.php

@@ -3,35 +3,35 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.', //TODO - Translation
-			'required' => 'The email address is required.', //TODO - Translation
+			'invalid' => 'The email address is invalid.',	// TODO - Translation
+			'required' => 'The email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
-			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
-				'email_sent' => 'An email has been sent to your address.', //TODO - Translation
-				'error' => 'The email address failed to be validated.', //TODO - Translation
-				'ok' => 'The email address has been validated.', //TODO - Translation
-				'unneccessary' => 'The email address was already validated.', //TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
+				'error' => 'The email address failed to be validated.',	// TODO - Translation
+				'ok' => 'The email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
-			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
-			'resend_email' => 'Resend the email', //TODO - Translation
-			'title' => 'Email address validation', //TODO - Translation
-		),
-	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
+			'resend_email' => 'Resend the email',	// TODO - Translation
+			'title' => 'Email address validation',	// TODO - Translation
 		),
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'title' => 'You need to validate your account', //TODO - Translation
-			'welcome' => 'Welcome %s,', //TODO - Translation
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'title' => 'You need to validate your account',	// TODO - Translation
+			'welcome' => 'Welcome %s,',	// TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.',	// TODO - Translation
 		),
 	),
 );

app/i18n/it/admin.php

@@ -67,8 +67,8 @@ return array(
 			'ok' => 'Estensione JSON presente.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'Manca il framework Minz.',
@@ -83,9 +83,9 @@ return array(
 			'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'Installazione PHP',
 			'nok' => 'Versione PHP %s FreshRSS richiede almeno la versione %s.',
 			'ok' => 'Versione PHP %s, compatibile con FreshRSS.',
+			'_' => 'Installazione PHP',
 		),
 		'tables' => array(
 			'nok' => 'Rilevate tabelle mancanti nel database.',
@@ -106,26 +106,25 @@ return array(
 		),
 	),
 	'extensions' => array(
-		'author' => 'Author',	//TODO - Translation
-		'community' => 'Available community extensions',	//TODO - Translation
-		'description' => 'Description',	//TODO - Translation
+		'author' => 'Author',	// TODO - Translation
+		'community' => 'Available community extensions',	// TODO - Translation
+		'description' => 'Description',	// TODO - Translation
 		'disabled' => 'Disabilitata',
 		'empty_list' => 'Non ci sono estensioni installate',
 		'enabled' => 'Abilitata',
-		'latest' => 'Installed',	//TODO - Translation
-		'name' => 'Name',	//TODO - Translation
+		'latest' => 'Installed',	// TODO - Translation
+		'name' => 'Name',	// TODO - Translation
 		'no_configure_view' => 'Questa estensioni non può essere configurata.',
 		'system' => array(
-			'_' => 'Estensioni di sistema',
 			'no_rights' => 'Estensione di sistema (non hai i permessi su questo tipo)',
+			'_' => 'Estensioni di sistema',
 		),
 		'title' => 'Estensioni',
-		'update' => 'Update available',	//TODO - Translation
+		'update' => 'Update available',	// TODO - Translation
 		'user' => 'Estensioni utente',
-		'version' => 'Version',	//TODO - Translation
+		'version' => 'Version',	// TODO - Translation
 	),
 	'stats' => array(
-		'_' => 'Statistiche',
 		'all_feeds' => 'Tutti i feeds',
 		'category' => 'Categoria',
 		'entry_count' => 'Articoli',
@@ -135,7 +134,7 @@ return array(
 		'entry_per_hour' => 'Per ora (media: %.2f articoli)',
 		'entry_per_month' => 'Per mese (media: %.2f articoli)',
 		'entry_repartition' => 'Ripartizione contenuti',
-		'feed' => 'Feed',
+		'feed' => 'Feed',	// TODO - Translation
 		'feed_per_category' => 'Feeds per categoria',
 		'idle' => 'Feeds non aggiornati',
 		'main' => 'Statistiche principali',
@@ -155,31 +154,32 @@ return array(
 		'status_unread' => 'Non letti',
 		'title' => 'Statistiche',
 		'top_feed' => 'I migliori 10 feeds',
+		'_' => 'Statistiche',
 	),
 	'system' => array(
-		'_' => 'Configurazione di sistema',
-		'auto-update-url' => 'Auto-update server URL',	//TODO - Translation
-		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
+		'auto-update-url' => 'Auto-update server URL',	// TODO - Translation
+		'cookie-duration' => array(
+			'help' => 'in seconds',	// TODO - Translation
+			'number' => 'Duration to keep logged in',	// TODO - Translation
+		),
+		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
 		'instance-name' => 'Nome istanza',
 		'max-categories' => 'Limite categorie per utente',
 		'max-feeds' => 'Limite feeds per utente',
-		'cookie-duration' => array(
-			'help' => 'in seconds', // @todo translate
-			'number' => 'Duration to keep logged in', // @todo translate
-		),
 		'registration' => array(
 			'help' => '0 significa che non esiste limite sui profili',
 			'number' => 'Numero massimo di profili',
 		),
+		'_' => 'Configurazione di sistema',
 	),
 	'update' => array(
-		'_' => 'Aggiornamento sistema',
 		'apply' => 'Applica',
 		'check' => 'Controlla la presenza di nuovi aggiornamenti',
 		'current_version' => 'FreshRSS versione %s.',
 		'last' => 'Ultima verifica: %s',
 		'none' => 'Nessun aggiornamento da applicare',
 		'title' => 'Aggiorna sistema',
+		'_' => 'Aggiornamento sistema',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articoli (%s)',
@@ -187,19 +187,19 @@ return array(
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'Crea nuovo utente',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	//TODO - Translation
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'delete_users' => 'Delete user',	// TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Lingua',
 		'list' => 'User list',	// TODO - Translation
 		'number' => ' %d profilo utente creato',
 		'numbers' => 'Sono presenti %d profili utente',
 		'password_form' => 'Password<br /><small>(per il login classico)</small>',
 		'password_format' => 'Almeno 7 caratteri',
-		'selected' => 'Selected user',	//TODO - Translation
+		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Gestione utenti',
-		'update_users' => 'Update user',	//TODO - Translation
-		'user_list' => 'Lista utenti',
+		'update_users' => 'Update user',	// TODO - Translation
 		'username' => 'Nome utente',
 		'users' => 'Utenti',
+		'user_list' => 'Lista utenti',
 	),
 );

app/i18n/it/conf.php

@@ -2,34 +2,33 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archiviazione',
 		'delete_after' => 'Rimuovi articoli dopo',
-		'exception' => 'Purge exception',	//TODO - Translation
+		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'Altre opzioni sono disponibili nelle impostazioni dei singoli feed',
-		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
+		'keep_labels' => 'Never delete labels',	// TODO - Translation
+		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Numero minimo di articoli da mantenere per feed',
-		'keep_labels' => 'Never delete labels',	//TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
-		'maintenance' => 'Maintenance',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Ottimizza database',
 		'optimize_help' => 'Da fare occasionalmente per ridurre le dimensioni del database',
-		'policy' => 'Purge policy',	//TODO - Translation
-		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
+		'policy' => 'Purge policy',	// TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	// TODO - Translation
 		'purge_now' => 'Cancella ora',
-		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
-		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Archiviazione',
 		'ttl' => 'Non effettuare aggiornamenti per più di',
+		'_' => 'Archiviazione',
 	),
 	'display' => array(
-		'_' => 'Visualizzazione',
 		'icon' => array(
 			'bottom_line' => 'Barra in fondo',
+			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'Icone degli articoli',
 			'publication_date' => 'Data di pubblicazione',
-			'related_tags' => 'Tags correlati',	//TODO - Translation
+			'related_tags' => 'Tags correlati',
 			'sharing' => 'Condivisione',
-			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Barra in alto',
 		),
 		'language' => 'Lingua',
@@ -37,7 +36,7 @@ return array(
 			'seconds' => 'secondi (0 significa nessun timeout)',
 			'timeout' => 'Notifica timeout HTML5',
 		),
-		'show_nav_buttons' => 'Show the navigation buttons',	//TODO - Translation
+		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'Tema',
 		'title' => 'Visualizzazione',
 		'width' => array(
@@ -47,35 +46,35 @@ return array(
 			'no_limit' => 'Nessun limite',
 			'thin' => 'Stretto',
 		),
+		'_' => 'Visualizzazione',
 	),
 	'profile' => array(
-		'_' => 'Gestione profili',
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Cancellazione account',
 			'warn' => 'Il tuo account e tutti i dati associati saranno cancellati.',
+			'_' => 'Cancellazione account',
 		),
 		'email' => 'Indirizzo email',
 		'password_api' => 'Password API<br /><small>(e.g., per applicazioni mobili)</small>',
 		'password_form' => 'Password<br /><small>(per il login classico)</small>',
 		'password_format' => 'Almeno 7 caratteri',
 		'title' => 'Profilo',
+		'_' => 'Gestione profili',
 	),
 	'query' => array(
-		'_' => 'Ricerche personali',
 		'deprecated' => 'Questa query non è più valida. La categoria o il feed di riferimento non stati cancellati.',
-		'display' => 'Display user query results',	//TODO - Translation
+		'display' => 'Display user query results',	// TODO - Translation
 		'filter' => 'Filtro applicato:',
 		'get_all' => 'Mostra tutti gli articoli',
 		'get_category' => 'Mostra la categoria "%s" ',
 		'get_favorite' => 'Mostra articoli preferiti',
 		'get_feed' => 'Mostra feed "%s" ',
-		'no_filter' => 'Nessun filtro',
 		'none' => 'Non hai creato nessuna ricerca personale.',
+		'no_filter' => 'Nessun filtro',
 		'number' => 'Ricerca n°%d',
 		'order_asc' => 'Mostra prima gli articoli più vecchi',
 		'order_desc' => 'Mostra prima gli articoli più nuovi',
-		'remove' => 'Remove user query',	//TODO - Translation
+		'remove' => 'Remove user query',	// TODO - Translation
 		'search' => 'Cerca per "%s"',
 		'state_0' => 'Mostra tutti gli articoli',
 		'state_1' => 'Mostra gli articoli letti',
@@ -94,9 +93,9 @@ return array(
 		'state_14' => 'Mostra gli articoli non letti',
 		'state_15' => 'Mostra tutti gli articoli',
 		'title' => 'Ricerche personali',
+		'_' => 'Ricerche personali',
 	),
 	'reading' => array(
-		'_' => 'Lettura',
 		'after_onread' => 'Dopo “segna tutto come letto”,',
 		'articles_per_page' => 'Numero di articoli per pagina',
 		'auto_load_more' => 'Carica articoli successivi a fondo pagina',
@@ -117,16 +116,16 @@ return array(
 			'when' => 'Segna articoli come letti…',
 		),
 		'show' => array(
-			'_' => 'Articoli da visualizzare',
 			'adaptive' => 'Adatta visualizzazione',
 			'all_articles' => 'Mostra tutti gli articoli',
 			'unread' => 'Mostra solo non letti',
+			'_' => 'Articoli da visualizzare',
 		),
-		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO - Translation
+		'sides_close_article' => 'Clicking outside of article text area closes the article',	// TODO - Translation
 		'sort' => array(
-			'_' => 'Ordinamento',
 			'newer_first' => 'Prima i più recenti',
 			'older_first' => 'Prima i più vecchi',
+			'_' => 'Ordinamento',
 		),
 		'sticky_post' => 'Blocca il contenuto a inizio pagina quando aperto',
 		'title' => 'Lettura',
@@ -136,26 +135,26 @@ return array(
 			'normal' => 'Vista elenco',
 			'reader' => 'Modalità di lettura',
 		),
+		'_' => 'Lettura',
 	),
 	'sharing' => array(
-		'_' => 'Condivisione',
-		'add' => 'Add a sharing method',	//TODO - Translation
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
+		'add' => 'Add a sharing method',	// TODO - Translation
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
 		'more_information' => 'Ulteriori informazioni',
 		'print' => 'Stampa',
-		'remove' => 'Remove sharing method',	//TODO - Translation
-		'shaarli' => 'Shaarli',
+		'remove' => 'Remove sharing method',	// TODO - Translation
+		'shaarli' => 'Shaarli',	// TODO - Translation
 		'share_name' => 'Nome condivisione',
 		'share_url' => 'URL condivisione',
 		'title' => 'Condividi',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag',	// TODO - Translation
+		'_' => 'Condivisione',
 	),
 	'shortcut' => array(
-		'_' => 'Comandi tastiera',
 		'article_action' => 'Azioni sugli articoli',
 		'auto_share' => 'Condividi',
 		'auto_share_help' => 'Se è presente un solo servizio di condivisione verrà usato quello, altrimenti usare anche il numero associato.',
@@ -163,7 +162,7 @@ return array(
 		'collapse_article' => 'Collassa articoli',
 		'first_article' => 'Salta al primo articolo',
 		'focus_search' => 'Modulo di ricerca',
-		'global_view' => 'Switch to global view',	//TODO - Translation
+		'global_view' => 'Switch to global view',	// TODO - Translation
 		'help' => 'Mostra documentazione',
 		'javascript' => 'JavaScript deve essere abilitato per poter usare i comandi da tastiera',
 		'last_article' => 'Salta all ultimo articolo',
@@ -172,21 +171,22 @@ return array(
 		'mark_read' => 'Segna come letto',
 		'navigation' => 'Navigazione',
 		'navigation_help' => 'Con il tasto "Shift" i comandi di navigazione verranno applicati ai feeds.<br/>Con il tasto "Alt" i comandi di navigazione verranno applicati alle categorie.',
-		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	//TODO - Translation
+		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	// TODO - Translation
 		'next_article' => 'Salta al contenuto successivo',
-		'normal_view' => 'Switch to normal view', // TODO
+		'normal_view' => 'Switch to normal view',	// TODO - Translation
 		'other_action' => 'Altre azioni',
 		'previous_article' => 'Salta al contenuto precedente',
-		'reading_view' => 'Switch to reading view',	//TODO - Translation
-		'rss_view' => 'Open RSS view in a new tab',	//TODO - Translation
+		'reading_view' => 'Switch to reading view',	// TODO - Translation
+		'rss_view' => 'Open RSS view in a new tab',	// TODO - Translation
 		'see_on_website' => 'Vai al sito fonte',
 		'shift_for_all_read' => '+ <code>shift</code> per segnare tutti gli articoli come letti',
-		'skip_next_article' => 'Focus next without opening',	//TODO - Translation
-		'skip_previous_article' => 'Focus previous without opening',	//TODO - Translation
+		'skip_next_article' => 'Focus next without opening',	// TODO - Translation
+		'skip_previous_article' => 'Focus previous without opening',	// TODO - Translation
 		'title' => 'Comandi da tastiera',
 		'user_filter' => 'Accedi alle ricerche personali',
 		'user_filter_help' => 'Se è presente una sola ricerca personale verrà usata quella, altrimenti usare anche il numero associato.',
-		'views' => 'Views',	//TODO - Translation
+		'views' => 'Views',	// TODO - Translation
+		'_' => 'Comandi tastiera',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articoli (%s)',

app/i18n/it/feedback.php

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Ottimizzazione completata',
-	),
 	'access' => array(
 		'denied' => 'Non hai i permessi per accedere a questa pagina',
 		'not_found' => 'Pagina non disponibile',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Ottimizzazione completata',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s non può essere abilitata. <a href="%s">Verifica i logs</a> per dettagli.',
 			'ok' => '%s è ora abilitata',
 		),
-		'no_access' => 'Accesso negato a %s',
 		'not_enabled' => '%s non abilitato',
 		'not_found' => '%s non disponibile',
+		'no_access' => 'Accesso negato a %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'Estensione ZIP non presente sul server. Per favore esporta i files singolarmente.',
@@ -63,8 +63,8 @@ return array(
 	'sub' => array(
 		'actualize' => 'Aggiorna',
 		'articles' => array(
-			'marked_read' => 'The selected articles have been marked as read.',	//TODO - Translation
-			'marked_unread' => 'The articles have been marked as unread.',	//TODO - Translation
+			'marked_read' => 'The selected articles have been marked as read.',	// TODO - Translation
+			'marked_unread' => 'The articles have been marked as unread.',	// TODO - Translation
 		),
 		'category' => array(
 			'created' => 'Categoria %s creata.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'Categoria svuotata',
 			'error' => 'Categoria non aggiornata',
 			'name_exists' => 'Categoria già esistente.',
-			'no_id' => 'Categoria senza ID.',
-			'no_name' => 'Il nome della categoria non può essere lasciato vuoto.',
 			'not_delete_default' => 'Non puoi cancellare la categoria predefinita!',
 			'not_exist' => 'La categoria non esite!',
+			'no_id' => 'Categoria senza ID.',
+			'no_name' => 'Il nome della categoria non può essere lasciato vuoto.',
 			'over_max' => 'Hai raggiunto il numero limite di categorie (%d)',
 			'updated' => 'Categoria aggiornata.',
 		),
@@ -86,12 +86,12 @@ return array(
 			'already_subscribed' => 'Hai già sottoscritto <em>%s</em>',
 			'deleted' => 'Feed cancellato',
 			'error' => 'Feed non aggiornato',
-			'internal_problem' => 'RSS feed non aggiunto. <a href="%s">Verifica i logs</a> per dettagli.',	//TODO - Translation
+			'internal_problem' => 'RSS feed non aggiunto. <a href="%s">Verifica i logs</a> per dettagli.',
 			'invalid_url' => 'URL <em>%s</em> non valido',
+			'not_added' => '<em>%s</em> non può essere aggiunto',
+			'no_refresh' => 'Nessun aggiornamento disponibile…',
 			'n_actualized' => '%d feeds aggiornati',
 			'n_entries_deleted' => '%d articoli cancellati',
-			'no_refresh' => 'Nessun aggiornamento disponibile…',
-			'not_added' => '<em>%s</em> non può essere aggiunto',
 			'over_max' => 'Hai raggiunto il numero limite di feed (%d)',
 			'updated' => 'Feed aggiornato',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'Utente %s creato',
 			'error' => 'Errore nella creazione utente %s ',
+			'_' => 'Utente %s creato',
 		),
 		'deleted' => array(
-			'_' => 'Utente %s cancellato',
 			'error' => 'Utente %s non cancellato',
+			'_' => 'Utente %s cancellato',
 		),
 		'updated' => array(
-			'_' => 'User %s has been updated',	//TODO - Translation
-			'error' => 'User %s has not been updated',	//TODO - Translation
+			'error' => 'User %s has not been updated',	// TODO - Translation
+			'_' => 'User %s has been updated',	// TODO - Translation
 		),
 	),
 );

app/i18n/it/gen.php

@@ -3,7 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Aggiorna',
-		'back' => '← Go back', //TODO - Translation
+		'back' => '← Go back',	// TODO - Translation
 		'back_to_rss_feeds' => '← Indietro',
 		'cancel' => 'Annulla',
 		'create' => 'Crea',
@@ -21,28 +21,28 @@ return array(
 		'see_website' => 'Vai al sito',
 		'submit' => 'Conferma',
 		'truncate' => 'Cancella tutti gli articoli',
-		'update' => 'Update', // TODO
+		'update' => 'Update',	// TODO - Translation
 	),
 	'auth' => array(
-		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.',	// TODO - Translation
 		'email' => 'Indirizzo email',
 		'keep_logged_in' => 'Ricorda i dati <small>(%s giorni)</small>',
 		'login' => 'Accedi',
 		'logout' => 'Esci',
 		'password' => array(
-			'_' => 'Password',
 			'format' => '<small>almeno 7 caratteri</small>',
+			'_' => 'Password',	// TODO - Translation
 		),
 		'registration' => array(
-			'_' => 'Nuovo profilo',
 			'ask' => 'Vuoi creare un nuovo profilo?',
 			'title' => 'Creazione profilo',
+			'_' => 'Nuovo profilo',
 		),
 		'reset' => 'Reset autenticazione',
 		'username' => array(
-			'_' => 'Username',
 			'admin' => 'Username amministratore',
 			'format' => '<small>massimo 16 caratteri alfanumerici</small>',
+			'_' => 'Username',	// TODO - Translation
 		),
 	),
 	'date' => array(
@@ -61,12 +61,12 @@ return array(
 		'february' => 'febbraio',
 		'format_date' => 'j\\ %s Y',
 		'format_date_hour' => 'j\\ %s Y \\o\\r\\e H\\:i',
-		'fri' => 'Fri',
+		'fri' => 'Fri',	// TODO - Translation
 		'Jan' => '\\G\\e\\n\\u\\a\\i\\o',
 		'jan' => 'genn.',
 		'january' => 'gennaio',
-		'Jul' => '\\L\\u\\g\\l\\i\\o',
 		'jul' => 'jul',
+		'Jul' => '\\L\\u\\g\\l\\i\\o',
 		'july' => 'luglio',
 		'Jun' => '\\G\\i\\u\\g\\n\\o',
 		'jun' => 'jun',
@@ -76,13 +76,13 @@ return array(
 		'last_month' => 'Ultimo mese',
 		'last_week' => 'Ultima settimana',
 		'last_year' => 'Ultimo anno',
-		'Mar' => '\\M\\a\\r\\z\\o',
 		'mar' => 'mar.',
+		'Mar' => '\\M\\a\\r\\z\\o',
 		'march' => 'marzo',
 		'May' => '\\M\\a\\g\\g\\i\\o',
 		'may' => 'maggio',
-		'may_' => 'May',
-		'mon' => 'Mon',
+		'may_' => 'May',	// TODO - Translation
+		'mon' => 'Mon',	// TODO - Translation
 		'month' => 'mesi',
 		'Nov' => '\\N\\o\\v\\e\\m\\b\\r\\e',
 		'nov' => 'nov.',
@@ -90,20 +90,20 @@ return array(
 		'Oct' => '\\O\\t\\t\\o\\b\\r\\e',
 		'oct' => 'ott.',
 		'october' => 'ottobre',
-		'sat' => 'Sat',
+		'sat' => 'Sat',	// TODO - Translation
 		'Sep' => '\\S\\e\\t\\t\\e\\m\\b\\r\\e',
 		'sep' => 'sett.',
 		'september' => 'settembre',
-		'sun' => 'Sun',
-		'thu' => 'Thu',
+		'sun' => 'Sun',	// TODO - Translation
+		'thu' => 'Thu',	// TODO - Translation
 		'today' => 'Oggi',
-		'tue' => 'Tue',
-		'wed' => 'Wed',
+		'tue' => 'Tue',	// TODO - Translation
+		'wed' => 'Wed',	// TODO - Translation
 		'yesterday' => 'Ieri',
 	),
 	'freshrss' => array(
-		'_' => 'Feed RSS Reader',
 		'about' => 'Informazioni',
+		'_' => 'Feed RSS Reader',
 	),
 	'js' => array(
 		'category_empty' => 'Categoria vuota',
@@ -118,20 +118,21 @@ return array(
 		'should_be_activated' => 'JavaScript deve essere abilitato',
 	),
 	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'es' => 'Español',
-		'fr' => 'Français',
-		'he' => 'עברית',
-		'it' => 'Italiano',
-		'kr' => '한국어',
-		'nl' => 'Nederlands',
-		'oc' => 'Occitan',
-		'pt-br' => 'Português (Brasil)',
-		'ru' => 'Русский',
-		'tr' => 'Türkçe',
-		'zh-cn' => '简体中文',
+		'cz' => 'Čeština',	// TODO - Translation
+		'de' => 'Deutsch',	// TODO - Translation
+		'en' => 'English',	// TODO - Translation
+		'es' => 'Español',	// TODO - Translation
+		'fr' => 'Français',	// TODO - Translation
+		'he' => 'עברית',	// TODO - Translation
+		'it' => 'Italiano',	// TODO - Translation
+		'kr' => '한국어',	// TODO - Translation
+		'nl' => 'Nederlands',	// TODO - Translation
+		'oc' => 'Occitan',	// TODO - Translation
+		'pt-br' => 'Português (Brasil)',	// TODO - Translation
+		'ru' => 'Русский',	// TODO - Translation
+		'sk' => 'Slovenčina',	// TODO - Translation
+		'tr' => 'Türkçe',	// TODO - Translation
+		'zh-cn' => '简体中文',	// TODO - Translation
 	),
 	'menu' => array(
 		'about' => 'Informazioni',
@@ -142,7 +143,7 @@ return array(
 		'configuration' => 'Configurazione',
 		'display' => 'Visualizzazione',
 		'extensions' => 'Estensioni',
-		'logs' => 'Logs',
+		'logs' => 'Logs',	// TODO - Translation
 		'queries' => 'Ricerche personali',
 		'reading' => 'Lettura',
 		'search' => 'Ricerca parole o #tags',
@@ -164,31 +165,31 @@ return array(
 		'previous' => 'Precedente',
 	),
 	'period' => array(
-		'days' => 'days',	//TODO - Translation
-		'hours' => 'hours',	//TODO - Translation
-		'months' => 'months',	//TODO - Translation
-		'weeks' => 'weeks',	//TODO - Translation
-		'years' => 'years',	//TODO - Translation
+		'days' => 'days',	// TODO - Translation
+		'hours' => 'hours',	// TODO - Translation
+		'months' => 'months',	// TODO - Translation
+		'weeks' => 'weeks',	// TODO - Translation
+		'years' => 'years',	// TODO - Translation
 	),
 	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'gnusocial' => 'GNU social',
-		'jdh' => 'Journal du hacker',
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
+		'gnusocial' => 'GNU social',	// TODO - Translation
+		'jdh' => 'Journal du hacker',	// TODO - Translation
 		'Known' => 'Siti basati su Known',
-		'lemmy' => 'Lemmy',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
-		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
+		'lemmy' => 'Lemmy',	// TODO - Translation
+		'linkedin' => 'LinkedIn',	// TODO - Translation
+		'mastodon' => 'Mastodon',	// TODO - Translation
+		'movim' => 'Movim',	// TODO - Translation
+		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pocket' => 'Pocket',	// TODO - Translation
 		'print' => 'Stampa',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag v1',
-		'wallabagv2' => 'wallabag v2',
+		'shaarli' => 'Shaarli',	// TODO - Translation
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag v1',	// TODO - Translation
+		'wallabagv2' => 'wallabag v2',	// TODO - Translation
 	),
 	'short' => array(
 		'attention' => 'Attenzione!',
@@ -197,7 +198,7 @@ return array(
 		'by_default' => 'predefinito',
 		'damn' => 'Ops!',
 		'default_category' => 'Senza categoria',
-		'no' => 'No',
+		'no' => 'No',	// TODO - Translation
 		'not_applicable' => 'Non disponibile',
 		'ok' => 'OK!',
 		'or' => 'o',

app/i18n/it/index.php

@@ -2,8 +2,7 @@
 
 return array(
 	'about' => array(
-		'_' => 'Informazioni',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
 		'bugs_reports' => 'Bugs',
 		'credits' => 'Crediti',
 		'credits_content' => 'Alcuni elementi di design provengono da <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> sebbene FreshRSS non usi questo framework. Le <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icone</a> provengono dal progetto <a href="https://www.gnome.org/">GNOME</a>. Il carattere <em>Open Sans</em> è stato creato da <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS è basato su <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
@@ -14,23 +13,21 @@ return array(
 		'title' => 'Informazioni',
 		'version' => 'Versione',
 		'website' => 'Sito',
-	),
-	'tos' => array(
-		'title' => 'Terms of Service', // TODO - Translation
+		'_' => 'Informazioni',
 	),
 	'feed' => array(
 		'add' => 'Aggiungi un Feed RSS',
 		'empty' => 'Non ci sono articoli da mostrare.',
 		'rss_of' => 'RSS feed di %s',
 		'title' => 'RSS feeds',
-		'title_global' => 'Vista globale per categorie',
 		'title_fav' => 'Preferiti',
+		'title_global' => 'Vista globale per categorie',
 	),
 	'log' => array(
-		'_' => 'Logs',
 		'clear' => 'Svuota logs',
 		'empty' => 'File di log vuoto',
-		'title' => 'Logs',
+		'title' => 'Logs',	// TODO - Translation
+		'_' => 'Logs',	// TODO - Translation
 	),
 	'menu' => array(
 		'about' => 'Informazioni',
@@ -43,7 +40,7 @@ return array(
 		'mark_all_read' => 'Segna tutto come letto',
 		'mark_cat_read' => 'Segna la categoria come letta',
 		'mark_feed_read' => 'Segna il feed come letto',
-		'mark_selection_unread' => 'Mark selection as unread',	//TODO - Translation
+		'mark_selection_unread' => 'Mark selection as unread',	// TODO - Translation
 		'newer_first' => 'Mostra prima i recenti',
 		'non-starred' => 'Escludi preferiti',
 		'normal_view' => 'Vista elenco',
@@ -51,16 +48,19 @@ return array(
 		'queries' => 'Chiavi di ricerca',
 		'read' => 'Mostra solo letti',
 		'reader_view' => 'Modalità di lettura',
-		'rss_view' => 'RSS feed',
+		'rss_view' => 'RSS feed',	// TODO - Translation
 		'search_short' => 'Cerca',
 		'starred' => 'Mostra solo preferiti',
 		'stats' => 'Statistiche',
 		'subscription' => 'Gestione sottoscrizioni',
-		'tags' => 'My labels',	//TODO - Translation
+		'tags' => 'My labels',	// TODO - Translation
 		'unread' => 'Mostra solo non letti',
 	),
 	'share' => 'Condividi',
 	'tag' => array(
-		'related' => 'Tags correlati',	//TODO - Translation
+		'related' => 'Tags correlati',
+	),
+	'tos' => array(
+		'title' => 'Terms of Service',	// TODO - Translation
 	),
 );

app/i18n/it/install.php

@@ -17,20 +17,19 @@ return array(
 		'type' => 'Metodo di autenticazione',
 	),
 	'bdd' => array(
-		'_' => 'Database',
 		'conf' => array(
-			'_' => 'Configurazione database',
 			'ko' => 'Verifica le informazioni del database.',
 			'ok' => 'Le configurazioni del database sono state salvate.',
+			'_' => 'Configurazione database',
 		),
-		'host' => 'Host',
+		'host' => 'Host',	// TODO - Translation
 		'password' => 'Password del database',
 		'prefix' => 'Prefisso tabella',
 		'type' => 'Tipo di database',
 		'username' => 'Nome utente del database',
+		'_' => 'Database',	// TODO - Translation
 	),
 	'check' => array(
-		'_' => 'Controlli',
 		'already_installed' => 'FreshRSS risulta già installato!',
 		'cache' => array(
 			'nok' => 'Verifica i permessi sulla cartella <em>./data/cache</em>. Il server HTTP deve avere i permessi per scriverci dentro',
@@ -66,11 +65,11 @@ return array(
 		),
 		'json' => array(
 			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',	// TODO - Translation
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'Manca il framework Minz.',
@@ -94,12 +93,13 @@ return array(
 		),
 		'xml' => array(
 			'nok' => 'You lack the required library to parse XML.',
-			'ok' => 'You have the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',	// TODO - Translation
 		),
+		'_' => 'Controlli',
 	),
 	'conf' => array(
-		'_' => 'Configurazioni generali',
 		'ok' => 'Configurazioni generali salvate.',
+		'_' => 'Configurazioni generali',
 	),
 	'congratulations' => 'Congratulazione!',
 	'default_user' => 'Username utente predefinito <small>(massimo 16 caratteri alfanumerici)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'Reinstallando FreshRSS perderai la configurazione precedente. Sei sicuro di voler procedere?',
 	),
 	'language' => array(
-		'_' => 'Lingua',
 		'choose' => 'Seleziona la lingua per FreshRSS',
 		'defined' => 'Lingua impostata.',
+		'_' => 'Lingua',
 	),
 	'not_deleted' => 'Qualcosa non ha funzionato; devi cancellare il file <em>%s</em> manualmente.',
 	'ok' => 'Processo di installazione terminato con successo.',
 	'step' => 'Passaggio %d',
 	'steps' => 'Passaggi',
-	'title' => 'Installazione · FreshRSS',
 	'this_is_the_end' => 'Fine',
+	'title' => 'Installazione · FreshRSS',
 );

app/i18n/it/sub.php

@@ -2,24 +2,24 @@
 
 return array(
 	'api' => array(
-		'documentation' => 'Copy the following URL to use it within an external tool.',	//TODO - Translation
-		'title' => 'API',	//TODO - Translation
+		'documentation' => 'Copy the following URL to use it within an external tool.',	// TODO - Translation
+		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',// TODO
-		'label' => 'Subscribe',	//TODO - Translation
-		'title' => 'Bookmarklet',	//TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'label' => 'Subscribe',	// TODO - Translation
+		'title' => 'Bookmarklet',	// TODO - Translation
 	),
 	'category' => array(
-		'_' => 'Categoria',
 		'add' => 'Aggiungi una categoria',
 		'archiving' => 'Archiviazione',
 		'empty' => 'Categoria vuota',
 		'information' => 'Informazioni',
 		'new' => 'Nuova categoria',
-		'position' => 'Display position',	//TODO - Translation
-		'position_help' => 'To control category sort order',	//TODO - Translation
+		'position' => 'Display position',	// TODO - Translation
+		'position_help' => 'To control category sort order',	// TODO - Translation
 		'title' => 'Titolo',
+		'_' => 'Categoria',
 	),
 	'feed' => array(
 		'add' => 'Aggiungi un Feed RSS',
@@ -29,60 +29,60 @@ return array(
 			'configuration' => 'Autenticazione',
 			'help' => 'Accesso per feeds protetti',
 			'http' => 'Autenticazione HTTP',
-			'password' => 'HTTP password',
-			'username' => 'HTTP username',
+			'password' => 'HTTP password',	// TODO - Translation
+			'username' => 'HTTP username',	// TODO - Translation
 		),
-		'clear_cache' => 'Always clear cache',	//TODO - Translation
+		'clear_cache' => 'Always clear cache',	// TODO - Translation
 		'css_help' => 'In caso di RSS feeds troncati (attenzione, richiede molto tempo!)',
 		'css_path' => 'Percorso del foglio di stile CSS del sito di origine',
 		'description' => 'Descrizione',
 		'empty' => 'Questo feed non contiene articoli. Per favore verifica il sito direttamente.',
 		'error' => 'Questo feed ha generato un errore. Per favore verifica se ancora disponibile.',
 		'filteractions' => array(
-			'_' => 'Filter actions',	//TODO - Translation
-			'help' => 'Write one search filter per line.',	//TODO - Translation
+			'help' => 'Write one search filter per line.',	// TODO - Translation
+			'_' => 'Filter actions',	// TODO - Translation
 		),
 		'information' => 'Informazioni',
 		'keep_min' => 'Numero minimo di articoli da mantenere',
 		'moved_category_deleted' => 'Cancellando una categoria i feed al suo interno verranno classificati automaticamente come <em>%s</em>.',
-		'mute' => 'mute',	//TODO - Translation
+		'mute' => 'mute',	// TODO - Translation
 		'no_selected' => 'Nessun feed selezionato.',
 		'number_entries' => '%d articoli',
 		'priority' => array(
-			'_' => 'Visibility',	//TODO - Translation
-			'archived' => 'Do not show (archived)',	//TODO - Translation
-			'main_stream' => 'Mostra in homepage',	//TODO - Translation
-			'normal' => 'Show in its category',	//TODO - Translation
+			'archived' => 'Do not show (archived)',	// TODO - Translation
+			'main_stream' => 'Mostra in homepage',
+			'normal' => 'Show in its category',	// TODO - Translation
+			'_' => 'Visibility',	// TODO - Translation
 		),
-		'websub' => 'Notifica istantanea con WebSub',
 		'show' => array(
-			'all' => 'Show all feeds',	//TODO - Translation
-			'error' => 'Show only feeds with error',	//TODO - Translation
+			'all' => 'Show all feeds',	// TODO - Translation
+			'error' => 'Show only feeds with error',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	//TODO - Translation
+			'error' => 'Showing only feeds with error',	// TODO - Translation
 		),
-		'ssl_verify' => 'Verify SSL security',	//TODO - Translation
+		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'Statistiche',
 		'think_to_add' => 'Aggiungi feed.',
-		'timeout' => 'Timeout in seconds',	//TODO - Translation
+		'timeout' => 'Timeout in seconds',	// TODO - Translation
 		'title' => 'Titolo',
 		'title_add' => 'Aggiungi RSS feed',
 		'ttl' => 'Non aggiornare automaticamente piu di',
-		'url' => 'Feed URL',
+		'url' => 'Feed URL',	// TODO - Translation
 		'validator' => 'Controlla la validita del feed ',
 		'website' => 'URL del sito',
+		'websub' => 'Notifica istantanea con WebSub',
 	),
 	'firefox' => array(
-		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
-		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
-		'title' => 'Firefox feed reader',	//TODO - Translation
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	// TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	// TODO - Translation
+		'title' => 'Firefox feed reader',	// TODO - Translation
 	),
 	'import_export' => array(
 		'export' => 'Esporta',
+		'export_labelled' => 'Export your labelled articles',	// TODO - Translation
 		'export_opml' => 'Esporta tutta la lista dei feed (OPML)',
 		'export_starred' => 'Esporta i tuoi preferiti',
-		'export_labelled' => 'Export your labelled articles',	//TODO
 		'feed_list' => 'Elenco di %s articoli',
 		'file_to_import' => 'File da importare<br />(OPML, JSON o ZIP)',
 		'file_to_import_no_zip' => 'File da importare<br />(OPML o JSON)',
@@ -94,11 +94,11 @@ return array(
 		'bookmark' => 'Bookmark (trascina nei preferiti)',
 		'import_export' => 'Importa / esporta',
 		'subscription_management' => 'Gestione sottoscrizioni',
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 	'title' => array(
-		'_' => 'Gestione sottoscrizioni',
 		'feed_management' => 'Gestione RSS feeds',
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
+		'_' => 'Gestione sottoscrizioni',
 	),
 );

app/i18n/it/user.php

@@ -3,35 +3,35 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.', //TODO - Translation
-			'required' => 'The email address is required.', //TODO - Translation
+			'invalid' => 'The email address is invalid.',	// TODO - Translation
+			'required' => 'The email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
-			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
-				'email_sent' => 'An email has been sent to your address.', //TODO - Translation
-				'error' => 'The email address failed to be validated.', //TODO - Translation
-				'ok' => 'The email address has been validated.', //TODO - Translation
-				'unneccessary' => 'The email address was already validated.', //TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
+				'error' => 'The email address failed to be validated.',	// TODO - Translation
+				'ok' => 'The email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
-			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
-			'resend_email' => 'Resend the email', //TODO - Translation
-			'title' => 'Email address validation', //TODO - Translation
-		),
-	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
+			'resend_email' => 'Resend the email',	// TODO - Translation
+			'title' => 'Email address validation',	// TODO - Translation
 		),
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'title' => 'You need to validate your account', //TODO - Translation
-			'welcome' => 'Welcome %s,', //TODO - Translation
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'title' => 'You need to validate your account',	// TODO - Translation
+			'welcome' => 'Welcome %s,',	// TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.',	// TODO - Translation
 		),
 	),
 );

app/i18n/kr/admin.php

@@ -64,7 +64,7 @@ return array(
 		'files' => '파일 시스템 설치 요구사항',
 		'json' => array(
 			'nok' => 'JSON 확장 기능을 찾을 수 없습니다 (php-json 패키지).',
-			'ok' => 'JSON  확장 기능이 설치되어 있습니다.',
+			'ok' => 'JSON 확장 기능이 설치되어 있습니다.',
 		),
 		'mbstring' => array(
 			'nok' => '유니코드 지원을 위한 mbstring 라이브러리를 찾을 수 없습니다.',
@@ -83,9 +83,9 @@ return array(
 			'ok' => '최소 하나의 지원가능한 드라이버와 PDO가 설치되어 있습니다 (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'PHP 설치 요구사항',
 			'nok' => 'PHP 버전은 %s 이지만, FreshRSS에는 최소 %s의 버전이 필요합니다.',
 			'ok' => 'PHP 버전은 %s 이고, FreshRSS와 호환가능 합니다.',
+			'_' => 'PHP 설치 요구사항',
 		),
 		'tables' => array(
 			'nok' => '하나 이상의 테이블을 데이터베이스에서 찾을 수 없습니다.',
@@ -116,8 +116,8 @@ return array(
 		'name' => '이름',
 		'no_configure_view' => '이 확장 기능은 설정이 없습니다.',
 		'system' => array(
-			'_' => '시스템 확장 기능',
 			'no_rights' => '시스템 확장 기능 (이 확장 기능에 대한 권한이 없습니다)',
+			'_' => '시스템 확장 기능',
 		),
 		'title' => '확장 기능',
 		'update' => '업데이트 있음',
@@ -125,7 +125,6 @@ return array(
 		'version' => '버전',
 	),
 	'stats' => array(
-		'_' => '통계',
 		'all_feeds' => '모든 피드',
 		'category' => '카테고리',
 		'entry_count' => '글 개수',
@@ -155,31 +154,32 @@ return array(
 		'status_unread' => '읽지 않음',
 		'title' => '통계',
 		'top_feed' => '상위 10 개 피드',
+		'_' => '통계',
 	),
 	'system' => array(
-		'_' => '시스템 설정',
 		'auto-update-url' => '자동 업데이트 서버 URL',
-		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
-		'instance-name' => '인스턴스 이름',
-		'max-categories' => '사용자별 카테고리 개수 제한',
-		'max-feeds' => '사용자별 피드 개수 제한',
 		'cookie-duration' => array(
 			'help' => '초',
 			'number' => '로그인 유지 시간',
 		),
+		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'instance-name' => '인스턴스 이름',
+		'max-categories' => '사용자별 카테고리 개수 제한',
+		'max-feeds' => '사용자별 피드 개수 제한',
 		'registration' => array(
 			'help' => '0: 제한 없음',
 			'number' => '계정 최대 개수',
 		),
+		'_' => '시스템 설정',
 	),
 	'update' => array(
-		'_' => '업데이트',
 		'apply' => '업데이트 적용하기',
 		'check' => '새 업데이트 확인하기',
 		'current_version' => '현재 FreshRSS 버전은 %s 입니다.',
 		'last' => '마지막 확인: %s',
 		'none' => '적용 가능한 업데이트가 없습니다',
 		'title' => '업데이트',
+		'_' => '업데이트',
 	),
 	'user' => array(
 		'articles_and_size' => '%s 개의 글 (%s)',
@@ -188,7 +188,7 @@ return array(
 		'create' => '새 사용자 생성',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => '사용자 삭제',
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => '언어',
 		'list' => 'User list',	// TODO - Translation
 		'number' => '%d 개의 계정이 생성되었습니다',
@@ -198,8 +198,8 @@ return array(
 		'selected' => '선택된 사용자',
 		'title' => '사용자 관리',
 		'update_users' => '사용자 정보 변경',
-		'user_list' => '사용자 목록',
 		'username' => '사용자 이름',
 		'users' => '전체 사용자',
+		'user_list' => '사용자 목록',
 	),
 );

app/i18n/kr/conf.php

@@ -2,34 +2,33 @@
 
 return array(
 	'archiving' => array(
-		'_' => '보관',
 		'delete_after' => '다음 기간보다 오래된 글 삭제',
-		'exception' => 'Purge exception',	//TODO - Translation
+		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => '더 자세한 옵션은 개별 피드 설정에 있습니다',
-		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
+		'keep_labels' => 'Never delete labels',	// TODO - Translation
+		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => '피드별 최소 유지 글 개수',
-		'keep_labels' => 'Never delete labels',	//TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
-		'maintenance' => 'Maintenance',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => '데이터베이스 최적화',
 		'optimize_help' => '데이터베이스 크기를 줄이기 위해 가끔씩 수행해주세요',
-		'policy' => 'Purge policy',	//TODO - Translation
-		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
+		'policy' => 'Purge policy',	// TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	// TODO - Translation
 		'purge_now' => '지금 삭제',
-		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
-		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => '보관',
 		'ttl' => '다음 시간이 지나기 전에 새로고침 금지',
+		'_' => '보관',
 	),
 	'display' => array(
-		'_' => '표시',
 		'icon' => array(
 			'bottom_line' => '하단',
+			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => '문서 아이콘',
 			'publication_date' => '발행일',
 			'related_tags' => '관련 태그',
 			'sharing' => '공유',
-			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => '상단',
 		),
 		'language' => '언어',
@@ -47,22 +46,22 @@ return array(
 			'no_limit' => '제한 없음',
 			'thin' => '얇음',
 		),
+		'_' => '표시',
 	),
 	'profile' => array(
-		'_' => '프로필 관리',
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => '계정 삭제',
 			'warn' => '당신의 계정과 관련된 모든 데이터가 삭제됩니다.',
+			'_' => '계정 삭제',
 		),
 		'email' => '메일 주소',
 		'password_api' => 'API 암호<br /><small>(예: 모바일 애플리케이션)</small>',
 		'password_form' => '암호<br /><small>(웹폼 로그인 방식 사용시)</small>',
 		'password_format' => '7 글자 이상이어야 합니다',
 		'title' => '프로필',
+		'_' => '프로필 관리',
 	),
 	'query' => array(
-		'_' => '사용자 쿼리',
 		'deprecated' => '이 쿼리는 더 이상 유효하지 않습니다. 해당하는 카테고리나 피드가 삭제되었습니다.',
 		'display' => '사용자 쿼리 결과 표시',
 		'filter' => '적용된 필터:',
@@ -70,8 +69,8 @@ return array(
 		'get_category' => '"%s" 카테고리 표시',
 		'get_favorite' => '즐겨찾기에 등록된 글 표시',
 		'get_feed' => '"%s" 피드 표시',
-		'no_filter' => '필터가 없습니다',
 		'none' => '아직 사용자 쿼리를 만들지 않았습니다.',
+		'no_filter' => '필터가 없습니다',
 		'number' => '쿼리 #%d',
 		'order_asc' => '오래된 글 먼저 표시',
 		'order_desc' => '최근 글 먼저 표시',
@@ -94,9 +93,9 @@ return array(
 		'state_14' => '읽지 않은 글 표시',
 		'state_15' => '모든 글 표시',
 		'title' => '사용자 쿼리',
+		'_' => '사용자 쿼리',
 	),
 	'reading' => array(
-		'_' => '읽기',
 		'after_onread' => '“모두 읽음으로 표시” 후,',
 		'articles_per_page' => '페이지당 글 수',
 		'auto_load_more' => '페이지 하단에 다다르면 글 더 불러오기',
@@ -117,16 +116,16 @@ return array(
 			'when' => '읽음으로 표시…',
 		),
 		'show' => array(
-			'_' => '글 표시 방식',
 			'adaptive' => '읽지 않은 글이 없으면 모든 글 표시',
 			'all_articles' => '모든 글 표시',
 			'unread' => '읽지 않은 글만 표시',
+			'_' => '글 표시 방식',
 		),
 		'sides_close_article' => '글 영역 바깥을 클릭하면 글 접기',
 		'sort' => array(
-			'_' => '정렬 순서',
 			'newer_first' => '최근 글 먼저',
 			'older_first' => '오래된 글 먼저',
+			'_' => '정렬 순서',
 		),
 		'sticky_post' => '글이 펼쳐진 경우 최상단에 고정하기',
 		'title' => '읽기',
@@ -136,9 +135,9 @@ return array(
 			'normal' => '일반 모드',
 			'reader' => '읽기 모드',
 		),
+		'_' => '읽기',
 	),
 	'sharing' => array(
-		'_' => '공유',
 		'add' => '공유 방법 추가',
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
@@ -153,9 +152,9 @@ return array(
 		'title' => '공유',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'_' => '공유',
 	),
 	'shortcut' => array(
-		'_' => '단축키',
 		'article_action' => '글 관련 동작',
 		'auto_share' => '공유',
 		'auto_share_help' => '공유 옵션이 하나만 설정되어 있다면 해당 공유 옵션을 사용하고, 그렇지 않다면 공유 옵션을 번호로 선택할 수 있습니다.',
@@ -187,6 +186,7 @@ return array(
 		'user_filter' => '사용자 필터 사용하기',
 		'user_filter_help' => '사용자 필터가 하나만 설정되어 있다면 해당 필터를 사용하고, 그렇지 않다면 필터를 번호로 선택할 수 있습니다.',
 		'views' => '표시',
+		'_' => '단축키',
 	),
 	'user' => array(
 		'articles_and_size' => '%s 개의 글 (%s)',

app/i18n/kr/feedback.php

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => '최적화가 완료되었습니다',
-	),
 	'access' => array(
 		'denied' => '이 페이지에 접근할 수 있는 권한이 없습니다',
 		'not_found' => '이 페이지는 존재하지 않습니다',
 	),
+	'admin' => array(
+		'optimization_complete' => '최적화가 완료되었습니다',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s 확장 기능을 활성화 할 수 없습니다. 자세한 내용은 <a href="%s">FreshRSS 로그</a>를 참고하세요.',
 			'ok' => '%s 확장 기능이 활성화되었습니다',
 		),
-		'no_access' => '%s 확장 기능에 접근 권한이 없습니다',
 		'not_enabled' => '%s 확장 기능이 활성화되지 않았습니다',
 		'not_found' => '%s 확장 기능이 존재하지 않습니다',
+		'no_access' => '%s 확장 기능에 접근 권한이 없습니다',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'ZIP 확장 기능을 서버에서 찾을 수 없습니다. 파일을 하나씩 내보내세요.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => '카테고리를 비웠습니다',
 			'error' => '카테고리를 변경할 수 없습니다',
 			'name_exists' => '같은 카테고리 이름이 이미 존재합니다.',
-			'no_id' => '카테고리 id를 명시해야 합니다.',
-			'no_name' => '카테고리 이름을 명시해야 합니다.',
 			'not_delete_default' => '기본 카테고리는 삭제할 수 없습니다!',
 			'not_exist' => '카테고리가 존재하지 않습니다!',
+			'no_id' => '카테고리 id를 명시해야 합니다.',
+			'no_name' => '카테고리 이름을 명시해야 합니다.',
 			'over_max' => '카테고리 개수 제한에 다다랐습니다 (%d)',
 			'updated' => '카테고리가 변경되었습니다.',
 		),
@@ -88,10 +88,10 @@ return array(
 			'error' => '피드를 변경할 수 없습니다',
 			'internal_problem' => 'RSS 피드를 추가할 수 없습니다. 자세한 내용은 <a href="%s">FreshRSS 로그</a>를 참고하세요.',
 			'invalid_url' => 'URL (<em>%s</em>)이 유효하지 않습니다',
+			'not_added' => '<em>%s</em> 피드를 추가할 수 없습니다',
+			'no_refresh' => '새 글을 가져올 피드가 없습니다…',
 			'n_actualized' => '%d 개의 피드에서 새 글을 가져왔습니다',
 			'n_entries_deleted' => '%d 개의 글을 삭제했습니다',
-			'no_refresh' => '새 글을 가져올 피드가 없습니다…',
-			'not_added' => '<em>%s</em> 피드를 추가할 수 없습니다',
 			'over_max' => '피드 개수 제한에 다다랐습니다 (%d)',
 			'updated' => '피드가 변경되었습니다',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => '%s 사용자가 생성되었습니다',
 			'error' => '%s 사용자를 생성할 수 없습니다',
+			'_' => '%s 사용자가 생성되었습니다',
 		),
 		'deleted' => array(
-			'_' => '%s 사용자를 삭제했습니다',
 			'error' => '%s 사용자를 삭제할 수 없습니다',
+			'_' => '%s 사용자를 삭제했습니다',
 		),
 		'updated' => array(
-			'_' => '사용자 %s의 정보가 변경되었습니다',
 			'error' => '사용자 %s의 정보가 변경되지 않았습니다',
+			'_' => '사용자 %s의 정보가 변경되었습니다',
 		),
 	),
 );

app/i18n/kr/gen.php

@@ -3,7 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => '새 글 가져오기',
-		'back' => '← Go back', //TODO - Translation
+		'back' => '← Go back',	// TODO - Translation
 		'back_to_rss_feeds' => '← RSS 피드로 돌아가기',
 		'cancel' => '취소',
 		'create' => '생성',
@@ -24,25 +24,25 @@ return array(
 		'update' => '변경',
 	),
 	'auth' => array(
-		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.',	// TODO - Translation
 		'email' => '메일 주소',
 		'keep_logged_in' => '로그인 유지 <small>(%s 일)</small>',
 		'login' => '로그인',
 		'logout' => '로그아웃',
 		'password' => array(
-			'_' => '암호',
 			'format' => '<small>7 글자 이상이어야 합니다</small>',
+			'_' => '암호',
 		),
 		'registration' => array(
-			'_' => '새 계정',
 			'ask' => '새 계정을 만들까요?',
 			'title' => '계정 생성',
+			'_' => '새 계정',
 		),
 		'reset' => '인증 초기화',
 		'username' => array(
-			'_' => '사용자 이름',
 			'admin' => '관리자 이름',
 			'format' => '<small>알파벳과 숫자를 포함할 수 있고 최대 16 글자</small>',
+			'_' => '사용자 이름',
 		),
 	),
 	'date' => array(
@@ -65,8 +65,8 @@ return array(
 		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
 		'jan' => '1월',
 		'january' => '1월',
-		'Jul' => '\\J\\u\\l\\y',
 		'jul' => '7월',
+		'Jul' => '\\J\\u\\l\\y',
 		'july' => '7월',
 		'Jun' => '\\J\\u\\n\\e',
 		'jun' => '6월',
@@ -76,15 +76,15 @@ return array(
 		'last_month' => '최근 한 달',
 		'last_week' => '최근 한 주',
 		'last_year' => '최근 일 년',
-		'Mar' => '\\M\\a\\r\\c\\h',
 		'mar' => '3월',
+		'Mar' => '\\M\\a\\r\\c\\h',
 		'march' => '3월',
 		'May' => '\\M\\a\\y',
 		'may' => '5월',
 		'may_' => '5월',
-		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
 		'mon' => '월',
 		'month' => '개월',
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
 		'nov' => '11월',
 		'november' => '11월',
 		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
@@ -102,8 +102,8 @@ return array(
 		'yesterday' => '어제',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => '정보',
+		'_' => 'FreshRSS',
 	),
 	'js' => array(
 		'category_empty' => '빈 카테고리',
@@ -130,6 +130,7 @@ return array(
 		'oc' => 'Occitan',
 		'pt-br' => 'Português (Brasil)',
 		'ru' => 'Русский',
+		'sk' => 'Slovenčina',	// TODO - Translation
 		'tr' => 'Türkçe',
 		'zh-cn' => '简体中文',
 	),
@@ -164,11 +165,11 @@ return array(
 		'previous' => '이전',
 	),
 	'period' => array(
-		'days' => 'days',	//TODO - Translation
-		'hours' => 'hours',	//TODO - Translation
-		'months' => 'months',	//TODO - Translation
-		'weeks' => 'weeks',	//TODO - Translation
-		'years' => 'years',	//TODO - Translation
+		'days' => 'days',	// TODO - Translation
+		'hours' => 'hours',	// TODO - Translation
+		'months' => 'months',	// TODO - Translation
+		'weeks' => 'weeks',	// TODO - Translation
+		'years' => 'years',	// TODO - Translation
 	),
 	'share' => array(
 		'blogotext' => 'Blogotext',

app/i18n/kr/index.php

@@ -2,7 +2,6 @@
 
 return array(
 	'about' => array(
-		'_' => '정보',
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => '버그 제보하기',
 		'credits' => '크레딧',
@@ -14,23 +13,21 @@ return array(
 		'title' => '정보',
 		'version' => '버전',
 		'website' => '웹사이트',
-	),
-	'tos' => array(
-		'title' => 'Terms of Service', // TODO - Translation
+		'_' => '정보',
 	),
 	'feed' => array(
 		'add' => '피드를 추가하세요.',
 		'empty' => '글이 없습니다.',
 		'rss_of' => '%s의 피드',
 		'title' => 'RSS 피드',
-		'title_global' => '전체 모드',
 		'title_fav' => '즐겨찾기',
+		'title_global' => '전체 모드',
 	),
 	'log' => array(
-		'_' => '로그',
 		'clear' => '로그 모두 지우기',
 		'empty' => '로그 파일이 비어있습니다',
 		'title' => '로그',
+		'_' => '로그',
 	),
 	'menu' => array(
 		'about' => 'FreshRSS 정보',
@@ -63,4 +60,7 @@ return array(
 	'tag' => array(
 		'related' => '관련 태그',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service',	// TODO - Translation
+	),
 );

app/i18n/kr/install.php

@@ -17,20 +17,19 @@ return array(
 		'type' => '인증 방식',
 	),
 	'bdd' => array(
-		'_' => '데이터베이스',
 		'conf' => array(
-			'_' => '데이터베이스 설정',
 			'ko' => '데이터베이스 정보를 확인하세요.',
 			'ok' => '데이터베이스 설정이 저장되었습니다.',
+			'_' => '데이터베이스 설정',
 		),
 		'host' => '데이터베이스 서버',
 		'password' => '데이터베이스 암호',
 		'prefix' => '테이블 접두어',
 		'type' => '데이터베이스 종류',
 		'username' => '데이터베이스 사용자 이름',
+		'_' => '데이터베이스',
 	),
 	'check' => array(
-		'_' => '설치 요구사항 확인',
 		'already_installed' => 'FreshRSS가 이미 설치되어 있는 것을 감지했습니다!',
 		'cache' => array(
 			'nok' => '<em>./data/cache</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다',
@@ -66,7 +65,7 @@ return array(
 		),
 		'json' => array(
 			'nok' => 'JSON 확장 기능을 찾을 수 없습니다 (php-json 패키지).',
-			'ok' => 'JSON  확장 기능이 설치되어 있습니다.',
+			'ok' => 'JSON 확장 기능이 설치되어 있습니다.',
 		),
 		'mbstring' => array(
 			'nok' => '유니코드 지원을 위한 mbstring 라이브러리를 찾을 수 없습니다.',
@@ -96,10 +95,11 @@ return array(
 			'nok' => 'XML 해석을 위한 라이브러리르 찾을 수 없습니다.',
 			'ok' => 'XML 해석을 위한 라이브러리가 설치되어 있습니다.',
 		),
+		'_' => '설치 요구사항 확인',
 	),
 	'conf' => array(
-		'_' => '일반 설정',
 		'ok' => '일반 설정이 저장되었습니다.',
+		'_' => '일반 설정',
 	),
 	'congratulations' => '축하합니다!',
 	'default_user' => '기본 사용자 이름<small>(알파벳과 숫자를 포함할 수 있고 최대 16 글자)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'FreshRSS을 다시 설치하면 이전 설정이 사라집니다. 계속하시겠습니까?',
 	),
 	'language' => array(
-		'_' => '언어',
 		'choose' => 'FreshRSS에서 사용할 언어를 고르세요',
 		'defined' => '언어가 설정되었습니다.',
+		'_' => '언어',
 	),
 	'not_deleted' => '무언가 잘못되었습니다; <em>%s</em> 파일을 직접 삭제해주세요.',
 	'ok' => '설치 과정이 성공적으로 끝났습니다.',
 	'step' => '단계 %d',
 	'steps' => '단계',
-	'title' => '설치 · FreshRSS',
 	'this_is_the_end' => '마침',
+	'title' => '설치 · FreshRSS',
 );

app/i18n/kr/sub.php

@@ -11,15 +11,15 @@ return array(
 		'title' => '북마클릿',
 	),
 	'category' => array(
-		'_' => '카테고리',
 		'add' => '카테고리 추가',
 		'archiving' => '보관',
 		'empty' => '빈 카테고리',
 		'information' => '정보',
 		'new' => '새 카테고리',
-		'position' => 'Display position',	//TODO - Translation
-		'position_help' => 'To control category sort order',	//TODO - Translation
+		'position' => 'Display position',	// TODO - Translation
+		'position_help' => 'To control category sort order',	// TODO - Translation
 		'title' => '제목',
+		'_' => '카테고리',
 	),
 	'feed' => array(
 		'add' => 'RSS 피드 추가',
@@ -39,8 +39,8 @@ return array(
 		'empty' => '이 피드는 비어있습니다. 피드가 계속 운영되고 있는지 확인하세요.',
 		'error' => '이 피드에 문제가 발생했습니다. 이 피드에 접근 권한이 있는지 확인하세요.',
 		'filteractions' => array(
-			'_' => 'Filter actions',	//TODO - Translation
-			'help' => 'Write one search filter per line.',	//TODO - Translation
+			'help' => 'Write one search filter per line.',	// TODO - Translation
+			'_' => 'Filter actions',	// TODO - Translation
 		),
 		'information' => '정보',
 		'keep_min' => '최소 유지 글 개수',
@@ -49,12 +49,11 @@ return array(
 		'no_selected' => '선택된 피드가 없습니다.',
 		'number_entries' => '%d 개의 글',
 		'priority' => array(
-			'_' => '표시',
 			'archived' => '표시하지 않음 (보관됨)',
 			'main_stream' => '메인 스트림에 표시하기',
 			'normal' => '피드가 속한 카테고리에만 표시하기',
+			'_' => '표시',
 		),
-		'websub' => 'WebSub을 사용한 즉시 알림',
 		'show' => array(
 			'all' => '모든 피드 보기',
 			'error' => '오류가 발생한 피드만 보기',
@@ -72,17 +71,18 @@ return array(
 		'url' => '피드 URL',
 		'validator' => '피드 유효성 검사',
 		'website' => '웹사이트 URL',
+		'websub' => 'WebSub을 사용한 즉시 알림',
 	),
 	'firefox' => array(
 		'documentation' => 'FreshRSS를 Firefox 피드 리더에 추가하기 위해서는 <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">여기</a>의 설명을 따르세요.',
-		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	// TODO - Translation
 		'title' => 'Firefox 피드 리더',
 	),
 	'import_export' => array(
 		'export' => '내보내기',
+		'export_labelled' => '라벨이 표시된 글들 내보내기',
 		'export_opml' => '피드 목록 내보내기 (OPML)',
 		'export_starred' => '즐겨찾기 내보내기',
-		'export_labelled' => '라벨이 표시된 글들 내보내기',
 		'feed_list' => '%s 개의 글 목록',
 		'file_to_import' => '불러올 파일<br />(OPML, JSON 또는 ZIP)',
 		'file_to_import_no_zip' => '불러올 파일<br />(OPML 또는 JSON)',
@@ -97,8 +97,8 @@ return array(
 		'subscription_tools' => '구독 도구',
 	),
 	'title' => array(
-		'_' => '구독 관리',
 		'feed_management' => 'RSS 피드 관리',
 		'subscription_tools' => '구독 도구',
+		'_' => '구독 관리',
 	),
 );

app/i18n/kr/user.php

@@ -3,35 +3,35 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.', //TODO - Translation
-			'required' => 'The email address is required.', //TODO - Translation
+			'invalid' => 'The email address is invalid.',	// TODO - Translation
+			'required' => 'The email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
-			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
-				'email_sent' => 'An email has been sent to your address.', //TODO - Translation
-				'error' => 'The email address failed to be validated.', //TODO - Translation
-				'ok' => 'The email address has been validated.', //TODO - Translation
-				'unneccessary' => 'The email address was already validated.', //TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
+				'error' => 'The email address failed to be validated.',	// TODO - Translation
+				'ok' => 'The email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
-			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
-			'resend_email' => 'Resend the email', //TODO - Translation
-			'title' => 'Email address validation', //TODO - Translation
-		),
-	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
+			'resend_email' => 'Resend the email',	// TODO - Translation
+			'title' => 'Email address validation',	// TODO - Translation
 		),
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'title' => 'You need to validate your account', //TODO - Translation
-			'welcome' => 'Welcome %s,', //TODO - Translation
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'title' => 'You need to validate your account',	// TODO - Translation
+			'welcome' => 'Welcome %s,',	// TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.',	// TODO - Translation
 		),
 	),
 );

app/i18n/nl/admin.php

@@ -1,5 +1,5 @@
 <?php
-/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+
 return array(
 	'auth' => array(
 		'allow_anonymous' => 'Sta bezoekers toe om artikelen te lezen van de standaard gebruiker (%s)',
@@ -83,9 +83,9 @@ return array(
 			'ok' => 'U hebt PDO en ten minste één van de ondersteunde drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'PHP installatie',
 			'nok' => 'Uw PHP versie is %s maar FreshRSS benodigd tenminste versie %s.',
 			'ok' => 'Uw PHP versie is %s, welke compatibel is met FreshRSS.',
+			'_' => 'PHP installatie',
 		),
 		'tables' => array(
 			'nok' => 'Er zijn één of meer ontbrekende tabellen in de database.',
@@ -116,8 +116,8 @@ return array(
 		'name' => 'Naam',
 		'no_configure_view' => 'Deze uitbreiding kan niet worden geconfigureerd.',
 		'system' => array(
-			'_' => 'Systeemuitbreidingen',
 			'no_rights' => 'Systeemuitbreidingen (U hebt hier geen rechten op)',
+			'_' => 'Systeemuitbreidingen',
 		),
 		'title' => 'Uitbreidingen',
 		'update' => 'Update beschikbaar',
@@ -125,7 +125,6 @@ return array(
 		'version' => 'Versie',
 	),
 	'stats' => array(
-		'_' => 'Statistieken',
 		'all_feeds' => 'Alle feeds',
 		'category' => 'Categorie',
 		'entry_count' => 'Invoer aantallen',
@@ -155,31 +154,32 @@ return array(
 		'status_unread' => 'Ongelezen',
 		'title' => 'Statistieken',
 		'top_feed' => 'Top tien feeds',
+		'_' => 'Statistieken',
 	),
 	'system' => array(
-		'_' => 'Systeem configuratie',
 		'auto-update-url' => 'Automatische update server URL',
-		'force_email_validation' => 'Emailadresvalidatie forceren',
-		'instance-name' => 'Voorbeeld naam',
-		'max-categories' => 'Categorielimiet per gebruiker',
-		'max-feeds' => 'Feedlimiet per gebruiker',
 		'cookie-duration' => array(
 			'help' => 'in seconden',
 			'number' => 'Tijdsduur om ingelogd te blijven',
 		),
+		'force_email_validation' => 'Emailadresvalidatie forceren',
+		'instance-name' => 'Voorbeeld naam',
+		'max-categories' => 'Categorielimiet per gebruiker',
+		'max-feeds' => 'Feedlimiet per gebruiker',
 		'registration' => array(
 			'help' => '0 betekent geen account limiet',
 			'number' => 'Maximum aantal accounts',
 		),
+		'_' => 'Systeem configuratie',
 	),
 	'update' => array(
-		'_' => 'Versie controle',
 		'apply' => 'Toepassen',
 		'check' => 'Controleer op nieuwe versies',
 		'current_version' => 'Uw huidige versie van FreshRSS is %s.',
 		'last' => 'Laatste controle: %s',
 		'none' => 'Geen nieuwe versie om toe te passen',
 		'title' => 'Vernieuw systeem',
+		'_' => 'Versie controle',
 	),
 	'user' => array(
 		'articles_and_size' => '%s artikelen (%s)',
@@ -188,7 +188,7 @@ return array(
 		'create' => 'Creëer nieuwe gebruiker',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Verwijder gebruiker',
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Taal',
 		'list' => 'User list',	// TODO - Translation
 		'number' => 'Er is %d accounts gemaakt',
@@ -198,8 +198,8 @@ return array(
 		'selected' => 'Geselecteerde gebruiker',
 		'title' => 'Beheer gebruikers',
 		'update_users' => 'Gebruiker bijwerken',
-		'user_list' => 'Lijst van gebruikers ',
 		'username' => 'Gebruikersnaam',
 		'users' => 'Gebruikers',
+		'user_list' => 'Lijst van gebruikers ',
 	),
 );

app/i18n/nl/conf.php

@@ -2,13 +2,14 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archivering',
 		'delete_after' => 'Verwijder artikelen na',
 		'exception' => 'Zuiveringsuitzondering',
 		'help' => 'Meer opties zijn beschikbaar in de persoonlijke stroom instellingen',
 		'keep_favourites' => 'Favorieten nooit verwijderen',
-		'keep_min_by_feed' => 'Minimum aantal te behouden artikelen in de feed',
 		'keep_labels' => 'Labels nooit verwijderen',
+		'keep_max' => 'Maximaal aantal artikelen om te behouden',
+		'keep_min_by_feed' => 'Minimum aantal te behouden artikelen in de feed',
+		'keep_period' => 'Maximumleeftijd artikelen om te behouden',
 		'keep_unreads' => 'Ongelezen artikels nooit verwijderen',
 		'maintenance' => 'Onderhoud',
 		'optimize' => 'Database optimaliseren',
@@ -16,20 +17,18 @@ return array(
 		'policy' => 'Zuiveringsbeleid',
 		'policy_warning' => 'Zonder zuiveringsbeleid wordt elk artikel bewaard.',
 		'purge_now' => 'Schoon nu op',
-		'keep_max' => 'Maximaal aantal artikelen om te behouden',
-		'keep_period' => 'Maximumleeftijd artikelen om te behouden',
 		'title' => 'Archivering',
 		'ttl' => 'Vernieuw niet automatisch meer dan',
+		'_' => 'Archivering',
 	),
 	'display' => array(
-		'_' => 'Opmaak',
 		'icon' => array(
 			'bottom_line' => 'Onderaan',
+			'display_authors' => 'Auteurs',
 			'entry' => 'Artikel pictogrammen',
 			'publication_date' => 'Publicatie datum',
 			'related_tags' => 'Gerelateerde labels',
 			'sharing' => 'Delen',
-			'display_authors' => 'Auteurs',
 			'top_line' => 'Bovenaan',
 		),
 		'language' => 'Taal',
@@ -47,22 +46,22 @@ return array(
 			'no_limit' => 'Geen limiet',
 			'thin' => 'Smal',
 		),
+		'_' => 'Opmaak',
 	),
 	'profile' => array(
-		'_' => 'Profiel beheer',
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Account verwijderen',
 			'warn' => 'Uw account en alle gerelateerde gegvens worden verwijderd.',
+			'_' => 'Account verwijderen',
 		),
 		'email' => 'Email adres',
 		'password_api' => 'Wachtwoord API<br /><small>(e.g., voor mobiele apps)</small>',
 		'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier log in methode)</small>',
 		'password_format' => 'Ten minste 7 tekens',
 		'title' => 'Profiel',
+		'_' => 'Profiel beheer',
 	),
 	'query' => array(
-		'_' => 'Gebruikersquery\'s (informatie aanvragen)',
 		'deprecated' => 'Deze query (informatie aanvraag) is niet langer geldig. De bedoelde categorie of feed is al verwijderd.',
 		'display' => 'Queryresultaten weergeven',
 		'filter' => 'Filter toegepast:',
@@ -70,8 +69,8 @@ return array(
 		'get_category' => 'Toon "%s" categorie',
 		'get_favorite' => 'Toon favoriete artikelen',
 		'get_feed' => 'Toon "%s" feed',
-		'no_filter' => 'Geen filter',
 		'none' => 'U hebt nog geen gebruikers query aangemaakt..',
+		'no_filter' => 'Geen filter',
 		'number' => 'Query n°%d',
 		'order_asc' => 'Toon oudste artikelen eerst',
 		'order_desc' => 'Toon nieuwste artikelen eerst',
@@ -94,9 +93,9 @@ return array(
 		'state_14' => 'Toon ongelezen artikelen',
 		'state_15' => 'Toon alle artikelen',
 		'title' => 'Gebruikersquery\'s',
+		'_' => 'Gebruikersquery\'s (informatie aanvragen)',
 	),
 	'reading' => array(
-		'_' => 'Lezen',
 		'after_onread' => 'Na “markeer alles als gelezen”,',
 		'articles_per_page' => 'Aantal artikelen per pagina',
 		'auto_load_more' => 'Laad volgende artikel onderaan de pagina',
@@ -117,16 +116,16 @@ return array(
 			'when' => 'Markeer artikel als gelezen…',
 		),
 		'show' => array(
-			'_' => 'Artikelen om te tonen',
 			'adaptive' => 'Pas weergave aan',
 			'all_articles' => 'Bekijk alle artikelen',
 			'unread' => 'Bekijk alleen ongelezen',
+			'_' => 'Artikelen om te tonen',
 		),
 		'sides_close_article' => 'Sluit het artikel door buiten de artikeltekst te klikken',
 		'sort' => array(
-			'_' => 'Sorteer volgorde',
 			'newer_first' => 'Nieuwste eerst',
 			'older_first' => 'Oudste eerst',
+			'_' => 'Sorteer volgorde',
 		),
 		'sticky_post' => 'Koppel artikel aan de bovenkant als het geopend wordt',
 		'title' => 'Lees modus',
@@ -136,9 +135,9 @@ return array(
 			'normal' => 'Normale weergave',
 			'reader' => 'Lees weergave',
 		),
+		'_' => 'Lezen',
 	),
 	'sharing' => array(
-		'_' => 'Delen',
 		'add' => 'Deelmethode toevoegen',
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
@@ -153,9 +152,9 @@ return array(
 		'title' => 'Delen',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'_' => 'Delen',
 	),
 	'shortcut' => array(
-		'_' => 'Snelkoppelingen',
 		'article_action' => 'Artikelacties',
 		'auto_share' => 'Delen',
 		'auto_share_help' => 'Als er slechts één deelmethode is, dan wordt die gebruikt. Anders zijn ze toegankelijk met hun nummer.',
@@ -187,6 +186,7 @@ return array(
 		'user_filter' => 'Toegang gebruikers filters',
 		'user_filter_help' => 'Als er slechts één gebruikersfilter is, dan wordt die gebruikt. Anders zijn ze toegankelijk met hun nummer.',
 		'views' => 'Aanzichten',
+		'_' => 'Snelkoppelingen',
 	),
 	'user' => array(
 		'articles_and_size' => '%s artikelen (%s)',

app/i18n/nl/feedback.php

@@ -1,17 +1,17 @@
 <?php
-/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimalisatie compleet',
-	),
 	'access' => array(
 		'denied' => 'U hebt geen rechten om deze pagina te bekijken.',
 		'not_found' => 'Deze pagina bestaat niet',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Optimalisatie compleet',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s kan niet worden ingeschakeld. <a href="%s">Controleer FreshRSS log bestanden</a> voor details.',
 			'ok' => '%s is nn ingeschakeld',
 		),
-		'no_access' => 'U hebt geen toegang voor %s',
 		'not_enabled' => '%s is nog niet ingeschakeld',
 		'not_found' => '%s bestaat niet',
+		'no_access' => 'U hebt geen toegang voor %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'ZIP uitbreiding is niet aanwezig op uw server. Exporteer a.u.b. uw bestanden één voor één.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'Categorie is leeg gemaakt',
 			'error' => 'Categorie kan niet worden vernieuwd',
 			'name_exists' => 'Categorie naam bestaat al.',
-			'no_id' => 'U moet de id specificeren of de categorie.',
-			'no_name' => 'Categorie naam mag niet leeg zijn.',
 			'not_delete_default' => 'U kunt de standaard categorie niet verwijderen!',
 			'not_exist' => 'De categorie bestaat niet!',
+			'no_id' => 'U moet de id specificeren of de categorie.',
+			'no_name' => 'Categorie naam mag niet leeg zijn.',
 			'over_max' => 'Maximum aantal categorieën bereikt (%d)',
 			'updated' => 'Categorie vernieuwd.',
 		),
@@ -88,10 +88,10 @@ return array(
 			'error' => 'Feed kan niet worden vernieuwd',
 			'internal_problem' => 'De feed kon niet worden toegevoegd. <a href="%s">Controleer de FreshRSS-logbestanden</a> voor details. Toevoegen forceren kan worden geprobeerd door <code>#force_feed</code> aan de URL toe te voegen.',
 			'invalid_url' => 'URL <em>%s</em> is ongeldig',
+			'not_added' => '<em>%s</em> kon niet worden toegevoegd',
+			'no_refresh' => 'Er is geen feed om te vernieuwen…',
 			'n_actualized' => '%d feeds zijn vernieuwd',
 			'n_entries_deleted' => '%d artikelen zijn verwijderd',
-			'no_refresh' => 'Er is geen feed om te vernieuwen…',
-			'not_added' => '<em>%s</em> kon niet worden toegevoegd',
 			'over_max' => 'Maximum aantal feeds bereikt (%d)',
 			'updated' => 'Feed is vernieuwd',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'Gebruiker %s is aangemaakt',
 			'error' => 'Gebruiker %s kan niet worden aangemaakt',
+			'_' => 'Gebruiker %s is aangemaakt',
 		),
 		'deleted' => array(
-			'_' => 'Gebruiker %s is verwijderd',
 			'error' => 'Gebruiker %s kan niet worden verwijderd',
+			'_' => 'Gebruiker %s is verwijderd',
 		),
 		'updated' => array(
-			'_' => 'Gebruiker %s is bijgewerkt',
 			'error' => 'Gebruiker %s kan niet worden bijgewerkt',
+			'_' => 'Gebruiker %s is bijgewerkt',
 		),
 	),
 );

app/i18n/nl/gen.php

@@ -30,19 +30,19 @@ return array(
 		'login' => 'Log in',
 		'logout' => 'Log uit',
 		'password' => array(
-			'_' => 'Wachtwoord',
 			'format' => '<small>Ten minste 7 tekens</small>',
+			'_' => 'Wachtwoord',
 		),
 		'registration' => array(
-			'_' => 'Nieuw account',
 			'ask' => 'Maak een account?',
 			'title' => 'Account maken',
+			'_' => 'Nieuw account',
 		),
 		'reset' => 'Authenticatie reset',
 		'username' => array(
-			'_' => 'Gebruikersnaam',
 			'admin' => 'Beheerdersgebruikersnaam',
 			'format' => '<small>maximaal 16 alfanumerieke tekens</small>',
+			'_' => 'Gebruikersnaam',
 		),
 	),
 	'date' => array(
@@ -65,8 +65,8 @@ return array(
 		'Jan' => '\\J\\a\\n\\u\\a\\r\\i',
 		'jan' => 'jan',
 		'january' => 'Jan',
-		'Jul' => '\\J\\u\\l\\i',
 		'jul' => 'jul',
+		'Jul' => '\\J\\u\\l\\i',
 		'july' => 'Jul',
 		'Jun' => '\\J\\u\\n\\i',
 		'jun' => 'jun',
@@ -76,8 +76,8 @@ return array(
 		'last_month' => 'Vorige maand',
 		'last_week' => 'Vorige week',
 		'last_year' => 'Vorig jaar',
-		'Mar' => '\\M\\a\\a\\r\\t',
 		'mar' => 'mrt',
+		'Mar' => '\\M\\a\\a\\r\\t',
 		'march' => 'Mrt',
 		'May' => '\\M\\e\\i',
 		'may' => 'Mei',
@@ -102,8 +102,8 @@ return array(
 		'yesterday' => 'Gisteren',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => 'Over FreshRSS',
+		'_' => 'FreshRSS',
 	),
 	'js' => array(
 		'category_empty' => 'Lege categorie',
@@ -130,6 +130,7 @@ return array(
 		'oc' => 'Occitan',
 		'pt-br' => 'Português (Brasil)',
 		'ru' => 'Русский',
+		'sk' => 'Slovenčina',
 		'tr' => 'Türkçe',
 		'zh-cn' => '简体中文',
 	),
@@ -171,8 +172,24 @@ return array(
 		'years' => 'jaren',
 	),
 	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'gnusocial' => 'GNU social',
+		'jdh' => 'Journal du hacker',
 		'Known' => 'Known-gebaseerde sites',
+		'lemmy' => 'Lemmy',
+		'linkedin' => 'LinkedIn',
+		'mastodon' => 'Mastodon',
+		'movim' => 'Movim',
+		'pinboard' => 'Pinboard',
+		'pocket' => 'Pocket',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 	),
 	'short' => array(
 		'attention' => 'Attentie!',

app/i18n/nl/index.php

@@ -1,8 +1,7 @@
 <?php
-/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+
 return array(
 	'about' => array(
-		'_' => 'Over',
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => 'Rapporteer fouten',
 		'credits' => 'Waarderingen',
@@ -14,23 +13,21 @@ return array(
 		'title' => 'Over',
 		'version' => 'Versie',
 		'website' => 'Website',
-	),
-	'tos' => array(
-		'title' => 'Gebruiksvoorwaarden',
+		'_' => 'Over',
 	),
 	'feed' => array(
 		'add' => 'U kunt wat feeds toevoegen.',
 		'empty' => 'Er is geen artikel om te laten zien.',
 		'rss_of' => 'RSS-feed van %s',
 		'title' => 'Overzicht RSS-feeds',
-		'title_global' => 'Globale weergave',
 		'title_fav' => 'Uw favorieten',
+		'title_global' => 'Globale weergave',
 	),
 	'log' => array(
-		'_' => 'Log bestanden',
 		'clear' => 'Leeg de log bestanden',
 		'empty' => 'Log bestand is leeg',
 		'title' => 'Log bestanden',
+		'_' => 'Log bestanden',
 	),
 	'menu' => array(
 		'about' => 'Over FreshRSS',
@@ -63,4 +60,7 @@ return array(
 	'tag' => array(
 		'related' => 'Verwante labels',
 	),
+	'tos' => array(
+		'title' => 'Gebruiksvoorwaarden',
+	),
 );

app/i18n/nl/install.php

@@ -1,5 +1,5 @@
 <?php
-/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+
 return array(
 	'action' => array(
 		'finish' => 'Completeer installatie',
@@ -17,20 +17,19 @@ return array(
 		'type' => 'Authenticatiemethode',
 	),
 	'bdd' => array(
-		'_' => 'Database',
 		'conf' => array(
-			'_' => 'Database configuratie',
 			'ko' => 'Controleer uw database informatie.',
 			'ok' => 'Database configuratie is opgeslagen.',
+			'_' => 'Database configuratie',
 		),
 		'host' => 'Host',
 		'password' => 'Database wachtwoord',
 		'prefix' => 'Tabel voorvoegsel',
 		'type' => 'Type database',
 		'username' => 'Database gebruikersnaam',
+		'_' => 'Database',
 	),
 	'check' => array(
-		'_' => 'Controles',
 		'already_installed' => 'We hebben geconstateerd dat FreshRSS al is geïnstallerd!',
 		'cache' => array(
 			'nok' => 'Controleer permissies van de <em>./data/cache</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
@@ -96,10 +95,11 @@ return array(
 			'nok' => 'U mist de benodigde bibliotheek om XML te gebruiken.',
 			'ok' => 'U hebt de benodigde bibliotheek om XML te gebruiken.',
 		),
+		'_' => 'Controles',
 	),
 	'conf' => array(
-		'_' => 'Algemene configuratie',
 		'ok' => 'Algemene configuratie is opgeslagen.',
+		'_' => 'Algemene configuratie',
 	),
 	'congratulations' => 'Gefeliciteerd!',
 	'default_user' => 'Gebruikersnaam van de standaardgebruiker <small>(maximaal 16 alfanumerieke tekens)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'U zal uw vorige configuratie kwijtraken door FreshRSS opnieuw te installeren. Weet u zeker dat u verder wilt gaan?',
 	),
 	'language' => array(
-		'_' => 'Taal',
 		'choose' => 'Kies een taal voor FreshRSS',
 		'defined' => 'Taal is bepaald.',
+		'_' => 'Taal',
 	),
 	'not_deleted' => 'Er ging iets fout! U moet het bestand <em>%s</em> handmatig verwijderen.',
 	'ok' => 'De installatieprocedure is geslaagd.',
 	'step' => 'stap %d',
 	'steps' => 'Stappen',
-	'title' => 'Installatie · FreshRSS',
 	'this_is_the_end' => 'Dit is het einde',
+	'title' => 'Installatie · FreshRSS',
 );

app/i18n/nl/sub.php

@@ -1,5 +1,5 @@
 <?php
-/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+
 return array(
 	'api' => array(
 		'documentation' => 'Kopieer de volgende URL om deze in een externe toepassing te gebruiken.',
@@ -11,7 +11,6 @@ return array(
 		'title' => 'Bookmarklet',
 	),
 	'category' => array(
-		'_' => 'Categorie',
 		'add' => 'Voeg categorie toe',
 		'archiving' => 'Archiveren',
 		'empty' => 'Lege categorie',
@@ -20,6 +19,7 @@ return array(
 		'position' => 'Weergavepositie',
 		'position_help' => 'Om de categorieweergave-sorteervolgorde te controleren',
 		'title' => 'Titel',
+		'_' => 'Categorie',
 	),
 	'feed' => array(
 		'add' => 'Voeg een RSS-feed toe',
@@ -39,8 +39,8 @@ return array(
 		'empty' => 'Deze feed is leeg. Controleer of deze nog actueel is.',
 		'error' => 'Deze feed heeft problemen. Verifieer a.u.b het doeladres en actualiseer het.',
 		'filteractions' => array(
-			'_' => 'Filteracties',
 			'help' => 'Voer één zoekfilter per lijn in.',
+			'_' => 'Filteracties',
 		),
 		'information' => 'Informatie',
 		'keep_min' => 'Minimum aantal artikelen om te houden',
@@ -49,12 +49,11 @@ return array(
 		'no_selected' => 'Geen feed geselecteerd.',
 		'number_entries' => '%d artikelen',
 		'priority' => array(
-			'_' => 'Zichtbaarheid',
 			'archived' => 'Niet weergeven (gearchiveerd)',
 			'main_stream' => 'Zichtbaar in het overzicht',
 			'normal' => 'Toon in categorie',
+			'_' => 'Zichtbaarheid',
 		),
-		'websub' => 'Directe notificaties met WebSub',
 		'show' => array(
 			'all' => 'Alle feeds tonen',
 			'error' => 'Alleen feeds met een foutmelding tonen',
@@ -72,6 +71,7 @@ return array(
 		'url' => 'Feed-url',
 		'validator' => 'Controleer de geldigheid van de feed',
 		'website' => 'Website-url',
+		'websub' => 'Directe notificaties met WebSub',
 	),
 	'firefox' => array(
 		'documentation' => 'Volg de stappen die <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">hier</a> beschreven worden om FreshRSS aan de Firefox-nieuwslezerlijst toe te voegen.',
@@ -80,9 +80,9 @@ return array(
 	),
 	'import_export' => array(
 		'export' => 'Exporteer',
+		'export_labelled' => 'Exporteer gelabelde artikels',
 		'export_opml' => 'Exporteer lijst van feeds (OPML)',
 		'export_starred' => 'Exporteer je favorieten',
-		'export_labelled' => 'Exporteer gelabelde artikels',
 		'feed_list' => 'Lijst van %s artikelen',
 		'file_to_import' => 'Bestand om te importeren<br />(OPML, JSON of ZIP)',
 		'file_to_import_no_zip' => 'Bestand om te importeren<br />(OPML of JSON)',
@@ -97,8 +97,8 @@ return array(
 		'subscription_tools' => 'Hulpmiddelen voor abonnementen',
 	),
 	'title' => array(
-		'_' => 'Abonnementenbeheer',
 		'feed_management' => 'RSS-feedbeheer',
 		'subscription_tools' => 'Hulpmiddelen voor abonnementen',
+		'_' => 'Abonnementenbeheer',
 	),
 );

app/i18n/nl/user.php

@@ -22,16 +22,16 @@ return array(
 			'title' => 'Emailadresvalidatie',
 		),
 	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'De gebruiksvoorwaarden moeten worden geaccepteerd om te kunnen registeren.',
-		),
-	),
 	'mailer' => array(
 		'email_need_validation' => array(
+			'body' => 'Je hebt je net geregistreerd op %s, maar je moet je email nog valideren. Volg daarvoor de link:',
 			'title' => 'Je account moet worden gevalideerd',
 			'welcome' => 'Welkom %s,',
-			'body' => 'Je hebt je net geregistreerd op %s, maar je moet je email nog valideren. Volg daarvoor de link:',
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'De gebruiksvoorwaarden moeten worden geaccepteerd om te kunnen registeren.',
 		),
 	),
 );

app/i18n/oc/admin.php

@@ -83,9 +83,9 @@ return array(
 			'ok' => 'Avètz PDO e almens un des drivers compatibles (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'Installacion PHP',
 			'nok' => 'Vòstra version PHP es la %s más FreshRSS demanda almens la versión %s.',
 			'ok' => 'Vòstra version PHP es %s, qu’es compatibla amb FreshRSS.',
+			'_' => 'Installacion PHP',
 		),
 		'tables' => array(
 			'nok' => 'Manca una o mai tabla dins la basa de donadas.',
@@ -116,16 +116,15 @@ return array(
 		'name' => 'Nom',
 		'no_configure_view' => 'Aquesta extension se pòt pas configurar.',
 		'system' => array(
-			'_' => 'Extensions sistèma',
 			'no_rights' => 'Extensions sistèma (contrarotlat per l’administrator)',
+			'_' => 'Extensions sistèma',
 		),
 		'title' => 'Extensions',
 		'update' => 'Mesa a jorn disponibla',
 		'user' => 'Extensions utilizaire',
-		'version' => 'Version',
+		'version' => 'Version',	// TODO - Translation
 	),
 	'stats' => array(
-		'_' => 'Estatisticas',
 		'all_feeds' => 'Totes los fluxes',
 		'category' => 'Categoria',
 		'entry_count' => 'Nombre d’articles',
@@ -151,13 +150,13 @@ return array(
 		'repartition' => 'Reparticion dels articles',
 		'status_favorites' => 'Favorits',
 		'status_read' => 'Legit',
-		'status_total' => 'Total',
+		'status_total' => 'Total',	// TODO - Translation
 		'status_unread' => 'Pas legits',
 		'title' => 'Estatisticas',
 		'top_feed' => 'Los dètz fluxes mai gròsses',
+		'_' => 'Estatisticas',
 	),
 	'system' => array(
-		'_' => 'Configuracion sistèma',
 		'auto-update-url' => 'URL del servici de mesa a jorn',
 		'cookie-duration' => array(
 			'help' => 'en segondas',
@@ -168,18 +167,19 @@ return array(
 		'max-categories' => 'Limita de categoria per utilizaire',
 		'max-feeds' => 'Limita de fluxes per utilizaire',
 		'registration' => array(
-			'number' => 'Nombre max de comptes',
 			'help' => '0 vòl dire qu’i a pas cap de limita de compte',
+			'number' => 'Nombre max de comptes',
 		),
+		'_' => 'Configuracion sistèma',
 	),
 	'update' => array(
-		'_' => 'Sistèma de mesa a jorn',
 		'apply' => 'Aplicar',
 		'check' => 'Verificar las mesas a jorn',
 		'current_version' => 'Vòstra version actuala de FreshRSS es %s.',
 		'last' => 'Darrièra verificacion : %s',
 		'none' => 'Cap d’actualizacion d’aplicar',
 		'title' => 'Sistèma de mesa a jorn',
+		'_' => 'Sistèma de mesa a jorn',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
@@ -188,7 +188,7 @@ return array(
 		'create' => 'Crear un nòu utilizaire',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Suprimir un utilizaire',
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Lenga',
 		'list' => 'User list',	// TODO - Translation
 		'number' => '%d compte ja creat',
@@ -198,8 +198,8 @@ return array(
 		'selected' => 'Utilizaire seleccionat',
 		'title' => 'Gestion dels utilizaires',
 		'update_users' => 'Actualizar un utilizaire',
-		'user_list' => 'Lista dels utilizaires',
 		'username' => 'Nom d’utilizaire',
 		'users' => 'Utilizaires',
+		'user_list' => 'Lista dels utilizaires',
 	),
 );

app/i18n/oc/conf.php

@@ -2,14 +2,14 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archius',
-		'advanced' => 'Avançat',
 		'delete_after' => 'Levar los articles aprèp',
 		'exception' => 'Excepcion de purga',
 		'help' => 'Mai d’opcions son disponiblas dins la configuracion individuala dels fluxes',
 		'keep_favourites' => 'Jamai suprimir los favorits',
-		'keep_min_by_feed' => 'Nombre minimum d’articles de servar per flux',
 		'keep_labels' => 'Jamai suprimir las etiquetas',
+		'keep_max' => 'Nombre maximum d’articles de gardar',
+		'keep_min_by_feed' => 'Nombre minimum d’articles de servar per flux',
+		'keep_period' => 'Atge maximum dels articles de gardar',
 		'keep_unreads' => 'Jamai suprimir los pas legits',
 		'maintenance' => 'Entreten',
 		'optimize' => 'Optimizar la basa de donada',
@@ -17,20 +17,18 @@ return array(
 		'policy' => 'Politica de purga',
 		'policy_warning' => 'Se cap de politica de purga es pas seleccionada, totes los articles seràn gardats',
 		'purge_now' => 'Purgar ara',
-		'keep_max' => 'Nombre maximum d’articles de gardar',
-		'keep_period' => 'Atge maximum dels articles de gardar',
 		'title' => 'Archius',
 		'ttl' => 'Actualizar pas automaticament mai sovent que',
+		'_' => 'Archius',
 	),
 	'display' => array(
-		'_' => 'Afichatge',
 		'icon' => array(
 			'bottom_line' => 'Linha enbàs',
+			'display_authors' => 'Autors',
 			'entry' => 'Icònas d’article',
 			'publication_date' => 'Data de publicacion',
 			'related_tags' => 'Etiquetas ligadas',
 			'sharing' => 'Partatge',
-			'display_authors' => 'Autors',
 			'top_line' => 'Linha amont',
 		),
 		'language' => 'Lenga',
@@ -48,22 +46,22 @@ return array(
 			'no_limit' => 'Cap de limit',
 			'thin' => 'Fina',
 		),
+		'_' => 'Afichatge',
 	),
 	'profile' => array(
-		'_' => 'Gestion del perfil',
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Supression del compte',
 			'warn' => 'Lo compte e totas las donadas ligadas seràn suprimits.',
+			'_' => 'Supression del compte',
 		),
 		'email' => 'Adreça de corrièl',
 		'password_api' => 'Senhal API<br /><small>(ex. : per las aplicacions mobil)</small>',
 		'password_form' => 'Senhal API<br /><small>(ex. : per la connexion via formulari)</small>',
 		'password_format' => 'Almens 7 caractèrs',
 		'title' => 'Pefil',
+		'_' => 'Gestion del perfil',
 	),
 	'query' => array(
-		'_' => 'Filtres utilizaires',
 		'deprecated' => 'Aqueste filtre es pas valid. La categoria o lo flux concernit es estat suprimit.',
 		'display' => 'Mostrar los resultats del filtre',
 		'filter' => 'Filtres aplicats :',
@@ -71,8 +69,8 @@ return array(
 		'get_category' => 'Mostrar la categoria « %s »',
 		'get_favorite' => 'Mostrar los articles favorits',
 		'get_feed' => 'Mostrar lo flux « %s »',
-		'no_filter' => 'Cap de filtre aplicat',
 		'none' => 'Avètz pas encara creat cap de filtre.',
+		'no_filter' => 'Cap de filtre aplicat',
 		'number' => 'Filtre n°%d',
 		'order_asc' => 'Mostrar los articles mai ancians en primièr',
 		'order_desc' => 'Mostrar los articles mai recents en primièr',
@@ -95,9 +93,9 @@ return array(
 		'state_14' => 'Mostrar los articles pas legits',
 		'state_15' => 'Mostrar totes los articles',
 		'title' => 'Filtres utilizaire',
+		'_' => 'Filtres utilizaires',
 	),
 	'reading' => array(
-		'_' => 'Lectura',
 		'after_onread' => 'Aprèp « marcar coma legit »,',
 		'articles_per_page' => 'Nombre d’articles per pagina',
 		'auto_load_more' => 'Cargar los articles seguents enbàs de la pagina',
@@ -118,16 +116,16 @@ return array(
 			'when' => 'Marcar un article coma legit…',
 		),
 		'show' => array(
-			'_' => 'Articles de mostrar',
 			'adaptive' => 'Adaptar l’afichatge',
 			'all_articles' => 'Mostrar totes los articles',
 			'unread' => 'Mostrar pas que los pas legits',
+			'_' => 'Articles de mostrar',
 		),
 		'sides_close_article' => 'Clicar fòra de la zòna de tèxte tampa l’article',
 		'sort' => array(
-			'_' => 'Òrdre de tria',
 			'newer_first' => 'Mai recents en primièr',
 			'older_first' => 'Mai ancians en primièr',
+			'_' => 'Òrdre de tria',
 		),
 		'sticky_post' => 'Gardar l’article amont quand es dobèrt',
 		'title' => 'Lectura',
@@ -137,9 +135,9 @@ return array(
 			'normal' => 'Vista normala',
 			'reader' => 'Vista lectura',
 		),
+		'_' => 'Lectura',
 	),
 	'sharing' => array(
-		'_' => 'Partatge',
 		'add' => 'Ajustar un metòde de partatge',
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
@@ -154,9 +152,9 @@ return array(
 		'title' => 'Partatge',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'_' => 'Partatge',
 	),
 	'shortcut' => array(
-		'_' => 'Acorchis',
 		'article_action' => 'Accions ligadas a l’article',
 		'auto_share' => 'Partejar',
 		'auto_share_help' => 'S’i a pas qu’un mòde de partatge, aquel serà utilizat. Autrament los mòdes son accessibles per lor numèro.',
@@ -188,6 +186,7 @@ return array(
 		'user_filter' => 'Accedir als filtres utilizaire',
 		'user_filter_help' => 'S’i a pas qu’un filtre utilizaire, aquel serà utilizat. Autrament los filtres son accessibles per lor numèro.',
 		'views' => 'Vistas',
+		'_' => 'Acorchis',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',

app/i18n/oc/feedback.php

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimizacion acabada',
-	),
 	'access' => array(
 		'denied' => 'Avètz pas l’autorizacion d’accedir a aquesta pagina',
 		'not_found' => 'La pagina que cercatz existís pas',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Optimizacion acabada',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s pòt pas èsser activada. <a href="%s">Consultatz los jornals d’audit de FreshRSS logs</a> per mai de detalhs.',
 			'ok' => '%s es ara activada',
 		),
-		'no_access' => 'Avètz pas accès sus %s',
 		'not_enabled' => '%s es pas encara activada',
 		'not_found' => '%s existís pas',
+		'no_access' => 'Avètz pas accès sus %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'L\'extension ZIP es pas presenta sul servidor. Volgatz ensajar d\'exportar los fichièrs un per un.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'La categoria es estada voidada',
 			'error' => 'Actualizacion de la categoria impossibla',
 			'name_exists' => 'Una categoria se ditz ja atal.',
-			'no_id' => 'Vos cal precisar l’id de la categoria.',
-			'no_name' => 'Vos cal donar un nom a la categoria.',
 			'not_delete_default' => 'Podètz pas suprimir la categoria per defaut !',
 			'not_exist' => 'Aquesta categoria existís pas !',
+			'no_id' => 'Vos cal precisar l’id de la categoria.',
+			'no_name' => 'Vos cal donar un nom a la categoria.',
 			'over_max' => 'Avètz atengut la limita de categoria (%d)',
 			'updated' => 'La categoria es estada actualizada.',
 		),
@@ -86,12 +86,12 @@ return array(
 			'already_subscribed' => 'Seguissètz ja <em>%s</em>',
 			'deleted' => 'Lo flux es suprimit',
 			'error' => 'Error en actualizar',
-			'internal_problem' => 'Lo flux pòt pas èsser ajustat. <a href="%s">Consultatz los jornals d’audit de FreshRSS</a> per ne saber mai. Podètz forçar l’apondon  en ajustant <code>#force_feed</code> a l’URL.',
+			'internal_problem' => 'Lo flux pòt pas èsser ajustat. <a href="%s">Consultatz los jornals d’audit de FreshRSS</a> per ne saber mai. Podètz forçar l’apondon en ajustant <code>#force_feed</code> a l’URL.',
 			'invalid_url' => 'L\'URL <em>%s</em> es invalida',
+			'not_added' => '<em>%s</em> a pas pogut èsser ajustat',
+			'no_refresh' => 'I a pas cap de flux d’actualizar…',
 			'n_actualized' => '%s fluxes son estats actualizats',
 			'n_entries_deleted' => '%d articles son estats suprimits',
-			'no_refresh' => 'I a pas cap de flux d’actualizar…',
-			'not_added' => '<em>%s</em> a pas pogut èsser ajustat',
 			'over_max' => 'Avètz atengut vòstra limita de fluxes (%d)',
 			'updated' => 'Lo flux es actualizat',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'L’utilizaire %s es estat creat',
 			'error' => 'L’utilizaire %s pòt pas èsser creat',
+			'_' => 'L’utilizaire %s es estat creat',
 		),
 		'deleted' => array(
-			'_' => 'L’utilizaire %s es estat suprimit',
 			'error' => 'L’utilizaire %s pòt pas èsser suprimit',
+			'_' => 'L’utilizaire %s es estat suprimit',
 		),
 		'updated' => array(
-			'_' => 'L’utilizaire %s es estat actualizat',
 			'error' => 'L’utilizaire %s es pas estat actualizat',
+			'_' => 'L’utilizaire %s es estat actualizat',
 		),
 	),
 );

app/i18n/oc/gen.php

@@ -30,19 +30,19 @@ return array(
 		'login' => 'Connexion',
 		'logout' => 'Se desconnectar',
 		'password' => array(
-			'_' => 'Senhal',
 			'format' => '<small>Almens 7 caractèrs</small>',
+			'_' => 'Senhal',
 		),
 		'registration' => array(
-			'_' => 'Compte nòu',
 			'ask' => 'Crear un compte?',
 			'title' => 'Creacion de compte',
+			'_' => 'Compte nòu',
 		),
 		'reset' => 'Reïnicializacion de l’autentificacion',
 		'username' => array(
-			'_' => 'Nom d’utilizaire',
 			'admin' => 'Nom d’utilizaire administrator',
 			'format' => '<small>16 caractèrs alfanumerics maximum)</small>',
+			'_' => 'Nom d’utilizaire',
 		),
 	),
 	'date' => array(
@@ -60,13 +60,13 @@ return array(
 		'feb' => 'feb.',
 		'february' => 'febrièr',
 		'format_date' => 'j \\d\\e %s \\d\\e Y',
-		'format_date_hour' => 'j \\d\\e %s \\d\\e Y \\a H\:i',
+		'format_date_hour' => 'j \\d\\e %s \\d\\e Y \\a H\\:i',
 		'fri' => 'dv',
 		'Jan' => '\\g\\e\\n\\i\\è\\r',
 		'jan' => 'gen.',
 		'january' => 'genièr',
-		'Jul' => '\\j\\u\\l\\h\\e\\t',
 		'jul' => 'julh',
+		'Jul' => '\\j\\u\\l\\h\\e\\t',
 		'july' => 'julhet',
 		'Jun' => '\\j\\u\\n\\h',
 		'jun' => 'junh',
@@ -76,8 +76,8 @@ return array(
 		'last_month' => 'Dempuèi lo mes passat',
 		'last_week' => 'Dempuèi la setmana passada',
 		'last_year' => 'Dempuèi l’annada passada',
-		'Mar' => '\\m\\a\\r\\ç',
 		'mar' => 'març',
+		'Mar' => '\\m\\a\\r\\ç',
 		'march' => 'març',
 		'May' => '\\m\\a\\i',
 		'may' => 'mai',
@@ -102,8 +102,8 @@ return array(
 		'yesterday' => 'Ièr',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => 'A prepaus de FreshRSS',
+		'_' => 'FreshRSS',
 	),
 	'js' => array(
 		'category_empty' => 'Categoria voida',
@@ -123,13 +123,14 @@ return array(
 		'en' => 'English',
 		'es' => 'Español',
 		'fr' => 'Français',
-		'he' => 'עברית',
+		'he' => 'עברית',	// TODO - Translation
 		'it' => 'Italiano',
 		'kr' => '한국어',
 		'nl' => 'Nederlands',
 		'oc' => 'Occitan',
 		'pt-br' => 'Português (Brasil)',
 		'ru' => 'Русский',
+		'sk' => 'Slovenčina',	// TODO - Translation
 		'tr' => 'Türkçe',
 		'zh-cn' => '简体中文',
 	),
@@ -179,11 +180,11 @@ return array(
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Sites basats sus Known',
 		'lemmy' => 'Lemmy',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
+		'linkedin' => 'LinkedIn',	// TODO - Translation
+		'mastodon' => 'Mastodon',	// TODO - Translation
 		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
+		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pocket' => 'Pocket',	// TODO - Translation
 		'print' => 'Imprimir',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',

app/i18n/oc/index.php

@@ -2,35 +2,32 @@
 
 return array(
 	'about' => array(
-		'_' => 'A prepaus',
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'bugs_reports' => 'Senhalament de problèmas',
 		'credits' => 'Crèdits',
 		'credits_content' => 'Unes elements de l’estil venon del <a href="http://twitter.github.io/bootstrap/">projècte Bootstrap</a> encara que FreshRSS utilize pas aqueste framework. Las <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icònas</a> venon del <a href="https://www.gnome.org/">projècte GNOME</a>. La polissa <em>Open Sans</em> utilizada foguèt creada per en <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS es basat sus <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
 		'freshrss_description' => 'FreshRSS es un agregador de fluxes RSS per l’auto-albergar tal coma <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> o <a href="https://github.com/LeedRSS/Leed">Leed</a>. Sa tòca es d’èsser leugièr e de bon utilizar de prima abòrd mas tanben d’èsser potent e parametrable.',
-		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',	// TODO - Translation
 		'license' => 'Licéncia',
 		'project_website' => 'Site del projècte',
 		'title' => 'A prepaus',
-		'website' => 'Site internet',
 		'version' => 'Version',
-	),
-	'tos' => array(
-		'title' => 'Condicions d’utilizacion',
+		'website' => 'Site internet',
+		'_' => 'A prepaus',
 	),
 	'feed' => array(
 		'add' => 'Podètz ajustar de fluxes.',
 		'empty' => 'I a pas cap de flux de mostrar.',
 		'rss_of' => 'Flux RSS de %s',
 		'title' => 'Vòstres fluxes RSS',
-		'title_global' => 'Vista generala',
 		'title_fav' => 'Vòstres favorits',
+		'title_global' => 'Vista generala',
 	),
 	'log' => array(
-		'_' => 'Jornals d’audit',
 		'clear' => 'Escafar los jornals',
 		'empty' => 'Los jornals son voids',
 		'title' => 'Jornals d’audit',
+		'_' => 'Jornals d’audit',
 	),
 	'menu' => array(
 		'about' => 'A prepaus de FreshRSS',
@@ -63,4 +60,7 @@ return array(
 	'tag' => array(
 		'related' => 'Etiquetas ligadas',
 	),
+	'tos' => array(
+		'title' => 'Condicions d’utilizacion',
+	),
 );

app/i18n/oc/install.php

@@ -17,20 +17,19 @@ return array(
 		'type' => 'Mòde d’autentification',
 	),
 	'bdd' => array(
-		'_' => 'Basa de donadas',
 		'conf' => array(
-			'_' => 'Configuracion de la basa de donadas',
 			'ko' => 'Verificatz las informacions de la basa de donadas.',
 			'ok' => 'La configuracion de la basa de donadas es salvagarda.',
+			'_' => 'Configuracion de la basa de donadas',
 		),
 		'host' => 'Òste',
 		'password' => 'Senhal de la basa de donadas',
 		'prefix' => 'Prefixe de tabla',
 		'type' => 'Tipe de basa de donadas',
 		'username' => 'Nom d’utilizaire de la basa de donadas',
+		'_' => 'Basa de donadas',
 	),
 	'check' => array(
-		'_' => 'Verificacions',
 		'already_installed' => 'Sembla que FreshRSS es ja installat !',
 		'cache' => array(
 			'nok' => 'Volgatz verificar los dreches sul repertòri <em>./data/cache</em>. Lo servidor HTTP deu poder escriure dedins',
@@ -96,10 +95,11 @@ return array(
 			'nok' => 'Impossible de trobar una bibliotèca necessària per XML.',
 			'ok' => 'Avètz la bibliotèca per percórrer los XML.',
 		),
+		'_' => 'Verificacions',
 	),
 	'conf' => array(
-		'_' => 'Configuracion generala',
 		'ok' => 'La configuracion generala es enregistrada.',
+		'_' => 'Configuracion generala',
 	),
 	'congratulations' => 'Òsca !',
 	'default_user' => 'Nom d’utilizaire per defaut <small>16 caractèrs alfanumerics maximum)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'En reïnstallant FreshRSS perdretz la configuracion precedenta. Volètz vertadièrament contunhar ?',
 	),
 	'language' => array(
-		'_' => 'Lenga',
 		'choose' => 'Causissètz la lenga per FreshRSS',
 		'defined' => 'La lenga es corrèctament definida.',
+		'_' => 'Lenga',
 	),
 	'not_deleted' => 'Quicòm a trucat, sembla qu’avètz suprimit <em>%s</em> a la man.',
 	'ok' => 'L’installacion s’es corrèctament passada.',
 	'step' => 'etapa %d',
 	'steps' => 'Etapas',
-	'title' => 'Installacion · FreshRSS',
 	'this_is_the_end' => 'Es la fin',
+	'title' => 'Installacion · FreshRSS',
 );

app/i18n/oc/sub.php

@@ -1,8 +1,9 @@
 <?php
+
 return array(
 	'api' => array(
 		'documentation' => 'Copiatz l’URL seguenta per l’utilizaire dins d’una aisina extèrna.',
-		'title' => 'API',
+		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
 		'documentation' => 'Depausatz aqueste boton per la barra de marcapaginas o clicatz-lo a drecha e causissètz « Enregistrar aqueste ligam». Puèi clicatz «S’abonar» sus las paginas que volètz seguir.',
@@ -10,7 +11,6 @@ return array(
 		'title' => 'Bookmarklet',
 	),
 	'category' => array(
-		'_' => 'Categoria',
 		'add' => 'Ajustar una categoria',
 		'archiving' => 'Archivar',
 		'empty' => 'Categoria voida',
@@ -19,6 +19,7 @@ return array(
 		'position' => 'Mostrar la posicion',
 		'position_help' => 'Per contrarotlar l’òrdre de tria de la categoria',
 		'title' => 'Títol',
+		'_' => 'Categoria',
 	),
 	'feed' => array(
 		'add' => 'Ajustar un flux RSS',
@@ -38,8 +39,8 @@ return array(
 		'empty' => 'Aqueste flux es void. Assegurats-vos qu’es totjorn mantengut.',
 		'error' => 'Aqueste flux a rescontrat un problèma. Volgatz verificar que siá totjorn accessible puèi actualizatz-lo.',
 		'filteractions' => array(
-			'_' => 'Filtre d’accion',
 			'help' => 'Escrivètz una recèrca per linha.',
+			'_' => 'Filtre d’accion',
 		),
 		'information' => 'Informacions',
 		'keep_min' => 'Nombre minimum d’articles de servar',
@@ -48,12 +49,11 @@ return array(
 		'no_selected' => 'Cap de flux pas seleccionat.',
 		'number_entries' => '%d articles',
 		'priority' => array(
-			'_' => 'Visibilitat',
 			'archived' => 'Mostrar pas (archivat)',
 			'main_stream' => 'Mostar al flux màger',
 			'normal' => 'Mostar dins sa categoria',
+			'_' => 'Visibilitat',
 		),
-		'websub' => 'Notificaciones instantáneas amb WebSub',
 		'show' => array(
 			'all' => 'Mostrar totes los fluxes',
 			'error' => 'Mostrar pas que los fluxes amb errors',
@@ -71,6 +71,7 @@ return array(
 		'url' => 'Flux URL',
 		'validator' => 'Verificar la validitat del flux',
 		'website' => 'URL del site',
+		'websub' => 'Notificaciones instantáneas amb WebSub',
 	),
 	'firefox' => array(
 		'documentation' => 'Seguissètz las etapas descrichas <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">aquí</a> per ajustar FreshRSS a la lista dels lectors de flux de Firefox.',
@@ -79,16 +80,15 @@ return array(
 	),
 	'import_export' => array(
 		'export' => 'Exportar',
+		'export_labelled' => 'Exportar los articles etiquetats',
 		'export_opml' => 'Exportar la lista de fluxes (OPML)',
 		'export_starred' => 'Exportar los favorits',
-		'export_labelled' => 'Exportar los articles etiquetats',
 		'feed_list' => 'Lista dels %s articles',
 		'file_to_import' => 'Fichièr d’importar<br />(OPML, JSON o ZIP)',
 		'file_to_import_no_zip' => 'Fichièr d’importar<br />(OPML o JSON)',
 		'import' => 'Importar',
 		'starred_list' => 'Lista dels articles favorits',
 		'title' => 'Importar / Exportar',
-
 	),
 	'menu' => array(
 		'bookmark' => 'Sabonar (marcapagina FreshRSS)',
@@ -97,8 +97,8 @@ return array(
 		'subscription_tools' => 'Aisinas d’abonament',
 	),
 	'title' => array(
-		'_' => 'Gestion dels abonaments',
 		'feed_management' => 'Gestion dels fluxes RSS',
 		'subscription_tools' => 'Aisinas d’abonament',
+		'_' => 'Gestion dels abonaments',
 	),
 );

app/i18n/oc/user.php

@@ -22,16 +22,16 @@ return array(
 			'title' => 'Validacion de l’adreça electronica',
 		),
 	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'Vos cal acceptar las condicions d’utilizacion per poder vos inscriure.',
-		),
-	),
 	'mailer' => array(
 		'email_need_validation' => array(
+			'body' => 'Venètz de vos marcar sus %s mas vos cal encara validar l’adreça electronica. Per aquò far, seguissètz lo ligam :',
 			'title' => 'Vos cal validar vòstra adreça electronica',
 			'welcome' => 'La benvenguda %s,',
-			'body' => 'Venètz de vos marcar sus %s mas vos cal encara validar l’adreça electronica. Per aquò far, seguissètz lo ligam :',
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'Vos cal acceptar las condicions d’utilizacion per poder vos inscriure.',
 		),
 	),
 );

app/i18n/pt-br/admin.php

@@ -67,8 +67,8 @@ return array(
 			'ok' => 'Você tem a extensão JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'Não foi possível encontrar o framework Minz.',
@@ -83,9 +83,9 @@ return array(
 			'ok' => 'Você tem o PDO e ao menos um dos drivers suportados (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'Instação do PHP',
 			'nok' => 'Sua versão do PHP é %s mas FreshRSS requer ao menos a versão %s.',
 			'ok' => 'Sua versão do PHP é %s, que é compatível com o FreshRSS.',
+			'_' => 'Instação do PHP',
 		),
 		'tables' => array(
 			'nok' => 'Há uma ou mais tabelas inexistentes no banco de dados.',
@@ -106,26 +106,25 @@ return array(
 		),
 	),
 	'extensions' => array(
-		'author' => 'Author',	//TODO - Translation
-		'community' => 'Available community extensions',	//TODO - Translation
-		'description' => 'Description',	//TODO - Translation
+		'author' => 'Author',	// TODO - Translation
+		'community' => 'Available community extensions',	// TODO - Translation
+		'description' => 'Description',	// TODO - Translation
 		'disabled' => 'Desabilitado',
 		'empty_list' => 'Não há extensões instaladas',
 		'enabled' => 'Habilitada',
-		'latest' => 'Installed',	//TODO - Translation
-		'name' => 'Name',	//TODO - Translation
+		'latest' => 'Installed',	// TODO - Translation
+		'name' => 'Name',	// TODO - Translation
 		'no_configure_view' => 'Esta extensão não pode ser configurada.',
 		'system' => array(
-			'_' => 'Extensões do sistema',
 			'no_rights' => 'Extensões do sistema (Você não tem direitos para isto)',
+			'_' => 'Extensões do sistema',
 		),
 		'title' => 'Extensões',
-		'update' => 'Update available',	//TODO - Translation
+		'update' => 'Update available',	// TODO - Translation
 		'user' => 'Extensões do usuário',
-		'version' => 'Version',	//TODO - Translation
+		'version' => 'Version',	// TODO - Translation
 	),
 	'stats' => array(
-		'_' => 'Estatísticas',
 		'all_feeds' => 'Todos os feeds',
 		'category' => 'Categoria',
 		'entry_count' => 'Contagem de entrada',
@@ -135,7 +134,7 @@ return array(
 		'entry_per_hour' => 'Por hora (média: %.2f mensagens)',
 		'entry_per_month' => 'Por mês(média: %.2f mensagens)',
 		'entry_repartition' => 'Repartição de entradas',
-		'feed' => 'Feed',
+		'feed' => 'Feed',	// TODO - Translation
 		'feed_per_category' => 'Feeds por categoria',
 		'idle' => 'Feeds inativos',
 		'main' => 'Estatísticas principais',
@@ -151,35 +150,36 @@ return array(
 		'repartition' => 'Repartição de artigos',
 		'status_favorites' => 'Favoritos',
 		'status_read' => 'Lido',
-		'status_total' => 'Total',
+		'status_total' => 'Total',	// TODO - Translation
 		'status_unread' => 'Não lidos',
 		'title' => 'Estatísticas',
 		'top_feed' => 'Top10 feeds',
+		'_' => 'Estatísticas',
 	),
 	'system' => array(
-		'_' => 'Configuração do sistema',
 		'auto-update-url' => 'URL do servidor para atualização automática',
-		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
+		'cookie-duration' => array(
+			'help' => 'in seconds',	// TODO - Translation
+			'number' => 'Duration to keep logged in',	// TODO - Translation
+		),
+		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
 		'instance-name' => 'Nome da instância',
 		'max-categories' => 'Limite de categorias por usuário',
 		'max-feeds' => 'Limite de Feeds por usuário',
-		'cookie-duration' => array(
-			'help' => 'in seconds', // @todo translate
-			'number' => 'Duration to keep logged in', // @todo translate
-		),
 		'registration' => array(
 			'help' => '0 significa que não há limite para a conta',
 			'number' => 'Máximo número de contas',
 		),
+		'_' => 'Configuração do sistema',
 	),
 	'update' => array(
-		'_' => 'Atualização do sistema',
 		'apply' => 'Aplicar',
 		'check' => 'Buscar por novas atualizações',
 		'current_version' => 'Sua versão do FreshRSS é %s.',
 		'last' => 'Última verificação: %s',
 		'none' => 'Nenhuma atualização para se aplicar',
 		'title' => 'Sistema de atualização',
+		'_' => 'Atualização do sistema',
 	),
 	'user' => array(
 		'articles_and_size' => '%s artigos (%s)',
@@ -187,19 +187,19 @@ return array(
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'Criar novo usuário',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	//TODO - Translation
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'delete_users' => 'Delete user',	// TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Idioma',
 		'list' => 'User list',	// TODO - Translation
 		'number' => 'Há %d conta criada',
 		'numbers' => 'Há %d contas criadas',
 		'password_form' => 'Senha<br /><small>(para o login pelo método do formulário)</small>',
 		'password_format' => 'Ao menos 7 caracteres',
-		'selected' => 'Selected user',	//TODO - Translation
+		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Gerenciar usuários',
-		'update_users' => 'Update user',	//TODO - Translation
-		'user_list' => 'Lista de usuários',
+		'update_users' => 'Update user',	// TODO - Translation
 		'username' => 'Usuário',
 		'users' => 'Usuários',
+		'user_list' => 'Lista de usuários',
 	),
 );

app/i18n/pt-br/conf.php

@@ -2,34 +2,33 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Arquivar',
 		'delete_after' => 'Remover artigos depois',
-		'exception' => 'Purge exception',	//TODO - Translation
+		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'Mais opções estão disponíveis nas configurações individuais do feed',
-		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
+		'keep_labels' => 'Never delete labels',	// TODO - Translation
+		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Número mínimo de artigos para deixar no feed',
-		'keep_labels' => 'Never delete labels',	//TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
-		'maintenance' => 'Maintenance',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Otimizar banco de dados',
 		'optimize_help' => 'Faça ocasionalmente para reduzir o tamanho do banco de dados',
-		'policy' => 'Purge policy',	//TODO - Translation
-		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
+		'policy' => 'Purge policy',	// TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	// TODO - Translation
 		'purge_now' => 'Purge agora',
-		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
-		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Arquivar',
 		'ttl' => 'Não atualize automaticamente mais frequente que',
+		'_' => 'Arquivar',
 	),
 	'display' => array(
-		'_' => 'Exibição',
 		'icon' => array(
 			'bottom_line' => 'Linha inferior',
+			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'Ícones de artigos',
 			'publication_date' => 'Data da publicação',
-			'related_tags' => 'Tags relacionadas',	//TODO - Translation
+			'related_tags' => 'Tags relacionadas',
 			'sharing' => 'Compartilhar',
-			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Linha superior',
 		),
 		'language' => 'Ídioma',
@@ -37,7 +36,7 @@ return array(
 			'seconds' => 'segundos (0 significa sem timeout)',
 			'timeout' => 'Notificação em HTML5 de timeout',
 		),
-		'show_nav_buttons' => 'Show the navigation buttons',	//TODO - Translation
+		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'Tema',
 		'title' => 'Exibição',
 		'width' => array(
@@ -47,35 +46,35 @@ return array(
 			'no_limit' => 'Sem lmite',
 			'thin' => 'Fino',
 		),
+		'_' => 'Exibição',
 	),
 	'profile' => array(
-		'_' => 'Gerenciamento de perfil',
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Remover conta',
 			'warn' => 'Sua conta e todos os dados relacionados serão removidos.',
+			'_' => 'Remover conta',
 		),
 		'email' => 'Endereço de e-mail',
 		'password_api' => 'Senha da API<br /><small>(p.s., para aplicativos móveis)</small>',
 		'password_form' => 'Senha<br /><small>(para o método de formulário web)</small>',
 		'password_format' => 'Ao menos 7 caracteres',
 		'title' => 'Perfil',
+		'_' => 'Gerenciamento de perfil',
 	),
 	'query' => array(
-		'_' => 'Queries do usuário',
 		'deprecated' => 'Esta não é mais válida. A categoria ou feed relacionado foi deletado.',
-		'display' => 'Display user query results',	//TODO - Translation
+		'display' => 'Display user query results',	// TODO - Translation
 		'filter' => 'Filtro aplicado:',
 		'get_all' => 'Mostrar todos os artigos',
 		'get_category' => 'Visualizar "%s" categoria',
 		'get_favorite' => 'Visualizar artigos favoritos',
 		'get_feed' => 'Visualizar "%s" feed',
-		'no_filter' => 'Sem filtro',
 		'none' => 'Você não criou nenhuma query de usuário ainda.',
-		'number' => 'Query n°%d',
+		'no_filter' => 'Sem filtro',
+		'number' => 'Query n°%d',	// TODO - Translation
 		'order_asc' => 'Exibir artigos mais antigos primeiro',
 		'order_desc' => 'Exibir artigos mais novos primeiro',
-		'remove' => 'Remove user query',	//TODO - Translation
+		'remove' => 'Remove user query',	// TODO - Translation
 		'search' => 'Busca por "%s"',
 		'state_0' => 'Exibir todos os artigos',
 		'state_1' => 'Exibir artigos lidos',
@@ -94,9 +93,9 @@ return array(
 		'state_14' => 'Exibir artigos não lidos',
 		'state_15' => 'Exibir todos os artigos',
 		'title' => 'Queries de usuários',
+		'_' => 'Queries do usuário',
 	),
 	'reading' => array(
-		'_' => 'Leitura',
 		'after_onread' => 'Depois de "marcar todos como lido",',
 		'articles_per_page' => 'Número de artigos por página',
 		'auto_load_more' => 'Carregar mais artigos no final da página',
@@ -117,16 +116,16 @@ return array(
 			'when' => 'Marcar artigo como lido…',
 		),
 		'show' => array(
-			'_' => 'Artigos para exibir',
 			'adaptive' => 'Ajustar visualização',
 			'all_articles' => 'Exibir todos os artigos',
 			'unread' => 'Exibir apenas não lido',
+			'_' => 'Artigos para exibir',
 		),
 		'sides_close_article' => 'Clicando fora da área do texto do artigo fecha o mesmo',
 		'sort' => array(
-			'_' => 'Ordem de visualização',
 			'newer_first' => 'Novos primeiro',
 			'older_first' => 'Antigos primeiro',
+			'_' => 'Ordem de visualização',
 		),
 		'sticky_post' => 'Coloque o artigo no topo quando aberto',
 		'title' => 'Lendo',
@@ -136,26 +135,26 @@ return array(
 			'normal' => 'Visualização normal',
 			'reader' => 'Visualização de leitura',
 		),
+		'_' => 'Leitura',
 	),
 	'sharing' => array(
-		'_' => 'Compartilhando',
-		'add' => 'Add a sharing method',	//TODO - Translation
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
+		'add' => 'Add a sharing method',	// TODO - Translation
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
 		'more_information' => 'Mais informação',
 		'print' => 'Imprimir',
-		'remove' => 'Remove sharing method',	//TODO - Translation
-		'shaarli' => 'Shaarli',
+		'remove' => 'Remove sharing method',	// TODO - Translation
+		'shaarli' => 'Shaarli',	// TODO - Translation
 		'share_name' => 'Nome de visualização para compartilhar',
 		'share_url' => 'URL utilizada para compartilhar',
 		'title' => 'Compartilhando',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag',	// TODO - Translation
+		'_' => 'Compartilhando',
 	),
 	'shortcut' => array(
-		'_' => 'Atalhos',
 		'article_action' => 'Ações no artigo',
 		'auto_share' => 'Compartilhar',
 		'auto_share_help' => 'Se há apenas um modo de compartilhamento, ele é usado. Caso contrário, serão acessíveis pelo seu número.',
@@ -163,7 +162,7 @@ return array(
 		'collapse_article' => 'Fechar',
 		'first_article' => 'Ir para o primeiro artigo',
 		'focus_search' => 'Acessar a caixa de busca',
-		'global_view' => 'Switch to global view',	//TODO - Translation
+		'global_view' => 'Switch to global view',	// TODO - Translation
 		'help' => 'Mostrar documentação',
 		'javascript' => 'JavaScript deve ser habilitado para utilizar atalhos',
 		'last_article' => 'Ir para o último artigo',
@@ -172,21 +171,22 @@ return array(
 		'mark_read' => 'Marcar como lido',
 		'navigation' => 'Navegação',
 		'navigation_help' => 'Com o modificador "Shift", atalhos de navegação aplicam aos feeds.<br/>Com o "Alt" modificador, atalhos de navegação aplicam as categorias.',
-		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	//TODO - Translation
+		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	// TODO - Translation
 		'next_article' => 'Pule para o próximo artigo',
-		'normal_view' => 'Switch to normal view',	//TODO - Translation
+		'normal_view' => 'Switch to normal view',	// TODO - Translation
 		'other_action' => 'Outras ações',
 		'previous_article' => 'Pule para o artigo anterior',
-		'reading_view' => 'Switch to reading view',	//TODO - Translation
-		'rss_view' => 'Open RSS view in a new tab',	//TODO - Translation
+		'reading_view' => 'Switch to reading view',	// TODO - Translation
+		'rss_view' => 'Open RSS view in a new tab',	// TODO - Translation
 		'see_on_website' => 'Visualize o site original',
 		'shift_for_all_read' => '+ <code>shift</code> para marcar todos os artigos como lido',
-		'skip_next_article' => 'Focus next without opening',	//TODO - Translation
-		'skip_previous_article' => 'Focus previous without opening',	//TODO - Translation
+		'skip_next_article' => 'Focus next without opening',	// TODO - Translation
+		'skip_previous_article' => 'Focus previous without opening',	// TODO - Translation
 		'title' => 'Atalhos',
 		'user_filter' => 'Acesse filtros de usuário',
 		'user_filter_help' => 'Se há apenas um filtro, ele é utilizado. Caso contrário, os filtros serão acessíveis pelos seus números.',
-		'views' => 'Views',	//TODO - Translation
+		'views' => 'Views',	// TODO - Translation
+		'_' => 'Atalhos',
 	),
 	'user' => array(
 		'articles_and_size' => '%s artigos (%s)',

app/i18n/pt-br/feedback.php

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Otimização Completa',
-	),
 	'access' => array(
 		'denied' => 'Você não tem permissão para acessar esta página',
 		'not_found' => 'VocÊ está buscando por uma página que não existe',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Otimização Completa',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s não pode ser habilitado. <a href="%s">verifique os logs do FreshRSS</a> para detalhes.',
 			'ok' => '%s agora está habilitado',
 		),
-		'no_access' => 'Você não tem acesso ao %s',
 		'not_enabled' => '%s não está habilitado',
 		'not_found' => '%s não existe',
+		'no_access' => 'Você não tem acesso ao %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'extensão ZIP não está presente em seu servidor. Por favor tente exportar os arquivos um por vez.',
@@ -57,14 +57,14 @@ return array(
 		'zip_error' => 'Um erro ocorreu durante a importação do arquivo ZIP.',
 	),
 	'profile' => array(
-		'error' => 'Your profile cannot be modified',
-		'updated' => 'Your profile has been modified',
+		'error' => 'Your profile cannot be modified',	// TODO - Translation
+		'updated' => 'Your profile has been modified',	// TODO - Translation
 	),
 	'sub' => array(
 		'actualize' => 'Atualizando',
 		'articles' => array(
-			'marked_read' => 'The selected articles have been marked as read.',	//TODO - Translation
-			'marked_unread' => 'The articles have been marked as unread.',	//TODO - Translation
+			'marked_read' => 'The selected articles have been marked as read.',	// TODO - Translation
+			'marked_unread' => 'The articles have been marked as unread.',	// TODO - Translation
 		),
 		'category' => array(
 			'created' => 'Categoria %s foi criada.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'Categoria foi esvaziada',
 			'error' => 'Categoria não pode ser atualizada',
 			'name_exists' => 'Este nome de categoria já existe.',
-			'no_id' => 'Você precisa especificar um id para a categoria.',
-			'no_name' => 'Nome da categoria não pode ser vazio.',
 			'not_delete_default' => 'Você não pode deletar uma categoria vazia!',
 			'not_exist' => 'A categoria não existe!',
+			'no_id' => 'Você precisa especificar um id para a categoria.',
+			'no_name' => 'Nome da categoria não pode ser vazio.',
 			'over_max' => 'Você atingiu seu limite de categorias (%d)',
 			'updated' => 'Categoria foi atualizada.',
 		),
@@ -86,12 +86,12 @@ return array(
 			'already_subscribed' => 'Você já está inscrito no <em>%s</em>',
 			'deleted' => 'o Feed foi deletado',
 			'error' => 'O feed não pode ser atualizado',
-			'internal_problem' => 'O RSS feed não pôde ser adicionado. <a href="%s">Verifique os FreshRSS logs</a> para detalhes.',	//TODO - Translation
+			'internal_problem' => 'O RSS feed não pôde ser adicionado. <a href="%s">Verifique os FreshRSS logs</a> para detalhes.',
 			'invalid_url' => 'URL <em>%s</em> é inválida',
+			'not_added' => '<em>%s</em> não pode ser atualizado',
+			'no_refresh' => 'Não há feed para atualizar…',
 			'n_actualized' => '%d feeds foram atualizados',
 			'n_entries_deleted' => '%d artigos foram deletados',
-			'no_refresh' => 'Não há feed para atualizar…',
-			'not_added' => '<em>%s</em> não pode ser atualizado',
 			'over_max' => 'Você atingiu seu limite de feeds (%d)',
 			'updated' => 'Feed foram atualizados',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'Usuário %s foi criado',
 			'error' => 'Usuário %s não pode ser criado',
+			'_' => 'Usuário %s foi criado',
 		),
 		'deleted' => array(
-			'_' => 'Usuário %s foi deletado',
 			'error' => 'Usuário %s não pode ser deletado',
+			'_' => 'Usuário %s foi deletado',
 		),
 		'updated' => array(
-			'_' => 'User %s has been updated',	//TODO - Translation
-			'error' => 'User %s has not been updated',	//TODO - Translation
+			'error' => 'User %s has not been updated',	// TODO - Translation
+			'_' => 'User %s has been updated',	// TODO - Translation
 		),
 	),
 );

app/i18n/pt-br/gen.php

@@ -3,7 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Atualizar',
-		'back' => '← Go back', //TODO - Translation
+		'back' => '← Go back',	// TODO - Translation
 		'back_to_rss_feeds' => '← Volte para o seu feeds RSS',
 		'cancel' => 'Cancelar',
 		'create' => 'Criar',
@@ -21,28 +21,28 @@ return array(
 		'see_website' => 'Ver o site',
 		'submit' => 'Enviar',
 		'truncate' => 'Deletar todos os artigos',
-		'update' => 'Update',	//TODO - Translation
+		'update' => 'Update',	// TODO - Translation
 	),
 	'auth' => array(
-		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.',	// TODO - Translation
 		'email' => 'Endereço de e-mail',
 		'keep_logged_in' => 'Mantenha logado por <small>(%s days)</small>',
-		'login' => 'Login',
-		'logout' => 'Logout',
+		'login' => 'Login',	// TODO - Translation
+		'logout' => 'Logout',	// TODO - Translation
 		'password' => array(
-			'_' => 'Senha',
 			'format' => '<small>Ao menos 7 caracteres</small>',
+			'_' => 'Senha',
 		),
 		'registration' => array(
-			'_' => 'Nova conta',
 			'ask' => 'Criar novoa conta?',
 			'title' => 'Criação de conta',
+			'_' => 'Nova conta',
 		),
 		'reset' => 'Reset autenticação',
 		'username' => array(
-			'_' => 'Usuário',
 			'admin' => 'Usuário administrador',
 			'format' => '<small>máximo 16 caracteres alphanumericos</small>',
+			'_' => 'Usuário',
 		),
 	),
 	'date' => array(
@@ -65,8 +65,8 @@ return array(
 		'Jan' => '\\J\\a\\n\\e\\i\\r\\o',
 		'jan' => 'jan',
 		'january' => 'Jan',
-		'Jul' => '\\J\\u\\l\\h\\o',
 		'jul' => 'jul',
+		'Jul' => '\\J\\u\\l\\h\\o',
 		'july' => 'Jul',
 		'Jun' => '\\J\\u\\n\\h\\o',
 		'jun' => 'jun',
@@ -76,8 +76,8 @@ return array(
 		'last_month' => 'Últimos mês',
 		'last_week' => 'Última semana',
 		'last_year' => 'Último ano',
-		'Mar' => '\\M\\a\\r\\ç\\o',
 		'mar' => 'mar',
+		'Mar' => '\\M\\a\\r\\ç\\o',
 		'march' => 'Mar',
 		'May' => '\\M\\a\\i\\o',
 		'may' => 'Mai',
@@ -102,8 +102,8 @@ return array(
 		'yesterday' => 'Ontem',
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
 		'about' => 'Sobre FreshRSS',
+		'_' => 'FreshRSS',	// TODO - Translation
 	),
 	'js' => array(
 		'category_empty' => 'Categoria vazia',
@@ -118,20 +118,21 @@ return array(
 		'should_be_activated' => 'JavaScript precisa estar ativo',
 	),
 	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'es' => 'Español',
-		'fr' => 'Français',
-		'he' => 'עברית',
-		'it' => 'Italiano',
-		'kr' => '한국어',
-		'nl' => 'Nederlands',
-		'oc' => 'Occitan',
-		'pt-br' => 'Português (Brasil)',
-		'ru' => 'Русский',
-		'tr' => 'Türkçe',
-		'zh-cn' => '简体中文',
+		'cz' => 'Čeština',	// TODO - Translation
+		'de' => 'Deutsch',	// TODO - Translation
+		'en' => 'English',	// TODO - Translation
+		'es' => 'Español',	// TODO - Translation
+		'fr' => 'Français',	// TODO - Translation
+		'he' => 'עברית',	// TODO - Translation
+		'it' => 'Italiano',	// TODO - Translation
+		'kr' => '한국어',	// TODO - Translation
+		'nl' => 'Nederlands',	// TODO - Translation
+		'oc' => 'Occitan',	// TODO - Translation
+		'pt-br' => 'Português (Brasil)',	// TODO - Translation
+		'ru' => 'Русский',	// TODO - Translation
+		'sk' => 'Slovenčina',	// TODO - Translation
+		'tr' => 'Türkçe',	// TODO - Translation
+		'zh-cn' => '简体中文',	// TODO - Translation
 	),
 	'menu' => array(
 		'about' => 'Sobre',
@@ -142,7 +143,7 @@ return array(
 		'configuration' => 'Configuração',
 		'display' => 'Visualização',
 		'extensions' => 'Extensões',
-		'logs' => 'Logs',
+		'logs' => 'Logs',	// TODO - Translation
 		'queries' => 'Queries de usuário',
 		'reading' => 'Leitura',
 		'search' => 'Procurar por palavras ou #tags',
@@ -164,31 +165,31 @@ return array(
 		'previous' => 'Anterior',
 	),
 	'period' => array(
-		'days' => 'days',	//TODO - Translation
-		'hours' => 'hours',	//TODO - Translation
-		'months' => 'months',	//TODO - Translation
-		'weeks' => 'weeks',	//TODO - Translation
-		'years' => 'years',	//TODO - Translation
+		'days' => 'days',	// TODO - Translation
+		'hours' => 'hours',	// TODO - Translation
+		'months' => 'months',	// TODO - Translation
+		'weeks' => 'weeks',	// TODO - Translation
+		'years' => 'years',	// TODO - Translation
 	),
 	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'gnusocial' => 'GNU social',
-		'jdh' => 'Journal du hacker',
-		'Known' => 'Known based sites',
-		'lemmy' => 'Lemmy',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
-		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
+		'gnusocial' => 'GNU social',	// TODO - Translation
+		'jdh' => 'Journal du hacker',	// TODO - Translation
+		'Known' => 'Known based sites',	// TODO - Translation
+		'lemmy' => 'Lemmy',	// TODO - Translation
+		'linkedin' => 'LinkedIn',	// TODO - Translation
+		'mastodon' => 'Mastodon',	// TODO - Translation
+		'movim' => 'Movim',	// TODO - Translation
+		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pocket' => 'Pocket',	// TODO - Translation
 		'print' => 'Imprimir',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag v1',
-		'wallabagv2' => 'wallabag v2',
+		'shaarli' => 'Shaarli',	// TODO - Translation
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag v1',	// TODO - Translation
+		'wallabagv2' => 'wallabag v2',	// TODO - Translation
 	),
 	'short' => array(
 		'attention' => 'Atencão!',
@@ -199,7 +200,7 @@ return array(
 		'default_category' => 'Sem categoria',
 		'no' => 'Não',
 		'not_applicable' => 'Não disponível',
-		'ok' => 'Ok!',
+		'ok' => 'Ok!',	// TODO - Translation
 		'or' => 'ou',
 		'yes' => 'Sim',
 	),

app/i18n/pt-br/index.php

@@ -2,8 +2,7 @@
 
 return array(
 	'about' => array(
-		'_' => 'Sobre',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
 		'bugs_reports' => 'Reportar Bugs',
 		'credits' => 'Créditos',
 		'credits_content' => 'Alguns elementos de design vieram do <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> Embora FreshRRS não utiliza este framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ícones</a> vieram do <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police foi criada por <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS é baseado no <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, um framework PHP.',
@@ -14,23 +13,21 @@ return array(
 		'title' => 'Sobre',
 		'version' => 'Versão',
 		'website' => 'Site',
-	),
-	'tos' => array(
-		'title' => 'Terms of Service', // TODO - Translation
+		'_' => 'Sobre',
 	),
 	'feed' => array(
 		'add' => 'Você pode adicionar alguns feeds.',
 		'empty' => 'Não há nenhum artigo para mostrar.',
 		'rss_of' => 'RSS feed do %s',
 		'title' => 'Seus RSS feeds',
-		'title_global' => 'Visualização Global',
 		'title_fav' => 'Seus favoritos',
+		'title_global' => 'Visualização Global',
 	),
 	'log' => array(
-		'_' => 'Logs',
 		'clear' => 'Limpar logs',
 		'empty' => 'Arquivo de log está vazio',
-		'title' => 'Logs',
+		'title' => 'Logs',	// TODO - Translation
+		'_' => 'Logs',	// TODO - Translation
 	),
 	'menu' => array(
 		'about' => 'Sobre o FreshRSS',
@@ -43,7 +40,7 @@ return array(
 		'mark_all_read' => 'Marcar todos como lidos',
 		'mark_cat_read' => 'Marcar categoria como lida',
 		'mark_feed_read' => 'Marcar feed com lido',
-		'mark_selection_unread' => 'Mark selection as unread',	//TODO - Translation
+		'mark_selection_unread' => 'Mark selection as unread',	// TODO - Translation
 		'newer_first' => 'Novos primeiro',
 		'non-starred' => 'Mostrar todos, exceto favoritos',
 		'normal_view' => 'visualização normal',
@@ -51,16 +48,19 @@ return array(
 		'queries' => 'Queries do usuário',
 		'read' => 'Mostrar apenas lidos',
 		'reader_view' => 'Visualização de leitura',
-		'rss_view' => 'RSS feed',
+		'rss_view' => 'RSS feed',	// TODO - Translation
 		'search_short' => 'Buscar',
 		'starred' => 'Mostrar apenas os favoritos',
 		'stats' => 'Estatísticas',
 		'subscription' => 'Gerenciamento de inscrições',
-		'tags' => 'My labels',	//TODO - Translation
+		'tags' => 'My labels',	// TODO - Translation
 		'unread' => 'Mostrar apenas os não lidos',
 	),
 	'share' => 'Compartilhar',
 	'tag' => array(
-		'related' => 'Tags relacionadas',	//TODO - Translation
+		'related' => 'Tags relacionadas',
+	),
+	'tos' => array(
+		'title' => 'Terms of Service',	// TODO - Translation
 	),
 );

app/i18n/pt-br/install.php

@@ -17,20 +17,19 @@ return array(
 		'type' => 'Método de autenticação',
 	),
 	'bdd' => array(
-		'_' => 'Banco de dados',
 		'conf' => array(
-			'_' => 'Configuração do banco de dados',
 			'ko' => 'Verifique as informações do seu banco de dados.',
 			'ok' => 'Configurações do banco de dados foram salvas.',
+			'_' => 'Configuração do banco de dados',
 		),
-		'host' => 'Host',
+		'host' => 'Host',	// TODO - Translation
 		'password' => 'Senha do banco de dados',
 		'prefix' => 'Prefixo da tabela',
 		'type' => 'Tipo do banco de dados',
 		'username' => 'Usuário do banco de dados',
+		'_' => 'Banco de dados',
 	),
 	'check' => array(
-		'_' => 'Verificações',
 		'already_installed' => 'Verificamos que o FreshRSS já está instalado!',
 		'cache' => array(
 			'nok' => 'Verifique as permissões no diretório <em>./data/cache</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
@@ -69,8 +68,8 @@ return array(
 			'ok' => 'Você tem a extensão JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'Não foi possível encontrar o framework Minz.',
@@ -96,10 +95,11 @@ return array(
 			'nok' => 'Não foi possível encontrar a biblioteca necessária para parse o XML.',
 			'ok' => 'Você tem a biblioteca necessária para parse o XML.',
 		),
+		'_' => 'Verificações',
 	),
 	'conf' => array(
-		'_' => 'Configurações gerais',
 		'ok' => 'Configurações gerais foram salvas.',
+		'_' => 'Configurações gerais',
 	),
 	'congratulations' => 'Parabéns!',
 	'default_user' => 'Usuário do usuário padrão <small>(máximo de 16 caracteres alphanumericos)</small>',
@@ -110,14 +110,14 @@ return array(
 		'confirm_reinstall' => 'Você irá perder suas configurações anteriores ao reinstalar o FreshRSS. Você está certo que deseja continuar?',
 	),
 	'language' => array(
-		'_' => 'Idioma',
 		'choose' => 'Escolhar o idioma para o FreshRSS',
 		'defined' => 'Idioma foi definido.',
+		'_' => 'Idioma',
 	),
 	'not_deleted' => 'Algo deu errado; você deve deletar o arquivo <em>%s</em> manualmente.',
 	'ok' => 'O processo de instalação foi um sucesso.',
 	'step' => 'passo %d',
 	'steps' => 'Passos',
-	'title' => 'Instalação · FreshRSS',
 	'this_is_the_end' => 'Este é o final',
+	'title' => 'Instalação · FreshRSS',
 );

app/i18n/pt-br/sub.php

@@ -2,87 +2,87 @@
 
 return array(
 	'api' => array(
-		'documentation' => 'Copy the following URL to use it within an external tool.',	//TODO - Translation
-		'title' => 'API',	//TODO - Translation
+		'documentation' => 'Copy the following URL to use it within an external tool.',	// TODO - Translation
+		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	//TODO - Translation
-		'label' => 'Subscribe',	//TODO - Translation
-		'title' => 'Bookmarklet',	//TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'label' => 'Subscribe',	// TODO - Translation
+		'title' => 'Bookmarklet',	// TODO - Translation
 	),
 	'category' => array(
-		'_' => 'Categoria',
 		'add' => 'Adicionar uma categoria',
 		'archiving' => 'Arquivar',
 		'empty' => 'Categoria vazia',
 		'information' => 'Informações',
 		'new' => 'Nova categoria',
-		'position' => 'Display position',	//TODO - Translation
-		'position_help' => 'To control category sort order',	//TODO - Translation
+		'position' => 'Display position',	// TODO - Translation
+		'position_help' => 'To control category sort order',	// TODO - Translation
 		'title' => 'Título',
+		'_' => 'Categoria',
 	),
 	'feed' => array(
 		'add' => 'Adicionar um RSS feed',
 		'advanced' => 'Avançado',
 		'archiving' => 'Arquivar',
 		'auth' => array(
-			'configuration' => 'Login',
+			'configuration' => 'Login',	// TODO - Translation
 			'help' => 'Permite acesso a feeds RSS protegidos por HTTP',
 			'http' => 'Autenticação HTTP',
 			'password' => 'Senha HTTP',
 			'username' => 'Usuário HTTP',
 		),
-		'clear_cache' => 'Always clear cache',	//TODO - Translation
+		'clear_cache' => 'Always clear cache',	// TODO - Translation
 		'css_help' => 'Retorna RSS feeds truncados (atenção, requer mais tempo!)',
 		'css_path' => 'Caminho do CSS do artigo no site original',
 		'description' => 'Descrição',
 		'empty' => 'Este feed está vazio. Por favor verifique ele ainda é mantido.',
 		'error' => 'Este feed encontra-se com problema. Por favor verifique se ele ainda está disponível e atualize-o.',
 		'filteractions' => array(
-			'_' => 'Filter actions',	//TODO - Translation
-			'help' => 'Write one search filter per line.',	//TODO - Translation
+			'help' => 'Write one search filter per line.',	// TODO - Translation
+			'_' => 'Filter actions',	// TODO - Translation
 		),
 		'information' => 'Informações',
 		'keep_min' => 'Número mínimo de artigos para manter',
 		'moved_category_deleted' => 'Quando você deleta uma categoria, seus feeds são automaticamente classificados como <em>%s</em>.',
-		'mute' => 'mute',	//TODO - Translation
+		'mute' => 'mute',	// TODO - Translation
 		'no_selected' => 'Nenhum feed selecionado.',
 		'number_entries' => '%d artigos',
 		'priority' => array(
-			'_' => 'Visibility',	//TODO - Translation
-			'archived' => 'Do not show (archived)',	//TODO - Translation
+			'archived' => 'Do not show (archived)',	// TODO - Translation
 			'main_stream' => 'Mostrar na tela principal',
-			'normal' => 'Show in its category',	//TODO - Translation
+			'normal' => 'Show in its category',	// TODO - Translation
+			'_' => 'Visibility',	// TODO - Translation
 		),
-		'websub' => 'Notificação instantânea com WebSub',
 		'show' => array(
-			'all' => 'Show all feeds',	//TODO - Translation
-			'error' => 'Show only feeds with error',	//TODO - Translation
+			'all' => 'Show all feeds',	// TODO - Translation
+			'error' => 'Show only feeds with error',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	//TODO - Translation
+			'error' => 'Showing only feeds with error',	// TODO - Translation
 		),
-		'ssl_verify' => 'Verify SSL security',	//TODO - Translation
+		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'Estatísticas',
 		'think_to_add' => 'Você deve adicionar alguns feeds.',
-		'timeout' => 'Timeout in seconds',	//TODO - Translation
+		'timeout' => 'Timeout in seconds',	// TODO - Translation
 		'title' => 'Título',
 		'title_add' => 'Adicionar o RSS feed',
 		'ttl' => 'Não atualize automáticamente mais que',
-		'url' => 'Feed URL',
+		'url' => 'Feed URL',	// TODO - Translation
 		'validator' => 'Verifique a validade do feed',
 		'website' => 'URL do site',
+		'websub' => 'Notificação instantânea com WebSub',
 	),
 	'firefox' => array(
-		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',// TODO
-		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
-		'title' => 'Firefox feed reader',	//TODO - Translation
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	// TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	// TODO - Translation
+		'title' => 'Firefox feed reader',	// TODO - Translation
 	),
 	'import_export' => array(
 		'export' => 'Exportar',
+		'export_labelled' => 'Export your labelled articles',	// TODO - Translation
 		'export_opml' => 'Exporta a lista dos feeds (OPML)',
 		'export_starred' => 'Exportar seus favoritos',
-		'export_labelled' => 'Export your labelled articles',	//TODO
 		'feed_list' => 'Lista dos %s artigos',
 		'file_to_import' => 'Arquivo para importar<br />(OPML, JSON or ZIP)',
 		'file_to_import_no_zip' => 'Arquivo para importar<br />(OPML or JSON)',
@@ -94,9 +94,11 @@ return array(
 		'bookmark' => 'Inscreva-se (FreshRSS favoritos)',
 		'import_export' => 'Importar / exportar',
 		'subscription_management' => 'Gerenciamento de inscrições',
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 	'title' => array(
-		'_' => 'Gerenciamento de inscrições',
 		'feed_management' => 'Gerenciamento dos RSS feeds',
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
+		'_' => 'Gerenciamento de inscrições',
 	),
 );

app/i18n/pt-br/user.php

@@ -3,35 +3,35 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.', //TODO - Translation
-			'required' => 'The email address is required.', //TODO - Translation
+			'invalid' => 'The email address is invalid.',	// TODO - Translation
+			'required' => 'The email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
-			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
-				'email_sent' => 'An email has been sent to your address.', //TODO - Translation
-				'error' => 'The email address failed to be validated.', //TODO - Translation
-				'ok' => 'The email address has been validated.', //TODO - Translation
-				'unneccessary' => 'The email address was already validated.', //TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
+				'error' => 'The email address failed to be validated.',	// TODO - Translation
+				'ok' => 'The email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
-			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
-			'resend_email' => 'Resend the email', //TODO - Translation
-			'title' => 'Email address validation', //TODO - Translation
-		),
-	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
+			'resend_email' => 'Resend the email',	// TODO - Translation
+			'title' => 'Email address validation',	// TODO - Translation
 		),
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'title' => 'You need to validate your account', //TODO - Translation
-			'welcome' => 'Welcome %s,', //TODO - Translation
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'title' => 'You need to validate your account',	// TODO - Translation
+			'welcome' => 'Welcome %s,',	// TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.',	// TODO - Translation
 		),
 	),
 );

app/i18n/ru/admin.php

@@ -67,8 +67,8 @@ return array(
 			'ok' => 'У вас установлена библиотека для работы с JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'У вас не установлен фрейворк Minz.',
@@ -83,9 +83,9 @@ return array(
 			'ok' => 'У вас установлен PDO и как минимум один из поддерживаемых драйверов (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'PHP installation',
 			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
 			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
+			'_' => 'PHP installation',	// TODO - Translation
 		),
 		'tables' => array(
 			'nok' => 'В базе данных отсуствует одна или больше таблица.',
@@ -94,38 +94,37 @@ return array(
 		'title' => 'Проверка установки и настройки',
 		'tokens' => array(
 			'nok' => 'Проверьте права доступа к папке <em>./data/tokens</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку tokens  в порядке.',
+			'ok' => 'Права на папку tokens в порядке.',
 		),
 		'users' => array(
 			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку users  в порядке.',
+			'ok' => 'Права на папку users в порядке.',
 		),
 		'zip' => array(
 			'nok' => 'You lack ZIP extension (php-zip package).',
-			'ok' => 'You have ZIP extension.',
+			'ok' => 'You have ZIP extension.',	// TODO - Translation
 		),
 	),
 	'extensions' => array(
-		'author' => 'Author',	//TODO - Translation
-		'community' => 'Available community extensions',	//TODO - Translation
-		'description' => 'Description',	//TODO - Translation
+		'author' => 'Author',	// TODO - Translation
+		'community' => 'Available community extensions',	// TODO - Translation
+		'description' => 'Description',	// TODO - Translation
 		'disabled' => 'Отключены',
 		'empty_list' => 'Расширения не установлены',
 		'enabled' => 'Включены',
-		'latest' => 'Installed',	//TODO - Translation
-		'name' => 'Name',	//TODO - Translation
+		'latest' => 'Installed',	// TODO - Translation
+		'name' => 'Name',	// TODO - Translation
 		'no_configure_view' => 'Это расширение нельзя настроить.',
 		'system' => array(
-			'_' => 'Системные расширения',
 			'no_rights' => 'Системные расширения (у вас нет к ним доступа)',
+			'_' => 'Системные расширения',
 		),
 		'title' => 'Расширения',
-		'update' => 'Update available',	//TODO - Translation
+		'update' => 'Update available',	// TODO - Translation
 		'user' => 'Расширения пользователя',
-		'version' => 'Version',	//TODO - Translation
+		'version' => 'Version',	// TODO - Translation
 	),
 	'stats' => array(
-		'_' => 'Статистика',
 		'all_feeds' => 'Все подписки',
 		'category' => 'Категория',
 		'entry_count' => 'Количество статей',
@@ -155,31 +154,32 @@ return array(
 		'status_unread' => 'Не прочитано',
 		'title' => 'Статистика',
 		'top_feed' => '10 лучших подписок',
+		'_' => 'Статистика',
 	),
 	'system' => array(
-		'_' => 'Системные настройки',
 		'auto-update-url' => 'Адрес сервера для автоматического обновления',
-		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
+		'cookie-duration' => array(
+			'help' => 'in seconds',	// TODO - Translation
+			'number' => 'Duration to keep logged in',	// TODO - Translation
+		),
+		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
 		'instance-name' => 'Название этого сервера',
 		'max-categories' => 'Количество категорий на пользователя',
 		'max-feeds' => 'Количество статей на пользователя',
-		'cookie-duration' => array(
-			'help' => 'in seconds', // @todo translate
-			'number' => 'Duration to keep logged in', // @todo translate
-		),
 		'registration' => array(
 			'help' => '0 означает неограниченное количество пользователей',
 			'number' => 'Максимальное количество пользователей',
 		),
+		'_' => 'Системные настройки',
 	),
 	'update' => array(
-		'_' => 'Обновление системы',
 		'apply' => 'Применить',
 		'check' => 'Проверить обновления',
 		'current_version' => 'Ваша текущая версия FreshRSS: %s.',
 		'last' => 'Последняя проверка: %s',
 		'none' => 'Нечего обновлять',
 		'title' => 'Обновить систему',
+		'_' => 'Обновление системы',
 	),
 	'user' => array(
 		'articles_and_size' => '%s статей (%s)',
@@ -187,19 +187,19 @@ return array(
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'Создать нового пользователя',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	//TODO - Translation
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'delete_users' => 'Delete user',	// TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Язык',
 		'list' => 'User list',	// TODO - Translation
 		'number' => 'На данный момент создан %d аккаунт',
-		'numbers' => 'На данный момент аккаунтов создано:  %d',
+		'numbers' => 'На данный момент аккаунтов создано:	%d',
 		'password_form' => 'Пароль<br /><small>(для входа через Веб-форму)</small>',
 		'password_format' => 'Минимум 7 символов',
-		'selected' => 'Selected user',	//TODO - Translation
+		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Управление пользователями',
-		'update_users' => 'Update user',	//TODO - Translation
-		'user_list' => 'Список пользователей',
+		'update_users' => 'Update user',	// TODO - Translation
 		'username' => 'Имя пользователя',
 		'users' => 'Пользователи',
+		'user_list' => 'Список пользователей',
 	),
 );

app/i18n/ru/conf.php

@@ -2,196 +2,196 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Архивация',
 		'delete_after' => 'Удалять статьи после',
-		'exception' => 'Purge exception',	//TODO - Translation
+		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'Каждую подписку можно настроить более гибко',
-		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
-		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',	//TODO - Translation
-		'keep_labels' => 'Never delete labels',	//TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
-		'maintenance' => 'Maintenance',	//TODO - Translation
+		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
+		'keep_labels' => 'Never delete labels',	// TODO - Translation
+		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
+		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',	// TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Оптимизировать базу данных',
-		'optimize_help' => 'To do occasionally to reduce the size of the database',	//TODO - Translation
-		'policy' => 'Purge policy',	//TODO - Translation
-		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
+		'optimize_help' => 'To do occasionally to reduce the size of the database',
+		'policy' => 'Purge policy',	// TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	// TODO - Translation
 		'purge_now' => 'Очистить сейчас',
-		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
-		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Архивация',
 		'ttl' => 'Не обновлять чаще чем',
+		'_' => 'Архивация',
 	),
 	'display' => array(
-		'_' => 'Display',
 		'icon' => array(
-			'bottom_line' => 'Bottom line',	//TODO - Translation
-			'entry' => 'Article icons',	//TODO - Translation
-			'publication_date' => 'Date of publication',	//TODO - Translation
-			'related_tags' => 'Related tags',	//TODO - Translation
-			'sharing' => 'Sharing',	//TODO - Translation
-			'display_authors' => 'Authors',  //TODO - Translation
-			'top_line' => 'Top line',	//TODO - Translation
+			'bottom_line' => 'Bottom line',	// TODO - Translation
+			'display_authors' => 'Authors',	// TODO - Translation
+			'entry' => 'Article icons',	// TODO - Translation
+			'publication_date' => 'Date of publication',	// TODO - Translation
+			'related_tags' => 'Related tags',
+			'sharing' => 'Sharing',	// TODO - Translation
+			'top_line' => 'Top line',	// TODO - Translation
 		),
 		'language' => 'Язык',
 		'notif_html5' => array(
-			'seconds' => 'seconds (0 means no timeout)',	//TODO - Translation
-			'timeout' => 'HTML5 notification timeout',	//TODO - Translation
+			'seconds' => 'seconds (0 means no timeout)',	// TODO - Translation
+			'timeout' => 'HTML5 notification timeout',	// TODO - Translation
 		),
-		'show_nav_buttons' => 'Show the navigation buttons',	//TODO - Translation
+		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'Тема',
-		'title' => 'Display',	//TODO - Translation
+		'title' => 'Display',	// TODO - Translation
 		'width' => array(
-			'content' => 'Content width',	//TODO - Translation
-			'large' => 'Large',	//TODO - Translation
-			'medium' => 'Medium',	//TODO - Translation
-			'no_limit' => 'No limit',	//TODO - Translation
-			'thin' => 'Thin',	//TODO - Translation
+			'content' => 'Content width',	// TODO - Translation
+			'large' => 'Large',	// TODO - Translation
+			'medium' => 'Medium',	// TODO - Translation
+			'no_limit' => 'No limit',	// TODO - Translation
+			'thin' => 'Thin',	// TODO - Translation
 		),
+		'_' => 'Display',	// TODO - Translation
 	),
 	'profile' => array(
-		'_' => 'Profile management',	//TODO - Translation
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Account deletion',	//TODO - Translation
-			'warn' => 'Your account and all the related data will be deleted.',	//TODO - Translation
+			'warn' => 'Your account and all the related data will be deleted.',
+			'_' => 'Account deletion',	// TODO - Translation
 		),
-		'email' => 'Email address',	//TODO - Translation
-		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',	//TODO - Translation
-		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',	//TODO - Translation
-		'password_format' => 'At least 7 characters',	//TODO - Translation
-		'title' => 'Profile',	//TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
+		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
+		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',	// TODO - Translation
+		'password_format' => 'At least 7 characters',	// TODO - Translation
+		'title' => 'Profile',	// TODO - Translation
+		'_' => 'Profile management',	// TODO - Translation
 	),
 	'query' => array(
-		'_' => 'User queries',
-		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',	//TODO - Translation
-		'display' => 'Display user query results',	//TODO - Translation
-		'filter' => 'Filter applied:',	//TODO - Translation
-		'get_all' => 'Display all articles',	//TODO - Translation
-		'get_category' => 'Display "%s" category',	//TODO - Translation
-		'get_favorite' => 'Display favorite articles',	//TODO - Translation
-		'get_feed' => 'Display "%s" feed',	//TODO - Translation
-		'no_filter' => 'No filter',	//TODO - Translation
-		'none' => 'You haven’t created any user query yet.',	//TODO - Translation
-		'number' => 'Query n°%d',	//TODO - Translation
-		'order_asc' => 'Display oldest articles first',	//TODO - Translation
-		'order_desc' => 'Display newest articles first',	//TODO - Translation
-		'remove' => 'Remove user query',	//TODO - Translation
-		'search' => 'Search for "%s"',	//TODO - Translation
-		'state_0' => 'Display all articles',	//TODO - Translation
-		'state_1' => 'Display read articles',	//TODO - Translation
-		'state_2' => 'Display unread articles',	//TODO - Translation
-		'state_3' => 'Display all articles',	//TODO - Translation
-		'state_4' => 'Display favorite articles',	//TODO - Translation
-		'state_5' => 'Display read favorite articles',	//TODO - Translation
-		'state_6' => 'Display unread favorite articles',	//TODO - Translation
-		'state_7' => 'Display favorite articles',	//TODO - Translation
-		'state_8' => 'Display not favorite articles',	//TODO - Translation
-		'state_9' => 'Display read not favorite articles',	//TODO - Translation
-		'state_10' => 'Display unread not favorite articles',	//TODO - Translation
-		'state_11' => 'Display not favorite articles',	//TODO - Translation
-		'state_12' => 'Display all articles',	//TODO - Translation
-		'state_13' => 'Display read articles',	//TODO - Translation
-		'state_14' => 'Display unread articles',	//TODO - Translation
-		'state_15' => 'Display all articles',	//TODO - Translation
-		'title' => 'User queries',	//TODO - Translation
+		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',	// TODO - Translation
+		'display' => 'Display user query results',	// TODO - Translation
+		'filter' => 'Filter applied:',	// TODO - Translation
+		'get_all' => 'Display all articles',	// TODO - Translation
+		'get_category' => 'Display "%s" category',	// TODO - Translation
+		'get_favorite' => 'Display favorite articles',
+		'get_feed' => 'Display "%s" feed',	// TODO - Translation
+		'none' => 'You haven’t created any user query yet.',
+		'no_filter' => 'No filter',	// TODO - Translation
+		'number' => 'Query n°%d',	// TODO - Translation
+		'order_asc' => 'Display oldest articles first',	// TODO - Translation
+		'order_desc' => 'Display newest articles first',	// TODO - Translation
+		'remove' => 'Remove user query',	// TODO - Translation
+		'search' => 'Search for "%s"',	// TODO - Translation
+		'state_0' => 'Display all articles',	// TODO - Translation
+		'state_1' => 'Display read articles',	// TODO - Translation
+		'state_2' => 'Display unread articles',	// TODO - Translation
+		'state_3' => 'Display all articles',	// TODO - Translation
+		'state_4' => 'Display favorite articles',
+		'state_5' => 'Display read favorite articles',
+		'state_6' => 'Display unread favorite articles',
+		'state_7' => 'Display favorite articles',
+		'state_8' => 'Display not favorite articles',
+		'state_9' => 'Display read not favorite articles',
+		'state_10' => 'Display unread not favorite articles',
+		'state_11' => 'Display not favorite articles',
+		'state_12' => 'Display all articles',	// TODO - Translation
+		'state_13' => 'Display read articles',	// TODO - Translation
+		'state_14' => 'Display unread articles',	// TODO - Translation
+		'state_15' => 'Display all articles',	// TODO - Translation
+		'title' => 'User queries',	// TODO - Translation
+		'_' => 'User queries',	// TODO - Translation
 	),
 	'reading' => array(
-		'_' => 'Reading',	//TODO - Translation
-		'after_onread' => 'After “mark all as read”,',	//TODO - Translation
-		'articles_per_page' => 'Number of articles per page',	//TODO - Translation
-		'auto_load_more' => 'Load next articles at the page bottom',	//TODO - Translation
-		'auto_remove_article' => 'Hide articles after reading',	//TODO - Translation
-		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',	//TODO - Translation
-		'display_articles_unfolded' => 'Show articles unfolded by default',	//TODO - Translation
-		'display_categories_unfolded' => 'Show categories unfolded by default',	//TODO - Translation
-		'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',	//TODO - Translation
-		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',	//TODO - Translation
-		'jump_next' => 'jump to next unread sibling (feed or category)',	//TODO - Translation
-		'mark_updated_article_unread' => 'Mark updated articles as unread',	//TODO - Translation
-		'number_divided_when_reader' => 'Divided by 2 in the reading view.',	//TODO - Translation
+		'after_onread' => 'After “mark all as read”,',	// TODO - Translation
+		'articles_per_page' => 'Number of articles per page',	// TODO - Translation
+		'auto_load_more' => 'Load next articles at the page bottom',
+		'auto_remove_article' => 'Hide articles after reading',	// TODO - Translation
+		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',	// TODO - Translation
+		'display_articles_unfolded' => 'Show articles unfolded by default',	// TODO - Translation
+		'display_categories_unfolded' => 'Show categories unfolded by default',	// TODO - Translation
+		'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
+		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',	// TODO - Translation
+		'jump_next' => 'jump to next unread sibling (feed or category)',	// TODO - Translation
+		'mark_updated_article_unread' => 'Mark updated articles as unread',	// TODO - Translation
+		'number_divided_when_reader' => 'Divided by 2 in the reading view.',	// TODO - Translation
 		'read' => array(
-			'article_open_on_website' => 'when article is opened on its original website',	//TODO - Translation
-			'article_viewed' => 'when article is viewed',	//TODO - Translation
-			'scroll' => 'while scrolling',	//TODO - Translation
-			'upon_reception' => 'upon reception of the article',	//TODO - Translation
-			'when' => 'Mark article as read…',	//TODO - Translation
+			'article_open_on_website' => 'when article is opened on its original website',	// TODO - Translation
+			'article_viewed' => 'when article is viewed',	// TODO - Translation
+			'scroll' => 'while scrolling',	// TODO - Translation
+			'upon_reception' => 'upon reception of the article',
+			'when' => 'Mark article as read…',	// TODO - Translation
 		),
 		'show' => array(
-			'_' => 'Articles to display',	//TODO - Translation
-			'adaptive' => 'Adjust showing',	//TODO - Translation
-			'all_articles' => 'Show all articles',	//TODO - Translation
-			'unread' => 'Show only unread',	//TODO - Translation
+			'adaptive' => 'Adjust showing',	// TODO - Translation
+			'all_articles' => 'Show all articles',	// TODO - Translation
+			'unread' => 'Show only unread',	// TODO - Translation
+			'_' => 'Articles to display',	// TODO - Translation
 		),
-		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO - Translation
+		'sides_close_article' => 'Clicking outside of article text area closes the article',	// TODO - Translation
 		'sort' => array(
-			'_' => 'Sort order',	//TODO - Translation
-			'newer_first' => 'Newer first',	//TODO - Translation
-			'older_first' => 'Oldest first',	//TODO - Translation
+			'newer_first' => 'Newer first',
+			'older_first' => 'Oldest first',	// TODO - Translation
+			'_' => 'Sort order',	// TODO - Translation
 		),
-		'sticky_post' => 'Stick the article to the top when opened',	//TODO - Translation
-		'title' => 'Reading',	//TODO - Translation
+		'sticky_post' => 'Stick the article to the top when opened',	// TODO - Translation
+		'title' => 'Reading',	// TODO - Translation
 		'view' => array(
-			'default' => 'Default view',	//TODO - Translation
-			'global' => 'Global view',	//TODO - Translation
-			'normal' => 'Normal view',	//TODO - Translation
-			'reader' => 'Reading view',	//TODO - Translation
+			'default' => 'Default view',	// TODO - Translation
+			'global' => 'Global view',	// TODO - Translation
+			'normal' => 'Normal view',	// TODO - Translation
+			'reader' => 'Reading view',	// TODO - Translation
 		),
+		'_' => 'Reading',	// TODO - Translation
 	),
 	'sharing' => array(
-		'_' => 'Sharing',	//TODO - Translation
-		'add' => 'Add a sharing method',	//TODO - Translation
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',	//TODO - Translation
-		'facebook' => 'Facebook',
-		'more_information' => 'More information',	//TODO - Translation
-		'print' => 'Print',	//TODO - Translation
-		'remove' => 'Remove sharing method',	//TODO - Translation
-		'shaarli' => 'Shaarli',
-		'share_name' => 'Share name to display',	//TODO - Translation
-		'share_url' => 'Share URL to use',	//TODO - Translation
-		'title' => 'Sharing',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'add' => 'Add a sharing method',	// TODO - Translation
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
+		'more_information' => 'More information',	// TODO - Translation
+		'print' => 'Print',	// TODO - Translation
+		'remove' => 'Remove sharing method',	// TODO - Translation
+		'shaarli' => 'Shaarli',	// TODO - Translation
+		'share_name' => 'Share name to display',	// TODO - Translation
+		'share_url' => 'Share URL to use',	// TODO - Translation
+		'title' => 'Sharing',	// TODO - Translation
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag',	// TODO - Translation
+		'_' => 'Sharing',	// TODO - Translation
 	),
 	'shortcut' => array(
-		'_' => 'Shortcuts',	//TODO - Translation
-		'article_action' => 'Article actions',	//TODO - Translation
-		'auto_share' => 'Share',	//TODO - Translation
-		'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',	//TODO - Translation
-		'close_dropdown' => 'Close menus',	//TODO - Translation
-		'collapse_article' => 'Collapse',	//TODO - Translation
-		'first_article' => 'Skip to the first article',	//TODO - Translation
-		'focus_search' => 'Access search box',	//TODO - Translation
-		'global_view' => 'Switch to global view',	//TODO - Translation
-		'help' => 'Display documentation',	//TODO - Translation
-		'javascript' => 'JavaScript must be enabled in order to use shortcuts',	//TODO - Translation
-		'last_article' => 'Skip to the last article',	//TODO - Translation
-		'load_more' => 'Load more articles',	//TODO - Translation
-		'mark_read' => 'Mark as read',	//TODO - Translation
-		'mark_favorite' => 'Mark as favourite',	//TODO - Translation
-		'navigation' => 'Navigation',	//TODO - Translation
-		'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',	//TODO - Translation
-		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	//TODO - Translation
-		'next_article' => 'Skip to the next article',	//TODO - Translation
-		'normal_view' => 'Switch to normal view',	//TODO - Translation
-		'other_action' => 'Other actions',	//TODO - Translation
-		'previous_article' => 'Skip to the previous article',	//TODO - Translation
-		'reading_view' => 'Switch to reading view',	//TODO - Translation
-		'rss_view' => 'Open RSS view in a new tab',	//TODO - Translation
-		'see_on_website' => 'See on original website',	//TODO - Translation
-		'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',	//TODO - Translation
-		'skip_next_article' => 'Focus next without opening',	//TODO - Translation
-		'skip_previous_article' => 'Focus previous without opening',	//TODO - Translation
-		'title' => 'Shortcuts',	//TODO - Translation
-		'user_filter' => 'Access user filters',	//TODO - Translation
-		'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',	//TODO - Translation
-		'views' => 'Views',	//TODO - Translation
+		'article_action' => 'Article actions',	// TODO - Translation
+		'auto_share' => 'Share',	// TODO - Translation
+		'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
+		'close_dropdown' => 'Close menus',	// TODO - Translation
+		'collapse_article' => 'Collapse',	// TODO - Translation
+		'first_article' => 'Skip to the first article',
+		'focus_search' => 'Access search box',	// TODO - Translation
+		'global_view' => 'Switch to global view',	// TODO - Translation
+		'help' => 'Display documentation',	// TODO - Translation
+		'javascript' => 'JavaScript must be enabled in order to use shortcuts',	// TODO - Translation
+		'last_article' => 'Skip to the last article',
+		'load_more' => 'Load more articles',	// TODO - Translation
+		'mark_favorite' => 'Mark as favourite',
+		'mark_read' => 'Mark as read',
+		'navigation' => 'Navigation',	// TODO - Translation
+		'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',	// TODO - Translation
+		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	// TODO - Translation
+		'next_article' => 'Skip to the next article',
+		'normal_view' => 'Switch to normal view',	// TODO - Translation
+		'other_action' => 'Other actions',	// TODO - Translation
+		'previous_article' => 'Skip to the previous article',
+		'reading_view' => 'Switch to reading view',	// TODO - Translation
+		'rss_view' => 'Open RSS view in a new tab',	// TODO - Translation
+		'see_on_website' => 'See on original website',	// TODO - Translation
+		'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',	// TODO - Translation
+		'skip_next_article' => 'Focus next without opening',	// TODO - Translation
+		'skip_previous_article' => 'Focus previous without opening',	// TODO - Translation
+		'title' => 'Shortcuts',	// TODO - Translation
+		'user_filter' => 'Access user filters',
+		'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
+		'views' => 'Views',	// TODO - Translation
+		'_' => 'Shortcuts',	// TODO - Translation
 	),
 	'user' => array(
-		'articles_and_size' => '%s articles (%s)',	//TODO - Translation
-		'current' => 'Current user',	//TODO - Translation
-		'is_admin' => 'is administrator',	//TODO - Translation
-		'users' => 'Users',	//TODO - Translation
+		'articles_and_size' => '%s articles (%s)',	// TODO - Translation
+		'current' => 'Current user',	// TODO - Translation
+		'is_admin' => 'is administrator',	// TODO - Translation
+		'users' => 'Users',	// TODO - Translation
 	),
 );

app/i18n/ru/feedback.php

@@ -1,122 +1,122 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimisation complete',	//TODO - Translation
-	),
 	'access' => array(
-		'denied' => 'You don’t have permission to access this page',	//TODO - Translation
-		'not_found' => 'You are looking for a page which doesn’t exist',	//TODO - Translation
+		'denied' => 'You don’t have permission to access this page',	// TODO - Translation
+		'not_found' => 'You are looking for a page which doesn’t exist',	// TODO - Translation
+	),
+	'admin' => array(
+		'optimization_complete' => 'Optimisation complete',
 	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
 		'form' => array(
-			'not_set' => 'A problem occured during authentication system configuration. Please retry later.',	//TODO - Translation
-			'set' => 'Form is now your default authentication system.',	//TODO - Translation
+			'not_set' => 'A problem occured during authentication system configuration. Please retry later.',	// TODO - Translation
+			'set' => 'Form is now your default authentication system.',	// TODO - Translation
 		),
 		'login' => array(
-			'invalid' => 'Login is invalid',	//TODO - Translation
-			'success' => 'You are connected',	//TODO - Translation
+			'invalid' => 'Login is invalid',	// TODO - Translation
+			'success' => 'You are connected',	// TODO - Translation
 		),
 		'logout' => array(
-			'success' => 'You are disconnected',	//TODO - Translation
+			'success' => 'You are disconnected',	// TODO - Translation
 		),
-		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',	//TODO - Translation
+		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',	// TODO - Translation
 	),
 	'conf' => array(
-		'error' => 'An error occurred during configuration saving',		//TODO - Translation
-		'query_created' => 'Query "%s" has been created.',	//TODO - Translation
-		'shortcuts_updated' => 'Shortcuts have been updated',	//TODO - Translation
-		'updated' => 'Configuration has been updated',	//TODO - Translation
+		'error' => 'An error occurred during configuration saving',	// TODO - Translation
+		'query_created' => 'Query "%s" has been created.',	// TODO - Translation
+		'shortcuts_updated' => 'Shortcuts have been updated',	// TODO - Translation
+		'updated' => 'Configuration has been updated',	// TODO - Translation
 	),
 	'extensions' => array(
-		'already_enabled' => '%s is already enabled',	//TODO - Translation
+		'already_enabled' => '%s is already enabled',	// TODO - Translation
 		'disable' => array(
-			'ko' => '%s cannot be disabled. <a href="%s">Check FreshRSS logs</a> for details.',	//TODO - Translation
-			'ok' => '%s is now disabled',	//TODO - Translation
+			'ko' => '%s cannot be disabled. <a href="%s">Check FreshRSS logs</a> for details.',	// TODO - Translation
+			'ok' => '%s is now disabled',	// TODO - Translation
 		),
 		'enable' => array(
-			'ko' => '%s cannot be enabled. <a href="%s">Check FreshRSS logs</a> for details.',	//TODO - Translation
-			'ok' => '%s is now enabled',	//TODO - Translation
+			'ko' => '%s cannot be enabled. <a href="%s">Check FreshRSS logs</a> for details.',	// TODO - Translation
+			'ok' => '%s is now enabled',	// TODO - Translation
 		),
-		'no_access' => 'You have no access on %s',	//TODO - Translation
-		'not_enabled' => '%s is not enabled yet',	//TODO - Translation
-		'not_found' => '%s does not exist',	//TODO - Translation
+		'not_enabled' => '%s is not enabled yet',
+		'not_found' => '%s does not exist',	// TODO - Translation
+		'no_access' => 'You have no access on %s',	// TODO - Translation
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.',	//TODO - Translation
-		'feeds_imported' => 'Your feeds have been imported and will now be updated',	//TODO - Translation
-		'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',	//TODO - Translation
-		'file_cannot_be_uploaded' => 'File cannot be uploaded!',	//TODO - Translation
-		'no_zip_extension' => 'ZIP extension is not present on your server.',	//TODO - Translation
-		'zip_error' => 'An error occured during ZIP import.',	//TODO - Translation
+		'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.',	// TODO - Translation
+		'feeds_imported' => 'Your feeds have been imported and will now be updated',	// TODO - Translation
+		'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
+		'file_cannot_be_uploaded' => 'File cannot be uploaded!',	// TODO - Translation
+		'no_zip_extension' => 'ZIP extension is not present on your server.',	// TODO - Translation
+		'zip_error' => 'An error occured during ZIP import.',	// TODO - Translation
 	),
 	'profile' => array(
-		'error' => 'Your profile cannot be modified',	//TODO - Translation
-		'updated' => 'Your profile has been modified',	//TODO - Translation
+		'error' => 'Your profile cannot be modified',	// TODO - Translation
+		'updated' => 'Your profile has been modified',	// TODO - Translation
 	),
 	'sub' => array(
-		'actualize' => 'Actualise',	//TODO - Translation
+		'actualize' => 'Actualise',
 		'articles' => array(
-			'marked_read' => 'The selected articles have been marked as read.',	//TODO - Translation
-			'marked_unread' => 'The articles have been marked as unread.',	//TODO - Translation
+			'marked_read' => 'The selected articles have been marked as read.',	// TODO - Translation
+			'marked_unread' => 'The articles have been marked as unread.',	// TODO - Translation
 		),
 		'category' => array(
-			'created' => 'Category %s has been created.',	//TODO - Translation
-			'deleted' => 'Category has been deleted.',	//TODO - Translation
-			'emptied' => 'Category has been emptied',	//TODO - Translation
-			'error' => 'Category cannot be updated',	//TODO - Translation
-			'name_exists' => 'Category name already exists.',	//TODO - Translation
-			'no_id' => 'You must precise the id of the category.',	//TODO - Translation
-			'no_name' => 'Category name cannot be empty.',	//TODO - Translation
-			'not_delete_default' => 'You cannot delete the default category!',	//TODO - Translation
-			'not_exist' => 'The category does not exist!',	//TODO - Translation
-			'over_max' => 'You have reached your limit of categories (%d)',	//TODO - Translation
-			'updated' => 'Category has been updated.',	//TODO - Translation
+			'created' => 'Category %s has been created.',	// TODO - Translation
+			'deleted' => 'Category has been deleted.',	// TODO - Translation
+			'emptied' => 'Category has been emptied',	// TODO - Translation
+			'error' => 'Category cannot be updated',	// TODO - Translation
+			'name_exists' => 'Category name already exists.',	// TODO - Translation
+			'not_delete_default' => 'You cannot delete the default category!',	// TODO - Translation
+			'not_exist' => 'The category does not exist!',	// TODO - Translation
+			'no_id' => 'You must precise the id of the category.',
+			'no_name' => 'Category name cannot be empty.',	// TODO - Translation
+			'over_max' => 'You have reached your limit of categories (%d)',	// TODO - Translation
+			'updated' => 'Category has been updated.',	// TODO - Translation
 		),
 		'feed' => array(
-			'actualized' => '<em>%s</em> has been updated',	//TODO - Translation
-			'actualizeds' => 'RSS feeds have been updated',	//TODO - Translation
-			'added' => 'RSS feed <em>%s</em> has been added',	//TODO - Translation
-			'already_subscribed' => 'You have already subscribed to <em>%s</em>',	//TODO - Translation
-			'deleted' => 'Feed has been deleted',	//TODO - Translation
-			'error' => 'Feed cannot be updated',	//TODO - Translation
-			'internal_problem' => 'The newsfeed could not be added. <a href="%s">Check FreshRSS logs</a> for details. You can try force adding by appending <code>#force_feed</code> to the URL.',	//TODO - Translation
-			'invalid_url' => 'URL <em>%s</em> is invalid',	//TODO - Translation
-			'n_actualized' => '%d feeds have been updated',	//TODO - Translation
-			'n_entries_deleted' => '%d articles have been deleted',	//TODO - Translation
-			'no_refresh' => 'There is no feed to refresh…',	//TODO - Translation
-			'not_added' => '<em>%s</em> could not be added',	//TODO - Translation
-			'over_max' => 'You have reached your limit of feeds (%d)',	//TODO - Translation
-			'updated' => 'Feed has been updated',	//TODO - Translation
+			'actualized' => '<em>%s</em> has been updated',	// TODO - Translation
+			'actualizeds' => 'RSS feeds have been updated',	// TODO - Translation
+			'added' => 'RSS feed <em>%s</em> has been added',	// TODO - Translation
+			'already_subscribed' => 'You have already subscribed to <em>%s</em>',	// TODO - Translation
+			'deleted' => 'Feed has been deleted',	// TODO - Translation
+			'error' => 'Feed cannot be updated',	// TODO - Translation
+			'internal_problem' => 'The newsfeed could not be added. <a href="%s">Check FreshRSS logs</a> for details. You can try force adding by appending <code>#force_feed</code> to the URL.',	// TODO - Translation
+			'invalid_url' => 'URL <em>%s</em> is invalid',	// TODO - Translation
+			'not_added' => '<em>%s</em> could not be added',	// TODO - Translation
+			'no_refresh' => 'There is no feed to refresh…',	// TODO - Translation
+			'n_actualized' => '%d feeds have been updated',	// TODO - Translation
+			'n_entries_deleted' => '%d articles have been deleted',	// TODO - Translation
+			'over_max' => 'You have reached your limit of feeds (%d)',	// TODO - Translation
+			'updated' => 'Feed has been updated',	// TODO - Translation
 		),
-		'purge_completed' => 'Purge completed (%d articles deleted)',	//TODO - Translation
+		'purge_completed' => 'Purge completed (%d articles deleted)',	// TODO - Translation
 	),
 	'update' => array(
-		'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',	//TODO - Translation
-		'error' => 'The update process has encountered an error: %s',	//TODO - Translation
-		'file_is_nok' => 'New <strong>version %s</strong> available, but check permissions on <em>%s</em> directory. HTTP server must have rights to write into',	//TODO - Translation
-		'finished' => 'Update completed!',	//TODO - Translation
-		'none' => 'No update to apply',	//TODO - Translation
-		'server_not_found' => 'Update server cannot be found. [%s]',	//TODO - Translation
+		'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',	// TODO - Translation
+		'error' => 'The update process has encountered an error: %s',	// TODO - Translation
+		'file_is_nok' => 'New <strong>version %s</strong> available, but check permissions on <em>%s</em> directory. HTTP server must have rights to write into',	// TODO - Translation
+		'finished' => 'Update completed!',	// TODO - Translation
+		'none' => 'No update to apply',	// TODO - Translation
+		'server_not_found' => 'Update server cannot be found. [%s]',	// TODO - Translation
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'User %s has been created',	//TODO - Translation
-			'error' => 'User %s cannot be created',	//TODO - Translation
+			'error' => 'User %s cannot be created',	// TODO - Translation
+			'_' => 'User %s has been created',	// TODO - Translation
 		),
 		'deleted' => array(
-			'_' => 'User %s has been deleted',	//TODO - Translation
-			'error' => 'User %s cannot be deleted',	//TODO - Translation
+			'error' => 'User %s cannot be deleted',	// TODO - Translation
+			'_' => 'User %s has been deleted',	// TODO - Translation
 		),
 		'updated' => array(
-			'_' => 'User %s has been updated',	//TODO - Translation
-			'error' => 'User %s has not been updated',	//TODO - Translation
+			'error' => 'User %s has not been updated',	// TODO - Translation
+			'_' => 'User %s has been updated',	// TODO - Translation
 		),
 	),
 );

app/i18n/ru/gen.php

@@ -2,205 +2,206 @@
 
 return array(
 	'action' => array(
-		'actualize' => 'Actualize',	//TODO - Translation
-		'back' => '← Go back', //TODO - Translation
-		'back_to_rss_feeds' => '← Go back to your RSS feeds',	//TODO - Translation
-		'cancel' => 'Cancel',	//TODO - Translation
-		'create' => 'Create',	//TODO - Translation
-		'disable' => 'Disable',	//TODO - Translation
-		'empty' => 'Empty',	//TODO - Translation
-		'enable' => 'Enable',	//TODO - Translation
-		'export' => 'Export',	//TODO - Translation
-		'filter' => 'Filter',	//TODO - Translation
-		'import' => 'Import',	//TODO - Translation
-		'manage' => 'Manage',	//TODO - Translation
-		'mark_favorite' => 'Mark as favourite',	//TODO - Translation
-		'mark_read' => 'Mark as read',	//TODO - Translation
+		'actualize' => 'Actualize',	// TODO - Translation
+		'back' => '← Go back',	// TODO - Translation
+		'back_to_rss_feeds' => '← Go back to your RSS feeds',	// TODO - Translation
+		'cancel' => 'Cancel',	// TODO - Translation
+		'create' => 'Create',	// TODO - Translation
+		'disable' => 'Disable',	// TODO - Translation
+		'empty' => 'Empty',	// TODO - Translation
+		'enable' => 'Enable',	// TODO - Translation
+		'export' => 'Export',	// TODO - Translation
+		'filter' => 'Filter',	// TODO - Translation
+		'import' => 'Import',	// TODO - Translation
+		'manage' => 'Manage',	// TODO - Translation
+		'mark_favorite' => 'Mark as favourite',	// TODO - Translation
+		'mark_read' => 'Mark as read',	// TODO - Translation
 		'purge' => 'Purge',	// TODO - Translation
-		'remove' => 'Remove',	//TODO - Translation
-		'see_website' => 'See website',	//TODO - Translation
-		'submit' => 'Submit',	//TODO - Translation
-		'truncate' => 'Delete all articles',	//TODO - Translation
-		'update' => 'Update',	//TODO - Translation
+		'remove' => 'Remove',	// TODO - Translation
+		'see_website' => 'See website',	// TODO - Translation
+		'submit' => 'Submit',	// TODO - Translation
+		'truncate' => 'Delete all articles',	// TODO - Translation
+		'update' => 'Update',	// TODO - Translation
 	),
 	'auth' => array(
-		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
-		'email' => 'Email address',	//TODO - Translation
-		'keep_logged_in' => 'Keep me logged in <small>(%s дней)</small>',	//TODO - Translation
-		'login' => 'Login',	//TODO - Translation
-		'logout' => 'Logout',	//TODO - Translation
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.',	// TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
+		'keep_logged_in' => 'Keep me logged in <small>(%s дней)</small>',
+		'login' => 'Login',	// TODO - Translation
+		'logout' => 'Logout',	// TODO - Translation
 		'password' => array(
-			'_' => 'Password',	//TODO - Translation
-			'format' => '<small>At least 7 characters</small>',	//TODO - Translation
+			'format' => '<small>At least 7 characters</small>',	// TODO - Translation
+			'_' => 'Password',	// TODO - Translation
 		),
 		'registration' => array(
-			'_' => 'New account',	//TODO - Translation
-			'ask' => 'Create an account?',	//TODO - Translation
-			'title' => 'Account creation',	//TODO - Translation
+			'ask' => 'Create an account?',	// TODO - Translation
+			'title' => 'Account creation',	// TODO - Translation
+			'_' => 'New account',	// TODO - Translation
 		),
-		'reset' => 'Authentication reset',	//TODO - Translation
+		'reset' => 'Authentication reset',	// TODO - Translation
 		'username' => array(
-			'_' => 'Username',	//TODO - Translation
-			'admin' => 'Administrator username',	//TODO - Translation
-			'format' => '<small>maximum 16 alphanumeric characters</small>',	//TODO - Translation
+			'admin' => 'Administrator username',	// TODO - Translation
+			'format' => '<small>maximum 16 alphanumeric characters</small>',	// TODO - Translation
+			'_' => 'Username',	// TODO - Translation
 		),
 	),
 	'date' => array(
-		'Apr' => '\\A\\p\\r\\i\\l',	//TODO - Translation
-		'apr' => 'apr',	//TODO - Translation
-		'april' => 'Apr',	//TODO - Translation
-		'Aug' => '\\A\\u\\g\\u\\s\\t',	//TODO - Translation
-		'aug' => 'aug',	//TODO - Translation
-		'august' => 'Aug',	//TODO - Translation
-		'before_yesterday' => 'Before yesterday',	//TODO - Translation
-		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',	//TODO - Translation
-		'dec' => 'dec',	//TODO - Translation
-		'december' => 'Dec',	//TODO - Translation
-		'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',	//TODO - Translation
-		'feb' => 'feb',	//TODO - Translation
-		'february' => 'Feb',	//TODO - Translation
-		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',	//TODO - Translation
-		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',	//TODO - Translation
-		'fri' => 'Fri',	//TODO - Translation
-		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',	//TODO - Translation
-		'jan' => 'jan',	//TODO - Translation
-		'january' => 'Jan',	//TODO - Translation
-		'Jul' => '\\J\\u\\l\\y',	//TODO - Translation
-		'jul' => 'jul',	//TODO - Translation
-		'july' => 'Jul',	//TODO - Translation
-		'Jun' => '\\J\\u\\n\\e',	//TODO - Translation
-		'jun' => 'jun',	//TODO - Translation
-		'june' => 'Jun',	//TODO - Translation
-		'last_3_month' => 'Last three months',	//TODO - Translation
-		'last_6_month' => 'Last six months',	//TODO - Translation
-		'last_month' => 'Last month',	//TODO - Translation
-		'last_week' => 'Last week',	//TODO - Translation
-		'last_year' => 'Last year',	//TODO - Translation
-		'Mar' => '\\M\\a\\r\\c\\h',	//TODO - Translation
-		'mar' => 'mar',	//TODO - Translation
-		'march' => 'Mar',	//TODO - Translation
-		'May' => '\\M\\a\\y',	//TODO - Translation
-		'may' => 'May',	//TODO - Translation
-		'may_' => 'May',	//TODO - Translation
-		'mon' => 'Mon',	//TODO - Translation
-		'month' => 'months',	//TODO - Translation
-		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',	//TODO - Translation
-		'nov' => 'nov',	//TODO - Translation
-		'november' => 'Nov',	//TODO - Translation
-		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',	//TODO - Translation
-		'oct' => 'oct',	//TODO - Translation
-		'october' => 'Oct',	//TODO - Translation
-		'sat' => 'Sat',	//TODO - Translation
-		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',	//TODO - Translation
-		'sep' => 'sep',	//TODO - Translation
-		'september' => 'Sep',	//TODO - Translation
-		'sun' => 'Sun',	//TODO - Translation
-		'thu' => 'Thu',	//TODO - Translation
-		'today' => 'Today',	//TODO - Translation
-		'tue' => 'Tue',	//TODO - Translation
-		'wed' => 'Wed',	//TODO - Translation
-		'yesterday' => 'Yesterday',	//TODO - Translation
+		'Apr' => '\\A\\p\\r\\i\\l',	// TODO - Translation
+		'apr' => 'apr',
+		'april' => 'Apr',
+		'Aug' => '\\A\\u\\g\\u\\s\\t',	// TODO - Translation
+		'aug' => 'aug',
+		'august' => 'Aug',
+		'before_yesterday' => 'Before yesterday',	// TODO - Translation
+		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',	// TODO - Translation
+		'dec' => 'dec',
+		'december' => 'Dec',
+		'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',	// TODO - Translation
+		'feb' => 'feb',
+		'february' => 'Feb',
+		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',	// TODO - Translation
+		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',	// TODO - Translation
+		'fri' => 'Fri',	// TODO - Translation
+		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',	// TODO - Translation
+		'jan' => 'jan',
+		'january' => 'Jan',
+		'jul' => 'jul',
+		'Jul' => '\\J\\u\\l\\y',	// TODO - Translation
+		'july' => 'Jul',
+		'Jun' => '\\J\\u\\n\\e',	// TODO - Translation
+		'jun' => 'jun',
+		'june' => 'Jun',
+		'last_3_month' => 'Last three months',	// TODO - Translation
+		'last_6_month' => 'Last six months',	// TODO - Translation
+		'last_month' => 'Last month',	// TODO - Translation
+		'last_week' => 'Last week',	// TODO - Translation
+		'last_year' => 'Last year',	// TODO - Translation
+		'mar' => 'mar',
+		'Mar' => '\\M\\a\\r\\c\\h',	// TODO - Translation
+		'march' => 'Mar',
+		'May' => '\\M\\a\\y',	// TODO - Translation
+		'may' => 'May',	// TODO - Translation
+		'may_' => 'May',	// TODO - Translation
+		'mon' => 'Mon',	// TODO - Translation
+		'month' => 'months',	// TODO - Translation
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',	// TODO - Translation
+		'nov' => 'nov',
+		'november' => 'Nov',
+		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',	// TODO - Translation
+		'oct' => 'oct',
+		'october' => 'Oct',
+		'sat' => 'Sat',	// TODO - Translation
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',	// TODO - Translation
+		'sep' => 'sep',
+		'september' => 'Sep',
+		'sun' => 'Sun',	// TODO - Translation
+		'thu' => 'Thu',	// TODO - Translation
+		'today' => 'Today',	// TODO - Translation
+		'tue' => 'Tue',	// TODO - Translation
+		'wed' => 'Wed',	// TODO - Translation
+		'yesterday' => 'Yesterday',	// TODO - Translation
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',	//TODO - Translation
-		'about' => 'About FreshRSS',	//TODO - Translation
+		'about' => 'About FreshRSS',	// TODO - Translation
+		'_' => 'FreshRSS',	// TODO - Translation
 	),
 	'js' => array(
-		'category_empty' => 'Empty category',	//TODO - Translation
-		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',	//TODO - Translation
-		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',	//TODO - Translation
+		'category_empty' => 'Empty category',	// TODO - Translation
+		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',	// TODO - Translation
+		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
 		'feedback' => array(
-			'body_new_articles' => 'There are %%d new articles to read on FreshRSS.',	//TODO - Translation
-			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',	//TODO - Translation
-			'title_new_articles' => 'FreshRSS: new articles!',	//TODO - Translation
+			'body_new_articles' => 'There are %%d new articles to read on FreshRSS.',	// TODO - Translation
+			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',	// TODO - Translation
+			'title_new_articles' => 'FreshRSS: new articles!',	// TODO - Translation
 		),
-		'new_article' => 'There are new available articles, click to refresh the page.',	//TODO - Translation
-		'should_be_activated' => 'JavaScript must be enabled',	//TODO - Translation
+		'new_article' => 'There are new available articles, click to refresh the page.',	// TODO - Translation
+		'should_be_activated' => 'JavaScript must be enabled',	// TODO - Translation
 	),
 	'lang' => array(
-		'cz' => 'Čeština',
-		'de' => 'Deutsch',
-		'en' => 'English',
-		'es' => 'Español',
-		'fr' => 'Français',
-		'he' => 'עברית',
-		'it' => 'Italiano',
-		'kr' => '한국어',
-		'nl' => 'Nederlands',
-		'oc' => 'Occitan',
-		'pt-br' => 'Português (Brasil)',
-		'ru' => 'Русский',
-		'tr' => 'Türkçe',
-		'zh-cn' => '简体中文',
+		'cz' => 'Čeština',	// TODO - Translation
+		'de' => 'Deutsch',	// TODO - Translation
+		'en' => 'English',	// TODO - Translation
+		'es' => 'Español',	// TODO - Translation
+		'fr' => 'Français',	// TODO - Translation
+		'he' => 'עברית',	// TODO - Translation
+		'it' => 'Italiano',	// TODO - Translation
+		'kr' => '한국어',	// TODO - Translation
+		'nl' => 'Nederlands',	// TODO - Translation
+		'oc' => 'Occitan',	// TODO - Translation
+		'pt-br' => 'Português (Brasil)',	// TODO - Translation
+		'ru' => 'Русский',	// TODO - Translation
+		'sk' => 'Slovenčina',	// TODO - Translation
+		'tr' => 'Türkçe',	// TODO - Translation
+		'zh-cn' => '简体中文',	// TODO - Translation
 	),
 	'menu' => array(
-		'about' => 'About',	//TODO - Translation
-		'admin' => 'Administration',	//TODO - Translation
-		'archiving' => 'Archiving',	//TODO - Translation
-		'authentication' => 'Authentication',	//TODO - Translation
-		'check_install' => 'Installation checking',	//TODO - Translation
-		'configuration' => 'Configuration',	//TODO - Translation
-		'display' => 'Display',	//TODO - Translation
-		'extensions' => 'Extensions',	//TODO - Translation
-		'logs' => 'Logs',	//TODO - Translation
-		'queries' => 'User queries',	//TODO - Translation
-		'reading' => 'Reading',	//TODO - Translation
-		'search' => 'Search words or #tags',	//TODO - Translation
-		'sharing' => 'Sharing',	//TODO - Translation
-		'shortcuts' => 'Shortcuts',	//TODO - Translation
-		'stats' => 'Statistics',	//TODO - Translation
-		'system' => 'System configuration',	//TODO - Translation
-		'update' => 'Update',	//TODO - Translation
-		'user_management' => 'Manage users',	//TODO - Translation
-		'user_profile' => 'Profile',	//TODO - Translation
+		'about' => 'About',	// TODO - Translation
+		'admin' => 'Administration',	// TODO - Translation
+		'archiving' => 'Archiving',	// TODO - Translation
+		'authentication' => 'Authentication',	// TODO - Translation
+		'check_install' => 'Installation checking',	// TODO - Translation
+		'configuration' => 'Configuration',	// TODO - Translation
+		'display' => 'Display',	// TODO - Translation
+		'extensions' => 'Extensions',	// TODO - Translation
+		'logs' => 'Logs',	// TODO - Translation
+		'queries' => 'User queries',	// TODO - Translation
+		'reading' => 'Reading',	// TODO - Translation
+		'search' => 'Search words or #tags',	// TODO - Translation
+		'sharing' => 'Sharing',	// TODO - Translation
+		'shortcuts' => 'Shortcuts',	// TODO - Translation
+		'stats' => 'Statistics',	// TODO - Translation
+		'system' => 'System configuration',	// TODO - Translation
+		'update' => 'Update',	// TODO - Translation
+		'user_management' => 'Manage users',	// TODO - Translation
+		'user_profile' => 'Profile',	// TODO - Translation
 	),
 	'pagination' => array(
-		'first' => 'First',	//TODO - Translation
-		'last' => 'Last',	//TODO - Translation
-		'load_more' => 'Load more articles',	//TODO - Translation
-		'mark_all_read' => 'Mark all as read',	//TODO - Translation
-		'next' => 'Next',	//TODO - Translation
-		'nothing_to_load' => 'There are no more articles',	//TODO - Translation
-		'previous' => 'Previous',	//TODO - Translation
+		'first' => 'First',	// TODO - Translation
+		'last' => 'Last',	// TODO - Translation
+		'load_more' => 'Load more articles',	// TODO - Translation
+		'mark_all_read' => 'Mark all as read',	// TODO - Translation
+		'next' => 'Next',	// TODO - Translation
+		'nothing_to_load' => 'There are no more articles',	// TODO - Translation
+		'previous' => 'Previous',	// TODO - Translation
 	),
 	'period' => array(
-		'days' => 'days',	//TODO - Translation
-		'hours' => 'hours',	//TODO - Translation
-		'months' => 'months',	//TODO - Translation
-		'weeks' => 'weeks',	//TODO - Translation
-		'years' => 'years',	//TODO - Translation
+		'days' => 'days',	// TODO - Translation
+		'hours' => 'hours',	// TODO - Translation
+		'months' => 'months',	// TODO - Translation
+		'weeks' => 'weeks',	// TODO - Translation
+		'years' => 'years',	// TODO - Translation
 	),
 	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'gnusocial' => 'GNU social',
-		'jdh' => 'Journal du hacker',
-		'Known' => 'Known based sites',
-		'lemmy' => 'Lemmy',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
-		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
-		'print' => 'Print',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag v1',
-		'wallabagv2' => 'wallabag v2',
+		'blogotext' => 'Blogotext',	// TODO - Translation
+		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'email' => 'Email',	// TODO - Translation
+		'facebook' => 'Facebook',	// TODO - Translation
+		'gnusocial' => 'GNU social',	// TODO - Translation
+		'jdh' => 'Journal du hacker',	// TODO - Translation
+		'Known' => 'Known based sites',	// TODO - Translation
+		'lemmy' => 'Lemmy',	// TODO - Translation
+		'linkedin' => 'LinkedIn',	// TODO - Translation
+		'mastodon' => 'Mastodon',	// TODO - Translation
+		'movim' => 'Movim',	// TODO - Translation
+		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pocket' => 'Pocket',	// TODO - Translation
+		'print' => 'Print',	// TODO - Translation
+		'shaarli' => 'Shaarli',	// TODO - Translation
+		'twitter' => 'Twitter',	// TODO - Translation
+		'wallabag' => 'wallabag v1',	// TODO - Translation
+		'wallabagv2' => 'wallabag v2',	// TODO - Translation
 	),
 	'short' => array(
-		'attention' => 'Warning!',	//TODO - Translation
-		'blank_to_disable' => 'Leave blank to disable',	//TODO - Translation
-		'by_author' => 'By:',	//TODO - Translation
-		'by_default' => 'By default',	//TODO - Translation
-		'damn' => 'Damn!',	//TODO - Translation
-		'default_category' => 'Uncategorized',	//TODO - Translation
-		'no' => 'No',	//TODO - Translation
-		'not_applicable' => 'Not available',	//TODO - Translation
-		'ok' => 'Ok!',	//TODO - Translation
-		'or' => 'or',	//TODO - Translation
-		'yes' => 'Yes',	//TODO - Translation
+		'attention' => 'Warning!',	// TODO - Translation
+		'blank_to_disable' => 'Leave blank to disable',	// TODO - Translation
+		'by_author' => 'By:',	// TODO - Translation
+		'by_default' => 'By default',	// TODO - Translation
+		'damn' => 'Damn!',
+		'default_category' => 'Uncategorized',	// TODO - Translation
+		'no' => 'No',	// TODO - Translation
+		'not_applicable' => 'Not available',	// TODO - Translation
+		'ok' => 'Ok!',	// TODO - Translation
+		'or' => 'or',	// TODO - Translation
+		'yes' => 'Yes',	// TODO - Translation
 	),
 );

app/i18n/ru/index.php

@@ -2,65 +2,65 @@
 
 return array(
 	'about' => array(
-		'_' => 'About',	//TODO - Translation
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	//TODO - Translation
-		'bugs_reports' => 'Bugs reports',	//TODO - Translation
-		'credits' => 'Credits',	//TODO - Translation
-		'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',	//TODO - Translation
-		'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="https://github.com/LeedRSS/Leed">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',	//TODO - Translation
-		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',	//TODO - Translation
-		'license' => 'License',	//TODO - Translation
-		'project_website' => 'Project website',	//TODO - Translation
-		'title' => 'About',	//TODO - Translation
-		'version' => 'Version',	//TODO - Translation
-		'website' => 'Website',	//TODO - Translation
-	),
-	'tos' => array(
-		'title' => 'Terms of Service', // TODO - Translation
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
+		'bugs_reports' => 'Bugs reports',	// TODO - Translation
+		'credits' => 'Credits',	// TODO - Translation
+		'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',	// TODO - Translation
+		'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="https://github.com/LeedRSS/Leed">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',	// TODO - Translation
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',	// TODO - Translation
+		'license' => 'License',	// TODO - Translation
+		'project_website' => 'Project website',	// TODO - Translation
+		'title' => 'About',	// TODO - Translation
+		'version' => 'Version',	// TODO - Translation
+		'website' => 'Website',	// TODO - Translation
+		'_' => 'About',	// TODO - Translation
 	),
 	'feed' => array(
-		'add' => 'You may add some feeds.',	//TODO - Translation
-		'empty' => 'There is no article to show.',	//TODO - Translation
-		'rss_of' => 'RSS feed of %s',	//TODO - Translation
-		'title' => 'Your RSS feeds',	//TODO - Translation
-		'title_global' => 'Global view',	//TODO - Translation
-		'title_fav' => 'Your favourites',	//TODO - Translation
+		'add' => 'You may add some feeds.',	// TODO - Translation
+		'empty' => 'There is no article to show.',	// TODO - Translation
+		'rss_of' => 'RSS feed of %s',	// TODO - Translation
+		'title' => 'Your RSS feeds',	// TODO - Translation
+		'title_fav' => 'Your favourites',	// TODO - Translation
+		'title_global' => 'Global view',	// TODO - Translation
 	),
 	'log' => array(
-		'_' => 'Logs',
-		'clear' => 'Clear the logs',	//TODO - Translation
-		'empty' => 'Log file is empty',	//TODO - Translation
-		'title' => 'Logs',	//TODO - Translation
+		'clear' => 'Clear the logs',	// TODO - Translation
+		'empty' => 'Log file is empty',	// TODO - Translation
+		'title' => 'Logs',	// TODO - Translation
+		'_' => 'Logs',	// TODO - Translation
 	),
 	'menu' => array(
-		'about' => 'About FreshRSS',
-		'add_query' => 'Add a query',
-		'before_one_day' => 'Before one day',
-		'before_one_week' => 'Before one week',
-		'favorites' => 'Favourites (%s)',
-		'global_view' => 'Global view',
-		'main_stream' => 'Main stream',
-		'mark_all_read' => 'Mark all as read',
-		'mark_cat_read' => 'Mark category as read',
-		'mark_feed_read' => 'Mark feed as read',
-		'mark_selection_unread' => 'Mark selection as unread',	//TODO - Translation
-		'newer_first' => 'Newer first',	//TODO - Translation
-		'non-starred' => 'Show all but favorites',	//TODO - Translation
-		'normal_view' => 'Normal view',	//TODO - Translation
-		'older_first' => 'Oldest first',	//TODO - Translation
-		'queries' => 'User queries',	//TODO - Translation
-		'read' => 'Show only read',	//TODO - Translation
-		'reader_view' => 'Reading view',	//TODO - Translation
-		'rss_view' => 'RSS feed',	//TODO - Translation
-		'search_short' => 'Search',	//TODO - Translation
-		'starred' => 'Show only favorites',	//TODO - Translation
-		'stats' => 'Statistics',	//TODO - Translation
-		'subscription' => 'Subscriptions management',
-		'tags' => 'My labels',	//TODO - Translation
-		'unread' => 'Show only unread',	//TODO - Translation
+		'about' => 'About FreshRSS',	// TODO - Translation
+		'add_query' => 'Add a query',	// TODO - Translation
+		'before_one_day' => 'Before one day',	// TODO - Translation
+		'before_one_week' => 'Before one week',	// TODO - Translation
+		'favorites' => 'Favourites (%s)',	// TODO - Translation
+		'global_view' => 'Global view',	// TODO - Translation
+		'main_stream' => 'Main stream',	// TODO - Translation
+		'mark_all_read' => 'Mark all as read',	// TODO - Translation
+		'mark_cat_read' => 'Mark category as read',	// TODO - Translation
+		'mark_feed_read' => 'Mark feed as read',	// TODO - Translation
+		'mark_selection_unread' => 'Mark selection as unread',	// TODO - Translation
+		'newer_first' => 'Newer first',	// TODO - Translation
+		'non-starred' => 'Show all but favorites',
+		'normal_view' => 'Normal view',	// TODO - Translation
+		'older_first' => 'Oldest first',	// TODO - Translation
+		'queries' => 'User queries',	// TODO - Translation
+		'read' => 'Show only read',
+		'reader_view' => 'Reading view',	// TODO - Translation
+		'rss_view' => 'RSS feed',	// TODO - Translation
+		'search_short' => 'Search',	// TODO - Translation
+		'starred' => 'Show only favorites',
+		'stats' => 'Statistics',	// TODO - Translation
+		'subscription' => 'Subscriptions management',	// TODO - Translation
+		'tags' => 'My labels',	// TODO - Translation
+		'unread' => 'Show only unread',
 	),
-	'share' => 'Share',
+	'share' => 'Share',	// TODO - Translation
 	'tag' => array(
-		'related' => 'Article tags',	//TODO - Translation
+		'related' => 'Article tags',	// TODO - Translation
+	),
+	'tos' => array(
+		'title' => 'Terms of Service',	// TODO - Translation
 	),
 );

app/i18n/ru/install.php

@@ -3,7 +3,7 @@
 return array(
 	'action' => array(
 		'finish' => 'Завершить установку',
-		'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу.',
+		'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить	к следующему этапу.',
 		'keep_install' => 'Сохранить предыдущую установку',
 		'next_step' => 'Перейти к следующему этапу',
 		'reinstall' => 'Переустановить FreshRSS',
@@ -17,20 +17,19 @@ return array(
 		'type' => 'Метод аутентификации',
 	),
 	'bdd' => array(
-		'_' => 'База данных',
 		'conf' => array(
-			'_' => 'Конфигурация базы данныхDatabase configuration',
 			'ko' => 'Проверьте конфигурацию базы данных.',
 			'ok' => 'Конфигурация базы данных сохранена.',
+			'_' => 'Конфигурация базы данныхDatabase configuration',
 		),
 		'host' => 'Хост',
 		'password' => 'Пароль базы данных',
 		'prefix' => 'Префикс таблицы',
 		'type' => 'Тип базы данных',
 		'username' => 'Имя пользователя базы данных',
+		'_' => 'База данных',
 	),
 	'check' => array(
-		'_' => 'Проверки',
 		'already_installed' => 'Обнаружена предыдущая установка FreshRSS!',
 		'cache' => array(
 			'nok' => 'Проверьте права доступа к папке <em>./data/cache</em> . Сервер HTTP должен иметь права на запись в эту папку.',
@@ -65,12 +64,12 @@ return array(
 			'ok' => 'Ваш HTTP REFERER известен и соотвествует вашему серверу.',
 		),
 		'json' => array(
-			'nok' => 'Cannot find a recommended library to parse JSON.',	//TODO - Translation
-			'ok' => 'You have a recommended library to parse JSON.',	//TODO - Translation
+			'nok' => 'Cannot find a recommended library to parse JSON.',	// TODO - Translation
+			'ok' => 'You have a recommended library to parse JSON.',	// TODO - Translation
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'У вас не установлен фрейворк Minz.',
@@ -90,34 +89,35 @@ return array(
 		),
 		'users' => array(
 			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
-			'ok' => 'Права на папку users  в порядке.',
+			'ok' => 'Права на папку users в порядке.',
 		),
 		'xml' => array(
-			'nok' => 'Cannot find the required library to parse XML.',
-			'ok' => 'You have the required library to parse XML.',
+			'nok' => 'Cannot find the required library to parse XML.',	// TODO - Translation
+			'ok' => 'You have the required library to parse XML.',	// TODO - Translation
 		),
+		'_' => 'Проверки',
 	),
 	'conf' => array(
-		'_' => 'Общие настройки',
 		'ok' => 'Общие настройки были сохранены.',
+		'_' => 'Общие настройки',
 	),
 	'congratulations' => 'Поздравляем!',
 	'default_user' => 'Имя пользователя по умолчанию <small>(максимум 16 латинских букв и/или цифр)</small>',
 	'delete_articles_after' => 'Удалять статьи после',
-	'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить  к следующему этапу..',
+	'fix_errors_before' => 'Пожалуйста, исправьте ошибки прежде чем переходить	к следующему этапу..',
 	'javascript_is_better' => 'FreshRSS принесёт больше удовольствия, если включить JavaScript',
 	'js' => array(
 		'confirm_reinstall' => 'Переустанавливая FreshRSS, вы потеряете предыдущую конфигурацию. Вы хотите продолжить?',
 	),
 	'language' => array(
-		'_' => 'Язык',
 		'choose' => 'Выберите язык для FreshRSS',
 		'defined' => 'Язык выбран.',
+		'_' => 'Язык',
 	),
 	'not_deleted' => 'Что-то пошло не так; удалите файл <em>%s</em> вручную.',
 	'ok' => 'Установка успешна.',
 	'step' => '%d этап',
 	'steps' => 'Этапы',
-	'title' => 'Установка · FreshRSS',
 	'this_is_the_end' => 'Это конец',
+	'title' => 'Установка · FreshRSS',
 );

app/i18n/ru/sub.php

@@ -2,103 +2,103 @@
 
 return array(
 	'api' => array(
-		'documentation' => 'Copy the following URL to use it within an external tool.',	//TODO - Translation
-		'title' => 'API',	//TODO - Translation
+		'documentation' => 'Copy the following URL to use it within an external tool.',	// TODO - Translation
+		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	//TODO - Translation
-		'label' => 'Subscribe',	//TODO - Translation
-		'title' => 'Bookmarklet',	//TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'label' => 'Subscribe',	// TODO - Translation
+		'title' => 'Bookmarklet',	// TODO - Translation
 	),
 	'category' => array(
-		'_' => 'Category',	//TODO - Translation
-		'add' => 'Add a category',	//TODO - Translation
-		'archiving' => 'Archivage',	//TODO - Translation
-		'empty' => 'Empty category',	//TODO - Translation
-		'information' => 'Information',	//TODO - Translation
-		'new' => 'New category',	//TODO - Translation
-		'position' => 'Display position',	//TODO - Translation
-		'position_help' => 'To control category sort order',	//TODO - Translation
-		'title' => 'Title',	//TODO - Translation
+		'add' => 'Add a category',	// TODO - Translation
+		'archiving' => 'Archivage',
+		'empty' => 'Empty category',	// TODO - Translation
+		'information' => 'Information',	// TODO - Translation
+		'new' => 'New category',	// TODO - Translation
+		'position' => 'Display position',	// TODO - Translation
+		'position_help' => 'To control category sort order',	// TODO - Translation
+		'title' => 'Title',	// TODO - Translation
+		'_' => 'Category',	// TODO - Translation
 	),
 	'feed' => array(
-		'add' => 'Add a RSS feed',	//TODO - Translation
-		'advanced' => 'Advanced',	//TODO - Translation
-		'archiving' => 'Archivage',	//TODO - Translation
+		'add' => 'Add a RSS feed',	// TODO - Translation
+		'advanced' => 'Advanced',	// TODO - Translation
+		'archiving' => 'Archivage',
 		'auth' => array(
-			'configuration' => 'Login',	//TODO - Translation
-			'help' => 'Connection allows to access HTTP protected RSS feeds',	//TODO - Translation
-			'http' => 'HTTP Authentication',	//TODO - Translation
-			'password' => 'HTTP password',	//TODO - Translation
-			'username' => 'HTTP username',	//TODO - Translation
+			'configuration' => 'Login',	// TODO - Translation
+			'help' => 'Connection allows to access HTTP protected RSS feeds',
+			'http' => 'HTTP Authentication',	// TODO - Translation
+			'password' => 'HTTP password',	// TODO - Translation
+			'username' => 'HTTP username',	// TODO - Translation
 		),
-		'clear_cache' => 'Always clear cache',	//TODO - Translation
-		'css_help' => 'Retrieves truncated RSS feeds (caution, requires more time!)',	//TODO - Translation
-		'css_path' => 'Articles CSS path on original website',	//TODO - Translation
-		'description' => 'Description',	//TODO - Translation
-		'empty' => 'This feed is empty. Please verify that it is still maintained.',	//TODO - Translation
-		'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',	//TODO - Translation
+		'clear_cache' => 'Always clear cache',	// TODO - Translation
+		'css_help' => 'Retrieves truncated RSS feeds (caution, requires more time!)',	// TODO - Translation
+		'css_path' => 'Articles CSS path on original website',	// TODO - Translation
+		'description' => 'Description',	// TODO - Translation
+		'empty' => 'This feed is empty. Please verify that it is still maintained.',	// TODO - Translation
+		'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
 		'filteractions' => array(
-			'_' => 'Filter actions',	//TODO - Translation
-			'help' => 'Write one search filter per line.',	//TODO - Translation
+			'help' => 'Write one search filter per line.',	// TODO - Translation
+			'_' => 'Filter actions',	// TODO - Translation
 		),
-		'information' => 'Information',	//TODO - Translation
-		'keep_min' => 'Minimum number of articles to keep',	//TODO - Translation
-		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',	//TODO - Translation
-		'mute' => 'mute',	//TODO - Translation
-		'no_selected' => 'No feed selected.',	//TODO - Translation
-		'number_entries' => '%d articles',	//TODO - Translation
+		'information' => 'Information',	// TODO - Translation
+		'keep_min' => 'Minimum number of articles to keep',	// TODO - Translation
+		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',	// TODO - Translation
+		'mute' => 'mute',	// TODO - Translation
+		'no_selected' => 'No feed selected.',	// TODO - Translation
+		'number_entries' => '%d articles',	// TODO - Translation
 		'priority' => array(
-			'_' => 'Visibility',	//TODO - Translation
-			'archived' => 'Do not show (archived)',	//TODO - Translation
-			'main_stream' => 'Show in main stream',	//TODO - Translation
-			'normal' => 'Show in its category',	//TODO - Translation
+			'archived' => 'Do not show (archived)',	// TODO - Translation
+			'main_stream' => 'Show in main stream',	// TODO - Translation
+			'normal' => 'Show in its category',	// TODO - Translation
+			'_' => 'Visibility',	// TODO - Translation
 		),
-		'websub' => 'Instant notification with WebSub',	//TODO - Translation
 		'show' => array(
-			'all' => 'Show all feeds',	//TODO - Translation
-			'error' => 'Show only feeds with error',	//TODO - Translation
+			'all' => 'Show all feeds',	// TODO - Translation
+			'error' => 'Show only feeds with error',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	//TODO - Translation
+			'error' => 'Showing only feeds with error',	// TODO - Translation
 		),
-		'ssl_verify' => 'Verify SSL security',	//TODO - Translation
-		'stats' => 'Statistics',	//TODO - Translation
-		'think_to_add' => 'You may add some feeds.',	//TODO - Translation
-		'timeout' => 'Timeout in seconds',	//TODO - Translation
-		'title' => 'Title',	//TODO - Translation
-		'title_add' => 'Add a RSS feed',	//TODO - Translation
-		'ttl' => 'Do not automatically refresh more often than',	//TODO - Translation
-		'url' => 'Feed URL',	//TODO - Translation
-		'validator' => 'Check the validity of the feed',	//TODO - Translation
-		'website' => 'Website URL',	//TODO - Translation
+		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
+		'stats' => 'Statistics',	// TODO - Translation
+		'think_to_add' => 'You may add some feeds.',	// TODO - Translation
+		'timeout' => 'Timeout in seconds',	// TODO - Translation
+		'title' => 'Title',	// TODO - Translation
+		'title_add' => 'Add a RSS feed',	// TODO - Translation
+		'ttl' => 'Do not automatically refresh more often than',	// TODO - Translation
+		'url' => 'Feed URL',	// TODO - Translation
+		'validator' => 'Check the validity of the feed',	// TODO - Translation
+		'website' => 'Website URL',	// TODO - Translation
+		'websub' => 'Instant notification with WebSub',	// TODO - Translation
 	),
 	'firefox' => array(
-		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
-		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
-		'title' => 'Firefox feed reader',	//TODO - Translation
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	// TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	// TODO - Translation
+		'title' => 'Firefox feed reader',	// TODO - Translation
 	),
 	'import_export' => array(
-		'export' => 'Export',	//TODO - Translation
-		'export_opml' => 'Export list of feeds (OPML)',	//TODO - Translation
-		'export_starred' => 'Export your favourites',	//TODO - Translation
-		'export_labelled' => 'Export your labelled articles',	//TODO
-		'feed_list' => 'List of %s articles',	//TODO - Translation
-		'file_to_import' => 'File to import<br />(OPML, JSON or ZIP)',	//TODO - Translation
-		'file_to_import_no_zip' => 'File to import<br />(OPML or JSON)',	//TODO - Translation
-		'import' => 'Import',	//TODO - Translation
-		'starred_list' => 'List of favourite articles',	//TODO - Translation
-		'title' => 'Import / export',	//TODO - Translation
+		'export' => 'Export',	// TODO - Translation
+		'export_labelled' => 'Export your labelled articles',	// TODO - Translation
+		'export_opml' => 'Export list of feeds (OPML)',	// TODO - Translation
+		'export_starred' => 'Export your favourites',	// TODO - Translation
+		'feed_list' => 'List of %s articles',	// TODO - Translation
+		'file_to_import' => 'File to import<br />(OPML, JSON or ZIP)',	// TODO - Translation
+		'file_to_import_no_zip' => 'File to import<br />(OPML or JSON)',	// TODO - Translation
+		'import' => 'Import',	// TODO - Translation
+		'starred_list' => 'List of favourite articles',	// TODO - Translation
+		'title' => 'Import / export',	// TODO - Translation
 	),
 	'menu' => array(
-		'bookmark' => 'Subscribe (FreshRSS bookmark)',	//TODO - Translation
-		'import_export' => 'Import / export',	//TODO - Translation
-		'subscription_management' => 'Subscriptions management',	//TODO - Translation
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'bookmark' => 'Subscribe (FreshRSS bookmark)',	// TODO - Translation
+		'import_export' => 'Import / export',	// TODO - Translation
+		'subscription_management' => 'Subscriptions management',	// TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 	'title' => array(
-		'_' => 'Subscriptions management',	//TODO - Translation
-		'feed_management' => 'RSS feeds management',	//TODO - Translation
-		'subscription_tools' => 'Subscription tools',	//TODO - Translation
+		'feed_management' => 'RSS feeds management',	// TODO - Translation
+		'subscription_tools' => 'Subscription tools',	// TODO - Translation
+		'_' => 'Subscriptions management',	// TODO - Translation
 	),
 );

app/i18n/ru/user.php

@@ -3,35 +3,35 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.', //TODO - Translation
-			'required' => 'The email address is required.', //TODO - Translation
+			'invalid' => 'The email address is invalid.',	// TODO - Translation
+			'required' => 'The email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
-			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.', //TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.', //TODO - Translation
+			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //TODO - Translation
-				'email_sent' => 'An email has been sent to your address.', //TODO - Translation
-				'error' => 'The email address failed to be validated.', //TODO - Translation
-				'ok' => 'The email address has been validated.', //TODO - Translation
-				'unneccessary' => 'The email address was already validated.', //TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.', //TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
+				'error' => 'The email address failed to be validated.',	// TODO - Translation
+				'ok' => 'The email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
-			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
-			'resend_email' => 'Resend the email', //TODO - Translation
-			'title' => 'Email address validation', //TODO - Translation
-		),
-	),
-	'tos' => array(
-		'feedback' => array(
-			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
+			'resend_email' => 'Resend the email',	// TODO - Translation
+			'title' => 'Email address validation',	// TODO - Translation
 		),
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'title' => 'You need to validate your account', //TODO - Translation
-			'welcome' => 'Welcome %s,', //TODO - Translation
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'title' => 'You need to validate your account',	// TODO - Translation
+			'welcome' => 'Welcome %s,',	// TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.',	// TODO - Translation
 		),
 	),
 );

app/i18n/sk/admin.php

@@ -83,9 +83,9 @@ return array(
 			'ok' => 'Našiel sa PDO a aspoň jeden z podporovaných ovládačov (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'_' => 'Inštalácia PHP',
 			'nok' => 'Vaša verzia PHP je %s, ale FreshRSS vyžaduje minimálne verziu %s.',
 			'ok' => 'Vaša verzia PHP %s je kompatibilná s FreshRSS.',
+			'_' => 'Inštalácia PHP',
 		),
 		'tables' => array(
 			'nok' => 'V databáze chýba jedna alebo viacero tabuliek.',
@@ -116,8 +116,8 @@ return array(
 		'name' => 'Názov',
 		'no_configure_view' => 'Toto rozšírenie nemá nastavenia.',
 		'system' => array(
-			'_' => 'Systémové rozšírenia',
 			'no_rights' => 'Systémové rozšírenie (nemáte oprávnenia)',
+			'_' => 'Systémové rozšírenia',
 		),
 		'title' => 'Rozšírenia',
 		'update' => 'Sú dostupné aktualizácie',
@@ -125,7 +125,6 @@ return array(
 		'version' => 'Verzia',
 	),
 	'stats' => array(
-		'_' => 'Štatistiky',
 		'all_feeds' => 'Všetky kanály',
 		'category' => 'Kategória',
 		'entry_count' => 'Počet položiek',
@@ -155,30 +154,32 @@ return array(
 		'status_unread' => 'Neprečítané',
 		'title' => 'Štatistiky',
 		'top_feed' => 'Top 10 kanálov',
+		'_' => 'Štatistiky',
 	),
 	'system' => array(
-		'_' => 'Nastavenia systému',
 		'auto-update-url' => 'Odkaz na aktualizačný server',
-		'instance-name' => 'Názov inštancie',
-		'max-categories' => 'Limit počtu kategórií pre používateľa',
-		'max-feeds' => 'Limit počtu kanálov pre používateľov',
 		'cookie-duration' => array(
 			'help' => 'v sekundách',
 			'number' => 'Dobra, počas ktorej ste prihlásený',
 		),
+		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'instance-name' => 'Názov inštancie',
+		'max-categories' => 'Limit počtu kategórií pre používateľa',
+		'max-feeds' => 'Limit počtu kanálov pre používateľov',
 		'registration' => array(
 			'help' => '0 znamená žiadny limit počtu účtov',
 			'number' => 'Maximálny počt účtov',
 		),
+		'_' => 'Nastavenia systému',
 	),
 	'update' => array(
-		'_' => 'Aktualizácia systému',
 		'apply' => 'Použiť',
 		'check' => 'Skontrolovať aktualizácie',
 		'current_version' => 'Vaša aktuálna verzia FreshRSS: %s',
 		'last' => 'Posledná kontrola: %s',
 		'none' => 'Žiadna nová aktualizácia',
 		'title' => 'Aktualizácia systému',
+		'_' => 'Aktualizácia systému',
 	),
 	'user' => array(
 		'articles_and_size' => '%s článkov (%s)',
@@ -187,7 +188,7 @@ return array(
 		'create' => 'Vytvoriť nového používateľa',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Zmazať používateľa',
-		'feed_count' => 'Feeds',	//TODO - Translation
+		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Jazyk',
 		'list' => 'User list',	// TODO - Translation
 		'number' => 'Je vytvorený používateľ: %d',
@@ -197,8 +198,8 @@ return array(
 		'selected' => 'Označený používateľ',
 		'title' => 'Správa používateľov',
 		'update_users' => 'Sktualizovať používateľov',
-		'user_list' => 'Zoznam používateľov',
 		'username' => 'Používateľské meno',
 		'users' => 'Používatelia',
+		'user_list' => 'Zoznam používateľov',
 	),
 );

app/i18n/sk/conf.php

@@ -2,19 +2,26 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archivovanie',
-		'advanced' => 'Pokročilé',
 		'delete_after' => 'Vymazať články po',
+		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'Viac možností nájdete v nastaveniach kanála',
+		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
+		'keep_labels' => 'Never delete labels',	// TODO - Translation
+		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Minimálny počet článkov kanála na zachovanie',
+		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Optimalizovať databázu',
 		'optimize_help' => 'Občas vykonajte na zmenšenie veľkosti databázy',
+		'policy' => 'Purge policy',	// TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	// TODO - Translation
 		'purge_now' => 'Vyčistiť teraz',
 		'title' => 'Archivovanie',
 		'ttl' => 'Neaktualizovať častejšie ako',
+		'_' => 'Archivovanie',
 	),
 	'display' => array(
-		'_' => 'Zobrazenie',
 		'icon' => array(
 			'bottom_line' => 'Spodný riadok',
 			'display_authors' => 'Autori',
@@ -39,21 +46,22 @@ return array(
 			'no_limit' => 'Bez obmedzenia',
 			'thin' => 'Úzka',
 		),
+		'_' => 'Zobrazenie',
 	),
 	'profile' => array(
-		'_' => 'Správca profilu',
-		'api' => 'API management', // TODO - Translation
+		'api' => 'API management',	// TODO - Translation
 		'delete' => array(
-			'_' => 'Vymazanie účtu',
 			'warn' => 'Váš účet a všetky údaje v ňom budú vymazané.',
+			'_' => 'Vymazanie účtu',
 		),
+		'email' => 'Email address',	// TODO - Translation
 		'password_api' => 'Heslo API<br /><small>(pre mobilné aplikácie)</small>',
 		'password_form' => 'Heslo<br /><small>(pre spôsob prihlásenia cez webový formulár)</small>',
 		'password_format' => 'Najmenej 7 znakov',
 		'title' => 'Profil',
+		'_' => 'Správca profilu',
 	),
 	'query' => array(
-		'_' => 'Dopyty používateľa',
 		'deprecated' => 'Tento dopyt už nie je platný. Kategória alebo kanál boli vymazané.',
 		'display' => 'Zobraziť výsledky dopytu používateľa',
 		'filter' => 'Použitý filter:',
@@ -61,8 +69,8 @@ return array(
 		'get_category' => 'Zobraziť kategóriu "%s"',
 		'get_favorite' => 'Zobraziť obľúbené články',
 		'get_feed' => 'Zobraziť kanál "%s"',
-		'no_filter' => 'Žiadny filter',
 		'none' => 'Zatiaľ ste nevytvorili používateľský dopyt.',
+		'no_filter' => 'Žiadny filter',
 		'number' => 'Dopyt číslo %d',
 		'order_asc' => 'Zobraziť staršie články hore',
 		'order_desc' => 'Zobraziť novšie články hore',
@@ -85,9 +93,9 @@ return array(
 		'state_14' => 'Zobraziť neprečítané články',
 		'state_15' => 'Zobraziť všetky články',
 		'title' => 'Používateľské dopyty',
+		'_' => 'Dopyty používateľa',
 	),
 	'reading' => array(
-		'_' => 'Čítanie',
 		'after_onread' => 'Po “Označiť všetko ako prečítané”,',
 		'articles_per_page' => 'Počet článkov na jednu stranu',
 		'auto_load_more' => 'Načítať ďalšie články dolu na stránke',
@@ -108,16 +116,16 @@ return array(
 			'when' => 'Označiť článok ako prečítaný…',
 		),
 		'show' => array(
-			'_' => 'Článkov na zobrazenie',
 			'adaptive' => 'Vyberte zobrazenie',
 			'all_articles' => 'Zobraziť všetky články',
 			'unread' => 'Zobraziť iba neprečítané',
+			'_' => 'Článkov na zobrazenie',
 		),
 		'sides_close_article' => 'Po kliknutí mimo textu článku sa článok zatvorí',
 		'sort' => array(
-			'_' => 'Poradie',
 			'newer_first' => 'Novšie hore',
 			'older_first' => 'Staršie hore',
+			'_' => 'Poradie',
 		),
 		'sticky_post' => 'Po otvorení posunúť článok hore',
 		'title' => 'Čítanie',
@@ -127,15 +135,14 @@ return array(
 			'normal' => 'Základné zobrazenie',
 			'reader' => 'Zobrazenie na čítanie',
 		),
+		'_' => 'Čítanie',
 	),
 	'sharing' => array(
-		'_' => 'Zdieľanie',
 		'add' => 'Pridať spôsob zdieľania',
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'E-mail',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Viac informácií',
 		'print' => 'Tlač',
 		'remove' => 'Odstrániť spôsob zdieľania',
@@ -145,9 +152,9 @@ return array(
 		'title' => 'Zdieľanie',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'_' => 'Zdieľanie',
 	),
 	'shortcut' => array(
-		'_' => 'Skratky',
 		'article_action' => 'Akcie článku',
 		'auto_share' => 'Zdieľať',
 		'auto_share_help' => 'Ak je nastavený iba jeden spôsob zdieľania, použije sa. Inak si spôsoby zdieľania vyberá používateľ podľa čísla.',
@@ -179,6 +186,7 @@ return array(
 		'user_filter' => 'Použiť používateľské filtre',
 		'user_filter_help' => 'Ak je nastavený iba jeden spôsob zdieľania, použije sa. Inak si spôsoby zdieľania vyberá používateľ podľa čísla.',
 		'views' => 'Zobrazenia',
+		'_' => 'Skratky',
 	),
 	'user' => array(
 		'articles_and_size' => '%s článkov (%s)',

app/i18n/sk/feedback.php

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'admin' => array(
-		'optimization_complete' => 'Optimalizácia dokončená',
-	),
 	'access' => array(
 		'denied' => 'Na prístup k tejto stránke nemáte oprávnenie',
 		'not_found' => 'Hľadáte stránku, ktorá neexistuje',
 	),
+	'admin' => array(
+		'optimization_complete' => 'Optimalizácia dokončená',
+	),
 	'api' => array(
 		'password' => array(
-			'failed' => 'Your password cannot be modified', // TODO - Translation
-			'updated' => 'Your password has been modified', // TODO - Translation
+			'failed' => 'Your password cannot be modified',	// TODO - Translation
+			'updated' => 'Your password has been modified',	// TODO - Translation
 		),
 	),
 	'auth' => array(
@@ -44,9 +44,9 @@ return array(
 			'ko' => '%s sa nepodarilo povoliť. <a href="%s">Prečítajte si záznamy FreshRSS</a>, ak chcete poznať podrobnosti.',
 			'ok' => '%s je teraz povolený',
 		),
-		'no_access' => 'Nemáte prístup k %s',
 		'not_enabled' => '%s nie je povolený',
 		'not_found' => '%s neexistuje',
+		'no_access' => 'Nemáte prístup k %s',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => 'ZIP rozšírenie sa na vašom serveri nenachádza. Prosím, skúste exportovať súbory pojednom.',
@@ -72,10 +72,10 @@ return array(
 			'emptied' => 'Kategória bola vyprázdnená',
 			'error' => 'Nepodarilo sa aktualizovať kategóriu',
 			'name_exists' => 'Názov kategórie už existuje.',
-			'no_id' => 'Musíte zadať ID kategórie.',
-			'no_name' => 'Názov kategórie nemôže byť prázdny.',
 			'not_delete_default' => 'Nemôžete odstrániť prednastavenú kategóriu!',
 			'not_exist' => 'Kategória neexistuje!',
+			'no_id' => 'Musíte zadať ID kategórie.',
+			'no_name' => 'Názov kategórie nemôže byť prázdny.',
 			'over_max' => 'Dosiahli ste limit počtu kategórií (%d)',
 			'updated' => 'Kategória bola aktualizovaná.',
 		),
@@ -88,10 +88,10 @@ return array(
 			'error' => 'Kanál sa nepodarilo aktualizovať',
 			'internal_problem' => 'Kanál sa nepodarilo pridať. <a href="%s">Prečítajte si záznamy FreshRSS</a>, ak chcete poznať podrobnosti. Skúste pridať kanál pomocou <code>#force_feed</code> v odkaze (URL).',
 			'invalid_url' => 'Odkaz <em>%s</em> je neplatný',
+			'not_added' => 'Kanál <em>%s</em> sa nepodarilo pridať',
+			'no_refresh' => 'Žiadny kanál sa neaktualizoval…',
 			'n_actualized' => 'Počet aktualizovaných kanálov: %d',
 			'n_entries_deleted' => 'Počet vymazaných článkov: %d',
-			'no_refresh' => 'Žiadny kanál sa neaktualizoval…',
-			'not_added' => 'Kanál <em>%s</em> sa nepodarilo pridať',
 			'over_max' => 'Dosiahli ste limit počtu kanálov (%d)',
 			'updated' => 'Kanál bol aktualizovaný',
 		),
@@ -107,16 +107,16 @@ return array(
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'Používateľ %s bol vytvorený',
 			'error' => 'Používateľ %s nebol vytvorený',
+			'_' => 'Používateľ %s bol vytvorený',
 		),
 		'deleted' => array(
-			'_' => 'Používateľ %s bol vymazaný',
 			'error' => 'Používateľ %s nebol vymazaný',
+			'_' => 'Používateľ %s bol vymazaný',
 		),
 		'updated' => array(
-			'_' => 'Používateľ %s bol aktualizovaný',
 			'error' => 'Používateľ %s nebol aktualizovaný',
+			'_' => 'Používateľ %s bol aktualizovaný',
 		),
 	),
 );