Merge pull request #2186 from FreshRSS/dev1.13.0

FreshRSS 1.13.0

1 files changed, 70 insertions, 66 deletions

diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php
index 71f86357e..e0dfc405d 100644
--- a/app/i18n/he/admin.php
+++ b/app/i18n/he/admin.php
@@ -8,10 +8,10 @@ return array(
 		'form' => 'טופס אינטרנטי (מסורתי, דורש JavaScript)',
 		'http' => 'HTTP (למשתמשים מתקדמים עם HTTPS)',
 		'none' => 'ללא (מסוכן)',
-		'title' => 'Authentication', // @todo
+		'title' => 'Authentication',	//TODO - Translation
 		'title_reset' => 'איפוס אימות',
 		'token' => 'מחרוזת אימות',
-		'token_help' => 'Allows to access RSS output of the default user without authentication:', // @todo
+		'token_help' => 'Allows to access RSS output of the default user without authentication:',	//TODO - Translation
 		'type' => 'שיטת אימות',
 		'unsafe_autologin' => 'הרשאה להתחברות אוטומטית בפורמט: ',
 	),
@@ -21,12 +21,12 @@ return array(
 			'ok' => 'ההרשאות בתיקיית המטמון תקינות',
 		),
 		'categories' => array(
-			'nok' => 'Category table is bad configured.', // @todo
-			'ok' => 'Category table is ok.', // @todo
+			'nok' => 'Category table is bad configured.',	//TODO - Translation
+			'ok' => 'Category table is ok.',	//TODO - Translation
 		),
 		'connection' => array(
-			'nok' => 'Connection to the database cannot being established.', // @todo
-			'ok' => 'Connection to the database is ok.', // @todo
+			'nok' => 'Connection to the database cannot being established.',	//TODO - Translation
+			'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
+			'ok' => 'You have cURL extension.',	//TODO - Translation
 		),
 		'data' => array(
 			'nok' => 'יש לבדוק את ההרשאות בתיקייה <em>%s</em>. שרת הHTTP חייב להיות בעל הרשאות כתיבה.',
 			'ok' => 'ההרשאות בתיקיית הדאטא תקינות',
 		),
-		'database' => 'Database installation', // @todo
+		'database' => 'Database installation',	//TODO - Translation
 		'dom' => array(
 			'nok' => 'הספרייה הנדרשת לסיור ב DOM אינה מותקנת  (php-xml package)',
 			'ok' => 'הספרייה הנדרשת לסיור ב DOM מותקנת',
 		),
 		'entries' => array(
-			'nok' => 'Entry table is bad configured.', // @todo
-			'ok' => 'Entry table is ok.', // @todo
+			'nok' => 'Entry table is bad configured.',	//TODO - Translation
+			'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
+			'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
-			'ok' => 'Feed table is ok.', // @todo
+			'nok' => 'Feed table is bad configured.',	//TODO - Translation
+			'ok' => 'Feed table is ok.',	//TODO - Translation
 		),
 		'fileinfo' => array(
-			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).', // @todo
-			'ok' => 'You have the fileinfo library.', // @todo
+			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',	//TODO - Translation
+			'ok' => 'You have the fileinfo library.',	//TODO - Translation
 		),
