From a701293a4e17d34e81ec8ac52447412d82008313 Mon Sep 17 00:00:00 2001
From: gcxfd <i@rmw.link>
Date: Tue, 29 Mar 2022 13:34:05 +0800
Subject: [PATCH 1/2] t Subscribe

---
 default.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.hbs b/default.hbs
index 05836fe..c20abbf 100644
--- a/default.hbs
+++ b/default.hbs
@@ -62,9 +62,9 @@
                 </div>
 
                 {{#unless @member}}
-                    <a class="gh-head-button" href="#/portal/signup" data-portal="signup">Subscribe</a>
+                  <a class="gh-head-button" href="#/portal/signup" data-portal="signup">{{t 'Subscribe'}}</a>
                 {{else}}
-                    <a class="gh-head-button" href="#/portal/account" data-portal="account">Account</a>
+                  <a class="gh-head-button" href="#/portal/account" data-portal="account">{{t 'Account'}}</a>
                 {{/unless}}
             </div>
         </nav>

From fac92b46e295205f9d128a6fefcb63398e18ea1d Mon Sep 17 00:00:00 2001
From: GenZmeY <genzmey@gmail.com>
Date: Tue, 29 Mar 2022 21:43:37 +0300
Subject: [PATCH 2/2] Update autoupdate.yml

---
 .github/workflows/autoupdate.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml
index fdbd4f8..3cca06d 100644
--- a/.github/workflows/autoupdate.yml
+++ b/.github/workflows/autoupdate.yml
@@ -15,6 +15,7 @@ jobs:
       run: |
         git config --local user.email "github-actions[bot]@users.noreply.github.com"
         git config --local user.name "github-actions"
+        git config --local pull.rebase false
     - name: Add upstream repo
       run: git remote add upstream https://github.com/TryGhost/Casper.git
     - name: Checkout master