Merge branch 'master' of gitlab.com:Remmina/remmina-web

4 files changed, 83 insertions, 92 deletions

diff --git a/_config.yml b/_config.yml
index 80a4d00..dccf077 100644
--- a/_config.yml
+++ b/_config.yml
@@ -113,7 +113,7 @@ author:
   location         : #"Somewhere"
   email            :
   uri              :
-  home             : # null (default), "absolute or relative url to link to author home"
+  home             : # null (default), "absolute or relative URL to link to author homepage"
   bitbucket        :
   codepen          :
   dribbble         :
@@ -126,11 +126,11 @@ author:
   keybase          :
   instagram        :
   lastfm           :
-  linkedin         : # "john-doe-12345678" (the last part of your profile url, e.g. https://www.linkedin.com/in/john-doe-12345678)
+  linkedin         : # "john-doe-12345678" (the last part of your profile URL, e.g. https://www.linkedin.com/in/john-doe-12345678)
   pinterest        :
   soundcloud       :
-  stackoverflow    : # "123456/username" (the last part of your profile url, e.g. https://stackoverflow.com/users/123456/username)
-  steam            : # "steamId" (the last part of your profile url, e.g. https://steamcommunity.com/id/steamId/)
+  stackoverflow    : # "123456/username" (the last part of your profile URL, e.g. https://stackoverflow.com/users/123456/username)
+  steam            : # "steamId" (the last part of your profile URL, e.g. https://steamcommunity.com/id/steamId/)
   tumblr           :
   twitter          : RemminaProject
   vine             :
@@ -141,24 +141,24 @@ author:
 # Site Footer
 footer:
   links:
-    - label: "Twitter"
-      icon: "fab fa-fw fa-twitter-square"
-      url: "https://twitter.com/RemminaProject"
-    - label: "Reddit"
-      icon: "fab fa-fw fa-reddit"
-      url: "https://www.reddit.com/r/Remmina/"
     - label: "GitLab"
       icon: "fab fa-fw fa-gitlab"
       url: "https://gitlab.com/Remmina/Remmina"
-    - label: "Matrix"
-      icon: "fa fa-fw fa-matrix-org"
-      url: "https://riot.im/app/#/group/+remmina:matrix.org"
-    - label: "List"
-      icon: "fa fa-fw fa-envelope-open"
-      url: "https://lists.remmina.org/listinfo/users"
     - label: "IRC"
       icon: "fa fa-fw fa-commenting"
       url: "https://kiwiirc.com/client/irc.freenode.net/?nick=remminer|?#remmina/"
+    - label: "List"
+      icon: "fa fa-fw fa-envelope-open"
+      url: "https://lists.remmina.org/listinfo/users"
+    - label: "Matrix"
+      icon: "fa fa-fw fa-matrix-org"
+      url: "https://riot.im/app/#/group/+remmina:matrix.org"
+    - label: "Reddit"
+      icon: "fab fa-fw fa-reddit"
+      url: "https://www.reddit.com/r/Remmina/"
+    - label: "Twitter"
+      icon: "fab fa-fw fa-twitter-square"
+      url: "https://twitter.com/RemminaProject"
     - label: "Wiki"
       icon: "fa fa-fw fa-wikipedia-w"
       url: "https://gitlab.com/Remmina/Remmina/wikis/home"
diff --git a/_data/navigation.yml b/_data/navigation.yml
index e226e18..a2ad725 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -3,16 +3,14 @@
 main:
     - title: "About"
       url: /authors/
-    - title: "News"
-      url: /blog/
-    - title: "Join"
-      url: /contributing-to-remmina/
     - title: "Discover"
       url: /screenshots/
     - title: '<i class="fa fa-heart" aria-hidden="true" color="red"></i> Donate'
-      url: /donations/
-    - title: '<i class="fa fa-download" aria-hidden="true"></i>'
-      url: /how-to-install-remmina/
+      url: /donations/      
+    - title: "Join"
+      url: /contributing-to-remmina/
+    - title: "News"
+      url: /blog/
     - title: '<i class="fa fa-life-ring" aria-hidden="true"></i>'
       url: /support/
     - title: '<i class="fa fa-bar-chart" aria-hidden="true"></i>'
