From 910b695d4d8197be74525b2669e6776d51eb9bd6 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 6 Jul 2023 18:57:10 +0200 Subject: [PATCH] correct usage of hyphens in all occurences of 'super fast, database-free' - fixes https://github.com/shaarli/Shaarli/issues/1758 --- Makefile | 2 +- README.md | 2 +- application/bookmark/BookmarkInitializer.php | 2 +- application/legacy/LegacyLinkDB.php | 2 +- composer.json | 2 +- doc/md/index.md | 2 +- inc/languages/de/LC_MESSAGES/shaarli.po | 2 +- inc/languages/fr/LC_MESSAGES/shaarli.po | 2 +- inc/languages/jp/LC_MESSAGES/shaarli.po | 2 +- inc/languages/ru/LC_MESSAGES/shaarli.po | 2 +- inc/languages/zh_CN/LC_MESSAGES/shaarli.po | 2 +- index.php | 2 +- mkdocs.yml | 2 +- tpl/default/page.footer.html | 4 ++-- tpl/vintage/page.footer.html | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 11f05d0fe..38d05bb7f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# The personal, minimalist, super-fast, database free, bookmarking service. +# The personal, minimalist, super fast, database-free, bookmarking service. # Makefile for PHP code analysis & testing, documentation and release generation BIN = vendor/bin diff --git a/README.md b/README.md index c14f6d437..81ebfa1ff 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Shaarli logo](doc/md/images/doc-logo.png) -The personal, minimalist, super-fast, database free, bookmarking service. +The personal, minimalist, super fast, database-free, bookmarking service. _Do you want to share the links you discover?_ _Shaarli is a minimalist link sharing service that you can install on your own server._ diff --git a/application/bookmark/BookmarkInitializer.php b/application/bookmark/BookmarkInitializer.php index 8ab5c441a..3c2c10cbc 100644 --- a/application/bookmark/BookmarkInitializer.php +++ b/application/bookmark/BookmarkInitializer.php @@ -91,7 +91,7 @@ public function initialize(): void $bookmark = new Bookmark(); $bookmark->setTitle( - 'Shaarli - ' . t('The personal, minimalist, super-fast, database free, bookmarking service') + 'Shaarli - ' . t('The personal, minimalist, super fast, database-free, bookmarking service') ); $bookmark->setDescription(t( 'Welcome to Shaarli! diff --git a/application/legacy/LegacyLinkDB.php b/application/legacy/LegacyLinkDB.php index cb19eda50..af1e6cba8 100644 --- a/application/legacy/LegacyLinkDB.php +++ b/application/legacy/LegacyLinkDB.php @@ -246,7 +246,7 @@ private function check() $this->links = []; $link = [ 'id' => 1, - 'title' => t('The personal, minimalist, super-fast, database free, bookmarking service'), + 'title' => t('The personal, minimalist, super fast, database-free, bookmarking service'), 'url' => 'https://shaarli.readthedocs.io', 'description' => t( 'Welcome to Shaarli! This is your first public bookmark. ' diff --git a/composer.json b/composer.json index a2d378c76..a8690dbea 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "shaarli/shaarli", - "description": "The personal, minimalist, super-fast, database-free bookmarking service", + "description": "The personal, minimalist, super fast, database-free bookmarking service", "type": "project", "license": "MIT", "homepage": "https://github.com/shaarli/Shaarli", diff --git a/doc/md/index.md b/doc/md/index.md index cc4dd2ebc..4d4f0b060 100644 --- a/doc/md/index.md +++ b/doc/md/index.md @@ -1,6 +1,6 @@ # Shaarli - The personal, minimalist, super-fast, database free, bookmarking service. + The personal, minimalist, super fast, database-free, bookmarking service. Do you want to share the links you discover? Shaarli is a minimalist bookmark manager and link sharing service that you can install on your own server. It is designed to be personal (single-user), fast and handy. diff --git a/inc/languages/de/LC_MESSAGES/shaarli.po b/inc/languages/de/LC_MESSAGES/shaarli.po index 4769858ee..053bfbb3b 100644 --- a/inc/languages/de/LC_MESSAGES/shaarli.po +++ b/inc/languages/de/LC_MESSAGES/shaarli.po @@ -204,7 +204,7 @@ msgstr "" #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "" "Der persönliche, minimalistische, superschnelle, datenbankfreie " "Lesezeichenservice" diff --git a/inc/languages/fr/LC_MESSAGES/shaarli.po b/inc/languages/fr/LC_MESSAGES/shaarli.po index a54fbcdf2..ffe871297 100644 --- a/inc/languages/fr/LC_MESSAGES/shaarli.po +++ b/inc/languages/fr/LC_MESSAGES/shaarli.po @@ -193,7 +193,7 @@ msgstr "" #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "" "Le gestionnaire de marque-pages personnel, minimaliste, et sans base de " "données" diff --git a/inc/languages/jp/LC_MESSAGES/shaarli.po b/inc/languages/jp/LC_MESSAGES/shaarli.po index 361644335..53663fedc 100644 --- a/inc/languages/jp/LC_MESSAGES/shaarli.po +++ b/inc/languages/jp/LC_MESSAGES/shaarli.po @@ -194,7 +194,7 @@ msgstr "" #: application/bookmark/BookmarkInitializer.php:94 #: application/legacy/LegacyLinkDB.php:246 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "" "個人向けの、ミニマムで高速でかつデータベースのいらないブックマークサービス" diff --git a/inc/languages/ru/LC_MESSAGES/shaarli.po b/inc/languages/ru/LC_MESSAGES/shaarli.po index 98e704252..825fe2b2e 100644 --- a/inc/languages/ru/LC_MESSAGES/shaarli.po +++ b/inc/languages/ru/LC_MESSAGES/shaarli.po @@ -196,7 +196,7 @@ msgstr "" #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "Личный, минималистичный, сверхбыстрый сервис закладок без баз данных" #: application/bookmark/BookmarkInitializer.php:97 diff --git a/inc/languages/zh_CN/LC_MESSAGES/shaarli.po b/inc/languages/zh_CN/LC_MESSAGES/shaarli.po index 07c300c00..d8eaf6fdb 100644 --- a/inc/languages/zh_CN/LC_MESSAGES/shaarli.po +++ b/inc/languages/zh_CN/LC_MESSAGES/shaarli.po @@ -195,7 +195,7 @@ msgstr "" #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "个人、超快、极简、掌握数据库的书签服务" #: application/bookmark/BookmarkInitializer.php:97 diff --git a/index.php b/index.php index f4210aed3..2a0246b7b 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,7 @@ {'Documentation'|t} {loop="$plugins_footer.text"} {$value} @@ -34,7 +34,7 @@ {'Are you sure you want to delete this link?'|t} {'Are you sure you want to delete this tag?'|t} - {'The personal, minimalist, super-fast, database free, bookmarking service'|t} {'by the Shaarli community'|t} + {'The personal, minimalist, super fast, database-free, bookmarking service'|t} {'by the Shaarli community'|t} diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html index be709aeb1..c437dc089 100644 --- a/tpl/vintage/page.footer.html +++ b/tpl/vintage/page.footer.html @@ -1,6 +1,6 @@