Merge pull request #792 from inkstitch/master

switch to main
2020-08-18 21:02:10 -04:00 · 2020-08-18 21:02:10 -04:00 · be671f837f
commit be671f837f
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -3,6 +3,7 @@ on:
  push:
    branches-ignore:
      - master
+      - main
    tags:
      - "v*"
 jobs:
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@ -9,7 +9,7 @@ jobs:
      - uses: actions/checkout@v2
        with:
          fetch-depth: 0
-          ref: master
+          ref: main
          token: ${{secrets.INKSTITCH_BUILDS_GITHUB_TOKEN}}
      - name: checkout submodules
        run: |
@ -32,10 +32,10 @@ jobs:

          make messages.po
          echo "uploading messages.po to crowdin"
-          java -jar crowdin-cli.jar -v upload -b master
+          java -jar crowdin-cli.jar -v upload -b main

          echo "downloading new translations"
-          java -jar crowdin-cli.jar -v pull -b master
+          java -jar crowdin-cli.jar -v pull -b main

          # Try to only commit if translations changed.  Crowdin will update all
          # files when a new translation string is added but we don't need to
@ -43,5 +43,5 @@ jobs:
          if git diff translations | grep -qE '^[-+]msgstr ".+"$'; then
            git add translations
            git commit -m "new translations from Crowdin"
-            git push https://github.com/inkstitch/inkstitch master
+            git push https://github.com/inkstitch/inkstitch main
          fi
--- a/translations/messages_af_ZA.po
+++ b/translations/messages_af_ZA.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: af\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: af_ZA\n"

--- a/translations/messages_ar_SA.po
+++ b/translations/messages_ar_SA.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: ar\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: ar_SA\n"

--- a/translations/messages_ca_ES.po
+++ b/translations/messages_ca_ES.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: ca\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: ca_ES\n"

--- a/translations/messages_cs_CZ.po
+++ b/translations/messages_cs_CZ.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: cs\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: cs_CZ\n"

--- a/translations/messages_da_DK.po
+++ b/translations/messages_da_DK.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: da\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: da_DK\n"

--- a/translations/messages_de_DE.po
+++ b/translations/messages_de_DE.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: de\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: de_DE\n"

--- a/translations/messages_el_GR.po
+++ b/translations/messages_el_GR.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: el\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: el_GR\n"

--- a/translations/messages_en_US.po
+++ b/translations/messages_en_US.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: en\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: en_US\n"

--- a/translations/messages_es_ES.po
+++ b/translations/messages_es_ES.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: es-ES\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: es_ES\n"

--- a/translations/messages_fi_FI.po
+++ b/translations/messages_fi_FI.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: fi\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: fi_FI\n"

--- a/translations/messages_fr_FR.po
+++ b/translations/messages_fr_FR.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: fr\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: fr_FR\n"

--- a/translations/messages_he_IL.po
+++ b/translations/messages_he_IL.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: he\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: he_IL\n"

--- a/translations/messages_hu_HU.po
+++ b/translations/messages_hu_HU.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: hu\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: hu_HU\n"

--- a/translations/messages_it_IT.po
+++ b/translations/messages_it_IT.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: it\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: it_IT\n"

--- a/translations/messages_ja_JP.po
+++ b/translations/messages_ja_JP.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: ja\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: ja_JP\n"

--- a/translations/messages_ko_KR.po
+++ b/translations/messages_ko_KR.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: ko\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: ko_KR\n"

--- a/translations/messages_nl_NL.po
+++ b/translations/messages_nl_NL.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: nl\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: nl_NL\n"

--- a/translations/messages_no_NO.po
+++ b/translations/messages_no_NO.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: no\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: no_NO\n"

--- a/translations/messages_pl_PL.po
+++ b/translations/messages_pl_PL.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: pl\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: pl_PL\n"

--- a/translations/messages_pt_BR.po
+++ b/translations/messages_pt_BR.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: pt-BR\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: pt_BR\n"

--- a/translations/messages_pt_PT.po
+++ b/translations/messages_pt_PT.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: pt-PT\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: pt_PT\n"

--- a/translations/messages_ro_RO.po
+++ b/translations/messages_ro_RO.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: ro\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: ro_RO\n"

--- a/translations/messages_ru_RU.po
+++ b/translations/messages_ru_RU.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: ru\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: ru_RU\n"

--- a/translations/messages_sr_SP.po
+++ b/translations/messages_sr_SP.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: sr\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: sr_SP\n"

--- a/translations/messages_sv_SE.po
+++ b/translations/messages_sv_SE.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: sv-SE\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: sv_SE\n"

--- a/translations/messages_tr_TR.po
+++ b/translations/messages_tr_TR.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: tr\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: tr_TR\n"

--- a/translations/messages_uk_UA.po
+++ b/translations/messages_uk_UA.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: uk\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: uk_UA\n"

--- a/translations/messages_vi_VN.po
+++ b/translations/messages_vi_VN.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: vi\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: vi_VN\n"

--- a/translations/messages_zh_CN.po
+++ b/translations/messages_zh_CN.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: zh_CN\n"

--- a/translations/messages_zh_TW.po
+++ b/translations/messages_zh_TW.po
@ -18,7 +18,7 @@ msgstr ""
 "X-Crowdin-Project: inkstitch\n"
 "X-Crowdin-Project-ID: 299419\n"
 "X-Crowdin-Language: zh-TW\n"
-"X-Crowdin-File: /master/messages.po\n"
+"X-Crowdin-File: /main/messages.po\n"
 "X-Crowdin-File-ID: 5\n"
 "Language: zh_TW\n"