Skip to content

Spanish translation#2773

Merged
stefan-kolb merged 6 commits into
masterfrom
spanishTranslation
Apr 21, 2017
Merged

Spanish translation#2773
stefan-kolb merged 6 commits into
masterfrom
spanishTranslation

Conversation

@Siedlerchr

Copy link
Copy Markdown
Member

I included the changes from @jtornero

jtornero and others added 6 commits April 18, 2017 15:00
From import and Remove entry from import strings have been updated
…ishTranslation

* 'master' of https://github.com/jtornero/jabref:
  Update Menu_es.properties
  Updated Spanish translation
  Updated Spanish translation
@Siedlerchr Siedlerchr mentioned this pull request Apr 20, 2017
6 tasks
@stefan-kolb stefan-kolb merged commit 72703f3 into master Apr 21, 2017
@stefan-kolb stefan-kolb deleted the spanishTranslation branch April 21, 2017 08:39
Siedlerchr added a commit that referenced this pull request Apr 23, 2017
* upstream/master:
  Reimplement date editor in JavaFX (#2781)
  Update CONTRIBUTING.md
  Add new author
  Update Checkstyle Version
  fix some more checkstyle warnings
  fix some more checkstyle warnings
  Fix Build failure, hopefully
  Spanish translation (#2773)
  Fixes #2766 If file is not found annotations might be null
  Fix language tests
  Remove preferences and globals from tests (#2768)
  Fix Unable to create Checker
  Fix checkstyle warnings
  New checkstyle rules regarding spacing
  Reimplement owner editior in JavaFX
  Reimplement url editior in JavaFX
  Reimplement journal editior in JavaFX
  New checkstyle rules regarding spacing

# Conflicts:
#	src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java
#	src/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java
Siedlerchr added a commit that referenced this pull request Apr 29, 2017
* upstream/master: (84 commits)
  Update README.md
  Update CHANGELOG.md
  Fixes #2789 Add Referer to API call (#2794)
  Change some FileDialogs to DialogService (#2767)
  Fix for issue 2762: Change CSV export to separate all names using semicolon (#2793)
  Set eclipse line wrapping to maximum
  Do not log an exception if side pane was not found (#2791)
  Added 'Ink' to the supported FileAnnotationType (required to close #2777)
  Renamed parseFileAnnotationType() to parse()
  Reimplement date editor in JavaFX (#2781)
  Update CONTRIBUTING.md
  Add new author
  Fixes handling of unknown PDAnnotation types.
  Update Checkstyle Version
  fix some more checkstyle warnings
  fix some more checkstyle warnings
  Fix Build failure, hopefully
  Spanish translation (#2773)
  Fixes #2766 If file is not found annotations might be null
  Fix language tests
  ...

# Conflicts:
#	src/main/java/org/jabref/logic/util/io/FileUtil.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