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.

Sign up for GitHub

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

Jump to bottom

Update German translation #1829

Merged
merged 4 commits into from
Aug 24, 2016
Merged

Update German translation #1829

merged 4 commits into from
Aug 24, 2016

Conversation

Siedlerchr
Copy link
Member

Should be complete now. Refs #1824

@stefan-kolb stefan-kolb added this to the v3.6 milestone Aug 24, 2016
@matthiasgeiger
Copy link
Member

Copied from the dev chat:
[02:44:34] Oliver Kopp: @Siedlerchr: In #1829 evtl. doch "nachverfolgt" statt "aufgelöst" nehmen, oder?
[08:44:55] Matthias Geiger: ich würde sogar "referenzierte Felder" schreiben - auch wenn "nachverfolgte Felder referenzierter Einträge" wohl am passendsten wäre ;-)

@Siedlerchr
Copy link
Member Author

@matthiasgeiger I am at work and just have no local acces to the project. Do you want to update it?
And there was another one already present in the translation were "aufgelöst" was already used in this context with Felder.

@Siedlerchr
Merge branch 'master' into gerTrans
daee318 
* master:
  Some more Swedish translations (#1836)
  Updated Menu_tr.properties
  Updated jabref_tr.properties
  Add check for obsolete database structure. Add help popup. (#1818)
  Updated dependencies (#1831)
  Removed one Globals call from MetaData (#1782)
@Siedlerchr
Updated German tranlsation
e1e9b4d 
referenziert instead of aufgelöst
Reword two others
@Siedlerchr
Copy link
Member Author

aufgelöst -> referenziert
Resolved Conflicts

matthiasgeiger
matthiasgeiger reviewed Aug 24, 2016
View reviewed changes
src/main/resources/l10n/JabRef_de.properties
The_import_finished_with_warnings\:=Der Import_wurde_mit_Warnungen_abgeschlossen\:
There_was_one_file_that_could_not_be_imported.=Eine_Datei_konnte_nicht_importiert_werden.
There_were_%0_files_which_could_not_be_imported.=%0_Dateien_konnten_nicht_importiert_werden.

Migration_help_information=Hilfe_zur_Migration
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=Die_eingegebene_Datenbank_ist_veraltet_und_wird_nicht_mehr_unterstützt.
Copy link
Member

Choose a reason for hiding this comment

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

Not added by you, but I would translate a bit more lax here: "Die_gewählte_Datenbank_nutzt_eine_veraltete,_nicht_mehr_unterstützte_Struktur."

@matthiasgeiger
Copy link
Member

One additional minor remark - apart from that: LGTM

@Siedlerchr Siedlerchr merged commit eda5411 into master Aug 24, 2016
@Siedlerchr Siedlerchr deleted the gerTrans branch August 24, 2016 20:54
Siedlerchr added a commit to Siedlerchr/jabref that referenced this pull request Aug 25, 2016
@Siedlerchr
Merge branch 'master' into uftest
c45bf6b 
* master:
  fix SplitPaneChangeListener (JabRef#1840)
  French localization: Jabref_fr: empty strings translated (JabRef#1847)
  Fixes JabRef#1687 "month" field ascending/descending sorting swapped (JabRef#1837)
  Fix localization entry.
  Update German translation (JabRef#1829)
Siedlerchr added a commit that referenced this pull request Aug 25, 2016
@Siedlerchr
Merge branch 'master' into office07
934fc67 
* master:
  Disable incompatible properties for shared database. (#1826)
  Allow setting the etal-string empty. Implements #1841 (#1848)
  fix SplitPaneChangeListener (#1840)
  French localization: Jabref_fr: empty strings translated (#1847)
  Fixes #1687 "month" field ascending/descending sorting swapped (#1837)
  Fix localization entry.
  Update German translation (#1829)
  entry scrolling  didn't work if the entry in question was just 1 row outside the table (bottom) (<; <= mistake)
  fix indent
  when pasting an entry search the entry from the back, b/c we want to select the duplicate, not the original
  fix issues and delete a duplicate method
  when inserting a duplicate the right entry will be selected
ayanai1 pushed a commit to ayanai1/jabref that referenced this pull request Sep 5, 2016
@Siedlerchr @ayanai1
Update German translation (JabRef#1829)
baf6eb9 
* Update German translation
referenziert instead of aufgelöst
* Better translation for obsolete structure
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.6
Development

Successfully merging this pull request may close these issues.
3 participants
@Siedlerchr @matthiasgeiger @stefan-kolb