remerge

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10792 a592a061-630c-0410-9148-cb99ea01b6c8

po/ChangeLog

@@ -1,3 +1,7 @@
+2006-01-28  Lars Gullik Bjonnes  <larsbj@lyx.org>
+
+	* remerge
+
 2006-01-28  Michael Gerz  <michael.gerz@teststep.org>
 
         * de.po: minor update for the gtk frontend

po/POTFILES.in

@@ -36,9 +36,12 @@ src/frontends/controllers/frnt_lang.C
 src/frontends/controllers/helper_funcs.C
 src/frontends/gtk/Dialogs.C
 src/frontends/gtk/GBC.h
+src/frontends/gtk/GBibItem.C
 src/frontends/gtk/GBox.C
+src/frontends/gtk/GBranch.C
 src/frontends/gtk/GChanges.C
 src/frontends/gtk/GCharacter.C
+src/frontends/gtk/GCitation.C
 src/frontends/gtk/GDocument.C
 src/frontends/gtk/GERT.C
 src/frontends/gtk/GErrorList.C
@@ -57,11 +60,13 @@ src/frontends/gtk/GSendto.C
 src/frontends/gtk/GShowFile.C
 src/frontends/gtk/GSpellchecker.C
 src/frontends/gtk/GTableCreate.C
+src/frontends/gtk/GTabular.C
 src/frontends/gtk/GTexinfo.C
 src/frontends/gtk/GThesaurus.C
 src/frontends/gtk/GToc.C
 src/frontends/gtk/GUrl.C
 src/frontends/gtk/GVSpace.C
+src/frontends/gtk/GWrap.C
 src/frontends/qt2/Alert_pimpl.C
 src/frontends/qt2/BulletsModule.C
 src/frontends/qt2/Dialogs.C

po/de.po

@@ -83,7 +83,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 1.4.0\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2006-01-28 21:37+0100\n"
+"POT-Creation-Date: 2006-01-28 22:20+0100\n"
 "PO-Revision-Date: 2006-01-28 21:47+0100\n"
 "Last-Translator: Michael Gerz <Michael.Gerz@teststep.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -7939,8 +7939,8 @@ msgstr "Kolumnenkopf:"
 msgid "Published-online:"
 msgstr "Online veröffentlicht:"
 
-#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt2/QCitation.C:50
-#: src/frontends/xforms/FormCitation.C:100
+#: lib/layouts/agu_stdtitle.inc:263 src/frontends/gtk/GCitation.C:71
+#: src/frontends/qt2/QCitation.C:50 src/frontends/xforms/FormCitation.C:100
 msgid "Citation"
 msgstr "Zitat"
 
@@ -11491,11 +11491,21 @@ msgstr "Stichwort"
 msgid "Label"
 msgstr "Marke"
 
+#: src/frontends/gtk/GBibItem.C:33 src/frontends/qt2/QBibitem.C:31
+#: src/frontends/xforms/FormBibitem.C:38
+msgid "Bibliography Entry Settings"
+msgstr "Literatureintrag-Einstellungen"
+
 #: src/frontends/gtk/GBox.C:42 src/frontends/qt2/QBox.C:51
 #: src/frontends/xforms/FormBox.C:47
 msgid "Box Settings"
 msgstr "Box-Einstellungen"
 
+#: src/frontends/gtk/GBranch.C:38 src/frontends/qt2/QBranch.C:36
+#: src/frontends/xforms/FormBranch.C:35
+msgid "Branch Settings"
+msgstr "Zweig-Einstellungen"
+
 #: src/frontends/gtk/GChanges.C:33 src/frontends/qt2/QChanges.C:36
 #: src/frontends/xforms/FormChanges.C:32
 msgid "Merge Changes"
@@ -11522,6 +11532,14 @@ msgstr "
 msgid "Text Style"
 msgstr "Textstil"
 
+#: src/frontends/gtk/GCitation.C:122
+msgid "CiteKeys"
+msgstr ""
+
+#: src/frontends/gtk/GCitation.C:128
+msgid "BibKeys"
+msgstr ""
+
 #: src/frontends/gtk/GDocument.C:58 src/frontends/qt2/QDocument.C:68
 #: src/frontends/xforms/FormDocument.C:93
 msgid "Document Settings"
@@ -11716,6 +11734,11 @@ msgstr "gepr
 msgid "Insert Table"
 msgstr "Tabelle einfügen"
 
+#: src/frontends/gtk/GTabular.C:67 src/frontends/qt2/QTabular.C:41
+#: src/frontends/xforms/FormTabular.C:57
+msgid "Table Settings"
+msgstr "Tabellen-Einstellungen"
+
 #: src/frontends/gtk/GTexinfo.C:37 src/frontends/qt2/QTexinfo.C:34
 #: src/frontends/xforms/FormTexinfo.C:35
 msgid "TeX Information"
@@ -11742,6 +11765,11 @@ msgstr "*** Keine Eintr
 msgid "VSpace Settings"
 msgstr "Einstellungen für vertikalen Abstand"
 
+#: src/frontends/gtk/GWrap.C:35 src/frontends/qt2/QWrap.C:39
+#: src/frontends/xforms/FormWrap.C:40
+msgid "Text Wrap Settings"
+msgstr "Einstellungen für umflossenes Gleitobjekt"
+
 #: src/frontends/qt2/Alert_pimpl.C:39 src/frontends/qt2/Alert_pimpl.C:64
 #: src/frontends/qt2/Alert_pimpl.C:76 src/frontends/qt2/Alert_pimpl.C:88
 #: src/frontends/qt2/Alert_pimpl.C:101
@@ -11791,18 +11819,10 @@ msgstr "Geben Sie ein benutzerdefiniertes Aufz
 msgid "Directories"
 msgstr "Verzeichnisse"
 
-#: src/frontends/qt2/QBibitem.C:31 src/frontends/xforms/FormBibitem.C:38
-msgid "Bibliography Entry Settings"
-msgstr "Literatureintrag-Einstellungen"
-
 #: src/frontends/qt2/QBibtex.C:50 src/frontends/xforms/FormBibtex.C:51
 msgid "BibTeX Bibliography"
 msgstr "BibTeX-Literaturverzeichnis"
 
-#: src/frontends/qt2/QBranch.C:36 src/frontends/xforms/FormBranch.C:35
-msgid "Branch Settings"
-msgstr "Zweig-Einstellungen"
-
 #: src/frontends/qt2/QChanges.C:66
 #, c-format
 msgid ""
@@ -12207,18 +12227,10 @@ msgstr "Springe zur Marke"
 msgid "Send Document to Command"
 msgstr "Dokument an Befehl senden"
 
-#: src/frontends/qt2/QTabular.C:41 src/frontends/xforms/FormTabular.C:57
-msgid "Table Settings"
-msgstr "Tabellen-Einstellungen"
-
 #: src/frontends/qt2/QVSpace.C:133 src/frontends/xforms/FormVSpace.C:166
 msgid "Vertical Space Settings"
 msgstr "Einstellungen für vertikalen Abstand"
 
-#: src/frontends/qt2/QWrap.C:39 src/frontends/xforms/FormWrap.C:40
-msgid "Text Wrap Settings"
-msgstr "Einstellungen für umflossenes Gleitobjekt"
-
 #: src/frontends/qt2/QtView.C:164
 msgid "LyX"
 msgstr "LyX"