-		'files' => 'File installation', // @todo
+		'files' => 'File installation',	//TODO - Translation
 		'json' => array(
-			'nok' => 'You lack JSON (php-json package).', // @todo
-			'ok' => 'You have JSON extension.', // @todo
+			'nok' => 'You lack JSON (php-json package).',	//TODO - Translation
+			'ok' => 'You have JSON extension.',	//TODO - Translation
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO
+			'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
+			'nok' => 'You lack the Minz framework.',	//TODO - Translation
 			'ok' => 'יש לכם את תשתית Minz',
 		),
 		'pcre' => array(
@@ -83,46 +83,46 @@ return array(
 			'ok' => 'PDO מותקן ולפחות אחד ממנהלי ההתקן הנתמכים מותקן (pdo_mysql, pdo_sqlite)',
 		),
 		'php' => array(
-			'_' => 'PHP installation', // @todo
+			'_' => 'PHP installation',	//TODO - Translation
 			'nok' => 'גירסת PHP שלכם היא %s אך FreshRSS דורש לפחות את גירסה %s',
 			'ok' => 'גירסת PHP שלכם היא %s, שתואמת ל FreshRSS',
 		),
 		'tables' => array(
-			'nok' => 'There is one or more lacking tables in the database.', // @todo
-			'ok' => 'Tables are existing in the database.', // @todo
+			'nok' => 'There is one or more lacking tables in the database.',	//TODO - Translation
+			'ok' => 'Tables are existing in the database.',	//TODO - Translation
 		),
-		'title' => 'Installation checking', // @todo
+		'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
-			'ok' => 'Permissions on tokens directory are good.', // @todo
+			'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
-			'ok' => 'Permissions on users directory are good.', // @todo
+			'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
-			'ok' => 'You have ZIP extension.', // @todo
+			'nok' => 'You lack ZIP extension (php-zip package).',	//TODO - Translation
+			'ok' => 'You have ZIP extension.',	//TODO - Translation
 		),
 	),
 	'extensions' => array(
-		'disabled' => 'Disabled', // @todo
-		'empty_list' => 'There is no installed extension', // @todo
-		'enabled' => 'Enabled', // @todo
-		'no_configure_view' => 'This extension cannot be configured.', // @todo
+		'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
 		'system' => array(
-			'_' => 'System extensions', // @todo
-			'no_rights' => 'System extension (you have no rights on it)', // @todo
-		),
-		'title' => 'Extensions', // @todo
-		'user' => 'User extensions', // @todo
-		'community' => 'Available community extensions', // @todo
-		'name' => 'Name', // @todo
-		'version' => 'Version', // @todo
-		'description' => 'Description', // @todo
-		'author' => 'Author', // @todo
-		'latest' => 'Installed', // @todo
-		'update' => 'Update available', // @todo
+			'_' => 'System extensions',	//TODO - Translation
+			'no_rights' => 'System extension (you have no rights on it)',	//TODO - Translation
+		),
+		'title' => 'Extensions',	//TODO - Translation
+		'update' => 'Update available',	//TODO - Translation
+		'user' => 'User extensions',	//TODO - Translation
+		'version' => 'Version',	//TODO - Translation
 	),
 	'stats' => array(
 		'_' => 'סטטיסטיקות',
@@ -131,9 +131,9 @@ return array(
 		'entry_count' => 'סכום המאמרים',
 		'entry_per_category' => 'מאמרים על פי קטגוריה',
 		'entry_per_day' => 'מספר מאמרים ליום (30 ימים אחרונים)',
-		'entry_per_day_of_week' => 'Per day of week (average: %.2f messages)', // @todo
-		'entry_per_hour' => 'Per hour (average: %.2f messages)', // @todo
-		'entry_per_month' => 'Per month (average: %.2f messages)', // @todo
+		'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' => 'הזנות על פי קטגוריה',
@@ -157,37 +157,41 @@ return array(
 		'top_feed' => 'עשרת ההזנות המובילות',
 	),
 	'system' => array(
-		'_' => 'System configuration', // @todo
-		'auto-update-url' => 'Auto-update server URL', // @todo
-		'instance-name' => 'Instance name', // @todo
-		'max-categories' => 'Categories per user limit', // @todo
-		'max-feeds' => 'Feeds per user limit', // @todo
+		'_' => 'System configuration', //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
+		),
+		'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
-			'number' => 'Max number of accounts', // @todo
+			'help' => '0 means that there is no account limit',	//TODO - Translation
+			'number' => 'Max number of accounts',	//TODO - Translation
 		),
 	),
 	'update' => array(
 		'_' => 'מערכת העדכון',
 		'apply' => 'החלת העדכון',
 		'check' => 'בדיקת עדכונים חדשים',
-		'current_version' => 'Your current version of FreshRSS is the %s.', // @todo
+		'current_version' => 'Your current version of FreshRSS is the %s.',	//TODO - Translation
 		'last' => 'תאריך בדיקה אחרון: %s',
 		'none' => 'אין עדכון להחלה',
 		'title' => 'מערכת העדכון',
 	),
 	'user' => array(
-		'articles_and_size' => '%s articles (%s)', // @todo
+		'articles_and_size' => '%s articles (%s)',	//TODO - Translation
 		'create' => 'יצירת משתמש חדש',
-		'delete_users' => 'Delete user', // TODO
+		'delete_users' => 'Delete user',	//TODO - Translation
 		'language' => 'שפה',
-		'number' => 'There is %d account created', // @todo
-		'numbers' => 'There are %d accounts created', // @todo
+		'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
-		'selected' => 'Selected user', // TODO
-		'title' => 'Manage users', // @todo
-		'update_users' => 'Update user', // TODO
+		'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' => 'רשימת משתמשים',
 		'username' => 'שם משתמש',
 		'users' => 'משתמשים',