Merge branch 'pt-translation-v3' into 'master'

translation v3 - Dishub

See merge request disroot/howto!70

pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/docs.en.md

@@ -21,7 +21,7 @@ First setup an account in the app Kaddressbook.
  * **Username:** _yourusername_
  * **Password:** _your_super_secret_password_
 * In the option "select one of these servers", select: **owncloud**
-* Host: place the address [cloud.disroot.org](http://https:cloud.disroot.org)
+* Host: place the address [cloud.disroot.org](https//:cloud.disroot.org)
 * Installation path: leave it blank
 * Select the option: "use secure connection"
 * Press:

pages/10.DisHub/01.Basics/02.Navigation_bar/docs.en.md

@@ -42,9 +42,10 @@ Here you can see your default and created profiles if there any or create new on
 [To know more about profiles and the available options...]((../../02.Channels/02.Profiles))
 
 ### Channel Manager
-From here you can manage your channels and create new ones.
-Note: Channels are different from profiles. A profile is a collection of information about yourself so you can have different profiles depending on the data you want to share with different users or groups. For example: your public or default profile (which is always available to the general public and can’t be hidden) is GNU/Linux and FOSS related. You set the permissions and establish connections with those who may share those interests. But if you have your group of friends that don’t care about that much, and you don’t want to bore them with it, you can create a new profile with a new set of permissions called “friends”, that allow its members access only to another kind of information.
-A channel, on the other hand, it’s the space on the web that contains collections of content stored in one place, that’s the stream (will see that later). What kind of content? Well, that’s exactly the point of it. You can create different channels for different kinds of content and specifies whose of your contacts or public can see it. In other words, a profile is information about you and a channel is the space where specific information it’s gathered and showed up.
+From here you can manage your channels and create new ones.<br>
+**Note: Channels are different from profiles.**<br>
+**A profile** is a collection of information about yourself so you can have different profiles depending on the data you want to share with different users or groups. For example: your public or default profile (which is always available to the general public and can’t be hidden) is GNU/Linux and FOSS related. You set the permissions and establish connections with those who may share those interests. But if you have your group of friends that don’t care about that much, and you don’t want to bore them with it, you can create a new profile with a new set of permissions called “friends”, that allow its members access only to another kind of information.<br>
+**A channel**, on the other hand, it’s the space on the web that contains collections of content stored in one place, that’s the stream (will see that later). What kind of content? Well, that’s exactly the point of it. You can create different channels for different kinds of content and specifies whose of your contacts or public can see it. In other words, a profile is information about you and a channel is the space where specific information it’s gathered and showed up.
 
 Click on the **Channel Manager** to access its options.
 
@@ -103,5 +104,6 @@ You can also use the **search box** to look for a tag, an user, etc. ![Search_bo
 It allows to see your connections and to edit them [Informations here](../../03.Connections)
 
 ## 6. Directory: ![home](en/Icon_directory.png)
-It allows to see any channel on hubzilla (not just Dishub)
+It allows to see and search any channel on hubzilla (not just Dishub). To search a specific channel use the search engine on the upper left side of the directory page
+
 ![Directory](en/Directory.png)

pages/10.DisHub/02.Channels/01.Creation/docs.en.md

@@ -50,6 +50,6 @@ Some channels are designated **Premium Channels** and may require some action be
 Here is an example of such a message:
 ![connections_premium_message](en/Connection_premium_message.png)
 
-To set a premium channel, go to your channel **Settings**, then on **Premium Channel Settings**
+To set a premium channel, go to your channel **Settings**, then on the same left side bar select **Premium Channel Settings**
 ![channel_premium](en/channel_premium.png)
 Enable the premium channel restriction, enter your message and click on *Submit*.

pages/10.DisHub/02.Channels/02.Profiles/docs.en.md

@@ -12,7 +12,7 @@ page-toc:
 ## What is a profile?
 You have surely registered with some other internet services, such as forums or online communities. For all of them you provided some information about yourself, such as date of birth, country, age and the likes. Think of your profile as **the basic information about yourself you tell other people**.
 
-Here is an example of a profile with not much on it :)
+Here is an example of a profile with not much on it
 ![profile_view](en/Profile_view.png)
 
 And the same one, but seen from a directory research on "meaz" !

pages/10.DisHub/03.Connections/docs.en.md

@@ -52,11 +52,13 @@ To do so, click on the **profile picture** of that channel and then choose **Con
  ![connect3](en/Connect3.gif)
 
 ### You want to connect with channels on other networks
-The process for connecting to channels on other networks (such as GNU-Social, Mastodon, and Diaspora) is similar - type their "webbie" into the **Add New Connections** box on the **Connections page**. Before you do this however, please visit your **Settings** page, **Addon Settings** and ensure that the relevant protocol (Diaspora, GNU-Social/OStatus, or ActivityPub) is provided on your hub and activated for your channel.
+The process for connecting to channels on other networks (such as GNU-Social, Mastodon, and Diaspora) is similar - type their "webbie" into the **Add New Connections** box on the **Connections page**. Before you do this however, please visit your **Settings** page, **Addon Settings** and ensure that the relevant protocol (Diaspora, GNU-Social/OStatus, ActivityPub, or others) is provided on your hub and activated for your channel.
 
 These networks/protocols do not support account migration and location independence so if you move location or clone your channel elsewhere, communications with these connections may fail. For this reason these protocols are not activated by default, but only through your consent. Activating these protocols involves an important decision between communicating with friends on these networks or providing fail-safe account resilience if your server fails.    
 
-Some communications offer more than one protocol. If you wish to connect with somebody on Mastodon (for instance) they can use either the 'ostatus' or the 'activitypub' protocol for communication. Generally the 'activitypub' protocol will provide a better experience than 'ostatus', but Hubzilla will often choose the first protocol it discovers and this may not be the one you want.
+Some softwares you might have heard of might use a communication protocol with a different name. For example Mastodon, Pleroma, Peertube all use ActivityPub so if you want to connect with people on these softwares, ativate  'activitypub' protocol for communication.
+Some softwares, like Mastodon and Pleroma also support the 'Osatus' protocol.
+Generally the 'activitypub' protocol will provide a better experience than 'ostatus', but Hubzilla will often choose the first protocol it discovers and this may not be the one you want.
 
 You may connect with somebody over a specific protocol the same way you would add a contact on hubzilla, but changing his/her address to point to the right protocol instance.
 

pages/10.DisHub/04.Permissions/01.Default_channel_permission-limits/docs.en.md

@@ -10,13 +10,13 @@ page-toc:
 ---
 
 ### What is it?
-There are a set of default permission limits that apply to all items shared by a channel. This determines the first "limit" on who can access an itemof your channel: a post, a wiki, a photo, etc.
+There are a set of default permission limits that apply to all items shared by a channel. This determines the first "limit" on who can access an item of your channel: a post, a wiki, a photo, etc.
 
 ### What kind of permissions can be set?
 
 - **Can view my channel stream and posts.**
 
-This permision determines who can view your channel "stream" : your non-private posts that appear on the *channel page* ![channel_icon](en/channel_icon.png) when you're logged in.
+This permision determines who can view your channel "stream": your non-private posts that appear on the *channel page* ![channel_icon](en/channel_icon.png) when you're logged in.
 
 - **Can send me their channel stream and posts.**
 
@@ -116,7 +116,7 @@ Anybody with a channel on the same hub/website as you will have permission appro
 
 - **Anybody in this network**
 
-Anybody in Hubzilla will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.
+Anybody in the Hubzilla network will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.
 
 - **Anybody authenticated**
 

pages/10.DisHub/06.Wiki/docs.en.md

@@ -30,7 +30,7 @@ If you don't see any wiki, then this channel may have viewing restrictions or si
 
 ## Enable wiki creation
 ### 1st step: enable the wiki feature
-If you want to be able to use the wiki feature, you have to enable it first. To do so, go to your channel **Settings**, click on the **Additionnal features** tab.
+If you want to be able to use the wiki feature, you have to enable it first. To do so, go to your channel **Settings**, click on the **Aditionnal features** tab.
 
 To see be able to enable the wiki feature, you need to set your skill to at least **"2. Intermediate..."**. (You can see any other level superior to 2)
 
@@ -51,7 +51,7 @@ However, you may want other people (or even yourself!) to be able to access your
 
 ![wiki_access](en/Wiki_access.gif)
 
-To do so, click on the **hamburger menu** and select **Add apps**. Go down to the wiki app and enabale it by **clicking on its star**. You will now be able to see it in the hamburger menu (sometimes, you need to refresh the page so that the app appears in the menu).
+To do so, click on the **hamburger menu** and select **Add apps**. Go down to the wiki app and enable it by **clicking on its star**. You will now be able to see it in the hamburger menu (sometimes, you need to refresh the page so that the app appears in the menu).
 
 ![wiki_enable_app](en/Wiki_enable_app.gif)
 

pages/10.DisHub/08.FAQ/docs.en.md

@@ -15,7 +15,7 @@ page-toc:
 ### How to change your page's background image?
 ![Background](en/Background.png)
 
-You can change the background in theme settings, depending on the theme you use. You can there pretty much change any color and number of other settings.
+You can change the background in theme settings, depending on the theme you use. There you can pretty much change any color and number of other settings.
 
 So go to **Settings > display settings > custom theme settings > background image**
 
@@ -27,4 +27,4 @@ Activate delayed posting in ** Settings -> Additional Features -> Post Compositi
 Then you will get a new option **Set publish date** when composing a post (click the clock icon under the post editor).
 It needs to be at least 10 minutes into the future in order to trigger delayed delivery.
 
-The post will vanish when you submit it, because it doesn't exist yet. Be aware of this so you don't end up posting the same thing multiple times and have them all show up at once at a future date. 
+The post will vanish when you submit it, because it doesn't exist yet. Be aware of this so you don't end up posting the same thing multiple times and have them all show up at once at a future date.

pages/10.DisHub/docs.en.md

@@ -11,11 +11,11 @@ page-toc:
 # **DisHub: Disroot's Hubzilla instance** Howto pages.
 
 [**Hubzilla**](https://project.hubzilla.org/page/hubzilla/hubzilla-project) is a powerful, free and open source software to create decentralized and federated web platforms which includes webpages tools, wikis, forums, cloud storage, social networks and more. Any attempt to accurately define Hubzilla may end up being inadequate.<br>
-While shares similarity with other web services software, **Hubzilla** offers some very particular features that no others do, like full and precise permission system that gives you control about the privacy of the information and content you may share; nomadic identity (which means you own your online identity and can take it across the network, no matter the hubs, instance, servers); multiple profiles and channels; account cloning; among other features.
+While it shares similarity with other web services software, **Hubzilla** offers some very particular features that no others do, like full and precise permission system that gives you control about the privacy of the information and content you may share; nomadic identity (which means you own your online identity and can take/migrate it across the network, no matter the hubs, instance, servers); multiple profiles and channels; account cloning; among other features.
 
 At **Disroot**, we think it’s an awesome piece of software and that everybody should try it because of its potential and the power it’s giving to decentralization and federation services. So we built **DisHub**, the **Disroot’s Hubzilla instance**. But, due to the amount of features, apps, services and user control settings, and because Hubzilla is beyond comparison, it may be kind of difficult until you fully get it. That’s why we made this Howto.
 
-Think of Hubzilla as your new digital house: You have many rooms that you can arrange and decorate as you want, it’s your place to talk and share whatever you want with the people you want. And more than that, because you can even take your home wherever you want.
+Think of Hubzilla as your new digital house: You have many rooms that you can arrange and decorate as you want, it’s your place to talk and share whatever you want with the people you want. And more than that, because you can even take your home wherever (other hubzilla instances) you want.
 
 So, exercise your freedom, your imagination and welcome to DisHub.