* po/*.po:

* po/POTFILES.in: remerge

	* po/Makefile.in.in: get rid of Qt shortcuts


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

po/Makefile.in.in

@@ -384,18 +384,25 @@ qt_l10n.pot: $(top_srcdir)/src/frontends/qt3/ui/*.ui
 		{\
 			return substr(FILENAME, length(top_srcdir "/") + 1);\
 		}\
-		/<string>/ { \
-			line=$$0; \
-			sub(/.*<string>/, "", line); \
-			sub(/<\/string>.*/, "", line); \
-			gsub(/&amp;/, "\\&", line); \
-			gsub(/&lt;/, "<", line); \
-			gsub(/&gt;/, ">", line); \
-			gsub(/"/, "\\\"", line); \
-			if (length(line) > 0) {\
-				printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n",\
+		BEGIN { \
+			previousline=""; \
+		} \
+		{ \
+			if (!(previousline ~ /^ *< *property  *name *= *"shortcut" *> *$$/) \
+			    && $$0 ~ /<string>/) { \
+				line=$$0; \
+				sub(/.*<string>/, "", line); \
+				sub(/<\/string>.*/, "", line); \
+				gsub(/&amp;/, "\\&", line); \
+				gsub(/&lt;/, "<", line); \
+				gsub(/&gt;/, ">", line); \
+				gsub(/"/, "\\\"", line); \
+				if (length(line) > 0) { \
+					printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
 					fixupfilename(), FNR, line); \
+				} \
 			} \
+			previousline=$$0; \
 		}' \
 	${top_srcdir}/src/frontends/qt3/ui/*.ui > $@
 

po/POTFILES.in

@@ -1,5 +1,4 @@
 src/BranchList.h
-src/BufferView.C
 src/BufferView_pimpl.C
 src/Chktex.C
 src/CutAndPaste.C
@@ -23,6 +22,7 @@ src/frontends/controllers/ControlAboutlyx.C
 src/frontends/controllers/ControlBibtex.C
 src/frontends/controllers/ControlBox.C
 src/frontends/controllers/ControlDocument.C
+src/frontends/controllers/ControlErrorList.C
 src/frontends/controllers/ControlExternal.C
 src/frontends/controllers/ControlGraphics.C
 src/frontends/controllers/ControlInclude.C
@@ -35,6 +35,7 @@ src/frontends/controllers/biblio.C
 src/frontends/controllers/character.C
 src/frontends/controllers/frnt_lang.C
 src/frontends/controllers/helper_funcs.C
+src/frontends/controllers/tex_helpers.C
 src/frontends/gtk/Dialogs.C
 src/frontends/gtk/GAboutlyx.C
 src/frontends/gtk/GBC.h