Merge branch 'master' into new-terms-for-1.0.2

zepinglee · Dec 24, 2021 · 0c3396c · 0c3396c
2 parents b04cd1f + c382056
commit 0c3396c
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 36 deletions.
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    tags-ignore:
+      - '**'
   workflow_dispatch:
     inputs:
       commit_message:
@@ -58,7 +60,7 @@ jobs:
       if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.0
+        ruby-version: 3.0.2
     - name: but use cache to speed that up
       if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
       uses: actions/cache@v2

diff --git a/.github/workflows/sheldon.yaml b/.github/workflows/sheldon.yaml
@@ -50,7 +50,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.0
+        ruby-version: 3.0.2
     - name: but use cache to speed that up
       uses: actions/cache@v2
       with:

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-ruby '3.0.0'
+ruby '3.0.2'
 source 'https://rubygems.org'
 
 gem 'rake'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/citation-style-language/Sheldon.git
-  revision: 38b6de75ac4dd86d6b3b47c172431e6e44f53ca0
+  revision: 38b1c813448737261a43060ccd3669d67dbfcad7
   specs:
     sheldon (1.0.30)
       citeproc-ruby
@@ -20,48 +20,64 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.13)
+    citeproc-ruby (1.1.14)
       citeproc (~> 1.0, >= 1.0.9)
-      csl (~> 1.5)
-    csl (1.5.2)
+      csl (~> 1.6)
+    csl (1.6.0)
       namae (~> 1.0)
-    csl-styles (1.0.1.10)
+      rexml
+    csl-styles (1.0.1.11)
       csl (~> 1.0)
     diff-lcs (1.4.4)
     diffy (3.4.0)
     dotenv (2.7.6)
     erubis (2.7.0)
-    faraday (1.3.0)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday_middleware (1.0.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday_middleware (1.1.0)
       faraday (~> 1.0)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     git_diff (0.4.3)
     hashdiff (0.3.7)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.6.1)
     multipart-post (2.1.1)
