[LyX/master] de.po: resolve shortcut conflict

2015-08-03 Thread Juergen Spitzmueller
commit 46ef6cbc0308410aaf510adfd111f2acb19cdbc0 Author: Juergen Spitzmueller sp...@lyx.org Date: Mon Aug 3 15:24:20 2015 +0200 de.po: resolve shortcut conflict diff --git a/po/de.gmo b/po/de.gmo index 6f8e35c..5294987 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git

[LyX/master] de.po: resolve shortcut conflict

2015-08-03 Thread Juergen Spitzmueller
commit 46ef6cbc0308410aaf510adfd111f2acb19cdbc0 Author: Juergen Spitzmueller Date: Mon Aug 3 15:24:20 2015 +0200 de.po: resolve shortcut conflict diff --git a/po/de.gmo b/po/de.gmo index 6f8e35c..5294987 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git