From b790b160c4782405d3cec506a9775b3c4f1d8df1 Mon Sep 17 00:00:00 2001 From: Patrick Crandol Date: Sun, 28 Oct 2018 20:28:30 -0400 Subject: Add ID's to buttons in configure-feed Add ID's to be able to individually target buttons inside the configure feeds (Subscriptions Management & Import/Export) buttons. --- app/layout/aside_feed.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index ce029cfa0..7b1645ebd 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -12,8 +12,8 @@
- - + +
-- cgit v1.2.3 From 396c714df9894ed053030d8a9daedcf95c397960 Mon Sep 17 00:00:00 2001 From: Quentí <33203663+Quenty31@users.noreply.github.com> Date: Sun, 4 Nov 2018 13:46:08 +0100 Subject: [i18n] Add the Occitan locale (#2110) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create oc.php L27 : ajout de l’occitan * Create admin.php * Create conf.php * Create feedback.php * Create gen.php * Create index.php * Create install.php * Create sub.php * Delete conf.php * Create conf.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update gen.php * Update oc.php * Update admin.php * Update conf.php * Update feedback.php * Update gen.php * Update index.php * Update install.php * Update sub.php * Update oc.php --- app/i18n/cz/gen.php | 1 + app/i18n/de/gen.php | 1 + app/i18n/en/gen.php | 1 + app/i18n/es/gen.php | 1 + app/i18n/fr/gen.php | 1 + app/i18n/he/gen.php | 1 + app/i18n/it/gen.php | 1 + app/i18n/kr/gen.php | 1 + app/i18n/nl/gen.php | 1 + app/i18n/oc/admin.php | 194 +++++++++++++++++++++++++++++++++++++++++++++++ app/i18n/oc/conf.php | 183 ++++++++++++++++++++++++++++++++++++++++++++ app/i18n/oc/feedback.php | 115 ++++++++++++++++++++++++++++ app/i18n/oc/gen.php | 194 +++++++++++++++++++++++++++++++++++++++++++++++ app/i18n/oc/index.php | 61 +++++++++++++++ app/i18n/oc/install.php | 124 ++++++++++++++++++++++++++++++ app/i18n/oc/sub.php | 84 ++++++++++++++++++++ app/i18n/pt-br/gen.php | 1 + app/i18n/ru/gen.php | 1 + app/i18n/tr/gen.php | 1 + app/i18n/zh-cn/gen.php | 1 + cli/i18n/ignore/oc.php | 56 ++++++++++++++ 21 files changed, 1024 insertions(+) create mode 100644 app/i18n/oc/admin.php create mode 100644 app/i18n/oc/conf.php create mode 100644 app/i18n/oc/feedback.php create mode 100644 app/i18n/oc/gen.php create mode 100644 app/i18n/oc/index.php create mode 100644 app/i18n/oc/install.php create mode 100644 app/i18n/oc/sub.php create mode 100644 cli/i18n/ignore/oc.php (limited to 'app') diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php index b9a65f210..eab572be4 100644 --- a/app/i18n/cz/gen.php +++ b/app/i18n/cz/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php index 617b2a494..935ab6a75 100644 --- a/app/i18n/de/gen.php +++ b/app/i18n/de/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php index 9f7da55a5..9328a35ec 100644 --- a/app/i18n/en/gen.php +++ b/app/i18n/en/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php index fe3d62e2d..35a01c02d 100755 --- a/app/i18n/es/gen.php +++ b/app/i18n/es/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php index 1e1cef590..34395a380 100644 --- a/app/i18n/fr/gen.php +++ b/app/i18n/fr/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php index 26b8f99e6..64050dc4f 100644 --- a/app/i18n/he/gen.php +++ b/app/i18n/he/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php index ab17441e7..200ce813a 100644 --- a/app/i18n/it/gen.php +++ b/app/i18n/it/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/kr/gen.php b/app/i18n/kr/gen.php index 6a461bdac..f87f24b64 100644 --- a/app/i18n/kr/gen.php +++ b/app/i18n/kr/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php index fdc4338c3..f18da5c36 100644 --- a/app/i18n/nl/gen.php +++ b/app/i18n/nl/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php new file mode 100644 index 000000000..3bad14e7c --- /dev/null +++ b/app/i18n/oc/admin.php @@ -0,0 +1,194 @@ + array( + 'disabled' => 'Desactivada', + 'enabled' => 'Activada', + 'name' => 'Nom', + 'description' => 'Descripcion', + 'empty_list' => 'Cap d’extensions pas installadas', + 'no_configure_view' => 'Aquesta extension se pòt pas configurar.', + 'system' => array( + '_' => 'Extensions sistèma', + 'no_rights' => 'Extensions sistèma (contrarotlat per l’administrator)', + ), + 'title' => 'Extensions', + 'user' => 'Extensions utilizaire', + 'community' => 'Extensions utilizaires disponiblas', + 'version' => 'Version', + 'author' => 'Autor', + 'latest' => 'Installada', + 'update' => 'Mesa a jorn disponibla', + ), + 'stats' => array( + 'no_idle' => 'I a pas cap d’article inactiu !', + 'status_favorites' => 'Favorits', + 'status_read' => 'Legit', + '_' => 'Estatisticas', + 'all_feeds' => 'Totes los fluxes', + 'category' => 'Categoria', + 'entry_count' => 'Nombre d’articles', + 'entry_per_category' => 'Articles per categoria', + 'entry_per_day' => 'Nombre d’articles per jorn (30 darrièrs jorns)', + 'entry_per_day_of_week' => 'Per jorn de la setmana (mejana : %.2f messatges)', + 'entry_per_hour' => 'Per ora (mejana : %.2f messatges)', + 'entry_per_month' => 'Per mes (mejana : %.2f messatges)', + 'entry_repartition' => 'Reparticion dels articles', + 'feed' => 'Flux', + 'feed_per_category' => 'Fluxes per categoria', + 'idle' => 'Fluxes inactius', + 'main' => 'Estatisticas principalas', + 'main_stream' => 'Flux màger', + 'menu' => array( + 'idle' => 'Fluxes inactius', + 'main' => 'Estatisticas principalas', + 'repartition' => 'Reparticion dels articles', + ), + 'number_entries' => '%d articles', + 'percent_of_total' => '%% del total', + 'repartition' => 'Reparticion dels articles', + 'status_total' => 'Total', + 'status_unread' => 'Pas legits', + 'title' => 'Estatisticas', + 'top_feed' => 'Los dètz fluxes mai gròsses', + ), + 'system' => array( + '_' => 'Configuracion sistèma', + 'instance-name' => 'Nom de l’instància', + 'registration' => array( + 'number' => 'Nombre max de comptes', + 'help' => '0 vòl dire qu’i a pas cap de limita de compte', + ), + 'auto-update-url' => 'URL del servici de mesa a jorn', + 'max-categories' => 'Limita de categoria per utilizaire', + 'max-feeds' => 'Limita de fluxes per utilizaire', + ), + 'update' => array( + 'apply' => 'Aplicar', + 'none' => 'Cap d’actualizacion d’aplicar', + '_' => 'Sistèma de mesa a jorn', + 'check' => 'Verificar las mesas a jorn', + 'current_version' => 'Vòstra version actuala de FreshRSS es %s.', + 'last' => 'Darrièra verificacion : %s', + 'title' => 'Sistèma de mesa a jorn', + ), + 'user' => array( + 'delete_users' => 'Suprimir un utilizaire', + 'language' => 'Lenga', + 'password_format' => 'Almens 7 caractèrs', + 'selected' => 'Utilizaire seleccionat', + 'username' => 'Nom d’utilizaire', + 'users' => 'Utilizaires', + 'articles_and_size' => '%s articles (%s)', + 'create' => 'Crear un nòu utilizaire', + 'number' => '%d compte ja creat', + 'numbers' => '%d comptes ja creats', + 'password_form' => 'Senhal
(ex. : per la connexion via formulari)', + 'title' => 'Gestion dels utilizaires', + 'update_users' => 'Actualizar un utilizaire', + 'user_list' => 'Lista dels utilizaires', + ), + 'auth' => array( + 'none' => 'Cap (perilhós)', + 'allow_anonymous' => 'Autorizar la lectura anonima dels articles de l’utilizaire per defaut (%s)', + 'allow_anonymous_refresh' => 'Autorizar l’actualizacion anonime dels fluxes', + 'api_enabled' => 'Autorizar l’accès per API(necessari per las aplicacions mobil)', + 'form' => 'Formulari (tradicional, demanda JavaScript)', + 'http' => 'HTTP (per utilizaires avançats amb HTTPS)', + 'title' => 'Autentificacion', + 'title_reset' => 'Reïnicializacion de l’autentificacion', + 'token' => 'Geton d’autentificacion', + 'token_help' => 'Permetre l’accès a la sortida RSS de l’utilizaire per defaut sens cap d’autentificacion :', + 'type' => 'Mòde d’autentification', + 'unsafe_autologin' => 'Autorizar las connexions automaticas pas seguras al format : ', + ), + 'check_install' => array( + 'cache' => array( + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data/cache. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul cache son bons.', + ), + 'categories' => array( + 'nok' => 'La tabla “category” es mala configurada.', + 'ok' => 'La tabla category es corrèctament configurada.', + ), + 'connection' => array( + 'nok' => 'Connexion impossibla a la basa de donadas.', + 'ok' => 'La connexion a la basa de donadas es bona.', + ), + 'ctype' => array( + 'nok' => 'Impossible de trobar una bibliotèca per la verificacion del tipe de caractèrs (php-ctype).', + 'ok' => 'Avètz la bibliotèca per la verificacion del tipe de caractèrs (ctype).', + ), + 'curl' => array( + 'nok' => 'Impossible de trobar la bibliotèca cURL( paquet php-curl).', + 'ok' => 'Avètz la bibliotèca cURL.', + ), + 'data' => array( + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul repertòri data son bons.', + ), + 'database' => 'Installacion de la basa de donadas', + 'dom' => array( + 'nok' => 'Impossible de trobar una bibliotèca per percórrer lo DOM (paquet php-xml).', + 'ok' => 'Avètz la bibliotèca per percórrer lo DOM.', + ), + 'entries' => array( + 'nok' => 'La tabla entry es pas configurada coma cal.', + 'ok' => 'La tabla entry es corrèctament configurada.', + ), + 'favicons' => array( + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data/favicons. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul repertòri dels favicons son bons.', + ), + 'feeds' => array( + 'nok' => 'La tabla feed es pas configurada coma cal.', + 'ok' => 'La tabla feed es corrèctament configurada.', + ), + 'fileinfo' => array( + 'nok' => 'Avètz pas PHP fileinfo (paquet fileinfo).', + 'ok' => 'Avètz la bibliotèca fileinfo.', + ), + 'files' => 'Installacion dels fichièrs', + 'json' => array( + 'nok' => 'Avètz pas l’extension recomandada JSON (paquet php-json).', + 'ok' => 'Avètz l’exension recomandada JSON.', + ), + 'mbstring' => array( + 'nok' => 'Impossible de trobar la bibliotèca recomandada mbstring per Unicode.', + 'ok' => 'Avètz la bibliotèca recomandada mbstring per Unicode.', + ), + 'minz' => array( + 'nok' => 'Avètz pas la bibliotèca Minz.', + 'ok' => 'Avètz la bibliotèca Minz.', + ), + 'pcre' => array( + 'nok' => 'Impossible de trobar una bibliotèca per las expressions regulara (php-pcre).', + 'ok' => 'Avètz la bibliotèca per las expressions regularas (PCRE).', + ), + 'pdo' => array( + 'nok' => 'Impossible de trobar PDO o un dels drivers compatibles (pdo_mysql, pdo_sqlite, pdo_pgsql).', + '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.', + ), + 'tables' => array( + 'nok' => 'Manca una o mai tabla dins la basa de donadas.', + 'ok' => 'Las tablas que cal existisson ben dins la basa de donadas.', + ), + 'title' => 'Verificacion de l’installacion', + 'tokens' => array( + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data/tokens. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul repertòri dels getons son bons.', + ), + 'users' => array( + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data/users. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul repertòri dels utilizaires son bons.', + ), + 'zip' => array( + 'nok' => 'Avètz pas l’extension ZIP (paquet php-zip).', + 'ok' => 'Avètz l’exension ZIP.', + ), + ), +); diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php new file mode 100644 index 000000000..7b297805d --- /dev/null +++ b/app/i18n/oc/conf.php @@ -0,0 +1,183 @@ + array( + 'users' => 'Utilizaires', + 'articles_and_size' => '%s articles (%s)', + 'current' => 'Utilizaire actual', + 'is_admin' => 'es administrator', + ), + 'archiving' => array( + '_' => 'Archivar', + 'advanced' => 'Avançat', + 'delete_after' => 'Levar los articles aprèp', + 'help' => 'Mai d’opcions son disponiblas dins la configuracion individuala dels fluxes', + 'keep_history_by_feed' => 'Nombre minimum d’articles de servar per flux', + 'optimize' => 'Optimizar la basa de donada', + 'optimize_help' => 'De far de temps en temps per redusir la talha de la basa de donadas', + 'purge_now' => 'Purgar ara', + 'title' => 'Archivar', + 'ttl' => 'Actualizar pas automaticament mai sovent que', + ), + 'display' => array( + '_' => 'Afichatge', + 'icon' => array( + 'bottom_line' => 'Linha enbàs', + 'entry' => 'Icònas d’article', + 'publication_date' => 'Data de publicacion', + 'related_tags' => 'Etiquetas ligadas', + 'sharing' => 'Partatge', + 'top_line' => 'Linha amont', + ), + 'language' => 'Lenga', + 'notif_html5' => array( + 'seconds' => 'segondas (0 significa cap de timeout)', + 'timeout' => 'Temps d’afichatge de las notificacions HTML5', + ), + 'theme' => 'Tèma', + 'title' => 'Afichatge', + 'width' => array( + 'content' => 'Largor del contengut', + 'large' => 'Larga', + 'medium' => 'Mejana', + 'no_limit' => 'Cap de limit', + 'thin' => 'Fina', + ), + 'show_nav_buttons' => 'Mostrar los botons de navigacion', + ), + '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 :', + 'get_all' => 'Mostrar totes los articles', + '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.', + 'number' => 'Filtre n°%d', + 'order_asc' => 'Mostrar los articles mai ancians en primièr', + 'order_desc' => 'Mostrar los articles mai recents en primièr', + 'remove' => 'Levar lo filtre utilizaire', + 'search' => 'Recèrca de « %s »', + 'state_0' => 'Mostrar totes los articles', + 'state_1' => 'Mostrar los articles pas legits', + 'state_2' => 'Mostrar los articles pas legits', + 'state_3' => 'Mostrar totes los articles', + 'state_4' => 'Mostrar los articles favorits', + 'state_5' => 'Mostrar los articles legits e en favorits', + 'state_6' => 'Mostrar los articles pas legits e en favorit', + 'state_7' => 'Mostrar los articles favorits', + 'state_8' => 'Mostrar los articles pas en favorit', + 'state_9' => 'Mostrar los articles legits e pas en favorit', + 'state_10' => 'Mostrar los articles pas legits e pas en favorit', + 'state_11' => 'Mostrar los articles pas en favorit', + 'state_12' => 'Mostrar totes los articles', + 'state_13' => 'Mostrar los articles legits', + 'state_14' => 'Mostrar los articles pas legits', + 'state_15' => 'Mostrar totes los articles', + 'title' => 'Filtres utilizaire', + ), + 'profile' => array( + '_' => 'Gestion del perfil', + 'delete' => array( + '_' => 'Supression del compte', + 'warn' => 'Lo compte e totas las donadas ligadas seràn suprimits.', + ), + 'password_api' => 'Senhal API
(ex. : per las aplicacions mobil)', + 'password_form' => 'Senhal API
(ex. : per la connexion via formulari)', + 'password_format' => 'Almens 7 caractèrs', + 'title' => 'Pefil', + ), + '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', + 'auto_remove_article' => 'Rescondre los articles aprèp lectura', + 'mark_updated_article_unread' => 'Marcar los articles actualizats coma pas legits', + 'confirm_enabled' => 'Mostrar una confirmacion per las accions del tipe « o marcar tot coma legit »', + 'display_articles_unfolded' => 'Mostrar los articles desplegats per defaut', + 'display_categories_unfolded' => 'Mostrar las categorias plegadas per defaut', + 'hide_read_feeds' => 'Rescondre las categorias & fluxes sens articles pas legits (fonciona pas amb la configuracion « Mostrar totes los articles »)', + 'img_with_lazyload' => 'Utilizar lo mòde “cargament tardiu” per las imatges', + 'sides_close_article' => 'Clicar fòra de la zòna de tèxte tampa l’article', + 'jump_next' => 'sautar al vesin venent pas legit (flux o categoria)', + 'number_divided_when_reader' => 'Devisat per 2 dins la vista de lectura.', + 'read' => array( + 'article_open_on_website' => 'quand l’article es dobèrt sul site d’origina', + 'article_viewed' => 'quand l’article es mostrat', + 'scroll' => 'en davalant la pagina', + 'upon_reception' => 'en recebre un article novèl', + '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', + ), + 'sort' => array( + '_' => 'Òrdre de tria', + 'newer_first' => 'Mai recents en primièr', + 'older_first' => 'Mai ancians en primièr', + ), + 'title' => 'Lectura', + 'view' => array( + 'default' => 'Vista per defaut', + 'global' => 'Vista generala', + 'normal' => 'Vista normala', + 'reader' => 'Vista lectura', + ), + 'sticky_post' => 'Gardar l\'article amont quand es dobèrt', + ), + 'sharing' => array( + '_' => 'Partatge', + 'add' => 'Ajustar un metòde de partatge', + 'blogotext' => 'Blogotext', + 'diaspora' => 'Diaspora*', + 'email' => 'Corrièl', + 'facebook' => 'Facebook', + 'g+' => 'Google+', + 'more_information' => 'Mai d’informacions', + 'print' => 'Imprimir', + 'remove' => 'Suprimir lo metòde de partatge', + 'shaarli' => 'Shaarli', + 'share_name' => 'Nom del partatge de mostrar', + 'share_url' => 'URL del partatge d’utilizar', + 'title' => 'Partatge', + 'twitter' => 'Twitter', + 'wallabag' => 'wallabag', + ), + 'shortcut' => array( + '_' => 'Acorchis', + 'auto_share' => 'Partejar', + 'close_dropdown' => 'Tampar los menús', + 'collapse_article' => 'Replegar', + 'first_article' => 'Passar al primièr article', + 'focus_search' => 'Accedir a la recèrca', + 'mark_read' => 'Marcar coma legit', + 'mark_favorite' => 'Ajustar als favorits', + 'navigation' => 'Navigacion', + 'other_action' => 'Autras accions', + 'title' => 'Acorchis', + 'views' => 'Vistas', + 'article_action' => 'Accions ligadas a l\'article', + '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.', + 'global_view' => 'Passar a la vista generala', + 'help' => 'Mostrar la documentacion', + 'javascript' => 'Devètz activar lo Javascript per utilizar los acorchis', + 'last_article' => 'Passar al darrièr article', + 'load_more' => 'Cargar mai d’articles', + 'navigation_help' => 'Amb lo modificador «Shift», los acorchis de navigacion s’aplican als fluxes.
Amb lo modificador «Alt», los acorchis de navigacion s’aplican a las categorias.', + 'next_article' => 'Passar a l’article seguent', + 'normal_view' => 'Passar a la vista normala', + 'previous_article' => 'Passar a l’article precedent', + 'reading_view' => 'Passar a la vista lectura', + 'rss_view' => 'Dobrir la vista RSS dins un onglet novèl', + 'see_on_website' => 'Veire al site d’origina', + 'shift_for_all_read' => '+ shift per marcar los articles coma legits', + '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.', + ), +); diff --git a/app/i18n/oc/feedback.php b/app/i18n/oc/feedback.php new file mode 100644 index 000000000..225be119b --- /dev/null +++ b/app/i18n/oc/feedback.php @@ -0,0 +1,115 @@ + 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', + ), + 'auth' => array( + 'form' => array( + 'not_set' => 'Un problèma es aparegut pendent la configuracion del sistèma d’autentificacion. Tonatz ensajar ai tard.', + 'set' => 'Lo sistèma d’autentificacion per defaut es ara lo formulari.', + ), + 'login' => array( + 'invalid' => 'L’identificant es invalid', + 'success' => 'Sètz connectat', + ), + 'logout' => array( + 'success' => 'Sètz desconnectat', + ), + 'no_password_set' => 'Pas de senhal es pas configurat. Aquesta foncionalitat es pas disponibla.', + ), + 'conf' => array( + 'error' => 'Una error es apareguda pendent la salvagarda de la configuracion', + 'query_created' => 'Lo filtre « %s » es estat creat.', + 'shortcuts_updated' => 'Los acorchis son actualizats', + 'updated' => 'La configuracion es estada actualizada', + ), + 'extensions' => array( + 'already_enabled' => '%s es ja activada', + 'disable' => array( + 'ko' => '%s pòt pas èsser desactivada. Consultatz los jornals d’audit de FreshRSS logs per mai de detalhs.', + 'ok' => '%s es ara desactivada', + ), + 'enable' => array( + 'ko' => '%s pòt pas èsser activada. Consultatz los jornals d’audit de FreshRSS logs 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', + ), + '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.', + 'feeds_imported' => 'Vòstres fluxes son estats importats seràn actualizats en seguida', + 'feeds_imported_with_errors' => 'Vòstres fluxes son estats importats mas i a agut d’errors', + 'file_cannot_be_uploaded' => 'Telecargament del fichièr impossible', + 'no_zip_extension' => 'L\'extension es pas presenta sul servidor.', + 'zip_error' => 'Una error s’es producha pendent l’importacion del fichièr ZIP.', + ), + 'sub' => array( + 'actualize' => 'Actualizar', + 'articles' => array( + 'marked_read' => 'Los articles seleccionats son estats marcats coma legits.', + 'marked_unread' => 'Los articles seleccionats son estats marcats coma pas legits.', + ), + 'category' => array( + 'created' => 'La categoria « %s » es estada creada.', + 'deleted' => 'La categoria es estada suprimida.', + '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 !', + 'over_max' => 'Avètz atengut la limita de categoria (%d)', + 'updated' => 'La categoria es estada actualizada.', + ), + 'feed' => array( + 'actualized' => '%s es a jorn', + 'actualizeds' => 'Los fluxes son estats actualizats', + 'added' => 'Lo flux RSS %s es ajustat', + 'already_subscribed' => 'Seguissètz ja %s', + 'deleted' => 'Lo flux es suprimit', + 'error' => 'Error en actualizar', + 'internal_problem' => 'Lo flux pòt pas èsser ajustat. Consultatz los jornals d’audit de FreshRSS per ne saber mai. Podètz forçar l’apondon en ajustant #force_feed a l’URL.', + 'invalid_url' => 'L\'URL %s es invalida', + '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' => '%s a pas pogut èsser ajustat', + 'over_max' => 'Avètz atengut vòstra limita de fluxes (%d)', + 'updated' => 'Lo flux es actualizat', + ), + 'purge_completed' => 'Purga realizada (%s articles suprimits)', + ), + 'update' => array( + 'can_apply' => 'FreshRSS es per èsser mes a jorn en version %s.', + 'error' => 'La mesa a jorn a conegut un problèma : %s', + 'file_is_nok' => 'Nòva version %s disponibla, mas volgatz verificar los dreches sul repertòri %s. Lo servidor HTTP deu poder escriure dedins', + 'finished' => 'Mesa a jorn acabada !', + 'none' => 'Cap de mesa a jorn d’aplicar', + 'server_not_found' => 'Impossible de trobar lo servidor de mesa a jorn. [%s]', + ), + 'user' => array( + 'created' => array( + '_' => 'L’utilizaire %s es estat creat', + 'error' => 'L’utilizaire %s pòt pas èsser creat', + ), + 'deleted' => array( + '_' => 'L’utilizaire %s es estat suprimit', + 'error' => 'L’utilizaire %s pòt pas èsser suprimit', + ), + 'updated' => array( + '_' => 'L’utilizaire %s es estat actualizat', + 'error' => 'L’utilizaire %s es pas estat actualizat', + ), + ), + 'profile' => array( + 'error' => 'Impossible d’actualizar vòstre perfil', + 'updated' => 'Vòstre perfil es estat actualizat', + ), +); diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php new file mode 100644 index 000000000..cdeb43807 --- /dev/null +++ b/app/i18n/oc/gen.php @@ -0,0 +1,194 @@ + array( + 'cancel' => 'Anullar', + 'disable' => 'Desactivar', + 'enable' => 'Activar', + 'filter' => 'Filtre', + 'import' => 'Importar', + 'submit' => 'Mandar', + 'actualize' => 'Actualizar', + 'back_to_rss_feeds' => '← Tornar a vòstres fluxes RSS', + 'create' => 'Crear', + 'empty' => 'Voidar', + 'export' => 'Exportar', + 'manage' => 'Gerir', + 'mark_favorite' => 'Ajustar als favorits', + 'mark_read' => 'Marcar coma legit', + 'remove' => 'Levar', + 'see_website' => 'Veire lo site', + 'truncate' => 'Suprimir totes los articles', + 'update' => 'Actualizar', + ), + 'auth' => array( + 'email' => 'Adreça de corrièl', + 'logout' => 'Se desconnectar', + 'password' => array( + '_' => 'Senhal', + 'format' => 'Almens 7 caractèrs', + ), + 'username' => array( + '_' => 'Nom d’utilizaire', + 'admin' => 'Nom d’utilizaire administrator', + 'format' => '16 caractèrs alfanumerics maximum)', + ), + 'keep_logged_in' => 'Demorar connectat (%s jorns) ', + 'login' => 'Connexion', + 'registration' => array( + '_' => 'Compte nòu', + 'ask' => 'Crear un compte?', + 'title' => 'Creacion de compte', + ), + 'reset' => 'Reïnicializacion de l’autentificacion', + ), + 'menu' => array( + 'about' => 'A prepaus', + 'admin' => 'Administracion', + 'configuration' => 'Configuracion', + 'user_profile' => 'Perfil', + 'queries' => 'Filtres utilizaire', + 'stats' => 'Estatisticas', + 'archiving' => 'Archivar', + 'authentication' => 'Autentificacion', + 'check_install' => 'Verificacion de l’installacion', + 'display' => 'Afichatge', + 'extensions' => 'Extensions', + 'logs' => 'Jornals d’audit', + 'reading' => 'Lectura', + 'search' => 'Recercar de mots o d’#etiquetas', + 'sharing' => 'Partatge', + 'shortcuts' => 'Acorchis', + 'system' => 'Configuracion sistèma', + 'update' => 'Mesa a jorn', + 'user_management' => 'Gestion dels utilizaires', + ), + 'pagination' => array( + 'next' => 'Seguent', + 'previous' => 'Precedent', + 'first' => 'Debuta', + 'last' => 'Fin', + 'load_more' => 'Cargar mai d’articles', + 'mark_all_read' => 'O marcar tot coma legit', + 'nothing_to_load' => 'I a pas mai d’articles', + ), + 'share' => array( + 'email' => 'Corrièl', + 'mastodon' => 'Mastodon', + 'blogotext' => 'Blogotext', + 'diaspora' => 'Diaspora*', + 'facebook' => 'Facebook', + 'g+' => 'Google+', + 'gnusocial' => 'GNU social', + 'jdh' => 'Journal du hacker', + 'Known' => 'Sites basats sus Known', + 'linkedin' => 'LinkedIn', + 'movim' => 'Movim', + 'pocket' => 'Pocket', + 'print' => 'Imprimir', + 'shaarli' => 'Shaarli', + 'twitter' => 'Twitter', + 'wallabag' => 'wallabag v1', + 'wallabagv2' => 'wallabag v2', + ), + 'short' => array( + 'no' => 'Non', + 'yes' => 'Òc', + 'attention' => 'Atencion !', + 'blank_to_disable' => 'Daissar void per desactivar', + 'by_author' => 'Per %s', + 'by_default' => 'Per defaut', + 'damn' => 'Zut !', + 'default_category' => 'Pas triat', + 'not_applicable' => 'Pas disponible', + 'ok' => 'Òc-ben !', + 'or' => 'o', + ), + 'date' => array( + 'Apr' => 'a\b\r\i\a\l', + 'Aug' => 'a\g\o\s\t', + 'Dec' => '\d\e\c\e\m\b\r\e', + 'Feb' => 'f\e\b\r\i\è\r', + 'Jan' => 'g\e\n\i\è\r', + 'Jul' => 'j\u\l\h\e\t', + 'Jun' => 'j\u\n\h', + 'Mar' => 'm\a\r\ç', + 'May' => '\m\a\i', + 'Nov' => '\n\o\v\e\m\b\r\e', + 'Oct' => '\o\c\t\ò\b\r\e', + 'Sep' => '\s\e\t\e\m\b\r\e', + 'apr' => 'abr.', + 'april' => 'abrial', + 'aug' => 'agost', + 'august' => 'agost', + 'before_yesterday' => 'Abans ièr', + 'dec' => 'dec.', + 'december' => 'decembre', + 'feb' => 'feb.', + 'february' => 'febrièr', + 'format_date' => 'j %s \de\ Y', + 'format_date_hour' => 'j %s \de\ Y \a H\:i', + 'fri' => 'dv', + 'jan' => 'gen.', + 'january' => 'genièr', + 'jul' => 'julh', + 'july' => 'julhet', + 'jun' => 'junh', + 'june' => 'junh', + 'last_3_month' => 'Dempuèi los tres darrièrs meses', + 'last_6_month' => 'Dempuèi los sièis darrièrs meses', + 'last_month' => 'Dempuèi lo mes passat', + 'last_week' => 'Dempuèi la setmana passada', + 'last_year' => 'Dempuèi l’annada passada', + 'mar' => 'març', + 'march' => 'març', + 'may' => 'mai', + 'may_' => 'mai', + 'mon' => 'dl', + 'month' => 'meses', + 'nov' => 'nov.', + 'november' => 'novembre', + 'oct' => 'oct.', + 'october' => 'octòbre', + 'sat' => 'ds', + 'sep' => 'set.', + 'september' => 'setembre', + 'sun' => 'dg', + 'thu' => 'dj', + 'today' => 'Uèi', + 'tue' => 'dm', + 'wed' => 'Dc', + 'yesterday' => 'Ièr', + ), + 'freshrss' => array( + '_' => 'FreshRSS', + 'about' => 'A prepaus de FreshRSS', + ), + 'js' => array( + 'category_empty' => 'Categoria voida', + 'confirm_action' => 'Volètz vertadièrament contunhar ? Aquesta accion se pòt pas anullar !', + 'confirm_action_feed_cat' => 'Volètz vertadièrament contunhar ? Perdretz los favorits e filtres ligats. Aquesta accion se pòt pas anullar !', + 'feedback' => array( + 'body_new_articles' => 'I a %%d nòus articles per legir sus FreshRSS.', + 'request_failed' => 'Una requèsta a fach meuca, aquò pòt venir d’un problèma de connexion Internet.', + 'title_new_articles' => 'FreshRSS : nòus articles !', + ), + 'new_article' => 'I a d’articles nòus disponibles, clicatz per actualizar la página.', + 'should_be_activated' => 'JavaScript deu èsser activat', + ), + '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' => '简体中文', + ), +); diff --git a/app/i18n/oc/index.php b/app/i18n/oc/index.php new file mode 100644 index 000000000..934e19dea --- /dev/null +++ b/app/i18n/oc/index.php @@ -0,0 +1,61 @@ + array( + '_' => 'A prepaus', + 'title' => 'A prepaus', + 'website' => 'Site internet', + 'agpl3' => 'AGPL 3', + 'bugs_reports' => 'Senhalament de problèmas', + 'credits' => 'Crèdits', + 'credits_content' => 'Unes elements de l’estil venon del projècte Bootstrap encara que FreshRSS utilize pas aqueste framework. Lasicònas venon del projècte GNOME. La polissa Open Sans utilizada foguèt creada per en Steve Matteson. FreshRSS es basat sus Minz, un framework PHP.', + 'freshrss_description' => 'FreshRSS es un agregador de fluxes RSS per l’auto-albergar tal coma Kriss Feed o Leed. Sa tòca es d’èsser leugièr e de bon utilizar de prima abòrd mas tanben d’èsser potent e parametrable.', + 'github' => 'on Github', + 'license' => 'Licéncia', + 'project_website' => 'Site del projècte', + 'version' => 'Version', + ), + 'menu' => array( + 'search_short' => 'Recercar', + 'about' => 'A prepaus de FreshRSS', + 'add_query' => 'Crear un filtre', + 'before_one_day' => '1 jorn en arrièr', + 'before_one_week' => '1 setmana en arrièr', + 'favorites' => 'Favorits (%s)', + 'global_view' => 'Vista generala', + 'main_stream' => 'Flux màger', + 'mark_all_read' => 'O marcar tot coma legit', + 'mark_cat_read' => 'Marcar la categoria coma legida', + 'mark_feed_read' => 'Marcar lo flux coma legit', + 'mark_selection_unread' => 'Marcar la seleccion coma pas legida', + 'newer_first' => 'Mai recents en primièr', + 'non-starred' => 'Mostrar los pas favorits', + 'normal_view' => 'Vista normala', + 'older_first' => 'Mai ancians en primièr', + 'queries' => 'Filtres utilizaire', + 'read' => 'Mostrar los legits', + 'reader_view' => 'Vista lectura', + 'rss_view' => 'Flux RSS', + 'starred' => 'Mostrar los favorits', + 'stats' => 'Estatisticas', + 'subscription' => 'Gestion dels abonaments', + 'unread' => 'Mostar los pas legits', + ), + 'share' => 'Partejar', + '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', + ), + 'log' => array( + '_' => 'Jornals d’audit', + 'clear' => 'Escafar los jornals', + 'empty' => 'Los jornals son voids', + 'title' => 'Jornals d’audit', + ), + 'tag' => array( + 'related' => 'Etiquetas ligadas', + ), +); diff --git a/app/i18n/oc/install.php b/app/i18n/oc/install.php new file mode 100644 index 000000000..52b56b4ec --- /dev/null +++ b/app/i18n/oc/install.php @@ -0,0 +1,124 @@ + array( + '_' => 'Lenga', + 'choose' => 'Causissètz la lenga per FreshRSS', + 'defined' => 'La lenga es corrèctament definida.', + ), + 'action' => array( + 'finish' => 'Acabar l’installacion', + 'fix_errors_before' => 'Mercés de corregir las errors seguentas abans de contunhar.', + 'keep_install' => 'Gardar la configuracion precedenta', + 'next_step' => 'Anar a l’estapa seguenta', + 'reinstall' => 'Reïnstallar FreshRSS', + ), + 'auth' => array( + 'form' => 'Formulari (tradicional, demanda JavaScript)', + 'http' => 'HTTP (per utilizaires avançats amb HTTPS)', + 'none' => 'Cap (perilhós)', + 'password_form' => 'Senhal API
(ex. : per la connexion via formulari)', + 'password_format' => 'Almens 7 caractèrs', + '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.', + ), + 'host' => 'Òste', + 'prefix' => 'Prefixe de tabla', + 'password' => 'Senhal de la basa de donadas', + 'type' => 'Tipe de basa de donadas', + 'username' => 'Nom d’utilizaire de la basa de donadas', + ), + 'check' => array( + '_' => 'Verificacions', + 'already_installed' => 'Sembla que FreshRSS es ja installat !', + 'cache' => array( + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data/cache. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul cache son bons.', + ), + 'ctype' => array( + 'nok' => 'Impossible de trobar una bibliotèca per la verificacion del tipe de caractèrs (php-ctype).', + 'ok' => 'Avètz la bibliotèca per la verificacion del tipe de caractèrs (ctype).', + ), + 'curl' => array( + 'nok' => 'Impossible de trobar la bibliotèca curl ( paquet php-curl).', + 'ok' => 'Avètz la bibliotèca cURL.', + ), + 'data' => array( + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul repertòri data son bons.', + ), + 'dom' => array( + 'nok' => 'Impossible de trobar una bibliotèca per percórrer lo DOM.', + 'ok' => 'Avètz la bibliotèca per percórrer lo DOM.', + ), + 'favicons' => array( + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data/favicons. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul repertòri dels favicons son bons.', + ), + 'fileinfo' => array( + 'nok' => 'Avètz pas PHP fileinfo (paquet fileinfo).', + 'ok' => 'Avètz la bibliotèca fileinfo.', + ), + 'http_referer' => array( + 'nok' => 'Mercés de verificar que modificatz pas vòstre HTTP REFERER.', + 'ok' => 'Lo HTTP REFERER es conegut e sembla correspondre a vòstre servidor.', + ), + 'json' => array( + 'nok' => 'Impossible de trobar l’extension recomandada JSON (paquet php-json).', + 'ok' => 'Avètz l’exension recomandada JSON.', + ), + 'mbstring' => array( + 'nok' => 'Impossible de trobar la bibliotèca recomandada mbstring per Unicode.', + //TODO + //TODO + 'ok' => 'Avètz la bibliotèca recomandada mbstring per Unicode.', + ), + 'minz' => array( + 'nok' => 'Avètz pas la bibliotèca Minz.', + 'ok' => 'Avètz la bibliotèca Minz.', + ), + 'pcre' => array( + 'nok' => 'Impossible de trobar una bibliotèca per las expressions regulara (php-pcre).', + 'ok' => 'Avètz la bibliotèca per las expressions regularas (PCRE).', + ), + 'pdo' => array( + 'nok' => 'Impossible de trobar PDO o un dels drivers compatibles (pdo_mysql, pdo_sqlite, pdo_pgsql).', + 'ok' => 'Avètz PDO e almens un des drivers compatibles (pdo_mysql, pdo_sqlite, pdo_pgsql).', + ), + 'php' => array( + 'nok' => 'Vòstra version PHP es la %s mas FreshRSS demanda almens la version %s.', + 'ok' => 'Vòstra version PHP es %s, qu’es compatibla amb FreshRSS.', + ), + 'users' => array( + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data/users. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul repertòri dels utilizaires son bons.', + ), + 'xml' => array( + 'nok' => 'Impossible de trobar una bibliotèca necessària per XML.', + 'ok' => 'Avètz la bibliotèca per percórrer los XML.', + ), + ), + 'conf' => array( + '_' => 'Configuracion generala', + 'ok' => 'La configuracion generala es enregistrada.', + ), + 'congratulations' => 'Òsca !', + 'default_user' => 'Nom d’utilizaire per defaut 16 caractèrs alfanumerics maximum)', + 'delete_articles_after' => 'Levar los articles aprèp', + 'fix_errors_before' => 'Mercés de corregir las errors seguentas abans de contunhar.', + 'javascript_is_better' => 'FreshRSS es mai agradable amb lo JavaScript activat', + 'js' => array( + 'confirm_reinstall' => 'En reïnstallant FreshRSS perdretz la configuracion precedenta. Volètz vertadièrament contunhar ?', + ), + 'not_deleted' => 'Quicòm a trucat, sembla qu’avètz suprimit %s 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', +); diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php new file mode 100644 index 000000000..6b4bfd072 --- /dev/null +++ b/app/i18n/oc/sub.php @@ -0,0 +1,84 @@ + array( + 'title' => 'API', + 'documentation' => 'Copiar l’URL seguenta per l’utilizaire dins d’una aisina extèrna.', + ), + 'bookmarklet' => array( + 'label' => 'S’abonar', + '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.', + 'title' => 'Bookmarklet', + ), + 'category' => array( + 'new' => 'Nòva categoria', + '_' => 'Categoria', + 'add' => 'Ajustar una categoria', + 'empty' => 'Categoria voida', + ), + 'feed' => array( + 'auth' => array( + 'password' => 'Senhal HTTP', + 'username' => 'Identificant HTTP', + 'configuration' => 'Identificacion', + 'help' => 'Permet l’accès als fluxes protegits per una autentificacion HTTP', + 'http' => 'Autentificacion HTTP', + ), + 'description' => 'Descripcion', + 'mute' => 'mut', + 'priority' => array( + '_' => 'Visibilitat', + 'archived' => 'Mostrar pas (archivat)', + 'main_stream' => 'Mostar al flux màger', + 'normal' => 'Mostar dins sa categoria', + ), + 'title' => 'Títol', + 'url' => 'Flux URL', + 'website' => 'URL del site', + 'add' => 'Ajustar un flux RSS', + 'advanced' => 'Avançat', + 'archiving' => 'Archivar', + 'css_path' => 'Selector CSS dels articles sul site d’origina', + 'empty' => 'Aqueste flux es void. Assegurats-vos qu’es totjorn mantengut.', + 'informations' => 'Informacions', + 'keep_history' => 'Nombre minimum d’articles de servar', + 'no_selected' => 'Cap de flux pas seleccionat.', + 'number_entries' => '%d articles', + 'ssl_verify' => 'Verificacion de la seguretat SSL', + 'stats' => 'Estatisticas', + 'think_to_add' => 'Podètz ajustar de fluxes.', + 'timeout' => 'Temps d’espèra en segondas', + 'title_add' => 'Ajustar un flux RSS', + 'ttl' => 'Actualizar pas automaticament mai sovent que', + 'validator' => 'Verificar la validitat del flux', + 'pubsubhubbub' => 'Notificaciones instantáneas amb PubSubHubbub', + 'css_help' => 'Permet de recuperar los fluxes troncats (atencion, demanda mai de temps !)', + 'error' => 'Aqueste flux a rescontrat un problèma. Volgatz verificar que siá totjorn accessible puèi actualizatz-lo.', + 'moved_category_deleted' => 'Quand escafatz una categoria, sos fluxes son automaticament classats dins %s.', + ), + 'import_export' => array( + 'export' => 'Exportar', + 'export_starred' => 'Exportar los favorits', + 'import' => 'Importar', + 'title' => 'Importar / Exportar', + 'export_opml' => 'Exportar la lista de fluxes (OPML)', + 'feed_list' => 'Lista dels %s articles', + 'file_to_import' => 'Fichièr d’importar
(OPML, JSON o ZIP)', + 'file_to_import_no_zip' => 'Fichièr d’importar
(OPML o JSON)', + 'starred_list' => 'Lista dels articles favorits', + ), + 'menu' => array( + 'import_export' => 'Importar / Exportar', + 'subscription_tools' => 'Aisinas d’abonament', + 'bookmark' => 'Sabonar (marcapagina FreshRSS)', + 'subscription_management' => 'Gestion dels abonaments', + ), + 'title' => array( + 'subscription_tools' => 'Aisinas d’abonament', + '_' => 'Gestión dels abonaments', + 'feed_management' => 'Gestion dels fluxes RSS', + ), + 'firefox' => array( + 'title' => 'Lector de flux de Firefox', + 'documentation' => 'Seguir las etapas descrichas aquí per ajustar FreshRSS a la lista dels lectors de flux de Firefox.', + ), +); diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php index 59218597b..bf5214ee8 100644 --- a/app/i18n/pt-br/gen.php +++ b/app/i18n/pt-br/gen.php @@ -123,6 +123,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php index 6c8dd2adf..f2612793a 100644 --- a/app/i18n/ru/gen.php +++ b/app/i18n/ru/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php index b8dc18c01..7328fb380 100644 --- a/app/i18n/tr/gen.php +++ b/app/i18n/tr/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php index 078e1d378..c68396e5d 100644 --- a/app/i18n/zh-cn/gen.php +++ b/app/i18n/zh-cn/gen.php @@ -124,6 +124,7 @@ return array( 'it' => 'Italiano', 'kr' => '한국어', 'nl' => 'Nederlands', + 'oc' => 'Occitan', 'pt-br' => 'Português (Brasil)', 'ru' => 'Русский', 'tr' => 'Türkçe', diff --git a/cli/i18n/ignore/oc.php b/cli/i18n/ignore/oc.php new file mode 100644 index 000000000..6413fc5f0 --- /dev/null +++ b/cli/i18n/ignore/oc.php @@ -0,0 +1,56 @@ + Date: Sun, 4 Nov 2018 15:08:16 +0100 Subject: Missing string (#2114) --- app/i18n/oc/index.php | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/i18n/oc/index.php b/app/i18n/oc/index.php index 934e19dea..b357a48e2 100644 --- a/app/i18n/oc/index.php +++ b/app/i18n/oc/index.php @@ -38,6 +38,7 @@ return array( 'starred' => 'Mostrar los favorits', 'stats' => 'Estatisticas', 'subscription' => 'Gestion dels abonaments', + 'tags' => 'Mas etiquetas', 'unread' => 'Mostar los pas legits', ), 'share' => 'Partejar', -- cgit v1.2.3 From cf899d8d25c57b05dff89b89e2c7e56808f83c50 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 5 Nov 2018 18:10:38 +0100 Subject: TT-RSS import (#2099) * TT-RSS import Import of Tiny Tiny RSS favourites https://github.com/FreshRSS/FreshRSS/issues/2018#issuecomment-432710462 * Fallback feed_url * Simpler JSON * TT-RSS import custom labels * Fix syntax --- app/Controllers/importExportController.php | 162 ++++++++++++++++++++++++----- app/Models/EntryDAO.php | 9 ++ app/Models/FeedDAO.php | 8 +- app/Models/TagDAO.php | 2 +- app/views/helpers/export/articles.phtml | 18 +++- 5 files changed, 171 insertions(+), 28 deletions(-) (limited to 'app') diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 0fb5ba651..c7b384540 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -109,6 +109,17 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { } } } + foreach ($list_files['ttrss_starred'] as $article_file) { + $json = $this->ttrssXmlToJson($article_file); + if (!$this->importJson($json, true)) { + $ok = false; + if (FreshRSS_Context::$isCli) { + fwrite(STDERR, 'FreshRSS error during TT-RSS articles import' . "\n"); + } else { + Minz_Log::warning('Error during TT-RSS articles import'); + } + } + } return $ok; } @@ -165,17 +176,22 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { private static function guessFileType($filename) { if (substr_compare($filename, '.zip', -4) === 0) { return 'zip'; - } elseif (substr_compare($filename, '.opml', -5) === 0 || - substr_compare($filename, '.xml', -4) === 0) { + } elseif (substr_compare($filename, '.opml', -5) === 0) { return 'opml'; - } elseif (substr_compare($filename, '.json', -5) === 0 && - strpos($filename, 'starred') !== false) { - return 'json_starred'; } elseif (substr_compare($filename, '.json', -5) === 0) { - return 'json_feed'; - } else { - return 'unknown'; + if (strpos($filename, 'starred') !== false) { + return 'json_starred'; + } else { + return 'json_feed'; + } + } elseif (substr_compare($filename, '.xml', -4) === 0) { + if (preg_match('/Tiny|tt-?rss/i', $filename)) { + return 'ttrss_starred'; + } else { + return 'opml'; + } } + return 'unknown'; } /** @@ -364,6 +380,43 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { return !$error; } + private function ttrssXmlToJson($xml) { + $table = (array)simplexml_load_string($xml, null, LIBXML_NOCDATA); + $table['items'] = isset($table['article']) ? $table['article'] : array(); + unset($table['article']); + for ($i = count($table['items']) - 1; $i >= 0; $i--) { + $item = (array)($table['items'][$i]); + $item['updated'] = isset($item['updated']) ? strtotime($item['updated']) : ''; + $item['published'] = $item['updated']; + $item['content'] = array('content' => isset($item['content']) ? $item['content'] : ''); + $item['categories'] = isset($item['tag_cache']) ? array($item['tag_cache']) : array(); + if (!empty($item['marked'])) { + $item['categories'][] = 'user/-/state/com.google/starred'; + } + if (!empty($item['published'])) { + $item['categories'][] = 'user/-/state/com.google/broadcast'; + } + if (!empty($item['label_cache'])) { + $labels_cache = json_decode($item['label_cache'], true); + if (is_array($labels_cache)) { + foreach ($labels_cache as $label_cache) { + if (!empty($label_cache[1])) { + $item['categories'][] = 'user/-/label/' . trim($label_cache[1]); + } + } + } + } + $item['alternate'][0]['href'] = isset($item['link']) ? $item['link'] : ''; + $item['origin'] = array( + 'title' => isset($item['feed_title']) ? $item['feed_title'] : '', + 'feedUrl' => isset($item['feed_url']) ? $item['feed_url'] : '', + ); + $item['id'] = isset($item['guid']) ? $item['guid'] : (isset($item['feed_url']) ? $item['feed_url'] : $item['published']); + $table['items'][$i] = $item; + } + return json_encode($table); + } + /** * This method import a JSON-based file (Google Reader format). * @@ -405,7 +458,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { // Oops, no more place! Minz_Log::warning(_t('feedback.sub.feed.over_max', $limits['max_feeds'])); } else { - $feed = $this->addFeedJson($item['origin'], $google_compliant); + $feed = $this->addFeedJson($item['origin']); } if ($feed == null) { @@ -425,6 +478,15 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { } } + $tagDAO = FreshRSS_Factory::createTagDao(); + $labels = $tagDAO->listTags(); + $knownLabels = array(); + foreach ($labels as $label) { + $knownLabels[$label->name()]['id'] = $label->id(); + $knownLabels[$label->name()]['articles'] = array(); + } + unset($labels); + // For each feed, check existing GUIDs already in database. $existingHashForGuids = array(); foreach ($newFeedGuids as $feedId => $newGuids) { @@ -443,19 +505,36 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { $feed_id = $article_to_feed[$item['id']]; $author = isset($item['author']) ? $item['author'] : ''; - $key_content = ($google_compliant && !isset($item['content'])) ? 'summary' : 'content'; + $is_starred = $starred; $tags = $item['categories']; - if ($google_compliant) { - // Remove tags containing "/state/com.google" which are useless. - $tags = array_filter($tags, function($var) { - return strpos($var, '/state/com.google') !== false; - }); + $labels = array(); + for ($i = count($tags) - 1; $i >= 0; $i --) { + $tag = trim($tags[$i]); + if (strpos($tag, 'user/-/') !== false) { + if ($tag === 'user/-/state/com.google/starred') { + $is_starred = true; + } elseif (strpos($tag, 'user/-/label/') === 0) { + $tag = trim(substr($tag, 13)); + if ($tag != '') { + $labels[] = $tag; + } + } + unset($tags[$i]); + } + } + + $url = $item['alternate'][0]['href']; + if (!empty($item['content']['content'])) { + $content = $item['content']['content']; + } elseif (!empty($item['summary']['content'])) { + $content = $item['summary']['content']; } + $content = sanitizeHTML($content, $url); $entry = new FreshRSS_Entry( $feed_id, $item['id'], $item['title'], $author, - $item[$key_content]['content'], $item['alternate'][0]['href'], - $item['published'], $is_read, $starred + $content, $url, + $item['published'], $is_read, $is_starred ); $entry->_id(min(time(), $entry->date(true)) . uSecString()); $entry->_tags($tags); @@ -478,8 +557,21 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { } else { $ok = $this->entryDAO->addEntry($values); } - $error |= ($ok === false); + foreach ($labels as $labelName) { + if (empty($knownLabels[$labelName]['id'])) { + $labelId = $tagDAO->addTag(array('name' => $labelName)); + $knownLabels[$labelName]['id'] = $labelId; + $knownLabels[$labelName]['articles'] = array(); + } + $knownLabels[$labelName]['articles'][] = array( + //'id' => $entry->id(), //ID changes after commitNewEntries() + 'id_feed' => $entry->feed(), + 'guid' => $entry->guid(), + ); + } + + $error |= ($ok === false); } $this->entryDAO->commit(); @@ -488,6 +580,20 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { $this->feedDAO->updateCachedValues(); $this->entryDAO->commit(); + $this->entryDAO->beginTransaction(); + foreach ($knownLabels as $labelName => $knownLabel) { + $labelId = $knownLabel['id']; + foreach ($knownLabel['articles'] as $article) { + $entryId = $this->entryDAO->searchIdByGuid($article['id_feed'], $article['guid']); + if ($entryId != null) { + $tagDAO->tagEntry($labelId, $entryId); + } else { + Minz_Log::warning('Could not add label "' . $labelName . '" to entry "' . $article['guid'] . '" in feed ' . $article['id_feed']); + } + } + } + $this->entryDAO->commit(); + return !$error; } @@ -495,16 +601,24 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { * This method import a JSON-based feed (Google Reader format). * * @param array $origin represents a feed. - * @param boolean $google_compliant takes care of some specific values if true. * @return FreshRSS_Feed if feed is in database at the end of the process, * else null. */ - private function addFeedJson($origin, $google_compliant) { + private function addFeedJson($origin) { $return = null; - $key = $google_compliant ? 'htmlUrl' : 'feedUrl'; - $url = $origin[$key]; - $name = $origin['title']; - $website = $origin['htmlUrl']; + if (!empty($origin['feedUrl'])) { + $url = $origin['feedUrl']; + } elseif (!empty($origin['htmlUrl'])) { + $url = $origin['htmlUrl']; + } else { + return null; + } + if (!empty($origin['htmlUrl'])) { + $website = $origin['htmlUrl']; + } elseif (!empty($origin['feedUrl'])) { + $website = $origin['feedUrl']; + } + $name = empty($origin['title']) ? '' : $origin['title']; try { // Create a Feed object and add it in database. diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index a01c2227b..708d01a69 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -671,6 +671,15 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { return isset($entries[0]) ? $entries[0] : null; } + public function searchIdByGuid($id_feed, $guid) { + $sql = 'SELECT id FROM `' . $this->prefix . 'entry` WHERE id_feed=? AND guid=?'; + $stm = $this->bd->prepare($sql); + $values = array($id_feed, $guid); + $stm->execute($values); + $res = $stm->fetchAll(PDO::FETCH_COLUMN, 0); + return isset($res[0]) ? $res[0] : null; + } + protected function sqlConcat($s1, $s2) { return 'CONCAT(' . $s1 . ',' . $s2 . ')'; //MySQL } diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php index e579f5881..7f00642f4 100644 --- a/app/Models/FeedDAO.php +++ b/app/Models/FeedDAO.php @@ -465,9 +465,15 @@ UPDATE `{$this->prefix}feed` SQL; $stm = $this->bd->prepare($sql); if (!($stm && $stm->execute(array(':new_value' => FreshRSS_Feed::TTL_DEFAULT, ':old_value' => -2)))) { + $info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo(); + Minz_Log::error('SQL warning updateTTL 1: ' . $info[2] . ' ' . $sql); + $sql2 = 'ALTER TABLE `' . $this->prefix . 'feed` ADD COLUMN ttl INT NOT NULL DEFAULT ' . FreshRSS_Feed::TTL_DEFAULT; //v0.7.3 $stm = $this->bd->prepare($sql2); - $stm->execute(); + if (!($stm && $stm->execute())) { + $info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo(); + Minz_Log::error('SQL error updateTTL 2: ' . $info[2] . ' ' . $sql2); + } } else { $stm->execute(array(':new_value' => -3600, ':old_value' => -1)); } diff --git a/app/Models/TagDAO.php b/app/Models/TagDAO.php index 1b59c8971..b55d2b35d 100644 --- a/app/Models/TagDAO.php +++ b/app/Models/TagDAO.php @@ -266,7 +266,7 @@ class FreshRSS_TagDAO extends Minz_ModelPdo implements FreshRSS_Searchable { if (is_array($entries) && count($entries) > 0) { $sql .= ' AND et.id_entry IN (' . str_repeat('?,', count($entries) - 1). '?)'; foreach ($entries as $entry) { - $values[] = $entry->id(); + $values[] = is_array($entry) ? $entry['id'] : $entry->id(); } } $stm = $this->bd->prepare($sql); diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml index b8958f527..59a2c7ad7 100644 --- a/app/views/helpers/export/articles.phtml +++ b/app/views/helpers/export/articles.phtml @@ -16,6 +16,12 @@ $articles = array( echo rtrim(json_encode($articles, $options), " ]}\n\r\t"), "\n"; $first = true; +$tagDAO = FreshRSS_Factory::createTagDao(); +$entryIdsTagNames = $tagDAO->getEntryIdsTagNames($this->entriesRaw); +if ($entryIdsTagNames == false) { + $entryIdsTagNames = array(); +} + foreach ($this->entriesRaw as $entryRaw) { if (empty($entryRaw)) { continue; @@ -32,13 +38,14 @@ foreach ($this->entriesRaw as $entryRaw) { $article = array( 'id' => $entry->guid(), + 'timestampUsec' => '' . $entry->id(), 'categories' => array_values($entry->tags()), 'title' => $entry->title(), - 'author' => $entry->authors(true), //TODO: Make an array like tags? + 'author' => $entry->authors(true), 'published' => $entry->date(true), 'updated' => $entry->date(true), 'alternate' => array(array( - 'href' => $entry->link(), + 'href' => htmlspecialchars_decode($entry->link(), ENT_QUOTES), 'type' => 'text/html', )), 'content' => array( @@ -51,6 +58,13 @@ foreach ($this->entriesRaw as $entryRaw) { 'feedUrl' => $feed == null ? '' : $feed->url(), ) ); + if ($entry->isFavorite()) { + $article['categories'][] = 'user/-/state/com.google/starred'; + } + $tagNames = isset($entryIdsTagNames['e_' . $entry->id()]) ? $entryIdsTagNames['e_' . $entry->id()] : array(); + foreach ($tagNames as $tagName) { + $article['categories'][] = 'user/-/label/' . $tagName; + } $line = json_encode($article, $options); if ($line != '') { -- cgit v1.2.3 From b672fc190d7df163449e91400c6d6a08a3775835 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 11 Nov 2018 17:31:50 +0100 Subject: Tweaks for Vienna RSS (#2093) * Tweaks for Vienna RSS https://github.com/FreshRSS/FreshRSS/issues/2091 https://github.com/ViennaRSS/vienna-rss/issues/1197 * Fix get feed by URL * Fix get item ids returning starred elements * API add item ids by feed URL * Add API filter `it` https://feedhq.readthedocs.io/en/latest/api/reference.html#stream-items-ids * API add `nt=` filter + refactoring * No ; prefix for author https://github.com/FreshRSS/FreshRSS/issues/2091#issuecomment-435562495 * Add id long form prefix and accept short id form https://github.com/FreshRSS/FreshRSS/issues/2091#issuecomment-435631259 * Fix quote problem https://github.com/FreshRSS/FreshRSS/issues/2091#issuecomment-435683930 * Isolate bug fix for News+ https://github.com/FreshRSS/FreshRSS/issues/2091#issuecomment-435687041 * Rework encoding conventions https://github.com/FreshRSS/FreshRSS/issues/2091#issuecomment-437441834 * Unicode escaping alternative Alternative approach to encode XML special characters and other problematic characters into their Unicode fullwidth version when we cannot use HTML-encoding because clients disagree wether they should HTML-decode or not. https://github.com/FreshRSS/FreshRSS/issues/2091#issuecomment-436059559 --- app/Models/BooleanSearch.php | 8 ++ app/Models/EntryDAO.php | 4 +- app/Models/Feed.php | 2 +- app/Models/Search.php | 8 ++ lib/lib_rss.php | 12 +++ p/api/greader.php | 226 +++++++++++++++++++++++++++---------------- 6 files changed, 171 insertions(+), 89 deletions(-) (limited to 'app') diff --git a/app/Models/BooleanSearch.php b/app/Models/BooleanSearch.php index 6e016f7e9..88eeea73c 100644 --- a/app/Models/BooleanSearch.php +++ b/app/Models/BooleanSearch.php @@ -45,6 +45,14 @@ class FreshRSS_BooleanSearch { return $this->searches; } + public function add($search) { + if ($search instanceof FreshRSS_Search) { + $this->searches[] = $search; + return $search; + } + return null; + } + public function __toString() { return $this->getRawInput(); } diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 708d01a69..6d77a33cd 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -921,8 +921,8 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { return self::daoToEntries($stm->fetchAll(PDO::FETCH_ASSOC)); } - public function listIdsWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filters = null, $date_min = 0) { //For API - list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filters, $date_min); + public function listIdsWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, $order = 'DESC', $limit = 1, $firstId = '', $filters = null) { //For API + list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filters); $stm = $this->bd->prepare($sql); $stm->execute($values); diff --git a/app/Models/Feed.php b/app/Models/Feed.php index e1dd2990d..a5ef33d6b 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -424,7 +424,7 @@ class FreshRSS_Feed extends Minz_Model { $author_names = ''; if (is_array($authors)) { foreach ($authors as $author) { - $author_names .= html_only_entity_decode(strip_tags($author->name == '' ? $author->email : $author->name)) . '; '; + $author_names .= escapeToUnicodeAlternative(strip_tags($author->name == '' ? $author->email : $author->name)) . '; '; } } $author_names = substr($author_names, 0, -2); diff --git a/app/Models/Search.php b/app/Models/Search.php index c52e391fa..f9cda7354 100644 --- a/app/Models/Search.php +++ b/app/Models/Search.php @@ -73,10 +73,18 @@ class FreshRSS_Search { return $this->min_date; } + public function setMinDate($value) { + return $this->min_date = $value; + } + public function getMaxDate() { return $this->max_date; } + public function setMaxDate($value) { + return $this->max_date = $value; + } + public function getMinPubdate() { return $this->min_pubdate; } diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 4087f6faf..52e4408d2 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -102,6 +102,18 @@ function safe_ascii($text) { return filter_var($text, FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH); } +function escapeToUnicodeAlternative($text) { + $text = htmlspecialchars_decode($text, ENT_QUOTES); + // https://raw.githubusercontent.com/mihaip/google-reader-api/master/wiki/StreamId.wiki + return trim(str_replace( + //Problematic characters + array("'", '"', '^', '<', '>', '?', '&', '\\', '/', ',', ';'), + //Use their fullwidth Unicode form instead: + array("’", '＂', '＾', '＜', '＞', '？', '＆', '＼', '／', '，', '；'), + $text + )); +} + /** * Test if a given server address is publicly accessible. * diff --git a/p/api/greader.php b/p/api/greader.php index c6701096c..7c5c54951 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -19,6 +19,7 @@ Server-side API compatible with Google Reader API layer 2 * https://github.com/devongovett/reader * https://github.com/theoldreader/api * https://www.inoreader.com/developers/ +* https://feedhq.readthedocs.io/en/latest/api/index.html */ require(__DIR__ . '/../../constants.php'); @@ -198,6 +199,7 @@ function clientLogin($email, $pass) { //http://web.archive.org/web/2013060409104 header('Content-Type: text/plain; charset=UTF-8'); $auth = $email . '/' . sha1(FreshRSS_Context::$system_conf->salt . $email . FreshRSS_Context::$user_conf->apiPasswordHash); echo 'SID=', $auth, "\n", + 'LSID=null', "\n", //Vienna RSS 'Auth=', $auth, "\n"; exit(); } else { @@ -258,7 +260,7 @@ function tagList() { foreach ($res as $cName) { $tags[] = array( - 'id' => 'user/-/label/' . $cName, + 'id' => 'user/-/label/' . htmlspecialchars_decode($cName, ENT_QUOTES), //'sortid' => $cName, 'type' => 'folder', //Inoreader ); @@ -270,7 +272,7 @@ function tagList() { $labels = $tagDAO->listTags(true); foreach ($labels as $label) { $tags[] = array( - 'id' => 'user/-/label/' . $label->name(), + 'id' => 'user/-/label/' . htmlspecialchars_decode($label->name(), ENT_QUOTES), //'sortid' => $cName, 'type' => 'tag', //Inoreader 'unread_count' => $label->nbUnread(), //Inoreader @@ -298,17 +300,17 @@ function subscriptionList() { foreach ($res as $line) { $subscriptions[] = array( 'id' => 'feed/' . $line['id'], - 'title' => $line['name'], + 'title' => escapeToUnicodeAlternative($line['name']), 'categories' => array( array( - 'id' => 'user/-/label/' . $line['c_name'], - 'label' => $line['c_name'], + 'id' => 'user/-/label/' . htmlspecialchars_decode($line['c_name'], ENT_QUOTES), + 'label' => htmlspecialchars_decode($line['c_name'], ENT_QUOTES), ), ), //'sortid' => $line['name'], //'firstitemmsec' => 0, - 'url' => $line['url'], - 'htmlUrl' => $line['website'], + 'url' => htmlspecialchars_decode($line['url'], ENT_QUOTES), + 'htmlUrl' => htmlspecialchars_decode($line['website'], ENT_QUOTES), 'iconUrl' => $faviconsUrl . hash('crc32b', $salt . $line['url']), ); } @@ -345,6 +347,7 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = ' $c_name = ''; } } + $c_name = htmlspecialchars($c_name, ENT_COMPAT, 'UTF-8'); $cat = $categoryDAO->searchByName($c_name); $addCatId = $cat == null ? 0 : $cat->id(); } else if ($remove != '' && strpos($remove, 'user/-/label/')) { @@ -355,26 +358,28 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = ' badRequest(); } for ($i = count($streamNames) - 1; $i >= 0; $i--) { - $streamName = $streamNames[$i]; //feed/http://example.net/sample.xml ; feed/338 - if (strpos($streamName, 'feed/') === 0) { - $streamName = substr($streamName, 5); + $streamUrl = $streamNames[$i]; //feed/http://example.net/sample.xml ; feed/338 + if (strpos($streamUrl, 'feed/') === 0) { + $streamUrl = substr($streamUrl, 5); $feedId = 0; - if (ctype_digit($streamName)) { + if (ctype_digit($streamUrl)) { if ($action === 'subscribe') { continue; } - $feedId = $streamName; + $feedId = $streamUrl; } else { - $feed = $feedDAO->searchByUrl($streamName); + $streamUrl = htmlspecialchars($streamUrl, ENT_COMPAT, 'UTF-8'); + $feed = $feedDAO->searchByUrl($streamUrl); $feedId = $feed == null ? -1 : $feed->id(); } $title = isset($titles[$i]) ? $titles[$i] : ''; + $title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8'); switch ($action) { case 'subscribe': if ($feedId <= 0) { - $http_auth = ''; //TODO + $http_auth = ''; try { - $feed = FreshRSS_feed_Controller::addFeed($streamName, $title, $addCatId, $c_name, $http_auth); + $feed = FreshRSS_feed_Controller::addFeed($streamUrl, $title, $addCatId, $c_name, $http_auth); continue; } catch (Exception $e) { Minz_Log::error('subscriptionEdit error subscribe: ' . $e->getMessage(), API_LOG); @@ -407,6 +412,7 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = ' function quickadd($url) { try { + $url = htmlspecialchars($url, ENT_COMPAT, 'UTF-8'); $feed = FreshRSS_feed_Controller::addFeed($url); exit(json_encode(array( 'numResults' => 1, @@ -442,7 +448,7 @@ function unreadCount() { //http://blog.martindoms.com/2009/10/16/using-the-googl } } $unreadcounts[] = array( - 'id' => 'user/-/label/' . $cat->name(), + 'id' => 'user/-/label/' . htmlspecialchars_decode($cat->name(), ENT_QUOTES), 'count' => $cat->nbNotRead(), 'newestItemTimestampUsec' => $catLastUpdate . '000000', ); @@ -455,7 +461,7 @@ function unreadCount() { //http://blog.martindoms.com/2009/10/16/using-the-googl $tagDAO = FreshRSS_Factory::createTagDao(); foreach ($tagDAO->listTags(true) as $label) { $unreadcounts[] = array( - 'id' => 'user/-/label/' . $label->name(), + 'id' => 'user/-/label/' . htmlspecialchars_decode($label->name(), ENT_QUOTES), 'count' => $label->nbUnread(), ); } @@ -496,28 +502,29 @@ function entriesToArray($entries) { $f_name = '_'; } $item = array( - 'id' => /*'tag:google.com,2005:reader/item/' .*/ dec2hex($entry->id()), //64-bit hexa http://code.google.com/p/google-reader-api/wiki/ItemId + 'id' => 'tag:google.com,2005:reader/item/' . dec2hex($entry->id()), //64-bit hexa http://code.google.com/p/google-reader-api/wiki/ItemId 'crawlTimeMsec' => substr($entry->id(), 0, -3), 'timestampUsec' => '' . $entry->id(), //EasyRSS 'published' => $entry->date(true), - 'title' => $entry->title(), + 'title' => escapeToUnicodeAlternative($entry->title()), 'summary' => array('content' => $entry->content()), 'alternate' => array( array('href' => htmlspecialchars_decode($entry->link(), ENT_QUOTES)), ), 'categories' => array( 'user/-/state/com.google/reading-list', - 'user/-/label/' . $c_name, + 'user/-/label/' . htmlspecialchars_decode($c_name, ENT_QUOTES), ), 'origin' => array( 'streamId' => 'feed/' . $f_id, - 'title' => $f_name, //EasyRSS + 'title' => escapeToUnicodeAlternative($f_name), //EasyRSS //'htmlUrl' => $line['f_website'], ), ); $author = $entry->authors(true); + $author = trim($author, '; '); if ($author != '') { - $item['author'] = $author; + $item['author'] = escapeToUnicodeAlternative($author); } if ($entry->isRead()) { $item['categories'][] = 'user/-/state/com.google/read'; @@ -527,69 +534,117 @@ function entriesToArray($entries) { } $tagNames = isset($entryIdsTagNames['e_' . $entry->id()]) ? $entryIdsTagNames['e_' . $entry->id()] : array(); foreach ($tagNames as $tagName) { - $item['categories'][] = 'user/-/label/' . $tagName; + $item['categories'][] = 'user/-/label/' . htmlspecialchars_decode($tagName, ENT_QUOTES); } $items[] = $item; } return $items; } -function streamContents($path, $include_target, $start_time, $count, $order, $exclude_target, $continuation) { -//http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI -//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#feed - header('Content-Type: application/json; charset=UTF-8'); - - switch ($path) { - case 'reading-list': - $type = 'A'; - break; - case 'starred': - $type = 's'; - break; - case 'feed': - $type = 'f'; +function streamContentsFilters($type, $streamId, $filter_target, $exclude_target, $start_time, $stop_time) { + switch ($type) { + case 'f': //feed + if ($streamId != '' && !ctype_digit($streamId)) { + $feedDAO = FreshRSS_Factory::createFeedDao(); + $streamId = htmlspecialchars($streamId, ENT_COMPAT, 'UTF-8'); + $feed = $feedDAO->searchByUrl($streamId); + $streamId = $feed == null ? -1 : $feed->id(); + } break; - case 'label': + case 'c': //category or label $categoryDAO = FreshRSS_Factory::createCategoryDao(); - $cat = $categoryDAO->searchByName($include_target); + $streamId = htmlspecialchars($streamId, ENT_COMPAT, 'UTF-8'); + $cat = $categoryDAO->searchByName($streamId); if ($cat != null) { $type = 'c'; - $include_target = $cat->id(); + $streamId = $cat->id(); } else { $tagDAO = FreshRSS_Factory::createTagDao(); - $tag = $tagDAO->searchByName($include_target); + $tag = $tagDAO->searchByName($streamId); if ($tag != null) { $type = 't'; - $include_target = $tag->id(); + $streamId = $tag->id(); } else { $type = 'A'; - $include_target = -1; + $streamId = -1; } } break; + } + + switch ($filter_target) { + case 'user/-/state/com.google/read': + $state = FreshRSS_Entry::STATE_READ; + break; + case 'user/-/state/com.google/unread': + $state = FreshRSS_Entry::STATE_NOT_READ; + break; + case 'user/-/state/com.google/starred': + $state = FreshRSS_Entry::STATE_FAVORITE; + break; default: - $type = 'A'; + $state = FreshRSS_Entry::STATE_ALL; break; } switch ($exclude_target) { case 'user/-/state/com.google/read': - $state = FreshRSS_Entry::STATE_NOT_READ; + $state &= FreshRSS_Entry::STATE_NOT_READ; break; case 'user/-/state/com.google/unread': - $state = FreshRSS_Entry::STATE_READ; + $state &= FreshRSS_Entry::STATE_READ; + break; + case 'user/-/state/com.google/starred': + $state &= FreshRSS_Entry::STATE_NOT_FAVORITE; + break; + } + + $searches = new FreshRSS_BooleanSearch(''); + if ($start_time != '') { + $search = new FreshRSS_Search(''); + $search->setMinDate($start_time); + $searches->add($search); + } + if ($stop_time != '') { + $search = new FreshRSS_Search(''); + $search->setMaxDate($stop_time); + $searches->add($search); + } + + return array($type, $streamId, $state, $searches); +} + +function streamContents($path, $include_target, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation) { +//http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI +//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#feed + header('Content-Type: application/json; charset=UTF-8'); + + switch ($path) { + case 'reading-list': + $type = 'A'; + break; + case 'starred': + $type = 's'; + break; + case 'feed': + $type = 'f'; + break; + case 'label': + $type = 'c'; break; default: - $state = FreshRSS_Entry::STATE_ALL; + $type = 'A'; break; } + list($type, $include_target, $state, $searches) = streamContentsFilters($type, $include_target, $filter_target, $exclude_target, $start_time, $stop_time); + if ($continuation != '') { $count++; //Shift by one element } $entryDAO = FreshRSS_Factory::createEntryDao(); - $entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, new FreshRSS_BooleanSearch(''), $start_time); + $entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, $searches); $items = entriesToArray($entries); @@ -614,7 +669,7 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex exit(); } -function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude_target, $continuation) { +function streamContentsItemsIds($streamId, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation) { //http://code.google.com/p/google-reader-api/wiki/ApiStreamItemsIds //http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI //http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#feed @@ -622,55 +677,32 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude $id = ''; if ($streamId === 'user/-/state/com.google/reading-list') { $type = 'A'; - } elseif ('user/-/state/com.google/starred') { + } elseif ($streamId === 'user/-/state/com.google/starred') { $type = 's'; } elseif (strpos($streamId, 'feed/') === 0) { $type = 'f'; - $id = basename($streamId); + $streamId = substr($streamId, 5); } elseif (strpos($streamId, 'user/-/label/') === 0) { $type = 'c'; - $c_name = substr($streamId, 13); - $categoryDAO = FreshRSS_Factory::createCategoryDao(); - $cat = $categoryDAO->searchByName($c_name); - if ($cat != null) { - $type = 'c'; - $id = $cat->id(); - } else { - $tagDAO = FreshRSS_Factory::createTagDao(); - $tag = $tagDAO->searchByName($c_name); - if ($tag != null) { - $type = 't'; - $id = $tag->id(); - } else { - $type = 'A'; - $id = -1; - } - } + $streamId = substr($streamId, 13); } - switch ($exclude_target) { - case 'user/-/state/com.google/read': - $state = FreshRSS_Entry::STATE_NOT_READ; - break; - default: - $state = FreshRSS_Entry::STATE_ALL; - break; - } + list($type, $id, $state, $searches) = streamContentsFilters($type, $streamId, $filter_target, $exclude_target, $start_time, $stop_time); if ($continuation != '') { $count++; //Shift by one element } $entryDAO = FreshRSS_Factory::createEntryDao(); - $ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, new FreshRSS_BooleanSearch(''), $start_time); + $ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, $searches); if ($continuation != '') { array_shift($ids); //Discard first element that was already sent in the previous response $count--; } - if (empty($ids)) { //For News+ bug https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632 - $ids[] = 0; + if (empty($ids) && isset($_GET['client']) && $_GET['client'] === 'newsplus') { + $ids[] = 0; //For News+ bug https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632 } $itemRefs = array(); foreach ($ids as $id) { @@ -697,7 +729,10 @@ function streamContentsItems($e_ids, $order) { header('Content-Type: application/json; charset=UTF-8'); foreach ($e_ids as $i => $e_id) { - $e_ids[$i] = hex2dec(basename($e_id)); //Strip prefix 'tag:google.com,2005:reader/item/' + if (strpos($e_id, '/') !== null) { + $e_id = hex2dec(basename($e_id)); //Strip prefix 'tag:google.com,2005:reader/item/' + } + $e_ids[$i] = $e_id; } $entryDAO = FreshRSS_Factory::createEntryDao(); @@ -717,7 +752,10 @@ function streamContentsItems($e_ids, $order) { function editTag($e_ids, $a, $r) { foreach ($e_ids as $i => $e_id) { - $e_ids[$i] = hex2dec(basename($e_id)); //Strip prefix 'tag:google.com,2005:reader/item/' + if (strpos($e_id, '/') !== null) { + $e_id = hex2dec(basename($e_id)); //Strip prefix 'tag:google.com,2005:reader/item/' + } + $e_ids[$i] = $e_id; } $entryDAO = FreshRSS_Factory::createEntryDao(); @@ -748,6 +786,7 @@ function editTag($e_ids, $a, $r) { } } if ($tagName != '') { + $tagName = htmlspecialchars($tagName, ENT_COMPAT, 'UTF-8'); $tag = $tagDAO->searchByName($tagName); if ($tag == null) { $tagDAO->addTag(array('name' => $tagName)); @@ -771,6 +810,7 @@ function editTag($e_ids, $a, $r) { default: if (strpos($r, 'user/-/label/') === 0) { $tagName = substr($r, 13); + $tagName = htmlspecialchars($tagName, ENT_COMPAT, 'UTF-8'); $tag = $tagDAO->searchByName($tagName); if ($tag != null) { foreach ($e_ids as $e_id) { @@ -788,7 +828,9 @@ function renameTag($s, $dest) { if ($s != '' && strpos($s, 'user/-/label/') === 0 && $dest != '' && strpos($dest, 'user/-/label/') === 0) { $s = substr($s, 13); + $s = htmlspecialchars($s, ENT_COMPAT, 'UTF-8'); $dest = substr($dest, 13); + $dest = htmlspecialchars($dest, ENT_COMPAT, 'UTF-8'); $categoryDAO = FreshRSS_Factory::createCategoryDao(); $cat = $categoryDAO->searchByName($s); @@ -810,6 +852,7 @@ function renameTag($s, $dest) { function disableTag($s) { if ($s != '' && strpos($s, 'user/-/label/') === 0) { $s = substr($s, 13); + $s = htmlspecialchars($s, ENT_COMPAT, 'UTF-8'); $categoryDAO = FreshRSS_Factory::createCategoryDao(); $cat = $categoryDAO->searchByName($s); if ($cat != null) { @@ -838,6 +881,7 @@ function markAllAsRead($streamId, $olderThanId) { $entryDAO->markReadFeed($f_id, $olderThanId); } elseif (strpos($streamId, 'user/-/label/') === 0) { $c_name = substr($streamId, 13); + $c_name = htmlspecialchars($c_name, ENT_COMPAT, 'UTF-8'); $categoryDAO = FreshRSS_Factory::createCategoryDao(); $cat = $categoryDAO->searchByName($c_name); if ($cat != null) { @@ -902,12 +946,14 @@ if (count($pathInfos) < 3) { * exclude items from a particular feed (obviously not useful in this * request, but xt appears in other listing requests). */ $exclude_target = isset($_GET['xt']) ? $_GET['xt'] : ''; + $filter_target = isset($_GET['it']) ? $_GET['it'] : ''; $count = isset($_GET['n']) ? intval($_GET['n']) : 20; //n=[integer] : The maximum number of results to return. $order = isset($_GET['r']) ? $_GET['r'] : 'd'; //r=[d|n|o] : Sort order of item results. d or n gives items in descending date order, o in ascending order. /* ot=[unix timestamp] : The time from which you want to retrieve * items. Only items that have been crawled by Google Reader after * this time will be returned. */ $start_time = isset($_GET['ot']) ? intval($_GET['ot']) : 0; + $stop_time = isset($_GET['nt']) ? intval($_GET['nt']) : 0; /* Continuation token. If a StreamContents response does not represent * all items in a timestamp range, it will have a continuation attribute. * The same request can be re-issued with the value of that attribute put @@ -920,23 +966,31 @@ if (count($pathInfos) < 3) { if (isset($pathInfos[7])) { if ($pathInfos[6] === 'feed') { $include_target = $pathInfos[7]; - StreamContents($pathInfos[6], $include_target, $start_time, $count, $order, $exclude_target, $continuation); + if ($include_target != '' && !ctype_digit($include_target)) { + $include_target = empty($_SERVER['REQUEST_URI']) ? '' : $_SERVER['REQUEST_URI']; + if (preg_match('#/reader/api/0/stream/contents/feed/([A-Za-z0-9\'!*()%$_.~+-]+)#', $include_target, $matches) && isset($matches[1])) { + $include_target = urldecode($matches[1]); + } else { + $include_target = ''; + } + } + streamContents($pathInfos[6], $include_target, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation); } elseif ($pathInfos[6] === 'user' && isset($pathInfos[8]) && isset($pathInfos[9])) { if ($pathInfos[8] === 'state') { if ($pathInfos[9] === 'com.google' && isset($pathInfos[10])) { if ($pathInfos[10] === 'reading-list' || $pathInfos[10] === 'starred') { $include_target = ''; - streamContents($pathInfos[10], $include_target, $start_time, $count, $order, $exclude_target, $continuation); + streamContents($pathInfos[10], $include_target, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation); } } } elseif ($pathInfos[8] === 'label') { $include_target = $pathInfos[9]; - streamContents($pathInfos[8], $include_target, $start_time, $count, $order, $exclude_target, $continuation); + streamContents($pathInfos[8], $include_target, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation); } } } else { //EasyRSS $include_target = ''; - streamContents('reading-list', $include_target, $start_time, $count, $order, $exclude_target, $continuation); + streamContents('reading-list', $include_target, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation); } } elseif ($pathInfos[5] === 'items') { if ($pathInfos[6] === 'ids' && isset($_GET['s'])) { @@ -944,7 +998,7 @@ if (count($pathInfos) < 3) { * be repeated to fetch the item IDs from multiple streams at once * (more efficient from a backend perspective than multiple requests). */ $streamId = $_GET['s']; - streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude_target, $continuation); + streamContentsItemsIds($streamId, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation); } else if ($pathInfos[6] === 'contents' && isset($_POST['i'])) { //FeedMe $e_ids = multiplePosts('i'); //item IDs streamContentsItems($e_ids, $order); -- cgit v1.2.3 From 0fce9892ff2b03083706b4f78495539861db98aa Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 12 Nov 2018 09:03:20 +0100 Subject: API encoding tuning (#2120) Use only minimal XML->Unicode encoding for articles title. Follow-up of https://github.com/FreshRSS/FreshRSS/pull/2093 --- app/Models/Feed.php | 2 +- lib/lib_rss.php | 21 +++++++++++++-------- p/api/greader.php | 8 ++++---- 3 files changed, 18 insertions(+), 13 deletions(-) (limited to 'app') diff --git a/app/Models/Feed.php b/app/Models/Feed.php index a5ef33d6b..acf3bd981 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -424,7 +424,7 @@ class FreshRSS_Feed extends Minz_Model { $author_names = ''; if (is_array($authors)) { foreach ($authors as $author) { - $author_names .= escapeToUnicodeAlternative(strip_tags($author->name == '' ? $author->email : $author->name)) . '; '; + $author_names .= escapeToUnicodeAlternative(strip_tags($author->name == '' ? $author->email : $author->name), true) . '; '; } } $author_names = substr($author_names, 0, -2); diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 52e4408d2..c445874c8 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -102,16 +102,21 @@ function safe_ascii($text) { return filter_var($text, FILTER_DEFAULT, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH); } -function escapeToUnicodeAlternative($text) { +function escapeToUnicodeAlternative($text, $extended = true) { $text = htmlspecialchars_decode($text, ENT_QUOTES); + + //Problematic characters + $problem = array('&', '<', '>'); + //Use their fullwidth Unicode form instead: + $replace = array('＆', '＜', '＞'); + // https://raw.githubusercontent.com/mihaip/google-reader-api/master/wiki/StreamId.wiki - return trim(str_replace( - //Problematic characters - array("'", '"', '^', '<', '>', '?', '&', '\\', '/', ',', ';'), - //Use their fullwidth Unicode form instead: - array("’", '＂', '＾', '＜', '＞', '？', '＆', '＼', '／', '，', '；'), - $text - )); + if ($extended) { + $problem += array("'", '"', '^', '?', '\\', '/', ',', ';'); + $replace += array("’", '＂', '＾', '？', '＼', '／', '，', '；'); + } + + return trim(str_replace($problem, $replace, $text)); } /** diff --git a/p/api/greader.php b/p/api/greader.php index 7c5c54951..7cd312f2c 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -300,7 +300,7 @@ function subscriptionList() { foreach ($res as $line) { $subscriptions[] = array( 'id' => 'feed/' . $line['id'], - 'title' => escapeToUnicodeAlternative($line['name']), + 'title' => escapeToUnicodeAlternative($line['name'], true), 'categories' => array( array( 'id' => 'user/-/label/' . htmlspecialchars_decode($line['c_name'], ENT_QUOTES), @@ -506,7 +506,7 @@ function entriesToArray($entries) { 'crawlTimeMsec' => substr($entry->id(), 0, -3), 'timestampUsec' => '' . $entry->id(), //EasyRSS 'published' => $entry->date(true), - 'title' => escapeToUnicodeAlternative($entry->title()), + 'title' => escapeToUnicodeAlternative($entry->title(), false), 'summary' => array('content' => $entry->content()), 'alternate' => array( array('href' => htmlspecialchars_decode($entry->link(), ENT_QUOTES)), @@ -517,14 +517,14 @@ function entriesToArray($entries) { ), 'origin' => array( 'streamId' => 'feed/' . $f_id, - 'title' => escapeToUnicodeAlternative($f_name), //EasyRSS + 'title' => escapeToUnicodeAlternative($f_name, true), //EasyRSS //'htmlUrl' => $line['f_website'], ), ); $author = $entry->authors(true); $author = trim($author, '; '); if ($author != '') { - $item['author'] = escapeToUnicodeAlternative($author); + $item['author'] = escapeToUnicodeAlternative($author, false); } if ($entry->isRead()) { $item['categories'][] = 'user/-/state/com.google/read'; -- cgit v1.2.3 From adcbfc43b866ad2654be3f96e90c650cae224141 Mon Sep 17 00:00:00 2001 From: romibi Date: Tue, 13 Nov 2018 22:29:03 +0100 Subject: Improve long dropdown menu lists (#2108) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dropdown menus with lots of entries were a bit difficult to use … Set max height to 75% of Viewport-height and enabled scrolling --- app/views/helpers/index/normal/entry_bottom.phtml | 2 +- p/themes/base-theme/template.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml index 784a41e1f..1f35318e3 100644 --- a/app/views/helpers/index/normal/entry_bottom.phtml +++ b/app/views/helpers/index/normal/entry_bottom.phtml @@ -42,7 +42,7 @@ -
    + diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 273b3d07f..f07b397f4 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -230,6 +230,11 @@ a.btn { background: #fff; border: 1px solid #aaa; } +.dropdown-menu-scrollable { + max-height: 75vh; + overflow-x: hidden; + overflow-y: auto; +} .dropdown-header { display: block; } -- cgit v1.2.3 From 6122a45d9a60fb52cbb83cb649dbf928c6446149 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 15 Nov 2018 17:07:05 +0100 Subject: Minor additional WebSub debug --- app/Models/Feed.php | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/Models/Feed.php b/app/Models/Feed.php index acf3bd981..fc7ed8c68 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -619,6 +619,7 @@ class FreshRSS_Feed extends Minz_Model { $info = curl_getinfo($ch); Minz_Log::warning('PubSubHubbub ' . ($state ? 'subscribe' : 'unsubscribe') . ' to ' . $url . + ' via hub ' . $hubJson['hub'] . ' with callback ' . $callbackUrl . ': ' . $info['http_code'] . ' ' . $response, PSHB_LOG); if (substr($info['http_code'], 0, 1) == '2') { -- cgit v1.2.3 From 55d7115926df2df45e8bde6e8e6f6e2b9c367024 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 18 Nov 2018 11:32:13 +0100 Subject: Add username in configuration menu and exports (#2133) * Add username in configuration menu https://github.com/FreshRSS/FreshRSS/pull/2099#issuecomment-435944803 * Add username to exported files --- app/Controllers/importExportController.php | 4 ++-- app/layout/header.phtml | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'app') diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index c7b384540..9e485dd28 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -699,7 +699,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { // Only one file? Guess its type and export it. $filename = key($export_files); $type = self::guessFileType($filename); - $this->sendFile('freshrss_' . $filename, $export_files[$filename], $type); + $this->sendFile('freshrss_' . Minz_Session::param('currentUser', '_') . '_' . $filename, $export_files[$filename], $type); } return $nb_files; } @@ -810,7 +810,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { header('Content-Type: application/zip'); header('Content-Length: ' . filesize($zip_file)); $day = date('Y-m-d'); - header('Content-Disposition: attachment; filename="freshrss_' . $day . '_export.zip"'); + header('Content-Disposition: attachment; filename="freshrss_' . Minz_Session::param('currentUser', '_') . '_' . $day . '_export.zip"'); readfile($zip_file); unlink($zip_file); } diff --git a/app/layout/header.phtml b/app/layout/header.phtml index e75a25efa..6b538851b 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -3,7 +3,8 @@ if (FreshRSS_Auth::accessNeedsAction()) { ?> -- cgit v1.2.3 From f26b8f3f310df60693deab7d977dd5fcc3adaf09 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 18 Nov 2018 11:34:40 +0100 Subject: PHP 7.1 tempnam warning fix (#2134) And suggested dir was wrong. https://bugs.php.net/bug.php?id=69489 ``` Notice: tempnam(): file created in the system's temporary directory in /var/www/html/FreshRSS/app/Controllers/importExportController.php on line 800
    ``` --- app/Controllers/importExportController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 9e485dd28..2d8d4e01d 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -797,7 +797,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { } // From https://stackoverflow.com/questions/1061710/php-zip-files-on-the-fly - $zip_file = tempnam('tmp', 'zip'); + $zip_file = @tempnam('/tmp', 'zip'); $zip = new ZipArchive(); $zip->open($zip_file, ZipArchive::OVERWRITE); -- cgit v1.2.3 From 16a131380bb1ae17a18e4bf95d345cffb80a787c Mon Sep 17 00:00:00 2001 From: Patrick Crandol Date: Sun, 18 Nov 2018 05:37:22 -0500 Subject: I18n standardization (#2138) * i18n Admin standardization cz - moved items incorrectly placed in system array to extensions array nl - remove registration array in user array that doesn't appear in any other translations - possibly from an old version that didn't get removed? oc - reordered list to standardize order with other translation files. * Alphabetize extensions Array * Standardize conf.php he - removed options not appearing in other i18n files, added missing strings * Standardize feedback.php he - removed line not found in other translation files nl - removed line not found in other translation files * Standardize gen.php * Standardize index.php Major sorting of oc. Added tags to several languages * Standardize install.php ru - added missing strings it - remove extra string not found in other config files he - add missing strings, remove strings not found in other languages oc - reorganize * Standardize sub.php * Standardize and fix TODOs use format "//TODO - Translation" for easier searching * Fix whitespace --- app/i18n/cz/admin.php | 34 +++--- app/i18n/cz/conf.php | 50 ++++----- app/i18n/cz/feedback.php | 18 +-- app/i18n/cz/gen.php | 29 ++--- app/i18n/cz/index.php | 6 +- app/i18n/cz/install.php | 8 +- app/i18n/cz/sub.php | 32 +++--- app/i18n/de/admin.php | 16 +-- app/i18n/de/conf.php | 32 +++--- app/i18n/de/feedback.php | 10 +- app/i18n/de/gen.php | 22 ++-- app/i18n/de/index.php | 4 +- app/i18n/de/install.php | 2 +- app/i18n/de/sub.php | 2 +- app/i18n/en/admin.php | 12 +- app/i18n/en/conf.php | 30 ++--- app/i18n/en/feedback.php | 8 +- app/i18n/en/gen.php | 22 ++-- app/i18n/en/index.php | 2 +- app/i18n/en/install.php | 6 +- app/i18n/en/sub.php | 2 +- app/i18n/es/admin.php | 24 ++-- app/i18n/es/conf.php | 50 ++++----- app/i18n/es/feedback.php | 18 +-- app/i18n/es/gen.php | 26 ++--- app/i18n/es/index.php | 6 +- app/i18n/es/install.php | 6 +- app/i18n/es/sub.php | 31 ++++-- app/i18n/fr/admin.php | 12 +- app/i18n/fr/conf.php | 30 ++--- app/i18n/fr/feedback.php | 8 +- app/i18n/fr/gen.php | 24 ++-- app/i18n/fr/sub.php | 2 +- app/i18n/he/admin.php | 132 +++++++++++----------- app/i18n/he/conf.php | 55 ++++----- app/i18n/he/feedback.php | 49 ++++---- app/i18n/he/gen.php | 60 +++++----- app/i18n/he/index.php | 6 +- app/i18n/he/install.php | 48 ++++---- app/i18n/he/sub.php | 35 +++--- app/i18n/it/admin.php | 26 ++--- app/i18n/it/conf.php | 48 ++++---- app/i18n/it/feedback.php | 18 +-- app/i18n/it/gen.php | 24 ++-- app/i18n/it/index.php | 6 +- app/i18n/it/install.php | 7 +- app/i18n/it/sub.php | 34 +++--- app/i18n/kr/admin.php | 16 +-- app/i18n/kr/conf.php | 32 +++--- app/i18n/kr/feedback.php | 12 +- app/i18n/kr/gen.php | 24 ++-- app/i18n/kr/index.php | 6 +- app/i18n/kr/install.php | 6 +- app/i18n/kr/sub.php | 4 +- app/i18n/nl/admin.php | 17 +-- app/i18n/nl/conf.php | 30 ++--- app/i18n/nl/feedback.php | 9 +- app/i18n/nl/gen.php | 24 ++-- app/i18n/nl/index.php | 3 +- app/i18n/nl/install.php | 2 +- app/i18n/nl/sub.php | 2 +- app/i18n/oc/admin.php | 181 +++++++++++++++--------------- app/i18n/oc/conf.php | 59 +++++----- app/i18n/oc/feedback.php | 9 +- app/i18n/oc/gen.php | 173 ++++++++++++++-------------- app/i18n/oc/index.php | 35 +++--- app/i18n/oc/install.php | 15 ++- app/i18n/oc/sub.php | 64 +++++------ app/i18n/pt-br/admin.php | 24 ++-- app/i18n/pt-br/conf.php | 50 ++++----- app/i18n/pt-br/feedback.php | 18 +-- app/i18n/pt-br/gen.php | 27 ++--- app/i18n/pt-br/index.php | 5 +- app/i18n/pt-br/install.php | 6 +- app/i18n/pt-br/sub.php | 26 ++--- app/i18n/ru/admin.php | 24 ++-- app/i18n/ru/conf.php | 262 +++++++++++++++++++++---------------------- app/i18n/ru/feedback.php | 144 ++++++++++++------------ app/i18n/ru/gen.php | 266 ++++++++++++++++++++++---------------------- app/i18n/ru/index.php | 71 ++++++------ app/i18n/ru/install.php | 14 ++- app/i18n/ru/sub.php | 124 ++++++++++----------- app/i18n/tr/admin.php | 24 ++-- app/i18n/tr/conf.php | 50 ++++----- app/i18n/tr/feedback.php | 18 +-- app/i18n/tr/gen.php | 26 ++--- app/i18n/tr/index.php | 6 +- app/i18n/tr/install.php | 6 +- app/i18n/tr/sub.php | 34 +++--- app/i18n/zh-cn/admin.php | 22 ++-- app/i18n/zh-cn/conf.php | 40 +++---- app/i18n/zh-cn/feedback.php | 18 +-- app/i18n/zh-cn/gen.php | 26 ++--- app/i18n/zh-cn/index.php | 6 +- app/i18n/zh-cn/install.php | 6 +- app/i18n/zh-cn/sub.php | 8 +- 96 files changed, 1620 insertions(+), 1586 deletions(-) (limited to 'app') diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php index 78a4a52e4..271a9a253 100644 --- a/app/i18n/cz/admin.php +++ b/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 - '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' => 'Nemáte framework Minz.', @@ -106,16 +106,23 @@ return array( ), ), 'extensions' => array( + '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 '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í)', ), 'title' => 'Rozšíření', + 'update' => 'Update available', //TODO - Translation 'user' => 'Uživatelská rozšíření', + 'version' => 'Version', //TODO - Translation ), 'stats' => array( '_' => 'Statistika', @@ -150,22 +157,15 @@ return array( 'top_feed' => 'Top ten kanálů', ), 'system' => array( - '_' => 'System configuration', // @todo translate - 'auto-update-url' => 'Auto-update server URL', // @todo translate - 'instance-name' => 'Instance name', // @todo translate - 'max-categories' => 'Categories per user limit', // @todo translate - 'max-feeds' => 'Feeds per user limit', // @todo translate + '_' => 'System configuration', //TODO - Translation + 'auto-update-url' => 'Auto-update server URL', //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ů', ), - 'community' => 'Available community extensions', // @todo translate - 'name' => 'Name', // @todo translate - 'version' => 'Version', // @todo translate - 'description' => 'Description', // @todo translate - 'author' => 'Author', // @todo translate - 'latest' => 'Installed', // @todo translate - 'update' => 'Update available', // @todo translate ), 'update' => array( '_' => 'Aktualizace systému', @@ -179,15 +179,15 @@ return array( 'user' => array( 'articles_and_size' => '%s článků (%s)', 'create' => 'Vytvořit nového uživatele', - 'delete_users' => 'Delete user', // TODO + 'delete_users' => 'Delete user', //TODO - Translation 'language' => 'Jazyk', 'number' => 'Zatím je vytvořen %d účet', 'numbers' => 'Zatím je vytvořeno %d účtů', 'password_form' => 'Heslo
    (pro přihlášení webovým formulářem)', 'password_format' => 'Alespoň 7 znaků', - 'selected' => 'Selected user', // TODO + 'selected' => 'Selected user', //TODO - Translation 'title' => 'Správa uživatelů', - 'update_users' => 'Update user', // TODO + 'update_users' => 'Update user', //TODO - Translation 'user_list' => 'Seznam uživatelů', 'username' => 'Přihlašovací jméno', 'users' => 'Uživatelé', diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php index 84ee78c73..0da2af39a 100644 --- a/app/i18n/cz/conf.php +++ b/app/i18n/cz/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Spodní řádek', 'entry' => 'Ikony článků', 'publication_date' => 'Datum vydání', - 'related_tags' => 'Související tagy', //TODO + 'related_tags' => 'Související tagy', //TODO - Translation 'sharing' => 'Sdílení', 'top_line' => 'Horní řádek', ), @@ -28,6 +28,7 @@ return array( 'seconds' => 'sekund (0 znamená žádný timeout)', 'timeout' => 'Timeout HTML5 notifikací', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO - Translation 'theme' => 'Vzhled', 'title' => 'Zobrazení', 'width' => array( @@ -37,12 +38,22 @@ return array( 'no_limit' => 'Bez limitu', 'thin' => 'Tenká', ), - 'show_nav_buttons' => 'Show the navigation buttons', //TODO + ), + 'profile' => array( + '_' => 'Správa profilu', + 'delete' => array( + '_' => 'Smazání účtu', + 'warn' => 'Váš účet bude smazán spolu se všemi souvisejícími daty', + ), + 'password_api' => 'Password API
    (tzn. pro mobilní aplikace)', + 'password_form' => 'Heslo
    (pro přihlášení webovým formulářem)', + 'password_format' => 'Alespoň 7 znaků', + 'title' => 'Profil', ), '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 + 'display' => 'Display user query results', //TODO - Translation 'filter' => 'Filtr aplikován:', 'get_all' => 'Zobrazit všechny články', 'get_category' => 'Zobrazit "%s" kategorii', @@ -53,7 +64,7 @@ return array( '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 + 'remove' => 'Remove user query', //TODO - Translation 'search' => 'Hledat "%s"', 'state_0' => 'Zobrazit všechny články', 'state_1' => 'Zobrazit přečtené články', @@ -73,31 +84,19 @@ return array( 'state_15' => 'Zobrazit všechny články', 'title' => 'Uživatelské dotazy', ), - 'profile' => array( - '_' => 'Správa profilu', - 'delete' => array( - '_' => 'Smazání účtu', - 'warn' => 'Váš účet bude smazán spolu se všemi souvisejícími daty', - ), - 'password_api' => 'Password API
    (tzn. pro mobilní aplikace)', - 'password_form' => 'Heslo
    (pro přihlášení webovým formulářem)', - 'password_format' => 'Alespoň 7 znaků', - 'title' => 'Profil', - ), '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', 'auto_remove_article' => 'Po přečtení články schovat', - 'mark_updated_article_unread' => 'Označte aktualizované položky jako nepřečtené', 'confirm_enabled' => 'Vyžadovat potvrzení pro akci “označit vše jako přečtené”', 'display_articles_unfolded' => 'Ve výchozím stavu zobrazovat články otevřené', 'display_categories_unfolded' => 'Ve výchozím stavu zobrazovat kategorie zavřené', 'hide_read_feeds' => 'Schovat kategorie a kanály s nulovým počtem nepřečtených článků (nefunguje s nastavením “Zobrazit všechny články”)', 'img_with_lazyload' => 'Použít "lazy load" mód pro načítaní obrázků', - 'sides_close_article' => 'Clicking outside of article text area closes the article', //TODO 'jump_next' => 'skočit na další nepřečtený (kanál nebo kategorii)', + 'mark_updated_article_unread' => 'Označte aktualizované položky jako nepřečtené', 'number_divided_when_reader' => 'V režimu “Čtení” děleno dvěma.', 'read' => array( 'article_open_on_website' => 'když je otevřen původní web s článkem', @@ -112,6 +111,7 @@ return array( 'all_articles' => 'Zobrazit všechny články', 'unread' => 'Zobrazit jen nepřečtené', ), + 'sides_close_article' => 'Clicking outside of article text area closes the article', //TODO - Translation 'sort' => array( '_' => 'Řazení', 'newer_first' => 'Nejdříve nejnovější', @@ -128,7 +128,7 @@ return array( ), 'sharing' => array( '_' => 'Sdílení', - 'add' => 'Add a sharing method', // TODO + 'add' => 'Add a sharing method', //TODO - Translation 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -136,7 +136,7 @@ return array( 'g+' => 'Google+', 'more_information' => 'Více informací', 'print' => 'Tisk', - 'remove' => 'Remove sharing method', // TODO + 'remove' => 'Remove sharing method', //TODO - Translation 'shaarli' => 'Shaarli', 'share_name' => 'Jméno pro zobrazení', 'share_url' => 'Jakou URL použít pro sdílení', @@ -153,27 +153,27 @@ return array( 'collapse_article' => 'Srolovat', 'first_article' => 'Skočit na první článek', 'focus_search' => 'Hledání', - 'global_view' => 'Switch to global view', // TODO + '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', 'load_more' => 'Načíst více článků', - 'mark_read' => 'Označit jako přečtené', 'mark_favorite' => 'Označit jako oblíbené', + '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ů.
    Pomocí přepínače "Alt" fungují v rámci kategorií.', 'next_article' => 'Skočit na další článek', - 'normal_view' => 'Switch to normal view', // TODO + '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 - 'rss_view' => 'Open RSS view in a new tab', // TODO + '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' => '+ shift označí vše jako přečtené', '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 + 'views' => 'Views', //TODO - Translation ), 'user' => array( 'articles_and_size' => '%s článků (%s)', diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php index fe85a3599..3d0dcbc96 100644 --- a/app/i18n/cz/feedback.php +++ b/app/i18n/cz/feedback.php @@ -50,11 +50,15 @@ return array( 'no_zip_extension' => 'Na serveru není naistalována podpora ZIP.', 'zip_error' => 'Během importu ZIP souboru došlo k chybě.', ), + 'profile' => array( + 'error' => 'Váš profil nelze změnit', + 'updated' => 'Váš profil byl změněn', + ), 'sub' => array( 'actualize' => 'Aktualizovat', 'articles' => array( - 'marked_read' => 'The selected articles have been marked as read.', //TODO - 'marked_unread' => 'The articles have been marked as unread.', //TODO + '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.', @@ -76,7 +80,7 @@ return array( 'already_subscribed' => 'Již jste přihlášen k odběru %s', 'deleted' => 'Kanál byl smazán', 'error' => 'Kanál nelze aktualizovat', - 'internal_problem' => 'RSS kanál nelze přidat. Pro detaily zkontrolujte logy FreshRSS.', // @todo + 'internal_problem' => 'RSS kanál nelze přidat. Pro detaily zkontrolujte logy FreshRSS.', //TODO - Translation 'invalid_url' => 'URL %s není platné', 'n_actualized' => '%d kanálů bylo aktualizováno', 'n_entries_deleted' => '%d článků bylo smazáno', @@ -105,12 +109,8 @@ return array( 'error' => 'Uživatele %s nelze smazat', ), 'updated' => array( - '_' => 'User %s has been updated', // TODO - 'error' => 'User %s has not been updated', // TODO + '_' => 'User %s has been updated', //TODO - Translation + 'error' => 'User %s has not been updated', //TODO - Translation ), ), - 'profile' => array( - 'error' => 'Váš profil nelze změnit', - 'updated' => 'Váš profil byl změněn', - ), ); diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php index eab572be4..27ff9414c 100644 --- a/app/i18n/cz/gen.php +++ b/app/i18n/cz/gen.php @@ -19,7 +19,7 @@ return array( 'see_website' => 'Navštívit WWW stránku', 'submit' => 'Odeslat', 'truncate' => 'Smazat všechny články', - 'update' => 'Update', // TODO + 'update' => 'Update', //TODO - Translation ), 'auth' => array( 'email' => 'Email', @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\D\\u\\b\\e\\n', - 'Aug' => '\\S\\r\\p\\e\\n', - 'Dec' => '\\P\\r\\o\\s\\i\\n\\e\\c', - 'Feb' => '\\Ú\\n\\o\\r', - 'Jan' => '\\L\\e\\d\\e\\n', - 'Jul' => '\\Č\\e\\r\\v\\e\\n\\e\\c', - 'Jun' => '\\Č\\e\\r\\v\\e\\n', - 'Mar' => '\\B\\ř\\e\\z\\e\\n', - 'May' => '\\K\\v\\ě\\t\\e\\n', - 'Nov' => '\\L\\i\\s\\t\\o\\p\\a\\d', - 'Oct' => '\\Ř\\í\\j\\e\\n', - 'Sep' => '\\Z\\á\\ř\\í', 'apr' => 'dub', 'april' => 'Dub', + 'Aug' => '\\S\\r\\p\\e\\n', 'aug' => 'srp', 'august' => 'Srp', 'before_yesterday' => 'Předevčírem', + 'Dec' => '\\P\\r\\o\\s\\i\\n\\e\\c', 'dec' => 'pro', 'december' => 'Pro', + 'Feb' => '\\Ú\\n\\o\\r', 'feb' => 'úno', 'february' => 'Úno', 'format_date' => 'j\\. %s Y', 'format_date_hour' => 'j\\. %s Y \\v H\\:i', 'fri' => 'Pá', + 'Jan' => '\\L\\e\\d\\e\\n', 'jan' => 'led', 'january' => 'Led', + 'Jul' => '\\Č\\e\\r\\v\\e\\n\\e\\c', 'jul' => 'čvn', 'july' => 'Čvn', + 'Jun' => '\\Č\\e\\r\\v\\e\\n', 'jun' => 'čer', 'june' => 'Čer', 'last_3_month' => 'Minulé tři měsíce', @@ -78,17 +73,22 @@ 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', 'march' => 'Bře', + 'May' => '\\K\\v\\ě\\t\\e\\n', 'may' => 'Květen', 'may_' => 'Kvě', 'mon' => 'Po', 'month' => 'měsíce', + 'Nov' => '\\L\\i\\s\\t\\o\\p\\a\\d', 'nov' => 'lis', 'november' => 'Lis', + 'Oct' => '\\Ř\\í\\j\\e\\n', 'oct' => 'říj', 'october' => 'Říj', 'sat' => 'So', + 'Sep' => '\\Z\\á\\ř\\í', 'sep' => 'zář', 'september' => 'Zář', 'sun' => 'Ne', @@ -146,7 +146,7 @@ return array( 'sharing' => 'Sdílení', 'shortcuts' => 'Zkratky', 'stats' => 'Statistika', - 'system' => 'System configuration', // @todo translate + 'system' => 'System configuration', //TODO - Translation 'update' => 'Aktualizace', 'user_management' => 'Správa uživatelů', 'user_profile' => 'Profil', @@ -161,7 +161,6 @@ return array( 'previous' => 'Předchozí', ), 'share' => array( - 'Known' => 'Known based sites', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -169,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => 'Known based sites', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', @@ -187,6 +187,7 @@ return array( 'damn' => 'Sakra!', 'default_category' => 'Nezařazeno', 'no' => 'Ne', + 'not_applicable' => 'Not available', //TODO - Translation 'ok' => 'Ok!', 'or' => 'nebo', 'yes' => 'Ano', diff --git a/app/i18n/cz/index.php b/app/i18n/cz/index.php index 7e60ca379..00f424fe8 100644 --- a/app/i18n/cz/index.php +++ b/app/i18n/cz/index.php @@ -40,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 + '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í', @@ -53,11 +53,11 @@ return array( 'starred' => 'Zobrazit oblíbené', 'stats' => 'Statistika', 'subscription' => 'Správa subskripcí', - 'tags' => 'My labels', //TODO + 'tags' => 'My labels', //TODO - Translation 'unread' => 'Zobrazovat nepřečtené', ), 'share' => 'Sdílet', 'tag' => array( - 'related' => 'Související tagy', //TODO + 'related' => 'Související tagy', //TODO - Translation ), ); diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php index acdb48ab6..d1b5d1616 100644 --- a/app/i18n/cz/install.php +++ b/app/i18n/cz/install.php @@ -24,8 +24,8 @@ return array( 'ok' => 'Nastavení databáze bylo uloženo.', ), 'host' => 'Hostitel', - 'prefix' => 'Prefix tabulky', 'password' => 'Heslo', + 'prefix' => 'Prefix tabulky', 'type' => 'Typ databáze', 'username' => 'Uživatel', ), @@ -45,7 +45,7 @@ return array( 'ok' => 'Máte rozšíření cURL.', ), 'data' => array( - 'nok' => 'Zkontrolujte oprávnění adresáře ./data. HTTP server musí mít do tohoto adresáře práva zápisu', + 'nok' => 'Zkontrolujte oprávnění adresáře ./data. HTTP server musí mít do tohoto adresáře práva zápisu', 'ok' => 'Oprávnění adresáře data jsou v pořádku.', ), 'dom' => array( @@ -69,8 +69,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 - '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' => 'Nemáte framework Minz.', diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php index 55441aaf8..fc06fb4dc 100644 --- a/app/i18n/cz/sub.php +++ b/app/i18n/cz/sub.php @@ -2,13 +2,13 @@ return array( 'api' => array( - 'documentation' => 'Copy the following URL to use it within an external tool.',// TODO - 'title' => 'API',// TODO + '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 - 'title' => 'Bookmarklet',// TODO + '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', @@ -27,7 +27,7 @@ return array( 'password' => 'Heslo', 'username' => 'Přihlašovací jméno', ), - 'clear_cache' => 'Always clear cache', //TODO + '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', @@ -36,30 +36,30 @@ return array( 'informations' => 'Informace', 'keep_history' => '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 %s.', - 'mute' => 'mute', // TODO + 'mute' => 'mute', //TODO - Translation 'no_selected' => 'Nejsou označeny žádné kanály.', 'number_entries' => '%d článků', 'priority' => array( - '_' => 'Visibility', // TODO - 'archived' => 'Do not show (archived)', // TODO + '_' => 'Visibility', //TODO - Translation + 'archived' => 'Do not show (archived)', //TODO - Translation 'main_stream' => 'Zobrazit ve “Všechny kanály”', - 'normal' => 'Show in its category', // TODO + 'normal' => 'Show in its category', //TODO - Translation ), - 'ssl_verify' => 'Verify SSL security', //TODO + 'pubsubhubbub' => 'Okamžité oznámení s PubSubHubbub', + 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistika', 'think_to_add' => 'Můžete přidat kanály.', - 'timeout' => 'Timeout in seconds', //TODO + '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', - 'pubsubhubbub' => 'Okamžité oznámení s PubSubHubbub', ), 'firefox' => array( 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.',// TODO - 'title' => 'Firefox feed reader',// TODO + 'title' => 'Firefox feed reader', //TODO - Translation ), 'import_export' => array( 'export' => 'Export', @@ -76,11 +76,11 @@ return array( 'bookmark' => 'Přihlásit (FreshRSS bookmark)', 'import_export' => 'Import / export', 'subscription_management' => 'Správa subskripcí', - 'subscription_tools' => 'Subscription tools',// TODO + 'subscription_tools' => 'Subscription tools', //TODO - Translation ), 'title' => array( '_' => 'Správa subskripcí', 'feed_management' => 'Správa RSS kanálů', - 'subscription_tools' => 'Subscription tools',// TODO + 'subscription_tools' => 'Subscription tools', //TODO - Translation ), ); diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php index 2eb4a69f6..fe626bb70 100644 --- a/app/i18n/de/admin.php +++ b/app/i18n/de/admin.php @@ -67,8 +67,8 @@ return array( 'ok' => 'Sie haben die JSON-Erweiterung.', ), 'mbstring' => array( - 'nok' => 'Ihnen fehlt die mbstring-Bibliothek für Unicode.', //TODO - 'ok' => 'Sie haben die empfohlene mbstring-Bliothek für Unicode.', //TODO + 'nok' => 'Ihnen fehlt die mbstring-Bibliothek für Unicode.', + 'ok' => 'Sie haben die empfohlene mbstring-Bliothek für Unicode.', ), 'minz' => array( 'nok' => 'Ihnen fehlt das Minz-Framework.', @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + 'author' => 'Autor', + 'community' => 'Verfügbare Community Erweiterungen', + 'description' => 'Beschreibungen', 'disabled' => 'Deaktiviert', 'empty_list' => 'Es gibt keine installierte Erweiterung.', 'enabled' => 'Aktiviert', + 'latest' => 'Installiert', + 'name' => 'Name', 'no_configure_view' => 'Diese Erweiterung kann nicht konfiguriert werden.', 'system' => array( '_' => 'System-Erweiterungen', 'no_rights' => 'System-Erweiterung (Sie haben keine Berechtigung dafür)', ), 'title' => 'Erweiterungen', + 'update' => 'Update verfügbar', 'user' => 'Benutzer-Erweiterungen', - 'community' => 'Verfügbare Community Erweiterungen', - 'name' => 'Name', 'version' => 'Version', - 'description' => 'Beschreibungen', - 'author' => 'Autor', - 'latest' => 'Installiert', - 'update' => 'Update verfügbar', ), 'stats' => array( '_' => 'Statistiken', diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php index 579363cb5..01dddacfc 100644 --- a/app/i18n/de/conf.php +++ b/app/i18n/de/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Fußzeile', 'entry' => 'Artikel-Symbole', 'publication_date' => 'Datum der Veröffentlichung', - 'related_tags' => 'Verwandte Tags', //TODO + 'related_tags' => 'Verwandte Tags', 'sharing' => 'Teilen', 'top_line' => 'Kopfzeile', ), @@ -28,6 +28,7 @@ return array( 'seconds' => 'Sekunden (0 bedeutet keine Zeitüberschreitung)', 'timeout' => 'Zeitüberschreitung für HTML5-Benachrichtigung', ), + 'show_nav_buttons' => 'Zeige Navigations-Buttons', 'theme' => 'Erscheinungsbild', 'title' => 'Anzeige', 'width' => array( @@ -37,7 +38,17 @@ return array( 'no_limit' => 'Keine Begrenzung', 'thin' => 'Klein', ), - 'show_nav_buttons' => 'Zeige Navigations-Buttons', + ), + 'profile' => array( + '_' => 'Profil-Verwaltung', + 'delete' => array( + '_' => 'Accountlöschung', + 'warn' => 'Dein Account und alle damit bezogenen Daten werden gelöscht.', + ), + 'password_api' => 'Passwort-API
    (z. B. für mobile Anwendungen)', + 'password_form' => 'Passwort
    (für die Anmeldemethode per Webformular)', + 'password_format' => 'mindestens 7 Zeichen', + 'title' => 'Profil', ), 'query' => array( '_' => 'Benutzerabfragen', @@ -73,31 +84,19 @@ return array( 'state_15' => 'Alle Artikel anzeigen', 'title' => 'Benutzerabfragen', ), - 'profile' => array( - '_' => 'Profil-Verwaltung', - 'delete' => array( - '_' => 'Accountlöschung', - 'warn' => 'Dein Account und alle damit bezogenen Daten werden gelöscht.', - ), - 'password_api' => 'Passwort-API
    (z. B. für mobile Anwendungen)', - 'password_form' => 'Passwort
    (für die Anmeldemethode per Webformular)', - 'password_format' => 'mindestens 7 Zeichen', - 'title' => 'Profil', - ), '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', 'auto_remove_article' => 'Artikel nach dem Lesen verstecken', - 'mark_updated_article_unread' => 'Markieren Sie aktualisierte Artikel als ungelesen', 'confirm_enabled' => 'Bei der Aktion „Alle als gelesen markieren“ einen Bestätigungsdialog anzeigen', 'display_articles_unfolded' => 'Artikel standardmäßig ausgeklappt zeigen', 'display_categories_unfolded' => 'Kategorien standardmäßig eingeklappt zeigen', 'hide_read_feeds' => 'Kategorien & Feeds ohne ungelesene Artikel verstecken (funktioniert nicht mit der Einstellung „Alle Artikel zeigen“)', 'img_with_lazyload' => 'Verwende die "träges Laden"-Methode zum Laden von Bildern', - 'sides_close_article' => 'Klick außerhalb des Artikel-Textes schließt den Artikel', 'jump_next' => 'springe zum nächsten ungelesenen Geschwisterelement (Feed oder Kategorie)', + 'mark_updated_article_unread' => 'Markieren Sie aktualisierte Artikel als ungelesen', 'number_divided_when_reader' => 'Geteilt durch 2 in der Lese-Ansicht.', 'read' => array( 'article_open_on_website' => 'wenn der Artikel auf der Original-Webseite geöffnet wird', @@ -112,6 +111,7 @@ return array( 'all_articles' => 'Alle Artikel zeigen', 'unread' => 'Nur ungelesene zeigen', ), + 'sides_close_article' => 'Klick außerhalb des Artikel-Textes schließt den Artikel', 'sort' => array( '_' => 'Sortierreihenfolge', 'newer_first' => 'Neuere zuerst', @@ -158,8 +158,8 @@ return array( 'javascript' => 'JavaScript muss aktiviert sein, um Tastaturkürzel benutzen zu können', 'last_article' => 'Zum letzten Artikel springen', 'load_more' => 'Weitere Artikel laden', - 'mark_read' => 'Als gelesen markieren', 'mark_favorite' => 'Als Favorit markieren', + 'mark_read' => 'Als gelesen markieren', 'navigation' => 'Navigation', 'navigation_help' => 'Mit der "Umschalttaste" finden die Tastenkombination auf Feeds Anwendung.
    Mit der "Alt-Taste" finden die Tastenkombination auf Kategorien Anwendung.', 'next_article' => 'Zum nächsten Artikel springen', diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php index dc4f679f9..269069162 100644 --- a/app/i18n/de/feedback.php +++ b/app/i18n/de/feedback.php @@ -50,6 +50,10 @@ return array( 'no_zip_extension' => 'Die ZIP-Erweiterung ist auf Ihrem Server nicht vorhanden.', 'zip_error' => 'Ein Fehler trat während des ZIP-Imports auf.', ), + 'profile' => array( + 'error' => 'Ihr Profil kann nicht geändert werden', + 'updated' => 'Ihr Profil ist geändert worden', + ), 'sub' => array( 'actualize' => 'Aktualisieren', 'articles' => array( @@ -76,7 +80,7 @@ return array( 'already_subscribed' => 'Sie haben %s bereits abonniert', 'deleted' => 'Der Feed ist gelöscht worden', 'error' => 'Der Feed kann nicht aktualisiert werden', - 'internal_problem' => 'Der RSS-Feed konnte nicht hinzugefügt werden. Für Details prüfen Sie die FreshRSS-Protokolle.', // @todo + 'internal_problem' => 'Der RSS-Feed konnte nicht hinzugefügt werden. Für Details prüfen Sie die FreshRSS-Protokolle.', 'invalid_url' => 'Die URL %s ist ungültig', 'n_actualized' => 'Die %d Feeds sind aktualisiert worden', 'n_entries_deleted' => 'Die %d Artikel sind gelöscht worden', @@ -109,8 +113,4 @@ return array( 'error' => 'Benutzer %s wurde nicht aktualisiert', ), ), - 'profile' => array( - 'error' => 'Ihr Profil kann nicht geändert werden', - 'updated' => 'Ihr Profil ist geändert worden', - ), ); diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php index 935ab6a75..59ce371d3 100644 --- a/app/i18n/de/gen.php +++ b/app/i18n/de/gen.php @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\A\\p\\r\\i\\l', - 'Aug' => '\\A\\u\\g\\u\\s\\t', - 'Dec' => '\\D\\e\\z\\e\\m\\b\\e\\r', - 'Feb' => '\\F\\e\\b\\r\\u\\a\\r', - 'Jan' => '\\J\\a\\n\\u\\a\\r', - 'Jul' => '\\J\\u\\l\\i', - 'Jun' => '\\J\\u\\n\\i', - 'Mar' => '\\M\\ä\\r\\z', - 'May' => '\\M\\a\\i', - 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', - 'Oct' => '\\O\\k\\t\\o\\b\\e\\r', - 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', 'apr' => 'Apr', 'april' => 'April', + 'Aug' => '\\A\\u\\g\\u\\s\\t', 'aug' => 'Aug', 'august' => 'August', 'before_yesterday' => 'Ältere Beiträge', + 'Dec' => '\\D\\e\\z\\e\\m\\b\\e\\r', 'dec' => 'Dez', 'december' => 'Dezember', + 'Feb' => '\\F\\e\\b\\r\\u\\a\\r', 'feb' => 'Feb', 'february' => 'Februar', 'format_date' => 'd\\. %s Y', 'format_date_hour' => 'd\\. %s Y \\u\\m H\\:i', 'fri' => 'Fr', + 'Jan' => '\\J\\a\\n\\u\\a\\r', 'jan' => 'Jan', 'january' => 'Januar', + 'Jul' => '\\J\\u\\l\\i', 'jul' => 'Jul', 'july' => 'Juli', + 'Jun' => '\\J\\u\\n\\i', 'jun' => 'Jun', 'june' => 'Juni', 'last_3_month' => 'Letzte drei Monate', @@ -78,17 +73,22 @@ return array( 'last_month' => 'Letzter Monat', 'last_week' => 'Letzte Woche', 'last_year' => 'Letztes Jahr', + 'Mar' => '\\M\\ä\\r\\z', 'mar' => 'Mär', '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' => 'Nov', 'november' => 'November', + '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' => 'Sep', 'september' => 'September', 'sun' => 'So', diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php index 2d0dcc2dd..10172e6f5 100644 --- a/app/i18n/de/index.php +++ b/app/i18n/de/index.php @@ -53,11 +53,11 @@ return array( 'starred' => 'Nur Favoriten zeigen', 'stats' => 'Statistiken', 'subscription' => 'Abonnementverwaltung', - 'tags' => 'My labels', //TODO + 'tags' => 'My labels', //TODO - Translation 'unread' => 'Nur ungelesene zeigen', ), 'share' => 'Teilen', 'tag' => array( - 'related' => 'Verwandte Tags', //TODO + 'related' => 'Verwandte Tags', ), ); diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php index d5a28f440..6fc8f2149 100644 --- a/app/i18n/de/install.php +++ b/app/i18n/de/install.php @@ -24,8 +24,8 @@ return array( 'ok' => 'Datenbank-Konfiguration ist gespeichert worden.', ), 'host' => 'Host', - 'prefix' => 'Tabellen-Präfix', 'password' => 'SQL-Password', + 'prefix' => 'Tabellen-Präfix', 'type' => 'Datenbank-Typ', 'username' => 'SQL-Nutzername', ), diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index 6a1100dba..32446c3fa 100644 --- a/app/i18n/de/sub.php +++ b/app/i18n/de/sub.php @@ -45,6 +45,7 @@ return array( 'main_stream' => 'In Haupt-Feeds zeigen', 'normal' => 'Zeige in eigener Kategorie', ), + 'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub', 'ssl_verify' => 'Überprüfe SSL Sicherheit', 'stats' => 'Statistiken', 'think_to_add' => 'Sie können Feeds hinzufügen.', @@ -55,7 +56,6 @@ return array( 'url' => 'Feed-URL', 'validator' => 'Überprüfen Sie die Gültigkeit des Feeds', 'website' => 'Webseiten-URL', - 'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub', ), 'firefox' => array( 'documentation' => 'Folge den hier beschriebenen Schritten um FreshRSS zu Deiner Firefox RSS-Reader Liste hinzuzufügen.', diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php index 9db14978f..b1252d672 100644 --- a/app/i18n/en/admin.php +++ b/app/i18n/en/admin.php @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + 'author' => 'Author', + 'community' => 'Available community extensions', + 'description' => 'Description', 'disabled' => 'Disabled', 'empty_list' => 'There are no installed extensions', 'enabled' => 'Enabled', + 'latest' => 'Installed', + 'name' => 'Name', 'no_configure_view' => 'This extension cannot be configured.', 'system' => array( '_' => 'System extensions', 'no_rights' => 'System extension (you have no rights on it)', ), 'title' => 'Extensions', + 'update' => 'Update available', 'user' => 'User extensions', - 'community' => 'Available community extensions', - 'name' => 'Name', 'version' => 'Version', - 'description' => 'Description', - 'author' => 'Author', - 'latest' => 'Installed', - 'update' => 'Update available', ), 'stats' => array( '_' => 'Statistics', diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index 5c128f8e7..bf494162d 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -28,6 +28,7 @@ return array( 'seconds' => 'seconds (0 means no timeout)', 'timeout' => 'HTML5 notification timeout', ), + 'show_nav_buttons' => 'Show the navigation buttons', 'theme' => 'Theme', 'title' => 'Display', 'width' => array( @@ -37,7 +38,17 @@ return array( 'no_limit' => 'No limit', 'thin' => 'Thin', ), - 'show_nav_buttons' => 'Show the navigation buttons', + ), + 'profile' => array( + '_' => 'Profile management', + 'delete' => array( + '_' => 'Account deletion', + 'warn' => 'Your account and all related data will be deleted.', + ), + 'password_api' => 'API password
    (e.g., for mobile apps)', + 'password_form' => 'Password
    (for the Web-form login method)', + 'password_format' => 'At least 7 characters', + 'title' => 'Profile', ), 'query' => array( '_' => 'User queries', @@ -73,31 +84,19 @@ return array( 'state_15' => 'Display all articles', 'title' => 'User queries', ), - 'profile' => array( - '_' => 'Profile management', - 'delete' => array( - '_' => 'Account deletion', - 'warn' => 'Your account and all related data will be deleted.', - ), - 'password_api' => 'API password
    (e.g., for mobile apps)', - 'password_form' => 'Password
    (for the Web-form login method)', - 'password_format' => 'At least 7 characters', - 'title' => 'Profile', - ), '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', 'auto_remove_article' => 'Hide articles after reading', - 'mark_updated_article_unread' => 'Mark updated articles as unread', 'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions', 'display_articles_unfolded' => 'Show articles unfolded by default', 'display_categories_unfolded' => 'Show categories folded by default', 'hide_read_feeds' => 'Hide categories & feeds with no unread articles (does not work with “Show all articles” configuration)', 'img_with_lazyload' => 'Use "lazy load" mode to load pictures', - 'sides_close_article' => 'Clicking outside of article text area closes the article', 'jump_next' => 'jump to next unread sibling (feed or category)', + 'mark_updated_article_unread' => 'Mark updated articles as unread', 'number_divided_when_reader' => 'Divided by 2 in the reading view.', 'read' => array( 'article_open_on_website' => 'when article is opened on its original website', @@ -112,6 +111,7 @@ return array( 'all_articles' => 'Show all articles', 'unread' => 'Show only unread', ), + 'sides_close_article' => 'Clicking outside of article text area closes the article', 'sort' => array( '_' => 'Sort order', 'newer_first' => 'Newest first', @@ -158,8 +158,8 @@ return array( 'javascript' => 'JavaScript must be enabled in order to use shortcuts', 'last_article' => 'Skip to the last article', 'load_more' => 'Load more articles', - 'mark_read' => 'Mark as read', 'mark_favorite' => 'Mark as favourite', + 'mark_read' => 'Mark as read', 'navigation' => 'Navigation', 'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.
    With the "Alt" modifier, navigation shortcuts apply on categories.', 'next_article' => 'Skip to the next article', diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php index 634b547f7..2322a62cc 100644 --- a/app/i18n/en/feedback.php +++ b/app/i18n/en/feedback.php @@ -50,6 +50,10 @@ return array( 'no_zip_extension' => 'ZIP extension is not present on your server.', 'zip_error' => 'An error occured during ZIP import.', ), + 'profile' => array( + 'error' => 'Your profile cannot be modified', + 'updated' => 'Your profile has been modified', + ), 'sub' => array( 'actualize' => 'Updating', 'articles' => array( @@ -109,8 +113,4 @@ return array( 'error' => 'User %s has not been updated', ), ), - 'profile' => array( - 'error' => 'Your profile cannot be modified', - 'updated' => 'Your profile has been modified', - ), ); diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php index 9328a35ec..f0ce8ed02 100644 --- a/app/i18n/en/gen.php +++ b/app/i18n/en/gen.php @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\A\\p\\r\\i\\l', - 'Aug' => '\\A\\u\\g\\u\\s\\t', - 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', - 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y', - 'Jan' => '\\J\\a\\n\\u\\a\\r\\y', - 'Jul' => '\\J\\u\\l\\y', - 'Jun' => '\\J\\u\\n\\e', - 'Mar' => '\\M\\a\\r\\c\\h', - 'May' => '\\M\\a\\y', - 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', - 'Oct' => '\\O\\c\\t\\o\\b\\e\\r', - 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', 'apr' => 'Apr.', 'april' => 'April', + 'Aug' => '\\A\\u\\g\\u\\s\\t', 'aug' => 'Aug.', 'august' => 'August', 'before_yesterday' => 'Before yesterday', + 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', 'dec' => 'Dec.', 'december' => 'December', + 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y', 'feb' => 'Feb.', 'february' => 'February', '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', 'jan' => 'Jan.', 'january' => 'January', + 'Jul' => '\\J\\u\\l\\y', 'jul' => 'July', 'july' => 'July', + 'Jun' => '\\J\\u\\n\\e', 'jun' => 'June', 'june' => 'June', 'last_3_month' => 'Last three months', @@ -78,16 +73,21 @@ return array( 'last_month' => 'Last month', 'last_week' => 'Last week', 'last_year' => 'Last year', + 'Mar' => '\\M\\a\\r\\c\\h', 'mar' => 'Mar.', 'march' => 'March', + 'May' => '\\M\\a\\y', 'may' => 'May', 'may_' => 'May', 'mon' => 'Mon', 'month' => 'months', + 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', 'nov' => 'Nov.', 'november' => 'November', + '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' => 'Sept.', 'september' => 'September', diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php index 427a769a0..46c415816 100644 --- a/app/i18n/en/index.php +++ b/app/i18n/en/index.php @@ -58,6 +58,6 @@ return array( ), 'share' => 'Share', 'tag' => array( - 'related' => 'Article tags', //TODO + 'related' => 'Article tags', ), ); diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php index 53d2f9be0..395919e9a 100644 --- a/app/i18n/en/install.php +++ b/app/i18n/en/install.php @@ -24,8 +24,8 @@ return array( 'ok' => 'Database configuration has been saved.', ), 'host' => 'Host', - 'prefix' => 'Table prefix', 'password' => 'Database password', + 'prefix' => 'Table prefix', 'type' => 'Type of database', 'username' => 'Database username', ), @@ -69,8 +69,8 @@ return array( 'ok' => 'You have a recommended library to parse JSON.', ), '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.', + 'ok' => 'You have the recommended library mbstring for Unicode.', ), 'minz' => array( 'nok' => 'Cannot find the Minz framework.', diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php index 22c7edc30..154d42e95 100644 --- a/app/i18n/en/sub.php +++ b/app/i18n/en/sub.php @@ -45,6 +45,7 @@ return array( 'main_stream' => 'Show in main stream', 'normal' => 'Show in its category', ), + 'pubsubhubbub' => 'Instant notification with PubSubHubbub', 'ssl_verify' => 'Verify SSL security', 'stats' => 'Statistics', 'think_to_add' => 'You may add some feeds.', @@ -55,7 +56,6 @@ return array( 'url' => 'Feed URL', 'validator' => 'Check the validity of the feed', 'website' => 'Website URL', - 'pubsubhubbub' => 'Instant notification with PubSubHubbub', ), 'firefox' => array( 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.', diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php index db41057bf..bd4446ce5 100755 --- a/app/i18n/es/admin.php +++ b/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 - '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' => 'No se ha podido localizar el entorno Minz.', @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + '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 '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)', ), 'title' => 'Extensiones', + 'update' => 'Update available', //TODO - Translation 'user' => 'Extensiones de usuario', - 'community' => 'Available community extensions', // @todo translate - 'name' => 'Name', // @todo translate - 'version' => 'Version', // @todo translate - 'description' => 'Description', // @todo translate - 'author' => 'Author', // @todo translate - 'latest' => 'Installed', // @todo translate - 'update' => 'Update available', // @todo translate + 'version' => 'Version', //TODO - Translation ), 'stats' => array( '_' => 'Estadísticas', @@ -179,15 +179,15 @@ return array( 'user' => array( 'articles_and_size' => '%s articles (%s)', 'create' => 'Crear nuevo usuario', - 'delete_users' => 'Delete user', // TODO + 'delete_users' => 'Delete user', //TODO - Translation 'language' => 'Idioma', 'number' => 'Hay %d cuenta creada', 'numbers' => 'Hay %d cuentas creadas', 'password_form' => 'Contraseña
    (para el método de identificación por formulario web)', 'password_format' => 'Mínimo de 7 caracteres', - 'selected' => 'Selected user', // TODO + 'selected' => 'Selected user', //TODO - Translation 'title' => 'Administrar usuarios', - 'update_users' => 'Update user', // TODO + 'update_users' => 'Update user', //TODO - Translation 'user_list' => 'Lista de usuarios', 'username' => 'Nombre de usuario', 'users' => 'Usuarios', diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php index 095015d47..4585e4d60 100755 --- a/app/i18n/es/conf.php +++ b/app/i18n/es/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Línea inferior', 'entry' => 'Iconos de artículos', 'publication_date' => 'Fecha de publicación', - 'related_tags' => 'Etiquetas relacionadas', //TODO + 'related_tags' => 'Etiquetas relacionadas', 'sharing' => 'Compartir', 'top_line' => 'Línea superior', ), @@ -28,6 +28,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 'theme' => 'Tema', 'title' => 'Visualización', 'width' => array( @@ -37,12 +38,22 @@ return array( 'no_limit' => 'Sin límite', 'thin' => 'Estrecho', ), - 'show_nav_buttons' => 'Show the navigation buttons', //TODO + ), + 'profile' => array( + '_' => 'Administración de perfiles', + 'delete' => array( + '_' => 'Borrar cuenta', + 'warn' => 'Tu cuenta y todos los datos asociados serán eliminados.', + ), + 'password_api' => 'Contraseña API
    (para apps móviles, por ej.)', + 'password_form' => 'Contraseña
    (para el método de identificación por formulario web)', + 'password_format' => 'Mínimo de 7 caracteres', + 'title' => 'Perfil', ), '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 + 'display' => 'Display user query results', //TODO - Translation 'filter' => 'Filtro aplicado:', 'get_all' => 'Mostrar todos los artículos', 'get_category' => 'Mostrar la categoría "%s"', @@ -53,7 +64,7 @@ return array( '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 + 'remove' => 'Remove user query', //TODO - Translation 'search' => 'Buscar "%s"', 'state_0' => 'Mostrar todos los artículos', 'state_1' => 'Mostrar artículos leídos', @@ -73,31 +84,19 @@ return array( 'state_15' => 'Mostrar todos los artículos', 'title' => 'Consultas de usuario', ), - 'profile' => array( - '_' => 'Administración de perfiles', - 'delete' => array( - '_' => 'Borrar cuenta', - 'warn' => 'Tu cuenta y todos los datos asociados serán eliminados.', - ), - 'password_api' => 'Contraseña API
    (para apps móviles, por ej.)', - 'password_form' => 'Contraseña
    (para el método de identificación por formulario web)', - 'password_format' => 'Mínimo de 7 caracteres', - 'title' => 'Perfil', - ), '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', 'auto_remove_article' => 'Ocultar artículos tras la lectura', - 'mark_updated_article_unread' => 'Marcar artículos actualizados como no leídos', 'confirm_enabled' => 'Mostrar ventana de confirmación al usar la función “marcar todos como leídos”', 'display_articles_unfolded' => 'Mostrar los artículos sin expandir por defecto', 'display_categories_unfolded' => 'Mostrar categorías expandidas por defecto', 'hide_read_feeds' => 'Ocultar categorías & fuentes sin artículos no leídos (no funciona con la configuración "Mostrar todos los artículos")', 'img_with_lazyload' => 'Usar el modo de "carga perezosa" para las imágenes', - 'sides_close_article' => 'Pinchar fuera del área de texto del artículo lo cerrará', 'jump_next' => 'saltar al siguiente archivo sin leer emparentado (fuente o categoría)', + 'mark_updated_article_unread' => 'Marcar artículos actualizados como no leídos', 'number_divided_when_reader' => 'Dividido en 2 en la vista de lectura.', 'read' => array( 'article_open_on_website' => 'cuando el artículo se abra en su web original', @@ -112,6 +111,7 @@ return array( 'all_articles' => 'Mostrar todos los artículos', 'unread' => 'Mostrar solo pendientes', ), + 'sides_close_article' => 'Pinchar fuera del área de texto del artículo lo cerrará', 'sort' => array( '_' => 'Orden', 'newer_first' => 'Nuevos primero', @@ -128,7 +128,7 @@ return array( ), 'sharing' => array( '_' => 'Compartir', - 'add' => 'Add a sharing method', // TODO + 'add' => 'Add a sharing method', //TODO - Translation 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -136,7 +136,7 @@ return array( 'g+' => 'Google+', 'more_information' => 'Más información', 'print' => 'Print', - 'remove' => 'Remove sharing method', // TODO + 'remove' => 'Remove sharing method', //TODO - Translation 'shaarli' => 'Shaarli', 'share_name' => 'Compartir nombre a mostrar', 'share_url' => 'Compatir URL a usar', @@ -153,27 +153,27 @@ 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 + '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', 'load_more' => 'Cargar más artículos', - 'mark_read' => 'Marcar como leído', 'mark_favorite' => 'Marcar como favorito', + '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.
    Con el modificador "Alt" es posible aplicar los atajos de teclado en las categorías.', 'next_article' => 'Saltar al siguiente artículo', - 'normal_view' => 'Switch to normal view', // TODO + '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 - 'rss_view' => 'Open RSS view in a new tab', // TODO + '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' => '+ mayúsculas para marcar todos los artículos como leídos', '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 + 'views' => 'Views', //TODO - Translation ), 'user' => array( 'articles_and_size' => '%s artículos (%s)', diff --git a/app/i18n/es/feedback.php b/app/i18n/es/feedback.php index 38548e901..d70ccfe8a 100755 --- a/app/i18n/es/feedback.php +++ b/app/i18n/es/feedback.php @@ -50,11 +50,15 @@ return array( 'no_zip_extension' => 'La extensión ZIP no está disponible en tu servidor.', 'zip_error' => 'Hubo un error durante la importación ZIP.', ), + 'profile' => array( + 'error' => 'Tu perfil no puede ser modificado', + 'updated' => 'Tu perfil ha sido modificado', + ), 'sub' => array( 'actualize' => 'Actualización', 'articles' => array( - 'marked_read' => 'The selected articles have been marked as read.', //TODO - 'marked_unread' => 'The articles have been marked as unread.', //TODO + '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.', @@ -76,7 +80,7 @@ return array( 'already_subscribed' => 'Ya estás suscrito a %s', 'deleted' => 'Fuente eliminada', 'error' => 'No es posible actualizar la fuente', - 'internal_problem' => 'No ha sido posible agregar la fuente RSS. Revisa el registro de FreshRSS para más información.', // @todo + 'internal_problem' => 'No ha sido posible agregar la fuente RSS. Revisa el registro de FreshRSS para más información.', //TODO - Translation 'invalid_url' => 'La URL %s es inválida', 'n_actualized' => 'Se han actualiado %d fuentes', 'n_entries_deleted' => 'Se han eliminado %d artículos', @@ -105,12 +109,8 @@ return array( 'error' => 'El usuario %s no ha podido ser eliminado', ), 'updated' => array( - '_' => 'User %s has been updated', // TODO - 'error' => 'User %s has not been updated', // TODO + '_' => 'User %s has been updated', //TODO - Translation + 'error' => 'User %s has not been updated', //TODO - Translation ), ), - 'profile' => array( - 'error' => 'Tu perfil no puede ser modificado', - 'updated' => 'Tu perfil ha sido modificado', - ), ); diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php index 35a01c02d..183e3f794 100755 --- a/app/i18n/es/gen.php +++ b/app/i18n/es/gen.php @@ -19,7 +19,7 @@ return array( 'see_website' => 'Ver web', 'submit' => 'Enviar', 'truncate' => 'Borrar todos los artículos', - 'update' => 'Update', // TODO + 'update' => 'Update', //TODO - Translation ), 'auth' => array( 'email' => 'Correo electrónico', @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\A\\b\\r\\i\\l', - 'Aug' => '\\A\\g\\o\\s\\t\\o', - 'Dec' => '\\D\\i\\c\\i\\e\\m\\b\\r\\e', - 'Feb' => '\\F\\e\\b\\r\\e\\r\\o', - 'Jan' => '\\E\\n\\e\\r\\o', - 'Jul' => '\\J\\u\\l\\i\\o', - 'Jun' => '\\J\\u\\n\\i\\o', - 'Mar' => '\\M\\a\\r\\z\\o', - 'May' => '\\M\\a\\y\\o', - 'Nov' => '\\N\\o\\v\\i\\e\\m\\b\\r\\e', - 'Oct' => '\\O\\c\\t\\u\\b\\r\\e', - 'Sep' => '\\S\\e\\p\\t\\i\\e\\m\\b\\r\\e', 'apr' => 'abr', 'april' => 'abril', + 'Aug' => '\\A\\g\\o\\s\\t\\o', 'aug' => 'ago', 'august' => 'agosto', 'before_yesterday' => 'Anteayer', + 'Dec' => '\\D\\i\\c\\i\\e\\m\\b\\r\\e', 'dec' => 'dic', 'december' => 'diciembre', + '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', 'fri' => 'Vie', + 'Jan' => '\\E\\n\\e\\r\\o', 'jan' => 'ene', 'january' => 'ene', + 'Jul' => '\\J\\u\\l\\i\\o', 'jul' => 'jul', 'july' => 'julio', + 'Jun' => '\\J\\u\\n\\i\\o', 'jun' => 'jun', 'june' => 'junio', 'last_3_month' => 'Últimos tres meses', @@ -78,17 +73,22 @@ return array( 'last_month' => 'Mes pasado', 'last_week' => 'Semana pasada', 'last_year' => 'Año pasado', + 'Mar' => '\\M\\a\\r\\z\\o', 'mar' => 'mar', 'march' => 'marzo', + 'May' => '\\M\\a\\y\\o', 'may' => 'mayo', 'may_' => 'may', 'mon' => 'Lun', 'month' => 'meses', + 'Nov' => '\\N\\o\\v\\i\\e\\m\\b\\r\\e', 'nov' => 'nov', 'november' => 'noviembre', + 'Oct' => '\\O\\c\\t\\u\\b\\r\\e', 'oct' => 'oct', 'october' => 'octubre', 'sat' => 'Sab', + 'Sep' => '\\S\\e\\p\\t\\i\\e\\m\\b\\r\\e', 'sep' => 'sep', 'september' => 'septiembre', 'sun' => 'Dom', @@ -161,7 +161,6 @@ return array( 'previous' => 'Anterior', ), 'share' => array( - 'Known' => 'Known based sites', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -169,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => 'Known based sites', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', diff --git a/app/i18n/es/index.php b/app/i18n/es/index.php index 1ed6066fb..d7a42537b 100755 --- a/app/i18n/es/index.php +++ b/app/i18n/es/index.php @@ -40,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 + 'mark_selection_unread' => 'Mark selection as unread', //TODO - Translation 'newer_first' => 'Nuevos primero', 'non-starred' => 'Mostrar todos menos los favoritos', 'normal_view' => 'Vista normal', @@ -53,11 +53,11 @@ return array( 'starred' => 'Mostrar solo los favoritos', 'stats' => 'Estadísticas', 'subscription' => 'Administración de suscripciones', - 'tags' => 'My labels', //TODO + 'tags' => 'My labels', //TODO - Translation 'unread' => 'Mostar solo no leídos', ), 'share' => 'Compartir', 'tag' => array( - 'related' => 'Etiquetas relacionadas', //TODO + 'related' => 'Etiquetas relacionadas', //TODO - Translation ), ); diff --git a/app/i18n/es/install.php b/app/i18n/es/install.php index a9be807c7..44236ccae 100755 --- a/app/i18n/es/install.php +++ b/app/i18n/es/install.php @@ -24,8 +24,8 @@ return array( 'ok' => 'La configuración de la base de datos ha sido guardada.', ), 'host' => 'Servidor', - 'prefix' => 'Prefijo de la tabla', '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', ), @@ -69,8 +69,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 - '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' => 'No se ha podido localizar el entorno Minz.', diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php index 8a4fb98de..02f4b270f 100755 --- a/app/i18n/es/sub.php +++ b/app/i18n/es/sub.php @@ -2,8 +2,13 @@ return array( 'api' => array( - 'documentation' => 'Copy the following URL to use it within an external tool.',// TODO - 'title' => 'API',// TODO + '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 ), 'category' => array( '_' => 'Categoría', @@ -22,7 +27,7 @@ return array( 'password' => 'Contraseña HTTP', 'username' => 'Nombre de usuario HTTP', ), - 'clear_cache' => 'Always clear cache', //TODO + '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', @@ -31,26 +36,30 @@ return array( 'informations' => 'Información', 'keep_history' => '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 %s.', - 'mute' => 'mute', // TODO + 'mute' => 'mute', //TODO - Translation 'no_selected' => 'No hay funentes seleccionadas.', 'number_entries' => '%d artículos', 'priority' => array( - '_' => 'Visibility', // TODO - 'archived' => 'Do not show (archived)', // TODO + '_' => 'Visibility', //TODO - Translation + 'archived' => 'Do not show (archived)', //TODO - Translation 'main_stream' => 'Mostrar en salida principal', - 'normal' => 'Show in its category', // TODO + 'normal' => 'Show in its category', //TODO - Translation ), - 'ssl_verify' => 'Verify SSL security', //TODO + 'pubsubhubbub' => 'Notificación inmedaiata con PubSubHubbub', + 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Estadísticas', 'think_to_add' => 'Puedes añadir fuentes.', - 'timeout' => 'Timeout in seconds', //TODO + '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', - 'pubsubhubbub' => 'Notificación inmedaiata con PubSubHubbub', + ), + 'firefox' => array( + 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.', //TODO - Translation + 'title' => 'Firefox feed reader', //TODO - Translation ), 'import_export' => array( 'export' => 'Exportar', @@ -67,9 +76,11 @@ return array( 'bookmark' => 'Suscribirse (favorito FreshRSS)', 'import_export' => 'Importar / exportar', 'subscription_management' => 'Administración de suscripciones', + '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 ), ); diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php index 1874f2c77..1175c9c65 100644 --- a/app/i18n/fr/admin.php +++ b/app/i18n/fr/admin.php @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + 'author' => 'Auteur', + 'community' => 'Extensions utilisateur disponibles', + 'description' => 'Description', 'disabled' => 'Désactivée', 'empty_list' => 'Aucune extension installée', 'enabled' => 'Activée', + 'latest' => 'Installée', + '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)', ), 'title' => 'Extensions', + 'update' => 'Mise à jour disponible', 'user' => 'Extensions utilisateur', - 'community' => 'Extensions utilisateur disponibles', - 'name' => 'Nom', 'version' => 'Version', - 'description' => 'Description', - 'author' => 'Auteur', - 'latest' => 'Installée', - 'update' => 'Mise à jour disponible', ), 'stats' => array( '_' => 'Statistiques', diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php index 01239770b..23000c3cf 100644 --- a/app/i18n/fr/conf.php +++ b/app/i18n/fr/conf.php @@ -28,6 +28,7 @@ return array( 'seconds' => 'secondes (0 signifie aucun timeout)', 'timeout' => 'Temps d’affichage de la notification HTML5', ), + 'show_nav_buttons' => 'Afficher les boutons de navigation', 'theme' => 'Thème', 'title' => 'Affichage', 'width' => array( @@ -37,7 +38,17 @@ return array( 'no_limit' => 'Pas de limite', 'thin' => 'Fine', ), - 'show_nav_buttons' => 'Afficher les boutons de navigation', + ), + 'profile' => array( + '_' => 'Gestion du profil', + 'delete' => array( + '_' => 'Suppression du compte', + 'warn' => 'Le compte et toutes les données associées vont être supprimées.', + ), + 'password_api' => 'Mot de passe API
    (ex. : pour applis mobiles)', + 'password_form' => 'Mot de passe
    (pour connexion par formulaire)', + 'password_format' => '7 caractères minimum', + 'title' => 'Profil', ), 'query' => array( '_' => 'Filtres utilisateurs', @@ -73,31 +84,19 @@ return array( 'state_15' => 'Afficher tous les articles', 'title' => 'Filtres utilisateurs', ), - 'profile' => array( - '_' => 'Gestion du profil', - 'delete' => array( - '_' => 'Suppression du compte', - 'warn' => 'Le compte et toutes les données associées vont être supprimées.', - ), - 'password_api' => 'Mot de passe API
    (ex. : pour applis mobiles)', - 'password_form' => 'Mot de passe
    (pour connexion par formulaire)', - 'password_format' => '7 caractères minimum', - 'title' => 'Profil', - ), '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', 'auto_remove_article' => 'Cacher les articles après lecture', - 'mark_updated_article_unread' => 'Marquer les articles mis à jour comme non-lus', 'confirm_enabled' => 'Afficher une confirmation lors des actions “marquer tout comme lu”', 'display_articles_unfolded' => 'Afficher les articles dépliés par défaut', 'display_categories_unfolded' => 'Afficher les catégories pliées par défaut', 'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)', 'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images', - 'sides_close_article' => 'Cliquer hors de la zone de texte ferme l’article', 'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)', + 'mark_updated_article_unread' => 'Marquer les articles mis à jour comme non-lus', 'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.', 'read' => array( 'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine', @@ -112,6 +111,7 @@ return array( 'all_articles' => 'Afficher tous les articles', 'unread' => 'Afficher les non lus', ), + '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', @@ -158,8 +158,8 @@ return array( 'javascript' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.', 'last_article' => 'Passer au dernier article', 'load_more' => 'Charger plus d’articles', - 'mark_read' => 'Marquer comme lu', 'mark_favorite' => 'Mettre en favori', + 'mark_read' => 'Marquer comme lu', 'navigation' => 'Navigation', 'navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.
    Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.', 'next_article' => 'Passer à l’article suivant', diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php index dafdd353d..328113c25 100644 --- a/app/i18n/fr/feedback.php +++ b/app/i18n/fr/feedback.php @@ -50,6 +50,10 @@ return array( 'no_zip_extension' => 'L’extension ZIP n’est pas présente sur votre serveur.', 'zip_error' => 'Une erreur est survenue durant l’import du fichier ZIP.', ), + 'profile' => array( + 'error' => 'Votre profil n’a pas pu être mis à jour', + 'updated' => 'Votre profil a été mis à jour', + ), 'sub' => array( 'actualize' => 'Actualiser', 'articles' => array( @@ -109,8 +113,4 @@ return array( 'error' => 'L’utilisateur %s n’a pas été mis à jour', ), ), - 'profile' => array( - 'error' => 'Votre profil n’a pas pu être mis à jour', - 'updated' => 'Votre profil a été mis à jour', - ), ); diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php index 34395a380..fa4dceadd 100644 --- a/app/i18n/fr/gen.php +++ b/app/i18n/fr/gen.php @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\a\\v\\r\\i\\l', - 'Aug' => '\\a\\o\\û\\t', - 'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e', - 'Feb' => '\\f\\é\\v\\r\\i\\e\\r', - 'Jan' => '\\j\\a\\n\\v\\i\\e\\r', - 'Jul' => '\\j\\u\\i\\l\\l\\e\\t', - 'Jun' => '\\j\\u\\i\\n', - 'Mar' => '\\m\\a\\r\\s', - 'May' => '\\m\\a\\i', - 'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e', - 'Oct' => '\\o\\c\\t\\o\\b\\r\\e', - 'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e', 'apr' => 'avr.', 'april' => 'avril', + 'Aug' => '\\a\\o\\û\\t', 'aug' => 'août', 'august' => 'août', 'before_yesterday' => 'À partir d’avant-hier', + 'Dec' => '\\d\\é\\c\\e\\m\\b\\r\\e', 'dec' => 'déc.', 'december' => 'décembre', + 'Feb' => '\\f\\é\\v\\r\\i\\e\\r', 'feb' => 'fév.', 'february' => 'février', 'format_date' => 'j %s Y', 'format_date_hour' => 'j %s Y \\à H\\:i', 'fri' => 'ven.', + 'Jan' => '\\j\\a\\n\\v\\i\\e\\r', 'jan' => 'jan.', 'january' => 'janvier', + 'Jul' => '\\j\\u\\i\\l\\l\\e\\t', 'jul' => 'jui.', 'july' => 'juillet', + 'Jun' => '\\j\\u\\i\\n', 'jun' => 'juin', 'june' => 'juin', 'last_3_month' => 'Depuis les trois derniers mois', @@ -78,17 +73,22 @@ 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', 'march' => 'mars', + 'May' => '\\m\\a\\i', 'may' => 'mai', 'may_' => 'mai', 'mon' => 'lun.', 'month' => 'mois', + 'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e', 'nov' => 'nov.', 'november' => 'novembre', + 'Oct' => '\\o\\c\\t\\o\\b\\r\\e', 'oct' => 'oct.', 'october' => 'octobre', 'sat' => 'sam.', + 'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e', 'sep' => 'sep.', 'september' => 'septembre', 'sun' => 'dim.', @@ -161,7 +161,6 @@ return array( 'previous' => 'Précédent', ), 'share' => array( - 'Known' => 'Sites basés sur Known', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Courriel', @@ -169,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => 'Sites basés sur Known', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php index d3921f1d9..c48aaf6c7 100644 --- a/app/i18n/fr/sub.php +++ b/app/i18n/fr/sub.php @@ -45,6 +45,7 @@ return array( 'main_stream' => 'Afficher dans le flux principal', 'normal' => 'Afficher dans sa catégorie', ), + 'pubsubhubbub' => 'Notification instantanée par PubSubHubbub', 'ssl_verify' => 'Vérification sécurité SSL', 'stats' => 'Statistiques', 'think_to_add' => 'Vous pouvez ajouter des flux.', @@ -55,7 +56,6 @@ return array( 'url' => 'URL du flux', 'validator' => 'Vérifier la validité du flux', 'website' => 'URL du site', - 'pubsubhubbub' => 'Notification instantanée par PubSubHubbub', ), 'firefox' => array( 'documentation' => 'Suivre les étapes décrites ici pour ajouter FreshRSS à la liste des lecteurs de flux dans Firefox.', diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php index 71f86357e..415816d34 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' => 'יש לבדוק את ההרשאות בתיקייה %s. שרת ה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 ./data/favicons directory. HTTP server must have rights to write into', // @todo + 'nok' => 'Check permissions on ./data/favicons 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 ./data/tokens directory. HTTP server must have rights to write into', // @todo - 'ok' => 'Permissions on tokens directory are good.', // @todo + 'nok' => 'Check permissions on ./data/tokens 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 ./data/users directory. HTTP server must have rights to write into', // @todo - 'ok' => 'Permissions on users directory are good.', // @todo + 'nok' => 'Check permissions on ./data/users 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,37 @@ 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 + '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' => 'סיסמה
    (לשימוש בטפוס ההרשמה)', - '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' => 'משתמשים', diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php index 2ab8aefa9..83ba5cd04 100644 --- a/app/i18n/he/conf.php +++ b/app/i18n/he/conf.php @@ -6,7 +6,7 @@ return array( 'advanced' => 'מתקדם', 'delete_after' => 'מחיקת מאמרים לאחר', 'help' => 'אפשרויות נוספות זמינות בזרמים ספציפיים', - 'keep_history_by_feed' => 'Minimum number of articles to keep by feed', // @todo + 'keep_history_by_feed' => 'Minimum number of articles to keep by feed', //TODO - Translation 'optimize' => 'מיטוב בסיס הנתונים', 'optimize_help' => 'ביצוע לעיתים קרובות על מנת למטב את בסיס הנתונים', 'purge_now' => 'ניקוי עכשיו', @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'שורה תחתונה', 'entry' => 'סמלילי מאמרים', 'publication_date' => 'תאריך הפרסום', - 'related_tags' => 'תגיות קשורות', //TODO + 'related_tags' => 'תגיות קשורות', //TODO - Translation 'sharing' => 'שיתוף', 'top_line' => 'שורה עליונה', ), @@ -28,6 +28,7 @@ return array( 'seconds' => 'שניות (0 משמעותה ללא פג תוקף)', 'timeout' => 'HTML5 התראה פג תוקף', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO - Translation 'theme' => 'ערכת נושא', 'title' => 'תצוגה', 'width' => array( @@ -37,12 +38,22 @@ return array( 'no_limit' => 'ללא הגבלה', 'thin' => 'צר', ), - 'show_nav_buttons' => 'Show the navigation buttons', //TODO + ), + 'profile' => array( + '_' => 'Profile management', //TODO - Translation + 'delete' => array( + '_' => 'Account deletion', //TODO - Translation + 'warn' => 'Your account and all related data will be deleted.', //TODO - Translation + ), + 'password_api' => 'סיסמת API
    (לדוגמה ליישומים סלולריים)', + 'password_form' => 'סיסמה
    (לשימוש בטפוס ההרשמה)', + 'password_format' => 'At least 7 characters', //TODO - Translation + 'title' => 'Profile', //TODO - Translation ), 'query' => array( '_' => 'שאילתות', 'deprecated' => 'שאילתה זו אינה בתוקף יותר, הפיד או הקטגוריה לייחוס נמחקו.', - 'display' => 'Display user query results', // TODO + 'display' => 'Display user query results', //TODO - Translation 'filter' => 'מסננים בשימוש:', 'get_all' => 'הצגת כל המאמרים', 'get_category' => 'הצגת קטגוריה "%s"', @@ -53,7 +64,7 @@ return array( 'number' => 'שאילתה מספר °%d', 'order_asc' => 'הצגת מאמרים ישנים בראש', 'order_desc' => 'הצגת מאמרים חדשים בראש', - 'remove' => 'Remove user query', // TODO + 'remove' => 'Remove user query', //TODO - Translation 'search' => 'חיפוש "%s"', 'state_0' => 'הצגת כל המאמרים', 'state_1' => 'הצגת מאמרים שנקראו', @@ -73,28 +84,19 @@ return array( 'state_15' => 'הצגת כל המאמרים', 'title' => 'שאילתות', ), - 'profile' => array( - '_' => 'Profile management', // @todo - 'email_persona' => 'כתובת דואר אלקטרוני להרשמה
    (לצורך מוזילה פרסונה)', - 'password_api' => 'סיסמת API
    (לדוגמה ליישומים סלולריים)', - 'password_form' => 'סיסמה
    (לשימוש בטפוס ההרשמה)', - 'password_format' => 'At least 7 characters', // @todo - 'title' => 'Profile', // @todo - ), 'reading' => array( '_' => 'קריאה', 'after_onread' => 'לאחר “סימון הכל כנקרא”,', 'articles_per_page' => 'מספר המאמרים בעמוד', 'auto_load_more' => 'טעינת המאמר הבא סוף העמוד', - 'auto_remove_article' => 'Hide articles after reading', // @todo - 'mark_updated_article_unread' => 'Mark updated articles as unread', // @todo + 'auto_remove_article' => 'Hide articles after reading', //TODO - Translation 'confirm_enabled' => 'הצגת דו-שיח לאישור “סימון הכל כנקרא” ', 'display_articles_unfolded' => 'הצגת מאמרים בשלמותם כברירת מחדל', 'display_categories_unfolded' => 'הצגת קטגוריות מקופלות כברירת מחדל', 'hide_read_feeds' => 'הסתרת קטגוריות & הזנות ללא מאמרים שלא נקראו (לא עובד יחד עם “הצגת כל המאמרים”)', 'img_with_lazyload' => 'שימוש ב "טעינה עצלה" על מנת לטעון תמונות', - 'sides_close_article' => 'Clicking outside of article text area closes the article', // @todo 'jump_next' => 'קפיצה לפריט הבא שלא נקרא (הזנה או קטגוריה)', + 'mark_updated_article_unread' => 'Mark updated articles as unread', //TODO - Translation 'number_divided_when_reader' => 'חלוקה ב2 במצב קריאה.', 'read' => array( 'article_open_on_website' => 'כאשר מאמר נפתח באתר המקורי', @@ -109,6 +111,7 @@ return array( 'all_articles' => 'הצגת כל המאמרים', 'unread' => 'הצגת מאמרים שלא נקראו בלבד', ), + 'sides_close_article' => 'Clicking outside of article text area closes the article', //TODO - Translation 'sort' => array( '_' => 'סדר המיון', 'newer_first' => 'חדשים בראש', @@ -125,7 +128,7 @@ return array( ), 'sharing' => array( '_' => 'שיתוף', - 'add' => 'Add a sharing method', // TODO + 'add' => 'Add a sharing method', //TODO - Translation 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'דואר אלקטרוני', @@ -133,7 +136,7 @@ return array( 'g+' => 'Google+', 'more_information' => 'מידע נוסף', 'print' => 'הדפסה', - 'remove' => 'Remove sharing method', // TODO + 'remove' => 'Remove sharing method', //TODO - Translation 'shaarli' => 'Shaarli', 'share_name' => 'שיתוף שם לתצוגה', 'share_url' => 'לשימוש שתפו URL', @@ -146,34 +149,34 @@ return array( 'article_action' => 'פעולות על מאמרים', 'auto_share' => 'שיתוף', 'auto_share_help' => 'אם יש רק מצב שיתוף אחד, הוא מופעל. אחרת המצבים נבחרים על בסיס המספר שלהם.', - 'close_dropdown' => 'Close menus', // @todo + 'close_dropdown' => 'Close menus', //TODO - Translation 'collapse_article' => 'כיווץ', 'first_article' => 'דילוג למאמר הראשון', 'focus_search' => 'גישה לתיבת החיפוש', - 'global_view' => 'Switch to global view', // TODO + 'global_view' => 'Switch to global view', //TODO - Translation 'help' => 'הצגת התיעוד', 'javascript' => 'חובה להפעיל JavaScript על מנת לעשות שימוש בקיצורי דרך', 'last_article' => 'דילוג למאמר האחרון', 'load_more' => 'טעינת מאמרים נוספים', - 'mark_read' => 'סימון כנקרא', 'mark_favorite' => 'סימון כמועדף', + 'mark_read' => 'סימון כנקרא', 'navigation' => 'ניווט', 'navigation_help' => 'בעזרת מקש השיפט קיצורי דרך חלים על הזנות .
    עם מקש האלט הם חלים על קטגוריות.', 'next_article' => 'דילוג למאמר הבא', - 'normal_view' => 'Switch to normal view', // TODO + 'normal_view' => 'Switch to normal view', //TODO - Translation 'other_action' => 'פעולות אחרות', 'previous_article' => 'דילוג למאמר הקודם', - 'reading_view' => 'Switch to reading view', // TODO - 'rss_view' => 'Open RSS view in a new tab', // TODO + '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' => '+ shift על מנת לסמן את כל המאמרים כנקראו', 'title' => 'קיצורי דרך', 'user_filter' => 'גישה למססנים', 'user_filter_help' => 'אם יש רק מזנן אחד הוא יהיה בשימוש. אחרת המסננים ישמשו על בסיס המספר שלהם.', - 'views' => 'Views', // TODO + 'views' => 'Views', //TODO - Translation ), 'user' => array( - 'articles_and_size' => '%s articles (%s)', // @todo + 'articles_and_size' => '%s articles (%s)', //TODO - Translation 'current' => 'משתמש נוכחי', 'is_admin' => 'מנהל', 'users' => 'משתמשים', diff --git a/app/i18n/he/feedback.php b/app/i18n/he/feedback.php index 369714795..f972173cb 100644 --- a/app/i18n/he/feedback.php +++ b/app/i18n/he/feedback.php @@ -21,7 +21,6 @@ return array( 'success' => 'You are disconnected', // @todo ), 'no_password_set' => 'לא הוגדרה סיסמת מנהל. תכונה זו אינה זמינה.', - 'not_persona' => 'ניתן לאפס את מערכת הפרסונה בלבד.', ), 'conf' => array( 'error' => 'An error occurred during configuration saving', // @todo @@ -51,24 +50,28 @@ return array( 'no_zip_extension' => 'הרחבת ZIP אינה מותקנת על השרת.', 'zip_error' => 'אירעה שגיאה במהלך ייבוא קובץ הZIP.', ), + 'profile' => array( + 'error' => 'Your profile cannot be modified', // @todo + 'updated' => 'Your profile has been modified', // @todo + ), 'sub' => array( 'actualize' => 'מימוש', 'articles' => array( - 'marked_read' => 'The selected articles have been marked as read.', //TODO - 'marked_unread' => 'The articles have been marked as unread.', //TODO + '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 - 'deleted' => 'Category has been deleted.', // @todo + 'created' => 'Category %s has been created.', //TODO - Translation + 'deleted' => 'Category has been deleted.', //TODO - Translation 'emptied' => 'הקטגוריה רוקנה', - 'error' => 'Category cannot be updated', // @todo - 'name_exists' => 'Category name already exists.', // @todo - 'no_id' => 'You must precise the id of the category.', // @todo - 'no_name' => 'Category name cannot be empty.', // @todo - 'not_delete_default' => 'You cannot delete the default category!', // @todo - 'not_exist' => 'The category does not exist!', // @todo - 'over_max' => 'You have reached your limit of categories (%d)', // @todo - 'updated' => 'Category has been updated.', // @todo + '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 ), 'feed' => array( 'actualized' => '%s עודכן', @@ -76,20 +79,20 @@ return array( 'added' => 'RSS הזנת %s נוספה', 'already_subscribed' => 'אתה כבר רשום ל %s', 'deleted' => 'ההזנה נמחקה', - 'error' => 'Feed cannot be updated', // @todo - 'internal_problem' => 'אין אפשרות להוסיף את ההזנה. בדקו את הלוגים לפרטים.', // @todo + 'error' => 'Feed cannot be updated', //TODO - Translation + 'internal_problem' => 'אין אפשרות להוסיף את ההזנה. בדקו את הלוגים לפרטים.', //TODO - Translation 'invalid_url' => 'URL %s אינו תקין', 'n_actualized' => '%d הזנות עודכנו', 'n_entries_deleted' => '%d המאמרים נמחקו', 'no_refresh' => 'אין הזנה שניתן לרענן…', 'not_added' => '%s אין אפשרות להוסיף את', - 'over_max' => 'You have reached your limit of feeds (%d)', // @todo + '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 version %s.', // @todo + 'can_apply' => 'FreshRSS will be now updated to the version %s.', //TODO - Translation 'error' => 'תהליך העדכון נתקל בשגיאה: %s', 'file_is_nok' => 'יש לבדוק את ההרשאות בתיקייה %s. שרת הHTTP חייב להיות בעל הרשאות כתיבה.', 'finished' => 'העדכון הושלם!', @@ -99,19 +102,15 @@ return array( 'user' => array( 'created' => array( '_' => 'המשתמש %s נוצר', - 'error' => 'User %s cannot be created', // @todo + 'error' => 'User %s cannot be created', //TODO - Translation ), 'deleted' => array( '_' => 'המשתמש %s נמחק', - 'error' => 'User %s cannot be deleted', // @todo + 'error' => 'User %s cannot be deleted', //TODO - Translation ), 'updated' => array( - '_' => 'User %s has been updated', // TODO - 'error' => 'User %s has not been updated', // TODO + '_' => 'User %s has been updated', //TODO - Translation + 'error' => 'User %s has not been updated', //TODO - Translation ), ), - 'profile' => array( - 'error' => 'Your profile cannot be modified', // @todo - 'updated' => 'Your profile has been modified', // @todo - ), ); diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php index 64050dc4f..9349cbce7 100644 --- a/app/i18n/he/gen.php +++ b/app/i18n/he/gen.php @@ -6,23 +6,23 @@ return array( 'back_to_rss_feeds' => '← חזרה להזנות הRSS שלך', 'cancel' => 'ביטול', 'create' => 'יצירה', - 'disable' => 'Disable', // @todo - 'empty' => 'Empty', // @todo - 'enable' => 'Enable', // @todo + 'disable' => 'Disable', //TODO - Translation + 'empty' => 'Empty', //TODO - Translation + 'enable' => 'Enable', //TODO - Translation 'export' => 'ייצוא', 'filter' => 'מסנן', 'import' => 'ייבוא', 'manage' => 'ניהול', 'mark_read' => 'סימון כנקרא', 'mark_favorite' => 'סימון כמועדף', - 'remove' => 'Remove', // @todo + 'remove' => 'Remove', //TODO - Translation 'see_website' => 'ראו אתר', 'submit' => 'אישור', 'truncate' => 'מחיקת כל המאמרים', - 'update' => 'Update', // TODO + 'update' => 'Update', //TODO - Translation ), 'auth' => array( - 'email' => 'Email address', // @todo + 'email' => 'Email address', //TODO - Translation 'keep_logged_in' => 'השאר מחובר חודש', 'login' => 'כניסה לחשבון', 'logout' => 'יציאה מהחשבון', @@ -31,46 +31,41 @@ return array( 'format' => 'At least 7 characters', ), 'registration' => array( - '_' => 'New account', // @todo - 'ask' => 'Create an account?', // @todo - 'title' => 'Account creation', // @todo + '_' => 'New account', //TODO - Translation + 'ask' => 'Create an account?', //TODO - Translation + 'title' => 'Account creation', //TODO - Translation ), 'reset' => 'איפוס אימות', 'username' => array( '_' => 'שם משתמש', 'admin' => 'שם משתמש של המנהל', - 'format' => 'maximum 16 alphanumeric characters', // @todo + 'format' => 'maximum 16 alphanumeric characters', //TODO - Translation ), ), 'date' => array( 'Apr' => '\\A\\p\\r\\i\\l', - 'Aug' => '\\A\\u\\g\\u\\s\\t', - 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', - 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y', - 'Jan' => '\\J\\a\\n\\u\\a\\r\\y', - 'Jul' => '\\J\\u\\l\\y', - 'Jun' => '\\J\\u\\n\\e', - 'Mar' => '\\M\\a\\r\\c\\h', - 'May' => '\\M\\a\\y', - 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', - 'Oct' => '\\O\\c\\t\\o\\b\\e\\r', - 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', 'apr' => 'apr', 'april' => 'Apr', + 'Aug' => '\\A\\u\\g\\u\\s\\t', 'aug' => 'aug', 'august' => 'Aug', 'before_yesterday' => 'ישן יותר', + 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', 'dec' => 'dec', 'december' => 'Dec', + 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y', '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', 'jan' => 'jan', 'january' => 'Jan', + 'Jul' => '\\J\\u\\l\\y', 'jul' => 'jul', 'july' => 'Jul', + 'Jun' => '\\J\\u\\n\\e', 'jun' => 'jun', 'june' => 'Jun', 'last_3_month' => 'בשלושת החודשים האחרונים', @@ -78,17 +73,22 @@ return array( 'last_month' => 'בחודש שעבר', 'last_week' => 'בשבוע שעבר', 'last_year' => 'בשנה האחרונה', + 'Mar' => '\\M\\a\\r\\c\\h', 'mar' => 'mar', 'march' => 'Mar', + 'May' => '\\M\\a\\y', 'may' => 'May', 'may_' => 'May', 'mon' => 'Mon', 'month' => 'חודשים', + 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', 'nov' => 'nov', 'november' => 'Nov', + 'Oct' => '\\O\\c\\t\\o\\b\\e\\r', 'oct' => 'oct', 'october' => 'Oct', 'sat' => 'Sat', + 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', 'sep' => 'sep', 'september' => 'Sep', 'sun' => 'Sun', @@ -103,12 +103,12 @@ return array( 'about' => 'אודות FreshRSS', ), 'js' => array( - 'category_empty' => 'Empty category', // @todo + '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 + 'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.', //TODO - Translation 'title_new_articles' => 'FreshRSS: מאמרים חדשים!', ), 'new_article' => 'מאמרים חדשים זמינים, לחצו לרענון העמוד.', @@ -134,11 +134,11 @@ return array( 'about' => 'אודות', 'admin' => 'ניהול', 'archiving' => 'ארכוב', - 'authentication' => 'Authentication', // @todo - 'check_install' => 'Installation checking', // @todo + 'authentication' => 'Authentication', //TODO - Translation + 'check_install' => 'Installation checking', //TODO - Translation 'configuration' => 'הגדרות', 'display' => 'תצוגה', - 'extensions' => 'Extensions', // @todo + 'extensions' => 'Extensions', //TODO - Translation 'logs' => 'לוגים', 'queries' => 'שאילתות', 'reading' => 'קריאה', @@ -146,10 +146,10 @@ return array( 'sharing' => 'שיתוף', 'shortcuts' => 'קיצורי דרך', 'stats' => 'סטטיסטיקות', - 'system' => 'System configuration', // @todo + 'system' => 'System configuration', //TODO - Translation 'update' => 'עדכון', - 'user_management' => 'Manage users', // @todo - 'user_profile' => 'Profile', // @todo + 'user_management' => 'Manage users', //TODO - Translation + 'user_profile' => 'Profile', //TODO - Translation ), 'pagination' => array( 'first' => 'הראשון', @@ -187,7 +187,7 @@ return array( 'damn' => 'הו לא!', 'default_category' => 'ללא קטגוריה', 'no' => 'לא', - 'not_applicable' => 'Not available', // @todo + 'not_applicable' => 'Not available', //TODO - Translation 'ok' => 'כן!', 'or' => 'או', 'yes' => 'כן', diff --git a/app/i18n/he/index.php b/app/i18n/he/index.php index d33c09b08..e01a02773 100644 --- a/app/i18n/he/index.php +++ b/app/i18n/he/index.php @@ -40,7 +40,7 @@ return array( 'mark_all_read' => 'סימון הכל כנקרא', 'mark_cat_read' => 'סימון קטגוריה כנקראה', 'mark_feed_read' => 'סימון הזנה כנקראה', - 'mark_selection_unread' => 'Mark selection as unread', //TODO + 'mark_selection_unread' => 'Mark selection as unread', //TODO - Translation 'newer_first' => 'חדשים בראש', 'non-starred' => 'הצגת הכל פרט למועדפים', 'normal_view' => 'תצוגה רגילה', @@ -53,11 +53,11 @@ return array( 'starred' => 'הצגת מועדפים בלבד', 'stats' => 'סטטיסטיקות', 'subscription' => 'ניהול הרשמות', - 'tags' => 'My labels', //TODO + 'tags' => 'My labels', //TODO - Translation 'unread' => 'הצגת מאמרים שלא נקראו בלבד', ), 'share' => 'שיתוף', 'tag' => array( - 'related' => 'תגיות קשורות', //TODO + 'related' => 'תגיות קשורות', //TODO - Translation ), ); diff --git a/app/i18n/he/install.php b/app/i18n/he/install.php index 93b8063b3..3a3e5ab12 100644 --- a/app/i18n/he/install.php +++ b/app/i18n/he/install.php @@ -4,16 +4,16 @@ return array( 'action' => array( 'finish' => 'השלמת ההתקנה', 'fix_errors_before' => 'יש לתקן את השגיאות לפני המעבר לשלב הבא.', + 'keep_install' => 'Keep previous configuration', //TODO - Translation 'next_step' => 'לשלב הבא', + 'reinstall' => 'Reinstall FreshRSS', //TODO - Translation ), 'auth' => array( - 'email_persona' => 'כתובת דואר אלקטרוני להרשמה
    (לצורך מוזילה פרסונה)', 'form' => 'טופס אינטרנטי (מסורתי, דורש JavaScript)', 'http' => 'HTTP (למשתמשים מתקדמים עם HTTPS)', 'none' => 'ללא (מסוכן)', 'password_form' => 'סיסמה
    (לשימוש בטפוס ההרשמה)', - 'password_format' => 'At least 7 characters', // @todo - 'persona' => 'מוזילה פרסונה (מודרני, דורש JavaScript)', + 'password_format' => 'At least 7 characters', //TODO - Translation 'type' => 'שיטת אימות', ), 'bdd' => array( @@ -24,15 +24,16 @@ return array( 'ok' => 'הגדרות בסיס הנתונים נשמרו.', ), 'host' => 'מארח', - 'prefix' => 'קידומת הטבלה', 'password' => 'HTTP סיסמה', + 'prefix' => 'קידומת הטבלה', 'type' => 'סוג בסיס הנתונים', 'username' => 'HTTP שם משתמש', ), 'check' => array( '_' => 'בדיקות', + 'already_installed' => 'We have detected that FreshRSS is already installed!', //TODO - Translation 'cache' => array( - 'nok' => 'Check permissions on ./data/cache directory. HTTP server must have rights to write into', // @todo + 'nok' => 'Check permissions on ./data/cache directory. HTTP server must have rights to write into', //TODO - Translation 'ok' => 'ההרשאות בתיקיית המטמון תקינות', ), 'ctype' => array( @@ -44,7 +45,7 @@ return array( 'ok' => 'יש לכם את גירסת %s של cURL', ), 'data' => array( - 'nok' => 'Check permissions on ./data directory. HTTP server must have rights to write into', // @todo + 'nok' => 'Check permissions on ./data directory. HTTP server must have rights to write into', //TODO - Translation 'ok' => 'ההרשאות בתיקיית הדאטא תקינות', ), 'dom' => array( @@ -52,23 +53,27 @@ return array( 'ok' => 'הספרייה הנדרשת לסיור ב DOM מותקנת', ), 'favicons' => array( - 'nok' => 'Check permissions on ./data/favicons directory. HTTP server must have rights to write into', // @todo + 'nok' => 'Check permissions on ./data/favicons 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 + ), 'http_referer' => array( 'nok' => 'נא לדבוק שאינך פוגעת ב HTTP REFERER שלך.', 'ok' => 'הHTTP REFERER ידוע ותאם לשרת שלך.', ), 'json' => array( - 'nok' => 'Cannot find a recommended library to parse JSON.', //TODO - 'ok' => 'You have a recommended library to parse JSON.', //TODO + '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 - '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( @@ -79,17 +84,17 @@ return array( 'nok' => 'PDO אינו מותקן או שאחד ממנהלי ההתקנים שלו חסר (pdo_mysql, pdo_sqlite)', 'ok' => 'PDO מותקן ולפחות אחד ממנהלי ההתקן הנתמכים מותקן (pdo_mysql, pdo_sqlite)', ), - 'persona' => array( - 'nok' => 'Check permissions on ./data/persona directory. HTTP server must have rights to write into', // @todo - 'ok' => 'ההרשאות בתיקיית מוזילה פרסונה תקינות', - ), 'php' => array( 'nok' => 'גירסת PHP שלכם היא %s אך FreshRSS דורש לפחות את גירסה %s', 'ok' => 'גירסת PHP שלכם היא %s, שתואמת ל FreshRSS', ), 'users' => array( - 'nok' => 'Check permissions on ./data/users directory. HTTP server must have rights to write into', // @todo - 'ok' => 'Permissions on users directory are good.', // @todo + 'nok' => 'Check permissions on ./data/users 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 ), ), 'conf' => array( @@ -101,14 +106,17 @@ return array( 'delete_articles_after' => 'מחיקת מאמרים לאחר', '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 + ), 'language' => array( '_' => 'שפה', 'choose' => 'בחירת שפה ל FreshRSS', 'defined' => 'השפה הוגדרה.', ), 'not_deleted' => 'משהו נכשל; יש צורך למחוק את הקובץ %s ידנית.', - 'ok' => 'The installation process was successful.', // @todo - 'step' => 'step %d', // @todo + 'ok' => 'The installation process was successful.', //TODO - Translation + 'step' => 'step %d', //TODO - Translation 'steps' => 'שלבים', 'title' => 'התקנה · FreshRSS', 'this_is_the_end' => 'סיום', diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php index 711004662..474abb8ad 100644 --- a/app/i18n/he/sub.php +++ b/app/i18n/he/sub.php @@ -2,18 +2,18 @@ return array( 'api' => array( - 'documentation' => 'Copy the following URL to use it within an external tool.', // @todo - 'title' => 'API', // @todo + '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 - 'title' => 'Bookmarklet', // @todo + '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' => 'הוספת קטגוריה', - 'empty' => 'Empty category', // @todo + 'empty' => 'Empty category', //TODO - Translation 'new' => 'קטגוריה חדשה', ), 'feed' => array( @@ -27,7 +27,7 @@ return array( 'password' => 'HTTP סיסמה', 'username' => 'HTTP שם משתמש', ), - 'clear_cache' => 'Always clear cache', //TODO + 'clear_cache' => 'Always clear cache', //TODO - Translation 'css_help' => 'קבלת הזנות RSS קטומות (זהירות, לוקח זמן רב יותר!)', 'css_path' => 'נתיב הCSS של המאמר באתר המקורי', 'description' => 'תיאור', @@ -36,19 +36,20 @@ return array( 'informations' => 'מידע', 'keep_history' => 'מסםר מינימלי של מאמרים לשמור', 'moved_category_deleted' => 'כאשר הקטגוריה נמחקת ההזנות שבתוכה אוטומטית מקוטלגות תחת %s.', - 'mute' => 'mute', // TODO + 'mute' => 'mute', //TODO - Translation 'no_selected' => 'אף הזנה לא נבחרה.', 'number_entries' => '%d מאמרים', 'priority' => array( - '_' => 'Visibility', // TODO - 'archived' => 'Do not show (archived)', // TODO + '_' => 'Visibility', //TODO - Translation + 'archived' => 'Do not show (archived)', //TODO - Translation 'main_stream' => 'הצגה בזרם המרכזי', - 'normal' => 'Show in its category', // TODO + 'normal' => 'Show in its category', //TODO - Translation ), - 'ssl_verify' => 'Verify SSL security', //TODO + 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //TODO - Translation + 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'סטטיסטיקות', 'think_to_add' => 'ניתן להוסיף הזנות חדשות.', - 'timeout' => 'Timeout in seconds', //TODO + 'timeout' => 'Timeout in seconds', //TODO - Translation 'title' => 'כותרת', 'title_add' => 'הוספת הזנה', 'ttl' => 'אין לרענן אוטומטית יותר מ', @@ -57,8 +58,8 @@ return array( 'website' => 'אתר URL', ), 'firefox' => array( - 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.', // @todo - 'title' => 'Firefox feed reader', // @todo + 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.', //TODO - Translation + 'title' => 'Firefox feed reader', //TODO - Translation ), 'import_export' => array( 'export' => 'ייצוא', @@ -75,11 +76,11 @@ return array( 'bookmark' => 'הרשמה (FreshRSS סימניית)', 'import_export' => 'יבוא / יצוא ', 'subscription_management' => 'ניהול הרשמות', - 'subscription_tools' => 'Subscription tools', // @todo + 'subscription_tools' => 'Subscription tools', //TODO - Translation ), 'title' => array( '_' => 'ניהול הרשמות', 'feed_management' => 'ניהול הזנות RSS', - 'subscription_tools' => 'Subscription tools', // @todo + 'subscription_tools' => 'Subscription tools', //TODO - Translation ), ); diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php index 5696ed571..88972aa8f 100644 --- a/app/i18n/it/admin.php +++ b/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 - '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' => 'Manca il framework Minz.', @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + '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 '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)', ), 'title' => 'Estensioni', + 'update' => 'Update available', //TODO - Translation 'user' => 'Estensioni utente', - 'community' => 'Available community extensions', // @todo translate - 'name' => 'Name', // @todo translate - 'version' => 'Version', // @todo translate - 'description' => 'Description', // @todo translate - 'author' => 'Author', // @todo translate - 'latest' => 'Installed', // @todo translate - 'update' => 'Update available', // @todo translate + 'version' => 'Version', //TODO - Translation ), 'stats' => array( '_' => 'Statistiche', @@ -158,7 +158,7 @@ return array( ), 'system' => array( '_' => 'Configurazione di sistema', - 'auto-update-url' => 'Auto-update server URL', // @todo translate + 'auto-update-url' => 'Auto-update server URL', //TODO - Translation 'instance-name' => 'Nome istanza', 'max-categories' => 'Limite categorie per utente', 'max-feeds' => 'Limite feeds per utente', @@ -179,15 +179,15 @@ return array( 'user' => array( 'articles_and_size' => '%s articoli (%s)', 'create' => 'Crea nuovo utente', - 'delete_users' => 'Delete user', // TODO + 'delete_users' => 'Delete user', //TODO - Translation 'language' => 'Lingua', 'number' => ' %d profilo utente creato', 'numbers' => 'Sono presenti %d profili utente', 'password_form' => 'Password
    (per il login classico)', 'password_format' => 'Almeno 7 caratteri', - 'selected' => 'Selected user', // TODO + 'selected' => 'Selected user', //TODO - Translation 'title' => 'Gestione utenti', - 'update_users' => 'Update user', // TODO + 'update_users' => 'Update user', //TODO - Translation 'user_list' => 'Lista utenti', 'username' => 'Nome utente', 'users' => 'Utenti', diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php index 83beb2df5..ef892cc8a 100644 --- a/app/i18n/it/conf.php +++ b/app/i18n/it/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Barra in fondo', 'entry' => 'Icone degli articoli', 'publication_date' => 'Data di pubblicazione', - 'related_tags' => 'Tags correlati', //TODO + 'related_tags' => 'Tags correlati', //TODO - Translation 'sharing' => 'Condivisione', 'top_line' => 'Barra in alto', ), @@ -28,6 +28,7 @@ return array( 'seconds' => 'secondi (0 significa nessun timeout)', 'timeout' => 'Notifica timeout HTML5', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO - Translation 'theme' => 'Tema', 'title' => 'Visualizzazione', 'width' => array( @@ -37,12 +38,22 @@ return array( 'no_limit' => 'Nessun limite', 'thin' => 'Stretto', ), - 'show_nav_buttons' => 'Show the navigation buttons', //TODO + ), + 'profile' => array( + '_' => 'Gestione profili', + 'delete' => array( + '_' => 'Cancellazione account', + 'warn' => 'Il tuo account e tutti i dati associati saranno cancellati.', + ), + 'password_api' => 'Password API
    (e.g., per applicazioni mobili)', + 'password_form' => 'Password
    (per il login classico)', + 'password_format' => 'Almeno 7 caratteri', + 'title' => 'Profilo', ), '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 + 'display' => 'Display user query results', //TODO - Translation 'filter' => 'Filtro applicato:', 'get_all' => 'Mostra tutti gli articoli', 'get_category' => 'Mostra la categoria "%s" ', @@ -53,7 +64,7 @@ return array( '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 + 'remove' => 'Remove user query', //TODO - Translation 'search' => 'Cerca per "%s"', 'state_0' => 'Mostra tutti gli articoli', 'state_1' => 'Mostra gli articoli letti', @@ -73,31 +84,19 @@ return array( 'state_15' => 'Mostra tutti gli articoli', 'title' => 'Ricerche personali', ), - 'profile' => array( - '_' => 'Gestione profili', - 'delete' => array( - '_' => 'Cancellazione account', - 'warn' => 'Il tuo account e tutti i dati associati saranno cancellati.', - ), - 'password_api' => 'Password API
    (e.g., per applicazioni mobili)', - 'password_form' => 'Password
    (per il login classico)', - 'password_format' => 'Almeno 7 caratteri', - 'title' => 'Profilo', - ), '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', 'auto_remove_article' => 'Nascondi articoli dopo la lettura', - 'mark_updated_article_unread' => 'Segna articoli aggiornati come non letti', 'confirm_enabled' => 'Mostra una conferma per “segna tutto come letto”', 'display_articles_unfolded' => 'Mostra articoli aperti di predefinito', 'display_categories_unfolded' => 'Mostra categorie aperte di predefinito', 'hide_read_feeds' => 'Nascondi categorie e feeds con articoli già letti (non funziona se “Mostra tutti gli articoli” è selezionato)', 'img_with_lazyload' => 'Usa la modalità "caricamento ritardato" per le immagini', - 'sides_close_article' => 'Clicking outside of article text area closes the article', //TODO 'jump_next' => 'Salta al successivo feed o categoria non letto', + 'mark_updated_article_unread' => 'Segna articoli aggiornati come non letti', 'number_divided_when_reader' => 'Diviso 2 nella modalità di lettura.', 'read' => array( 'article_open_on_website' => 'Quando un articolo è aperto nel suo sito di origine', @@ -112,6 +111,7 @@ return array( 'all_articles' => 'Mostra tutti gli articoli', 'unread' => 'Mostra solo non letti', ), + 'sides_close_article' => 'Clicking outside of article text area closes the article', //TODO - Translation 'sort' => array( '_' => 'Ordinamento', 'newer_first' => 'Prima i più recenti', @@ -128,7 +128,7 @@ return array( ), 'sharing' => array( '_' => 'Condivisione', - 'add' => 'Add a sharing method', // TODO + 'add' => 'Add a sharing method', //TODO - Translation 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -136,7 +136,7 @@ return array( 'g+' => 'Google+', 'more_information' => 'Ulteriori informazioni', 'print' => 'Stampa', - 'remove' => 'Remove sharing method', // TODO + 'remove' => 'Remove sharing method', //TODO - Translation 'shaarli' => 'Shaarli', 'share_name' => 'Nome condivisione', 'share_url' => 'URL condivisione', @@ -153,27 +153,27 @@ return array( 'collapse_article' => 'Collassa articoli', 'first_article' => 'Salta al primo articolo', 'focus_search' => 'Modulo di ricerca', - 'global_view' => 'Switch to global view', // TODO + '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', 'load_more' => 'Carica altri articoli', - 'mark_read' => 'Segna come letto', 'mark_favorite' => 'Segna come preferito', + 'mark_read' => 'Segna come letto', 'navigation' => 'Navigazione', 'navigation_help' => 'Con il tasto "Shift" i comandi di navigazione verranno applicati ai feeds.
    Con il tasto "Alt" i comandi di navigazione verranno applicati alle categorie.', 'next_article' => 'Salta al contenuto successivo', 'normal_view' => 'Switch to normal view', // TODO 'other_action' => 'Altre azioni', 'previous_article' => 'Salta al contenuto precedente', - 'reading_view' => 'Switch to reading view', // TODO - 'rss_view' => 'Open RSS view in a new tab', // TODO + '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' => '+ shift per segnare tutti gli articoli come letti', '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 + 'views' => 'Views', //TODO - Translation ), 'user' => array( 'articles_and_size' => '%s articoli (%s)', diff --git a/app/i18n/it/feedback.php b/app/i18n/it/feedback.php index b0f3a814a..ca7879904 100644 --- a/app/i18n/it/feedback.php +++ b/app/i18n/it/feedback.php @@ -50,11 +50,15 @@ return array( 'no_zip_extension' => 'Estensione ZIP non presente sul server.', 'zip_error' => 'Si è verificato un errore importando il file ZIP', ), + 'profile' => array( + 'error' => 'Il tuo profilo non può essere modificato', + 'updated' => 'Il tuo profilo è stato modificato', + ), 'sub' => array( 'actualize' => 'Aggiorna', 'articles' => array( - 'marked_read' => 'The selected articles have been marked as read.', //TODO - 'marked_unread' => 'The articles have been marked as unread.', //TODO + '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.', @@ -76,7 +80,7 @@ return array( 'already_subscribed' => 'Hai già sottoscritto %s', 'deleted' => 'Feed cancellato', 'error' => 'Feed non aggiornato', - 'internal_problem' => 'RSS feed non aggiunto. Verifica i logs per dettagli.', // @todo + 'internal_problem' => 'RSS feed non aggiunto. Verifica i logs per dettagli.', //TODO - Translation 'invalid_url' => 'URL %s non valido', 'n_actualized' => '%d feeds aggiornati', 'n_entries_deleted' => '%d articoli cancellati', @@ -105,12 +109,8 @@ return array( 'error' => 'Utente %s non cancellato', ), 'updated' => array( - '_' => 'User %s has been updated', // TODO - 'error' => 'User %s has not been updated', // TODO + '_' => 'User %s has been updated', //TODO - Translation + 'error' => 'User %s has not been updated', //TODO - Translation ), ), - 'profile' => array( - 'error' => 'Il tuo profilo non può essere modificato', - 'updated' => 'Il tuo profilo è stato modificato', - ), ); diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php index 200ce813a..3bf2f155f 100644 --- a/app/i18n/it/gen.php +++ b/app/i18n/it/gen.php @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\A\\p\\r\\i\\l\\e', - 'Aug' => '\\A\\g\\o\\s\\t\\o', - 'Dec' => '\\D\\i\\c\\e\\m\\b\\r\\e', - 'Feb' => '\\F\\e\\b\\b\\r\\a\\i\\o', - 'Jan' => '\\G\\e\\n\\u\\a\\i\\o', - 'Jul' => '\\L\\u\\g\\l\\i\\o', - 'Jun' => '\\G\\i\\u\\g\\n\\o', - 'Mar' => '\\M\\a\\r\\z\\o', - 'May' => '\\M\\a\\g\\g\\i\\o', - 'Nov' => '\\N\\o\\v\\e\\m\\b\\r\\e', - 'Oct' => '\\O\\t\\t\\o\\b\\r\\e', - 'Sep' => '\\S\\e\\t\\t\\e\\m\\b\\r\\e', 'apr' => 'apr.', 'april' => 'aprile', + 'Aug' => '\\A\\g\\o\\s\\t\\o', 'aug' => 'ag.', 'august' => 'agosto', 'before_yesterday' => 'Meno recenti', + 'Dec' => '\\D\\i\\c\\e\\m\\b\\r\\e', 'dec' => 'dic.', 'december' => 'dicembre', + 'Feb' => '\\F\\e\\b\\b\\r\\a\\i\\o', 'feb' => 'febbr.', 'february' => 'febbraio', 'format_date' => 'j\\ %s Y', 'format_date_hour' => 'j\\ %s Y \\o\\r\\e H\\:i', 'fri' => 'Fri', + 'Jan' => '\\G\\e\\n\\u\\a\\i\\o', 'jan' => 'genn.', 'january' => 'gennaio', + 'Jul' => '\\L\\u\\g\\l\\i\\o', 'jul' => 'jul', 'july' => 'luglio', + 'Jun' => '\\G\\i\\u\\g\\n\\o', 'jun' => 'jun', 'june' => 'giugno', 'last_3_month' => 'Ultimi 3 mesi', @@ -78,17 +73,22 @@ return array( 'last_month' => 'Ultimo mese', 'last_week' => 'Ultima settimana', 'last_year' => 'Ultimo anno', + 'Mar' => '\\M\\a\\r\\z\\o', 'mar' => 'mar.', 'march' => 'marzo', + 'May' => '\\M\\a\\g\\g\\i\\o', 'may' => 'maggio', 'may_' => 'May', 'mon' => 'Mon', 'month' => 'mesi', + 'Nov' => '\\N\\o\\v\\e\\m\\b\\r\\e', 'nov' => 'nov.', 'november' => 'novembre', + 'Oct' => '\\O\\t\\t\\o\\b\\r\\e', 'oct' => 'ott.', 'october' => 'ottobre', 'sat' => 'Sat', + 'Sep' => '\\S\\e\\t\\t\\e\\m\\b\\r\\e', 'sep' => 'sett.', 'september' => 'settembre', 'sun' => 'Sun', @@ -161,7 +161,6 @@ return array( 'previous' => 'Precedente', ), 'share' => array( - 'Known' => 'Siti basati su Known', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -169,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => 'Siti basati su Known', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', diff --git a/app/i18n/it/index.php b/app/i18n/it/index.php index 909db1440..8162b1639 100644 --- a/app/i18n/it/index.php +++ b/app/i18n/it/index.php @@ -40,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 + 'mark_selection_unread' => 'Mark selection as unread', //TODO - Translation 'newer_first' => 'Mostra prima i recenti', 'non-starred' => 'Escludi preferiti', 'normal_view' => 'Vista elenco', @@ -53,11 +53,11 @@ return array( 'starred' => 'Mostra solo preferiti', 'stats' => 'Statistiche', 'subscription' => 'Gestione sottoscrizioni', - 'tags' => 'My labels', //TODO + 'tags' => 'My labels', //TODO - Translation 'unread' => 'Mostra solo non letti', ), 'share' => 'Condividi', 'tag' => array( - 'related' => 'Tags correlati', //TODO + 'related' => 'Tags correlati', //TODO - Translation ), ); diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php index 2d0a34885..0b904ab02 100644 --- a/app/i18n/it/install.php +++ b/app/i18n/it/install.php @@ -24,8 +24,8 @@ return array( 'ok' => 'Le configurazioni del database sono state salvate.', ), 'host' => 'Host', - 'prefix' => 'Prefisso tabella', 'password' => 'Password del database', + 'prefix' => 'Prefisso tabella', 'type' => 'Tipo di database', 'username' => 'Nome utente del database', ), @@ -69,8 +69,8 @@ return array( 'ok' => 'You have a recommended library to parse JSON.', ), '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' => 'Manca il framework Minz.', @@ -85,7 +85,6 @@ return array( 'ok' => 'PDO e altri driver supportati (pdo_mysql, pdo_sqlite, pdo_pgsql).', ), 'php' => array( - '_' => 'Installazione PHP', 'nok' => 'Versione di PHP %s FreshRSS richiede almeno la versione %s.', 'ok' => 'Versione di PHP %s, compatibile con FreshRSS.', ), diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php index b22340c9b..3cf869dd4 100644 --- a/app/i18n/it/sub.php +++ b/app/i18n/it/sub.php @@ -2,13 +2,13 @@ return array( 'api' => array( - 'documentation' => 'Copy the following URL to use it within an external tool.',// TODO - 'title' => 'API',// TODO + '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 - 'title' => 'Bookmarklet',// TODO + 'label' => 'Subscribe', //TODO - Translation + 'title' => 'Bookmarklet', //TODO - Translation ), 'category' => array( '_' => 'Categoria', @@ -27,7 +27,7 @@ return array( 'password' => 'HTTP password', 'username' => 'HTTP username', ), - 'clear_cache' => 'Always clear cache', //TODO + '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', @@ -36,30 +36,30 @@ return array( 'informations' => 'Informazioni', 'keep_history' => 'Numero minimo di articoli da mantenere', 'moved_category_deleted' => 'Cancellando una categoria i feed al suo interno verranno classificati automaticamente come %s.', - 'mute' => 'mute', // TODO + 'mute' => 'mute', //TODO - Translation 'no_selected' => 'Nessun feed selezionato.', 'number_entries' => '%d articoli', 'priority' => array( - '_' => 'Visibility', // TODO - 'archived' => 'Do not show (archived)', // TODO - 'main_stream' => 'Mostra in homepage', // TODO - 'normal' => 'Show in its category', // TODO + '_' => 'Visibility', //TODO - Translation + 'archived' => 'Do not show (archived)', //TODO - Translation + 'main_stream' => 'Mostra in homepage', //TODO - Translation + 'normal' => 'Show in its category', //TODO - Translation ), - 'ssl_verify' => 'Verify SSL security', //TODO + 'pubsubhubbub' => 'Notifica istantanea con PubSubHubbub', + 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistiche', 'think_to_add' => 'Aggiungi feed.', - 'timeout' => 'Timeout in seconds', //TODO + 'timeout' => 'Timeout in seconds', //TODO - Translation 'title' => 'Titolo', 'title_add' => 'Aggiungi RSS feed', 'ttl' => 'Non aggiornare automaticamente piu di', 'url' => 'Feed URL', 'validator' => 'Controlla la validita del feed ', 'website' => 'URL del sito', - 'pubsubhubbub' => 'Notifica istantanea con PubSubHubbub', ), 'firefox' => array( - 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.',// TODO - 'title' => 'Firefox feed reader',// TODO + 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.', //TODO - Translation + 'title' => 'Firefox feed reader', //TODO - Translation ), 'import_export' => array( 'export' => 'Esporta', @@ -76,11 +76,11 @@ return array( 'bookmark' => 'Bookmark (trascina nei preferiti)', 'import_export' => 'Importa / esporta', 'subscription_management' => 'Gestione sottoscrizioni', - 'subscription_tools' => 'Subscription tools',// TODO + 'subscription_tools' => 'Subscription tools', //TODO - Translation ), 'title' => array( '_' => 'Gestione sottoscrizioni', 'feed_management' => 'Gestione RSS feeds', - 'subscription_tools' => 'Subscription tools',// TODO + 'subscription_tools' => 'Subscription tools', //TODO - Translation ), ); diff --git a/app/i18n/kr/admin.php b/app/i18n/kr/admin.php index bc65b3fa2..ac4a808e7 100644 --- a/app/i18n/kr/admin.php +++ b/app/i18n/kr/admin.php @@ -67,8 +67,8 @@ return array( 'ok' => 'JSON 확장 기능이 설치되어 있습니다.', ), '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' => 'Minz 프레임워크를 찾을 수 없습니다.', @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + 'author' => '제작자', + 'community' => '사용 가능한 커뮤니티 확장 기능들', + 'description' => '설명', 'disabled' => '비활성화됨', 'empty_list' => '설치된 확장 기능이 없습니다', 'enabled' => '활성화됨', + 'latest' => '설치됨', + 'name' => '이름', 'no_configure_view' => '이 확장 기능은 설정이 없습니다.', 'system' => array( '_' => '시스템 확장 기능', 'no_rights' => '시스템 확장 기능 (이 확장 기능에 대한 권한이 없습니다)', ), 'title' => '확장 기능', + 'update' => '업데이트 있음', 'user' => '사용자 확장 기능', - 'community' => '사용 가능한 커뮤니티 확장 기능들', - 'name' => '이름', 'version' => '버전', - 'description' => '설명', - 'author' => '제작자', - 'latest' => '설치됨', - 'update' => '업데이트 있음', ), 'stats' => array( '_' => '통계', diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php index f26e2cf09..ae34795ef 100644 --- a/app/i18n/kr/conf.php +++ b/app/i18n/kr/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => '하단', 'entry' => '문서 아이콘', 'publication_date' => '발행일', - 'related_tags' => '관련 태그', //TODO + 'related_tags' => '관련 태그', 'sharing' => '공유', 'top_line' => '상단', ), @@ -28,6 +28,7 @@ return array( 'seconds' => '초 (0: 타임아웃 없음)', 'timeout' => 'HTML5 알림 타임아웃', ), + 'show_nav_buttons' => '내비게이션 버튼 보이기', 'theme' => '테마', 'title' => '표시', 'width' => array( @@ -37,7 +38,17 @@ return array( 'no_limit' => '제한 없음', 'thin' => '얇음', ), - 'show_nav_buttons' => '내비게이션 버튼 보이기', + ), + 'profile' => array( + '_' => '프로필 관리', + 'delete' => array( + '_' => '계정 삭제', + 'warn' => '당신의 계정과 관련된 모든 데이터가 삭제됩니다.', + ), + 'password_api' => 'API 암호
    (예: 모바일 애플리케이션)', + 'password_form' => '암호
    (웹폼 로그인 방식 사용시)', + 'password_format' => '7 글자 이상이어야 합니다', + 'title' => '프로필', ), 'query' => array( '_' => '사용자 쿼리', @@ -73,31 +84,19 @@ return array( 'state_15' => '모든 글 표시', 'title' => '사용자 쿼리', ), - 'profile' => array( - '_' => '프로필 관리', - 'delete' => array( - '_' => '계정 삭제', - 'warn' => '당신의 계정과 관련된 모든 데이터가 삭제됩니다.', - ), - 'password_api' => 'API 암호
    (예: 모바일 애플리케이션)', - 'password_form' => '암호
    (웹폼 로그인 방식 사용시)', - 'password_format' => '7 글자 이상이어야 합니다', - 'title' => '프로필', - ), 'reading' => array( '_' => '읽기', 'after_onread' => '“모두 읽음으로 표시” 후,', 'articles_per_page' => '페이지당 글 수', 'auto_load_more' => '페이지 하단에 다다르면 글 더 불러오기', 'auto_remove_article' => '글을 읽은 후 숨기기', - 'mark_updated_article_unread' => '갱신 된 글을 읽지 않음으로 표시', 'confirm_enabled' => '“모두 읽음으로 표시” 실행시 확인 창 표시', 'display_articles_unfolded' => '글을 펼쳐진 상태로 보여주기', 'display_categories_unfolded' => '카테고리를 접힌 상태로 보여주기', 'hide_read_feeds' => '읽지 않은 글이 없는 카테고리와 피드 감추기 (“모든 글 표시”가 설정된 경우 동작하지 않습니다)', 'img_with_lazyload' => '그림을 불러오는 데에 "lazy load" 모드 사용하기', - 'sides_close_article' => '글 영역 바깥을 클릭하면 글 접기', 'jump_next' => '다음 읽지 않은 항목으로 이동 (피드 또는 카테고리)', + 'mark_updated_article_unread' => '갱신 된 글을 읽지 않음으로 표시', 'number_divided_when_reader' => '읽기 모드에서는 절반만 표시됩니다.', 'read' => array( 'article_open_on_website' => '글이 게재된 웹사이트를 방문했을 때', @@ -112,6 +111,7 @@ return array( 'all_articles' => '모든 글 표시', 'unread' => '읽지 않은 글만 표시', ), + 'sides_close_article' => '글 영역 바깥을 클릭하면 글 접기', 'sort' => array( '_' => '정렬 순서', 'newer_first' => '최근 글 먼저', @@ -158,8 +158,8 @@ return array( 'javascript' => '단축키를 사용하기 위해선 자바스크립트를 사용하도록 설정하여야 합니다', 'last_article' => '마지막 글 보기', 'load_more' => '글 더 불러오기', - 'mark_read' => '읽음으로 표시', 'mark_favorite' => '즐겨찾기에 등록', + 'mark_read' => '읽음으로 표시', 'navigation' => '탐색', 'navigation_help' => '"Shift" 키를 누른 상태에선 탐색 단축키가 피드에 적용됩니다.
    "Alt" 키를 누른 상태에선 탐색 단축키가 카테고리에 적용됩니다.', 'next_article' => '다음 글 보기', diff --git a/app/i18n/kr/feedback.php b/app/i18n/kr/feedback.php index 12cd673ff..550904894 100644 --- a/app/i18n/kr/feedback.php +++ b/app/i18n/kr/feedback.php @@ -50,11 +50,15 @@ return array( 'no_zip_extension' => 'ZIP 확장 기능을 서버에서 찾을 수 없습니다.', 'zip_error' => 'ZIP 파일을 불러오는 동안 문제가 발생했습니다.', ), + 'profile' => array( + 'error' => '프로필을 변경할 수 없습니다', + 'updated' => '프로필을 변경했습니다', + ), 'sub' => array( 'actualize' => '피드를 가져오는 중입니다', 'articles' => array( - 'marked_read' => 'The selected articles have been marked as read.', //TODO - 'marked_unread' => 'The articles have been marked as unread.', //TODO + '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' => '%s 카테고리가 생성되었습니다.', @@ -109,8 +113,4 @@ return array( 'error' => '사용자 %s의 정보가 변경되지 않았습니다', ), ), - 'profile' => array( - 'error' => '프로필을 변경할 수 없습니다', - 'updated' => '프로필을 변경했습니다', - ), ); diff --git a/app/i18n/kr/gen.php b/app/i18n/kr/gen.php index f87f24b64..744ec6fce 100644 --- a/app/i18n/kr/gen.php +++ b/app/i18n/kr/gen.php @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\A\\p\\r\\i\\l', - 'Aug' => '\\A\\u\\g\\u\\s\\t', - 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', - 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y', - 'Jan' => '\\J\\a\\n\\u\\a\\r\\y', - 'Jul' => '\\J\\u\\l\\y', - 'Jun' => '\\J\\u\\n\\e', - 'Mar' => '\\M\\a\\r\\c\\h', - 'May' => '\\M\\a\\y', - 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', - 'Oct' => '\\O\\c\\t\\o\\b\\e\\r', - 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', 'apr' => '4월', 'april' => '4월', + 'Aug' => '\\A\\u\\g\\u\\s\\t', 'aug' => '8월', 'august' => '8월', 'before_yesterday' => '어제 이전', + 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', 'dec' => '12월', 'december' => '12월', + 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y', 'feb' => '2월', 'february' => '2월', 'format_date' => 'Y년 m월 d일', 'format_date_hour' => 'Y년 m월 d일 H시 i분', 'fri' => '금', + 'Jan' => '\\J\\a\\n\\u\\a\\r\\y', 'jan' => '1월', 'january' => '1월', + 'Jul' => '\\J\\u\\l\\y', 'jul' => '7월', 'july' => '7월', + 'Jun' => '\\J\\u\\n\\e', 'jun' => '6월', 'june' => '6월', 'last_3_month' => '최근 3 개월', @@ -78,17 +73,22 @@ return array( 'last_month' => '최근 한 달', 'last_week' => '최근 한 주', 'last_year' => '최근 일 년', + 'Mar' => '\\M\\a\\r\\c\\h', 'mar' => '3월', 'march' => '3월', + 'May' => '\\M\\a\\y', 'may' => '5월', 'may_' => '5월', + 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', 'mon' => '월', 'month' => '개월', 'nov' => '11월', 'november' => '11월', + 'Oct' => '\\O\\c\\t\\o\\b\\e\\r', 'oct' => '10월', 'october' => '10월', 'sat' => '토', + 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', 'sep' => '9월', 'september' => '9월', 'sun' => '일', @@ -161,7 +161,6 @@ return array( 'previous' => 'Previous', ), 'share' => array( - 'Known' => 'Known based sites', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => '메일', @@ -169,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => 'Known based sites', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', diff --git a/app/i18n/kr/index.php b/app/i18n/kr/index.php index 87cc12eca..3c63fd664 100644 --- a/app/i18n/kr/index.php +++ b/app/i18n/kr/index.php @@ -40,7 +40,7 @@ return array( 'mark_all_read' => '모두 읽음으로 표시', 'mark_cat_read' => '카테고리를 읽음으로 표시', 'mark_feed_read' => '피드를 읽음으로 표시', - 'mark_selection_unread' => 'Mark selection as unread', //TODO + 'mark_selection_unread' => 'Mark selection as unread', //TODO - Translation 'newer_first' => '최근 글 먼저', 'non-starred' => '즐겨찾기를 제외하고 표시', 'normal_view' => '일반 모드', @@ -53,11 +53,11 @@ return array( 'starred' => '즐겨찾기만 표시', 'stats' => '통계', 'subscription' => '구독 관리', - 'tags' => 'My labels', //TODO + 'tags' => 'My labels', //TODO - Translation 'unread' => '읽지 않은 글만 표시', ), 'share' => '공유', 'tag' => array( - 'related' => '관련 태그', //TODO + 'related' => '관련 태그', //TODO - Translation ), ); diff --git a/app/i18n/kr/install.php b/app/i18n/kr/install.php index 03a8ccdbe..6b60f6ffd 100644 --- a/app/i18n/kr/install.php +++ b/app/i18n/kr/install.php @@ -24,8 +24,8 @@ return array( 'ok' => '데이터베이스 설정이 저장되었습니다.', ), 'host' => '데이터베이스 서버', - 'prefix' => '테이블 접두어', 'password' => '데이터베이스 암호', + 'prefix' => '테이블 접두어', 'type' => '데이터베이스 종류', 'username' => '데이터베이스 사용자 이름', ), @@ -69,8 +69,8 @@ return array( 'ok' => 'JSON 확장 기능이 설치되어 있습니다.', ), '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' => 'Minz 프레임워크를 찾을 수 없습니다.', diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php index ee6b25e3f..9595a045e 100644 --- a/app/i18n/kr/sub.php +++ b/app/i18n/kr/sub.php @@ -27,7 +27,7 @@ return array( 'password' => 'HTTP 암호', 'username' => 'HTTP 사용자 이름', ), - 'clear_cache' => 'Always clear cache', //TODO + 'clear_cache' => 'Always clear cache', //TODO - Translation 'css_help' => '글의 일부가 포함된 RSS 피드를 가져옵니다 (주의, 시간이 좀 더 걸립니다!)', 'css_path' => '웹사이트 상의 글 본문에 해당하는 CSS 경로', 'description' => '설명', @@ -45,6 +45,7 @@ return array( 'main_stream' => '메인 스트림에 표시하기', 'normal' => '피드가 속한 카테고리에만 표시하기', ), + 'pubsubhubbub' => 'PubSubHubbub을 사용한 즉시 알림', 'ssl_verify' => 'SSL 유효성 검사', 'stats' => '통계', 'think_to_add' => '피드를 추가할 수 있습니다.', @@ -55,7 +56,6 @@ return array( 'url' => '피드 URL', 'validator' => '피드 유효성 검사', 'website' => '웹사이트 URL', - 'pubsubhubbub' => 'PubSubHubbub을 사용한 즉시 알림', ), 'firefox' => array( 'documentation' => 'FreshRSS를 Firefox 피드 리더에 추가하기 위해서는 여기의 설명을 따르세요.', diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php index f40db7bcb..1fd31e27a 100644 --- a/app/i18n/nl/admin.php +++ b/app/i18n/nl/admin.php @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + 'author' => 'Auteur', + 'community' => 'Gebruikersuitbreidingen beschikbaar', + 'description' => 'Beschrijving', 'disabled' => 'Uitgeschakeld', 'empty_list' => 'Er zijn geïnstalleerde uitbreidingen', 'enabled' => 'Ingeschakeld', + 'latest' => 'Geïnstalleerd', + 'name' => 'Naam', 'no_configure_view' => 'Deze uitbreiding kan niet worden geconfigureerd.', 'system' => array( '_' => 'Systeemuitbreidingen', 'no_rights' => 'Systeemuitbreidingen (U hebt hier geen rechten op)', ), 'title' => 'Uitbreidingen', + 'update' => 'Update beschikbaar', 'user' => 'Gebruikersuitbreidingen', - 'community' => 'Gebruikersuitbreidingen beschikbaar', - 'name' => 'Naam', 'version' => 'Versie', - 'description' => 'Beschrijving', - 'author' => 'Auteur', - 'latest' => 'Geïnstalleerd', - 'update' => 'Update beschikbaar', ), 'stats' => array( '_' => 'Statistieken', @@ -185,11 +185,6 @@ return array( 'numbers' => 'Er zijn %d accounts gemaakt', 'password_form' => 'Wachtwoord
    (voor de Web-formulier loginmethode)', 'password_format' => 'Ten minste 7 tekens', - 'registration' => array( - 'allow' => 'Sta het maken van nieuwe accounts toe', - 'help' => '0 betekent dat er geen accountlimiet is', - 'number' => 'Max aantal accounts', - ), 'selected' => 'Geselecteerde gebruiker', 'title' => 'Beheer gebruikers', 'update_users' => 'Gebruiker bijwerken', diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php index 883d932ab..f6f6f4bba 100644 --- a/app/i18n/nl/conf.php +++ b/app/i18n/nl/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Onderaan', 'entry' => 'Artikel pictogrammen', 'publication_date' => 'Publicatie datum', - 'related_tags' => 'Gerelateerde labels', //TODO + 'related_tags' => 'Gerelateerde labels', 'sharing' => 'Delen', 'top_line' => 'Bovenaan', ), @@ -28,6 +28,7 @@ return array( 'seconds' => 'seconden (0 betekent geen stop)', 'timeout' => 'HTML5 notificatie stop', ), + 'show_nav_buttons' => 'Toon navigatieknoppen', 'theme' => 'Thema', 'title' => 'Opmaak', 'width' => array( @@ -37,7 +38,17 @@ return array( 'no_limit' => 'Geen limiet', 'thin' => 'Smal', ), - 'show_nav_buttons' => 'Toon navigatieknoppen', + ), + 'profile' => array( + '_' => 'Profiel beheer', + 'delete' => array( + '_' => 'Account verwijderen', + 'warn' => 'Uw account en alle gerelateerde gegvens worden verwijderd.', + ), + 'password_api' => 'Wachtwoord API
    (e.g., voor mobiele apps)', + 'password_form' => 'Wachtwoord
    (voor de Web-formulier log in methode)', + 'password_format' => 'Ten minste 7 tekens', + 'title' => 'Profiel', ), 'query' => array( '_' => 'Gebruikersquery\'s (informatie aanvragen)', @@ -73,17 +84,6 @@ return array( 'state_15' => 'Toon alle artikelen', 'title' => 'Gebruikersquery\'s', ), - 'profile' => array( - '_' => 'Profiel beheer', - 'delete' => array( - '_' => 'Account verwijderen', - 'warn' => 'Uw account en alle gerelateerde gegvens worden verwijderd.', - ), - 'password_api' => 'Wachtwoord API
    (e.g., voor mobiele apps)', - 'password_form' => 'Wachtwoord
    (voor de Web-formulier log in methode)', - 'password_format' => 'Ten minste 7 tekens', - 'title' => 'Profiel', - ), 'reading' => array( '_' => 'Lezen', 'after_onread' => 'Na “markeer alles als gelezen”,', @@ -95,7 +95,6 @@ return array( 'display_categories_unfolded' => 'Toon categoriën ingeklapt als standaard', 'hide_read_feeds' => 'Verberg categoriën en feeds zonder ongelezen artikelen (werkt niet met “Toon alle artikelen” configuratie)', 'img_with_lazyload' => 'Gebruik "lazy load" methode om afbeeldingen te laden', - 'sides_close_article' => 'Sluit het artikel door buiten de artikeltekst te klikken', 'jump_next' => 'Ga naar volgende ongelezen (feed of categorie)', 'mark_updated_article_unread' => 'Markeer vernieuwd artikel als ongelezen', 'number_divided_when_reader' => 'Gedeeld door 2 in de lees modus.', @@ -112,6 +111,7 @@ return array( 'all_articles' => 'Bekijk alle artikelen', 'unread' => 'Bekijk alleen ongelezen', ), + 'sides_close_article' => 'Sluit het artikel door buiten de artikeltekst te klikken', 'sort' => array( '_' => 'Sorteer volgorde', 'newer_first' => 'Nieuwste eerst', @@ -158,8 +158,8 @@ return array( 'javascript' => 'JavaScript moet geactiveerd zijn om verwijzingen te gebruiken', 'last_article' => 'Spring naar laatste artikel', 'load_more' => 'Laad meer artikelen', - 'mark_read' => 'Markeer als gelezen', 'mark_favorite' => 'Markeer als favoriet', + 'mark_read' => 'Markeer als gelezen', 'navigation' => 'Navigatie', 'navigation_help' => 'Met de "Shift" toets, kunt u navigatie verwijzingen voor feeds gebruiken.
    Met de "Alt" toets, kunt u navigatie verwijzingen voor categoriën gebruiken.', 'next_article' => 'Spring naar volgende artikel', diff --git a/app/i18n/nl/feedback.php b/app/i18n/nl/feedback.php index b16232b84..07ac7e89d 100644 --- a/app/i18n/nl/feedback.php +++ b/app/i18n/nl/feedback.php @@ -50,6 +50,10 @@ return array( 'no_zip_extension' => 'ZIP uitbreiding is niet aanwezig op uw server.', 'zip_error' => 'Er is een fout opgetreden tijdens het imporeren van het ZIP bestand.', ), + 'profile' => array( + 'error' => 'Uw profiel kan niet worden aangepast', + 'updated' => 'Uw profiel is aangepast', + ), 'sub' => array( 'actualize' => 'Actualiseren', 'articles' => array( @@ -108,10 +112,5 @@ return array( '_' => 'Gebruiker %s is bijgewerkt', 'error' => 'Gebruiker %s kan niet worden bijgewerkt', ), - 'set_registration' => 'Het maximale aantal accounts is vernieuwd.', - ), - 'profile' => array( - 'error' => 'Uw profiel kan niet worden aangepast', - 'updated' => 'Uw profiel is aangepast', ), ); diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php index f18da5c36..99b1cf9c2 100644 --- a/app/i18n/nl/gen.php +++ b/app/i18n/nl/gen.php @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\A\\p\\r\\i\\l', - 'Aug' => '\\A\\u\\g\\u\\s\\t\\u\\s', - 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', - 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\i', - 'Jan' => '\\J\\a\\n\\u\\a\\r\\i', - 'Jul' => '\\J\\u\\l\\i', - 'Jun' => '\\J\\u\\n\\i', - 'Mar' => '\\M\\a\\a\\r\\t', - 'May' => '\\M\\e\\i', - 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', - 'Oct' => '\\O\\k\\t\\o\\b\\e\\r', - 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', 'apr' => 'apr', 'april' => 'Apr', + 'Aug' => '\\A\\u\\g\\u\\s\\t\\u\\s', 'aug' => 'aug', 'august' => 'Aug', 'before_yesterday' => 'Ouder', + 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', 'dec' => 'dec', 'december' => 'Dec', + 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\i', 'feb' => 'feb', 'february' => 'Feb', 'format_date' => 'j %s Y', 'format_date_hour' => 'j %s Y \\o\\m H\\:i', 'fri' => 'Vr', + 'Jan' => '\\J\\a\\n\\u\\a\\r\\i', 'jan' => 'jan', 'january' => 'Jan', + 'Jul' => '\\J\\u\\l\\i', 'jul' => 'jul', 'july' => 'Jul', + 'Jun' => '\\J\\u\\n\\i', 'jun' => 'jun', 'june' => 'Jun', 'last_3_month' => 'Laatste drie maanden', @@ -78,17 +73,22 @@ return array( 'last_month' => 'Vorige maand', 'last_week' => 'Vorige week', 'last_year' => 'Vorig jaar', + 'Mar' => '\\M\\a\\a\\r\\t', 'mar' => 'mrt', 'march' => 'Mrt', + 'May' => '\\M\\e\\i', 'may' => 'Mei', 'may_' => 'Mei', 'mon' => 'Ma', 'month' => 'maanden', + 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', 'nov' => 'nov', 'november' => 'Nov', + 'Oct' => '\\O\\k\\t\\o\\b\\e\\r', 'oct' => 'okt', 'october' => 'Okt', 'sat' => 'Za', + 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', 'sep' => 'sep', 'september' => 'Sep', 'sun' => 'Zo', @@ -161,7 +161,6 @@ return array( 'previous' => 'Vorige', ), 'share' => array( - 'Known' => 'Known based sites', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -169,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => 'Known based sites', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php index 33fec43c0..c2b550647 100644 --- a/app/i18n/nl/index.php +++ b/app/i18n/nl/index.php @@ -53,10 +53,11 @@ return array( 'starred' => 'Laat alleen favorieten zien', 'stats' => 'Statistieken', 'subscription' => 'Abonnementen beheer', + 'tags' => 'My labels', //TODO - Translation 'unread' => 'Laat alleen ongelezen zien', ), 'share' => 'Delen', 'tag' => array( - 'related' => 'Verwante labels', //TODO + 'related' => 'Verwante labels', //TODO - Translation ), ); diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php index 2d2f38913..6597c8146 100644 --- a/app/i18n/nl/install.php +++ b/app/i18n/nl/install.php @@ -24,8 +24,8 @@ return array( 'ok' => 'Database configuratie is opgeslagen.', ), 'host' => 'Host', - 'prefix' => 'Tabel voorvoegsel', 'password' => 'Database wachtwoord', + 'prefix' => 'Tabel voorvoegsel', 'type' => 'Type database', 'username' => 'Database gebruikersnaam', ), diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php index fec7fb4e7..7b1e3727e 100644 --- a/app/i18n/nl/sub.php +++ b/app/i18n/nl/sub.php @@ -27,7 +27,7 @@ return array( 'password' => 'HTTP wachtwoord', 'username' => 'HTTP gebruikers naam', ), - 'clear_cache' => 'Always clear cache', //TODO + 'clear_cache' => 'Always clear cache', //TODO - Translation 'css_help' => 'Haalt verstoorde RSS feeds op (attentie, heeft meer tijd nodig!)', 'css_path' => 'Artikelen CSS pad op originele website', 'description' => 'Omschrijving', diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php index 3bad14e7c..9eab3b4c8 100644 --- a/app/i18n/oc/admin.php +++ b/app/i18n/oc/admin.php @@ -1,99 +1,13 @@ array( - 'disabled' => 'Desactivada', - 'enabled' => 'Activada', - 'name' => 'Nom', - 'description' => 'Descripcion', - 'empty_list' => 'Cap d’extensions pas installadas', - 'no_configure_view' => 'Aquesta extension se pòt pas configurar.', - 'system' => array( - '_' => 'Extensions sistèma', - 'no_rights' => 'Extensions sistèma (contrarotlat per l’administrator)', - ), - 'title' => 'Extensions', - 'user' => 'Extensions utilizaire', - 'community' => 'Extensions utilizaires disponiblas', - 'version' => 'Version', - 'author' => 'Autor', - 'latest' => 'Installada', - 'update' => 'Mesa a jorn disponibla', - ), - 'stats' => array( - 'no_idle' => 'I a pas cap d’article inactiu !', - 'status_favorites' => 'Favorits', - 'status_read' => 'Legit', - '_' => 'Estatisticas', - 'all_feeds' => 'Totes los fluxes', - 'category' => 'Categoria', - 'entry_count' => 'Nombre d’articles', - 'entry_per_category' => 'Articles per categoria', - 'entry_per_day' => 'Nombre d’articles per jorn (30 darrièrs jorns)', - 'entry_per_day_of_week' => 'Per jorn de la setmana (mejana : %.2f messatges)', - 'entry_per_hour' => 'Per ora (mejana : %.2f messatges)', - 'entry_per_month' => 'Per mes (mejana : %.2f messatges)', - 'entry_repartition' => 'Reparticion dels articles', - 'feed' => 'Flux', - 'feed_per_category' => 'Fluxes per categoria', - 'idle' => 'Fluxes inactius', - 'main' => 'Estatisticas principalas', - 'main_stream' => 'Flux màger', - 'menu' => array( - 'idle' => 'Fluxes inactius', - 'main' => 'Estatisticas principalas', - 'repartition' => 'Reparticion dels articles', - ), - 'number_entries' => '%d articles', - 'percent_of_total' => '%% del total', - 'repartition' => 'Reparticion dels articles', - 'status_total' => 'Total', - 'status_unread' => 'Pas legits', - 'title' => 'Estatisticas', - 'top_feed' => 'Los dètz fluxes mai gròsses', - ), - 'system' => array( - '_' => 'Configuracion sistèma', - 'instance-name' => 'Nom de l’instància', - 'registration' => array( - 'number' => 'Nombre max de comptes', - 'help' => '0 vòl dire qu’i a pas cap de limita de compte', - ), - 'auto-update-url' => 'URL del servici de mesa a jorn', - 'max-categories' => 'Limita de categoria per utilizaire', - 'max-feeds' => 'Limita de fluxes per utilizaire', - ), - 'update' => array( - 'apply' => 'Aplicar', - 'none' => 'Cap d’actualizacion d’aplicar', - '_' => 'Sistèma de mesa a jorn', - 'check' => 'Verificar las mesas a jorn', - 'current_version' => 'Vòstra version actuala de FreshRSS es %s.', - 'last' => 'Darrièra verificacion : %s', - 'title' => 'Sistèma de mesa a jorn', - ), - 'user' => array( - 'delete_users' => 'Suprimir un utilizaire', - 'language' => 'Lenga', - 'password_format' => 'Almens 7 caractèrs', - 'selected' => 'Utilizaire seleccionat', - 'username' => 'Nom d’utilizaire', - 'users' => 'Utilizaires', - 'articles_and_size' => '%s articles (%s)', - 'create' => 'Crear un nòu utilizaire', - 'number' => '%d compte ja creat', - 'numbers' => '%d comptes ja creats', - 'password_form' => 'Senhal
    (ex. : per la connexion via formulari)', - 'title' => 'Gestion dels utilizaires', - 'update_users' => 'Actualizar un utilizaire', - 'user_list' => 'Lista dels utilizaires', - ), 'auth' => array( - 'none' => 'Cap (perilhós)', 'allow_anonymous' => 'Autorizar la lectura anonima dels articles de l’utilizaire per defaut (%s)', 'allow_anonymous_refresh' => 'Autorizar l’actualizacion anonime dels fluxes', 'api_enabled' => 'Autorizar l’accès per API(necessari per las aplicacions mobil)', 'form' => 'Formulari (tradicional, demanda JavaScript)', 'http' => 'HTTP (per utilizaires avançats amb HTTPS)', + 'none' => 'Cap (perilhós)', 'title' => 'Autentificacion', 'title_reset' => 'Reïnicializacion de l’autentificacion', 'token' => 'Geton d’autentificacion', @@ -103,8 +17,8 @@ return array( ), 'check_install' => array( 'cache' => array( - 'nok' => 'Volgatz verificar los dreches sul repertòri ./data/cache. Lo servidor HTTP deu poder escriure dedins', - 'ok' => 'Los dreches sul cache son bons.', + 'nok' => 'Volgatz verificar los dreches sul repertòri ./data/cache. Lo servidor HTTP deu poder escriure dedins', + 'ok' => 'Los dreches sul cache son bons.', ), 'categories' => array( 'nok' => 'La tabla “category” es mala configurada.', @@ -191,4 +105,91 @@ return array( 'ok' => 'Avètz l’exension ZIP.', ), ), + 'extensions' => array( + 'author' => 'Autor', + 'community' => 'Extensions utilizaires disponiblas', + 'description' => 'Descripcion', + 'disabled' => 'Desactivada', + 'empty_list' => 'Cap d’extensions pas installadas', + 'enabled' => 'Activada', + 'latest' => 'Installada', + '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)', + ), + 'title' => 'Extensions', + 'update' => 'Mesa a jorn disponibla', + 'user' => 'Extensions utilizaire', + 'version' => 'Version', + ), + 'stats' => array( + '_' => 'Estatisticas', + 'all_feeds' => 'Totes los fluxes', + 'category' => 'Categoria', + 'entry_count' => 'Nombre d’articles', + 'entry_per_category' => 'Articles per categoria', + 'entry_per_day' => 'Nombre d’articles per jorn (30 darrièrs jorns)', + 'entry_per_day_of_week' => 'Per jorn de la setmana (mejana : %.2f messatges)', + 'entry_per_hour' => 'Per ora (mejana : %.2f messatges)', + 'entry_per_month' => 'Per mes (mejana : %.2f messatges)', + 'entry_repartition' => 'Reparticion dels articles', + 'feed' => 'Flux', + 'feed_per_category' => 'Fluxes per categoria', + 'idle' => 'Fluxes inactius', + 'main' => 'Estatisticas principalas', + 'main_stream' => 'Flux màger', + 'menu' => array( + 'idle' => 'Fluxes inactius', + 'main' => 'Estatisticas principalas', + 'repartition' => 'Reparticion dels articles', + ), + 'no_idle' => 'I a pas cap d’article inactiu !', + 'number_entries' => '%d articles', + 'percent_of_total' => '%% del total', + 'repartition' => 'Reparticion dels articles', + 'status_favorites' => 'Favorits', + 'status_read' => 'Legit', + 'status_total' => 'Total', + 'status_unread' => 'Pas legits', + 'title' => 'Estatisticas', + 'top_feed' => 'Los dètz fluxes mai gròsses', + ), + 'system' => array( + '_' => 'Configuracion sistèma', + 'auto-update-url' => 'URL del servici de mesa a jorn', + 'instance-name' => 'Nom de l’instància', + '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', + ), + ), + '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', + ), + 'user' => array( + 'articles_and_size' => '%s articles (%s)', + 'create' => 'Crear un nòu utilizaire', + 'delete_users' => 'Suprimir un utilizaire', + 'language' => 'Lenga', + 'number' => '%d compte ja creat', + 'numbers' => '%d comptes ja creats', + 'password_form' => 'Senhal
    (ex. : per la connexion via formulari)', + 'password_format' => 'Almens 7 caractèrs', + 'selected' => 'Utilizaire seleccionat', + 'title' => 'Gestion dels utilizaires', + 'update_users' => 'Actualizar un utilizaire', + 'user_list' => 'Lista dels utilizaires', + 'username' => 'Nom d’utilizaire', + 'users' => 'Utilizaires', + ), ); diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php index 7b297805d..fff8689e0 100644 --- a/app/i18n/oc/conf.php +++ b/app/i18n/oc/conf.php @@ -1,11 +1,6 @@ array( - 'users' => 'Utilizaires', - 'articles_and_size' => '%s articles (%s)', - 'current' => 'Utilizaire actual', - 'is_admin' => 'es administrator', - ), 'archiving' => array( '_' => 'Archivar', 'advanced' => 'Avançat', @@ -33,6 +28,7 @@ return array( 'seconds' => 'segondas (0 significa cap de timeout)', 'timeout' => 'Temps d’afichatge de las notificacions HTML5', ), + 'show_nav_buttons' => 'Mostrar los botons de navigacion', 'theme' => 'Tèma', 'title' => 'Afichatge', 'width' => array( @@ -42,7 +38,17 @@ return array( 'no_limit' => 'Cap de limit', 'thin' => 'Fina', ), - 'show_nav_buttons' => 'Mostrar los botons de navigacion', + ), + 'profile' => array( + '_' => 'Gestion del perfil', + 'delete' => array( + '_' => 'Supression del compte', + 'warn' => 'Lo compte e totas las donadas ligadas seràn suprimits.', + ), + 'password_api' => 'Senhal API
    (ex. : per las aplicacions mobil)', + 'password_form' => 'Senhal API
    (ex. : per la connexion via formulari)', + 'password_format' => 'Almens 7 caractèrs', + 'title' => 'Pefil', ), 'query' => array( '_' => 'Filtres utilizaires', @@ -78,31 +84,19 @@ return array( 'state_15' => 'Mostrar totes los articles', 'title' => 'Filtres utilizaire', ), - 'profile' => array( - '_' => 'Gestion del perfil', - 'delete' => array( - '_' => 'Supression del compte', - 'warn' => 'Lo compte e totas las donadas ligadas seràn suprimits.', - ), - 'password_api' => 'Senhal API
    (ex. : per las aplicacions mobil)', - 'password_form' => 'Senhal API
    (ex. : per la connexion via formulari)', - 'password_format' => 'Almens 7 caractèrs', - 'title' => 'Pefil', - ), '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', 'auto_remove_article' => 'Rescondre los articles aprèp lectura', - 'mark_updated_article_unread' => 'Marcar los articles actualizats coma pas legits', 'confirm_enabled' => 'Mostrar una confirmacion per las accions del tipe « o marcar tot coma legit »', 'display_articles_unfolded' => 'Mostrar los articles desplegats per defaut', 'display_categories_unfolded' => 'Mostrar las categorias plegadas per defaut', 'hide_read_feeds' => 'Rescondre las categorias & fluxes sens articles pas legits (fonciona pas amb la configuracion « Mostrar totes los articles »)', 'img_with_lazyload' => 'Utilizar lo mòde “cargament tardiu” per las imatges', - 'sides_close_article' => 'Clicar fòra de la zòna de tèxte tampa l’article', 'jump_next' => 'sautar al vesin venent pas legit (flux o categoria)', + 'mark_updated_article_unread' => 'Marcar los articles actualizats coma pas legits', 'number_divided_when_reader' => 'Devisat per 2 dins la vista de lectura.', 'read' => array( 'article_open_on_website' => 'quand l’article es dobèrt sul site d’origina', @@ -117,11 +111,13 @@ return array( 'all_articles' => 'Mostrar totes los articles', 'unread' => 'Mostrar pas que los pas legits', ), + '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', ), + 'sticky_post' => 'Gardar l\'article amont quand es dobèrt', 'title' => 'Lectura', 'view' => array( 'default' => 'Vista per defaut', @@ -129,7 +125,6 @@ return array( 'normal' => 'Vista normala', 'reader' => 'Vista lectura', ), - 'sticky_post' => 'Gardar l\'article amont quand es dobèrt', ), 'sharing' => array( '_' => 'Partatge', @@ -151,33 +146,39 @@ return array( ), '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.', 'close_dropdown' => 'Tampar los menús', 'collapse_article' => 'Replegar', 'first_article' => 'Passar al primièr article', 'focus_search' => 'Accedir a la recèrca', - 'mark_read' => 'Marcar coma legit', - 'mark_favorite' => 'Ajustar als favorits', - 'navigation' => 'Navigacion', - 'other_action' => 'Autras accions', - 'title' => 'Acorchis', - 'views' => 'Vistas', - 'article_action' => 'Accions ligadas a l\'article', - '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.', 'global_view' => 'Passar a la vista generala', 'help' => 'Mostrar la documentacion', 'javascript' => 'Devètz activar lo Javascript per utilizar los acorchis', 'last_article' => 'Passar al darrièr article', 'load_more' => 'Cargar mai d’articles', + 'mark_favorite' => 'Ajustar als favorits', + 'mark_read' => 'Marcar coma legit', + 'navigation' => 'Navigacion', 'navigation_help' => 'Amb lo modificador «Shift», los acorchis de navigacion s’aplican als fluxes.
    Amb lo modificador «Alt», los acorchis de navigacion s’aplican a las categorias.', 'next_article' => 'Passar a l’article seguent', 'normal_view' => 'Passar a la vista normala', + 'other_action' => 'Autras accions', 'previous_article' => 'Passar a l’article precedent', 'reading_view' => 'Passar a la vista lectura', 'rss_view' => 'Dobrir la vista RSS dins un onglet novèl', 'see_on_website' => 'Veire al site d’origina', 'shift_for_all_read' => '+ shift per marcar los articles coma legits', + 'title' => 'Acorchis', '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', + ), + 'user' => array( + 'articles_and_size' => '%s articles (%s)', + 'current' => 'Utilizaire actual', + 'is_admin' => 'es administrator', + 'users' => 'Utilizaires', ), ); diff --git a/app/i18n/oc/feedback.php b/app/i18n/oc/feedback.php index 225be119b..7f7d05dbd 100644 --- a/app/i18n/oc/feedback.php +++ b/app/i18n/oc/feedback.php @@ -1,4 +1,5 @@ array( 'optimization_complete' => 'Optimizacion acabada', @@ -49,6 +50,10 @@ return array( 'no_zip_extension' => 'L\'extension es pas presenta sul servidor.', 'zip_error' => 'Una error s’es producha pendent l’importacion del fichièr ZIP.', ), + 'profile' => array( + 'error' => 'Impossible d’actualizar vòstre perfil', + 'updated' => 'Vòstre perfil es estat actualizat', + ), 'sub' => array( 'actualize' => 'Actualizar', 'articles' => array( @@ -108,8 +113,4 @@ return array( 'error' => 'L’utilizaire %s es pas estat actualizat', ), ), - 'profile' => array( - 'error' => 'Impossible d’actualizar vòstre perfil', - 'updated' => 'Vòstre perfil es estat actualizat', - ), ); diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php index cdeb43807..246a74eb2 100644 --- a/app/i18n/oc/gen.php +++ b/app/i18n/oc/gen.php @@ -1,137 +1,71 @@ array( - 'cancel' => 'Anullar', - 'disable' => 'Desactivar', - 'enable' => 'Activar', - 'filter' => 'Filtre', - 'import' => 'Importar', - 'submit' => 'Mandar', 'actualize' => 'Actualizar', 'back_to_rss_feeds' => '← Tornar a vòstres fluxes RSS', + 'cancel' => 'Anullar', 'create' => 'Crear', + 'disable' => 'Desactivar', 'empty' => 'Voidar', + 'enable' => 'Activar', 'export' => 'Exportar', + 'filter' => 'Filtre', + 'import' => 'Importar', 'manage' => 'Gerir', 'mark_favorite' => 'Ajustar als favorits', 'mark_read' => 'Marcar coma legit', 'remove' => 'Levar', 'see_website' => 'Veire lo site', + 'submit' => 'Mandar', 'truncate' => 'Suprimir totes los articles', 'update' => 'Actualizar', ), 'auth' => array( 'email' => 'Adreça de corrièl', + 'keep_logged_in' => 'Demorar connectat (%s jorns) ', + 'login' => 'Connexion', 'logout' => 'Se desconnectar', 'password' => array( '_' => 'Senhal', 'format' => 'Almens 7 caractèrs', ), - 'username' => array( - '_' => 'Nom d’utilizaire', - 'admin' => 'Nom d’utilizaire administrator', - 'format' => '16 caractèrs alfanumerics maximum)', - ), - 'keep_logged_in' => 'Demorar connectat (%s jorns) ', - 'login' => 'Connexion', 'registration' => array( '_' => 'Compte nòu', 'ask' => 'Crear un compte?', 'title' => 'Creacion de compte', ), 'reset' => 'Reïnicializacion de l’autentificacion', - ), - 'menu' => array( - 'about' => 'A prepaus', - 'admin' => 'Administracion', - 'configuration' => 'Configuracion', - 'user_profile' => 'Perfil', - 'queries' => 'Filtres utilizaire', - 'stats' => 'Estatisticas', - 'archiving' => 'Archivar', - 'authentication' => 'Autentificacion', - 'check_install' => 'Verificacion de l’installacion', - 'display' => 'Afichatge', - 'extensions' => 'Extensions', - 'logs' => 'Jornals d’audit', - 'reading' => 'Lectura', - 'search' => 'Recercar de mots o d’#etiquetas', - 'sharing' => 'Partatge', - 'shortcuts' => 'Acorchis', - 'system' => 'Configuracion sistèma', - 'update' => 'Mesa a jorn', - 'user_management' => 'Gestion dels utilizaires', - ), - 'pagination' => array( - 'next' => 'Seguent', - 'previous' => 'Precedent', - 'first' => 'Debuta', - 'last' => 'Fin', - 'load_more' => 'Cargar mai d’articles', - 'mark_all_read' => 'O marcar tot coma legit', - 'nothing_to_load' => 'I a pas mai d’articles', - ), - 'share' => array( - 'email' => 'Corrièl', - 'mastodon' => 'Mastodon', - 'blogotext' => 'Blogotext', - 'diaspora' => 'Diaspora*', - 'facebook' => 'Facebook', - 'g+' => 'Google+', - 'gnusocial' => 'GNU social', - 'jdh' => 'Journal du hacker', - 'Known' => 'Sites basats sus Known', - 'linkedin' => 'LinkedIn', - 'movim' => 'Movim', - 'pocket' => 'Pocket', - 'print' => 'Imprimir', - 'shaarli' => 'Shaarli', - 'twitter' => 'Twitter', - 'wallabag' => 'wallabag v1', - 'wallabagv2' => 'wallabag v2', - ), - 'short' => array( - 'no' => 'Non', - 'yes' => 'Òc', - 'attention' => 'Atencion !', - 'blank_to_disable' => 'Daissar void per desactivar', - 'by_author' => 'Per %s', - 'by_default' => 'Per defaut', - 'damn' => 'Zut !', - 'default_category' => 'Pas triat', - 'not_applicable' => 'Pas disponible', - 'ok' => 'Òc-ben !', - 'or' => 'o', + 'username' => array( + '_' => 'Nom d’utilizaire', + 'admin' => 'Nom d’utilizaire administrator', + 'format' => '16 caractèrs alfanumerics maximum)', + ), ), 'date' => array( 'Apr' => 'a\b\r\i\a\l', - 'Aug' => 'a\g\o\s\t', - 'Dec' => '\d\e\c\e\m\b\r\e', - 'Feb' => 'f\e\b\r\i\è\r', - 'Jan' => 'g\e\n\i\è\r', - 'Jul' => 'j\u\l\h\e\t', - 'Jun' => 'j\u\n\h', - 'Mar' => 'm\a\r\ç', - 'May' => '\m\a\i', - 'Nov' => '\n\o\v\e\m\b\r\e', - 'Oct' => '\o\c\t\ò\b\r\e', - 'Sep' => '\s\e\t\e\m\b\r\e', 'apr' => 'abr.', 'april' => 'abrial', + 'Aug' => 'a\g\o\s\t', 'aug' => 'agost', 'august' => 'agost', 'before_yesterday' => 'Abans ièr', + 'Dec' => '\d\e\c\e\m\b\r\e', 'dec' => 'dec.', 'december' => 'decembre', + 'Feb' => 'f\e\b\r\i\è\r', 'feb' => 'feb.', 'february' => 'febrièr', 'format_date' => 'j %s \de\ Y', 'format_date_hour' => 'j %s \de\ 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', 'july' => 'julhet', + 'Jun' => 'j\u\n\h', 'jun' => 'junh', 'june' => 'junh', 'last_3_month' => 'Dempuèi los tres darrièrs meses', @@ -139,17 +73,22 @@ 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ç', 'march' => 'març', + 'May' => '\m\a\i', 'may' => 'mai', 'may_' => 'mai', 'mon' => 'dl', 'month' => 'meses', + 'Nov' => '\n\o\v\e\m\b\r\e', 'nov' => 'nov.', 'november' => 'novembre', + 'Oct' => '\o\c\t\ò\b\r\e', 'oct' => 'oct.', 'october' => 'octòbre', 'sat' => 'ds', + 'Sep' => '\s\e\t\e\m\b\r\e', 'sep' => 'set.', 'september' => 'setembre', 'sun' => 'dg', @@ -191,4 +130,66 @@ return array( 'tr' => 'Türkçe', 'zh-cn' => '简体中文', ), + 'menu' => array( + 'about' => 'A prepaus', + 'admin' => 'Administracion', + 'archiving' => 'Archivar', + 'authentication' => 'Autentificacion', + 'check_install' => 'Verificacion de l’installacion', + 'configuration' => 'Configuracion', + 'display' => 'Afichatge', + 'extensions' => 'Extensions', + 'logs' => 'Jornals d’audit', + 'queries' => 'Filtres utilizaire', + 'reading' => 'Lectura', + 'search' => 'Recercar de mots o d’#etiquetas', + 'sharing' => 'Partatge', + 'shortcuts' => 'Acorchis', + 'stats' => 'Estatisticas', + 'system' => 'Configuracion sistèma', + 'update' => 'Mesa a jorn', + 'user_management' => 'Gestion dels utilizaires', + 'user_profile' => 'Perfil', + ), + 'pagination' => array( + 'first' => 'Debuta', + 'last' => 'Fin', + 'load_more' => 'Cargar mai d’articles', + 'mark_all_read' => 'O marcar tot coma legit', + 'next' => 'Seguent', + 'nothing_to_load' => 'I a pas mai d’articles', + 'previous' => 'Precedent', + ), + 'share' => array( + 'blogotext' => 'Blogotext', + 'diaspora' => 'Diaspora*', + 'email' => 'Corrièl', + 'facebook' => 'Facebook', + 'g+' => 'Google+', + 'gnusocial' => 'GNU social', + 'jdh' => 'Journal du hacker', + 'Known' => 'Sites basats sus Known', + 'linkedin' => 'LinkedIn', + 'mastodon' => 'Mastodon', + 'movim' => 'Movim', + 'pocket' => 'Pocket', + 'print' => 'Imprimir', + 'shaarli' => 'Shaarli', + 'twitter' => 'Twitter', + 'wallabag' => 'wallabag v1', + 'wallabagv2' => 'wallabag v2', + ), + 'short' => array( + 'attention' => 'Atencion !', + 'blank_to_disable' => 'Daissar void per desactivar', + 'by_author' => 'Per %s', + 'by_default' => 'Per defaut', + 'damn' => 'Zut !', + 'default_category' => 'Pas triat', + 'no' => 'Non', + 'not_applicable' => 'Pas disponible', + 'ok' => 'Òc-ben !', + 'or' => 'o', + 'yes' => 'Òc', + ), ); diff --git a/app/i18n/oc/index.php b/app/i18n/oc/index.php index b357a48e2..5211fd24a 100644 --- a/app/i18n/oc/index.php +++ b/app/i18n/oc/index.php @@ -1,9 +1,8 @@ array( '_' => 'A prepaus', - 'title' => 'A prepaus', - 'website' => 'Site internet', 'agpl3' => 'AGPL 3', 'bugs_reports' => 'Senhalament de problèmas', 'credits' => 'Crèdits', @@ -12,10 +11,25 @@ return array( 'github' => 'on Github', 'license' => 'Licéncia', 'project_website' => 'Site del projècte', + 'title' => 'A prepaus', + 'website' => 'Site internet', 'version' => 'Version', ), + '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', + ), + 'log' => array( + '_' => 'Jornals d’audit', + 'clear' => 'Escafar los jornals', + 'empty' => 'Los jornals son voids', + 'title' => 'Jornals d’audit', + ), 'menu' => array( - 'search_short' => 'Recercar', 'about' => 'A prepaus de FreshRSS', 'add_query' => 'Crear un filtre', 'before_one_day' => '1 jorn en arrièr', @@ -35,6 +49,7 @@ return array( 'read' => 'Mostrar los legits', 'reader_view' => 'Vista lectura', 'rss_view' => 'Flux RSS', + 'search_short' => 'Recercar', 'starred' => 'Mostrar los favorits', 'stats' => 'Estatisticas', 'subscription' => 'Gestion dels abonaments', @@ -42,20 +57,6 @@ return array( 'unread' => 'Mostar los pas legits', ), 'share' => 'Partejar', - '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', - ), - 'log' => array( - '_' => 'Jornals d’audit', - 'clear' => 'Escafar los jornals', - 'empty' => 'Los jornals son voids', - 'title' => 'Jornals d’audit', - ), 'tag' => array( 'related' => 'Etiquetas ligadas', ), diff --git a/app/i18n/oc/install.php b/app/i18n/oc/install.php index 52b56b4ec..5d4639ab4 100644 --- a/app/i18n/oc/install.php +++ b/app/i18n/oc/install.php @@ -1,10 +1,6 @@ array( - '_' => 'Lenga', - 'choose' => 'Causissètz la lenga per FreshRSS', - 'defined' => 'La lenga es corrèctament definida.', - ), 'action' => array( 'finish' => 'Acabar l’installacion', 'fix_errors_before' => 'Mercés de corregir las errors seguentas abans de contunhar.', @@ -28,8 +24,8 @@ return array( 'ok' => 'La configuracion de la basa de donadas es salvagarda.', ), 'host' => 'Òste', - 'prefix' => 'Prefixe de tabla', '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', ), @@ -74,8 +70,6 @@ return array( ), 'mbstring' => array( 'nok' => 'Impossible de trobar la bibliotèca recomandada mbstring per Unicode.', - //TODO - //TODO 'ok' => 'Avètz la bibliotèca recomandada mbstring per Unicode.', ), 'minz' => array( @@ -115,6 +109,11 @@ return array( 'js' => 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.', + ), 'not_deleted' => 'Quicòm a trucat, sembla qu’avètz suprimit %s a la man.', 'ok' => 'L’installacion s’es corrèctament passada.', 'step' => 'etapa %d', diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index 6b4bfd072..407a10b96 100644 --- a/app/i18n/oc/sub.php +++ b/app/i18n/oc/sub.php @@ -1,84 +1,86 @@ array( - 'title' => 'API', 'documentation' => 'Copiar l’URL seguenta per l’utilizaire dins d’una aisina extèrna.', + 'title' => 'API', ), 'bookmarklet' => array( - 'label' => 'S’abonar', '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.', + 'label' => 'S’abonar', 'title' => 'Bookmarklet', ), 'category' => array( - 'new' => 'Nòva categoria', '_' => 'Categoria', 'add' => 'Ajustar una categoria', 'empty' => 'Categoria voida', + 'new' => 'Nòva categoria', ), 'feed' => array( + 'add' => 'Ajustar un flux RSS', + 'advanced' => 'Avançat', + 'archiving' => 'Archivar', 'auth' => array( - 'password' => 'Senhal HTTP', - 'username' => 'Identificant HTTP', 'configuration' => 'Identificacion', 'help' => 'Permet l’accès als fluxes protegits per una autentificacion HTTP', 'http' => 'Autentificacion HTTP', + 'password' => 'Senhal HTTP', + 'username' => 'Identificant HTTP', ), + 'clear_cache' => 'Always clear cache', //TODO - Translation + 'css_help' => 'Permet de recuperar los fluxes troncats (atencion, demanda mai de temps !)', + 'css_path' => 'Selector CSS dels articles sul site d’origina', 'description' => 'Descripcion', + '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.', + 'informations' => 'Informacions', + 'keep_history' => 'Nombre minimum d’articles de servar', + 'moved_category_deleted' => 'Quand escafatz una categoria, sos fluxes son automaticament classats dins %s.', 'mute' => 'mut', + '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', ), - 'title' => 'Títol', - 'url' => 'Flux URL', - 'website' => 'URL del site', - 'add' => 'Ajustar un flux RSS', - 'advanced' => 'Avançat', - 'archiving' => 'Archivar', - 'css_path' => 'Selector CSS dels articles sul site d’origina', - 'empty' => 'Aqueste flux es void. Assegurats-vos qu’es totjorn mantengut.', - 'informations' => 'Informacions', - 'keep_history' => 'Nombre minimum d’articles de servar', - 'no_selected' => 'Cap de flux pas seleccionat.', - 'number_entries' => '%d articles', + 'pubsubhubbub' => 'Notificaciones instantáneas amb PubSubHubbub', 'ssl_verify' => 'Verificacion de la seguretat SSL', 'stats' => 'Estatisticas', 'think_to_add' => 'Podètz ajustar de fluxes.', 'timeout' => 'Temps d’espèra en segondas', + 'title' => 'Títol', 'title_add' => 'Ajustar un flux RSS', 'ttl' => 'Actualizar pas automaticament mai sovent que', + 'url' => 'Flux URL', 'validator' => 'Verificar la validitat del flux', - 'pubsubhubbub' => 'Notificaciones instantáneas amb PubSubHubbub', - 'css_help' => 'Permet de recuperar los fluxes troncats (atencion, demanda mai de temps !)', - 'error' => 'Aqueste flux a rescontrat un problèma. Volgatz verificar que siá totjorn accessible puèi actualizatz-lo.', - 'moved_category_deleted' => 'Quand escafatz una categoria, sos fluxes son automaticament classats dins %s.', + 'website' => 'URL del site', + ), + 'firefox' => array( + 'documentation' => 'Seguir las etapas descrichas aquí per ajustar FreshRSS a la lista dels lectors de flux de Firefox.', + 'title' => 'Lector de flux de Firefox', ), 'import_export' => array( 'export' => 'Exportar', - 'export_starred' => 'Exportar los favorits', - 'import' => 'Importar', - 'title' => 'Importar / Exportar', 'export_opml' => 'Exportar la lista de fluxes (OPML)', + 'export_starred' => 'Exportar los favorits', 'feed_list' => 'Lista dels %s articles', 'file_to_import' => 'Fichièr d’importar
    (OPML, JSON o ZIP)', 'file_to_import_no_zip' => 'Fichièr d’importar
    (OPML o JSON)', + 'import' => 'Importar', 'starred_list' => 'Lista dels articles favorits', + 'title' => 'Importar / Exportar', + ), 'menu' => array( - 'import_export' => 'Importar / Exportar', - 'subscription_tools' => 'Aisinas d’abonament', 'bookmark' => 'Sabonar (marcapagina FreshRSS)', + 'import_export' => 'Importar / Exportar', 'subscription_management' => 'Gestion dels abonaments', + 'subscription_tools' => 'Aisinas d’abonament', ), 'title' => array( - 'subscription_tools' => 'Aisinas d’abonament', '_' => 'Gestión dels abonaments', 'feed_management' => 'Gestion dels fluxes RSS', - ), - 'firefox' => array( - 'title' => 'Lector de flux de Firefox', - 'documentation' => 'Seguir las etapas descrichas aquí per ajustar FreshRSS a la lista dels lectors de flux de Firefox.', + 'subscription_tools' => 'Aisinas d’abonament', ), ); diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php index 51c5d381f..ca88e2039 100644 --- a/app/i18n/pt-br/admin.php +++ b/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 - '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' => 'Não foi possível encontrar o framework Minz.', @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + '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 '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)', ), 'title' => 'Extensões', + 'update' => 'Update available', //TODO - Translation 'user' => 'Extensões do usuário', - 'community' => 'Available community extensions', // @todo translate - 'name' => 'Name', // @todo translate - 'version' => 'Version', // @todo translate - 'description' => 'Description', // @todo translate - 'author' => 'Author', // @todo translate - 'latest' => 'Installed', // @todo translate - 'update' => 'Update available', // @todo translate + 'version' => 'Version', //TODO - Translation ), 'stats' => array( '_' => 'Estatísticas', @@ -179,15 +179,15 @@ return array( 'user' => array( 'articles_and_size' => '%s artigos (%s)', 'create' => 'Criar novo usuário', - 'delete_users' => 'Delete user', // TODO + 'delete_users' => 'Delete user', //TODO - Translation 'language' => 'Idioma', 'number' => 'Há %d conta criada', 'numbers' => 'Há %d contas criadas', 'password_form' => 'Senha
    (para o login pelo método do formulário)', 'password_format' => 'Ao menos 7 caracteres', - 'selected' => 'Selected user', // TODO + 'selected' => 'Selected user', //TODO - Translation 'title' => 'Gerenciar usuários', - 'update_users' => 'Update user', // TODO + 'update_users' => 'Update user', //TODO - Translation 'user_list' => 'Lista de usuários', 'username' => 'Usuário', 'users' => 'Usuários', diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php index 2547a8624..ae32bef72 100644 --- a/app/i18n/pt-br/conf.php +++ b/app/i18n/pt-br/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Linha inferior', 'entry' => 'Ícones de artigos', 'publication_date' => 'Data da publicação', - 'related_tags' => 'Tags relacionadas', //TODO + 'related_tags' => 'Tags relacionadas', //TODO - Translation 'sharing' => 'Compartilhar', 'top_line' => 'Linha superior', ), @@ -28,6 +28,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 'theme' => 'Tema', 'title' => 'Exibição', 'width' => array( @@ -37,12 +38,22 @@ return array( 'no_limit' => 'Sem lmite', 'thin' => 'Fino', ), - 'show_nav_buttons' => 'Show the navigation buttons', //TODO + ), + 'profile' => array( + '_' => 'Gerenciamento de perfil', + 'delete' => array( + '_' => 'Remover conta', + 'warn' => 'Sua conta e todos os dados relacionados serão removidos.', + ), + 'password_api' => 'Senha da API
    (p.s., para aplicativos móveis)', + 'password_form' => 'Senha
    (para o método de formulário web)', + 'password_format' => 'Ao menos 7 caracteres', + 'title' => '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 + 'display' => 'Display user query results', //TODO - Translation 'filter' => 'Filtro aplicado:', 'get_all' => 'Mostrar todos os artigos', 'get_category' => 'Visualizar "%s" categoria', @@ -53,7 +64,7 @@ return array( 'number' => 'Query n°%d', 'order_asc' => 'Exibir artigos mais antigos primeiro', 'order_desc' => 'Exibir artigos mais novos primeiro', - 'remove' => 'Remove user query', // TODO + 'remove' => 'Remove user query', //TODO - Translation 'search' => 'Busca por "%s"', 'state_0' => 'Exibir todos os artigos', 'state_1' => 'Exibir artigos lidos', @@ -73,31 +84,19 @@ return array( 'state_15' => 'Exibir todos os artigos', 'title' => 'Queries de usuários', ), - 'profile' => array( - '_' => 'Gerenciamento de perfil', - 'delete' => array( - '_' => 'Remover conta', - 'warn' => 'Sua conta e todos os dados relacionados serão removidos.', - ), - 'password_api' => 'Senha da API
    (p.s., para aplicativos móveis)', - 'password_form' => 'Senha
    (para o método de formulário web)', - 'password_format' => 'Ao menos 7 caracteres', - 'title' => 'Perfil', - ), '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', 'auto_remove_article' => 'Esconder artigos depois de lidos', - 'mark_updated_article_unread' => 'Marcar artigos atualizados como não lidos', 'confirm_enabled' => 'Exibir uma caixa de diálogo de confirmação quando acionar "marcar todos como lido"', 'display_articles_unfolded' => 'Mostrar aritogs abertos por padrão', 'display_categories_unfolded' => 'Mostrar artigos fechados por padrão', 'hide_read_feeds' => 'Esconder categorias e feeds com nenhum artigo não lido (não funciona com a configuração "Mostrar todos os artigos”)', 'img_with_lazyload' => 'Utilizar o modo "lazy load" para carregar as imagens', - 'sides_close_article' => 'Clicando fora da área do texto do artigo fecha o mesmo', 'jump_next' => 'Vá para o próximo irmão não lido (feed ou categoria)', + 'mark_updated_article_unread' => 'Marcar artigos atualizados como não lidos', 'number_divided_when_reader' => 'Dividido por 2 no modo de leitura .', 'read' => array( 'article_open_on_website' => 'quando o artigo é aberto no site original', @@ -112,6 +111,7 @@ return array( 'all_articles' => 'Exibir todos os artigos', 'unread' => 'Exibir apenas não lido', ), + 'sides_close_article' => 'Clicando fora da área do texto do artigo fecha o mesmo', 'sort' => array( '_' => 'Ordem de visualização', 'newer_first' => 'Novos primeiro', @@ -128,7 +128,7 @@ return array( ), 'sharing' => array( '_' => 'Compartilhando', - 'add' => 'Add a sharing method', // TODO + 'add' => 'Add a sharing method', //TODO - Translation 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -136,7 +136,7 @@ return array( 'g+' => 'Google+', 'more_information' => 'Mais informação', 'print' => 'Imprimir', - 'remove' => 'Remove sharing method', // TODO + 'remove' => 'Remove sharing method', //TODO - Translation 'shaarli' => 'Shaarli', 'share_name' => 'Nome de visualização para compartilhar', 'share_url' => 'URL utilizada para compartilhar', @@ -153,27 +153,27 @@ 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 + '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', 'load_more' => 'Carregar mais artigos', - 'mark_read' => 'Marcar como lido', 'mark_favorite' => 'Marcar como favorito', + 'mark_read' => 'Marcar como lido', 'navigation' => 'Navegação', 'navigation_help' => 'Com o modificador "Shift", atalhos de navegação aplicam aos feeds.
    Com o "Alt" modificador, atalhos de navegação aplicam as categorias.', 'next_article' => 'Pule para o próximo artigo', - 'normal_view' => 'Switch to normal view', // TODO + '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 - 'rss_view' => 'Open RSS view in a new tab', // TODO + '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' => '+ shift para marcar todos os artigos como lido', '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 + 'views' => 'Views', //TODO - Translation ), 'user' => array( 'articles_and_size' => '%s artigos (%s)', diff --git a/app/i18n/pt-br/feedback.php b/app/i18n/pt-br/feedback.php index a2d66384e..816bbf43b 100644 --- a/app/i18n/pt-br/feedback.php +++ b/app/i18n/pt-br/feedback.php @@ -50,11 +50,15 @@ return array( 'no_zip_extension' => 'extensão ZIP não está presente em seu servidor.', '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', + ), 'sub' => array( 'actualize' => 'Atualizando', 'articles' => array( - 'marked_read' => 'The selected articles have been marked as read.', //TODO - 'marked_unread' => 'The articles have been marked as unread.', //TODO + '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.', @@ -76,7 +80,7 @@ return array( 'already_subscribed' => 'Você já está inscrito no %s', 'deleted' => 'o Feed foi deletado', 'error' => 'O feed não pode ser atualizado', - 'internal_problem' => 'O RSS feed não pôde ser adicionado. Verifique os FreshRSS logs para detalhes.', // @todo + 'internal_problem' => 'O RSS feed não pôde ser adicionado. Verifique os FreshRSS logs para detalhes.', //TODO - Translation 'invalid_url' => 'URL %s é inválida', 'n_actualized' => '%d feeds foram atualizados', 'n_entries_deleted' => '%d artigos foram deletados', @@ -105,12 +109,8 @@ return array( 'error' => 'Usuário %s não pode ser deletado', ), 'updated' => array( - '_' => 'User %s has been updated', // TODO - 'error' => 'User %s has not been updated', // TODO + '_' => 'User %s has been updated', //TODO - Translation + 'error' => 'User %s has not been updated', //TODO - Translation ), ), - 'profile' => array( - 'error' => 'Your profile cannot be modified', - 'updated' => 'Your profile has been modified', - ), ); diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php index bf5214ee8..8a0b26b3d 100644 --- a/app/i18n/pt-br/gen.php +++ b/app/i18n/pt-br/gen.php @@ -19,7 +19,7 @@ return array( 'see_website' => 'Ver o site', 'submit' => 'Enviar', 'truncate' => 'Deletar todos os artigos', - 'update' => 'Update', // TODO + 'update' => 'Update', //TODO - Translation ), 'auth' => array( 'email' => 'Endereço de e-mail', @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\A\\b\\r\\i\\l', - 'Aug' => '\\A\\g\\o\\s\\t\\o', - 'Dec' => '\\D\\e\\z\\e\\m\\b\\r\\o', - 'Feb' => '\\F\\e\\v\\e\\r\\e\\i\\r\\o', - 'Jan' => '\\J\\a\\n\\e\\i\\r\\o', - 'Jul' => '\\J\\u\\l\\h\\o', - 'Jun' => '\\J\\u\\n\\h\\o', - 'Mar' => '\\M\\a\\r\\ç\\o', - 'May' => '\\M\\a\\i\\o', - 'Nov' => '\\N\\o\\v\\e\\m\\b\\r\\o', - 'Oct' => '\\O\\u\\t\\u\\b\\r\\o', - 'Sep' => '\\S\\e\\t\\e\\m\\b\\r\\o', 'apr' => 'abr', 'april' => 'Abr', + 'Aug' => '\\A\\g\\o\\s\\t\\o', 'aug' => 'ago', 'august' => 'Ago', 'before_yesterday' => 'Antes de ontem', + 'Dec' => '\\D\\e\\z\\e\\m\\b\\r\\o', 'dec' => 'dez', 'december' => 'Dez', + 'Feb' => '\\F\\e\\v\\e\\r\\e\\i\\r\\o', 'feb' => 'fev', 'february' => 'Fev', 'format_date' => 'j \\d\\e %s \\d\\e Y', 'format_date_hour' => 'j \\d\\e %s \\d\\e Y\\, H\\:i', 'fri' => 'Sex', + 'Jan' => '\\J\\a\\n\\e\\i\\r\\o', 'jan' => 'jan', 'january' => 'Jan', + 'Jul' => '\\J\\u\\l\\h\\o', 'jul' => 'jul', 'july' => 'Jul', + 'Jun' => '\\J\\u\\n\\h\\o', 'jun' => 'jun', 'june' => 'Jun', 'last_3_month' => 'Últimos três meses', @@ -78,16 +73,22 @@ return array( 'last_month' => 'Últimos mês', 'last_week' => 'Última semana', 'last_year' => 'Último ano', + 'Mar' => '\\M\\a\\r\\ç\\o', 'mar' => 'mar', 'march' => 'Mar', + 'May' => '\\M\\a\\i\\o', 'may' => 'Mai', + 'may_' => 'Mai', 'mon' => 'Seg', 'month' => 'meses', + 'Nov' => '\\N\\o\\v\\e\\m\\b\\r\\o', 'nov' => 'nov', 'november' => 'Nov', + 'Oct' => '\\O\\u\\t\\u\\b\\r\\o', 'oct' => 'out', 'october' => 'Out', 'sat' => 'Sab', + 'Sep' => '\\S\\e\\t\\e\\m\\b\\r\\o', 'sep' => 'set', 'september' => 'Set', 'sun' => 'Dom', @@ -160,7 +161,6 @@ return array( 'previous' => 'Anterior', ), 'share' => array( - 'Known' => 'Known based sites', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -168,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => 'Known based sites', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', diff --git a/app/i18n/pt-br/index.php b/app/i18n/pt-br/index.php index 9f98902ed..e5807ed95 100644 --- a/app/i18n/pt-br/index.php +++ b/app/i18n/pt-br/index.php @@ -40,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 + 'mark_selection_unread' => 'Mark selection as unread', //TODO - Translation 'newer_first' => 'Novos primeiro', 'non-starred' => 'Mostrar todos, exceto favoritos', 'normal_view' => 'visualização normal', @@ -53,10 +53,11 @@ return array( 'starred' => 'Mostrar apenas os favoritos', 'stats' => 'Estatísticas', 'subscription' => 'Gerenciamento de inscrições', + 'tags' => 'My labels', //TODO - Translation 'unread' => 'Mostrar apenas os não lidos', ), 'share' => 'Compartilhar', 'tag' => array( - 'related' => 'Tags relacionadas', //TODO + 'related' => 'Tags relacionadas', //TODO - Translation ), ); diff --git a/app/i18n/pt-br/install.php b/app/i18n/pt-br/install.php index 65bddf62c..d99a09364 100644 --- a/app/i18n/pt-br/install.php +++ b/app/i18n/pt-br/install.php @@ -24,8 +24,8 @@ return array( 'ok' => 'Configurações do banco de dados foram salvas.', ), 'host' => 'Host', - 'prefix' => 'Prefixo da tabela', 'password' => 'Senha do banco de dados', + 'prefix' => 'Prefixo da tabela', 'type' => 'Tipo do banco de dados', 'username' => 'Usuário do banco de dados', ), @@ -69,8 +69,8 @@ return array( 'ok' => 'Você tem a extensão JSON.', ), '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' => 'Não foi possível encontrar o framework Minz.', diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php index daa24e8f3..15986d6c3 100644 --- a/app/i18n/pt-br/sub.php +++ b/app/i18n/pt-br/sub.php @@ -2,13 +2,13 @@ return array( 'api' => array( - 'documentation' => 'Copy the following URL to use it within an external tool.',// TODO - 'title' => 'API',// TODO + '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 - 'title' => 'Bookmarklet',// TODO + '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', @@ -27,7 +27,7 @@ return array( 'password' => 'Senha HTTP', 'username' => 'Usuário HTTP', ), - 'clear_cache' => 'Always clear cache', //TODO + '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', @@ -36,26 +36,26 @@ return array( 'informations' => 'Informações', 'keep_history' => 'Número mínimo de artigos para manter', 'moved_category_deleted' => 'Quando você deleta uma categoria, seus feeds são automaticamente classificados como %s.', - 'mute' => 'mute', // TODO + 'mute' => 'mute', //TODO - Translation 'no_selected' => 'Nenhum feed selecionado.', 'number_entries' => '%d artigos', 'priority' => array( - '_' => 'Visibility', // TODO - 'archived' => 'Do not show (archived)', // TODO + '_' => 'Visibility', //TODO - Translation + 'archived' => 'Do not show (archived)', //TODO - Translation 'main_stream' => 'Mostrar na tela principal', - 'normal' => 'Show in its category', // TODO + 'normal' => 'Show in its category', //TODO - Translation ), - 'ssl_verify' => 'Verify SSL security', //TODO + 'pubsubhubbub' => 'Notificação instantânea com PubSubHubbub', + 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Estatísticas', 'think_to_add' => 'Você deve adicionar alguns feeds.', - 'timeout' => 'Timeout in seconds', //TODO + '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', 'validator' => 'Verifique a validade do feed', 'website' => 'URL do site', - 'pubsubhubbub' => 'Notificação instantânea com PubSubHubbub', ), 'import_export' => array( 'export' => 'Exportar', diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php index 91da8adcf..efbd8fde0 100644 --- a/app/i18n/ru/admin.php +++ b/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 - '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' => 'У вас не установлен фрейворк Minz.', @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + '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 'no_configure_view' => 'Это расширение нельзя настроить.', 'system' => array( '_' => 'Системные расширения', 'no_rights' => 'Системные расширения (у вас нет к ним доступа)', ), 'title' => 'Расширения', + 'update' => 'Update available', //TODO - Translation 'user' => 'Расширения пользователя', - 'community' => 'Available community extensions', // @todo translate - 'name' => 'Name', // @todo translate - 'version' => 'Version', // @todo translate - 'description' => 'Description', // @todo translate - 'author' => 'Author', // @todo translate - 'latest' => 'Installed', // @todo translate - 'update' => 'Update available', // @todo translate + 'version' => 'Version', //TODO - Translation ), 'stats' => array( '_' => 'Статистика', @@ -179,15 +179,15 @@ return array( 'user' => array( 'articles_and_size' => '%s статей (%s)', 'create' => 'Создать нового пользователя', - 'delete_users' => 'Delete user', // TODO + 'delete_users' => 'Delete user', //TODO - Translation 'language' => 'Язык', 'number' => 'На данный момент создан %d аккаунт', 'numbers' => 'На данный момент аккаунтов создано: %d', 'password_form' => 'Пароль
    (для входа через Веб-форму)', 'password_format' => 'Минимум 7 символов', - 'selected' => 'Selected user', // TODO + 'selected' => 'Selected user', //TODO - Translation 'title' => 'Управление пользователями', - 'update_users' => 'Update user', // TODO + 'update_users' => 'Update user', //TODO - Translation 'user_list' => 'Список пользователей', 'username' => 'Имя пользователя', 'users' => 'Пользователи', diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php index b9d45fb20..3fe0ded2d 100644 --- a/app/i18n/ru/conf.php +++ b/app/i18n/ru/conf.php @@ -6,9 +6,9 @@ return array( 'advanced' => 'Продвинутые настройки', 'delete_after' => 'Удалять статьи после', 'help' => 'Каждую подписку можно настроить более гибко', - 'keep_history_by_feed' => 'Minimum number of articles to keep by feed', + 'keep_history_by_feed' => 'Minimum number of articles to keep by feed', //TODO - Translation 'optimize' => 'Оптимизировать базу данных', - 'optimize_help' => 'To do occasionally to reduce the size of the database', + 'optimize_help' => 'To do occasionally to reduce the size of the database', //TODO - Translation 'purge_now' => 'Очистить сейчас', 'title' => 'Архивация', 'ttl' => 'Не обновлять чаще чем', @@ -16,169 +16,169 @@ return array( 'display' => array( '_' => 'Display', 'icon' => array( - 'bottom_line' => 'Bottom line', - 'entry' => 'Article icons', - 'publication_date' => 'Date of publication', - 'related_tags' => 'Related tags', //TODO - 'sharing' => 'Sharing', - 'top_line' => 'Top line', + '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 + 'top_line' => 'Top line', //TODO - Translation ), 'language' => 'Язык', 'notif_html5' => array( - 'seconds' => 'seconds (0 means no timeout)', - 'timeout' => 'HTML5 notification timeout', + 'seconds' => 'seconds (0 means no timeout)', //TODO - Translation + 'timeout' => 'HTML5 notification timeout', //TODO - Translation ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO - Translation 'theme' => 'Тема', - 'title' => 'Display', + 'title' => 'Display', //TODO - Translation 'width' => array( - 'content' => 'Content width', - 'large' => 'Large', - 'medium' => 'Medium', - 'no_limit' => 'No limit', - 'thin' => 'Thin', + 'content' => 'Content width', //TODO - Translation + 'large' => 'Large', //TODO - Translation + 'medium' => 'Medium', //TODO - Translation + 'no_limit' => 'No limit', //TODO - Translation + 'thin' => 'Thin', //TODO - Translation ), - 'show_nav_buttons' => 'Show the navigation buttons', //TODO - ), - 'query' => array( - '_' => 'User queries', - 'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.', - 'display' => 'Display user query results', // TODO - 'filter' => 'Filter applied:', - 'get_all' => 'Display all articles', - 'get_category' => 'Display "%s" category', - 'get_favorite' => 'Display favorite articles', - 'get_feed' => 'Display "%s" feed', - 'no_filter' => 'No filter', - 'none' => 'You haven’t created any user query yet.', - 'number' => 'Query n°%d', - 'order_asc' => 'Display oldest articles first', - 'order_desc' => 'Display newest articles first', - 'remove' => 'Remove user query', // TODO - 'search' => 'Search for "%s"', - 'state_0' => 'Display all articles', - 'state_1' => 'Display read articles', - 'state_2' => 'Display unread articles', - 'state_3' => 'Display all articles', - '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', - 'state_13' => 'Display read articles', - 'state_14' => 'Display unread articles', - 'state_15' => 'Display all articles', - 'title' => 'User queries', ), 'profile' => array( - '_' => 'Profile management', + '_' => 'Profile management', //TODO - Translation 'delete' => array( - '_' => 'Account deletion', - 'warn' => 'Your account and all the related data will be deleted.', + '_' => 'Account deletion', //TODO - Translation + 'warn' => 'Your account and all the related data will be deleted.', //TODO - Translation ), - 'password_api' => 'Password API
    (e.g., for mobile apps)', - 'password_form' => 'Password
    (for the Web-form login method)', - 'password_format' => 'At least 7 characters', - 'title' => 'Profile', + 'password_api' => 'Password API
    (e.g., for mobile apps)', //TODO - Translation + 'password_form' => 'Password
    (for the Web-form login method)', //TODO - Translation + 'password_format' => 'At least 7 characters', //TODO - Translation + 'title' => 'Profile', //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 ), 'reading' => array( - '_' => 'Reading', - 'after_onread' => 'After “mark all as read”,', - 'articles_per_page' => 'Number of articles per page', - 'auto_load_more' => 'Load next articles at the page bottom', - 'auto_remove_article' => 'Hide articles after reading', - 'mark_updated_article_unread' => 'Mark updated articles as unread', - 'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions', - 'display_articles_unfolded' => 'Show articles unfolded by default', - 'display_categories_unfolded' => 'Show categories folded by default', - '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', - 'sides_close_article' => 'Clicking outside of article text area closes the article', //TODO - 'jump_next' => 'jump to next unread sibling (feed or category)', - 'number_divided_when_reader' => 'Divided by 2 in the reading view.', + '_' => '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 folded 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 'read' => array( - 'article_open_on_website' => 'when article is opened on its original website', - 'article_viewed' => 'when article is viewed', - 'scroll' => 'while scrolling', - 'upon_reception' => 'upon reception of the article', - 'when' => 'Mark article as read…', + '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 ), 'show' => array( - '_' => 'Articles to display', - 'adaptive' => 'Adjust showing', - 'all_articles' => 'Show all articles', - 'unread' => 'Show only unread', + '_' => 'Articles to display', //TODO - Translation + 'adaptive' => 'Adjust showing', //TODO - Translation + 'all_articles' => 'Show all articles', //TODO - Translation + 'unread' => 'Show only unread', //TODO - Translation ), + 'sides_close_article' => 'Clicking outside of article text area closes the article', //TODO - Translation 'sort' => array( - '_' => 'Sort order', - 'newer_first' => 'Newer first', - 'older_first' => 'Oldest first', + '_' => 'Sort order', //TODO - Translation + 'newer_first' => 'Newer first', //TODO - Translation + 'older_first' => 'Oldest first', //TODO - Translation ), - 'sticky_post' => 'Stick the article to the top when opened', - 'title' => 'Reading', + 'sticky_post' => 'Stick the article to the top when opened', //TODO - Translation + 'title' => 'Reading', //TODO - Translation 'view' => array( - 'default' => 'Default view', - 'global' => 'Global view', - 'normal' => 'Normal view', - 'reader' => 'Reading view', + 'default' => 'Default view', //TODO - Translation + 'global' => 'Global view', //TODO - Translation + 'normal' => 'Normal view', //TODO - Translation + 'reader' => 'Reading view', //TODO - Translation ), ), 'sharing' => array( - '_' => 'Sharing', - 'add' => 'Add a sharing method', // TODO + '_' => 'Sharing', //TODO - Translation + 'add' => 'Add a sharing method', //TODO - Translation 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', - 'email' => 'Email', + 'email' => 'Email', //TODO - Translation 'facebook' => 'Facebook', 'g+' => 'Google+', - 'more_information' => 'More information', - 'print' => 'Print', - 'remove' => 'Remove sharing method', // TODO + 'more_information' => 'More information', //TODO - Translation + 'print' => 'Print', //TODO - Translation + 'remove' => 'Remove sharing method', //TODO - Translation 'shaarli' => 'Shaarli', - 'share_name' => 'Share name to display', - 'share_url' => 'Share URL to use', + 'share_name' => 'Share name to display', //TODO - Translation + 'share_url' => 'Share URL to use', //TODO - Translation 'title' => 'Sharing', 'twitter' => 'Twitter', 'wallabag' => 'wallabag', ), 'shortcut' => array( - '_' => 'Shortcuts', - 'article_action' => 'Article actions', - 'auto_share' => 'Share', - 'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.', - 'close_dropdown' => 'Close menus', - 'collapse_article' => 'Collapse', - 'first_article' => 'Skip to the first article', - 'focus_search' => 'Access search box', - 'global_view' => 'Switch to global view', // TODO - 'help' => 'Display documentation', - 'javascript' => 'JavaScript must be enabled in order to use shortcuts', - 'last_article' => 'Skip to the last article', - 'load_more' => 'Load more articles', - 'mark_read' => 'Mark as read', - 'mark_favorite' => 'Mark as favourite', - 'navigation' => 'Navigation', - 'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.
    With the "Alt" modifier, navigation shortcuts apply on categories.', - 'next_article' => 'Skip to the next article', - 'normal_view' => 'Switch to normal view', // TODO - 'other_action' => 'Other actions', - 'previous_article' => 'Skip to the previous article', - 'reading_view' => 'Switch to reading view', // TODO - 'rss_view' => 'Open RSS view in a new tab', // TODO - 'see_on_website' => 'See on original website', - 'shift_for_all_read' => '+ shift to mark all articles as read', - 'title' => 'Shortcuts', - '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 + '_' => '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.
    With the "Alt" modifier, navigation shortcuts apply on categories.', //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' => '+ shift to mark all articles as read', //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 ), 'user' => array( - 'articles_and_size' => '%s articles (%s)', - 'current' => 'Current user', - 'is_admin' => 'is administrator', - 'users' => 'Users', + 'articles_and_size' => '%s articles (%s)', //TODO - Translation + 'current' => 'Current user', //TODO - Translation + 'is_admin' => 'is administrator', //TODO - Translation + 'users' => 'Users', //TODO - Translation ), ); diff --git a/app/i18n/ru/feedback.php b/app/i18n/ru/feedback.php index 693a40b34..7b859fcdd 100644 --- a/app/i18n/ru/feedback.php +++ b/app/i18n/ru/feedback.php @@ -2,115 +2,115 @@ return array( 'admin' => array( - 'optimization_complete' => 'Optimisation complete', //TODO + 'optimization_complete' => 'Optimisation complete', //TODO - Translation ), 'access' => array( - 'denied' => 'You don’t have permission to access this page', //TODO - 'not_found' => 'You are looking for a page which doesn’t exist', //TODO + '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 ), 'auth' => array( 'form' => array( - 'not_set' => 'A problem occured during authentication system configuration. Please retry later.', //TODO - 'set' => 'Form is now your default authentication system.', //TODO + '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 - 'success' => 'You are connected', //TODO + 'invalid' => 'Login is invalid', //TODO - Translation + 'success' => 'You are connected', //TODO - Translation ), 'logout' => array( - 'success' => 'You are disconnected', //TODO + 'success' => 'You are disconnected', //TODO - Translation ), - 'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.', //TODO + '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 - 'query_created' => 'Query "%s" has been created.', //TODO - 'shortcuts_updated' => 'Shortcuts have been updated', //TODO - 'updated' => 'Configuration has been updated', //TODO + '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 + 'already_enabled' => '%s is already enabled', //TODO - Translation 'disable' => array( - 'ko' => '%s cannot be disabled. Check FreshRSS logs for details.', //TODO - 'ok' => '%s is now disabled', //TODO + 'ko' => '%s cannot be disabled. Check FreshRSS logs for details.', //TODO - Translation + 'ok' => '%s is now disabled', //TODO - Translation ), 'enable' => array( - 'ko' => '%s cannot be enabled. Check FreshRSS logs for details.', //TODO - 'ok' => '%s is now enabled', //TODO + 'ko' => '%s cannot be enabled. Check FreshRSS logs 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 + '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 ), 'import_export' => array( - 'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.', //TODO - 'feeds_imported' => 'Your feeds have been imported and will now be updated', //TODO - 'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred', //TODO - 'file_cannot_be_uploaded' => 'File cannot be uploaded!', //TODO - 'no_zip_extension' => 'ZIP extension is not present on your server.', //TODO - 'zip_error' => 'An error occured during ZIP import.', //TODO + '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 + ), + 'profile' => array( + 'error' => 'Your profile cannot be modified', //TODO - Translation + 'updated' => 'Your profile has been modified', //TODO - Translation ), 'sub' => array( - 'actualize' => 'Actualise', //TODO + 'actualize' => 'Actualise', //TODO - Translation 'articles' => array( - 'marked_read' => 'The selected articles have been marked as read.', //TODO - 'marked_unread' => 'The articles have been marked as unread.', //TODO + '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 - 'deleted' => 'Category has been deleted.', //TODO - 'emptied' => 'Category has been emptied', //TODO - 'error' => 'Category cannot be updated', //TODO - 'name_exists' => 'Category name already exists.', //TODO - 'no_id' => 'You must precise the id of the category.', //TODO - 'no_name' => 'Category name cannot be empty.', //TODO - 'not_delete_default' => 'You cannot delete the default category!', //TODO - 'not_exist' => 'The category does not exist!', //TODO - 'over_max' => 'You have reached your limit of categories (%d)', //TODO - 'updated' => 'Category has been updated.', //TODO + '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 ), 'feed' => array( - 'actualized' => '%s has been updated', //TODO - 'actualizeds' => 'RSS feeds have been updated', //TODO - 'added' => 'RSS feed %s has been added', //TODO - 'already_subscribed' => 'You have already subscribed to %s', //TODO - 'deleted' => 'Feed has been deleted', //TODO - 'error' => 'Feed cannot be updated', //TODO - 'internal_problem' => 'The newsfeed could not be added. Check FreshRSS logs for details. You can try force adding by appending #force_feed to the URL.', //TODO - 'invalid_url' => 'URL %s is invalid', //TODO - 'n_actualized' => '%d feeds have been updated', //TODO - 'n_entries_deleted' => '%d articles have been deleted', //TODO - 'no_refresh' => 'There is no feed to refresh…', //TODO - 'not_added' => '%s could not be added', //TODO - 'over_max' => 'You have reached your limit of feeds (%d)', //TODO - 'updated' => 'Feed has been updated', //TODO + 'actualized' => '%s has been updated', //TODO - Translation + 'actualizeds' => 'RSS feeds have been updated', //TODO - Translation + 'added' => 'RSS feed %s has been added', //TODO - Translation + 'already_subscribed' => 'You have already subscribed to %s', //TODO - Translation + 'deleted' => 'Feed has been deleted', //TODO - Translation + 'error' => 'Feed cannot be updated', //TODO - Translation + 'internal_problem' => 'The newsfeed could not be added. Check FreshRSS logs for details. You can try force adding by appending #force_feed to the URL.', //TODO - Translation + 'invalid_url' => 'URL %s 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' => '%s 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 ), - 'purge_completed' => 'Purge completed (%d articles deleted)', //TODO + 'purge_completed' => 'Purge completed (%d articles deleted)', //TODO - Translation ), 'update' => array( - 'can_apply' => 'FreshRSS will now be updated to the version %s.', //TODO - 'error' => 'The update process has encountered an error: %s', //TODO - 'file_is_nok' => 'New version %s available, but check permissions on %s directory. HTTP server must have rights to write into', //TODO - 'finished' => 'Update completed!', //TODO - 'none' => 'No update to apply', //TODO - 'server_not_found' => 'Update server cannot be found. [%s]', //TODO + 'can_apply' => 'FreshRSS will now be updated to the version %s.', //TODO - Translation + 'error' => 'The update process has encountered an error: %s', //TODO - Translation + 'file_is_nok' => 'New version %s available, but check permissions on %s 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 - 'error' => 'User %s cannot be created', //TODO + '_' => 'User %s has been created', //TODO - Translation + 'error' => 'User %s cannot be created', //TODO - Translation ), 'deleted' => array( - '_' => 'User %s has been deleted', //TODO - 'error' => 'User %s cannot be deleted', //TODO + '_' => 'User %s has been deleted', //TODO - Translation + 'error' => 'User %s cannot be deleted', //TODO - Translation ), 'updated' => array( - '_' => 'User %s has been updated', // TODO - 'error' => 'User %s has not been updated', // TODO + '_' => 'User %s has been updated', //TODO - Translation + 'error' => 'User %s has not been updated', //TODO - Translation ), ), - 'profile' => array( - 'error' => 'Your profile cannot be modified', //TODO - 'updated' => 'Your profile has been modified', //TODO - ), ); diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php index f2612793a..f6b1f16ec 100644 --- a/app/i18n/ru/gen.php +++ b/app/i18n/ru/gen.php @@ -2,117 +2,117 @@ return array( 'action' => array( - 'actualize' => 'Actualize', - 'back_to_rss_feeds' => '← Go back to your RSS feeds', - 'cancel' => 'Cancel', - 'create' => 'Create', - 'disable' => 'Disable', - 'empty' => 'Empty', - 'enable' => 'Enable', - 'export' => 'Export', - 'filter' => 'Filter', - 'import' => 'Import', - 'manage' => 'Manage', - 'mark_favorite' => 'Mark as favourite', - 'mark_read' => 'Mark as read', - 'remove' => 'Remove', - 'see_website' => 'See website', - 'submit' => 'Submit', - 'truncate' => 'Delete all articles', - 'update' => 'Update', // TODO + 'actualize' => 'Actualize', //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 + '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( - 'email' => 'Email address', - 'keep_logged_in' => 'Keep me logged in (%s дней)', - 'login' => 'Login', - 'logout' => 'Logout', + 'email' => 'Email address', //TODO - Translation + 'keep_logged_in' => 'Keep me logged in (%s дней)', //TODO - Translation + 'login' => 'Login', //TODO - Translation + 'logout' => 'Logout', //TODO - Translation 'password' => array( - '_' => 'Password', - 'format' => 'At least 7 characters', + '_' => 'Password', //TODO - Translation + 'format' => 'At least 7 characters', //TODO - Translation ), 'registration' => array( - '_' => 'New account', - 'ask' => 'Create an account?', - 'title' => 'Account creation', + '_' => 'New account', //TODO - Translation + 'ask' => 'Create an account?', //TODO - Translation + 'title' => 'Account creation', //TODO - Translation ), - 'reset' => 'Authentication reset', + 'reset' => 'Authentication reset', //TODO - Translation 'username' => array( - '_' => 'Username', - 'admin' => 'Administrator username', - 'format' => 'maximum 16 alphanumeric characters', + '_' => 'Username', //TODO - Translation + 'admin' => 'Administrator username', //TODO - Translation + 'format' => 'maximum 16 alphanumeric characters', //TODO - Translation ), ), 'date' => array( - 'Apr' => '\\A\\p\\r\\i\\l', - 'Aug' => '\\A\\u\\g\\u\\s\\t', - 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', - 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y', - 'Jan' => '\\J\\a\\n\\u\\a\\r\\y', - 'Jul' => '\\J\\u\\l\\y', - 'Jun' => '\\J\\u\\n\\e', - 'Mar' => '\\M\\a\\r\\c\\h', - 'May' => '\\M\\a\\y', - 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', - 'Oct' => '\\O\\c\\t\\o\\b\\e\\r', - 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', - 'apr' => 'apr', - 'april' => 'Apr', - 'aug' => 'aug', - 'august' => 'Aug', - 'before_yesterday' => 'Before yesterday', - 'dec' => 'dec', - 'december' => 'Dec', - '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' => 'jan', - 'january' => 'Jan', - 'jul' => 'jul', - 'july' => 'Jul', - 'jun' => 'jun', - 'june' => 'Jun', - 'last_3_month' => 'Last three months', - 'last_6_month' => 'Last six months', - 'last_month' => 'Last month', - 'last_week' => 'Last week', - 'last_year' => 'Last year', - 'mar' => 'mar', - 'march' => 'Mar', - 'may' => 'May', - 'may_' => 'May', - 'mon' => 'Mon', - 'month' => 'months', - 'nov' => 'nov', - 'november' => 'Nov', - 'oct' => 'oct', - 'october' => 'Oct', - 'sat' => 'Sat', - 'sep' => 'sep', - 'september' => 'Sep', - 'sun' => 'Sun', - 'thu' => 'Thu', - 'today' => 'Today', - 'tue' => 'Tue', - 'wed' => 'Wed', - 'yesterday' => 'Yesterday', + '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 ), 'freshrss' => array( - '_' => 'FreshRSS', - 'about' => 'About FreshRSS', + '_' => 'FreshRSS', //TODO - Translation + 'about' => 'About FreshRSS', //TODO - Translation ), 'js' => array( - 'category_empty' => 'Empty category', - 'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!', - '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!', + '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 'feedback' => array( - 'body_new_articles' => 'There are %%d new articles to read on FreshRSS.', - 'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.', - 'title_new_articles' => 'FreshRSS: new articles!', + '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.', - 'should_be_activated' => 'JavaScript must be enabled', + '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', @@ -131,37 +131,36 @@ return array( 'zh-cn' => '简体中文', ), 'menu' => array( - 'about' => 'About', - 'admin' => 'Administration', - 'archiving' => 'Archiving', - 'authentication' => 'Authentication', - 'check_install' => 'Installation checking', - 'configuration' => 'Configuration', - 'display' => 'Display', - 'extensions' => 'Extensions', - 'logs' => 'Logs', - 'queries' => 'User queries', - 'reading' => 'Reading', - 'search' => 'Search words or #tags', - 'sharing' => 'Sharing', - 'shortcuts' => 'Shortcuts', - 'stats' => 'Statistics', - 'system' => 'System configuration', - 'update' => 'Update', - 'user_management' => 'Manage users', - 'user_profile' => 'Profile', + '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', - 'last' => 'Last', - 'load_more' => 'Load more articles', - 'mark_all_read' => 'Mark all as read', - 'next' => 'Next', - 'nothing_to_load' => 'There are no more articles', - 'previous' => 'Previous', + '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 ), 'share' => array( - 'Known' => 'Known based sites', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -169,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => 'Known based sites', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', @@ -180,16 +180,16 @@ return array( 'wallabagv2' => 'wallabag v2', ), 'short' => array( - 'attention' => 'Warning!', - 'blank_to_disable' => 'Leave blank to disable', - 'by_author' => 'By:', - 'by_default' => 'By default', - 'damn' => 'Damn!', - 'default_category' => 'Uncategorized', - 'no' => 'No', - 'not_applicable' => 'Not available', - 'ok' => 'Ok!', - 'or' => 'or', - 'yes' => 'Yes', + '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 ), ); diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php index aaf25a3ab..977777178 100644 --- a/app/i18n/ru/index.php +++ b/app/i18n/ru/index.php @@ -2,32 +2,32 @@ return array( 'about' => array( - '_' => 'About', - 'agpl3' => 'AGPL 3', - 'bugs_reports' => 'Bugs reports', - 'credits' => 'Credits', - 'credits_content' => 'Some design elements come from Bootstrap although FreshRSS doesn’t use this framework. Icons come from GNOME project. Open Sans font police has been created by Steve Matteson. FreshRSS is based on Minz, a PHP framework.', - 'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like Kriss Feed or Leed. It is light and easy to take in hand while being powerful and configurable tool.', - 'github' => 'on Github', - 'license' => 'License', - 'project_website' => 'Project website', - 'title' => 'About', - 'version' => 'Version', - 'website' => 'Website', + '_' => 'About', //TODO - Translation + 'agpl3' => 'AGPL 3', //TODO - Translation + 'bugs_reports' => 'Bugs reports', //TODO - Translation + 'credits' => 'Credits', //TODO - Translation + 'credits_content' => 'Some design elements come from Bootstrap although FreshRSS doesn’t use this framework. Icons come from GNOME project. Open Sans font police has been created by Steve Matteson. FreshRSS is based on Minz, a PHP framework.', //TODO - Translation + 'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like Kriss Feed or Leed. It is light and easy to take in hand while being powerful and configurable tool.', //TODO - Translation + 'github' => 'on Github', //TODO - Translation + 'license' => 'License', //TODO - Translation + 'project_website' => 'Project website', //TODO - Translation + 'title' => 'About', //TODO - Translation + 'version' => 'Version', //TODO - Translation + 'website' => 'Website', //TODO - Translation ), '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', + '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 ), 'log' => array( '_' => 'Logs', - 'clear' => 'Clear the logs', - 'empty' => 'Log file is empty', - 'title' => 'Logs', + 'clear' => 'Clear the logs', //TODO - Translation + 'empty' => 'Log file is empty', //TODO - Translation + 'title' => 'Logs', //TODO - Translation ), 'menu' => array( 'about' => 'About FreshRSS', @@ -40,23 +40,24 @@ return array( '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 - 'newer_first' => 'Newer first', - 'non-starred' => 'Show all but favorites', - 'normal_view' => 'Normal view', - 'older_first' => 'Oldest first', - 'queries' => 'User queries', - 'read' => 'Show only read', - 'reader_view' => 'Reading view', - 'rss_view' => 'RSS feed', - 'search_short' => 'Search', - 'starred' => 'Show only favorites', - 'stats' => 'Statistics', + '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', - 'unread' => 'Show only unread', + 'tags' => 'My labels', //TODO - Translation + 'unread' => 'Show only unread', //TODO - Translation ), 'share' => 'Share', 'tag' => array( - 'related' => 'Article tags', //TODO + 'related' => 'Article tags', //TODO - Translation ), ); diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php index c1d0e81e8..fd1e5c962 100644 --- a/app/i18n/ru/install.php +++ b/app/i18n/ru/install.php @@ -24,8 +24,8 @@ return array( 'ok' => 'Конфигурация базы данных сохранена.', ), 'host' => 'Хост', - 'prefix' => 'Префикс таблицы', 'password' => 'Пароль базы данных', + 'prefix' => 'Префикс таблицы', 'type' => 'Тип базы данных', 'username' => 'Имя пользователя базы данных', ), @@ -64,9 +64,13 @@ return 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 + ), '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' => 'У вас не установлен фрейворк Minz.', @@ -88,6 +92,10 @@ return array( 'nok' => 'Проверьте права доступа к папке ./data/users . Сервер HTTP должен иметь права на запись в эту папку.', 'ok' => 'Права на папку users в порядке.', ), + 'xml' => array( + 'nok' => 'Cannot find the required library to parse XML.', + 'ok' => 'You have the required library to parse XML.', + ), ), 'conf' => array( '_' => 'Общие настройки', diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php index 12901998d..eccbf818d 100644 --- a/app/i18n/ru/sub.php +++ b/app/i18n/ru/sub.php @@ -2,85 +2,85 @@ return array( 'api' => array( - 'documentation' => 'Copy the following URL to use it within an external tool.',// TODO - 'title' => 'API',// TODO + '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 - 'title' => 'Bookmarklet',// TODO + '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 - 'add' => 'Add a category',// TODO - 'empty' => 'Empty category',// TODO - 'new' => 'New category',// TODO + '_' => 'Category', //TODO - Translation + 'add' => 'Add a category', //TODO - Translation + 'empty' => 'Empty category', //TODO - Translation + 'new' => 'New category', //TODO - Translation ), 'feed' => array( - 'add' => 'Add a RSS feed',// TODO - 'advanced' => 'Advanced',// TODO - 'archiving' => 'Archivage',// TODO + 'add' => 'Add a RSS feed', //TODO - Translation + 'advanced' => 'Advanced', //TODO - Translation + 'archiving' => 'Archivage', //TODO - Translation 'auth' => array( - 'configuration' => 'Login',// TODO - 'help' => 'Connection allows to access HTTP protected RSS feeds',// TODO - 'http' => 'HTTP Authentication',// TODO - 'password' => 'HTTP password',// TODO - 'username' => 'HTTP username',// TODO + '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 ), - 'clear_cache' => 'Always clear cache', //TODO - 'css_help' => 'Retrieves truncated RSS feeds (caution, requires more time!)',// TODO - 'css_path' => 'Articles CSS path on original website',// TODO - 'description' => 'Description',// TODO - 'empty' => 'This feed is empty. Please verify that it is still maintained.',// TODO - 'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',// TODO - 'informations' => 'Information',// TODO - 'keep_history' => 'Minimum number of articles to keep',// TODO - 'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under %s.',// TODO - 'mute' => 'mute', // TODO - 'no_selected' => 'No feed selected.',// TODO - 'number_entries' => '%d articles',// TODO + '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 + 'informations' => 'Information', //TODO - Translation + 'keep_history' => 'Minimum number of articles to keep', //TODO - Translation + 'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under %s.', //TODO - Translation + 'mute' => 'mute', //TODO - Translation + 'no_selected' => 'No feed selected.', //TODO - Translation + 'number_entries' => '%d articles', //TODO - Translation 'priority' => array( - '_' => 'Visibility', // TODO - 'archived' => 'Do not show (archived)', // TODO - 'main_stream' => 'Show in main stream', // TODO - 'normal' => 'Show in its category', // TODO + '_' => '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 ), - 'ssl_verify' => 'Verify SSL security', //TODO - 'stats' => 'Statistics',// TODO - 'think_to_add' => 'You may add some feeds.',// TODO - 'timeout' => 'Timeout in seconds', //TODO - 'title' => 'Title',// TODO - 'title_add' => 'Add a RSS feed',// TODO - 'ttl' => 'Do not automatically refresh more often than',// TODO - 'url' => 'Feed URL',// TODO - 'validator' => 'Check the validity of the feed',// TODO - 'website' => 'Website URL',// TODO - 'pubsubhubbub' => 'Instant notification with PubSubHubbub',// TODO + 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //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 ), 'firefox' => array( - 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.',// TODO - 'title' => 'Firefox feed reader',// TODO + 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.', //TODO - Translation + 'title' => 'Firefox feed reader', //TODO - Translation ), 'import_export' => array( - 'export' => 'Export',// TODO - 'export_opml' => 'Export list of feeds (OPML)',// TODO - 'export_starred' => 'Export your favourites',// TODO - 'feed_list' => 'List of %s articles',// TODO - 'file_to_import' => 'File to import
    (OPML, JSON or ZIP)',// TODO - 'file_to_import_no_zip' => 'File to import
    (OPML or JSON)',// TODO - 'import' => 'Import',// TODO - 'starred_list' => 'List of favourite articles',// TODO - 'title' => 'Import / export',// TODO + 'export' => 'Export', //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
    (OPML, JSON or ZIP)', //TODO - Translation + 'file_to_import_no_zip' => 'File to import
    (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 - 'import_export' => 'Import / export',// TODO - 'subscription_management' => 'Subscriptions management',// TODO - 'subscription_tools' => 'Subscription tools',// TODO + '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 - 'feed_management' => 'RSS feeds management',// TODO - 'subscription_tools' => 'Subscription tools',// TODO + '_' => 'Subscriptions management', //TODO - Translation + 'feed_management' => 'RSS feeds management', //TODO - Translation + 'subscription_tools' => 'Subscription tools', //TODO - Translation ), ); diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php index f481bb294..81e5d14a2 100644 --- a/app/i18n/tr/admin.php +++ b/app/i18n/tr/admin.php @@ -67,8 +67,8 @@ return array( 'ok' => 'JSON eklentisi sorunsuz.', ), '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' => 'Minz framework eksik.', @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + 'author' => 'Author', //TODO - Translation + 'community' => 'Available community extensions', //TODO - Translation + 'description' => 'Description', //TODO - Translation 'disabled' => 'Pasif', 'empty_list' => 'Yüklenmiş eklenti bulunmamaktadır', 'enabled' => 'Aktif', + 'latest' => 'Installed', //TODO - Translation + 'name' => 'Name', //TODO - Translation 'no_configure_view' => 'Bu eklenti yapılandırılamaz.', 'system' => array( '_' => 'Sistem eklentileri', 'no_rights' => 'Sistem eklentileri (düzenleme hakkınız yok)', ), 'title' => 'Eklentiler', + 'update' => 'Update available', //TODO - Translation 'user' => 'Kullanıcı eklentileri', - 'community' => 'Available community extensions', // @todo translate - 'name' => 'Name', // @todo translate - 'version' => 'Version', // @todo translate - 'description' => 'Description', // @todo translate - 'author' => 'Author', // @todo translate - 'latest' => 'Installed', // @todo translate - 'update' => 'Update available', // @todo translate + 'version' => 'Version', //TODO - Translation ), 'stats' => array( '_' => 'İstatistikler', @@ -179,15 +179,15 @@ return array( 'user' => array( 'articles_and_size' => '%s makale (%s)', 'create' => 'Yeni kullanıcı oluştur', - 'delete_users' => 'Delete user', // TODO + 'delete_users' => 'Delete user', //TODO - Translation 'language' => 'Dil', 'number' => 'Oluşturulmuş %d hesap var', 'numbers' => 'Oluşturulmuş %d hesap var', 'password_form' => 'Şifre
    (Tarayıcı girişi için)', 'password_format' => 'En az 7 karakter', - 'selected' => 'Selected user', // TODO + 'selected' => 'Selected user', //TODO - Translation 'title' => 'Kullanıcıları yönet', - 'update_users' => 'Update user', // TODO + 'update_users' => 'Update user', //TODO - Translation 'user_list' => 'Kullanıcı listesi', 'username' => 'Kullanıcı adı', 'users' => 'Kullanıcılar', diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php index 49533bb6a..526a28ba6 100644 --- a/app/i18n/tr/conf.php +++ b/app/i18n/tr/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Alt çizgi', 'entry' => 'Makale ikonları', 'publication_date' => 'Yayınlama Tarihi', - 'related_tags' => 'İlgili etiketler', //TODO + 'related_tags' => 'İlgili etiketler', //TODO - Translation 'sharing' => 'Paylaşım', 'top_line' => 'Üst çizgi', ), @@ -28,6 +28,7 @@ return array( 'seconds' => 'saniye (0 zaman aşımı yok demektir)', 'timeout' => 'HTML5 bildirim zaman aşımı', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO - Translation 'theme' => 'Tema', 'title' => 'Görünüm', 'width' => array( @@ -37,12 +38,22 @@ return array( 'no_limit' => 'Sınırsız', 'thin' => 'Zayıf', ), - 'show_nav_buttons' => 'Show the navigation buttons', //TODO + ), + 'profile' => array( + '_' => 'Profil yönetimi', + 'delete' => array( + '_' => 'Hesap silme', + 'warn' => 'Hesabınız ve tüm verileriniz silinecek.', + ), + 'password_api' => 'API Şifresi
    (ör. mobil uygulamalar için)', + 'password_form' => 'Şifre
    (Tarayıcı girişi için)', + 'password_format' => 'En az 7 karakter', + 'title' => 'Profil', ), 'query' => array( '_' => 'Kullanıcı sorguları', 'deprecated' => 'Bu sorgu artık geçerli değil. İlgili akış veya kategori silinmiş.', - 'display' => 'Display user query results', // TODO + 'display' => 'Display user query results', //TODO - Translation 'filter' => 'Filtre uygulandı:', 'get_all' => 'Tüm makaleleri göster', 'get_category' => '"%s" kategorisini göster', @@ -53,7 +64,7 @@ return array( 'number' => 'Sorgu n°%d', 'order_asc' => 'Önce eski makaleleri göster', 'order_desc' => 'Önce yeni makaleleri göster', - 'remove' => 'Remove user query', // TODO + 'remove' => 'Remove user query', //TODO - Translation 'search' => '"%s" için arama', 'state_0' => 'Tüm makaleleri göster', 'state_1' => 'Okunmuş makaleleri göster', @@ -73,31 +84,19 @@ return array( 'state_15' => 'Tüm makaleleri göster', 'title' => 'Kullanıcı sorguları', ), - 'profile' => array( - '_' => 'Profil yönetimi', - 'delete' => array( - '_' => 'Hesap silme', - 'warn' => 'Hesabınız ve tüm verileriniz silinecek.', - ), - 'password_api' => 'API Şifresi
    (ör. mobil uygulamalar için)', - 'password_form' => 'Şifre
    (Tarayıcı girişi için)', - 'password_format' => 'En az 7 karakter', - 'title' => 'Profil', - ), 'reading' => array( '_' => 'Okuma', 'after_onread' => '"Hepsini okundu say" dedinten sonra,', 'articles_per_page' => 'Sayfa başına makale sayısı', 'auto_load_more' => 'Sayfa sonunda yeni makaleleri yükle', 'auto_remove_article' => 'Okuduktan sonra makaleleri gizle', - 'mark_updated_article_unread' => 'Güncellenen makaleleri okundu olarak işaretle', 'confirm_enabled' => '"Hepsini okundu say" eylemi için onay iste', 'display_articles_unfolded' => 'Show articles unfolded by default', 'display_categories_unfolded' => 'Show categories folded by default', 'hide_read_feeds' => 'Okunmamış makalesi olmayan kategori veya akışı gizle ("Tüm makaleleri göster" komutunda çalışmaz)', 'img_with_lazyload' => 'Resimleri yüklemek için "tembel modu" kullan', - 'sides_close_article' => 'Clicking outside of article text area closes the article', //TODO 'jump_next' => 'Bir sonraki benzer okunmamışa geç (akış veya kategori)', + 'mark_updated_article_unread' => 'Güncellenen makaleleri okundu olarak işaretle', 'number_divided_when_reader' => 'Okuma modunda ikiye bölünecek.', 'read' => array( 'article_open_on_website' => 'orijinal makale sitesi açıldığında', @@ -112,6 +111,7 @@ return array( 'all_articles' => 'Tüm makaleleri göster', 'unread' => 'Sadece okunmamış makaleleri göster', ), + 'sides_close_article' => 'Clicking outside of article text area closes the article', //TODO - Translation 'sort' => array( '_' => 'Sıralama', 'newer_first' => 'Önce yeniler', @@ -128,7 +128,7 @@ return array( ), 'sharing' => array( '_' => 'Paylaşım', - 'add' => 'Add a sharing method', // TODO + 'add' => 'Add a sharing method', //TODO - Translation 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -136,7 +136,7 @@ return array( 'g+' => 'Google+', 'more_information' => 'Daha fazla bilgi', 'print' => 'Yazdır', - 'remove' => 'Remove sharing method', // TODO + 'remove' => 'Remove sharing method', //TODO - Translation 'shaarli' => 'Shaarli', 'share_name' => 'Paylaşım ismi', 'share_url' => 'Paylaşım URL si', @@ -153,27 +153,27 @@ return array( 'collapse_article' => 'Kapat', 'first_article' => 'İlk makaleyi atla', 'focus_search' => 'Arama kutusuna eriş', - 'global_view' => 'Switch to global view', // TODO + 'global_view' => 'Switch to global view', //TODO - Translation 'help' => 'Dokümantasyonu göster', 'javascript' => 'Kısayolları kullanabilmek için JavaScript aktif olmalıdır', 'last_article' => 'Son makaleyi atla', 'load_more' => 'Daha fazla makale yükle', - 'mark_read' => 'Okundu olarak işaretle', 'mark_favorite' => 'Favori olarak işaretle', + 'mark_read' => 'Okundu olarak işaretle', 'navigation' => 'Genel eylemler', 'navigation_help' => '"Shift" tuşu ile kısayollar akışlar için geçerli olur.
    "Alt" tuşu ile kısayollar kategoriler için geçerli olur.', 'next_article' => 'Sonraki makaleye geç', - 'normal_view' => 'Switch to normal view', // TODO + 'normal_view' => 'Switch to normal view', //TODO - Translation 'other_action' => 'Diğer eylemler', 'previous_article' => 'Önceki makaleye geç', - 'reading_view' => 'Switch to reading view', // TODO - 'rss_view' => 'Open RSS view in a new tab', // TODO + 'reading_view' => 'Switch to reading view', //TODO - Translation + 'rss_view' => 'Open RSS view in a new tab', //TODO - Translation 'see_on_website' => 'Orijinal sitede göster', 'shift_for_all_read' => '+ shift tuşu ile tüm makaleler okundu olarak işaretlenir', 'title' => 'Kısayollar', 'user_filter' => 'Kullanıcı filtrelerine eriş', 'user_filter_help' => 'Eğer tek filtre varsa o kullanılır. Yoksa filtrelerin kendi numaralarıyla kullanılır.', - 'views' => 'Views', // TODO + 'views' => 'Views', //TODO - Translation ), 'user' => array( 'articles_and_size' => '%s makale (%s)', diff --git a/app/i18n/tr/feedback.php b/app/i18n/tr/feedback.php index 278abe978..fc1e59bbc 100644 --- a/app/i18n/tr/feedback.php +++ b/app/i18n/tr/feedback.php @@ -50,11 +50,15 @@ return array( 'no_zip_extension' => 'ZIP eklentisi mevcut sunucunuzda yer almıyor.', 'zip_error' => 'ZIP içe aktarımı sırasında hata meydana geldi.', ), + 'profile' => array( + 'error' => 'Profiliniz düzenlenemedi', + 'updated' => 'Profiliniz düzenlendi', + ), 'sub' => array( 'actualize' => 'Güncelleme', 'articles' => array( - 'marked_read' => 'The selected articles have been marked as read.', //TODO - 'marked_unread' => 'The articles have been marked as unread.', //TODO + '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' => 'Kategori %s oluşturuldu.', @@ -76,7 +80,7 @@ return array( 'already_subscribed' => '%s için zaten aboneliğiniz bulunmakta', 'deleted' => 'Akış silindi', 'error' => 'Akış güncellenemiyor', - 'internal_problem' => 'RSS akışı eklenemiyor. Detaylar için FreshRSS log kayıtlarını kontrol edin.', // @todo + 'internal_problem' => 'RSS akışı eklenemiyor. Detaylar için FreshRSS log kayıtlarını kontrol edin.', //TODO - Translation 'invalid_url' => 'URL %s geçersiz', 'n_actualized' => '%d akışları güncellendi', 'n_entries_deleted' => '%d makaleleri silindi', @@ -105,12 +109,8 @@ return array( 'error' => '%s kullanıcısı silinemedi', ), 'updated' => array( - '_' => 'User %s has been updated', // TODO - 'error' => 'User %s has not been updated', // TODO + '_' => 'User %s has been updated', //TODO - Translation + 'error' => 'User %s has not been updated', //TODO - Translation ), ), - 'profile' => array( - 'error' => 'Profiliniz düzenlenemedi', - 'updated' => 'Profiliniz düzenlendi', - ), ); diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php index 7328fb380..370660aba 100644 --- a/app/i18n/tr/gen.php +++ b/app/i18n/tr/gen.php @@ -19,7 +19,7 @@ return array( 'see_website' => 'Siteyi gör', 'submit' => 'Onayla', 'truncate' => 'Tüm makaleleri sil', - 'update' => 'Update', // TODO + 'update' => 'Update', //TODO - Translation ), 'auth' => array( 'email' => 'Email adresleri', @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\N\\i\\s\\a\\n', - 'Aug' => '\\A\\ğ\\u\\s\\t\\o\\s', - 'Dec' => '\\A\\r\\a\\l\\ı\\k', - 'Feb' => '\\Ş\\u\\b\\a\\t', - 'Jan' => '\\O\\c\\a\\k', - 'Jul' => '\\T\\e\\m\\m\\u\\z', - 'Jun' => '\\H\\a\\z\\i\\r\\a\\n', - 'Mar' => '\\M\\a\\r\\t', - 'May' => '\\M\\a\\y\\ı\\s', - 'Nov' => '\\K\\a\\s\\ı\\m', - 'Oct' => '\\E\\k\\i\\m', - 'Sep' => '\\E\\y\\l\\ü\\l', 'apr' => 'nis', 'april' => 'Nis', + 'Aug' => '\\A\\ğ\\u\\s\\t\\o\\s', 'aug' => 'ağu', 'august' => 'Ağu', 'before_yesterday' => 'Dünden önceki gün', + 'Dec' => '\\A\\r\\a\\l\\ı\\k', 'dec' => 'ara', 'december' => 'Ara', + 'Feb' => '\\Ş\\u\\b\\a\\t', 'feb' => 'şub', 'february' => 'Şub', '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' => 'Cum', + 'Jan' => '\\O\\c\\a\\k', 'jan' => 'oca', 'january' => 'Oca', + 'Jul' => '\\T\\e\\m\\m\\u\\z', 'jul' => 'tem', 'july' => 'Tem', + 'Jun' => '\\H\\a\\z\\i\\r\\a\\n', 'jun' => 'haz', 'june' => 'Haz', 'last_3_month' => 'Son 3 ay', @@ -78,17 +73,22 @@ return array( 'last_month' => 'Geçen ay', 'last_week' => 'Geçen hafta', 'last_year' => 'Geçen yıl', + 'Mar' => '\\M\\a\\r\\t', 'mar' => 'mar', 'march' => 'Mar', + 'May' => '\\M\\a\\y\\ı\\s', 'may' => 'Mayıs', 'may_' => 'May', 'mon' => 'Pzt', 'month' => 'ay', + 'Nov' => '\\K\\a\\s\\ı\\m', 'nov' => 'kas', 'november' => 'Kas', + 'Oct' => '\\E\\k\\i\\m', 'oct' => 'ekm', 'october' => 'Ekm', 'sat' => 'Cts', + 'Sep' => '\\E\\y\\l\\ü\\l', 'sep' => 'eyl', 'september' => 'Eyl', 'sun' => 'Pzr', @@ -161,7 +161,6 @@ return array( 'previous' => 'Önceki', ), 'share' => array( - 'Known' => 'Known based sites', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -169,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => 'Known based sites', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php index e7db73b96..d6db514dd 100644 --- a/app/i18n/tr/index.php +++ b/app/i18n/tr/index.php @@ -40,7 +40,7 @@ return array( 'mark_all_read' => 'Hepsini okundu olarak işaretle', 'mark_cat_read' => 'Kategoriyi okundu olarak işaretle', 'mark_feed_read' => 'Akışı okundu olarak işaretle', - 'mark_selection_unread' => 'Mark selection as unread', //TODO + 'mark_selection_unread' => 'Mark selection as unread', //TODO - Translation 'newer_first' => 'Önce yeniler', 'non-starred' => 'Favori dışındakileri göster', 'normal_view' => 'Normal görünüm', @@ -53,11 +53,11 @@ return array( 'starred' => 'Favorileri göster', 'stats' => 'İstatistikler', 'subscription' => 'Abonelik yönetimi', - 'tags' => 'My labels', //TODO + 'tags' => 'My labels', //TODO - Translation 'unread' => 'Okunmamışları göster', ), 'share' => 'Share', 'tag' => array( - 'related' => 'İlgili etiketler', //TODO + 'related' => 'İlgili etiketler', //TODO - Translation ), ); diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php index f90e43f1d..8d152322c 100644 --- a/app/i18n/tr/install.php +++ b/app/i18n/tr/install.php @@ -24,8 +24,8 @@ return array( 'ok' => 'Veritabanı yapılandırılması kayıt edildi.', ), 'host' => 'Sunucu', - 'prefix' => 'Tablo ön eki', 'password' => 'Veritabanı şifresi', + 'prefix' => 'Tablo ön eki', 'type' => 'Veritabanı türü', 'username' => 'Veritabanı kullanıcı adı', ), @@ -69,8 +69,8 @@ return array( 'ok' => 'Tavsiye edilen JSON çözümleme kütüphanesi sorunsuz.', ), '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' => 'Minz framework eksik.', diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index ef0c8ffbd..e6adc0353 100644 --- a/app/i18n/tr/sub.php +++ b/app/i18n/tr/sub.php @@ -2,13 +2,13 @@ return array( 'api' => array( - 'documentation' => 'Copy the following URL to use it within an external tool.',// TODO - 'title' => 'API',// TODO + '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 - 'title' => 'Bookmarklet',// TODO + '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( '_' => 'Kategori', @@ -27,7 +27,7 @@ return array( 'password' => 'HTTP şifre', 'username' => 'HTTP kullanıcı adı', ), - 'clear_cache' => 'Always clear cache', //TODO + 'clear_cache' => 'Always clear cache', //TODO - Translation 'css_help' => 'Dikkat, daha çok zaman gerekir!', 'css_path' => 'Makaleleri kendi CSS görünümü ile göster', 'description' => 'Tanım', @@ -36,30 +36,30 @@ return array( 'informations' => 'Bilgi', 'keep_history' => 'En az tutulacak makale sayısı', 'moved_category_deleted' => 'Bir kategoriyi silerseniz, içerisindeki akışlar %s içerisine yerleşir.', - 'mute' => 'mute', // TODO + 'mute' => 'mute', //TODO - Translation 'no_selected' => 'Hiçbir akış seçilmedi.', 'number_entries' => '%d makale', 'priority' => array( - '_' => 'Visibility', // TODO - 'archived' => 'Do not show (archived)', // TODO + '_' => 'Visibility', //TODO - Translation + 'archived' => 'Do not show (archived)', //TODO - Translation 'main_stream' => 'Ana akışda göster', - 'normal' => 'Show in its category', // TODO + 'normal' => 'Show in its category', //TODO - Translation ), - 'ssl_verify' => 'Verify SSL security', //TODO + 'pubsubhubbub' => 'PubSubHubbub ile anlık bildirim', + 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'İstatistikler', 'think_to_add' => 'Akış ekleyebilirsiniz.', - 'timeout' => 'Timeout in seconds', //TODO + 'timeout' => 'Timeout in seconds', //TODO - Translation 'title' => 'Başlık', 'title_add' => 'RSS akışı ekle', 'ttl' => 'Şu kadar süreden fazla otomatik yenileme yapma', 'url' => 'Akış URL', 'validator' => 'Akış geçerliliğini kontrol edin', 'website' => 'Site URL', - 'pubsubhubbub' => 'PubSubHubbub ile anlık bildirim', ), 'firefox' => array( - 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.',// TODO - 'title' => 'Firefox feed reader',// TODO + 'documentation' => 'Follow the steps described here to add FreshRSS to Firefox feed reader list.', //TODO - Translation + 'title' => 'Firefox feed reader', //TODO - Translation ), 'import_export' => array( 'export' => 'Dışa aktar', @@ -76,11 +76,11 @@ return array( 'bookmark' => 'Abonelik (FreshRSS yer imleri)', 'import_export' => 'İçe / dışa aktar', 'subscription_management' => 'Abonelik yönetimi', - 'subscription_tools' => 'Subscription tools',// TODO + 'subscription_tools' => 'Subscription tools', //TODO - Translation ), 'title' => array( '_' => 'Abonelik yönetimi', 'feed_management' => 'RSS akış yönetimi', - 'subscription_tools' => 'Subscription tools',// TODO + 'subscription_tools' => 'Subscription tools', //TODO - Translation ), ); diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php index 1f007f964..e6ca552ab 100644 --- a/app/i18n/zh-cn/admin.php +++ b/app/i18n/zh-cn/admin.php @@ -67,8 +67,8 @@ return array( 'ok' => '已找到 JSON 扩展', ), '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' => '找不到 Minz 框架。', @@ -106,23 +106,23 @@ return array( ), ), 'extensions' => array( + 'author' => '作者', + 'community' => '可用的社区扩展', + 'description' => '描述', 'disabled' => '已禁用', 'empty_list' => '没有已安装的扩展', 'enabled' => '已启用', + 'latest' => '已安装', + 'name' => '名称', 'no_configure_view' => '此扩展不能配置。', 'system' => array( '_' => '系统扩展', 'no_rights' => '系统扩展 (你不能修改它)', ), 'title' => '扩展', + 'update' => '更新可用', 'user' => '用户扩展', - 'community' => '可用的社区扩展', - 'name' => '名称', 'version' => '版本', - 'description' => '描述', - 'author' => '作者', - 'latest' => '已安装', - 'update' => '更新可用', ), 'stats' => array( '_' => '统计', @@ -179,15 +179,15 @@ return array( 'user' => array( 'articles_and_size' => '%s 篇文章 (%s)', 'create' => '创建新用户', - 'delete_users' => 'Delete user', // TODO + 'delete_users' => 'Delete user', //TODO - Translation 'language' => '语言', 'number' => '已有 %d 个帐户', 'numbers' => '已有 %d 个帐户', 'password_form' => '密码
    (用于 Web-form 登录方式)', 'password_format' => '至少 7 个字符', - 'selected' => 'Selected user', // TODO + 'selected' => 'Selected user', //TODO - Translation 'title' => '用户管理', - 'update_users' => 'Update user', // TODO + 'update_users' => 'Update user', //TODO - Translation 'user_list' => '用户列表', 'username' => '用户名', 'users' => '用户', diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php index 6c62349c2..5b58e3626 100644 --- a/app/i18n/zh-cn/conf.php +++ b/app/i18n/zh-cn/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => '底栏', 'entry' => '文章图标', 'publication_date' => '更新日期', - 'related_tags' => '相关标签', //TODO + 'related_tags' => '相关标签', 'sharing' => '分享', 'top_line' => '顶栏', ), @@ -28,6 +28,7 @@ return array( 'seconds' => '秒 (0 表示不超时)', 'timeout' => 'HTML5 通知超时时间', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO - Translation 'theme' => '主题', 'title' => '显示', 'width' => array( @@ -37,12 +38,22 @@ return array( 'no_limit' => '无限制', 'thin' => '小', ), - 'show_nav_buttons' => 'Show the navigation buttons', //TODO + ), + 'profile' => array( + '_' => '帐户管理', + 'delete' => array( + '_' => '账户删除', + 'warn' => '你的帐户和所有相关数据都将被删除。', + ), + 'password_api' => 'API 密码
    (例如,用于手机 APP)', + 'password_form' => '密码
    (用于 Web-form 登录方式)', + 'password_format' => '至少 7 个字符', + 'title' => '用户帐户', ), 'query' => array( '_' => '自定义查询', 'deprecated' => '此查询不再有效。相关的分类或 RSS 源已被删除。', - 'display' => 'Display user query results', // TODO + 'display' => 'Display user query results', //TODO - Translation 'filter' => '生效的过滤器：', 'get_all' => '显示所有文章', 'get_category' => '显示分类 "%s"', @@ -53,7 +64,7 @@ return array( 'number' => '查询 n°%d', 'order_asc' => '由旧到新显示文章', 'order_desc' => '由新到旧显示文章', - 'remove' => 'Remove user query', // TODO + 'remove' => 'Remove user query', //TODO - Translation 'search' => '搜索 "%s"', 'state_0' => '显示所有文章', 'state_1' => '显示已读文章', @@ -73,31 +84,19 @@ return array( 'state_15' => '显示所有文章', 'title' => '自定义查询', ), - 'profile' => array( - '_' => '帐户管理', - 'delete' => array( - '_' => '账户删除', - 'warn' => '你的帐户和所有相关数据都将被删除。', - ), - 'password_api' => 'API 密码
    (例如,用于手机 APP)', - 'password_form' => '密码
    (用于 Web-form 登录方式)', - 'password_format' => '至少 7 个字符', - 'title' => '用户帐户', - ), 'reading' => array( '_' => '阅读', 'after_onread' => '“全部设为已读”后,', 'articles_per_page' => '每页文章数', 'auto_load_more' => '在页面底部载入下一篇文章', 'auto_remove_article' => '阅读后隐藏文章', - 'mark_updated_article_unread' => '有更新的文章设为未读', 'confirm_enabled' => '“全部设为已读”时显示确认对话框', 'display_articles_unfolded' => '默认展开文章', 'display_categories_unfolded' => '默认展开分类', 'hide_read_feeds' => '隐藏没有未读文章的分类或 RSS 源 (启用“显示所有文章”时不生效))', 'img_with_lazyload' => '延迟加载图片', - 'sides_close_article' => '点击文章外区域以关闭文章', 'jump_next' => '跳转到下一未读项 (RSS 源或分类)', + 'mark_updated_article_unread' => '有更新的文章设为未读', 'number_divided_when_reader' => '阅读视图中显示一半', 'read' => array( 'article_open_on_website' => '在打开原文章后', @@ -112,6 +111,7 @@ return array( 'all_articles' => '显示所有文章', 'unread' => '只显示未读', ), + 'sides_close_article' => '点击文章外区域以关闭文章', 'sort' => array( '_' => '排列顺序', 'newer_first' => '由新到旧', @@ -128,7 +128,7 @@ return array( ), 'sharing' => array( '_' => '分享', - 'add' => 'Add a sharing method', // TODO + 'add' => 'Add a sharing method', //TODO - Translation 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -136,7 +136,7 @@ return array( 'g+' => 'Google+', 'more_information' => '更多信息', 'print' => '打印', - 'remove' => 'Remove sharing method', // TODO + 'remove' => 'Remove sharing method', //TODO - Translation 'shaarli' => 'Shaarli', 'share_name' => '名称', 'share_url' => '地址', @@ -158,8 +158,8 @@ return array( 'javascript' => '若要使用快捷键，必须启用 JavaScript', 'last_article' => '跳转到最后一篇文章', 'load_more' => '载入更多文章', - 'mark_read' => '设为已读', 'mark_favorite' => '加入收藏', + 'mark_read' => '设为已读', 'navigation' => '浏览', 'navigation_help' => '搭配 "Shift" 键，浏览快捷键将生效于 RSS 源。
    搭配 "Alt" 键，浏览快捷键将生效于分类。', 'next_article' => '跳转到下一篇文章', diff --git a/app/i18n/zh-cn/feedback.php b/app/i18n/zh-cn/feedback.php index e9f7b4aac..e1778a9f2 100644 --- a/app/i18n/zh-cn/feedback.php +++ b/app/i18n/zh-cn/feedback.php @@ -50,11 +50,15 @@ return array( 'no_zip_extension' => '服务器未启用 ZIP 扩展。', 'zip_error' => '导入 ZIP 文件时出错', ), + 'profile' => array( + 'error' => '你的帐户修改失败', + 'updated' => '你的帐户已修改', + ), 'sub' => array( 'actualize' => '获取', 'articles' => array( - 'marked_read' => 'The selected articles have been marked as read.', //TODO - 'marked_unread' => 'The articles have been marked as unread.', //TODO + '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' => '分类 %s 已创建。', @@ -76,7 +80,7 @@ return array( 'already_subscribed' => '你已订阅 %s', 'deleted' => 'RSS 源已删除', 'error' => 'RSS 源更新失败', - 'internal_problem' => 'RSS 源添加失败。检查 FreshRSS 日志 查看详情。', // @todo + 'internal_problem' => 'RSS 源添加失败。检查 FreshRSS 日志 查看详情。', //TODO - Translation 'invalid_url' => 'URL %s 无效', 'n_actualized' => '%d 个 RSS 源已更新', 'n_entries_deleted' => '%d 篇文章已删除', @@ -105,12 +109,8 @@ return array( 'error' => '用户 %s 删除失败', ), 'updated' => array( - '_' => 'User %s has been updated', // TODO - 'error' => 'User %s has not been updated', // TODO + '_' => 'User %s has been updated', //TODO - Translation + 'error' => 'User %s has not been updated', //TODO - Translation ), ), - 'profile' => array( - 'error' => '你的帐户修改失败', - 'updated' => '你的帐户已修改', - ), ); diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php index c68396e5d..a0f74fdfa 100644 --- a/app/i18n/zh-cn/gen.php +++ b/app/i18n/zh-cn/gen.php @@ -19,7 +19,7 @@ return array( 'see_website' => '查看网站', 'submit' => '提交', 'truncate' => '删除所有文章', - 'update' => 'Update', // TODO + 'update' => 'Update', //TODO - Translation ), 'auth' => array( 'email' => 'Email 地址', @@ -44,33 +44,28 @@ return array( ), 'date' => array( 'Apr' => '\\四\\月', - 'Aug' => '\\八\\月', - 'Dec' => '\\十\\二\\月', - 'Feb' => '\\二\\月', - 'Jan' => '\\一\\月', - 'Jul' => '\\七\\月', - 'Jun' => '\\六\\月', - 'Mar' => '\\三\\月', - 'May' => '\\五\\月', - 'Nov' => '\\十\\一\\月', - 'Oct' => '\\十\\月', - 'Sep' => '\\九\\月', 'apr' => '四月', 'april' => '四月', + 'Aug' => '\\八\\月', 'aug' => '八月', 'august' => '八月', 'before_yesterday' => '昨天以前', + 'Dec' => '\\十\\二\\月', 'dec' => '十二月', 'december' => '十二月', + 'Feb' => '\\二\\月', 'feb' => '二月', 'february' => '二月', 'format_date' => 'Y\\年n\\月j\\日', 'format_date_hour' => 'Y\\年n\\月j\\日 H\\:i', 'fri' => '周五', + 'Jan' => '\\一\\月', 'jan' => '一月', 'january' => '一月', + 'Jul' => '\\七\\月', 'jul' => '七月', 'july' => '七月', + 'Jun' => '\\六\\月', 'jun' => '六月', 'june' => '六月', 'last_3_month' => '最近三个月', @@ -78,17 +73,22 @@ return array( 'last_month' => '上月', 'last_week' => '上周', 'last_year' => '去年', + 'Mar' => '\\三\\月', 'mar' => '三月', 'march' => '三月', + 'May' => '\\五\\月', 'may' => '五月', 'may_' => '五月', 'mon' => '周一', 'month' => '个月', + 'Nov' => '\\十\\一\\月', 'nov' => '十一月', 'november' => '十一月', + 'Oct' => '\\十\\月', 'oct' => '十月', 'october' => '十月', 'sat' => '周日', + 'Sep' => '\\九\\月', 'sep' => '九月', 'september' => '九月', 'sun' => '周日', @@ -161,7 +161,6 @@ return array( 'previous' => '上一页', ), 'share' => array( - 'Known' => '基于 Known 的站点', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -169,6 +168,7 @@ return array( 'g+' => 'Google+', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', + 'Known' => '基于 Known 的站点', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php index dd8eafda7..3f6b44701 100644 --- a/app/i18n/zh-cn/index.php +++ b/app/i18n/zh-cn/index.php @@ -40,7 +40,7 @@ return array( 'mark_all_read' => '全部设为已读', 'mark_cat_read' => '此分类设为已读', 'mark_feed_read' => '此源设为已读', - 'mark_selection_unread' => 'Mark selection as unread', //TODO + 'mark_selection_unread' => 'Mark selection as unread', //TODO - Translation 'newer_first' => '由新到旧', 'non-starred' => '显示未收藏', 'normal_view' => '普通视图', @@ -53,11 +53,11 @@ return array( 'starred' => '显示收藏', 'stats' => '统计', 'subscription' => '订阅管理', - 'tags' => 'My labels', //TODO + 'tags' => 'My labels', //TODO - Translation 'unread' => '显示未读', ), 'share' => '分享', 'tag' => array( - 'related' => '相关标签', //TODO + 'related' => '相关标签', //TODO - Translation ), ); diff --git a/app/i18n/zh-cn/install.php b/app/i18n/zh-cn/install.php index fe34a44c0..29647932a 100644 --- a/app/i18n/zh-cn/install.php +++ b/app/i18n/zh-cn/install.php @@ -24,8 +24,8 @@ return array( 'ok' => '数据库配置已保存。', ), 'host' => '主机', - 'prefix' => '表前缀', 'password' => '密码', + 'prefix' => '表前缀', 'type' => '数据库类型', 'username' => '用户名', ), @@ -69,8 +69,8 @@ return array( 'ok' => '已找到推荐的 JSON 解析库。', ), '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' => '找不到 Minz 框架。', diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php index 4980b803a..aab4b1359 100644 --- a/app/i18n/zh-cn/sub.php +++ b/app/i18n/zh-cn/sub.php @@ -27,7 +27,7 @@ return array( 'password' => 'HTTP 密码', 'username' => 'HTTP 用户名', ), - 'clear_cache' => 'Always clear cache', //TODO + 'clear_cache' => 'Always clear cache', //TODO - Translation 'css_help' => '用于获取全文（注意，这将耗费更多时间！）', 'css_path' => '原文的 CSS 选择器', 'description' => '描述', @@ -45,17 +45,17 @@ return array( 'main_stream' => '在首页中显示', 'normal' => '在分类中显示', ), - 'ssl_verify' => 'Verify SSL security', //TODO + 'pubsubhubbub' => 'PubSubHubbub 即时通知', + 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => '统计', 'think_to_add' => '你可以添加一些 RSS 源。', - 'timeout' => 'Timeout in seconds', //TODO + 'timeout' => 'Timeout in seconds', //TODO - Translation 'title' => '标题', 'title_add' => '添加 RSS 源', 'ttl' => '最小自动更新时间', 'url' => '源 URL', 'validator' => '检查 RSS 源有效性', 'website' => '网站 URL', - 'pubsubhubbub' => 'PubSubHubbub 即时通知', ), 'firefox' => array( 'documentation' => '按照 这里 描述的步骤可将 FreshRSS 添加到 Firefox 阅读器列表', -- cgit v1.2.3 From f3a88614ef4a2541ee29054124d62c0cdc78f485 Mon Sep 17 00:00:00 2001 From: Matt DeMoss Date: Sun, 18 Nov 2018 08:08:27 -0500 Subject: Add shortcuts for focusing next and previous without opening articles. (#1767) * add skipping option to toggleContent to use later for 'i' and 'o' hotkeys * in English config j,k are now 'open' and not 'skip', i,o are called 'focus .. without opening' --- app/i18n/en/conf.php | 13 +++++++--- app/views/configure/shortcut.phtml | 14 +++++++++++ app/views/helpers/javascript_vars.phtml | 2 ++ config-user.default.php | 2 ++ p/scripts/main.js | 43 +++++++++++++++++++++++++++------ 5 files changed, 62 insertions(+), 12 deletions(-) (limited to 'app') diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index bf494162d..5894c12b7 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -151,25 +151,30 @@ return array( 'auto_share_help' => 'If there is only one sharing mode, it is used. Otherwise, modes are accessible by their number.', 'close_dropdown' => 'Close menus', 'collapse_article' => 'Collapse', - 'first_article' => 'Skip to the first article', + 'first_article' => 'Open the first article', 'focus_search' => 'Access search box', 'global_view' => 'Switch to global view', 'help' => 'Display documentation', 'javascript' => 'JavaScript must be enabled in order to use shortcuts', - 'last_article' => 'Skip to the last article', + 'last_article' => 'Open the last article', 'load_more' => 'Load more articles', 'mark_favorite' => 'Mark as favourite', 'mark_read' => 'Mark as read', 'navigation' => 'Navigation', 'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.
    With the "Alt" modifier, navigation shortcuts apply on categories.', - 'next_article' => 'Skip to the next article', + 'next_article' => 'Open the next article', + 'other_action' => 'Other actions', + 'previous_article' => 'Open the previous article', + 'next_article' => 'Open the next article', 'normal_view' => 'Switch to normal view', 'other_action' => 'Other actions', - 'previous_article' => 'Skip to the previous article', + 'previous_article' => 'Open the previous article', 'reading_view' => 'Switch to reading view', 'rss_view' => 'Open RSS view in a new tab', 'see_on_website' => 'See on original website', 'shift_for_all_read' => '+ shift to mark all articles as read', + 'skip_next_article' => 'Focus next without opening', + 'skip_previous_article' => 'Focus previous without opening', 'title' => 'Shortcuts', '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.', diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index 66db6a5d4..650c84df1 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -64,6 +64,20 @@ + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index d7b3e4360..a434a04a3 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -26,6 +26,8 @@ echo htmlspecialchars(json_encode(array( 'go_website' => @$s['go_website'], 'prev_entry' => @$s['prev_entry'], 'next_entry' => @$s['next_entry'], + 'skip_prev_entry' => @$s['skip_prev_entry'], + 'skip_next_entry' => @$s['skip_next_entry'], 'first_entry' => @$s['first_entry'], 'last_entry' => @$s['last_entry'], 'collapse_entry' => @$s['collapse_entry'], diff --git a/config-user.default.php b/config-user.default.php index 6aef0dc49..08f3af720 100644 --- a/config-user.default.php +++ b/config-user.default.php @@ -49,6 +49,8 @@ return array ( 'go_website' => 'space', 'next_entry' => 'j', 'prev_entry' => 'k', + 'skip_next_entry' => 'n', + 'skip_prev_entry' => 'p', 'first_entry' => 'home', 'last_entry' => 'end', 'collapse_entry' => 'c', diff --git a/p/scripts/main.js b/p/scripts/main.js index 92fa8db4c..43753417c 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -237,12 +237,13 @@ function mark_favorite(active) { }); } -function toggleContent(new_active, old_active) { +function toggleContent(new_active, old_active, skipping = false) { + // If skipping, move current without activating or marking as read if (new_active.length === 0) { return; } - if (context.does_lazyload) { + if (context.does_lazyload && !skipping) { new_active.find('img[data-original], iframe[data-original]').each(function () { this.onload = function () { $(document.body).trigger("sticky_kit:recalc"); }; this.setAttribute('src', this.getAttribute('data-original')); @@ -251,15 +252,15 @@ function toggleContent(new_active, old_active) { } if (old_active[0] !== new_active[0]) { - if (isCollapsed) { + if (isCollapsed && !skipping) { // BUG?: isCollapsed can only ever be true new_active.addClass("active"); } old_active.removeClass("active current"); new_active.addClass("current"); - if (context.auto_remove_article && !old_active.hasClass('not_read')) { + if (context.auto_remove_article && !old_active.hasClass('not_read') && !skipping) { auto_remove(old_active); } - } else { + } else { // collapse_entry calls toggleContent(flux_current, flux_current) new_active.toggleClass('active'); } @@ -278,6 +279,10 @@ function toggleContent(new_active, old_active) { } } + if (skipping){ + // when skipping, this feels more natural if it's not so near the top + new_pos -= $(window).height()/4 + } if (context.hide_posts) { if (relative_move) { new_pos += old_scroll; @@ -295,7 +300,7 @@ function toggleContent(new_active, old_active) { } } - if (context.auto_mark_article && new_active.hasClass('active')) { + if (context.auto_mark_article && new_active.hasClass('active') && !skipping) { mark_read(new_active, true); } } @@ -313,13 +318,29 @@ function auto_remove(element) { function prev_entry() { var old_active = $(".flux.current"), new_active = old_active.length === 0 ? $(".flux:last") : old_active.prevAll(".flux:first"); - toggleContent(new_active, old_active); + toggleContent(new_active, old_active, false); } function next_entry() { var old_active = $(".flux.current"), new_active = old_active.length === 0 ? $(".flux:first") : old_active.nextAll(".flux:first"); - toggleContent(new_active, old_active); + toggleContent(new_active, old_active, false); + + if (new_active.nextAll().length < 3) { + load_more_posts(); + } +} + +function skip_prev_entry() { + var old_active = $(".flux.current"), + new_active = old_active.length === 0 ? $(".flux:last") : old_active.prevAll(".flux:first"); + toggleContent(new_active, old_active, true); +} + +function skip_next_entry() { + var old_active = $(".flux.current"), + new_active = old_active.length === 0 ? $(".flux:first") : old_active.nextAll(".flux:first"); + toggleContent(new_active, old_active, true); if (new_active.nextAll().length < 3) { load_more_posts(); @@ -637,6 +658,9 @@ function init_shortcuts() { shortcut.add(shortcuts.prev_entry, prev_entry, { 'disable_in_input': true }); + shortcut.add(shortcuts.skip_prev_entry, skip_prev_entry, { + 'disable_in_input': true + }); shortcut.add(shortcuts.first_entry, function () { var old_active = $(".flux.current"), first = $(".flux:first"); @@ -650,6 +674,9 @@ function init_shortcuts() { shortcut.add(shortcuts.next_entry, next_entry, { 'disable_in_input': true }); + shortcut.add(shortcuts.skip_next_entry, skip_next_entry, { + 'disable_in_input': true + }); shortcut.add(shortcuts.last_entry, function () { var old_active = $(".flux.current"), last = $(".flux:last"); -- cgit v1.2.3 From e20c7ef1b020df492923ca9a445fb8fa172a11dd Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Sun, 18 Nov 2018 19:31:36 +0100 Subject: [fix] Finishing touches for next/previous without focus (#2140) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [fix] Finishing touches for next/previous without focus Cf. #1767. * Avoid single quote Alternative: use `’` * Minor whitespace * Minor whitespace * be explicit about skipping * add todos * overshot by one --- app/i18n/cz/conf.php | 1 + app/i18n/de/conf.php | 1 + app/i18n/en/conf.php | 1 + app/i18n/es/conf.php | 1 + app/i18n/fr/conf.php | 1 + app/i18n/he/conf.php | 1 + app/i18n/it/conf.php | 1 + app/i18n/kr/conf.php | 1 + app/i18n/nl/conf.php | 1 + app/i18n/oc/conf.php | 1 + app/i18n/pt-br/conf.php | 1 + app/i18n/ru/conf.php | 1 + app/i18n/tr/conf.php | 1 + app/i18n/zh-cn/conf.php | 1 + app/views/configure/shortcut.phtml | 4 +++- p/scripts/main.js | 18 +++++++++--------- 16 files changed, 26 insertions(+), 10 deletions(-) (limited to 'app') diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php index 0da2af39a..8df9d9f35 100644 --- a/app/i18n/cz/conf.php +++ b/app/i18n/cz/conf.php @@ -162,6 +162,7 @@ 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ů.
    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 'next_article' => 'Skočit na další článek', 'normal_view' => 'Switch to normal view', //TODO - Translation 'other_action' => 'Ostatní akce', diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php index 01dddacfc..2f3122a8e 100644 --- a/app/i18n/de/conf.php +++ b/app/i18n/de/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => 'Als gelesen markieren', 'navigation' => 'Navigation', 'navigation_help' => 'Mit der "Umschalttaste" finden die Tastenkombination auf Feeds Anwendung.
    Mit der "Alt-Taste" finden die Tastenkombination auf Kategorien Anwendung.', + 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', //TODO - Translation 'next_article' => 'Zum nächsten Artikel springen', 'normal_view' => 'Wechsle zur normalen Ansicht', 'other_action' => 'Andere Aktionen', diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index 5894c12b7..c6471426f 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => 'Mark as read', 'navigation' => 'Navigation', 'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.
    With the "Alt" modifier, navigation shortcuts apply on categories.', + 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', 'next_article' => 'Open the next article', 'other_action' => 'Other actions', 'previous_article' => 'Open the previous article', diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php index 4585e4d60..a79bac555 100755 --- a/app/i18n/es/conf.php +++ b/app/i18n/es/conf.php @@ -162,6 +162,7 @@ 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.
    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 'next_article' => 'Saltar al siguiente artículo', 'normal_view' => 'Switch to normal view', //TODO - Translation 'other_action' => 'Otras acciones', diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php index 23000c3cf..f24bcab98 100644 --- a/app/i18n/fr/conf.php +++ b/app/i18n/fr/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => 'Marquer comme lu', 'navigation' => 'Navigation', 'navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.
    Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.', + 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', //TODO - Translation 'next_article' => 'Passer à l’article suivant', 'normal_view' => 'Basculer vers la vue normale', 'other_action' => 'Autres actions', diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php index 83ba5cd04..c0ca06000 100644 --- a/app/i18n/he/conf.php +++ b/app/i18n/he/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => 'סימון כנקרא', 'navigation' => 'ניווט', 'navigation_help' => 'בעזרת מקש השיפט קיצורי דרך חלים על הזנות .
    עם מקש האלט הם חלים על קטגוריות.', + 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', //TODO - Translation 'next_article' => 'דילוג למאמר הבא', 'normal_view' => 'Switch to normal view', //TODO - Translation 'other_action' => 'פעולות אחרות', diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php index ef892cc8a..64bd50dfe 100644 --- a/app/i18n/it/conf.php +++ b/app/i18n/it/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => 'Segna come letto', 'navigation' => 'Navigazione', 'navigation_help' => 'Con il tasto "Shift" i comandi di navigazione verranno applicati ai feeds.
    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 'next_article' => 'Salta al contenuto successivo', 'normal_view' => 'Switch to normal view', // TODO 'other_action' => 'Altre azioni', diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php index ae34795ef..70996945d 100644 --- a/app/i18n/kr/conf.php +++ b/app/i18n/kr/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => '읽음으로 표시', 'navigation' => '탐색', 'navigation_help' => '"Shift" 키를 누른 상태에선 탐색 단축키가 피드에 적용됩니다.
    "Alt" 키를 누른 상태에선 탐색 단축키가 카테고리에 적용됩니다.', + 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', //TODO - Translation 'next_article' => '다음 글 보기', 'normal_view' => '일반 모드로 전환', 'other_action' => '다른 동작', diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php index f6f6f4bba..76fccfeaf 100644 --- a/app/i18n/nl/conf.php +++ b/app/i18n/nl/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => 'Markeer als gelezen', 'navigation' => 'Navigatie', 'navigation_help' => 'Met de "Shift" toets, kunt u navigatie verwijzingen voor feeds gebruiken.
    Met de "Alt" toets, kunt u navigatie verwijzingen voor categoriën gebruiken.', + 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', //TODO - Translation 'next_article' => 'Spring naar volgende artikel', 'normal_view' => 'Schakel naar gewoon aanzicht', 'other_action' => 'Andere acties', diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php index fff8689e0..7dc166a6d 100644 --- a/app/i18n/oc/conf.php +++ b/app/i18n/oc/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => 'Marcar coma legit', 'navigation' => 'Navigacion', 'navigation_help' => 'Amb lo modificador «Shift», los acorchis de navigacion s’aplican als fluxes.
    Amb lo modificador «Alt», los acorchis de navigacion s’aplican a las categorias.', + 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', //TODO - Translation 'next_article' => 'Passar a l’article seguent', 'normal_view' => 'Passar a la vista normala', 'other_action' => 'Autras accions', diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php index ae32bef72..6f908d251 100644 --- a/app/i18n/pt-br/conf.php +++ b/app/i18n/pt-br/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => 'Marcar como lido', 'navigation' => 'Navegação', 'navigation_help' => 'Com o modificador "Shift", atalhos de navegação aplicam aos feeds.
    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 'next_article' => 'Pule para o próximo artigo', 'normal_view' => 'Switch to normal view', //TODO - Translation 'other_action' => 'Outras ações', diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php index 3fe0ded2d..a33e7e6d0 100644 --- a/app/i18n/ru/conf.php +++ b/app/i18n/ru/conf.php @@ -162,6 +162,7 @@ return array( 'mark_favorite' => 'Mark as favourite', //TODO - Translation 'navigation' => 'Navigation', //TODO - Translation 'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.
    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 diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php index 526a28ba6..f3837ca97 100644 --- a/app/i18n/tr/conf.php +++ b/app/i18n/tr/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => 'Okundu olarak işaretle', 'navigation' => 'Genel eylemler', 'navigation_help' => '"Shift" tuşu ile kısayollar akışlar için geçerli olur.
    "Alt" tuşu ile kısayollar kategoriler için geçerli olur.', + 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', //TODO - Translation 'next_article' => 'Sonraki makaleye geç', 'normal_view' => 'Switch to normal view', //TODO - Translation 'other_action' => 'Diğer eylemler', diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php index 5b58e3626..c180443ac 100644 --- a/app/i18n/zh-cn/conf.php +++ b/app/i18n/zh-cn/conf.php @@ -162,6 +162,7 @@ return array( 'mark_read' => '设为已读', 'navigation' => '浏览', 'navigation_help' => '搭配 "Shift" 键，浏览快捷键将生效于 RSS 源。
    搭配 "Alt" 键，浏览快捷键将生效于分类。', + 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', //TODO - Translation 'next_article' => '跳转到下一篇文章', 'normal_view' => '切换到普通视图', 'other_action' => '其他操作', diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index 650c84df1..70a274edd 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -64,7 +64,9 @@
    - + +

    +
    diff --git a/p/scripts/main.js b/p/scripts/main.js index 43753417c..3f1fdf20e 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -237,7 +237,7 @@ function mark_favorite(active) { }); } -function toggleContent(new_active, old_active, skipping = false) { +function toggleContent(new_active, old_active, skipping) { // If skipping, move current without activating or marking as read if (new_active.length === 0) { return; @@ -252,7 +252,7 @@ function toggleContent(new_active, old_active, skipping = false) { } if (old_active[0] !== new_active[0]) { - if (isCollapsed && !skipping) { // BUG?: isCollapsed can only ever be true + if (isCollapsed && !skipping) { // BUG?: isCollapsed can only ever be true new_active.addClass("active"); } old_active.removeClass("active current"); @@ -260,7 +260,7 @@ function toggleContent(new_active, old_active, skipping = false) { if (context.auto_remove_article && !old_active.hasClass('not_read') && !skipping) { auto_remove(old_active); } - } else { // collapse_entry calls toggleContent(flux_current, flux_current) + } else { // collapse_entry calls toggleContent(flux_current, flux_current, false) new_active.toggleClass('active'); } @@ -279,9 +279,9 @@ function toggleContent(new_active, old_active, skipping = false) { } } - if (skipping){ + if (skipping) { // when skipping, this feels more natural if it's not so near the top - new_pos -= $(window).height()/4 + new_pos -= $(window).height() / 4; } if (context.hide_posts) { if (relative_move) { @@ -423,7 +423,7 @@ function last_category() { function collapse_entry() { var flux_current = $(".flux.current"); - toggleContent(flux_current, flux_current); + toggleContent(flux_current, flux_current, false); } function user_filter(key) { @@ -666,7 +666,7 @@ function init_shortcuts() { first = $(".flux:first"); if (first.hasClass("flux")) { - toggleContent(first, old_active); + toggleContent(first, old_active, false); } }, { 'disable_in_input': true @@ -682,7 +682,7 @@ function init_shortcuts() { last = $(".flux:last"); if (last.hasClass("flux")) { - toggleContent(last, old_active); + toggleContent(last, old_active, false); } }, { 'disable_in_input': true @@ -795,7 +795,7 @@ function init_stream(divStream) { } return true; } - toggleContent(new_active, old_active); + toggleContent(new_active, old_active, false); }); divStream.on('click', '.flux a.read', function () { -- cgit v1.2.3 From ebb9ee0873333c111546412ad08bf5207529f24a Mon Sep 17 00:00:00 2001 From: Patrick Crandol Date: Sun, 18 Nov 2018 13:34:41 -0500 Subject: Edit cookie_duration from GUI (#2137) * Use cookie_duration correctly * WIP allow cookie_duration to be modified from GUI * Allow cookie_duration to actually be updated * Update view to properly display cookie_duration * Add new strings in Translation Files * Fix typo * Fix trailing whitespace * I18n: French translation * I18n fr: Forgot todo --- app/Controllers/configureController.php | 2 ++ app/Models/Auth.php | 11 ++++++----- app/Models/ConfigurationSetter.php | 3 +++ app/i18n/cz/admin.php | 14 +++++++++----- app/i18n/de/admin.php | 4 ++++ app/i18n/en/admin.php | 4 ++++ app/i18n/es/admin.php | 4 ++++ app/i18n/fr/admin.php | 4 ++++ app/i18n/he/admin.php | 14 +++++++++----- app/i18n/it/admin.php | 4 ++++ app/i18n/kr/admin.php | 4 ++++ app/i18n/nl/admin.php | 4 ++++ app/i18n/oc/admin.php | 4 ++++ app/i18n/pt-br/admin.php | 4 ++++ app/i18n/ru/admin.php | 4 ++++ app/i18n/tr/admin.php | 4 ++++ app/i18n/zh-cn/admin.php | 4 ++++ app/views/configure/system.phtml | 8 ++++++++ 18 files changed, 85 insertions(+), 15 deletions(-) (limited to 'app') diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 20bcd2e76..9c3900f39 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -308,6 +308,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController { * - user limit (default: 1) * - user category limit (default: 16384) * - user feed limit (default: 16384) + * - user login duration for form auth (default: 2592000) */ public function systemAction() { if (!FreshRSS_Auth::hasAccess('admin')) { @@ -318,6 +319,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController { $limits['max_registrations'] = Minz_Request::param('max-registrations', 1); $limits['max_feeds'] = Minz_Request::param('max-feeds', 16384); $limits['max_categories'] = Minz_Request::param('max-categories', 16384); + $limits['cookie_duration'] = Minz_Request::param('cookie-duration', 2592000); FreshRSS_Context::$system_conf->limits = $limits; FreshRSS_Context::$system_conf->title = Minz_Request::param('instance-name', 'FreshRSS'); FreshRSS_Context::$system_conf->auto_update_url = Minz_Request::param('auto-update-url', false); diff --git a/app/Models/Auth.php b/app/Models/Auth.php index 8c711308c..d1e26b8e8 100644 --- a/app/Models/Auth.php +++ b/app/Models/Auth.php @@ -233,9 +233,10 @@ class FreshRSS_FormAuth { $token_file = DATA_PATH . '/tokens/' . $token . '.txt'; $mtime = @filemtime($token_file); - if ($mtime + 2629744 < time()) { - // Token has expired (> 1 month) or does not exist. - // TODO: 1 month -> use a configuration instead + $limits = $conf->limits; + $cookie_duration = empty($limits['cookie_duration']) ? 2592000 : $limits['cookie_duration']; + if ($mtime + $cookie_duration < time()) { + // Token has expired (> cookie_duration) or does not exist. @unlink($token_file); return array(); } @@ -256,7 +257,7 @@ class FreshRSS_FormAuth { } $limits = $conf->limits; - $cookie_duration = empty($limits['cookie_duration']) ? 2629744 : $limits['cookie_duration']; + $cookie_duration = empty($limits['cookie_duration']) ? 2592000 : $limits['cookie_duration']; $expire = time() + $cookie_duration; Minz_Session::setLongTermCookie('FreshRSS_login', $token, $expire); return $token; @@ -277,7 +278,7 @@ class FreshRSS_FormAuth { public static function purgeTokens() { $conf = Minz_Configuration::get('system'); $limits = $conf->limits; - $cookie_duration = empty($limits['cookie_duration']) ? 2629744 : $limits['cookie_duration']; + $cookie_duration = empty($limits['cookie_duration']) ? 2592000 : $limits['cookie_duration']; $oldest = time() - $cookie_duration; foreach (new DirectoryIterator(DATA_PATH . '/tokens/') as $file_info) { // $extension = $file_info->getExtension(); doesn't work in PHP < 5.3.7 diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index ad703dfc5..ec6380df4 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -335,6 +335,9 @@ class FreshRSS_ConfigurationSetter { private function _limits(&$data, $values) { $max_small_int = 16384; $limits_keys = array( + 'cookie_duration' => array( + 'min' => 0, + ), 'cache_duration' => array( 'min' => 0, ), diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php index 271a9a253..68127f571 100644 --- a/app/i18n/cz/admin.php +++ b/app/i18n/cz/admin.php @@ -157,11 +157,15 @@ return array( 'top_feed' => 'Top ten kanálů', ), 'system' => array( - '_' => 'System configuration', //TODO - Translation - 'auto-update-url' => 'Auto-update server URL', //TODO - Translation - 'instance-name' => 'Instance name', //TODO - Translation - 'max-categories' => 'Categories per user limit', //TODO - Translation - 'max-feeds' => 'Feeds per user limit', //TODO - Translation + '_' => '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 znamená žádná omezení účtu', 'number' => 'Maximální počet účtů', diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php index fe626bb70..f0307dcab 100644 --- a/app/i18n/de/admin.php +++ b/app/i18n/de/admin.php @@ -162,6 +162,10 @@ return array( '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' => 'Duration to keep logged in', // @todo translate + ), 'registration' => array( 'help' => '0 meint, dass es kein Account Limit gibt', 'number' => 'Maximale Anzahl von Accounts', diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php index b1252d672..004089ffc 100644 --- a/app/i18n/en/admin.php +++ b/app/i18n/en/admin.php @@ -162,6 +162,10 @@ return array( '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', + ), 'registration' => array( 'help' => '0 means that there is no account limit', 'number' => 'Max number of accounts', diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php index bd4446ce5..0ec8549bd 100755 --- a/app/i18n/es/admin.php +++ b/app/i18n/es/admin.php @@ -162,6 +162,10 @@ return array( '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', diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php index 1175c9c65..74605b5ee 100644 --- a/app/i18n/fr/admin.php +++ b/app/i18n/fr/admin.php @@ -162,6 +162,10 @@ return array( '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', + ), 'registration' => array( 'help' => 'Un chiffre de 0 signifie que l’on peut créer un nombre infini de comptes', 'number' => 'Nombre max de comptes', diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php index 415816d34..e0dfc405d 100644 --- a/app/i18n/he/admin.php +++ b/app/i18n/he/admin.php @@ -157,11 +157,15 @@ return array( 'top_feed' => 'עשרת ההזנות המובילות', ), 'system' => array( - '_' => 'System configuration', //TODO - Translation - 'auto-update-url' => 'Auto-update server URL', //TODO - Translation - 'instance-name' => 'Instance name', //TODO - Translation - 'max-categories' => 'Categories per user limit', //TODO - Translation - 'max-feeds' => 'Feeds per user limit', //TODO - Translation + '_' => '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 - Translation 'number' => 'Max number of accounts', //TODO - Translation diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php index 88972aa8f..d4253e9ba 100644 --- a/app/i18n/it/admin.php +++ b/app/i18n/it/admin.php @@ -162,6 +162,10 @@ return array( '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', diff --git a/app/i18n/kr/admin.php b/app/i18n/kr/admin.php index ac4a808e7..532fe30a5 100644 --- a/app/i18n/kr/admin.php +++ b/app/i18n/kr/admin.php @@ -162,6 +162,10 @@ return array( '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' => '계정 최대 개수', diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php index 1fd31e27a..8a63b885b 100644 --- a/app/i18n/nl/admin.php +++ b/app/i18n/nl/admin.php @@ -162,6 +162,10 @@ return array( 'instance-name' => 'Voorbeeld naam', 'max-categories' => 'Categoriën limiet per gebruiker', 'max-feeds' => 'Feed limiet per gebruiker', + 'cookie-duration' => array( + 'help' => 'in seconds', // @todo translate + 'number' => 'Duration to keep logged in', // @todo translate + ), 'registration' => array( 'help' => '0 betekent geen account limiet', 'number' => 'Maximum aantal accounts', diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php index 9eab3b4c8..3df36c7c5 100644 --- a/app/i18n/oc/admin.php +++ b/app/i18n/oc/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Configuracion sistèma', 'auto-update-url' => 'URL del servici de mesa a jorn', + 'cookie-duration' => array( + 'help' => 'in seconds', //TODO - Translation + 'number' => 'Duration to keep logged in', //TODO - Translation + ), 'instance-name' => 'Nom de l’instància', 'max-categories' => 'Limita de categoria per utilizaire', 'max-feeds' => 'Limita de fluxes per utilizaire', diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php index ca88e2039..82559c67b 100644 --- a/app/i18n/pt-br/admin.php +++ b/app/i18n/pt-br/admin.php @@ -162,6 +162,10 @@ return array( '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', diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php index efbd8fde0..c9a7d6683 100644 --- a/app/i18n/ru/admin.php +++ b/app/i18n/ru/admin.php @@ -162,6 +162,10 @@ return array( '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' => 'Максимальное количество пользователей', diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php index 81e5d14a2..b1d6671ca 100644 --- a/app/i18n/tr/admin.php +++ b/app/i18n/tr/admin.php @@ -162,6 +162,10 @@ return array( 'instance-name' => 'Örnek isim', 'max-categories' => 'Kullanıcı başına kategori limiti', 'max-feeds' => 'Kullanıcı başına akış limiti', + 'cookie-duration' => array( + 'help' => 'in seconds', // @todo translate + 'number' => 'Duration to keep logged in', // @todo translate + ), 'registration' => array( 'help' => '0 sınır yok anlamındadır', 'number' => 'En fazla hesap sayısı', diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php index e6ca552ab..e34070526 100644 --- a/app/i18n/zh-cn/admin.php +++ b/app/i18n/zh-cn/admin.php @@ -162,6 +162,10 @@ return array( 'instance-name' => '实例名称', 'max-categories' => '每用户分类限制', 'max-feeds' => '每用户 RSS 源限制', + 'cookie-duration' => array( + 'help' => 'in seconds', // @todo translate + 'number' => 'Duration to keep logged in', // @todo translate + ), 'registration' => array( 'help' => '0 表示无账户数限制', 'number' => '最大账户数', diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index 37b68c991..9af4cc2c9 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -51,6 +51,14 @@
    + +
    + +
    + + +
    +
    -- cgit v1.2.3 From 9d703da026345fa47e892c983e7b4a60176cf100 Mon Sep 17 00:00:00 2001 From: Quentí <33203663+Quenty31@users.noreply.github.com> Date: Sun, 18 Nov 2018 21:09:57 +0100 Subject: [i18n] Update missing string for Occitan (#2141) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [i18n] Update missing string for Occitan According to I18n standardization #2138 this string was missing. Took the most used translation for "to clear" from Firefox, escafar. And «cache» like in French and English. Tell me know if other strings are missing * Removal of the comment Comment removed - comentari tirat - commentaire retiré --- app/i18n/oc/sub.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index 407a10b96..c553a8af4 100644 --- a/app/i18n/oc/sub.php +++ b/app/i18n/oc/sub.php @@ -26,7 +26,7 @@ return array( 'password' => 'Senhal HTTP', 'username' => 'Identificant HTTP', ), - 'clear_cache' => 'Always clear cache', //TODO - Translation + 'clear_cache' => 'Totjorn escafar lo cache', 'css_help' => 'Permet de recuperar los fluxes troncats (atencion, demanda mai de temps !)', 'css_path' => 'Selector CSS dels articles sul site d’origina', 'description' => 'Descripcion', -- cgit v1.2.3 From 03bc6fda05f250432d1884aedf9d94bbbc2a9cbc Mon Sep 17 00:00:00 2001 From: Quentí <33203663+Quenty31@users.noreply.github.com> Date: Tue, 20 Nov 2018 21:08:09 +0100 Subject: [i18n] Missing strings for Occitan locale (#2145) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Missing strings * Missing strings * More ’ --- app/i18n/oc/admin.php | 4 ++-- app/i18n/oc/conf.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php index 3df36c7c5..4a47374d7 100644 --- a/app/i18n/oc/admin.php +++ b/app/i18n/oc/admin.php @@ -160,8 +160,8 @@ return array( '_' => 'Configuracion sistèma', 'auto-update-url' => 'URL del servici de mesa a jorn', 'cookie-duration' => array( - 'help' => 'in seconds', //TODO - Translation - 'number' => 'Duration to keep logged in', //TODO - Translation + 'help' => 'en segondas', + 'number' => 'Durada de téner d’ésser connectat', ), 'instance-name' => 'Nom de l’instància', 'max-categories' => 'Limita de categoria per utilizaire', diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php index 7dc166a6d..004b7332a 100644 --- a/app/i18n/oc/conf.php +++ b/app/i18n/oc/conf.php @@ -117,7 +117,7 @@ return array( 'newer_first' => 'Mai recents en primièr', 'older_first' => 'Mai ancians en primièr', ), - 'sticky_post' => 'Gardar l\'article amont quand es dobèrt', + 'sticky_post' => 'Gardar l’article amont quand es dobèrt', 'title' => 'Lectura', 'view' => array( 'default' => 'Vista per defaut', @@ -146,9 +146,9 @@ return array( ), 'shortcut' => array( '_' => 'Acorchis', - 'article_action' => 'Accions ligadas a l\'article', + '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.', + '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.', 'close_dropdown' => 'Tampar los menús', 'collapse_article' => 'Replegar', 'first_article' => 'Passar al primièr article', @@ -162,7 +162,7 @@ return array( 'mark_read' => 'Marcar coma legit', 'navigation' => 'Navigacion', 'navigation_help' => 'Amb lo modificador «Shift», los acorchis de navigacion s’aplican als fluxes.
    Amb lo modificador «Alt», los acorchis de navigacion s’aplican a las categorias.', - 'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.', //TODO - Translation + 'navigation_no_mod_help' => 'Los acorchis clavièrs de navigacion son pas compatibles amb los modificadors.', 'next_article' => 'Passar a l’article seguent', 'normal_view' => 'Passar a la vista normala', 'other_action' => 'Autras accions', -- cgit v1.2.3 From b35c3b4f0a77322e13834fcf87b315d6687fc7b7 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Wed, 28 Nov 2018 21:09:06 +0100 Subject: [i18n] Add `conf.shortcut.skip_next_article` and `conf.shortcut.skip_previous_article` todos (#2156) Cf. https://github.com/FreshRSS/FreshRSS/pull/2140#issuecomment-440425725 --- app/i18n/cz/conf.php | 2 ++ app/i18n/de/conf.php | 2 ++ app/i18n/es/conf.php | 2 ++ app/i18n/fr/conf.php | 2 ++ app/i18n/he/conf.php | 2 ++ app/i18n/it/conf.php | 2 ++ app/i18n/kr/conf.php | 2 ++ app/i18n/nl/conf.php | 2 ++ app/i18n/oc/conf.php | 2 ++ app/i18n/pt-br/conf.php | 2 ++ app/i18n/ru/conf.php | 2 ++ app/i18n/tr/conf.php | 2 ++ app/i18n/zh-cn/conf.php | 2 ++ 13 files changed, 26 insertions(+) (limited to 'app') diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php index 8df9d9f35..d0203c252 100644 --- a/app/i18n/cz/conf.php +++ b/app/i18n/cz/conf.php @@ -171,6 +171,8 @@ return array( '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' => '+ shift 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 '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.', diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php index 2f3122a8e..e0beb1ac7 100644 --- a/app/i18n/de/conf.php +++ b/app/i18n/de/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Öffne RSS Ansicht in neuem Tab', 'see_on_website' => 'Auf der Original-Webseite ansehen', 'shift_for_all_read' => '+ Umschalttaste, um alle Artikel als gelesen zu markieren.', + 'skip_next_article' => 'Focus next without opening', //TODO - Translation + 'skip_previous_article' => 'Focus previous without opening', //TODO - Translation 'title' => 'Tastenkombination', '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.', diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php index a79bac555..b7d87f375 100755 --- a/app/i18n/es/conf.php +++ b/app/i18n/es/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Open RSS view in a new tab', //TODO - Translation 'see_on_website' => 'Ver en la web original', 'shift_for_all_read' => '+ mayúsculas 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 '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.', diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php index f24bcab98..5c8e91c89 100644 --- a/app/i18n/fr/conf.php +++ b/app/i18n/fr/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Ouvrir le flux RSS dans un nouvel onglet', 'see_on_website' => 'Voir sur le site d’origine', 'shift_for_all_read' => '+ shift pour marquer tous les articles comme lus', + 'skip_next_article' => 'Focus next without opening', //TODO - Translation + 'skip_previous_article' => 'Focus previous without opening', //TODO - Translation 'title' => 'Raccourcis', '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.', diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php index c0ca06000..2f699bcf2 100644 --- a/app/i18n/he/conf.php +++ b/app/i18n/he/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Open RSS view in a new tab', //TODO - Translation 'see_on_website' => 'ראו את המקור באתר', 'shift_for_all_read' => '+ shift על מנת לסמן את כל המאמרים כנקראו', + 'skip_next_article' => 'Focus next without opening', //TODO - Translation + 'skip_previous_article' => 'Focus previous without opening', //TODO - Translation 'title' => 'קיצורי דרך', 'user_filter' => 'גישה למססנים', 'user_filter_help' => 'אם יש רק מזנן אחד הוא יהיה בשימוש. אחרת המסננים ישמשו על בסיס המספר שלהם.', diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php index 64bd50dfe..df4a5ebeb 100644 --- a/app/i18n/it/conf.php +++ b/app/i18n/it/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Open RSS view in a new tab', //TODO - Translation 'see_on_website' => 'Vai al sito fonte', 'shift_for_all_read' => '+ shift 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 '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.', diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php index 70996945d..5c3d95d17 100644 --- a/app/i18n/kr/conf.php +++ b/app/i18n/kr/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => '새 탭에서 RSS 피드 열기', 'see_on_website' => '글이 게재된 웹사이트에서 보기', 'shift_for_all_read' => '+ shift를 누른 상태에선 모두 읽음으로 표시', + 'skip_next_article' => 'Focus next without opening', //TODO - Translation + 'skip_previous_article' => 'Focus previous without opening', //TODO - Translation 'title' => '단축키', 'user_filter' => '사용자 필터 사용하기', 'user_filter_help' => '사용자 필터가 하나만 설정되어 있다면 해당 필터를 사용하고, 그렇지 않다면 필터를 번호로 선택할 수 있습니다.', diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php index 76fccfeaf..ba21fc889 100644 --- a/app/i18n/nl/conf.php +++ b/app/i18n/nl/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Open RSS-aanzicht in een nieuwe tab', 'see_on_website' => 'Bekijk op originale website', 'shift_for_all_read' => '+ shift om alle artikelen als gelezen te markeren', + 'skip_next_article' => 'Focus next without opening', //TODO - Translation + 'skip_previous_article' => 'Focus previous without opening', //TODO - Translation 'title' => 'Verwijzingen', '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.', diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php index 004b7332a..e4d85c7bf 100644 --- a/app/i18n/oc/conf.php +++ b/app/i18n/oc/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Dobrir la vista RSS dins un onglet novèl', 'see_on_website' => 'Veire al site d’origina', 'shift_for_all_read' => '+ shift per marcar los articles coma legits', + 'skip_next_article' => 'Focus next without opening', //TODO - Translation + 'skip_previous_article' => 'Focus previous without opening', //TODO - Translation 'title' => 'Acorchis', '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.', diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php index 6f908d251..ca365db5b 100644 --- a/app/i18n/pt-br/conf.php +++ b/app/i18n/pt-br/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Open RSS view in a new tab', //TODO - Translation 'see_on_website' => 'Visualize o site original', 'shift_for_all_read' => '+ shift 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 '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.', diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php index a33e7e6d0..59ac480bc 100644 --- a/app/i18n/ru/conf.php +++ b/app/i18n/ru/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Open RSS view in a new tab', //TODO - Translation 'see_on_website' => 'See on original website', //TODO - Translation 'shift_for_all_read' => '+ shift 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 diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php index f3837ca97..507558487 100644 --- a/app/i18n/tr/conf.php +++ b/app/i18n/tr/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => 'Open RSS view in a new tab', //TODO - Translation 'see_on_website' => 'Orijinal sitede göster', 'shift_for_all_read' => '+ shift tuşu ile tüm makaleler okundu olarak işaretlenir', + 'skip_next_article' => 'Focus next without opening', //TODO - Translation + 'skip_previous_article' => 'Focus previous without opening', //TODO - Translation 'title' => 'Kısayollar', 'user_filter' => 'Kullanıcı filtrelerine eriş', 'user_filter_help' => 'Eğer tek filtre varsa o kullanılır. Yoksa filtrelerin kendi numaralarıyla kullanılır.', diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php index c180443ac..1216aaaca 100644 --- a/app/i18n/zh-cn/conf.php +++ b/app/i18n/zh-cn/conf.php @@ -171,6 +171,8 @@ return array( 'rss_view' => '在新标签中打开 RSS 视图', 'see_on_website' => '在原网站上查看', 'shift_for_all_read' => '+ shift 可以将全部文章设为已读', + 'skip_next_article' => 'Focus next without opening', //TODO - Translation + 'skip_previous_article' => 'Focus previous without opening', //TODO - Translation 'title' => '快捷键', 'user_filter' => '显示自定义查询', 'user_filter_help' => '如果有多个自定义过滤器，则会按照它们的编号依次访问。', -- cgit v1.2.3 From 57fce758f5bd116e1f603d6435fb341f2741ab16 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 28 Nov 2018 22:16:14 +0100 Subject: Fix HTML injections (#2157) Minz: Fix HTML injections --- app/views/error/index.phtml | 2 +- lib/Minz/ActionException.php | 4 +--- lib/Minz/ControllerNotExistException.php | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml index fe3abf8c4..8fd74e8bf 100644 --- a/app/views/error/index.phtml +++ b/app/views/error/index.phtml @@ -2,7 +2,7 @@

    code; ?>

    - errorMessage; ?>
    + errorMessage, ENT_NOQUOTES, 'UTF-8'); ?>

    diff --git a/lib/Minz/ActionException.php b/lib/Minz/ActionException.php index f1f70c1bc..311f15086 100644 --- a/lib/Minz/ActionException.php +++ b/lib/Minz/ActionException.php @@ -1,9 +1,7 @@ Date: Sat, 1 Dec 2018 22:12:42 +0100 Subject: Filter feeds in error (#2160) https://github.com/FreshRSS/FreshRSS/issues/2146 --- app/Controllers/subscriptionController.php | 2 ++ app/i18n/cz/sub.php | 7 +++++++ app/i18n/de/sub.php | 7 +++++++ app/i18n/en/sub.php | 7 +++++++ app/i18n/es/sub.php | 7 +++++++ app/i18n/fr/sub.php | 7 +++++++ app/i18n/he/sub.php | 7 +++++++ app/i18n/it/sub.php | 7 +++++++ app/i18n/kr/sub.php | 7 +++++++ app/i18n/nl/sub.php | 7 +++++++ app/i18n/oc/sub.php | 7 +++++++ app/i18n/pt-br/sub.php | 7 +++++++ app/i18n/ru/sub.php | 7 +++++++ app/i18n/tr/sub.php | 7 +++++++ app/i18n/zh-cn/sub.php | 7 +++++++ app/views/subscription/index.phtml | 17 +++++++++++++++++ 16 files changed, 117 insertions(+) (limited to 'app') diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 0b1439ba5..46503fc19 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -33,6 +33,8 @@ class FreshRSS_subscription_Controller extends Minz_ActionController { @filemtime(PUBLIC_PATH . '/scripts/category.js'))); Minz_View::prependTitle(_t('sub.title') . ' · '); + $this->view->onlyFeedsWithError = Minz_Request::paramTernary('error'); + $id = Minz_Request::param('id'); if ($id !== false) { $feedDAO = FreshRSS_Factory::createFeedDao(); diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php index fc06fb4dc..ec4c6f374 100644 --- a/app/i18n/cz/sub.php +++ b/app/i18n/cz/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Okamžité oznámení s PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistika', 'think_to_add' => 'Můžete přidat kanály.', diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index 32446c3fa..c4455c4be 100644 --- a/app/i18n/de/sub.php +++ b/app/i18n/de/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Zeige in eigener Kategorie', ), 'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Überprüfe SSL Sicherheit', 'stats' => 'Statistiken', 'think_to_add' => 'Sie können Feeds hinzufügen.', diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php index 154d42e95..1dac808b0 100644 --- a/app/i18n/en/sub.php +++ b/app/i18n/en/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', ), 'pubsubhubbub' => 'Instant notification with PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', + 'error' => 'Show only feeds with error', + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', + ), 'ssl_verify' => 'Verify SSL security', 'stats' => 'Statistics', 'think_to_add' => 'You may add some feeds.', diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php index 02f4b270f..b6a7eb568 100755 --- a/app/i18n/es/sub.php +++ b/app/i18n/es/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Notificación inmedaiata con PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Estadísticas', 'think_to_add' => 'Puedes añadir fuentes.', diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php index c48aaf6c7..b5eaccef4 100644 --- a/app/i18n/fr/sub.php +++ b/app/i18n/fr/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Afficher dans sa catégorie', ), 'pubsubhubbub' => 'Notification instantanée par PubSubHubbub', + 'show' => array( + 'all' => 'Montrer tous les flux', + 'error' => 'Montrer seulement les flux en erreur', + ), + 'showing' => array( + 'error' => 'Montre seulement les flux en erreur', + ), 'ssl_verify' => 'Vérification sécurité SSL', 'stats' => 'Statistiques', 'think_to_add' => 'Vous pouvez ajouter des flux.', diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php index 474abb8ad..f467df28c 100644 --- a/app/i18n/he/sub.php +++ b/app/i18n/he/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //TODO - Translation + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'סטטיסטיקות', 'think_to_add' => 'ניתן להוסיף הזנות חדשות.', diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php index 3cf869dd4..cbb488f3e 100644 --- a/app/i18n/it/sub.php +++ b/app/i18n/it/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Notifica istantanea con PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistiche', 'think_to_add' => 'Aggiungi feed.', diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php index 9595a045e..785a3ea96 100644 --- a/app/i18n/kr/sub.php +++ b/app/i18n/kr/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => '피드가 속한 카테고리에만 표시하기', ), 'pubsubhubbub' => 'PubSubHubbub을 사용한 즉시 알림', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'SSL 유효성 검사', 'stats' => '통계', 'think_to_add' => '피드를 추가할 수 있습니다.', diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php index 7b1e3727e..53954ad3f 100644 --- a/app/i18n/nl/sub.php +++ b/app/i18n/nl/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Toon in categorie', ), 'pubsubhubbub' => 'Directe notificaties met PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'SSL-veiligheid controleren', 'stats' => 'Statistieken', 'think_to_add' => 'Voeg wat feeds toe.', diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index c553a8af4..1d2e0007b 100644 --- a/app/i18n/oc/sub.php +++ b/app/i18n/oc/sub.php @@ -45,6 +45,13 @@ return array( 'normal' => 'Mostar dins sa categoria', ), 'pubsubhubbub' => 'Notificaciones instantáneas amb PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verificacion de la seguretat SSL', 'stats' => 'Estatisticas', 'think_to_add' => 'Podètz ajustar de fluxes.', diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php index 15986d6c3..03ae9d014 100644 --- a/app/i18n/pt-br/sub.php +++ b/app/i18n/pt-br/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Notificação instantânea com PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Estatísticas', 'think_to_add' => 'Você deve adicionar alguns feeds.', diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php index eccbf818d..ccd3b0020 100644 --- a/app/i18n/ru/sub.php +++ b/app/i18n/ru/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //TODO - Translation + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + '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 diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index e6adc0353..4d71e3dbf 100644 --- a/app/i18n/tr/sub.php +++ b/app/i18n/tr/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'PubSubHubbub ile anlık bildirim', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'İstatistikler', 'think_to_add' => 'Akış ekleyebilirsiniz.', diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php index aab4b1359..49b6e4304 100644 --- a/app/i18n/zh-cn/sub.php +++ b/app/i18n/zh-cn/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => '在分类中显示', ), 'pubsubhubbub' => 'PubSubHubbub 即时通知', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => '统计', 'think_to_add' => '你可以添加一些 RSS 源。', diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index 41dd8a7df..8b196cb00 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -52,6 +52,12 @@ default_category->name()); ?>

    + onlyFeedsWithError): ?> +

    + +

    + +
    @@ -122,6 +128,9 @@ onlyFeedsWithError && !$feed->inError()) { + continue; + } $error = $feed->inError() ? ' error' : ''; $empty = $feed->nbEntries() == 0 ? ' empty' : ''; ?> @@ -140,6 +149,14 @@
+ +
    + onlyFeedsWithError): ?> +
    • + +
    • + +
feed) ? ' class="active"' : ''; ?> -- cgit v1.2.3 From 2f70da06e6c19bef383e5011e6300eef7a8257cb Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 4 Dec 2018 21:26:10 +0100 Subject: Fix undefined conf (#2163) Small fix for https://github.com/FreshRSS/FreshRSS/pull/2137 --- app/Models/Auth.php | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/Models/Auth.php b/app/Models/Auth.php index d1e26b8e8..9c3e31952 100644 --- a/app/Models/Auth.php +++ b/app/Models/Auth.php @@ -233,6 +233,7 @@ class FreshRSS_FormAuth { $token_file = DATA_PATH . '/tokens/' . $token . '.txt'; $mtime = @filemtime($token_file); + $conf = Minz_Configuration::get('system'); $limits = $conf->limits; $cookie_duration = empty($limits['cookie_duration']) ? 2592000 : $limits['cookie_duration']; if ($mtime + $cookie_duration < time()) { -- cgit v1.2.3 From 2610db6260c8beeb9590cdc9f4f3aac1e9985510 Mon Sep 17 00:00:00 2001 From: Patrick Crandol Date: Tue, 11 Dec 2018 15:21:59 -0500 Subject: Remove rawurlencode from movim sharing (#2177) --- app/shares.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/shares.php b/app/shares.php index 55deed785..6d234b374 100644 --- a/app/shares.php +++ b/app/shares.php @@ -64,7 +64,7 @@ return array( ), 'movim' => array( 'url' => '~URL~/?share/~LINK~', - 'transform' => array('rawurlencode', 'urlencode'), + 'transform' => array('urlencode'), 'help' => 'https://github.com/edhelas/movim', 'form' => 'advanced', 'method' => 'GET', -- cgit v1.2.3 From a1071e7dd9b9efe3b1f61a3f6bb9f936ad6d7c6a Mon Sep 17 00:00:00 2001 From: Patrick Crandol Date: Tue, 11 Dec 2018 18:20:04 -0500 Subject: Add option to share to Pinboard. (#2178) * Prelim. Add Pinboard based on the url found in the "For iPad" section here: https://pinboard.in/howto/ * add i18n string for Pinboard * Add help to pinboard * add title to Pinboard Share Title seems to be an element, but isn't documented in the API. Perhaps it's an alternative to description? It probably won't hurt to include it. * Feedback from @samplereality * Minor Whitespace --- app/i18n/cz/gen.php | 1 + app/i18n/de/gen.php | 1 + app/i18n/en/gen.php | 1 + app/i18n/es/gen.php | 1 + app/i18n/fr/gen.php | 1 + app/i18n/he/gen.php | 1 + app/i18n/it/gen.php | 1 + app/i18n/kr/gen.php | 1 + app/i18n/nl/gen.php | 1 + app/i18n/oc/gen.php | 1 + app/i18n/pt-br/gen.php | 1 + app/i18n/ru/gen.php | 1 + app/i18n/tr/gen.php | 1 + app/i18n/zh-cn/gen.php | 1 + app/shares.php | 7 +++++++ 15 files changed, 21 insertions(+) (limited to 'app') diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php index 27ff9414c..08fce0280 100644 --- a/app/i18n/cz/gen.php +++ b/app/i18n/cz/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Tisk', 'shaarli' => 'Shaarli', diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php index 59ce371d3..c02a55b2c 100644 --- a/app/i18n/de/gen.php +++ b/app/i18n/de/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Drucken', 'shaarli' => 'Shaarli', diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php index f0ce8ed02..32f5ee02e 100644 --- a/app/i18n/en/gen.php +++ b/app/i18n/en/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Print', 'shaarli' => 'Shaarli', diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php index 183e3f794..db36e5f5b 100755 --- a/app/i18n/es/gen.php +++ b/app/i18n/es/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Print', 'shaarli' => 'Shaarli', diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php index fa4dceadd..86d8461e6 100644 --- a/app/i18n/fr/gen.php +++ b/app/i18n/fr/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Imprimer', 'shaarli' => 'Shaarli', diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php index 9349cbce7..cf4a1fcda 100644 --- a/app/i18n/he/gen.php +++ b/app/i18n/he/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'הדפסה', 'shaarli' => 'Shaarli', diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php index 3bf2f155f..9cc40ffe3 100644 --- a/app/i18n/it/gen.php +++ b/app/i18n/it/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Stampa', 'shaarli' => 'Shaarli', diff --git a/app/i18n/kr/gen.php b/app/i18n/kr/gen.php index 744ec6fce..86a50e9c4 100644 --- a/app/i18n/kr/gen.php +++ b/app/i18n/kr/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => '인쇄', 'shaarli' => 'Shaarli', diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php index 99b1cf9c2..bdf2e0abd 100644 --- a/app/i18n/nl/gen.php +++ b/app/i18n/nl/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Print', 'shaarli' => 'Shaarli', diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php index 246a74eb2..ffe10941d 100644 --- a/app/i18n/oc/gen.php +++ b/app/i18n/oc/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Imprimir', 'shaarli' => 'Shaarli', diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php index 8a0b26b3d..46ae53eb4 100644 --- a/app/i18n/pt-br/gen.php +++ b/app/i18n/pt-br/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Imprimir', 'shaarli' => 'Shaarli', diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php index f6b1f16ec..b55c6b667 100644 --- a/app/i18n/ru/gen.php +++ b/app/i18n/ru/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Print', 'shaarli' => 'Shaarli', diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php index 370660aba..a84c39f20 100644 --- a/app/i18n/tr/gen.php +++ b/app/i18n/tr/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => 'Print', 'shaarli' => 'Shaarli', diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php index a0f74fdfa..1dcd95233 100644 --- a/app/i18n/zh-cn/gen.php +++ b/app/i18n/zh-cn/gen.php @@ -172,6 +172,7 @@ return array( 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', 'movim' => 'Movim', + 'pinboard' => 'Pinboard', 'pocket' => 'Pocket', 'print' => '打印', 'shaarli' => 'Shaarli', diff --git a/app/shares.php b/app/shares.php index 6d234b374..4f7fde3ed 100644 --- a/app/shares.php +++ b/app/shares.php @@ -137,4 +137,11 @@ return array( 'form' => 'simple', 'method' => 'GET', ), + 'pinboard' => array( + 'url' => 'https://pinboard.in/add?next=same&url=~LINK~&title=~TITLE~', + 'transform' => array('urlencode'), + 'help' => 'https://pinboard.in/api/', + 'form' => 'simple', + 'method' => 'GET', + ), ); -- cgit v1.2.3 From 478d3e6611e73974bd3b917c625bf0d099cbf123 Mon Sep 17 00:00:00 2001 From: Patrick Crandol Date: Wed, 12 Dec 2018 06:04:31 -0500 Subject: Decouple scrolling of feeds and articles (#2117) * Remove Sticky Kit Remove sticky-kit, as functionality is unsuitable for separate scrolling. * Remove sticky-kit load in main.js Further removing the sticky-kit kruft * Finish removal of references to Sticky-kit * CSS Changes to template for Independent Scrolling * Addition of JS and supporting CSS and html * More CSS fixes to establish expected behavior Should be able to scroll navbar without it being in sticky mode now. * Fix typo in main.js sortcut.js -> shortcut.js * Fix unexpected tree scrolling behavior * Change name of generic JS function * Improve sticky-aside * CSS changes in themes to accommodate independent Scroll In themes where .aside's width is not the standard 300px, .tree's width must be specified to be equal to .aside * Remove Sticky-Kit from README files * Updates to Sticky-Aside * Update Template to fix screwup * Make Recalculating height actually work * Let sidebar fill height if nav buttons aren't visible * Make accommodating for nav buttons actually work * update Swage theme for Independent Scroll feature * Integrate sticky_aside into main.js * Add Simple Scrollbar * Patch scrollbar color for themes with dark colored asides * Increase Visibility of scrollbar on Dark Themes * Improve async loading, events, and performance * CSS typo * Fix double scrollbar on mobile * Fix regression causing sticky to not be removed * No $ for non-jQuery variables * Fix strange condition + option for nice scrollbar * Initial attempt to use css sticky * Add stickyfill * make the correct element sticky * re-add incorrectly removed sidebar code * Continue fixing mistaken deletions * decrease frequency of recalc * use minified version of simple-scrollbar. * Load stickyfill instead of injecting * put recalc back where it belongs * re-remove script injector * remove padding bottom padding was causing the last item in the feed to be hidden under the nav buttons * Manual merge of css_scrollbar Add auto-detection of -webkit-scrollbar-thumb, otherwise fall back to simple-scrollbar.js * Fix Regression Sticky recalc is still needed when using css scrollbars * Replace method of closing dropdowns Changed from an overlay href to a javascript solution, for better compatibility * Remove Treepadding Treepadding was causing dropdown menus at the bottom of the tree to be obscured. * Undo unnecessary move of dropdown-target * Move Dropdown Handler to a sensibleish place * Fix light Scrollbar color not picking up on Firefox * Minor syntax * Minor Clarification of CSS/ patch BlueLagoon * Change logic for native WebKit scrollbar detection Fix https://github.com/FreshRSS/FreshRSS/pull/2117#issuecomment-444251419 Tested with Firefox 63, Firefox 65, Chrome 71, IE11, Edge 42 * Fixes for other views E.g. reader view * Cleaner way of generating hash for dropdowns * Make dropdown-toggle an actual toggle * Prepare for CSS Scrollbars Module Level 1 * Fix regression causing my labels dropdown not to appear * remove unneeded dropdown-close css rule * Re-apply some lost changes https://github.com/FreshRSS/FreshRSS/pull/2117/commits/3c509989e890b88852e52c67c1c5507d1e0bf28c * Add standard scrollbar compatibility E.g. Firefox 64+ * Make All dropdowns click-to-close * Remove BlueLagoon template * Try to fix Firefox https://github.com/FreshRSS/FreshRSS/pull/2117#discussion_r239539984 * Add CSS rules necessary for consistent function of scrollbar in Firefox * Use inheritance to determine width * Use overlay scrollbar where possible * Test Reduced Listener * Fix Firefox 62 And show subtle scrollbar even when not hovering * Add margin at bottom To allow opening the menus https://github.com/FreshRSS/FreshRSS/pull/2117#issuecomment-444571218 * Minor - tab correction * Spaces -> tabs * Remove unneeded inheritance * Fix indenting * Revert bad merge * Messy WIP to make dropdowns work * Style Cleanup * Break it down * Lets try a move-it move-it * Update p/scripts/main.js Co-Authored-By: pattems * Update p/themes/BlueLagoon/BlueLagoon.css Co-Authored-By: pattems * separate ALL THE THINGS * erroneous commas * and to or * removing double condition that doesn't do what I want * More breaking down * fix var * Fix variable name again * Remove magic number https://github.com/FreshRSS/FreshRSS/pull/2117#discussion_r240052598 * Suuuuper inelegant solution for dropdowns * lets try that again * Inelegant Fix For Dropdowns Now with 100% more working dropdowns * Make sidebar dropdowns work correctly? * Fix reversion * Make JS scrollbar always visible * Remove unneeded CSS Added early in this pull request, didn't get pulled out when it was obsolete * Fix CSS removal I missed * CSS comment update/consistency for dark themes * Clean Up Duplicate code * Make dropdowns properly hide Downside: Can no longer click on header/nav buttons to close * Strip unneeded if statement * jshint -W018 https://github.com/FreshRSS/FreshRSS/pull/2117#discussion_r240392851 * Half-reversion to old dropdown * make overlay href scale to sidebar width * remove init of nonexistent method * remove trailing tabs * move #close href where it belongs in index.phtml * Revert all changes to index.phtml * remove whitespace accidentally added in last commit * Move var's in init_column categories * Finish putting old style dropdowns back * Make CSS changes to use support statements * Cleanup Whitespace * re-add missing class * spaces -> tabs in main.js * tabs -> spaces css * Minor whitespace * Cleanup per @Alkarex * Second attempt to add bottom margin https://github.com/FreshRSS/FreshRSS/pull/2117#discussion_r240820901 * Fix error in IE11 * Simple-scrollbar color match for dark themes --- README.fr.md | 4 +- README.md | 6 +- app/layout/aside_feed.phtml | 3 +- p/scripts/jquery.sticky-kit.min.js | 9 --- p/scripts/main.js | 116 +++++++++++++++++++++++------------ p/scripts/simple-scrollbar.min.js | 2 + p/themes/BlueLagoon/BlueLagoon.css | 26 ++++++++ p/themes/Dark/dark.css | 25 ++++++++ p/themes/Flat/flat.css | 25 ++++++++ p/themes/Screwdriver/screwdriver.css | 25 ++++++++ p/themes/Swage/swage.css | 26 ++++++++ p/themes/Swage/swage.scss | 38 ++++++++++-- p/themes/base-theme/template.css | 99 +++++++++++++++++++++++++++--- 13 files changed, 338 insertions(+), 66 deletions(-) delete mode 100644 p/scripts/jquery.sticky-kit.min.js create mode 100644 p/scripts/simple-scrollbar.min.js (limited to 'app') diff --git a/README.fr.md b/README.fr.md index 312fbac45..a8a8f87ff 100644 --- a/README.fr.md +++ b/README.fr.md @@ -192,13 +192,13 @@ Tout client supportant une API de type Fever ; Sélection : * [php-http-304](https://alexandre.alapetite.fr/doc-alex/php-http-304/) * [jQuery](https://jquery.com/) * [lib_opml](https://github.com/marienfressinaud/lib_opml) -* [jQuery Plugin Sticky-Kit](https://leafo.net/sticky-kit/) * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/) * [flotr2](http://www.humblesoftware.com/flotr2) -## Uniquement pour certaines options +## Uniquement pour certaines options ou configurations * [bcrypt.js](https://github.com/dcodeIO/bcrypt.js) * [phpQuery](https://github.com/phpquery/phpquery) +* [simple-scrollbar](https://github.com/buzinas/simple-scrollbar) ## Si les fonctions natives ne sont pas disponibles * [Services_JSON](https://pear.php.net/pepr/pepr-proposal-show.php?id=198) diff --git a/README.md b/README.md index 1e86d9f57..d6e13851e 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ FreshRSS comes with absolutely no warranty. More detailed information about installation and server configuration can be found in [our documentation](https://freshrss.github.io/FreshRSS/en/admins/02_Installation.html). -## Automated install +## Automated install * [![Docker](https://www.docker.com/sites/default/files/horizontal.png)](./Docker/) * [![YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=freshrss) * [![Cloudron](https://cloudron.io/img/button.svg)](https://cloudron.io/button.html?app=org.freshrss.cloudronapp) @@ -199,13 +199,13 @@ Supported clients are: * [php-http-304](https://alexandre.alapetite.fr/doc-alex/php-http-304/) * [jQuery](https://jquery.com/) * [lib_opml](https://github.com/marienfressinaud/lib_opml) -* [jQuery Plugin Sticky-Kit](https://leafo.net/sticky-kit/) * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/) * [flotr2](http://www.humblesoftware.com/flotr2) -## Only for some options +## Only for some options or configurations * [bcrypt.js](https://github.com/dcodeIO/bcrypt.js) * [phpQuery](https://github.com/phpquery/phpquery) +* [simple-scrollbar](https://github.com/buzinas/simple-scrollbar) ## If native functions are not available * [Services_JSON](https://pear.php.net/pepr/pepr-proposal-show.php?id=198) diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 7b1645ebd..73b200686 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -21,7 +21,7 @@
-
    + diff --git a/p/scripts/jquery.sticky-kit.min.js b/p/scripts/jquery.sticky-kit.min.js deleted file mode 100644 index e2a3c6de9..000000000 --- a/p/scripts/jquery.sticky-kit.min.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - Sticky-kit v1.1.2 | WTFPL | Leaf Corcoran 2015 | http://leafo.net -*/ -(function(){var b,f;b=this.jQuery||window.jQuery;f=b(window);b.fn.stick_in_parent=function(d){var A,w,J,n,B,K,p,q,k,E,t;null==d&&(d={});t=d.sticky_class;B=d.inner_scrolling;E=d.recalc_every;k=d.parent;q=d.offset_top;p=d.spacer;w=d.bottoming;null==q&&(q=0);null==k&&(k=void 0);null==B&&(B=!0);null==t&&(t="is_stuck");A=b(document);null==w&&(w=!0);J=function(a,d,n,C,F,u,r,G){var v,H,m,D,I,c,g,x,y,z,h,l;if(!a.data("sticky_kit")){a.data("sticky_kit",!0);I=A.height();g=a.parent();null!=k&&(g=g.closest(k)); -if(!g.length)throw"failed to find stick parent";v=m=!1;(h=null!=p?p&&a.closest(p):b("
    "))&&h.css("position",a.css("position"));x=function(){var c,f,e;if(!G&&(I=A.height(),c=parseInt(g.css("border-top-width"),10),f=parseInt(g.css("padding-top"),10),d=parseInt(g.css("padding-bottom"),10),n=g.offset().top+c+f,C=g.height(),m&&(v=m=!1,null==p&&(a.insertAfter(h),h.detach()),a.css({position:"",top:"",width:"",bottom:""}).removeClass(t),e=!0),F=a.offset().top-(parseInt(a.css("margin-top"),10)||0)-q, -u=a.outerHeight(!0),r=a.css("float"),h&&h.css({width:a.outerWidth(!0),height:u,display:a.css("display"),"vertical-align":a.css("vertical-align"),"float":r}),e))return l()};x();if(u!==C)return D=void 0,c=q,z=E,l=function(){var b,l,e,k;if(!G&&(e=!1,null!=z&&(--z,0>=z&&(z=E,x(),e=!0)),e||A.height()===I||x(),e=f.scrollTop(),null!=D&&(l=e-D),D=e,m?(w&&(k=e+u+c>C+n,v&&!k&&(v=!1,a.css({position:"fixed",bottom:"",top:c}).trigger("sticky_kit:unbottom"))),eb&&!v&&(c-=l,c=Math.max(b-u,c),c=Math.min(q,c),m&&a.css({top:c+"px"})))):e>F&&(m=!0,b={position:"fixed",top:c},b.width="border-box"===a.css("box-sizing")?a.outerWidth()+"px":a.width()+"px",a.css(b).addClass(t),null==p&&(a.after(h),"left"!==r&&"right"!==r||h.append(a)),a.trigger("sticky_kit:stick")),m&&w&&(null==k&&(k=e+u+c>C+n),!v&&k)))return v=!0,"static"===g.css("position")&&g.css({position:"relative"}), -a.css({position:"absolute",bottom:d,top:"auto"}).trigger("sticky_kit:bottom")},y=function(){x();return l()},H=function(){G=!0;f.off("touchmove",l);f.off("scroll",l);f.off("resize",y);b(document.body).off("sticky_kit:recalc",y);a.off("sticky_kit:detach",H);a.removeData("sticky_kit");a.css({position:"",bottom:"",top:"",width:""});g.position("position","");if(m)return null==p&&("left"!==r&&"right"!==r||a.insertAfter(h),h.remove()),a.removeClass(t)},f.on("touchmove",l),f.on("scroll",l),f.on("resize", -y),b(document.body).on("sticky_kit:recalc",y),a.on("sticky_kit:detach",H),setTimeout(l,0)}};n=0;for(K=this.length;n +var sidebar = document.getElementById('sidebar'); +var useJsScrollbar = true; +try { + /*jshint -W018 */ + useJsScrollbar = sidebar && !CSS.supports('scrollbar-color: auto') && + !(parseInt(getComputedStyle(sidebar, '::-webkit-scrollbar').width) < sidebar.offsetWidth); + /*jshint +W018 */ +} catch (ex) { +} +if (useJsScrollbar) { + inject_script('simple-scrollbar.min.js'); +} + +function sticky_recalc() { + var h = 0; + if ($nav_entries && $nav_entries.length > 0) { + h = $(window).height() - sidebar.getBoundingClientRect().top - $nav_entries.height(); + } else { + h = $(window).height() - sidebar.getBoundingClientRect().top; + } + if (h > 0) { + $(sidebar).height(h); + } +} + +function init_simple_scrollbar() { + if (!window.SimpleScrollbar) { + if (window.console) { + console.log('FreshRSS waiting for simple-scrollbar…'); + } + window.setTimeout(init_simple_scrollbar, 100); + } else { + SimpleScrollbar.initEl(sidebar); + } +} +var scrollTimeout; +function init_sticky_sidebar(){ + if (!sidebar) { + return; + } + if (useJsScrollbar) { + init_simple_scrollbar(); + } + $(window).scroll(function () { + if (scrollTimeout) { + clearTimeout(scrollTimeout); + scrollTimeout = null; + } + scrollTimeout = setTimeout(sticky_recalc, 200); + }); + window.onresize = sticky_recalc; +} function init_confirm_action() { $('body').on('click', '.confirm', function () { @@ -1536,7 +1576,6 @@ function init_beforeDOM() { return; } if (['normal', 'reader', 'global'].indexOf(context.current_view) >= 0) { - inject_script('jquery.sticky-kit.min.js'); init_normal(); } } @@ -1554,6 +1593,7 @@ function init_afterDOM() { $stream = $('#stream'); if ($stream.length > 0) { init_load_more($stream); + init_sticky_sidebar(); init_posts(); init_nav_entries(); init_dynamic_tags(); diff --git a/p/scripts/simple-scrollbar.min.js b/p/scripts/simple-scrollbar.min.js new file mode 100644 index 000000000..36b7df0b8 --- /dev/null +++ b/p/scripts/simple-scrollbar.min.js @@ -0,0 +1,2 @@ +// https://github.com/buzinas/simple-scrollbar +!function(t,e){"object"==typeof exports?module.exports=e(window,document):t.SimpleScrollbar=e(window,document)}(this,function(t,e){function s(t){Object.prototype.hasOwnProperty.call(t,"data-simple-scrollbar")||Object.defineProperty(t,"data-simple-scrollbar",{value:new o(t)})}function i(t,s){function i(t){var e=t.pageY-a;a=t.pageY,n(function(){s.el.scrollTop+=e/s.scrollRatio})}function r(){t.classList.remove("ss-grabbed"),e.body.classList.remove("ss-grabbed"),e.removeEventListener("mousemove",i),e.removeEventListener("mouseup",r)}var a;t.addEventListener("mousedown",function(s){return a=s.pageY,t.classList.add("ss-grabbed"),e.body.classList.add("ss-grabbed"),e.addEventListener("mousemove",i),e.addEventListener("mouseup",r),!1})}function r(t){for(this.target=t,this.direction=window.getComputedStyle(this.target).direction,this.bar='
    ',this.wrapper=e.createElement("div"),this.wrapper.setAttribute("class","ss-wrapper"),this.el=e.createElement("div"),this.el.setAttribute("class","ss-content"),"rtl"===this.direction&&this.el.classList.add("rtl"),this.wrapper.appendChild(this.el);this.target.firstChild;)this.el.appendChild(this.target.firstChild);this.target.appendChild(this.wrapper),this.target.insertAdjacentHTML("beforeend",this.bar),this.bar=this.target.lastChild,i(this.bar,this),this.moveBar(),this.el.addEventListener("scroll",this.moveBar.bind(this)),this.el.addEventListener("mouseenter",this.moveBar.bind(this)),this.target.classList.add("ss-container");var s=window.getComputedStyle(t);"0px"===s.height&&"0px"!==s["max-height"]&&(t.style.height=s["max-height"])}function a(){for(var t=e.querySelectorAll("*[ss-container]"),i=0;i=1?i.bar.classList.add("ss-hidden"):(i.bar.classList.remove("ss-hidden"),i.bar.style.cssText="height:"+Math.max(100*i.scrollRatio,10)+"%; top:"+i.el.scrollTop/e*100+"%;right:"+a+"px;")})}},e.addEventListener("DOMContentLoaded",a),r.initEl=s,r.initAll=a;var o=r;return o}); \ No newline at end of file diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css index f167f2051..263764a9c 100644 --- a/p/themes/BlueLagoon/BlueLagoon.css +++ b/p/themes/BlueLagoon/BlueLagoon.css @@ -564,6 +564,32 @@ a.btn { color: #0090FF } +/*=== Scrollbar */ + +@supports (scrollbar-width: thin) { + #sidebar { + scrollbar-color: rgba(255, 255, 255, 0.05) rgba(0, 0, 0, 0.0); + } + #sidebar:hover { + scrollbar-color: rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0.0); + } +} +.ss-scroll { + background: rgba(255, 255, 255, 0.1); +} +.ss-container:hover .ss-scroll, +.ss-container:active .ss-scroll { + background: rgba(255, 255, 255, 0.3); +} +@supports not (scrollbar-width: thin) { + #sidebar::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.1); + } + #sidebar:hover::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.3); + } +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index 31ff514a2..b8366caeb 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -502,6 +502,31 @@ a.btn { color: #888; } +/*=== Scrollbar */ +@supports (scrollbar-width: thin) { + #sidebar { + scrollbar-color: rgba(255, 255, 255, 0.05) rgba(0, 0, 0, 0.0); + } + #sidebar:hover { + scrollbar-color: rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0.0); + } +} +.ss-scroll { + background: rgba(255, 255, 255, 0.1); +} +.ss-container:hover .ss-scroll, +.ss-container:active .ss-scroll { + background: rgba(255, 255, 255, 0.3); +} +@supports not (scrollbar-width: thin) { + #sidebar::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.1); + } + #sidebar:hover::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.3); + } +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index be047a394..176a541f7 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -505,6 +505,31 @@ a.btn { color: #fff; } +/*=== Scrollbar */ +@supports (scrollbar-width: thin) { + #sidebar { + scrollbar-color: rgba(255, 255, 255, 0.05) rgba(0, 0, 0, 0.0); + } + #sidebar:hover { + scrollbar-color: rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0.0); + } +} +.ss-scroll { + background: rgba(255, 255, 255, 0.1); +} +.ss-container:hover .ss-scroll, +.ss-container:active .ss-scroll { + background: rgba(255, 255, 255, 0.3); +} +@supports not (scrollbar-width: thin) { + #sidebar::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.1); + } + #sidebar:hover::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.3); + } +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index 1bc49c2db..b92dbac3e 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -559,6 +559,31 @@ a.btn { .tree-folder-items > .item.active > a { } +/*=== Scrollbar */ +@supports (scrollbar-width: thin) { + #sidebar { + scrollbar-color: rgba(255, 255, 255, 0.05) rgba(0, 0, 0, 0.0); + } + #sidebar:hover { + scrollbar-color: rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0.0); + } +} +.ss-scroll { + background: rgba(255, 255, 255, 0.1); +} +.ss-container:hover .ss-scroll, +.ss-container:active .ss-scroll { + background: rgba(255, 255, 255, 0.3); +} +@supports not (scrollbar-width: thin) { + #sidebar::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.1); + } + #sidebar:hover::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.3); + } +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/Swage/swage.css b/p/themes/Swage/swage.css index 8f262da8c..a8ff0bdd5 100644 --- a/p/themes/Swage/swage.css +++ b/p/themes/Swage/swage.css @@ -529,6 +529,32 @@ text-decoration: none; color: #FCFCFC; } +@supports (scrollbar-width: thin) { + #sidebar { +scrollbar-color: rgba(255, 255, 255, 0.05) rgba(0, 0, 0, 0.0); +} +#sidebar:hover { +scrollbar-color: rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0.0); +} +} + +.ss-scroll { +background: rgba(255, 255, 255, 0.1); +} +.ss-container:hover .ss-scroll, +.ss-container:active .ss-scroll { +background: rgba(255, 255, 255, 0.3); +} + +@supports not (scrollbar-width: thin) { +#sidebar::-webkit-scrollbar-thumb { +background: rgba(255, 255, 255, 0.1); +} +#sidebar:hover::-webkit-scrollbar-thumb { +background: rgba(255, 255, 255, 0.3); +} +} + .header > .item { vertical-align: middle; } diff --git a/p/themes/Swage/swage.scss b/p/themes/Swage/swage.scss index c0c76cf14..8ddac14db 100644 --- a/p/themes/Swage/swage.scss +++ b/p/themes/Swage/swage.scss @@ -351,7 +351,7 @@ form { > a { min-width: initial; white-space: nowrap; - } + } &:hover { background: $color_nav; color: $color_light; @@ -603,6 +603,32 @@ form { } } +@supports (scrollbar-width: thin) { + #sidebar { + scrollbar-color: rgba(255, 255, 255, 0.05) rgba(0, 0, 0, 0.0); + } + #sidebar:hover { + scrollbar-color: rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0.0); + } +} + +.ss-scroll { + background: rgba(255, 255, 255, 0.1); +} +.ss-container:hover .ss-scroll, +.ss-container:active .ss-scroll { + background: rgba(255, 255, 255, 0.3); +} + +@supports not (scrollbar-width: thin) { + #sidebar::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.1); + } + #sidebar:hover::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.3); + } +} + .header { > .item { vertical-align: middle; @@ -918,7 +944,7 @@ form { #global { height: 0; } - + .header { height: 55px; background: $color_aside; @@ -936,7 +962,7 @@ form { color: $color_light; padding-left: 5px; } - + input { border-left: 5px solid; border-right: 1px darken( $color_light, 10%); @@ -984,7 +1010,7 @@ form { .dropdown-header, .dropdown-menu > .item { padding: 12px; } - + #new-article { width: 100%; bottom: initial; @@ -1207,5 +1233,5 @@ button.as-link { background: inital; } } - -} \ No newline at end of file + +} diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index fdc2f884e..60c4822ef 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -109,7 +109,7 @@ input[type="checkbox"] { min-height: 15px !important; } .dropdown-menu label > input[type="text"] { - with: 150px; + width: 150px; width: calc(99% - 5em); } .dropdown-menu input[type="checkbox"] { @@ -168,6 +168,13 @@ td.numeric { display: block; } +@supports (position: sticky) { + #mark-read-aside { + position: sticky; + top: 0; + } +} + /*=== Buttons */ .stick { display: inline-block; @@ -273,6 +280,7 @@ a.btn { left: 0; right: 0; display: block; z-index: -10; + cursor: default; } .separator { display: block; @@ -373,16 +381,90 @@ a.btn { cursor: grab; } +/*=== Scrollbar */ +.ss-wrapper { + overflow: hidden; + width: 100%; + height: 100%; + position: relative; + z-index: 1; + float: left; +} + +.ss-content { + height: 100%; + width: calc(100% + 18px); + padding: 0 0 0 0; + position: relative; + overflow-y: scroll; + box-sizing: border-box; +} + +.ss-content.rtl { + width: calc(100% + 18px); + right: auto; +} + +.ss-scroll { + position: relative; + background: rgba(0, 0, 0, 0.1); + width: 9px; + border-radius: 4px; + top: 0; + z-index: 2; + cursor: pointer; + transition: opacity 0.25s linear; +} + +.ss-hidden { + display: none; +} + +.ss-container:hover .ss-scroll, +.ss-container:active .ss-scroll { + background: rgba(0, 0, 0, 0.3); +} + +.ss-grabbed { + -o-user-select: none; + -ms-user-select: none; + -moz-user-select: none; + -webkit-user-select: none; + user-select: none; +} + +@supports (scrollbar-width: thin) { + #sidebar { + overflow-y: scroll; + scrollbar-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.05); + scrollbar-width: thin; + } + #sidebar:hover { + scrollbar-color: rgba(0, 0, 0, 0.3) rgba(0, 0, 0, 0.05); + } +} + +@supports not (scrollbar-width: thin) { + #sidebar::-webkit-scrollbar { + background: rgba(0, 0, 0, 0.05); + width: 8px; + } + #sidebar::-webkit-scrollbar-thumb { + background: rgba(0, 0, 0, 0.1); + border-radius: 5px; + display: unset; + } + #sidebar:hover::-webkit-scrollbar-thumb { + background: rgba(0, 0, 0, 0.3); + } +} + /*=== Tree */ .tree { margin: 0; - padding: 0 0 2em 0; list-style: none; text-align: left; -} - -.treepadding { - padding: 0 0 15em 0; + overflow-x: hidden; } .tree-folder-items { @@ -412,6 +494,10 @@ a.btn { white-space: nowrap; text-overflow: ellipsis; } +.tree-bottom { + visibility: hidden; + margin-bottom: 15em; +} /*=== STRUCTURE */ /*===============*/ @@ -914,7 +1000,6 @@ pre.enclosure-description { } .aside:target { width: 90%; - overflow: auto; } .flux_header .item.website { -- cgit v1.2.3 From 983aa587ee71a83d21b17de29d2a26763b18292e Mon Sep 17 00:00:00 2001 From: Patrick Crandol Date: Sat, 15 Dec 2018 04:56:38 -0500 Subject: Add aside_feed to reader view (#2180) * Add Nav menu to reader mode At this point, it appears to be non-functional in reader mode. * Add aside_feed toggle to reader view * make init_column_categories work in reader view * Make sidebar links redirect to proper view * CSS to support toggleable sidebar in reader view * remove unneeded !important --- app/layout/aside_feed.phtml | 15 ++++++++------- app/layout/nav_menu.phtml | 2 +- app/views/index/reader.phtml | 1 + p/scripts/main.js | 2 +- p/themes/base-theme/template.css | 23 +++++++++++++++++++++++ 5 files changed, 34 insertions(+), 9 deletions(-) (limited to 'app') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 73b200686..5efaa54d1 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -1,4 +1,5 @@ hide_read_feeds && FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) && @@ -24,13 +25,13 @@
    - name(); ?> + name(); ?>
@@ -69,7 +70,7 @@
  • - name(); ?> + name(); ?>
    @@ -111,7 +112,7 @@