diff options
56 files changed, 109 insertions, 109 deletions
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php index 8cf0d2b27..c62e37697 100644 --- a/app/i18n/cz/admin.php +++ b/app/i18n/cz/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stabilní vydání (“latest”)', ), 'title' => 'Aktualizovat systém', - 'viaGit' => 'Aktualizace přes git a Github.com začala', + 'viaGit' => 'Aktualizace přes git a GitHub.com začala', ), 'user' => array( 'admin' => 'Administrátor', diff --git a/app/i18n/cz/index.php b/app/i18n/cz/index.php index 1f31ca419..9a1f279e3 100644 --- a/app/i18n/cz/index.php +++ b/app/i18n/cz/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Některé designové prvky pocházejí z <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, FreshRSS ale tuto platformu nevyužívá. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Ikony</a> pocházejí z <a href="https://www.gnome.org/">projektu GNOME</a>. Písmo <em>Open Sans</em> vytvořil <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS je založeno na PHP framework <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>.', 'documentation' => 'Dokumentace', 'freshrss_description' => 'FreshRSS je čtečka kanálů RSS určená k provozu na vlastním serveru. Je to nenáročný a jednoduchý, zároveň ale mocný a konfigurovatelný nástroj.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na GitHub</a>', 'license' => 'Licence', 'project_website' => 'Webová stránka projektu', 'title' => 'O aplikaci', diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php index ce2399f44..314be6ef7 100644 --- a/app/i18n/de/admin.php +++ b/app/i18n/de/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stabile Version (“latest”)', ), 'title' => 'System aktualisieren', - 'viaGit' => 'Update über git und Github.com gestartet', + 'viaGit' => 'Update über git und GitHub.com gestartet', ), 'user' => array( 'admin' => 'Administrator', // IGNORE diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php index 7d6367280..27d7508b4 100644 --- a/app/i18n/de/index.php +++ b/app/i18n/de/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Einige Designelemente stammen von <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, obwohl FreshRSS dieses Framework nicht nutzt. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Icons</a> stammen vom <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> Font wurde von <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> erstellt. FreshRSS basiert auf <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, einem PHP-Framework.', 'documentation' => 'Handbuch', 'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">auf Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">auf GitHub</a>', 'license' => 'Lizenz', 'project_website' => 'Projekt-Website', 'title' => 'Über', diff --git a/app/i18n/el/admin.php b/app/i18n/el/admin.php index 7c561b94b..0c5f490e5 100644 --- a/app/i18n/el/admin.php +++ b/app/i18n/el/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stable release (“latest”)', // TODO ), 'title' => 'Ενημέρωση συστήματος', - 'viaGit' => 'Update via git and Github.com started', // TODO + 'viaGit' => 'Update via git and GitHub.com started', // TODO ), 'user' => array( 'admin' => 'Διαχειριστής', diff --git a/app/i18n/el/index.php b/app/i18n/el/index.php index acee104e3..d8b12a8d0 100644 --- a/app/i18n/el/index.php +++ b/app/i18n/el/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Icons</a> come from the <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, a PHP framework.', // TODO 'documentation' => 'Documentation', // TODO 'freshrss_description' => 'FreshRSS is a self-hostable RSS aggregator and reader. It allows you to read and follow several news websites at a glance without the need to browse from one website to another. FreshRSS is lightweight, configurable, and easy to use.', // TODO - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>', // TODO + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on GitHub</a>', // TODO 'license' => 'License', // TODO 'project_website' => 'Project website', // TODO 'title' => 'About', // TODO diff --git a/app/i18n/en-us/admin.php b/app/i18n/en-us/admin.php index 5d57df310..9671b71d3 100644 --- a/app/i18n/en-us/admin.php +++ b/app/i18n/en-us/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stable release (“latest”)', // IGNORE ), 'title' => 'Update system', // IGNORE - 'viaGit' => 'Update via git and Github.com started', // IGNORE + 'viaGit' => 'Update via git and GitHub.com started', // IGNORE ), 'user' => array( 'admin' => 'Administrator', // IGNORE diff --git a/app/i18n/en-us/index.php b/app/i18n/en-us/index.php index 2496fb159..15f37ecba 100644 --- a/app/i18n/en-us/index.php +++ b/app/i18n/en-us/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Icons</a> come from the <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, a PHP framework.', // IGNORE 'documentation' => 'Documentation', // IGNORE 'freshrss_description' => 'FreshRSS is a self-hostable RSS aggregator and reader. It allows you to read and follow several news websites at a glance without the need to browse from one website to another. FreshRSS is lightweight, configurable, and easy to use.', // IGNORE - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>', // IGNORE + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on GitHub</a>', // IGNORE 'license' => 'License', // IGNORE 'project_website' => 'Project website', // IGNORE 'title' => 'About', // IGNORE diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php index 4ce82a3ff..97989f1ef 100644 --- a/app/i18n/en/admin.php +++ b/app/i18n/en/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stable release (“latest”)', ), 'title' => 'Update FreshRSS', - 'viaGit' => 'Update via git and Github.com started', + 'viaGit' => 'Update via git and GitHub.com started', ), 'user' => array( 'admin' => 'Administrator', diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php index ac72b983d..5c4906469 100644 --- a/app/i18n/en/index.php +++ b/app/i18n/en/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Icons</a> come from the <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, a PHP framework.', 'documentation' => 'Documentation', 'freshrss_description' => 'FreshRSS is a self-hostable RSS aggregator and reader. It allows you to read and follow several news websites at a glance without the need to browse from one website to another. FreshRSS is lightweight, configurable, and easy to use.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on GitHub</a>', 'license' => 'License', 'project_website' => 'Project website', 'title' => 'About', diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php index 2c83bf76d..6a13ae549 100644 --- a/app/i18n/es/admin.php +++ b/app/i18n/es/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stable release (“latest”)', // TODO ), 'title' => 'Actualizar sistema', - 'viaGit' => 'Update via git and Github.com started', // TODO + 'viaGit' => 'Update via git and GitHub.com started', // TODO ), 'user' => array( 'admin' => 'Administrador', diff --git a/app/i18n/es/index.php b/app/i18n/es/index.php index c27809389..027743e0c 100644 --- a/app/i18n/es/index.php +++ b/app/i18n/es/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Aunque FreshRSS no usa ese entorno, algunos elementos del diseño están obtenidos de <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>. Los <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Iconos</a> han sido obtenidos del <a href="https://www.gnome.org/">proyecto GNOME</a>. La fuente <em>Open Sans</em> es una creación de <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS usa el entorno PHP <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>.', 'documentation' => 'Documentacion', 'freshrss_description' => 'FreshRSS es un agregador de fuentes RSS de alojamiento privado. Es una herramienta potente, pero ligera y fácil de usar y configurar.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">en Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">en GitHub</a>', 'license' => 'Licencia', 'project_website' => 'Web del proyecto', 'title' => 'Acerca de', diff --git a/app/i18n/fa/admin.php b/app/i18n/fa/admin.php index 7bc62eee8..6c6f6cd3c 100644 --- a/app/i18n/fa/admin.php +++ b/app/i18n/fa/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => ' انتشار پایدار ("آخرین")', ), 'title' => ' FreshRSS را به روز کنید', - 'viaGit' => ' به روز رسانی از طریق git و Github.com شروع شد', + 'viaGit' => ' به روز رسانی از طریق git و GitHub.com شروع شد', ), 'user' => array( 'admin' => ' مدیر', diff --git a/app/i18n/fa/index.php b/app/i18n/fa/index.php index 310cf02fa..2dba7fbb2 100644 --- a/app/i18n/fa/index.php +++ b/app/i18n/fa/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => ' برخی از عناصر طراحی از <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> می آیند', 'documentation' => ' اسناد و مدارک', 'freshrss_description' => ' FreshRSS یک جمع کننده و خواننده RSS خود میزبان است. این به شما امکان می دهد بدون نیاز به مرور از یک وب سایت به وب سایت دیگر', - 'github' => ' <a href="https://github.com/FreshRSS/FreshRSS/issues">در Github</a>', + 'github' => ' <a href="https://github.com/FreshRSS/FreshRSS/issues">در GitHub</a>', 'license' => ' مجوز', 'project_website' => ' وب سایت پروژه', 'title' => ' در مورد', diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php index 4e8ddca53..29b1142c3 100644 --- a/app/i18n/fr/admin.php +++ b/app/i18n/fr/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Publication stable (“latest”)', ), 'title' => 'Système de mise à jour', - 'viaGit' => 'Mise à jour via git et Github.com démarrée', + 'viaGit' => 'Mise à jour via git et GitHub.com démarrée', ), 'user' => array( 'admin' => 'Administrateur', diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php index 76631edc7..dd4b51fe2 100644 --- a/app/i18n/fr/index.php +++ b/app/i18n/fr/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS repose sur <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, un framework PHP.', 'documentation' => 'Documentation', // IGNORE 'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">sur Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">sur GitHub</a>', 'license' => 'Licence', 'project_website' => 'Site du projet', 'title' => 'À propos', diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php index 068b22fec..37694ca22 100644 --- a/app/i18n/he/admin.php +++ b/app/i18n/he/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stable release (“latest”)', // TODO ), 'title' => 'מערכת העדכון', - 'viaGit' => 'Update via git and Github.com started', // TODO + 'viaGit' => 'Update via git and GitHub.com started', // TODO ), 'user' => array( 'admin' => 'Administrator', // TODO diff --git a/app/i18n/id/admin.php b/app/i18n/id/admin.php index 5c6c20fd5..d07c19d5d 100644 --- a/app/i18n/id/admin.php +++ b/app/i18n/id/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stable release (“latest”)', // TODO ), 'title' => 'Perbarui Sistem', - 'viaGit' => 'Update via git and Github.com started', // TODO + 'viaGit' => 'Update via git and GitHub.com started', // TODO ), 'user' => array( 'admin' => 'Administrator', // TODO diff --git a/app/i18n/id/index.php b/app/i18n/id/index.php index 2bb9d2d3d..390673ddc 100644 --- a/app/i18n/id/index.php +++ b/app/i18n/id/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Icons</a> come from the <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, a PHP framework.', // TODO 'documentation' => 'Documentation', // TODO 'freshrss_description' => 'FreshRSS is a self-hostable RSS aggregator and reader. It allows you to read and follow several news websites at a glance without the need to browse from one website to another. FreshRSS is lightweight, configurable, and easy to use.', // TODO - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>', // TODO + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on GitHub</a>', // TODO 'license' => 'License', // TODO 'project_website' => 'Project website', // TODO 'title' => 'About', // TODO diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php index 1cdd51c2f..2c2b22456 100644 --- a/app/i18n/it/admin.php +++ b/app/i18n/it/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stabile (“latest”)', ), 'title' => 'Aggiorna sistema', - 'viaGit' => 'Aggiornamento tramite git e Github.com avviato', + 'viaGit' => 'Aggiornamento tramite git e GitHub.com avviato', ), 'user' => array( 'admin' => 'Amministratore', diff --git a/app/i18n/it/index.php b/app/i18n/it/index.php index 08c790a84..14fcd25fa 100644 --- a/app/i18n/it/index.php +++ b/app/i18n/it/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Alcuni elementi di design provengono da <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> sebbene FreshRSS non usi questo framework. Le <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">icone</a> provengono dal progetto <a href="https://www.gnome.org/">GNOME</a>. Il carattere <em>Open Sans</em> è stato creato da <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS è basato su <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, un framework PHP.', 'documentation' => 'Documentazione', 'freshrss_description' => 'FreshRSS è un aggregatore di feeds RSS da installare sul proprio host. Leggero e facile da mantenere pur essendo molto configurabile e potente.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">su Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">su GitHub</a>', 'license' => 'Licenza', 'project_website' => 'Sito del progetto', 'title' => 'Informazioni', diff --git a/app/i18n/ja/admin.php b/app/i18n/ja/admin.php index cdcbb22a6..09fd002c3 100644 --- a/app/i18n/ja/admin.php +++ b/app/i18n/ja/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => '安定版リリース (“latest”)', ), 'title' => 'アップデートシステム', - 'viaGit' => 'gitとGithub.comによるアップデートを開始', + 'viaGit' => 'gitとGitHub.comによるアップデートを開始', ), 'user' => array( 'admin' => '管理者', diff --git a/app/i18n/ja/index.php b/app/i18n/ja/index.php index 10e9c8b5a..92dae4757 100644 --- a/app/i18n/ja/index.php +++ b/app/i18n/ja/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'いくつかのデザイン要素は <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>から来ています。しかしFreshRSSはこのフレームワークを使用していません。 <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">アイコン</a> は <a href="https://www.gnome.org/">GNOME プロジェクトから作られています</a>。 <em>Open Sans</em> フォントは <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson によって作成されました</a>。 FreshRSS は<a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>,PHP フレームワークをもとにしています。', 'documentation' => '文書', 'freshrss_description' => 'FreshRSSは なセルフホストできるRSSフィード収集ツールです。強力なツールになっており、軽量で簡単に使え、豊富な設定が特徴です。', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Githubへお願いします</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">GitHubへお願いします</a>', 'license' => 'ライセンス', 'project_website' => 'プロジェクトのwebサイト', 'title' => 'FreshRSSについて', diff --git a/app/i18n/ko/admin.php b/app/i18n/ko/admin.php index 546eb88c3..06076af7a 100644 --- a/app/i18n/ko/admin.php +++ b/app/i18n/ko/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => '안정 릴리즈 (“latest”)', ), 'title' => '업데이트', - 'viaGit' => 'Git 및 Github.com을 통한 업데이트 시작 됨', + 'viaGit' => 'Git 및 GitHub.com을 통한 업데이트 시작 됨', ), 'user' => array( 'admin' => '관리자', diff --git a/app/i18n/ko/index.php b/app/i18n/ko/index.php index 7d9af2d21..095f9ad08 100644 --- a/app/i18n/ko/index.php +++ b/app/i18n/ko/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'FreshRSS는 <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> 프레임워크를 사용하진 않지만, 일부 디자인 요소를 가져왔습니다. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">아이콘들</a>은 <a href="https://www.gnome.org/">GNOME 프로젝트</a>에서 가져왔습니다. <em>Open Sans</em> 글꼴은 <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>가 제작하였습니다. FreshRSS는 PHP 프레임워크인 <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>에 기반하고 있습니다.', 'documentation' => '문서', 'freshrss_description' => 'FreshRSS는 같은 셀프 호스팅 기반의 RSS 피드 수집기입니다. FreshRSS는 강력하고 다양한 설정을 할 수 있으면서도 가볍고 사용하기 쉽습니다.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github 저장소에 제보</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">GitHub 저장소에 제보</a>', 'license' => '라이센스', 'project_website' => '프로젝트 웹사이트', 'title' => '정보', diff --git a/app/i18n/lv/admin.php b/app/i18n/lv/admin.php index e13846254..b2d9b8a3f 100644 --- a/app/i18n/lv/admin.php +++ b/app/i18n/lv/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stable release (“latest”)', // TODO ), 'title' => 'Atjaunināt sistēmu', - 'viaGit' => 'Update via git and Github.com started', // TODO + 'viaGit' => 'Update via git and GitHub.com started', // TODO ), 'user' => array( 'admin' => 'Administrators', diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php index f588bb615..daeabdfdc 100644 --- a/app/i18n/nl/admin.php +++ b/app/i18n/nl/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stabiele release (“latest”)', ), 'title' => 'Vernieuw systeem', - 'viaGit' => 'Update via git and Github.com gestart', + 'viaGit' => 'Update via git and GitHub.com gestart', ), 'user' => array( 'admin' => 'Beheerder', diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php index 024f8da53..e7f3a1f29 100644 --- a/app/i18n/nl/index.php +++ b/app/i18n/nl/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Sommige ontwerp elementen komen van <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> alhoewel FreshRSS dit raamwerk niet gebruikt. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Pictogrammen</a> komen van het <a href="https://www.gnome.org/">GNOME project</a>. <em>De Open Sans</em> font police is gemaakt door <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is gebaseerd op <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, een PHP raamwerk. Nederlandse vertaling door Wanabo, <a href="http://www.nieuwskop.be" title="NieuwsKop">NieuwsKop.be</a>. Link naar de Nederlandse vertaling, <a href="https://github.com/Wanabo/FreshRSS-Dutch-translation/tree/master">FreshRSS-Dutch-translation</a>.', 'documentation' => 'Documentatie', 'freshrss_description' => 'FreshRSS is een RSS-feed aggregator om zelf te hosten. Het gebruikt weinig systeembronnen en is makkelijk te beheren terwijl het een krachtig en makkelijk te configureren programma is.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">op Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">op GitHub</a>', 'license' => 'Licentie', 'project_website' => 'Projectwebsite', 'title' => 'Over', diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php index a98acbd58..9cbd2a9ab 100644 --- a/app/i18n/oc/admin.php +++ b/app/i18n/oc/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stable release (“latest”)', // TODO ), 'title' => 'Sistèma de mesa a jorn', - 'viaGit' => 'Update via git and Github.com started', // TODO + 'viaGit' => 'Update via git and GitHub.com started', // TODO ), 'user' => array( 'admin' => 'Administrator', // IGNORE diff --git a/app/i18n/oc/index.php b/app/i18n/oc/index.php index ef37cb177..2d3a0554e 100644 --- a/app/i18n/oc/index.php +++ b/app/i18n/oc/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Unes elements de l’estil venon del <a href="http://twitter.github.io/bootstrap/">projècte Bootstrap</a> encara que FreshRSS utilize pas aqueste framework. Las <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">icònas</a> venon del <a href="https://www.gnome.org/">projècte GNOME</a>. La polissa <em>Open Sans</em> utilizada foguèt creada per en <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS es basat sus <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, un framework PHP.', 'documentation' => 'Documentation', // TODO 'freshrss_description' => 'FreshRSS es un agregador de fluxes RSS per l’auto-albergar tal. Sa tòca es d’èsser leugièr e de bon utilizar de prima abòrd mas tanben d’èsser potent e parametrable.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">sus Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">sus GitHub</a>', 'license' => 'Licéncia', 'project_website' => 'Site del projècte', 'title' => 'A prepaus', diff --git a/app/i18n/pl/admin.php b/app/i18n/pl/admin.php index 5ee1949f9..c22671a38 100644 --- a/app/i18n/pl/admin.php +++ b/app/i18n/pl/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Wersja stabilna (“latest”)', ), 'title' => 'Aktualizacja', - 'viaGit' => 'Rozpoczęto aktualizację gitem do najnowszej wersji z Githuba', + 'viaGit' => 'Rozpoczęto aktualizację gitem do najnowszej wersji z GitHuba', ), 'user' => array( 'admin' => 'Administrator', // IGNORE diff --git a/app/i18n/pl/index.php b/app/i18n/pl/index.php index 1a2948d58..a9f120ef8 100644 --- a/app/i18n/pl/index.php +++ b/app/i18n/pl/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Niektóre elementy designu pochodzą z <a href="http://twitter.github.io/bootstrap/">Bootstrapa</a>, przy czym FreshRSS nie używa tego frameworku. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Ikony</a> zostały pierwotnie stworzone dla <a href="https://www.gnome.org/">projektu GNOME</a>. Font <em>Open Sans</em> jest autorstwa <a href="https://fonts.google.com/specimen/Open+Sans">Steve’a Mattesona</a>. FreshRSS opiera się na <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, frameworku PHP.', 'documentation' => 'Dokumentacja', 'freshrss_description' => 'FreshRSS jest agregatorem kanałów RSS przeznaczonym do zainstalowania na własnym serwerze. Jest lekki i łatwy do schowania w kieszeni, pozostając przy tym potężnym i konfigurowalnym narzędziem.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na Githubie</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na GitHubie</a>', 'license' => 'Licencja', 'project_website' => 'Strona projektu', 'title' => 'O serwisie', diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php index b1b86361a..eb509b545 100644 --- a/app/i18n/pt-br/admin.php +++ b/app/i18n/pt-br/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Release estável (“latest”)', ), 'title' => 'Sistema de atualização', - 'viaGit' => 'Atualização via git e Github.com iniciada', + 'viaGit' => 'Atualização via git e GitHub.com iniciada', ), 'user' => array( 'admin' => 'Administrador', diff --git a/app/i18n/pt-br/index.php b/app/i18n/pt-br/index.php index 0d3f6a5d7..be420fa29 100644 --- a/app/i18n/pt-br/index.php +++ b/app/i18n/pt-br/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Alguns elementos de design vieram do <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> Embora FreshRRS não utiliza este framework. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Ícones</a> vieram do <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police foi criada por <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS é baseado no <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, um framework PHP.', 'documentation' => 'Documentação', 'freshrss_description' => 'FreshRSS é um RSS feeds aggregator para um host próprio. É leve e fácil de utilizar enquanto é uma ferramenta poderosa e configurável. ', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">no Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">no GitHub</a>', 'license' => 'licença', 'project_website' => 'Site do projeto', 'title' => 'Sobre', diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php index 10ff58ed4..346df2fc4 100644 --- a/app/i18n/ru/admin.php +++ b/app/i18n/ru/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stable release (“latest”)', // TODO ), 'title' => 'Обновить систему', - 'viaGit' => 'Update via git and Github.com started', // TODO + 'viaGit' => 'Update via git and GitHub.com started', // TODO ), 'user' => array( 'admin' => 'Администратор', diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php index 2bf6802de..14791b76e 100644 --- a/app/i18n/ru/index.php +++ b/app/i18n/ru/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Некоторые элементы дизайна взяты из <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, хотя FreshRSS не использует этот фреймворк. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Иконки</a> взяты из <a href="https://www.gnome.org/">проекта GNOME</a>. Шрифт <em>Open Sans</em> создан <a href="https://fonts.google.com/specimen/Open+Sans">Стивом Мэттесоном</a>. FreshRSS основан на <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, PHP-фреймворке.', 'documentation' => 'Документация', 'freshrss_description' => 'FreshRSS — агрегатор RSS-лент для размещения на своём сервере. Лёгкий и простой в использовании, будучи при этом мощным и настраиваемым инструментом.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">в Github</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">в GitHub</a>', 'license' => 'Лицензия', 'project_website' => 'Сайт проекта', 'title' => 'О проекте', diff --git a/app/i18n/sk/admin.php b/app/i18n/sk/admin.php index 1f6e6e236..98860b971 100644 --- a/app/i18n/sk/admin.php +++ b/app/i18n/sk/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stabilná verzia (“latest”)', ), 'title' => 'Aktualizácia systému', - 'viaGit' => 'Začala sa aktualizácia prostredníctvom git a Github.com', + 'viaGit' => 'Začala sa aktualizácia prostredníctvom git a GitHub.com', ), 'user' => array( 'admin' => 'Administrátor', diff --git a/app/i18n/sk/index.php b/app/i18n/sk/index.php index 357e71492..0f566ea7e 100644 --- a/app/i18n/sk/index.php +++ b/app/i18n/sk/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Niektoré časti vzhľadu pochádzajú z <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>u, aj keď FreshRSS tento framework nepoužíva. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">Ikony</a> sú z <a href="https://www.gnome.org/">GNOME project</a>. Font <em>Open Sans</em> zabezpečil <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS je založený na PHP frameworku <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>.', 'documentation' => 'Dokumentácia', 'freshrss_description' => 'FreshRSS je čítačka RSS kanálov, ktorú môžete nasadiť na vlastný server. Ide o jednoduchý a zároveň dobre nastaviteľný nástroj.', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na Github</a>e', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na GitHub</a>e', 'license' => 'Licencia', 'project_website' => 'Webová stránka projektu', 'title' => 'O FreshRSS', diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php index c622ab9c0..fc3d3edda 100644 --- a/app/i18n/tr/admin.php +++ b/app/i18n/tr/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => 'Stabil sürüm (“latest”)', ), 'title' => 'Sistem güncelleme', - 'viaGit' => 'git ve Github.com ile gğncelleme başladı', + 'viaGit' => 'git ve GitHub.com ile gğncelleme başladı', ), 'user' => array( 'admin' => 'Yönetici', diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php index 3ec6b0d36..34171b183 100644 --- a/app/i18n/tr/index.php +++ b/app/i18n/tr/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => 'Bu frameworkü kullanmamasına rağmen FreshRSS bazı tasarım ögelerini <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> dan almıştır. <a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">İkonlar</a> <a href="https://www.gnome.org/">GNOME projesinden</a> alınmıştır. <em>Open Sans</em> yazı tipi <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> tarafından oluşturulmuştur. FreshRSS bir PHP framework olan <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a> i temel alır.', 'documentation' => 'Dökümantasyon', 'freshrss_description' => 'FreshRSS 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' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github sayfası</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">GitHub sayfası</a>', 'license' => 'Lisans', 'project_website' => 'Proje sayfası', 'title' => 'Hakkında', diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php index e3803574b..dca56f65f 100644 --- a/app/i18n/zh-cn/admin.php +++ b/app/i18n/zh-cn/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => '稳定版本 (“latest”)', ), 'title' => '更新系统', - 'viaGit' => '开始通过 git and Github.com 更新', + 'viaGit' => '开始通过 git and GitHub.com 更新', ), 'user' => array( 'admin' => '管理员', diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php index 4055b2978..3ee6d82e6 100644 --- a/app/i18n/zh-cn/index.php +++ b/app/i18n/zh-cn/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => '某些设计元素来自于 <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> ，尽管 FreshRSS 并没有使用此框架。<a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">图标</a> 来自于 <a href="https://www.gnome.org/">GNOME 项目</a>。<em>Open Sans</em> 字体出自 <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> 之手。FreshRSS 基于 PHP 框架 <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>。', 'documentation' => '文档', 'freshrss_description' => 'FreshRSS 是一个自托管的 RSS 聚合服务。 它不仅轻快易用，并且强大又易于配置。', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github Issues</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">GitHub Issues</a>', 'license' => '授权', 'project_website' => '项目网站', 'title' => '关于', diff --git a/app/i18n/zh-tw/admin.php b/app/i18n/zh-tw/admin.php index ddef0641e..3d4589424 100644 --- a/app/i18n/zh-tw/admin.php +++ b/app/i18n/zh-tw/admin.php @@ -213,7 +213,7 @@ return array( 'latest' => '穩定式發佈(“latest”)', ), 'title' => '系統更新', - 'viaGit' => '從git並由Github.com開始', + 'viaGit' => '從git並由GitHub.com開始', ), 'user' => array( 'admin' => '管理員', diff --git a/app/i18n/zh-tw/index.php b/app/i18n/zh-tw/index.php index a21d4ded6..a0bf58886 100644 --- a/app/i18n/zh-tw/index.php +++ b/app/i18n/zh-tw/index.php @@ -19,7 +19,7 @@ return array( 'credits_content' => '某些設計元素來自於 <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> ，盡管 FreshRSS 並沒有使用此框架。<a href="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic">圖標</a> 來自於 <a href="https://www.gnome.org/">GNOME 項目</a>。<em>Open Sans</em> 字體出自 <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> 之手。FreshRSS 基於 PHP 框架 <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>。', 'documentation' => 'Documentation', // TODO 'freshrss_description' => 'FreshRSS 是一個自托管的 RSS 聚合服務。 它不僅輕快又易用，而且強大又易於配置。', - 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github Issues</a>', + 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">GitHub Issues</a>', 'license' => '授權', 'project_website' => '項目網站', 'title' => '關於', diff --git a/docs/en/admins/02_Prerequisites.md b/docs/en/admins/02_Prerequisites.md index 490ff31c3..6902a97e7 100644 --- a/docs/en/admins/02_Prerequisites.md +++ b/docs/en/admins/02_Prerequisites.md @@ -32,6 +32,6 @@ It could happen that we make two releases in a short span of time if we have a r As its name suggests, the development version is the working codebase, intended for developers. **This release may be unstable!** -If you want to keep track of the most recent enhancements or help the developers with bug reports, this is the branch for you. If you use this version, please keep in mind that you need to follow the branch activity on Github (via [the branch RSS feed](https://github.com/FreshRSS/FreshRSS/commits/edge.atom), for instance), and manually pull new commits. +If you want to keep track of the most recent enhancements or help the developers with bug reports, this is the branch for you. If you use this version, please keep in mind that you need to follow the branch activity on GitHub (via [the branch RSS feed](https://github.com/FreshRSS/FreshRSS/commits/edge.atom), for instance), and manually pull new commits. Some say that the main developers use this branch on a daily basis without problem. They may know what they are doing… diff --git a/docs/en/developers/01_Index.md b/docs/en/developers/01_Index.md index c3787377a..0e59b8c12 100644 --- a/docs/en/developers/01_Index.md +++ b/docs/en/developers/01_Index.md @@ -6,7 +6,7 @@ Start by creating your development environment. A guide to setting up FreshRSS ## After That -* [Github Branching and Pushing](02_Github.md) +* [GitHub Branching and Pushing](02_GitHub.md) * [Running tests](03_Running_tests.md) * [Creating a pull request](04_Pull_requests.md) * [Releasing a new version](05_Release_new_version.md) diff --git a/docs/en/developers/02_Github.md b/docs/en/developers/02_GitHub.md index 066d6ffb0..066d6ffb0 100644 --- a/docs/en/developers/02_Github.md +++ b/docs/en/developers/02_GitHub.md diff --git a/docs/en/developers/03_Backend/05_Extensions.md b/docs/en/developers/03_Backend/05_Extensions.md index 602625cf8..164a309ed 100644 --- a/docs/en/developers/03_Backend/05_Extensions.md +++ b/docs/en/developers/03_Backend/05_Extensions.md @@ -2,7 +2,7 @@ ## About FreshRSS -FreshRSS is an RSS / Atom feed aggregator written in PHP dating back to October 2012. The official site is located at [freshrss.org](https://freshrss.org) and the official repository is hosted on Github: [github.com/FreshRSS/FreshRSS](https://github.com/FreshRSS/FreshRSS). +FreshRSS is an RSS / Atom feed aggregator written in PHP dating back to October 2012. The official site is located at [freshrss.org](https://freshrss.org) and the official repository is hosted on GitHub: [github.com/FreshRSS/FreshRSS](https://github.com/FreshRSS/FreshRSS). ## The problem diff --git a/docs/en/users/07_Frequently_Asked_Questions.md b/docs/en/users/07_Frequently_Asked_Questions.md index 548762510..4e10a5eca 100644 --- a/docs/en/users/07_Frequently_Asked_Questions.md +++ b/docs/en/users/07_Frequently_Asked_Questions.md @@ -27,7 +27,7 @@ Here are the steps to follow: 1. __Verify if the feed syntax is valid__ with the [W3C on-line tool](https://validator.w3.org/feed/ "RSS and Atom feed validator"). If it’s not valid, there’s nothing we can do. 1. __Verify SimplePie validation__ with the [SimplePie on-line tool](https://simplepie.org/demo/ "SimplePie official demo"). If it’s not recognized, there’s nothing we can do. -1. __Verify FreshRSS integration__ with the [demo](https://demo.freshrss.org "FreshRSS official demo"). If it’s not working, you need to [create an issue on Github](https://github.com/FreshRSS/FreshRSS/issues/new "Create an issue for FreshRSS") so we can have a look at it. If it’s working, there’s probably something fishy with the hosting server. +1. __Verify FreshRSS integration__ with the [demo](https://demo.freshrss.org "FreshRSS official demo"). If it’s not working, you need to [create an issue on GitHub](https://github.com/FreshRSS/FreshRSS/issues/new "Create an issue for FreshRSS") so we can have a look at it. If it’s working, there’s probably something fishy with the hosting server. ## How can you change a forgotten password? diff --git a/docs/fr/developers/03_Backend/05_Extensions.md b/docs/fr/developers/03_Backend/05_Extensions.md index a8662ffa1..335eb5e6e 100644 --- a/docs/fr/developers/03_Backend/05_Extensions.md +++ b/docs/fr/developers/03_Backend/05_Extensions.md @@ -4,7 +4,7 @@ FreshRSS est un agrégateur de flux RSS / Atom écrit en PHP depuis octobre 2012. Le site officiel est situé à l’adresse -[freshrss.org](https://freshrss.org) et son dépot Git est hébergé par Github +[freshrss.org](https://freshrss.org) et son dépot Git est hébergé par GitHub : [github.com/FreshRSS/FreshRSS](https://github.com/FreshRSS/FreshRSS). ## Problème à résoudre diff --git a/docs/fr/users/01_Installation.md b/docs/fr/users/01_Installation.md index e77cf866e..3f4aaa45f 100644 --- a/docs/fr/users/01_Installation.md +++ b/docs/fr/users/01_Installation.md @@ -26,7 +26,7 @@ Cette version sort lorsqu’on considère qu’on a répondu à nos objectifs en [Téléchargement](https://github.com/FreshRSS/FreshRSS/archive/edge.zip) -Comme son nom l’indique, il s’agit de la version sur laquelle les développeurs travaillent. **Elle est donc instable !** Si vous souhaitez recevoir les améliorations au jour le jour, vous pouvez l’utiliser, mais attention à bien suivre les évolutions sur Github (via [le flux RSS de la branche](https://github.com/FreshRSS/FreshRSS/commits/edge.atom) par exemple). On raconte que les développeurs principaux l’utilisent quotidiennement sans avoir de soucis. Sans doute savent-ils ce qu’ils font… +Comme son nom l’indique, il s’agit de la version sur laquelle les développeurs travaillent. **Elle est donc instable !** Si vous souhaitez recevoir les améliorations au jour le jour, vous pouvez l’utiliser, mais attention à bien suivre les évolutions sur GitHub (via [le flux RSS de la branche](https://github.com/FreshRSS/FreshRSS/commits/edge.atom) par exemple). On raconte que les développeurs principaux l’utilisent quotidiennement sans avoir de soucis. Sans doute savent-ils ce qu’ils font… ## Installation sur Apache diff --git a/docs/fr/users/07_Frequently_Asked_Questions.md b/docs/fr/users/07_Frequently_Asked_Questions.md index 6e8153f1f..e420cb2c4 100644 --- a/docs/fr/users/07_Frequently_Asked_Questions.md +++ b/docs/fr/users/07_Frequently_Asked_Questions.md @@ -55,7 +55,7 @@ dans un premier temps déterminer la cause du problème.Voici la liste des 1. __Vérifier l’intégration dans FreshRSS__ grâce à la [démo](https://demo.freshrss.org "Démo officielle de FreshRSS"). Si ça ne fonctionne pas, il faut [créer un ticket sur - Github](https://github.com/FreshRSS/FreshRSS/issues/new "Créer un ticket + GitHub](https://github.com/FreshRSS/FreshRSS/issues/new "Créer un ticket pour FreshRSS") pour que l’on puisse regarder ce qui se passe. Si ça fonctionne, il y a probablement un problème avec l’hébergement. diff --git a/docs/i18n/freshrss.fr.po b/docs/i18n/freshrss.fr.po index 3b15a0347..af44074c4 100644 --- a/docs/i18n/freshrss.fr.po +++ b/docs/i18n/freshrss.fr.po @@ -289,7 +289,7 @@ msgstr "" #. type: Bullet: '* ' #: en/./developers/01_Index.md:16 -msgid "[Github Branching and Pushing](02_Github.md)" +msgid "[GitHub Branching and Pushing](02_GitHub.md)" msgstr "" #. type: Bullet: '* ' @@ -1311,19 +1311,19 @@ msgstr "" "];\n" #. type: Title # -#: en/./developers/02_Github.md:1 +#: en/./developers/02_GitHub.md:1 #, no-wrap msgid "Branching" msgstr "Système de branches" #. type: Title ## -#: en/./developers/02_Github.md:3 +#: en/./developers/02_GitHub.md:3 #, no-wrap msgid "Basic" msgstr "Élémentaire" #. type: Plain text -#: en/./developers/02_Github.md:6 +#: en/./developers/02_GitHub.md:6 msgid "" "If you are new to Git, here are some of the resources you might find useful:" msgstr "" @@ -1331,63 +1331,63 @@ msgstr "" "être utiles :" #. type: Bullet: '* ' -#: en/./developers/02_Github.md:11 +#: en/./developers/02_GitHub.md:11 msgid "[GitHub’s blog post](https://github.com/blog/120-new-to-git)" msgstr "[Article du blog de GitHub](https://github.com/blog/120-new-to-git)" #. type: Bullet: '* ' -#: en/./developers/02_Github.md:11 +#: en/./developers/02_GitHub.md:11 msgid "<http://try.github.com/>" msgstr "<http://try.github.com/>" #. type: Bullet: '* ' -#: en/./developers/02_Github.md:11 +#: en/./developers/02_GitHub.md:11 msgid "<http://sixrevisions.com/resources/git-tutorials-beginners/>" msgstr "<http://sixrevisions.com/resources/git-tutorials-beginners/>" #. type: Bullet: '* ' -#: en/./developers/02_Github.md:11 +#: en/./developers/02_GitHub.md:11 msgid "<http://rogerdudler.github.io/git-guide/>" msgstr "<http://rogerdudler.github.io/git-guide/>" #. type: Title ## -#: en/./developers/02_Github.md:12 +#: en/./developers/02_GitHub.md:12 #, no-wrap msgid "Getting the latest code from the FreshRSS repository" msgstr "Obtenir le dernier code du répertoire FreshRSS" #. type: Plain text -#: en/./developers/02_Github.md:15 +#: en/./developers/02_GitHub.md:15 msgid "First you need to add the official repo to your remote repo list:" msgstr "" "Vous devez avant tout ajouter le repo officiel à votre liste de repo remote :" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:16 +#: en/./developers/02_GitHub.md:16 #, no-wrap msgid "git remote add upstream git@github.com:FreshRSS/FreshRSS.git\n" msgstr "git remote add upstream git@github.com:FreshRSS/FreshRSS.git\n" #. type: Plain text -#: en/./developers/02_Github.md:21 +#: en/./developers/02_GitHub.md:21 msgid "You can verify the remote repo is successfully added by using:" msgstr "" "Vous pouvez vérifier que le repo remote a été ajouté avec succès en " "utilisant :" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:22 +#: en/./developers/02_GitHub.md:22 #, no-wrap msgid "git remote -v show\n" msgstr "git remote -v show\n" #. type: Plain text -#: en/./developers/02_Github.md:27 +#: en/./developers/02_GitHub.md:27 msgid "Now you can pull the latest development code:" msgstr "Vous pouvez maintenant pull le dernier code de développement :" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:28 +#: en/./developers/02_GitHub.md:28 #, no-wrap msgid "" "git checkout edge\n" @@ -1397,25 +1397,25 @@ msgstr "" "git pull upstream edge\n" #. type: Title ## -#: en/./developers/02_Github.md:33 +#: en/./developers/02_GitHub.md:33 #, no-wrap msgid "Starting a new development branch" msgstr "Lancer une nouvelle branche de développement" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:35 +#: en/./developers/02_GitHub.md:35 #, no-wrap msgid "git checkout -b my-development-branch\n" msgstr "git checkout -b mon-branch-developpement\n" #. type: Title ## -#: en/./developers/02_Github.md:39 +#: en/./developers/02_GitHub.md:39 #, no-wrap msgid "Sending a patch" msgstr "Proposer un patch" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:41 +#: en/./developers/02_GitHub.md:41 #, no-wrap msgid "" "# Add the changed file, here actualize_script.php\n" @@ -1437,18 +1437,18 @@ msgstr "" "git push\n" #. type: Plain text -#: en/./developers/02_Github.md:53 +#: en/./developers/02_GitHub.md:53 msgid "Now you can create a PR based on your branch." msgstr "Vous pouvez maintenant créer une PR en fonction de votre branche." #. type: Title ## -#: en/./developers/02_Github.md:54 +#: en/./developers/02_GitHub.md:54 #, no-wrap msgid "How to write a commit message" msgstr "Comment écrire un message de commit" #. type: Plain text -#: en/./developers/02_Github.md:57 +#: en/./developers/02_GitHub.md:57 #, fuzzy #| msgid "" #| "A commit message should succintly describe the changes on the first line. " @@ -1461,13 +1461,13 @@ msgstr "" "première ligne. Par exemple :" #. type: Plain text -#: en/./developers/02_Github.md:59 +#: en/./developers/02_GitHub.md:59 #, no-wrap msgid "> Fix broken icon\n" msgstr "> Fixe une icône cassée\n" #. type: Plain text -#: en/./developers/02_Github.md:61 +#: en/./developers/02_GitHub.md:61 msgid "" "If necessary, this can be followed by a blank line and a longer explanation." msgstr "" @@ -1475,7 +1475,7 @@ msgstr "" "suivre." #. type: Plain text -#: en/./developers/02_Github.md:62 +#: en/./developers/02_GitHub.md:62 msgid "For further tips, see [here](https://chris.beams.io/posts/git-commit/)." msgstr "" "Pour d’autres conseils, voir [ici](https://chris.beams.io/posts/git-commit/)." @@ -1533,12 +1533,12 @@ msgstr "Présentation de FreshRSS" msgid "" "FreshRSS is an RSS / Atom feed aggregator written in PHP dating back to " "October 2012. The official site is located at [freshrss.org](https://" -"freshrss.org) and the official repository is hosted on Github: [github.com/" +"freshrss.org) and the official repository is hosted on GitHub: [github.com/" "FreshRSS/FreshRSS](https://github.com/FreshRSS/FreshRSS)." msgstr "" "FreshRSS est un agrégateur de flux RSS / Atom écrit en PHP depuis octobre " "2012. Le site officiel est situé à l’adresse [freshrss.org](https://freshrss." -"org) et son dépot Git est hébergé par Github : [github.com/FreshRSS/FreshRSS]" +"org) et son dépot Git est hébergé par GitHub : [github.com/FreshRSS/FreshRSS]" "(https://github.com/FreshRSS/FreshRSS)." #. type: Title ## @@ -7811,13 +7811,13 @@ msgstr "" msgid "" "__Verify FreshRSS integration__ with the [demo](https://demo.freshrss.org " "\"FreshRSS official demo\"). If it’s not working, you need to [create an " -"issue on Github](https://github.com/FreshRSS/FreshRSS/issues/new \"Create an " +"issue on GitHub](https://github.com/FreshRSS/FreshRSS/issues/new \"Create an " "issue for FreshRSS\") so we can have a look at it. If it’s working, there’s " "probably something fishy with the hosting server." msgstr "" "__Vérifier l’intégration dans FreshRSS__ grâce à la [démo](https://demo." "freshrss.org \"Démo officielle de FreshRSS\"). Si ça ne fonctionne pas, il " -"faut [créer un ticket sur Github](https://github.com/FreshRSS/FreshRSS/" +"faut [créer un ticket sur GitHub](https://github.com/FreshRSS/FreshRSS/" "issues/new \"Créer un ticket pour FreshRSS\") pour que l’on puisse regarder " "ce qui se passe. Si ça fonctionne, il y a probablement un problème avec " "l’hébergement." diff --git a/docs/i18n/templates/freshrss.pot b/docs/i18n/templates/freshrss.pot index ca48baebb..3cc0ca681 100644 --- a/docs/i18n/templates/freshrss.pot +++ b/docs/i18n/templates/freshrss.pot @@ -267,7 +267,7 @@ msgstr "" #. type: Bullet: '* ' #: en/./developers/01_Index.md:16 #, markdown-text -msgid "[Github Branching and Pushing](02_Github.md)" +msgid "[GitHub Branching and Pushing](02_GitHub.md)" msgstr "" #. type: Bullet: '* ' @@ -1214,85 +1214,85 @@ msgid "" msgstr "" #. type: Title # -#: en/./developers/02_Github.md:1 +#: en/./developers/02_GitHub.md:1 #, markdown-text, no-wrap msgid "Branching" msgstr "" #. type: Title ## -#: en/./developers/02_Github.md:3 +#: en/./developers/02_GitHub.md:3 #, markdown-text, no-wrap msgid "Basic" msgstr "" #. type: Plain text -#: en/./developers/02_Github.md:6 +#: en/./developers/02_GitHub.md:6 #, markdown-text msgid "If you are new to Git, here are some of the resources you might find useful:" msgstr "" #. type: Bullet: '* ' -#: en/./developers/02_Github.md:11 +#: en/./developers/02_GitHub.md:11 #, markdown-text msgid "[GitHub’s blog post](https://github.com/blog/120-new-to-git)" msgstr "" #. type: Bullet: '* ' -#: en/./developers/02_Github.md:11 +#: en/./developers/02_GitHub.md:11 #, markdown-text msgid "<http://try.github.com/>" msgstr "" #. type: Bullet: '* ' -#: en/./developers/02_Github.md:11 +#: en/./developers/02_GitHub.md:11 #, markdown-text msgid "<http://sixrevisions.com/resources/git-tutorials-beginners/>" msgstr "" #. type: Bullet: '* ' -#: en/./developers/02_Github.md:11 +#: en/./developers/02_GitHub.md:11 #, markdown-text msgid "<http://rogerdudler.github.io/git-guide/>" msgstr "" #. type: Title ## -#: en/./developers/02_Github.md:12 +#: en/./developers/02_GitHub.md:12 #, markdown-text, no-wrap msgid "Getting the latest code from the FreshRSS repository" msgstr "" #. type: Plain text -#: en/./developers/02_Github.md:15 +#: en/./developers/02_GitHub.md:15 #, markdown-text msgid "First you need to add the official repo to your remote repo list:" msgstr "" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:16 +#: en/./developers/02_GitHub.md:16 #, no-wrap msgid "git remote add upstream git@github.com:FreshRSS/FreshRSS.git\n" msgstr "" #. type: Plain text -#: en/./developers/02_Github.md:21 +#: en/./developers/02_GitHub.md:21 #, markdown-text msgid "You can verify the remote repo is successfully added by using:" msgstr "" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:22 +#: en/./developers/02_GitHub.md:22 #, no-wrap msgid "git remote -v show\n" msgstr "" #. type: Plain text -#: en/./developers/02_Github.md:27 +#: en/./developers/02_GitHub.md:27 #, markdown-text msgid "Now you can pull the latest development code:" msgstr "" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:28 +#: en/./developers/02_GitHub.md:28 #, no-wrap msgid "" "git checkout edge\n" @@ -1300,25 +1300,25 @@ msgid "" msgstr "" #. type: Title ## -#: en/./developers/02_Github.md:33 +#: en/./developers/02_GitHub.md:33 #, markdown-text, no-wrap msgid "Starting a new development branch" msgstr "" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:35 +#: en/./developers/02_GitHub.md:35 #, no-wrap msgid "git checkout -b my-development-branch\n" msgstr "" #. type: Title ## -#: en/./developers/02_Github.md:39 +#: en/./developers/02_GitHub.md:39 #, markdown-text, no-wrap msgid "Sending a patch" msgstr "" #. type: Fenced code block (sh) -#: en/./developers/02_Github.md:41 +#: en/./developers/02_GitHub.md:41 #, no-wrap msgid "" "# Add the changed file, here actualize_script.php\n" @@ -1332,19 +1332,19 @@ msgid "" msgstr "" #. type: Plain text -#: en/./developers/02_Github.md:53 +#: en/./developers/02_GitHub.md:53 #, markdown-text msgid "Now you can create a PR based on your branch." msgstr "" #. type: Title ## -#: en/./developers/02_Github.md:54 +#: en/./developers/02_GitHub.md:54 #, markdown-text, no-wrap msgid "How to write a commit message" msgstr "" #. type: Plain text -#: en/./developers/02_Github.md:57 +#: en/./developers/02_GitHub.md:57 #, markdown-text msgid "" "A commit message should succinctly describe the changes on the first " @@ -1352,19 +1352,19 @@ msgid "" msgstr "" #. type: Plain text -#: en/./developers/02_Github.md:59 +#: en/./developers/02_GitHub.md:59 #, markdown-text, no-wrap msgid "> Fix broken icon\n" msgstr "" #. type: Plain text -#: en/./developers/02_Github.md:61 +#: en/./developers/02_GitHub.md:61 #, markdown-text msgid "If necessary, this can be followed by a blank line and a longer explanation." msgstr "" #. type: Plain text -#: en/./developers/02_Github.md:62 +#: en/./developers/02_GitHub.md:62 #, markdown-text msgid "For further tips, see [here](https://chris.beams.io/posts/git-commit/)." msgstr "" @@ -1424,7 +1424,7 @@ msgid "" "FreshRSS is an RSS / Atom feed aggregator written in PHP dating back to " "October 2012. The official site is located at " "[freshrss.org](https://freshrss.org) and the official repository is hosted " -"on Github: " +"on GitHub: " "[github.com/FreshRSS/FreshRSS](https://github.com/FreshRSS/FreshRSS)." msgstr "" @@ -7303,7 +7303,7 @@ msgstr "" msgid "" "__Verify FreshRSS integration__ with the [demo](https://demo.freshrss.org " "\"FreshRSS official demo\"). If it’s not working, you need to [create an " -"issue on Github](https://github.com/FreshRSS/FreshRSS/issues/new \"Create an " +"issue on GitHub](https://github.com/FreshRSS/FreshRSS/issues/new \"Create an " "issue for FreshRSS\") so we can have a look at it. If it’s working, there’s " "probably something fishy with the hosting server." msgstr "" diff --git a/docs/po4a.conf b/docs/po4a.conf index f5522e973..4596a2338 100644 --- a/docs/po4a.conf +++ b/docs/po4a.conf @@ -5,7 +5,7 @@ [type: text] en/./contributing.md $lang:$lang/./contributing.md opt:"-o markdown" opt:"-M utf-8" [type: text] en/./developers/01_Index.md $lang:$lang/./developers/01_Index.md opt:"-o markdown" opt:"-M utf-8" [type: text] en/./developers/02_First_steps.md $lang:$lang/./developers/02_First_steps.md opt:"-o markdown" opt:"-M utf-8" -[type: text] en/./developers/02_Github.md $lang:$lang/./developers/02_Github.md opt:"-o markdown" opt:"-M utf-8" +[type: text] en/./developers/02_GitHub.md $lang:$lang/./developers/02_GitHub.md opt:"-o markdown" opt:"-M utf-8" [type: text] en/./developers/03_Backend/01_Database_schema.md $lang:$lang/./developers/03_Backend/01_Database_schema.md opt:"-o markdown" opt:"-M utf-8" [type: text] en/./developers/03_Backend/03_External_libraries.md $lang:$lang/./developers/03_Backend/03_External_libraries.md opt:"-o markdown" opt:"-M utf-8" [type: text] en/./developers/03_Backend/05_Extensions.md $lang:$lang/./developers/03_Backend/05_Extensions.md opt:"-o markdown" opt:"-M utf-8" diff --git a/p/themes/base-theme/README.md b/p/themes/base-theme/README.md index 33a9125bf..6cd3f5d1a 100644 --- a/p/themes/base-theme/README.md +++ b/p/themes/base-theme/README.md @@ -8,5 +8,5 @@ A base theme for [FreshRSS](https://freshrss.org) 3. Choose your new theme in FreshRSS configuration 4. Enjoy your wonderful theme! -Don’t hesitate to share your theme with us [on Github](https://github.com/FreshRSS/FreshRSS/issues) :) +Don’t hesitate to share your theme with us [on GitHub](https://github.com/FreshRSS/FreshRSS/issues) :) |