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 translations #4042

Merged
merged 2 commits into from
May 21, 2018
Merged

New Crowdin translations #4042

merged 2 commits into from
May 21, 2018

Conversation

Siedlerchr
Copy link
Member

Enjoy!

@koppor koppor merged commit 3f902da into master May 21, 2018
@koppor koppor deleted the l10n_master branch May 21, 2018 12:59
Siedlerchr added a commit that referenced this pull request May 22, 2018
* upstream/master:
  update gradle to 4.7 (#4049)
  Add missing translation for "HTML to Unicode" (#4046)
  New Crowdin translations (#4042)
  Use all-text-fields magic also in BibTeX cleanup. (#4039)
  Shortittle bibtexkeypattern now also discards small words (#4030)
Siedlerchr added a commit that referenced this pull request May 22, 2018
* upstream/maintable-beta: (46 commits)
  update gradle to 4.7 (#4049)
  Add missing translation for "HTML to Unicode" (#4046)
  New Crowdin translations (#4042)
  Use all-text-fields magic also in BibTeX cleanup. (#4039)
  Switch to org.postgresql (#4031)
  Fix freeze when importing (#4037)
  Use JavaFX-native SVGPath for logo in About dialog (#4035)
  Remove reflection hack to set WM_CLASS (#4034)
  Fix initial freeze when downloading files
  Inline comment
  Move color related method
  Extract dialog service to field
  Extract dialog service to field
  Remove unused class
  Show tooltip for icon-based columns
  Remove commented-out code
  Convert static methods to instance members (and fix spelling)
  Fix formatting
  Fix formatting
  Remove unused argument
  ...

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/org/jabref/gui/GUIGlobals.java
#	src/main/java/org/jabref/gui/SidePaneComponent.java
#	src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
#	src/main/java/org/jabref/gui/groups/GroupSidePane.java
#	src/main/java/org/jabref/gui/help/AboutDialogView.java
#	src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
#	src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
#	src/main/resources/l10n/JabRef_en.properties
Siedlerchr added a commit that referenced this pull request May 25, 2018
* upstream/maintable-beta:
  update gradle to 4.7 (#4049)
  Add missing translation for "HTML to Unicode" (#4046)
  New Crowdin translations (#4042)
  Use all-text-fields magic also in BibTeX cleanup. (#4039)
  Shortittle bibtexkeypattern now also discards small words (#4030)
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.

2 participants