From 8ee8a573f1f7e9cc45f9b3c46627d15670f14f3a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 29 Sep 2018 20:47:17 +0200 Subject: Custom labels (#2027) * First draft of custom tags https://github.com/FreshRSS/FreshRSS/issues/928 https://github.com/FreshRSS/FreshRSS/issues/1367 * SMALLINT to BIGINT for id_entry And uppercase SQL types * Fix layout for unreads * Start UI menu * Change menu order * Clean database helpers https://github.com/FreshRSS/FreshRSS/pull/2027#discussion_r217971535 * Travis rules do not understand PostgreSQL constants Grrr * Tag controller + UI * Add column attributes to tags * Use only favicon for now, for label * Fix styling for different themes * Constant for maximum InnoDB index length in Unicode https://github.com/FreshRSS/FreshRSS/pull/2027#discussion_r219052200 (I would have personnally prefered keeping the readability of a real value instead of a constant, in this case of many SQL fields) * Use FreshRSS_Factory::createCategoryDao * Add view of all articles containing any tag * Fix search in tags * Mark as read tags * Partial auto-update unread tags * More auto update tag unreads * Add tag deletion * Do not purge tagged articles * Minor comment * Fix SQLite and UI bug * Google Reader API support for user tags Add SQL check that tag names must be distinct from category names * whitespace * Add missing API for EasyRSS * Compatibility SQLite Problematic parentheses * Add SQL DISTINCT for cases with multiple tags * Fix for PostgreSQL PostgreSQL needs some additional type hint to avoid "could not determine data type of parameter $1" http://www.postgresql-archive.org/Could-not-determine-data-type-of-parameter-1-tp2171092p2171094.html --- app/i18n/cz/conf.php | 2 +- app/i18n/cz/index.php | 5 +++-- app/i18n/de/conf.php | 2 +- app/i18n/de/index.php | 5 +++-- app/i18n/en/conf.php | 2 +- app/i18n/en/index.php | 5 +++-- app/i18n/es/conf.php | 2 +- app/i18n/es/index.php | 5 +++-- app/i18n/fr/conf.php | 2 +- app/i18n/fr/index.php | 5 +++-- app/i18n/he/conf.php | 2 +- app/i18n/he/index.php | 5 +++-- app/i18n/it/conf.php | 2 +- app/i18n/it/index.php | 5 +++-- app/i18n/kr/conf.php | 2 +- app/i18n/kr/index.php | 5 +++-- app/i18n/nl/conf.php | 2 +- app/i18n/nl/index.php | 4 ++-- app/i18n/pt-br/conf.php | 2 +- app/i18n/pt-br/index.php | 4 ++-- app/i18n/ru/conf.php | 2 +- app/i18n/ru/index.php | 4 ++-- app/i18n/tr/conf.php | 2 +- app/i18n/tr/index.php | 5 +++-- app/i18n/zh-cn/conf.php | 2 +- app/i18n/zh-cn/index.php | 5 +++-- 26 files changed, 49 insertions(+), 39 deletions(-) (limited to 'app/i18n') diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php index e73ab168f..84ee78c73 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', + 'related_tags' => 'Související tagy', //TODO 'sharing' => 'Sdílení', 'top_line' => 'Horní řádek', ), diff --git a/app/i18n/cz/index.php b/app/i18n/cz/index.php index 48a28d4da..7e60ca379 100644 --- a/app/i18n/cz/index.php +++ b/app/i18n/cz/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'Hlášení chyb', 'credits' => 'Poděkování', 'credits_content' => 'Některé designové prvky pocházejí z Bootstrap, FreshRSS ale tuto platformu nevyužívá. Ikony pocházejí z GNOME projektu. Font Open Sans vytvořil Steve Matteson. FreshRSS je založen na PHP framework Minz.', - 'freshrss_description' => 'FreshRSS je čtečka RSS kanálů určená k provozu na vlastním serveru, podobná Kriss Feed nebo Leed. Je to nenáročný a jednoduchý, zároveň ale mocný a konfigurovatelný nástroj.', + 'freshrss_description' => 'FreshRSS je čtečka RSS kanálů určená k provozu na vlastním serveru, podobná Kriss Feed nebo Leed. Je to nenáročný a jednoduchý, zároveň ale mocný a konfigurovatelný nástroj.', 'github' => 'na Github', 'license' => 'Licence', 'project_website' => 'Stránka projektu', @@ -53,10 +53,11 @@ return array( 'starred' => 'Zobrazit oblíbené', 'stats' => 'Statistika', 'subscription' => 'Správa subskripcí', + 'tags' => 'My labels', //TODO 'unread' => 'Zobrazovat nepřečtené', ), 'share' => 'Sdílet', 'tag' => array( - 'related' => 'Související tagy', + 'related' => 'Související tagy', //TODO ), ); diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php index 3a0c98c27..579363cb5 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', + 'related_tags' => 'Verwandte Tags', //TODO 'sharing' => 'Teilen', 'top_line' => 'Kopfzeile', ), diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php index 1fa3e3933..64300f5eb 100644 --- a/app/i18n/de/index.php +++ b/app/i18n/de/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'Fehlerberichte', 'credits' => 'Credits', 'credits_content' => 'Einige Designelemente stammen von Bootstrap, obwohl FreshRSS dieses Framework nicht nutzt. Icons stammen vom GNOME project. Open Sans Font wurde von Steve Matteson erstellt. FreshRSS basiert auf Minz, einem PHP-Framework.', - 'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten wie zum Beispiel Kriss Feed oder Leed. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.', + 'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten wie zum Beispiel Kriss Feed oder Leed. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.', 'github' => 'on Github', 'license' => 'Lizenz', 'project_website' => 'Projekt-Webseite', @@ -53,10 +53,11 @@ return array( 'starred' => 'Nur Favoriten zeigen', 'stats' => 'Statistiken', 'subscription' => 'Abonnementverwaltung', + 'tags' => 'My labels', //TODO 'unread' => 'Nur ungelesene zeigen', ), 'share' => 'Teilen', 'tag' => array( - 'related' => 'Verwandte Tags', + 'related' => 'Verwandte Tags', //TODO ), ); diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index fd91ed8f6..5c128f8e7 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Bottom line', 'entry' => 'Article icons', 'publication_date' => 'Date of publication', - 'related_tags' => 'Related tags', + 'related_tags' => 'Article tags', 'sharing' => 'Sharing', 'top_line' => 'Top line', ), diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php index 1c13abdb7..427a769a0 100644 --- a/app/i18n/en/index.php +++ b/app/i18n/en/index.php @@ -7,7 +7,7 @@ return array( '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.', + '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', @@ -53,10 +53,11 @@ return array( 'starred' => 'Show favourites', 'stats' => 'Statistics', 'subscription' => 'Subscriptions management', + 'tags' => 'My labels', 'unread' => 'Show unread', ), 'share' => 'Share', 'tag' => array( - 'related' => 'Related tags', + 'related' => 'Article tags', //TODO ), ); diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php index 0e198caf8..095015d47 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', + 'related_tags' => 'Etiquetas relacionadas', //TODO 'sharing' => 'Compartir', 'top_line' => 'Línea superior', ), diff --git a/app/i18n/es/index.php b/app/i18n/es/index.php index c88152459..1ed6066fb 100755 --- a/app/i18n/es/index.php +++ b/app/i18n/es/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'Informe de fallos', 'credits' => 'Créditos', 'credits_content' => 'Aunque FreshRSS no usa ese entorno, algunos elementos del diseño están obtenidos de Bootstrap. Los Iconos han sido obtenidos del proyecto GNOME. La fuente Open Sans es una creación de Steve Matteson. FreshRSS usa el entorno PHP Minz.', - 'freshrss_description' => 'FreshRSS es un agregador de fuentes RSS de alojamiento privado al estilo de Kriss Feed o Leed. Es una herramienta potente, pero ligera y fácil de usar y configurar.', + 'freshrss_description' => 'FreshRSS es un agregador de fuentes RSS de alojamiento privado al estilo de Kriss Feed o Leed. Es una herramienta potente, pero ligera y fácil de usar y configurar.', 'github' => 'en Github', 'license' => 'Licencia', 'project_website' => 'Web del proyecto', @@ -53,10 +53,11 @@ return array( 'starred' => 'Mostrar solo los favoritos', 'stats' => 'Estadísticas', 'subscription' => 'Administración de suscripciones', + 'tags' => 'My labels', //TODO 'unread' => 'Mostar solo no leídos', ), 'share' => 'Compartir', 'tag' => array( - 'related' => 'Etiquetas relacionadas', + 'related' => 'Etiquetas relacionadas', //TODO ), ); diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php index 52b2f7e0d..01239770b 100644 --- a/app/i18n/fr/conf.php +++ b/app/i18n/fr/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Ligne du bas', 'entry' => 'Icônes d’article', 'publication_date' => 'Date de publication', - 'related_tags' => 'Tags associés', + 'related_tags' => 'Tags de l’article', 'sharing' => 'Partage', 'top_line' => 'Ligne du haut', ), diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php index bb0d14faf..c9595e449 100644 --- a/app/i18n/fr/index.php +++ b/app/i18n/fr/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'Rapports de bugs', 'credits' => 'Crédits', 'credits_content' => 'Des éléments de design sont issus du projet Bootstrap bien que FreshRSS n’utilise pas ce framework. Les icônes sont issues du projet GNOME. La police Open Sans utilisée a été créée par Steve Matteson. FreshRSS repose sur Minz, un framework PHP.', - 'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de Kriss Feed ou Leed. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.', + 'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de Kriss Feed ou Leed. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.', 'github' => 'sur Github', 'license' => 'Licence', 'project_website' => 'Site du projet', @@ -53,10 +53,11 @@ return array( 'starred' => 'Afficher les favoris', 'stats' => 'Statistiques', 'subscription' => 'Gestion des abonnements', + 'tags' => 'Mes étiquettes', 'unread' => 'Afficher les non-lus', ), 'share' => 'Partager', 'tag' => array( - 'related' => 'Tags associés', + 'related' => 'Tags de l’article', ), ); diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php index a682461a6..2ab8aefa9 100644 --- a/app/i18n/he/conf.php +++ b/app/i18n/he/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'שורה תחתונה', 'entry' => 'סמלילי מאמרים', 'publication_date' => 'תאריך הפרסום', - 'related_tags' => 'תגיות קשורות', + 'related_tags' => 'תגיות קשורות', //TODO 'sharing' => 'שיתוף', 'top_line' => 'שורה עליונה', ), diff --git a/app/i18n/he/index.php b/app/i18n/he/index.php index 8ca6e76f7..d33c09b08 100644 --- a/app/i18n/he/index.php +++ b/app/i18n/he/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'דיווח באגים', 'credits' => 'קרדיטים', 'credits_content' => 'מאפייני עיצוב מסויימים הגיעו מ Bootstrap אף על פי ש FreshRSS אינו משתמש בתשתית הזו. סמלילים הגיעו מ פרוייקט GNOME . Open Sans הגופן police נוצר על ידי Steve Matteson. Favicons נאספים בעזרת getFavicon API. FreshRSS מבוסס על Minz, תשתית PHP.', - 'freshrss_description' => 'FreshRSS הוא קורא RSS לאחסון עצמי בדומה ל Kriss Feed או Leed. אינו צורך משאבים רבים, וקל לתפעול אך בו בזמן חזק וניתן להתאמה.', + 'freshrss_description' => 'FreshRSS הוא קורא RSS לאחסון עצמי בדומה ל Kriss Feed או Leed. אינו צורך משאבים רבים, וקל לתפעול אך בו בזמן חזק וניתן להתאמה.', 'github' => 'בגיטהאב', 'license' => 'רישיון', 'project_website' => 'אתר', @@ -53,10 +53,11 @@ return array( 'starred' => 'הצגת מועדפים בלבד', 'stats' => 'סטטיסטיקות', 'subscription' => 'ניהול הרשמות', + 'tags' => 'My labels', //TODO 'unread' => 'הצגת מאמרים שלא נקראו בלבד', ), 'share' => 'שיתוף', 'tag' => array( - 'related' => 'תגיות קשורות', + 'related' => 'תגיות קשורות', //TODO ), ); diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php index 65b979c51..83beb2df5 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', + 'related_tags' => 'Tags correlati', //TODO 'sharing' => 'Condivisione', 'top_line' => 'Barra in alto', ), diff --git a/app/i18n/it/index.php b/app/i18n/it/index.php index 718093327..909db1440 100644 --- a/app/i18n/it/index.php +++ b/app/i18n/it/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'Bugs', 'credits' => 'Crediti', 'credits_content' => 'Alcuni elementi di design provengono da Bootstrap sebbene FreshRSS non usi questo framework. Le icone provengono dal progetto GNOME. Il carattere Open Sans è stato creato da Steve Matteson. FreshRSS è basato su Minz, un framework PHP.', - 'freshrss_description' => 'FreshRSS è un aggregatore di feeds RSS da installare sul proprio host come Kriss Feed o Leed. Leggero e facile da mantenere pur essendo molto configurabile e potente.', + 'freshrss_description' => 'FreshRSS è un aggregatore di feeds RSS da installare sul proprio host come Kriss Feed o Leed. Leggero e facile da mantenere pur essendo molto configurabile e potente.', 'github' => 'su Github', 'license' => 'Licenza', 'project_website' => 'Sito del progetto', @@ -53,10 +53,11 @@ return array( 'starred' => 'Mostra solo preferiti', 'stats' => 'Statistiche', 'subscription' => 'Gestione sottoscrizioni', + 'tags' => 'My labels', //TODO 'unread' => 'Mostra solo non letti', ), 'share' => 'Condividi', 'tag' => array( - 'related' => 'Tags correlati', + 'related' => 'Tags correlati', //TODO ), ); diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php index f618d6c96..f26e2cf09 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' => '관련 태그', + 'related_tags' => '관련 태그', //TODO 'sharing' => '공유', 'top_line' => '상단', ), diff --git a/app/i18n/kr/index.php b/app/i18n/kr/index.php index cb9684dff..87cc12eca 100644 --- a/app/i18n/kr/index.php +++ b/app/i18n/kr/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => '버그 제보하기', 'credits' => '크레딧', 'credits_content' => 'FreshRSS는 Bootstrap 프레임워크를 사용하진 않지만, 일부 디자인 요소를 가져왔습니다. 아이콘들은 GNOME 프로젝트에서 가져왔습니다. Open Sans 글꼴은 Steve Matteson가 제작하였습니다. FreshRSS는 PHP 프레임워크인 Minz에 기반하고 있습니다.', - 'freshrss_description' => 'FreshRSS는 Kriss Feed 또는 Leed와 같은 셀프 호스팅 기반의 RSS 피드 수집기입니다. FreshRSS는 강력하고 다양한 설정을 할 수 있으면서 도 가볍고 사용하기 쉽습니다.', + 'freshrss_description' => 'FreshRSS는 Kriss Feed 또는 Leed와 같은 셀프 호스팅 기반의 RSS 피드 수집기입니다. FreshRSS는 강력하고 다양한 설정을 할 수 있으면서 도 가볍고 사용하기 쉽습니다.', 'github' => 'Github 저장소에 제보', 'license' => '라이센스', 'project_website' => '프로젝트 웹사이트', @@ -53,10 +53,11 @@ return array( 'starred' => '즐겨찾기만 표시', 'stats' => '통계', 'subscription' => '구독 관리', + 'tags' => 'My labels', //TODO 'unread' => '읽지 않은 글만 표시', ), 'share' => '공유', 'tag' => array( - 'related' => '관련 태그', + 'related' => '관련 태그', //TODO ), ); diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php index 041b482b9..883d932ab 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', + 'related_tags' => 'Gerelateerde labels', //TODO 'sharing' => 'Delen', 'top_line' => 'Bovenaan', ), diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php index 67b3886ea..33fec43c0 100644 --- a/app/i18n/nl/index.php +++ b/app/i18n/nl/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'Rapporteer fouten', 'credits' => 'Waarderingen', 'credits_content' => 'Sommige ontwerp elementen komen van Bootstrap alhoewel FreshRSS dit raamwerk niet gebruikt. Pictogrammen komen van het GNOME project. De Open Sans font police is gemaakt door Steve Matteson. FreshRSS is gebaseerd op Minz, een PHP raamwerk. Nederlandse vertaling door Wanabo, NieuwsKop.be. Link naar de Nederlandse vertaling, FreshRSS-Dutch-translation.', - 'freshrss_description' => 'FreshRSS is een RSS feed aggregator om zelf te hosten zoals Kriss Feed of Leed. Het gebruikt weinig systeembronnen en is makkelijk te administreren terwijl het een krachtig en makkelijk te configureren programma is.', + 'freshrss_description' => 'FreshRSS is een RSS feed aggregator om zelf te hosten zoals Kriss Feed of Leed. Het gebruikt weinig systeembronnen en is makkelijk te administreren terwijl het een krachtig en makkelijk te configureren programma is.', 'github' => 'op Github', 'license' => 'License', 'project_website' => 'Project website', @@ -57,6 +57,6 @@ return array( ), 'share' => 'Delen', 'tag' => array( - 'related' => 'Verwante labels', + 'related' => 'Verwante labels', //TODO ), ); diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php index 61a12160c..2547a8624 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', + 'related_tags' => 'Tags relacionadas', //TODO 'sharing' => 'Compartilhar', 'top_line' => 'Linha superior', ), diff --git a/app/i18n/pt-br/index.php b/app/i18n/pt-br/index.php index 2eff8d948..9f98902ed 100644 --- a/app/i18n/pt-br/index.php +++ b/app/i18n/pt-br/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'Reportar Bugs', 'credits' => 'Créditos', 'credits_content' => 'Alguns elementos de design vieram do Bootstrap Embora FreshRRS não utiliza este framework. Ícones vieram do GNOME project. Open Sans font police foi criada por Steve Matteson. FreshRSS é baseado no Minz, um framework PHP.', - 'freshrss_description' => 'FreshRSS é um RSS feeds aggregator para um host próprio como o Kriss Feed ou Leed. É leve e fácil de utilizar enquanto é uma ferramenta poderosa e configurável. ', + 'freshrss_description' => 'FreshRSS é um RSS feeds aggregator para um host próprio como o Kriss Feed ou Leed. É leve e fácil de utilizar enquanto é uma ferramenta poderosa e configurável. ', 'github' => 'no Github', 'license' => 'licença', 'project_website' => 'Site do projeto', @@ -57,6 +57,6 @@ return array( ), 'share' => 'Compartilhar', 'tag' => array( - 'related' => 'Tags relacionadas', + 'related' => 'Tags relacionadas', //TODO ), ); diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php index 90a1a6797..b9d45fb20 100644 --- a/app/i18n/ru/conf.php +++ b/app/i18n/ru/conf.php @@ -19,7 +19,7 @@ return array( 'bottom_line' => 'Bottom line', 'entry' => 'Article icons', 'publication_date' => 'Date of publication', - 'related_tags' => 'Related tags', + 'related_tags' => 'Related tags', //TODO 'sharing' => 'Sharing', 'top_line' => 'Top line', ), diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php index 9bb327786..aaf25a3ab 100644 --- a/app/i18n/ru/index.php +++ b/app/i18n/ru/index.php @@ -7,7 +7,7 @@ return array( '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.', + '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', @@ -57,6 +57,6 @@ return array( ), 'share' => 'Share', 'tag' => array( - 'related' => 'Related tags', + 'related' => 'Article tags', //TODO ), ); diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php index cae1e4cac..49533bb6a 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', + 'related_tags' => 'İlgili etiketler', //TODO 'sharing' => 'Paylaşım', 'top_line' => 'Üst çizgi', ), diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php index 1357c05e7..e7db73b96 100644 --- a/app/i18n/tr/index.php +++ b/app/i18n/tr/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'Hata raporu', 'credits' => 'Tanıtım', 'credits_content' => 'Bu frameworkü kullanmamasına rağmen FreshRSS bazı tasarım ögelerini Bootstrap dan almıştır. İkonlar GNOME projesinden alınmıştır. Open Sans yazı tipi Steve Matteson tarafından oluşturulmuştur. FreshRSS bir PHP framework olan Minz i temel alır.', - 'freshrss_description' => 'FreshRSS Kriss Feed veya Leed gibi kendi hostunuzda çalışan bir RSS akış toplayıcısıdır. Güçlü ve yapılandırılabilir araçlarıyla basit ve kullanımı kolay bir uygulamadır.', + 'freshrss_description' => 'FreshRSS Kriss Feed veya Leed gibi kendi hostunuzda çalışan bir RSS akış toplayıcısıdır. Güçlü ve yapılandırılabilir araçlarıyla basit ve kullanımı kolay bir uygulamadır.', 'github' => 'Github sayfası', 'license' => 'Lisans', 'project_website' => 'Proje sayfası', @@ -53,10 +53,11 @@ return array( 'starred' => 'Favorileri göster', 'stats' => 'İstatistikler', 'subscription' => 'Abonelik yönetimi', + 'tags' => 'My labels', //TODO 'unread' => 'Okunmamışları göster', ), 'share' => 'Share', 'tag' => array( - 'related' => 'İlgili etiketler', + 'related' => 'İlgili etiketler', //TODO ), ); diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php index 00bea4d79..6c62349c2 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' => '相关标签', + 'related_tags' => '相关标签', //TODO 'sharing' => '分享', 'top_line' => '顶栏', ), diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php index 2b76961ef..dd8eafda7 100644 --- a/app/i18n/zh-cn/index.php +++ b/app/i18n/zh-cn/index.php @@ -7,7 +7,7 @@ return array( 'bugs_reports' => 'Bug 报告', 'credits' => '致谢', 'credits_content' => '某些设计元素来自于 Bootstrap ，尽管 FreshRSS 并没有使用此框架。图标 来自于 GNOME 项目。Open Sans 字体出自 Steve Matteson 之手。FreshRSS 基于 PHP 框架 Minz。', - 'freshrss_description' => 'FreshRSS 是一个自托管的 RSS 聚合服务，类似于 Kriss Feed 或 Leed。 它不仅轻快又易用，而且强大又易于配置。', + 'freshrss_description' => 'FreshRSS 是一个自托管的 RSS 聚合服务，类似于 Kriss Feed 或 Leed。 它不仅轻快又易用，而且强大又易于配置。', 'github' => 'Github Issues', 'license' => '授权', 'project_website' => '项目网站', @@ -53,10 +53,11 @@ return array( 'starred' => '显示收藏', 'stats' => '统计', 'subscription' => '订阅管理', + 'tags' => 'My labels', //TODO 'unread' => '显示未读', ), 'share' => '分享', 'tag' => array( - 'related' => '相关标签', + 'related' => '相关标签', //TODO ), ); -- cgit v1.2.3