Merge branch 'master' of github.com:raivo-otp/marketing-website

Gemfile.lock

@@ -28,7 +28,7 @@ GEM
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.23.5)
+    commonmarker (0.23.6)
     concurrent-ruby (1.1.10)
     deep_merge (1.2.2)
     dnsruby (1.61.9)
@@ -227,7 +227,7 @@ GEM
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.16.2)
-    nokogiri (1.13.8)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.25.1)
@@ -236,7 +236,7 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.6.0)
+    racc (1.6.1)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)

README.md

@@ -45,7 +45,7 @@ Raivo does not collect personally identifiable information in any way. Please re
 
 ## Credits
 
-Special thanks to [@cjerrington](https://github.com/cjerrington) and [@therealmrmuffin](https://github.com/therealmrmuffin) for contributing to this marketing website in its early stages.
+Special thanks to [@cjerrington](https://github.com/cjerrington) and other [contributors](https://github.com/raivo-otp/marketing-website/graphs/contributors) for developing this marketing website in its early stages.
 
 ## License
 

_config.yml

@@ -6,7 +6,7 @@ application_description                   : A native, lightweight, non-commercia
 application_app_icon_link                 : img/app-icon.png
 application_apple_app_store_ios_id        : 1459042137
 application_apple_app_store_ios_link      : https://apps.apple.com/app/raivo-otp/id1459042137?platform=iphone
-application_apple_app_store_ios_beta      : https://testflight.apple.com/join/v5529czJ
+application_apple_app_store_ios_beta      : https://testflight.apple.com/join/F3t8jXrL
 application_apple_app_store_mac_id        : 1498497896
 application_apple_app_store_mac_link      : https://apps.apple.com/app/raivo-otp/id1498497896
 application_presskit_link                 : https://github.com/raivo-otp/ios-application/tree/master/Assets
@@ -41,9 +41,9 @@ features                                  :
     description                           : Add (custom) icons to your one-time passwords and apply effects to them.
     icon                                  : sliders
   - title                                 : Dark mode
-    description                           : Discover the beauty of Ravo OTP's dark side with a fully featured dark mode.
+    description                           : Discover the beauty of Raivo OTP's dark side with a fully featured dark mode.
     icon                                  : moon
-  - title                                 : Powerfull search
+  - title                                 : Powerful search
     description                           : Search through all of your one-time passwords with one tap under your thumb.
     icon                                  : search
   - title                                 : Native & open source

_pages/donate.html

@@ -8,7 +8,7 @@
 
 <h1>Donate</h1>
 
-<p>I make the majority of my software available to the public and make sure that it is <strong>secure</strong> and <strong>add-free</strong>. One of my favorite projects that I've published is {{ site.application_name_full }}. It's available for free on the Apple App Store for iOS and MacOS.</p>
+<p>I make the majority of my software available to the public and make sure that it is <strong>secure</strong> and <strong>ad-free</strong>. One of my favorite projects that I've published is {{ site.application_name_full }}. It's available for free on the Apple App Store for iOS and MacOS.</p>
 
 <p>Because it is free and privacy friendly, more and more people are using {{ site.application_name_full }}. Unfortunately for me, the costs are therefore slowly increasing. In addition to the time I spend developing {{ site.application_name_full }}, I spend money on an Apple Developer license, domain names and hosting for the issuer icons and Apple Push Notification proxy server.</p>
 
@@ -19,4 +19,4 @@ <h1>Donate</h1>
 <a href="https://github.com/sponsors/mobime-org" class="icon-link" target="_blank" rel="noopener nofollow">
     {% include icon.html name='dollar-sign' %}
     <span class="text">Become a monthly sponsor on GitHub</span>
-</a>
+</a>

_pages/faq.html

@@ -74,11 +74,11 @@ <h1>FAQ</h1>
 {% endcapture %}
 {% capture answer %}
 	<p>Download {{ site.application_name_full }} from the iOS or MacOS App Store.</p>
-	<a href="{{ application_apple_app_store_ios_link }}" class="icon-link" target="_blank" rel="noopener nofollow">
+	<a href="{{ site.application_apple_app_store_ios_link }}" class="icon-link" target="_blank" rel="noopener nofollow">
 	    {% include icon.html name='download' %}
 	    <span class="text">Download {{ site.application_name_full }} for iOS</span>
 	</a>
-	<a href="{{ application_apple_app_store_mac_link }}" class="icon-link" target="_blank" rel="noopener nofollow">
+	<a href="{{ site.application_apple_app_store_mac_link }}" class="icon-link" target="_blank" rel="noopener nofollow">
 	    {% include icon.html name='download' %}
 	    <span class="text">Download {{ site.application_name_full }} for MacOS</span>
 	</a>
@@ -92,7 +92,7 @@ <h1>FAQ</h1>
 {% capture answer %}
 	<p>Yes, you can join the {{ site.application_name_full }} <i>beta</i> by downloading {{ site.application_name_full }} via Apple TestFlight.</p>
 
-	<a href="{{ application_apple_app_store_ios_beta }}" class="icon-link" target="_blank" rel="noopener nofollow">
+	<a href="{{ site.application_apple_app_store_ios_beta }}" class="icon-link" target="_blank" rel="noopener nofollow">
 	    {% include icon.html name='download' %}
 	    <span class="text">Download {{ site.application_name_full }} <i>beta</i></span>
 	</a>
@@ -197,7 +197,7 @@ <h1>FAQ</h1>
 	How do I restore from a ZIP-archive export?
 {% endcapture %}
 {% capture answer %}
-	<p>Unfortunately {{ site.application_name_full }} does not currently support restoring from your ZIP-archive export. This is an <a href="https://github.com/raivo-otp/ios-application/issues/22" target="_blank" rel="noopener nofollow">open feature request</a> tracked on GitHub. As an alternative way to restore from your ZIP-archive export, you can scan each QR-code in the HTML file of your ZIP-archive export manually.</p>
+	<p>In the settings screen, tap import and select a previously created {{ site.application_name_full }} ZIP-archive. Enter the password of the ZIP-archive (this is the master password of the {{ site.application_name_full }} installation with which you've created the export). Afterwards, all one-time passwords in the ZIP-archive will be added to your current {{ site.application_name_full }} installation.<p>
 {% endcapture %}
 {% include question_capture.html category='Usage' question=question answer=answer %}