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

Remove menu* from crowdin.yml #4094

Merged
merged 1 commit into from
Jun 4, 2018
Merged

Conversation

koppor
Copy link
Member

@koppor koppor commented Jun 4, 2018

Our JavaFX port does not need separate files anymore.

Refs #3873 #3877

@koppor koppor requested a review from tobiasdiez June 4, 2018 12:33
@koppor koppor added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jun 4, 2018
@Siedlerchr
Copy link
Member

Do we need to configure or resync sth at crowdin?

@tobiasdiez tobiasdiez merged commit 7fb3f37 into master Jun 4, 2018
@tobiasdiez tobiasdiez deleted the no-menu-files-at-crowdin-anymore branch June 4, 2018 12:48
@koppor
Copy link
Member Author

koppor commented Jun 4, 2018

I paused the synchronization. At a resume, crowdin should obey the new setting. The latest crowdin PR #4090 looks good from the side of Menu_*.properties.

Siedlerchr added a commit that referenced this pull request Jun 5, 2018
* upstream/master: (130 commits)
  Update gradle from 4.7 to 4.8 (#4102)
  Add gradle task downloadDependencies and use it at CircleCI (#4091)
  Set minimum java to 171 (#4095)
  Also use https in the CHANGELOG itself
  Add missing CHANGELOG entry
  Fix localiazation test
  Use official TempFolder extension for JUnit 5 tests
  Remove menu* from crowdin.yml (#4094)
  Merge recent changes to exporter/importer
  Add missing CHANGELOG entry
  New translations JabRef_en.properties (Vietnamese)
  New translations JabRef_en.properties (Dutch)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (German)
  New translations JabRef_en.properties (Greek)
  New translations JabRef_en.properties (Indonesian)
  New translations JabRef_en.properties (Italian)
  New translations JabRef_en.properties (Japanese)
  New translations JabRef_en.properties (Danish)
  New translations JabRef_en.properties (Norwegian)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/BasePanel.java
#	src/main/java/org/jabref/gui/PreviewPanel.java
#	src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
Siedlerchr added a commit that referenced this pull request Jun 6, 2018
* upstream/master: (89 commits)
  Fix that sometimes an empty side pane is shown (#4105)
  Update gradle from 4.7 to 4.8 (#4102)
  Add gradle task downloadDependencies and use it at CircleCI (#4091)
  Set minimum java to 171 (#4095)
  Also use https in the CHANGELOG itself
  Add missing CHANGELOG entry
  Fix localiazation test
  Use official TempFolder extension for JUnit 5 tests
  Remove menu* from crowdin.yml (#4094)
  Merge recent changes to exporter/importer
  Add missing CHANGELOG entry
  New translations JabRef_en.properties (Vietnamese)
  New translations JabRef_en.properties (Dutch)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (German)
  New translations JabRef_en.properties (Greek)
  New translations JabRef_en.properties (Indonesian)
  New translations JabRef_en.properties (Italian)
  New translations JabRef_en.properties (Japanese)
  New translations JabRef_en.properties (Danish)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants