The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 79b6a057da158121b7aa773f9b1dfca2a5ae347f
Author: Juergen Spitzmueller <[email protected]>
Date:   Sat Dec 29 18:16:33 2012 +0100

    de.po: fix clashes

diff --git a/po/de.po b/po/de.po
index 5c809f6..d4a7852 100644
--- a/po/de.po
+++ b/po/de.po
@@ -96,7 +96,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2012-12-29 11:12+0100\n"
-"PO-Revision-Date: 2012-12-29 11:26+0100\n"
+"PO-Revision-Date: 2012-12-29 18:15+0100\n"
 "Last-Translator: Jürgen Spitzmüller <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "Language: de\n"
@@ -15415,7 +15415,7 @@ msgstr "Komprimiert|K"
 #: lib/ui/stdcontext.inc:561 lib/ui/stdcontext.inc:569
 #: lib/ui/stdcontext.inc:615
 msgid "Settings...|S"
-msgstr "Einstellungen...|n"
+msgstr "Einstellungen...|E"
 
 # , c-format
 # , c-format
@@ -26394,7 +26394,7 @@ msgstr "Andere Formate aktualisieren|n"
 #: src/frontends/qt4/Menus.cpp:1083
 #, c-format
 msgid "View [%1$s]|V"
-msgstr "Ansehen [%1$s]|A"
+msgstr "Ansehen [%1$s]|s"
 
 #: src/frontends/qt4/Menus.cpp:1084
 #, c-format

-----------------------------------------------------------------------

Summary of changes:
 po/de.po |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to