Squashed 'buildres/csl/csl-locales/' changes from d5ee85de8e..c38205618f

c38205618f copied .github/workflows/merge.yaml from styles 95ee22b362 Merge pull request #243 from jagrg/master 50498dce39 Fix pt-BR translation git-subtree-dir: buildres/csl/csl-locales git-subtree-split: c38205618f1a23eb80e8c5f33c8086648ca3874b
JabRef · Jan 1, 2022 · 9947276 · 9947276
1 parent a0bb7d4
commit 9947276
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
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:

diff --git a/locales-pt-BR.xml b/locales-pt-BR.xml
@@ -42,7 +42,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>