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 erroneous escape character #3831

Merged
merged 1 commit into from
Mar 11, 2018
Merged

Conversation

HerrAachen
Copy link
Contributor

This seems to be an escape character that slipped into the localized text. Presumably a copy-and-paste error?

This seems to be an escape character that slipped into the localized text. Presumably a copy-and-paste error?
Copy link
Member

@Siedlerchr Siedlerchr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah thanks for spotting this

Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@tobiasdiez tobiasdiez merged commit 766d756 into JabRef:master Mar 11, 2018
Siedlerchr added a commit that referenced this pull request Mar 11, 2018
* upstream/master: (26 commits)
  Remove erroneous escape character (#3831)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (Tagalog)
  New translations JabRef_en.properties (Italian)
  New translations JabRef_en.properties (Indonesian)
  New translations JabRef_en.properties (Greek)
  New translations JabRef_en.properties (Japanese)
  New translations JabRef_en.properties (German)
  New translations JabRef_en.properties (Dutch)
  New translations JabRef_en.properties (Danish)
  New translations JabRef_en.properties (Chinese Simplified)
  New translations JabRef_en.properties (Vietnamese)
  New translations JabRef_en.properties (Turkish)
  New translations JabRef_en.properties (Swedish)
  New translations JabRef_en.properties (Norwegian)
  New translations JabRef_en.properties (Russian)
  New translations JabRef_en.properties (Portuguese, Brazilian)
  New translations JabRef_en.properties (Persian)
  New translations JabRef_en.properties (Spanish)
  New translations JabRef_en.properties (French)
  ...
Siedlerchr added a commit that referenced this pull request Mar 14, 2018
…drop

* upstream/maintable-beta: (97 commits)
  Update Eclipse style to intellij style (#3827)
  fix some not on fx thread dialogs in preferences
  fix inital save error Convert last dialog to javafx refactor exception
  Merge changes for renamed actions
  New Crowdin translations (#3835)
  Partial revert of #3715 since double click on group should expand/collapse it (#3834)
  Add Spanish translations (#3833)
  update applicationsinsights
  update javafxsvg to 1.3.0
  Disable FTP Download on CI
  Apply copy linked files dialog fix from master
  Show dialog when copy files did not found file (#3826)
  Remove customjfx (#3779)
  Disable FTP Download on CI
  Remove color customization for maintable from preferences (#3808)
  Remove erroneous escape character (#3831)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (Tagalog)
  New translations JabRef_en.properties (Italian)
  New translations JabRef_en.properties (Indonesian)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/maintable/MainTable.java
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.

3 participants