diff --git a/_pages/authors.md b/_pages/authors.md
index 13ed985..180c3d7 100644
--- a/_pages/authors.md
+++ b/_pages/authors.md
@@ -23,44 +23,34 @@ See the [AUTHORS](https://gitlab.com/Remmina/Remmina/blob/master/AUTHORS) for an
 If you are not listed and have contributed, feel free to update it.
 
 
-Sometimes Remmina makes the difference, and when it happens are the Remminers, our beloved users, that send us a message to say thank you.
-Here we keep track of them (when they agree), and if you want to show us some love, feel free to drop us a message.
-
-<blockquote>We are a Swiss based SME. We use remmina for all our users (Thinclients). The clients are updated on startup from a central server. This way, the end user doesn't need to hassle with anything but their work. They don't need to connect to a vpn or there is need for a special connection (even from an outside network). All that is handled by remmina (over ssh). The users don't even need a password other than there windows credentials. It's really maintanance free. As the admin I have great joy using remmina and have only positive experience using it. The developpers react fast for request. Keep up the good work and thanks for the awesome product.</blockquote>
+Here are messages from Remminers, our beloved users, (posted when they agree).
 
+<blockquote>We are a Swiss based SME. We use Remmina for all our users (thin clients). The clients are updated upon startup from a central server. This way, the end-user doesn't need to hassle with anything but their work. They don't need to connect to a VPN, nor is there need for a special connection (even from an outside network). All that is handled by Remmina (over SSH). The users don't even need a password other than their Windows credentials. It's really maintanance free. As the admin I have great joy using Remmina and have only positive experience using it. The developpers react to requests quickly. Keep up the good work and thanks for the awesome product.</blockquote>
 (Daniel Bolter - Switzerland)
 
-<blockquote>Remmina gives me a stable, advanced, easy-to-use and easy-to-update RDP client. It’s an essential component of using a Linux desktop in my consulting business, where I often need to access Windows servers. So I love using Remmina twice: the first time because it’s a great app, the second time because it makes the Linux desktop viable for me, and I love using Linux. This is why it’s one of the applications I support with a small monthly donation. Tim Richardson, GrowthPath (www.growthpath.com.au)</blockquote>
-
+<blockquote>Remmina gives me a stable, advanced, easy-to-use and easy-to-update RDP client. It’s an essential component of using a Linux desktop in my consulting business, where I often need to access Windows servers. So I love using Remmina twice: The first time because it’s a great app, the second time because it makes the Linux desktop viable for me, and I love using Linux. This is why it’s one of the applications I support with a small monthly donation. Tim Richardson, GrowthPath (www.growthpath.com.au)</blockquote>
 ([Tim Richardson  - GrowthPath founder](https://www.growthpath.com.au/people/growthpath-team-2))
 
-<blockquote>For a Remote Desktop application at North Kinangop Catholic Hospital in Kenya we were looking for a RDP client to be installed on 10 Raspberry PI 2 computers, equipped with Xubuntu. Remmina was the best solution for efficiency, reliability, look-and-feel. Kenyan people are very happy about Remmina, and they prefer it to the classic RDP connection for Windows, that is used on about 35 clients.</blockquote>
-
-(Massimo Montelatici - Volunteer IT Consultant @[North Kinangop Catholic Hospital](https://www.northkinangop.com/index.php/en/))
-
-<blockquote>I use Remmina literally every day at work to manage 400+ SSH connections and a handful of RDP connections. Without it running Linux simply would not be possible as I’d have to use mRemote / Windows instead (or somehow, remember 400 hostnames off the top of my head!) As more and more people at our company switch over to Linux, I will ask about a company donation to the project also. Again many thanks for the good work!</blockquote>
+<blockquote>For a Remote Desktop application at North Kinangop Hospital in Kenya we were looking for a RDP client to be installed on 10 Raspberry Pi 2 computers, equipped with Xubuntu. Remmina was the best solution for efficiency, reliability, look-and-feel. Kenyan people are very happy about Remmina, and they prefer it to the classic RDP connection for Windows, that is used on about 35 clients.</blockquote>
+(Massimo Montelatici - Volunteer IT Consultant @[North Kinangop Hospital](https://www.northkinangop.com/index.php/en/))
 
+<blockquote>I use Remmina literally every day at work to manage 400+ SSH connections and a handful of RDP connections. Without it, running Linux simply would not be possible as I’d have to use mRemote/Windows instead (or somehow, remember 400 hostnames off the top of my head!) As more and more people at our company switch over to Linux, I will ask about a company donation to the project. Again, many thanks for the good work!</blockquote>
 (Richard Lees - DevOps Engineer)
 
 <blockquote>I've been using Remmina now for several years.  I love how it's integrated into Ubuntu by default and how I can access the multiple platforms I have to support in one application.
 I mostly use RDP and VNC (Ultra VNC).
-Anyone reading this should open up their pocket book and donate to the project and others like it.
+Anyone reading this should open up their pocket book and donate to the project and others like it. (*)
 
 Open Source and Free Software (they're different) suffer from a lack of funding and if you've come to rely on an application like I have with Remmina you want to see it thrive, succeed and have longevity.
-You can't do that with well wishes and thank you's...so; open up your wallet and flip them some cash.
+You can't do that with well wishes and thank you's…so; open up your wallet and flip them some cash.
 Make it meaningful like I did, show them you care.
-After you tossed Remmina some cash think about other open source projects you
-like, perhaps Wikipedia, Ubuntu Foundation, FreeBSD foundation, FireFox (Thunderbird too!) and the MANY MANY other great projects...I could keep going! Show them love with cash.
+After you tossed Remmina some cash think about other libre software projects you like,
 
-Lastly, there are lots of corporations making tons of cash off the backs of volunteer driven open source and free code.
-If you're a corporate interest making buckets of money then cut a BIG FAT CHECK to the projects you leverage.
-I can name a few like Dell, HP, IBM, Google, Amazon, CISCO, BIT Defender...
-Who really can't be mentioned in the same breath as the afore mentioned is a recent company I've run into that gives no mention of the OS they chose to use on their "BOX".
-They use OpenWRT and other Open Source Software and I'm sure they didn't kick any money back to OpenWRT.
-Company's are abusers not users in my view.  I know of many many others, I should make a list.
+(*)
 
 As a person with moral fiber (unlike greedy corporate interests) lets make a conscious decision to be generous and not just because of a special holiday or occasion.
-The occasion is because you though of it, recognized what you use, how you use and that you benefit from someone elses hard work so show the projects you benefit from love AND RESPECT...CUT'M A CHECK!
+The occasion is because you though of it, recognized what you use, how you use and that you benefit from someone elses hard work so show the projects you benefit from love AND RESPECT…CUT'M A CHECK!
 </blockquote>
-
 (Rafael Wolf owner of [EITS, LLC, dba Express IT Solutions](https://eitsonline.com)  - Kalamazoo, MI 49048 - USA)
+
+(*) ////Shortened by editor.
\ No newline at end of file
diff --git a/_pages/contributing-to-remmina.md b/_pages/contributing-to-remmina.md
index e1c165d..131bfea 100644
--- a/_pages/contributing-to-remmina.md
+++ b/_pages/contributing-to-remmina.md
@@ -9,48 +9,7 @@ toc_sticky: true
 ---
 Welcome, we are a kind, open-minded, simple community. All help welcome, in any way you can think of.
 
-## Documenting
-Submit user and developer guides in any (accessible) format you want (screencasts, PDF, HTML, Open Document, .gs, .ps, LaTeX, GitLab wiki , etc).
-* [Wiki](https://gitlab.com/Remmina/Remmina/wikis/home)
-* [Dev documentation](https://remmina.gitlab.io/remminadoc.gitlab.io)
-Commenting the source code and writing checks is also an ongoing process.
-
-## Videos
-- As short as you can. Around 2 minutes to maximum 4 minutes.
-- Avoid showing copyrighted content, even the Windows desktop icons should not be shown.
-
-Videos demonstrating different ways to use Remmina, the more the merrier!
-The original video is needed, as it will be uploaded to video streaming services, if you need support let us know.
-The most wanted Videos are:
-
-- Configuration and use of a basic RDP profile, quickly showing the most common controls (resizes, toolbar placement, screenshots, …).
-- Creation of a default profile.
-- Cration of and connection to a VNC server.
-- Using a basic SSH tunnel.
-
-### Disclaimer
-Uploading your video to video streaming services, the Remmina project will keeps the generated ad revenue.
-You can add a watermark with the details you want to share, and a caption will be added in the linked video.
-Pick a suitable license, like CC-BY-SA 4.0-intl.
-
-Sending an unedited video is fine too.
-
-### Desktop/screen video recorder
-- [SimpleScreenRecorder](https://www.maartenbaert.be/simplescreenrecorder/)
-- [OBS Studio](https://obsproject.com/)
-
-### Video editors
-There are many video editors for Linux|GNU. [OpenShot](https://www.openshot.org/) is simple enough.
-To produce good looking videos choose a 1080p profile.
-
-### Share your videos with us
-If you don't want to use reep.io, get in contact at admin@remmina.org.
-[reep.io](https://reep.io/) is a P2P file sharing system, meaning there are no servers in the middle.
-
-## Screenshots
-Send in pictures or screengrabs of your setup.
-
-## Writing code
+## Coding
 **Remmina** uses the [fork and pull](https://stackoverflow.com/questions/11582995/what-is-the-fork-pull-model-in-github) model.
 If you&#8217;d like to make changes to this project, the following steps will get you there!
 
@@ -77,9 +36,11 @@ Similarly, we have a quite important list of feature requests, that are labeled
   * Separate plugin processes from the main process to improve stability.
   * Write an additional plugin system to write plugins also in Python and eventually Ruby.
 
-## Report bugs, ideas, issues
-Install it, use it and report What doesn&#8217;t work, is missing, or ugly. Don&#8217;t hesitate to let us know.
-For bug and feature requests, use [GitLab issues](https://gitlab.com/Remmina/Remmina/issues) or ask on IRC. #remmina on freenode.
+## Documentation
+Submit user and developer guides in any (accessible) format you want (screencasts, PDF, HTML, Open Document, .gs, .ps, LaTeX, GitLab wiki , etc).
+* [Wiki](https://gitlab.com/Remmina/Remmina/wikis/home)
+* [Dev documentation](https://remmina.gitlab.io/remminadoc.gitlab.io)
+Commenting the source code and writing checks is also an ongoing process.
 
 ## Donating
 Financial contributions help make Remmina a lot.
@@ -87,4 +48,46 @@ More info to be found on the [Remmina website donation page](/donations/).
 See [THANKS.md](https://gitlab.com/Remmina/Remmina/master/THANKS.md) for a list of all the great supporters.
 
 ## Merchandise
-From our store on [TEEPUBLIC](http://tee.pub/lic/CfbUoWiygXM) you can get [mugged](http://tee.pub/lic/fgVKOyGjHgc), your ThinkPad [covered](http://tee.pub/lic/fgVKOyGjHgc) and clad in this most compelling [T-shirt](http://tee.pub/lic/fgVKOyGjHgc).
\ No newline at end of file
+From our store on [TEEPUBLIC](http://tee.pub/lic/CfbUoWiygXM) you can get [mugged](http://tee.pub/lic/fgVKOyGjHgc), your ThinkPad [covered](http://tee.pub/lic/fgVKOyGjHgc) and clad in this most compelling [T-shirt](http://tee.pub/lic/fgVKOyGjHgc).
+
+## Report bugs, ideas, issues
+Install it, use it and report What doesn&#8217;t work, is missing, or ugly. Don&#8217;t hesitate to let us know.
+For bug and feature requests, use [GitLab issues](https://gitlab.com/Remmina/Remmina/issues) or ask on IRC. #remmina on freenode.
+
+## Screenshots
+Send in pictures or screengrabs of your setup.
+
+##Translation
+Help translate Remmina to your language.
+* [Weblate](https://hosted.weblate.org/projects/remmina/)
+
+## Videos
+- As short as you can. Around 2 minutes to maximum 4 minutes.
+- Avoid showing copyrighted and distracting content, even custom/other desktop icons should not be shown.
+
+Videos demonstrating different ways to use Remmina, the more the merrier!
+The original video is needed, as it will be uploaded to video streaming services, if you need support let us know.
+These would make good topics for videos:
+
+- Configuration and use of a basic RDP profile, quickly showing the most common controls (resizes, toolbar placement, screenshots, …).
+- Creation of a default profile.
+- Cration of and connection to a VNC server.
+- Using a basic SSH tunnel.
+
+### Disclaimer
+Your video will be uploaded to video streaming services, under the respective Remmina account at each site.
+You can add a watermark with the details you want to share, and a caption will be added in the linked video.
+Pick a suitable license, like CC-BY-SA 4.0-intl.
+Sending an unedited video is fine too.
+
+### Desktop/screen video recorder
+- [SimpleScreenRecorder](https://www.maartenbaert.be/simplescreenrecorder/)
+- [OBS Studio](https://obsproject.com/)
+
+### Video editors
+There are many video editors for Linux|GNU. [OpenShot](https://www.openshot.org/) is good.
+To produce good looking videos choose a 1080p profile.
+
+### Share your videos with us
+If you don't want to use reep.io, get in contact at admin@remmina.org.
+[reep.io](https://reep.io/) is a P2P file-sharing system, meaning there are no servers in the middle.
\ No newline at end of file