Merge pull request #2003 from nodiscc/doc-hyphens

correct usage of hyphens in all occurences of 'super fast, database-free'
shaarli · Sep 25, 2023 · 280e613 · 280e613
2 parents 775fcb4 + 910b695
commit 280e613
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 # Shaarli
 
-<img src="images/icon.png" width="16px" height="16px"> The personal, minimalist, super-fast, database free, bookmarking service.
+<img src="images/icon.png" width="16px" height="16px"> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Shaarli - The personal, minimalist, super-fast, database free, bookmarking service.
+ * Shaarli - The personal, minimalist, super fast, database-free, bookmarking service.
  *
  * Friendly fork by the Shaarli community:
  *  - https://github.com/shaarli/Shaarli

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,7 +1,7 @@
 site_name: Shaarli Documentation
 repo_url: https://github.com/shaarli/Shaarli
 edit_uri: edit/master/doc/md
-site_description: The personal, minimalist, super-fast, database free, bookmarking service
+site_description: The personal, minimalist, super fast, database-free, bookmarking service
 theme:
   name: readthedocs
   custom_dir: doc/custom_theme/

diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
@@ -9,7 +9,7 @@
       {$version}
     {/if}
     &middot;
-    {'The personal, minimalist, super-fast, database free, bookmarking service'|t} {'by the Shaarli community'|t} &middot;
+    {'The personal, minimalist, super fast, database-free, bookmarking service'|t} {'by the Shaarli community'|t} &middot;
     <a href="{$root_path}/doc/html/index.html" rel="nofollow">{'Documentation'|t}</a>
       {loop="$plugins_footer.text"}
           {$value}
@@ -34,7 +34,7 @@
   <span id="translation-delete-link">{'Are you sure you want to delete this link?'|t}</span>
   <span id="translation-delete-tag">{'Are you sure you want to delete this tag?'|t}</span>
   <span id="translation-shaarli-desc">
-    {'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}
   </span>
 </div>
 

diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html
@@ -1,6 +1,6 @@
 <div id="footer">
   <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong>
-  - The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community
+  - The personal, minimalist, super fast, database-free, bookmarking service by the Shaarli community
   - <a href="doc/html/index.html" rel="nofollow">Help/documentation</a>
     {loop="$plugins_footer.text"}
         {$value}