Merge branch 'master' of https://github.com/Xenareee/landing

miraheze · Mar 1, 2024 · 2717ac8 · 2717ac8
2 parents 825b55b + 8b59269
commit 2717ac8
Show file tree

Hide file tree

Showing 23 changed files with 380 additions and 107 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,6 @@ Licensed under the GPLv3 (or later) LICENSE.
 
 # Security Vulnerabilities
 
-If you believe you have found a security vulnerability in any part of our code, please do not post it publicly by using our wikis or a public Phabricator task for that; rather, please read our [security page](https://meta.miraheze.org/wiki/Security) carefully, and follow the instructions to create a private one.
+If you believe you have found a security vulnerability in any part of our code, please do not post it publicly by using our wikis or a public Phorge task for that; rather, please read our [security page](https://meta.miraheze.org/wiki/Security) carefully, and follow the instructions to create a private one.
 
-As a quick overview, you can email security concerns to [email protected] which will open a phabricator task that is hidden from public view. If you'd like, you can instead directly create a security-related task [here](https://phabricator.miraheze.org/maniphest/task/edit/form/2/), but please leave the "Security" project on the issue.
+As a quick overview, you can email security concerns to [email protected] which will open a Phorge task that is hidden from public view. If you'd like, you can instead directly create a security-related task [here](https://issue-tracker.miraheze.org/maniphest/task/edit/form/2/), but please leave the "Security" project on the issue.
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
diff --git a/css/styles.css b/css/styles.css
@@ -634,8 +634,8 @@ progress {
 .container-md,
 .container-sm {
 	width: 100%;
-	padding-right: var(--bs-gutter-x, 0.75rem);
-	padding-left: var(--bs-gutter-x, 0.75rem);
+	padding-right: var(--bs-gutter-x, 0.75rem) !important;
+	padding-left: var(--bs-gutter-x, 0.75rem) !important;
 	margin-right: auto;
 	margin-left: auto;
 }

diff --git a/donate.php b/donate.php
@@ -55,7 +55,7 @@
 		_paq.push(['trackPageView']);
 		_paq.push(['enableLinkTracking']);
 		( function() {
-			var u = 'https://matomo.miraheze.org/';
+			var u = 'https://analytics.wikitide.net/';
 			_paq.push(['setTrackerUrl', u+'matomo.php']);
 			_paq.push(['setDocumentTitle', 'Landing - Donate']);
 			_paq.push(['setSiteId', 9838]);
@@ -75,7 +75,7 @@ function _amountInput( ele ) {
 			a.setAttribute( 'href', 'https://www.paypal.com/donate/?hosted_button_id=Q8ZN29LJVXP7L' + value );
 		}
 	</script>
-	<noscript><p><img src="https://matomo.miraheze.org/matomo.php?idsite=9838&amp;rec=1&amp;action_name=Landing_Donate" style="border: 0;" alt="Matomo" /></p></noscript>
+	<noscript><p><img src="https://analytics.wikitide.net/matomo.php?idsite=9838&amp;rec=1&amp;action_name=Landing_Donate" style="border: 0;" alt="Matomo" /></p></noscript>
 </head>
 
 <body>
@@ -185,7 +185,7 @@ function _amountInput( ele ) {
                         <p class="section-title text-white h5 mb-4">Contact us<span></span></p>
                         <p><i class="fa fa-envelope me-3"></i>sre [at] miraheze.org</p>
                         <p><i class="fa fa-globe me-3"></i><a href="https://meta.miraheze.org/wiki/Special:MyLanguage/Help_center" style="color: white;" title="On-wiki">On-wiki</a></p>
-                        <p><i class="fa fa-flag-checkered me-3"></i><a href="https://phabricator.miraheze.org" style="color: white;" title="Phabricator issue trakcer">Phabricator</a></p>
+                        <p><i class="fa fa-flag-checkered me-3"></i><a href="https://issue-tracker.miraheze.org" style="color: white;" title="Issue tracker">Issue tracker</a></p>
 
                         <div class="d-flex pt-2">
                             <a rel="me" class="btn btn-outline-light btn-social" href="https://mastodon.social/@miraheze" title="Mastodon"><i class="fab fa-mastodon"></i></a>

diff --git a/i18n/br.json b/i18n/br.json
@@ -0,0 +1,40 @@
+{
+	"@metadata": {
+		"authors": [
+			"Adriendelucca"
+		]
+	},
+	"about-heading": "Diwar-benn",
+	"sign-up": "Lakait hoc'h anv!",
+	"sign-in": "Kevreañ",
+	"support-us": "Skoazellit ac'hanomp!",
+	"learn-more": "Gouzout hiroc'h",
+	"features-text": "Perak e tibabfec'h Miraheze?",
+	"features-header": "AR PEZH A GINNIGOMP",
+	"features-adfree": "Kuit a vruderezh",
+	"features-mediawiki": "MediaWiki",
+	"features-community-text": "Kumuniezh",
+	"footer-terms": "Termenoù implijout",
+	"footer-privacy-policy": "Reolennoù prevezded",
+	"footer-translate": "Treiñ ar bajenn-mañ",
+	"footer-facebook-title": "Facebook",
+	"footer-twitter-title": "Twitter",
+	"footer-mastodon-title": "Mastodon",
+	"footer-discord-title": "Discord",
+	"back-to-top-title": "Distreiñ da grec'h ar bajenn",
+	"help-center": "Kreizenn sikour",
+	"home": "Degemer",
+	"faq": "FAG",
+	"more": "Muioc'h",
+	"blog-text": "Blog",
+	"status-text": "Statud",
+	"donate-heading": "Ober un donezon da vMiraheze",
+	"donate-amount": "Sammad",
+	"fundraiser-sitenotice-title": "Skoazellit ac'hanomp!",
+	"statistics-wikis": "Wikioù",
+	"statistics-users": "Implijerien",
+	"wikitype-technology": "Teknologiezh",
+	"wikitype-games": "C'hoarioù",
+	"wikitype-science": "Skiantoù",
+	"wikitype-education": "Deskadurezh"
+}
diff --git a/i18n/en.json b/i18n/en.json
@@ -62,11 +62,11 @@
 	"blog-text": "Blog",
 	"status-text": "Status",
 	"donate-heading": "Donate to Miraheze",
-	"donate-subheading": "Support Miraheze for years to come with your generation donation today!",
+	"donate-subheading": "Support Miraheze for years to come with your generous donation today!",
 	"header-donate-logo-text": "Miraheze Donate",
 	"donate-amount": "Amount",
 	"donate-note": "This form is for donations with PayPal (you may use credit/debit cards). You should select your local currency using the dropdown on the page.",
-	"fundraising-sitenotice": "For almost eight years now, Miraheze has provided it's over 300,000+ users with free hosting. Help us keep going for eight more years and longer! We're powered 100% by donations from people just like you. We're grateful to keep seeing impressive year-over-year traffic and community growth. With our impressive growth though, we need more infrastructure to handle increased demand. We ask you, earnestly, consider chipping in $5, $10, $20, or whatever you can afford. If 550 of Miraheze's 300,000+ users gave only $16 once a year, Miraheze would exceed its budget requirements.",
+	"fundraising-sitenotice": "For almost eight years now, Miraheze has provided its 300,000+ users with free hosting. Help us keep going for eight more years and longer! We're powered 100% by donations from people just like you. We're grateful to keep seeing impressive year-over-year traffic and community growth. With our impressive growth though, we need more infrastructure to handle increased demand. We ask you, earnestly, consider chipping in $5, $10, $20, or whatever you can afford. If 550 of Miraheze's 300,000+ users gave only $16 once a year, Miraheze would exceed its budget requirements.",
 	"fundraiser-sitenotice-title": "Help Us!",
 	"fundraising-sitenotice-button-text": "Learn how to help!",
 	"statistics-wikis": "Wikis",
@@ -76,7 +76,7 @@
 	"wikitype-header": "Wikis for a wide variety",
 	"wikitype-desc": "Miraheze offers wiki hosting service to a wide variety of wikis! Consider some potential use cases:",
 	"wikitype-technology": "Technology",
-	"wikitype-technology-desc": "Technology is everywhere, even in a toaster. Create and share encyclopedias, documentation, guides, knowledgebases, on a wide variety of tech topics, from FOSS to hardware to programming.",
+	"wikitype-technology-desc": "Technology is everywhere, even in a toaster. Create and share encyclopedias, documentation, guides, and knowledge bases on a wide variety of tech topics, from FOSS to hardware to programming.",
 	"wikitype-games": "Games",
 	"wikitype-games-desc": "No one knows games like you do. Hidden features, powerful mods, scrapped lore, you know it all. Build an encyclopedia that captures all of that, powered by flexibility like none other.",
 	"wikitype-tv": "TV/Entertainment",

diff --git a/i18n/fi.json b/i18n/fi.json
@@ -13,8 +13,13 @@
 	"welcome-text": "Tervetuloa Mirahezeen",
 	"description-text": "Miraheze on mainokseton ja yhteisökeskeinen wiki-isännöintialusta, jossa kuka tahansa voi luoda ilmaisen MediaWiki-pohjaisen wikin. Pyydä ilmaista wikiäsi jo tänään!",
 	"sign-up": "Rekisteröidy",
+	"sign-in": "Kirjaudu sisään",
 	"support-us": "Tue meitä!",
 	"features-text": "Ominaisuudet",
+	"features-header": "MITÄ TARJOAMME",
+	"features-adfree": "Mainosvapaa",
+	"features-customizability": "Muokattavuus",
+	"features-visualeditor": "VisualEditor-tuki",
 	"features-mediawiki": "MediaWiki",
 	"features-mediawiki-desc": "Miraheze käyttää [https://www.mediawiki.org MediaWiki]-ohjelmistoa, eli samaa kuin Wikipedia! Voit tehdä mitä tahansa kuvien ja videoiden lataamisesta artikkeleiden ja blogien kirjoittamiseen. Meillä on yli 300 laajennusta ja yli 25 ulkoasua, joista voit valita ja muokata kokemustasi MediaWikiin!",
 	"features-not-for-profit-text": "Voittoa tavoittelematon",
@@ -36,17 +41,23 @@
 	"footer-translate": "Käännä tämä sivusto",
 	"back-to-top-title": "Takaisin alkuun",
 	"help-center": "Ohjekeskus",
-	"home": "Koti",
+	"home": "Etusivu",
 	"faq": "Usein kysyttyä",
 	"more": "Lisää",
 	"wikidiscover-text": "Tutustu wikeihin",
-	"requestwiki-text": "Pyydä wikiä",
+	"requestwiki-text": "Aloita wiki",
 	"blog-text": "Blogi",
 	"status-text": "Tila",
-	"donate-heading": "Lahjoita",
+	"donate-heading": "Lahjoita Mirahezelle",
 	"header-donate-logo-text": "Miraheze Donate",
 	"donate-amount": "Määrä",
 	"donate-note": "Tämä lomake on PayPal-lahjoituksia varten (voit käyttää luotto- tai pankkikorttia). Valitse paikallinen valuuttasi lahjoitussivun pudotusvalikosta.",
 	"fundraising-sitenotice": "Kuten kaikki tiedätte, Miraheze on yhteisökeskeinen, mainokseton ja yhteisölähtöinen wikialusta, joka pyörii 100-prosenttisesti lahjoituksilla. Meillä on ollut onni nähdä liikenteen ja yhteisömme vaikuttavan vuosittaisen kasvun jatkuvan. Kasvun myötä tarvitaan kuitenkin lisäinfrastruktuuria lisääntyneen kapasiteetin hallintaan sekä varoja jo olemassa olevan infrastruktuurin maksamiseen. Pyydämmekin sinua harkitsemaan, lahjoittaisitko meille 5, 10, 20 puntaa tai minkä tahansa summan, johon sinulla on varaa. Jos vain 500 Mirahezen yli 100 000 käyttäjästä antaisi yhden dollarin ($1) kerran vuodessa, Mirahezen budjettitarve täyttyisi. Voit lahjoittaa [https://www.gofundme.com/f/$2 GoFundMe-sivumme], [https://paypal.me/mirahezelimited PayPalin] tai [https://github.com/sponsors/miraheze GitHub-sponsoriemme] kautta!\n Kiitokseksi tuestasi saat wikissä näkyvän tunnustuksen lahjoituksestasi, mikäli olet kertonut wikikäyttäjänimesi sen yhteydessä.",
-	"fundraiser-sitenotice-title": "Auta meitä!"
+	"fundraiser-sitenotice-title": "Auta meitä!",
+	"statistics-wikis": "wikiä",
+	"statistics-requests": "wikipyyntöä",
+	"statistics-users": "käyttäjää",
+	"statistics-powered": "Asiantuntijoiden tarjoama",
+	"wikitype-games": "Pelit",
+	"wikitype-education": "Koulutus"
 }