From 0671a3a60c669d412d62b952e7a8282d6e292c19 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Sat, 12 Aug 2017 22:07:43 +0200
Subject: [PATCH] Insert an image

---
 app/assets/templates/faq_posts_and_posting_tpl.jst.hbs | 4 +---
 config/locales/diaspora/en.yml                         | 7 ++-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
index 0d268d5af..6fd047cc4 100644
--- a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
+++ b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
@@ -59,9 +59,7 @@
       <h4>{{ insert_images_comments_q }}</h4>
     </a>
     <div class='answer hideable'>
-      {{ insert_images_comments_a1 }}
-      <pre>![{{ image_text }}]( {{ image_url }})</pre>
-      {{ insert_images_comments_a2 }}
+      {{ insert_images_comments_a }}
     </div>
   </div>
   <div class='question opened collapsible'>
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index ee2ae4f1c..fa727ed68 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -411,12 +411,9 @@ en:
       format_text_q: "How can I format the text in my posts (bold, italics, etc.)?"
       format_text_a: "diaspora* uses a simplified system called %{markdown}. The publisher has buttons to make it easy to format your text. If you want to format your post manually, you can find the full Markdown syntax %{here}. The preview tab means you can see how your message will look before you share it. Remember that you can’t edit it once posted, so use the preview to make sure it’s perfect before pressing Share!"
       insert_images_q: "How do I insert images into posts?"
-      insert_images_a: "Click the little camera icon to insert an image into a post. Press the camera icon again to add another photo, or you can select multiple photos to upload in one go."
+      insert_images_a: "If you want to include an image stored on your computer in your post, click the little camera icon at the bottom of the publisher. You can also drag and drop an image, or multiple images, from your computer onto that icon. If you want to insert an image from the web into your post, click the image button on the top of the publisher, which will create the Markdown code for you."
       insert_images_comments_q: "Can I insert images into comments?"
-      insert_images_comments_a1: "You cannot upload images into comments, but the following Markdown code"
-      image_text: "image text"
-      image_url: "image url"
-      insert_images_comments_a2: "can be used to insert images from the web into comments as well as posts."
+      insert_images_comments_a: "You can use Markdown to insert an image from the web into a comment, just like in posts. However, you cannot upload images from your computer directly into comments. Upload them to an image-hosting service and then insert them using the image button above the publisher."
       size_of_images_q: "Can I customize the size of images in posts or comments?"
       size_of_images_a: "No. Images are resized automatically to fit the stream or single-post view. Markdown does not have a code for specifying the size of an image."
       embed_multimedia_q: "How do I embed a video, audio, or other multimedia content into a post?"