Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Crowdin updates #7247

Merged
merged 1 commit into from
Dec 26, 2020
Merged

New Crowdin updates #7247

merged 1 commit into from
Dec 26, 2020

Conversation

Siedlerchr
Copy link
Member

No description provided.

@Siedlerchr Siedlerchr merged commit 79f26ac into master Dec 26, 2020
@Siedlerchr Siedlerchr deleted the l10n_master branch December 26, 2020 18:04
Siedlerchr added a commit that referenced this pull request Dec 28, 2020
…dtask

* upstream/master:
  Bump xmlunit-core from 2.8.1 to 2.8.2 (#7251)
  Bump classgraph from 4.8.97 to 4.8.98 (#7250)
  Bump bcprov-jdk15on from 1.67 to 1.68 (#7249)
  Bump xmlunit-matchers from 2.8.1 to 2.8.2 (#7252)
  Bump unirest-java from 3.11.06 to 3.11.09 (#7254)
  Bump org.beryx.jlink from 2.23.0 to 2.23.1 (#7253)
  Bump pascalgn/automerge-action from v0.12.0 to v0.13.0 (#7255)
  Added a check to integrate with the flatpak package (#7248)
  New translations JabRef_en.properties (Chinese Traditional) (#7247)
  Update code-howtos.md
Siedlerchr added a commit that referenced this pull request Dec 30, 2020
* upstream/master: (201 commits)
  Only disable  move to file dir when path equals (#7269)
  Improved detection of long DOI's within text (#7260)
  Add missing author and fix name
  Fix style of highlighted checkboxes while searching in preferences (#7258)
  Updates to institution citation keys (#7210)
  Bump xmlunit-core from 2.8.1 to 2.8.2 (#7251)
  Bump classgraph from 4.8.97 to 4.8.98 (#7250)
  Bump bcprov-jdk15on from 1.67 to 1.68 (#7249)
  Bump xmlunit-matchers from 2.8.1 to 2.8.2 (#7252)
  Bump unirest-java from 3.11.06 to 3.11.09 (#7254)
  Bump org.beryx.jlink from 2.23.0 to 2.23.1 (#7253)
  Bump pascalgn/automerge-action from v0.12.0 to v0.13.0 (#7255)
  Added a check to integrate with the flatpak package (#7248)
  New translations JabRef_en.properties (Chinese Traditional) (#7247)
  Update code-howtos.md
  GitBook: [master] 5 pages and 25 assets modified
  New Crowdin updates (#7246)
  add language mapping for chinese
  remove chinese content
  fix hamcrest link
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
#	src/main/java/org/jabref/gui/exporter/SaveAction.java
#	src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
#	src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
#	src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
Siedlerchr added a commit that referenced this pull request Jan 1, 2021
* updateGradle7: (39 commits)
  try upgrading gradle
  Only disable  move to file dir when path equals (#7269)
  Improved detection of long DOI's within text (#7260)
  Add missing author and fix name
  Fix style of highlighted checkboxes while searching in preferences (#7258)
  Updates to institution citation keys (#7210)
  Bump xmlunit-core from 2.8.1 to 2.8.2 (#7251)
  Bump classgraph from 4.8.97 to 4.8.98 (#7250)
  Bump bcprov-jdk15on from 1.67 to 1.68 (#7249)
  Bump xmlunit-matchers from 2.8.1 to 2.8.2 (#7252)
  Bump unirest-java from 3.11.06 to 3.11.09 (#7254)
  Bump org.beryx.jlink from 2.23.0 to 2.23.1 (#7253)
  Bump pascalgn/automerge-action from v0.12.0 to v0.13.0 (#7255)
  Added a check to integrate with the flatpak package (#7248)
  New translations JabRef_en.properties (Chinese Traditional) (#7247)
  Update code-howtos.md
  GitBook: [master] 5 pages and 25 assets modified
  New Crowdin updates (#7246)
  add language mapping for chinese
  remove chinese content
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant