The branch, master, has been updated.

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

commit 0050245151fc1d2bd87becb797c175929e3e5826
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sun Apr 21 20:20:08 2013 +0200

    PrefInputUi.ui: change 2 strings
    
    because all over the docs we refer to the keyboard maps as primary and 
secondary

diff --git a/po/de.po b/po/de.po
index cc8c8c3..e792e10 100644
--- a/po/de.po
+++ b/po/de.po
@@ -96,14 +96,14 @@ msgstr ""
 "Project-Id-Version: LyX 2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2013-04-04 10:15+0200\n"
-"PO-Revision-Date: 2013-04-04 10:27+0200\n"
-"Last-Translator: Jürgen Spitzmüller <sp...@lyx.org>\n"
+"PO-Revision-Date: 2013-04-21 20:12+0100\n"
+"Last-Translator: Uwe Stöhr <uwesto...@web.de>\n"
 "Language-Team: German <lyx-d...@lists.lyx.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Poedit 1.5.5\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:25 src/frontends/qt4/GuiPrefs.cpp:253
@@ -2360,11 +2360,11 @@ msgstr "&Tastaturtabelle verwenden"
 
 #: src/frontends/qt4/ui/PrefInputUi.ui:44
 msgid "&First:"
-msgstr "&Erste:"
+msgstr "&Primäre:"
 
 #: src/frontends/qt4/ui/PrefInputUi.ui:90
 msgid "S&econd:"
-msgstr "&Zweite:"
+msgstr "&Sekundäre:"
 
 #: src/frontends/qt4/ui/PrefInputUi.ui:120
 msgid ""
diff --git a/src/frontends/qt4/ui/PrefInputUi.ui 
b/src/frontends/qt4/ui/PrefInputUi.ui
index 4f8d0fd..989458f 100644
--- a/src/frontends/qt4/ui/PrefInputUi.ui
+++ b/src/frontends/qt4/ui/PrefInputUi.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PrefInputUi</class>
  <widget class="QWidget" name="PrefInputUi">
@@ -41,7 +42,7 @@
          <bool>false</bool>
         </property>
         <property name="text">
-         <string>&amp;First:</string>
+         <string>&amp;Primary:</string>
         </property>
         <property name="buddy">
          <cstring>firstKeymapED</cstring>
@@ -87,7 +88,7 @@
          <bool>false</bool>
         </property>
         <property name="text">
-         <string>S&amp;econd:</string>
+         <string>S&amp;econdary:</string>
         </property>
         <property name="buddy">
          <cstring>secondKeymapED</cstring>
@@ -114,15 +115,15 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="3" >
-       <widget class="QCheckBox" name="dontswapCB" >
+      <item row="3" column="0" colspan="3">
+       <widget class="QCheckBox" name="dontswapCB">
         <property name="toolTip">
          <string>Mac OS X specific setting for use with emacs bindings. Takes 
effect next time LyX is launched.</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Do not swap Apple and Control keys</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
@@ -201,13 +202,13 @@
      <property name="title">
       <string>Scroll wheel zoom</string>
      </property>
-     <property name="flat">
-      <bool>true</bool>
-     </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <widget class="QWidget" name="">
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="layoutWidget">
       <property name="geometry">
        <rect>
         <x>10</x>

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

Summary of changes:
 po/de.po                            |   10 +++++-----
 src/frontends/qt4/ui/PrefInputUi.ui |   21 +++++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to