-    namae (1.0.2)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    namae (1.1.1)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    octokit (4.20.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ostruct (0.3.3)
+    ostruct (0.4.0)
     public_suffix (4.0.6)
     racc (1.5.2)
-    rake (13.0.3)
+    rake (13.0.6)
     reverse_markdown (2.0.0)
       nokogiri
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -76,7 +92,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -93,7 +109,7 @@ DEPENDENCIES
   sheldon!
 
 RUBY VERSION
-   ruby 3.0.0p0
+   ruby 3.0.2p107
 
 BUNDLED WITH
-   2.2.3
+   2.2.22
diff --git a/README.md b/README.md
@@ -1,16 +1,23 @@
-CSL Locales Repository
-======================
+<p align="center"><a href="https://citationstyles.org/" target="_blank"><img width="300" src="https://raw.githubusercontent.com/citation-style-language/logo/master/assets/rgb/%C2%ABCSL%C2%BB.svg" alt="CSL logo"></a></p>
 
-[![Build Status](https://travis-ci.org/citation-style-language/locales.svg?branch=master)](https://travis-ci.org/citation-style-language/locales)
-[![license](https://img.shields.io/badge/license-CC%20BY%20SA%203.0-blue.svg)](https://github.com/citation-style-language/locales#licensing)
-![languages](https://img.shields.io/badge/supported%20languages-52-orange.svg)
+<h1 align="center">Citation Style Language - Locales Repository</h1>
+
+<p align="center">
+  <a href="https://github.com/citation-style-language/styles#licensing"><img src="https://img.shields.io/badge/license-CC%20BY%20SA%203.0-blue.svg" alt="License"></a>
+  <a href="https://github.com/citation-style-language/styles/actions"><img src="https://github.com/citation-style-language/locales/workflows/Merge%20to%20release/badge.svg?event=push" alt="Build Status"></a>
+  <a href="https://img.shields.io/badge/supported%20languages-52-orange.svg" ><img src="https://img.shields.io/badge/supported%20languages-52-orange.svg" alt="Supported Languages"></a>
+</p>
+
+
+Introduction
+------------
 
 [github.com/citation-style-language/locales](https://github.com/citation-style-language/locales) is the official repository for Citation Style Language (CSL) locale files and is maintained by CSL project members.
-For more information, check out [CitationStyles.org](http://citationstyles.org/) and the [repository wiki](https://github.com/citation-style-language/locales/wiki).
+For more information, check out [CitationStyles.org](https://citationstyles.org/) and the [repository wiki](https://github.com/citation-style-language/locales/wiki).
 
 Licensing
 ---------
 
-All the locale files in this repository are released under the [Creative Commons Attribution-ShareAlike 3.0 Unported license](http://creativecommons.org/licenses/by-sa/3.0/).
-For attribution, any software using CSL locale files from this repository must include a clear mention of the CSL project and a link to [CitationStyles.org](http://citationstyles.org/).
+All the locale files in this repository are released under the [Creative Commons Attribution-ShareAlike 3.0 Unported license](https://creativecommons.org/licenses/by-sa/3.0/).
+For attribution, any software using CSL locale files from this repository must include a clear mention of the CSL project and a link to [CitationStyles.org](https://citationstyles.org/).
 When distributing these locale files, the listings of translators in the locale metadata must be kept as is.
diff --git a/locales-de-AT.xml b/locales-de-AT.xml
@@ -540,7 +540,7 @@
     </term>
     <term name="editortranslator" form="short">
       <single>Hrsg.&#160;&amp; Übers.</single>
-      <multiple>Hrsg.&#160;&amp; Übers</multiple>
+      <multiple>Hrsg.&#160;&amp; Übers.</multiple>
     </term>
 
     <!-- VERB ROLE FORMS -->

diff --git a/locales-de-CH.xml b/locales-de-CH.xml
@@ -526,7 +526,7 @@
     </term>
     <term name="editortranslator" form="short">
       <single>Hrsg.&#160;&amp; Übers.</single>
-      <multiple>Hrsg.&#160;&amp; Übers</multiple>
+      <multiple>Hrsg.&#160;&amp; Übers.</multiple>
     </term>
 
     <!-- VERB ROLE FORMS -->

diff --git a/locales-de-DE.xml b/locales-de-DE.xml
@@ -537,7 +537,7 @@
     </term>
     <term name="editortranslator" form="short">
       <single>Hrsg.&#160;&amp; Übers.</single>
-      <multiple>Hrsg.&#160;&amp; Übers</multiple>
+      <multiple>Hrsg.&#160;&amp; Übers.</multiple>
     </term>
 
     <!-- VERB ROLE FORMS -->

diff --git a/locales-pl-PL.xml b/locales-pl-PL.xml
@@ -7,6 +7,9 @@
     <translator>
       <name>Michal</name>
     </translator>
+    <translator>
+      <name>Pendzoncymisio</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
     <updated>2012-07-04T23:31:02+00:00</updated>
   </info>
@@ -49,7 +52,7 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">udostępniono</term>
+    <term name="accessed">dostęp</term>
     <term name="and">i</term>
     <term name="and others">i inni</term>
     <term name="anonymous">anonim</term>

diff --git a/locales-pt-BR.xml b/locales-pt-BR.xml
@@ -69,7 +69,7 @@
     <term name="forthcoming">a ser publicado</term>
     <term name="from">de</term>
     <term name="ibid">ibidem</term>
-    <term name="in">in</term>
+    <term name="in">em</term>
     <term name="in press">no prelo</term>
     <term name="internet">internet</term>
     <term name="interview">entrevista</term>

diff --git a/locales-th-TH.xml b/locales-th-TH.xml
@@ -575,7 +575,7 @@
     <term name="month-07">กรกฎาคม</term>
     <term name="month-08">สิงหาคม</term>
     <term name="month-09">กันยายน</term>
-    <term name="month-10">ตุลาคาม</term>
+    <term name="month-10">ตุลาคม</term>
     <term name="month-11">พฤศจิกายน</term>
     <term name="month-12">ธันวาคม</term>