jEdit / Merge Requests / #176 add a "German Keyboard" keymap that replaces shortcuts that

#176 add a "German Keyboard" keymap that replaces shortcuts that

Milestone: for 5.0.x

Status: closed-accepted

Owner: Alan Ezust

Labels: None

Priority: 5

Updated: 2012-10-15

Created: 2012-09-28

Creator: Björn Kautler

Private: No

r22267

Discussion

Alan Ezust - 2012-10-14

There are conflicts in jedit_de.props because it looks like you escaped a bunch of unicode characters that in props that were otherwise unchanged.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Björn Kautler - 2012-10-14

That was unintentional,
Please also merge r22376, then you get only the intended changes.
Also the changes to German_Keyboard_keys.props of revision r22375 should be merged with this merge request.

svn merge -c 22267 -c 22376 --accept mine-conflict https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/trunk

followed by

svn diff -c 22375 https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/trunk/keymaps/German_Keyboard_keys.props | patch -d keymaps

and then adding the CHANGES.txt entry at the proper place

should give the desired result.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Alan Ezust - 2012-10-15

assigned_to: nobody --> ezust

status: open --> closed-accepted
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Alan Ezust - 2012-10-15

Committed 22381

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Log in to post a comment.