Merge remote-tracking branch 'upstream/master'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-
+labels: ["bug", "triage"]
 ---
 
 **Describe the bug**

SECURITY.md

@@ -3,14 +3,7 @@
 ## How to contact us
 
 Please send any issue that you feel affects the
-security of Trustroots to **[email protected]** or [via our contact form](https://www.trustroots.org/contact).
-
-If we do not respond promptly, please send us a quick
-message _without details_ to one of the following:
-
-- An issue at [GitHub](https://github.com/Trustroots/trustroots/issues)
-- Message [@trustroots](https://twitter.com/trustroots) on Twitter.
-- Give us a heads up on IRC in [#trustroots](https://webchat.freenode.net/?channels=trustroots) on Freenode.
+security of Trustroots to **[email protected]**.
 
 ## Bug Bounties
 

docs/Volunteering.md

@@ -1,39 +1 @@
-_Nobody can do everything, but everyone can do something…_
-
-For some background reading check [Trustroots Foundation](https://www.trustroots.org/foundation) and [Teams](https://www.trustroots.org/team) pages.
-
-Make sure to familiarise yourself with our [volunteer code of conduct](https://github.com/Trustroots/trustroots/blob/master/CODE_OF_CONDUCT.md#readme).
-
-Generally speaking, it's helpful if you have a good tolerance for some kind of chaos. ;) It's easier to work with people who can commit for longer term, who are proactive and _can_ work autonomously. We often work together so good communication skills definitely help.
-
-**Aight! Ready to help out Trustroots?**
-
-Please start by joining our [volunteer chat](Chat.md). You should start by introducing yourself; what have you done in the past, what are you interested in and little bit about yourself. We're always happy to hear from you even if you don't know what you can do.
-
-**How to get started with:**
-
-- [Development](Development-Getting-Started.md)
-- [Design](Design-Getting-Started.md)
-- [Translating](Translating-Getting-Started.md)
-- [Photography](Photos.md)
-- [Copywriting & Proofreading](Copywriting-Getting-Started.md)
-
-Contact us if you want to help with
-- Social media
-- Support
-- Legal
-- Anything else
-
-Some of the easiest ways to help _right now_ are:
-
-**Use the website:** travel and host! Test it out with different mobile devices, browsers, and screen sizes. Report bugs by opening [an issue on GitHub](https://github.com/Trustroots/trustroots/issues/new) or [drop us a message](https://www.trustroots.org/contact).
-
-**Got Space?** Let us know if you have a space at your disposal that you want to provide to a Trustroots collective or a Hackathon. Check out some <a href="https://nomadwiki.org/en/Trustroots_Iberian_Collective_2018">previous</a> Trustroots spaces.
-
-**Spread the word!** Honestly, the biggest thing that helps us is helping more people find out about Trustroots. Tell your friends and fellow travellers about Trustroots and tag us on social media. You can follow us on [Twitter](https://twitter.com/trustroots), [Instagram](https://www.instagram.com/trustroots/), [Facebook](https://www.facebook.com/trustroots.org/) and our [blog](https://ideas.trustroots.org/).
-
-If you write a post about Trustroots on your blog, definitely [let us know](https://www.trustroots.org/contact) so that we can share it.
-
-If you're still not sure and just want to chat to some humans, introduce yourself in our [volunteer chat](Chat.md). All are welcome and we'll be happy to help you get started.
-
-_Thanks for helping out, we really appreciate it!_ ❤️
+Online social networks around the gift economy should be less dependant on individuals running servers and dealing with bureaucracy. **Nostr** is a great way to turn this into a reality. Please check out the [nostroots repository](https://github.com/trustroots/nostroots) if you want to help with this.

docs/index.md

@@ -15,6 +15,7 @@ title: Trustroots Team Guide
 
 [_Become a volunteer and make a difference!_](Volunteering.md)
 
+<!--
 ## Where to report bugs & feature suggestions
 
 - [Issues about the website](https://github.com/Trustroots/trustroots/issues)
@@ -75,3 +76,5 @@ Is Trustroots.org down or is it just me? Check
 - [Contact us via our support form](https://www.trustroots.org/contact).
 - We are using [chat rooms](Chat.md) on Matrix for volunteer, day-to-day communications.
 - It's also great if you join the [hacker circle](https://www.trustroots.org/circles/hackers)!
+
+-->

public/locales/de/contacts.json

@@ -41,5 +41,6 @@
     "(additional {{count}} pending)": "(weitere {{count}} offen)",
     "(additional {{count}} pending)_plural": "(weitere {{count}} offen)",
     "Wait a moment…": "Warte einen Moment…",
-    "Connected since {{date, LL}}": "Verbunden seit {{date, LL}}"
+    "Connected since {{date, LL}}": "Verbunden seit {{date, LL}}",
+    "Requested {{date, LL}}": "Angefragt {{date, LL}}"
 }

public/locales/de/core.json

@@ -58,5 +58,7 @@
     "Support": "Support",
     "Skip to main content": "Zum Hauptinhalt springen",
     "Foundation": "Stiftung",
-    "Meet": "Treffen"
+    "Meet": "Treffen",
+    "Account": "Konto",
+    "Contribute": "Beitragen"
 }

public/locales/de/offers.json

@@ -31,5 +31,7 @@
     "Send a message": "Schick eine Nachricht",
     "Add it to map!": "Zur Karte hinzufügen!",
     "Just making a dinner and would like to invite people over?": "Gerade am Abendessen vorbereiten und Lust Leute einzuladen?",
-    "Meetups stay visible on map at most one month.": "Treffen bleiben höchstens einen Monat lang auf der Karte sichtbar."
+    "Meetups stay visible on map at most one month.": "Treffen bleiben höchstens einen Monat lang auf der Karte sichtbar.",
+    "Travelling? Organising an event?": "Auf Reisen? Am Organisieren einer Veranstaltung?",
+    "Travelling? Organising an event? Just making a dinner and would like to invite people over?": "Auf Reisen? Am Organisieren einer Veranstaltung? Sie bereiten gerade ein Abendessen vor und möchten Leute einladen?"
 }

public/locales/de/pages.json

@@ -25,7 +25,7 @@
     "podcast": "Podcast",
     "Blog": "Blog",
     "Apr 19th": "19. April",
-    "Account": "Account",
+    "Account": "Konto",
     "Find people": "Finde Mitglieder",
     "I'm a developer and I want to help!": "Ich bin ein Entwickler und will helfen!",
     "I don't find a circle that suits me": "Ich finde keinen Kreis, der zu mir passt",

public/locales/en/core.json

@@ -3,6 +3,7 @@
   "Account": "Account",
   "Back": "Back",
   "Blog": "Blog",
+  "Bugs & Features": "Bugs & Features",
   "Cancel": "Cancel",
   "Change map style": "Change map style",
   "Circles": "Circles",

public/locales/en/pages.json

@@ -33,8 +33,10 @@
   "Be respectful of others and restrain from any kind of abusive behaviour.": "Be respectful of others and restrain from any kind of abusive behaviour.",
   "Be yourself, helpful, kind, responsible.": "Be yourself, helpful, kind, responsible.",
   "BeWelcome: Writing to your host": "BeWelcome: Writing to your host",
+  "Before you go through the trouble of creating a new issue, use the search bar to see if there’s already an issue about the bug. You can check when it’s created, the responses and who’s working on it.": "Before you go through the trouble of creating a new issue, use the search bar to see if there’s already an issue about the bug. You can check when it’s created, the responses and who’s working on it.",
   "Blog": "Blog",
   "Board": "Board",
+  "Bugs & Features": "Bugs & Features",
   "CIC on Wikipedia": "CIC on Wikipedia",
   "Callum, Carlos and Kasper were also part of the founding team.": "Callum, Carlos and Kasper were also part of the founding team.",
   "Circles": "Circles",
@@ -65,6 +67,7 @@
   "Fill your profile": "Fill your profile",
   "Find members": "Find members",
   "Find people": "Find people",
+  "First of all: thank you for taking the time and making an effort in reporting a bug. We have a technical workspace where we document all our bugs, suggestions and improvement. If you go to our <2>GitHub</2> you can see all documented issues we currently have.": "First of all: thank you for taking the time and making an effort in reporting a bug. We have a technical workspace where we document all our bugs, suggestions and improvement. If you go to our <2>GitHub</2> you can see all documented issues we currently have.",
   "Follow Trustroots": "Follow Trustroots",
   "For Writing Great Messages": "For Writing Great Messages",
   "For developers": "For developers",
@@ -86,6 +89,7 @@
   "How can I help?": "How can I help?",
   "How can I remove my account": "How can I remove my account",
   "How can I remove my account?": "How can I remove my account?",
+  "How do I report a bug?": "How do I report a bug?",
   "How do I report a member that violates the rules?": "How do I report a member that violates the rules?",
   "How do you want to make the project financially sustainable?": "How do you want to make the project financially sustainable?",
   "How does it work?": "How does it work?",
@@ -95,13 +99,15 @@
   "I'm a developer and I want to help!": "I'm a developer and I want to help!",
   "If you ignore these rules, we might stop our services for you without further notice.": "If you ignore these rules, we might stop our services for you without further notice.",
   "If you navigate to the profile of a user, you will find a link that says \"Report member\" that will lead you to a report form. Also, at any point, you can <1>contact us</1> with your report.": "If you navigate to the profile of a user, you will find a link that says \"Report member\" that will lead you to a report form. Also, at any point, you can <1>contact us</1> with your report.",
+  "If you want to respond or if you need to create a new issue, you have to sign up at Github. It takes a few minutes and this way, you’ll get an email about any updates or responses. When you create a new issue, you’ll see some questions to help us to get a good idea of the issue. Fill in as much as you can and submit your issue.": "If you want to respond or if you need to create a new issue, you have to sign up at Github. It takes a few minutes and this way, you’ll get an email about any updates or responses. When you create a new issue, you’ll see some questions to help us to get a good idea of the issue. Fill in as much as you can and submit your issue.",
   "If you wish to stay completely anonymous online, please check this guide by Matomo:": "If you wish to stay completely anonymous online, please check this guide by Matomo:",
   "If you would like to help out developing our mobile apps, read more about <2>developing Trustroots</2> . <br/>": "If you would like to help out developing our mobile apps, read more about <2>developing Trustroots</2> . <br/>",
   "If you would like to help solve this, <2>get in touch!</2>": "If you would like to help solve this, <2>get in touch!</2>",
   "In Dutch.": "In Dutch.",
   "In Finnish.": "In Finnish.",
   "In German.": "In German.",
   "In Italian. 2nd audio track from 10:50 to 25:00.": "In Italian. 2nd audio track from 10:50 to 25:00.",
+  "In case you can’t find any existing issue about your suggestion, you can create a new one. When you create a new issue, you’ll see some questions to help us to get a good idea of the issue. Fill in as much as you can and submit your issue.": "In case you can’t find any existing issue about your suggestion, you can create a new one. When you create a new issue, you’ll see some questions to help us to get a good idea of the issue. Fill in as much as you can and submit your issue.",
   "In plenty of public and private ways: <2>drop us a message</2>, <5>comment on our blog</5>, <8>report bugs at GitHub</8>, reach out via <10>Twitter</10> or <13>Facebook</13> and to directly contact individuals, see <15>the team </15> page.": "In plenty of public and private ways: <2>drop us a message</2>, <5>comment on our blog</5>, <8>report bugs at GitHub</8>, reach out via <10>Twitter</10> or <13>Facebook</13> and to directly contact individuals, see <15>the team </15> page.",
   "In the future, we would like to host a support ticket system on our own servers.": "In the future, we would like to host a support ticket system on our own servers.",
   "In the initial phase we were focusing on getting especially hitchhikers on board and making the site ideal for that. Our background is within Hitchhikers community and in <2>Hitchwiki</2>. The site will obviously remain rather alternative and true to its roots, even when we introduce it to new communities. <br/>": "In the initial phase we were focusing on getting especially hitchhikers on board and making the site ideal for that. Our background is within Hitchhikers community and in <2>Hitchwiki</2>. The site will obviously remain rather alternative and true to its roots, even when we introduce it to new communities. <br/>",
@@ -266,14 +272,17 @@
   "We want a world that encourages trust, adventure and intercultural\n      connections.": "We want a world that encourages trust, adventure and intercultural\n      connections.",
   "We want a world that encourages trust, adventure and intercultural connections. For that to happen through Trustroots we have written down some basic rules that apply to everyone. Please respect these rules:": "We want a world that encourages trust, adventure and intercultural connections. For that to happen through Trustroots we have written down some basic rules that apply to everyone. Please respect these rules:",
   "We will never, ever sell your profile data to anyone or try to otherwise use it commercially.": "We will never, ever sell your profile data to anyone or try to otherwise use it commercially.",
+  "We work on these kind of things in our technical space on <2>GitHub</2>. Here you can see everything that is currently documented. First use the search bar to see if someone else has submitted already your suggestion or if you can find a similar one. You have to create an account in order to do so. It takes a few minutes and this way, you’ll get an email about any updates or responses.": "We work on these kind of things in our technical space on <2>GitHub</2>. Here you can see everything that is currently documented. First use the search bar to see if someone else has submitted already your suggestion or if you can find a similar one. You have to create an account in order to do so. It takes a few minutes and this way, you’ll get an email about any updates or responses.",
   "We would love to! However, it seems we cannot because of how our mobile app is built.<br/><br/>We don't have resources yet to build a separate \"native app\" for Android so we're using <5>Expo.io</5> framework instead.": "We would love to! However, it seems we cannot because of how our mobile app is built.<br/><br/>We don't have resources yet to build a separate \"native app\" for Android so we're using <5>Expo.io</5> framework instead.",
   "We'll aim to add ways to the site that will fill your trips and your life with adventure! Imagine walking around in a city you're visiting for the first time and suddently you start receiving invitations from people to stay with them or go to awesome or inspiring events, or just to a dumpster dive dinner. That's the adventure Trustroots wants to enable. And circles is a step towards this.": "We'll aim to add ways to the site that will fill your trips and your life with adventure! Imagine walking around in a city you're visiting for the first time and suddently you start receiving invitations from people to stay with them or go to awesome or inspiring events, or just to a dumpster dive dinner. That's the adventure Trustroots wants to enable. And circles is a step towards this.",
+  "We’re always very happy to hear back from the community how we can improve our current features or have creative ideas for new ones. Bare in mind though all time is donated and we fully rely on volunteers, therefore only when we have plenty of volunteers, there’s time to work on these kind of suggestions.": "We’re always very happy to hear back from the community how we can improve our current features or have creative ideas for new ones. Bare in mind though all time is donated and we fully rely on volunteers, therefore only when we have plenty of volunteers, there’s time to work on these kind of suggestions.",
   "What are circles?": "What are circles?",
   "What are your expectations in regards with going through their town?": "What are your expectations in regards with going through their town?",
   "What is your long term vision?": "What is your long term vision?",
   "What's your legal status?": "What's your legal status?",
   "When searching for hosts, you can filter members by circles.": "When searching for hosts, you can filter members by circles.",
   "When you do travel or host, take care of your own and other's safety. Communicate to your guests and hosts what your expectations regarding safety are. <1>Remember to stay respectful</1> towards each other and each other's needs when it comes to safety.": "When you do travel or host, take care of your own and other's safety. Communicate to your guests and hosts what your expectations regarding safety are. <1>Remember to stay respectful</1> towards each other and each other's needs when it comes to safety.",
+  "Where can I suggest an improvement or new feature?": "Where can I suggest an improvement or new feature?",
   "Whether you’re a hardcore techie or know nothing of coding, we can use your help! See <2>volunteer page</2> get an idea of what’s in the making and what you can do to help out. You could help Trustroots out with as little effort as donating your photo's to use for our website or create content. If you're a (semi-)professional photographer or have any questions you can <5>contact us</5>.": "Whether you’re a hardcore techie or know nothing of coding, we can use your help! See <2>volunteer page</2> get an idea of what’s in the making and what you can do to help out. You could help Trustroots out with as little effort as donating your photo's to use for our website or create content. If you're a (semi-)professional photographer or have any questions you can <5>contact us</5>.",
   "Who are the board?": "Who are the board?",
   "Who decides what gets done?": "Who decides what gets done?",
@@ -295,6 +304,7 @@
   "Your circles will also show up in your profile, telling others more about you.": "Your circles will also show up in your profile, telling others more about you.",
   "Your data is yours": "Your data is yours",
   "Your emails": "Your emails",
+  "about Bugs & Features": "about Bugs & Features",
   "about circles": "about circles",
   "about technology": "about technology",
   "about the foundation": "about the foundation",

public/locales/en/support.json

@@ -1,5 +1,6 @@
 {
   "<0>Become a volunteer</0> and make a difference!": "<0>Become a volunteer</0> and make a difference!",
+  "Bugs & Features": "Bugs & Features",
   "Contact us": "Contact us",
   "Email": "Email",
   "Frequently Asked Questions": "Frequently Asked Questions",