Make English welcome message more natural

    sed -i "s/Welcome on wallabag/Welcome to wallabag/"

Signed-off-by: Olivier Mehani <shtrom@ssji.net>

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index ebb1a95a0d739983a7bb90528dd1c3c1c06ba4c1..39e14a7e0d23d1b51f1753b7b83621499b62145a 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -197,7 +197,7 @@ Re-fetch content: Recharger le contenu
 Tag added: Tag ajouté
 
 # Import
-Welcome on wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer."
+Welcome to wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer."
 "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.": "Cet outil va importer toutes vos données de Pocket. Pocket ne nous autorise pas à récupérer le contenu depuis leur service, donc wallabag doit reparcourir chaque article pour récupérer son contenu."
 "This importer will import all your wallabag v1 articles. On your config page, click on \"JSON export\" in the \"Export your wallabag data\" section. You will have a \"wallabag-export-1-xxxx-xx-xx.json\" file.": "Cet outil va importer toutes vos données de wallabag v1. Sur votre page de configuration de wallabag v1, cliquez sur \"Export JSON\" dans la section \"Exporter vos données de wallabag\". Vous allez récupérer un fichier \"wallabag-export-1-xxxx-xx-xx.json\"."
 "This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on \"JSON\". You will have a \"All articles.json\" file.": "Cet outil va importer toutes vos articles d'une autre instance de wallabag v2. Allez dans tous vos articles, puis, sur la barre latérale, cliquez sur \"JSON\". Vous allez récupérer un fichier \"All articles.json\""
@@ -217,7 +217,7 @@ Import > Wallabag v2: "Importer > Wallabag v2"
 
 # Quickstart
 Quickstart: Pour bien débuter
-Welcome on wallabag!: "Bienvenue sur wallabag !"
+Welcome to wallabag!: "Bienvenue sur wallabag !"
 We'll accompany you to visit wallabag and show you some features which can interess you.: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil."
 Follow us!: "Suivez-nous !"
 Configure the application: "Configurez l'application"

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 2256883ef26b8fd91c24e2dd11ed5f5b052e02f5..6d9bf0db890311eaf962e87fa690bf9942d69b66 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -184,7 +184,7 @@ Is public: "Herkes tarafından erişime açık olsun mu?"
 Import: "İçe Aktar"
 "Import > Pocket": "İçe Aktar > Pocket"
 "Import > Wallabag v1": "İçe Aktar > Wallabag v1"
-Welcome on wallabag importer. Please select your previous service that you want to migrate.: "wallabag içe aktarma aracına hoşgeldiniz. Lütfen içe aktarmak istediğiiz önceki servisinizi seçin."
+Welcome to wallabag importer. Please select your previous service that you want to migrate.: "wallabag içe aktarma aracına hoşgeldiniz. Lütfen içe aktarmak istediğiiz önceki servisinizi seçin."
 "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.": "Bu araç tüm Pocket verinizi içe aktarır. Pocket içeriklerin getirilmesine izin vermez, okunabilen içerikler wallabag tarafından yeniden getirilir."
 "This importer will import all your wallabag v1 articles. On your config page, click on \"JSON export\" in the \"Export your wallabag data\" section. You will have a \"wallabag-export-1-xxxx-xx-xx.json\" file.": "Bu araç wallabag v1 üzerindeki tüm makalelerinizi içe aktarır. Yapılandırma sayfasında, \"Export your wallabag data\" sekmesinden \"JSON export\" adımını izleyin. Bu adım size \"wallabag-export-1-xxxx-xx-xx.json\" isimli bir dosya verecektir."
 "You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.": "Pocket hesabınızda verilerinizi içe aktarabilmemiz için öncelikle aşağıdaki butona tıklayın. Daha sonra, getpocket.com üzerindeki uygulamamıza gereken izinleri verin. Hepsi bu kadar!"
@@ -195,7 +195,7 @@ Upload file: "Dosyayı yükle"
 Import contents: "İçerikleri içe aktar"
 
 # Quickstart
-Welcome on wallabag!: "wallabag"
+Welcome to wallabag!: "wallabag"
 Quickstart: "Hızlı başlangıç"
 We'll accompany you to visit wallabag and show you some features which can interess you.: "wallabag kurduğunuz için teşekkür ederiz. Bu sayfada biz size eşlik edecek ve ilginizi çekecek birkaç özellik göstereceğim."
 Follow us!: "Bizi takip edin!"

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
index f57673c505e707a67c3f83c4309434132710e57d..3984081c6a007aa30b9d39f34c2b8c51a7ee9b01 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-    <h2>{% trans %}Welcome on wallabag!{% endtrans %}</h2>
+    <h2>{% trans %}Welcome to wallabag!{% endtrans %}</h2>
     <p>{% trans %}We'll accompany you to visit wallabag and show you some features which can interess you.{% endtrans %}</p>
     <p>{% trans %}Follow us!{% endtrans %}</p>
     <h4>{% trans %}Configure the application{% endtrans %}</h4>

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
index e1f6fd5ca9ef19586f83bbc78d2276b72937dc32..aff8dd2b897cbb11e18a5de4db760877b32a9c40 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
@@ -9,7 +9,7 @@
             <div class="card-panel settings">
 
                 <div class="row">
-                    <h3>{% trans %}Welcome on wallabag!{% endtrans %}</h3>
+                    <h3>{% trans %}Welcome to wallabag!{% endtrans %}</h3>
                     <p>{% trans %}We'll accompany you to visit wallabag and show you some features which can interess you.{% endtrans %}</p>
                     <p>{% trans %}Follow us!{% endtrans %}</p>
                     <h4>{% trans %}Configure the application{% endtrans %}</h4>

diff --git a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
index 303e6cbfbd80689b0501acd6c54f3d969f84ed9c..8c300624d34912d4ddd1c9f486106006e694aabc 100644 (file)
--- a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
@@ -5,7 +5,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% trans %}Welcome on wallabag importer. Please select your previous service that you want to migrate.{% endtrans %}
+            {% trans %}Welcome to wallabag importer. Please select your previous service that you want to migrate.{% endtrans %}
             <ul>
                 {% for import in imports %}
                     <li>

diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig
index 7517c27c2eed81c39ade7b2c7661de650ec2ce6c..60b321bf3a824268d8dee4d8b549df97d5e8c82b 100644 (file)
--- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig
@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Welcome on wallabag!{% endtrans %}{% endblock %}
+{% block title %}{% trans %}Welcome to wallabag!{% endtrans %}{% endblock %}
 
 {% block body_class %}login{% endblock %}
 

diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig
index c355d3bfefa7cf1e370087da7fc0d9ff65dd7105..cbdc1da205e281cf0d891418ee2f3b133882a3f1 100644 (file)
--- a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig
@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Welcome on wallabag!{% endtrans %}{% endblock %}
+{% block title %}{% trans %}Welcome to wallabag!{% endtrans %}{% endblock %}
 
 {% block body_class %}login{% endblock %}