* po/*.po: remerge.

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1dcbf11c1c91bda1c7fdb808d6cbf88f10f7518e..7f044ae2afa297b5f4a4a3a3410239ae3e24bfbc 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -158,6 +158,7 @@ dist_itexamples_DATA = \
 
 jaexamplesdir = $(pkgdatadir)/examples/ja
 dist_jaexamples_DATA = \
+       examples/ja/Braille.lyx \
        examples/ja/splash.lyx
 
 nlexamplesdir = $(pkgdatadir)/examples/nl
@@ -246,6 +247,7 @@ dist_examples_DATA = \
        examples/serial_letter3.lyx \
        examples/simplecv.lyx \
        examples/splash.lyx \
+       examples/sweave.lyx \
        examples/xyfigure.png \
        examples/xypic.lyx
 
@@ -327,6 +329,7 @@ dist_images_DATA = \
        images/dialog-show_mathmatrix.png \
        images/dialog-show_print.png \
        images/dialog-show_spellchecker.png \
+       images/dialog-show_vclog.png \
        images/dialog-toggle_toc.png \
        images/down.png \
        images/ert-insert.png \
@@ -355,11 +358,6 @@ dist_images_DATA = \
        images/layout_Section.png \
        images/lyx-quit.png \
        images/lyx.png \
-       images/vc-check-in.png \
-       images/vc-check-out.png \
-       images/dialog-show_vclog.png \
-       images/vc-register.png \
-       images/vc-revert.png \
        images/marginalnote-insert.png \
        images/master-buffer-update.png \
        images/master-buffer-view.png \
@@ -423,31 +421,17 @@ dist_images_DATA = \
        images/undo.png \
        images/unknown.png \
        images/up.png \
-       images/url-insert.png
+       images/url-insert.png \
+       images/vc-check-in.png \
+       images/vc-check-out.png \
+       images/vc-locking-toggle.png \
+       images/vc-register.png \
+       images/vc-revert.png
 
 imagesmathdir = $(imagesdir)/math
 dist_imagesmath_DATA = \
-       images/math/style.png \
-       images/math/font.png \
-       images/math/delim.png \
-       images/math/equation.png \
-       images/math/matrix.png \
-       images/math/space.png \
-       images/math/sqrt-square.png \
-       images/math/style.png \
-       images/math/sub.png \
-       images/math/super.png \
-       images/math/Bbbk.png \
-       images/math/Finv.png \
-       images/math/Game.png \
-       images/math/Im.png \
-       images/math/Lleftarrow.png \
-       images/math/Rrightarrow.png \
-       images/math/Lsh.png \
-       images/math/Re.png \
-       images/math/Rsh.png \
-       images/math/Vvdash.png \
        images/math/acute.png \
+       images/math/adots.png \
        images/math/aleph.png \
        images/math/alpha.png \
        images/math/amalg.png \
@@ -463,6 +447,7 @@ dist_imagesmath_DATA = \
        images/math/bar.png \
        images/math/bars.png \
        images/math/barwedge.png \
+       images/math/Bbbk.png \
        images/math/because.png \
        images/math/beta.png \
        images/math/beth.png \
@@ -530,8 +515,11 @@ dist_imagesmath_DATA = \
        images/math/dashrightarrow.png \
        images/math/dashv.png \
        images/math/ddagger.png \
+       images/math/ddddot.png \
+       images/math/dddot.png \
        images/math/ddot.png \
        images/math/ddots.png \
+       images/math/delim.png \
        images/math/delta.png \
        images/math/delta2.png \
        images/math/diagdown.png \
@@ -560,6 +548,7 @@ dist_imagesmath_DATA = \
        images/math/eqcirc.png \
        images/math/eqslantgtr.png \
        images/math/eqslantless.png \
+       images/math/equation.png \
        images/math/equiv.png \
        images/math/eta.png \
        images/math/eth.png \
@@ -568,12 +557,15 @@ dist_imagesmath_DATA = \
        images/math/fallingdotseq.png \
        images/math/fint.png \
        images/math/fintop.png \
+       images/math/Finv.png \
        images/math/flat.png \
+       images/math/font.png \
        images/math/forall.png \
        images/math/frac.png \
        images/math/frac-square.png \
        images/math/frown.png \
        images/math/functions.png \
+       images/math/Game.png \
        images/math/gamma.png \
        images/math/gamma2.png \
        images/math/geq.png \
@@ -601,12 +593,14 @@ dist_imagesmath_DATA = \
        images/math/hookrightarrow.png \
        images/math/hphantom.png \
        images/math/hslash.png \
+       images/math/iddots.png \
        images/math/iiiint.png \
        images/math/iiiintop.png \
        images/math/iiint.png \
        images/math/iiintop.png \
        images/math/iint.png \
        images/math/iintop.png \
+       images/math/Im.png \
        images/math/imath.png \
        images/math/in.png \
        images/math/infty.png \
@@ -655,6 +649,7 @@ dist_imagesmath_DATA = \
        images/math/lfloor_rfloor.png \
        images/math/ll.png \
        images/math/llcorner.png \
+       images/math/Lleftarrow.png \
        images/math/lll.png \
        images/math/lnapprox.png \
        images/math/lneq.png \
@@ -673,6 +668,7 @@ dist_imagesmath_DATA = \
        images/math/lparen.png \
        images/math/lparen_rparen.png \
        images/math/lrcorner.png \
+       images/math/Lsh.png \
        images/math/ltimes.png \
        images/math/lvertneqq.png \
        images/math/mapsto.png \
@@ -688,6 +684,7 @@ dist_imagesmath_DATA = \
        images/math/mathcal_O.png \
        images/math/mathcircumflex.png \
        images/math/mathrm_T.png \
+       images/math/matrix.png \
        images/math/measuredangle.png \
        images/math/mho.png \
        images/math/mid.png \
@@ -786,6 +783,7 @@ dist_imagesmath_DATA = \
        images/math/rbrace.png \
        images/math/rbracket.png \
        images/math/rceil.png \
+       images/math/Re.png \
        images/math/rfloor.png \
        images/math/rho.png \
        images/math/rightarrow.png \
@@ -801,6 +799,8 @@ dist_imagesmath_DATA = \
        images/math/risingdotseq.png \
        images/math/root.png \
        images/math/rparen.png \
+       images/math/Rrightarrow.png \
+       images/math/Rsh.png \
        images/math/rtimes.png \
        images/math/searrow.png \
        images/math/setminus.png \
@@ -816,6 +816,7 @@ dist_imagesmath_DATA = \
        images/math/smallsetminus.png \
        images/math/smallsmile.png \
        images/math/smile.png \
+       images/math/space.png \
        images/math/spadesuit.png \
        images/math/sphericalangle.png \
        images/math/sqcap.png \
@@ -825,12 +826,15 @@ dist_imagesmath_DATA = \
        images/math/sqint.png \
        images/math/sqintop.png \
        images/math/sqrt.png \
+       images/math/sqrt-square.png \
        images/math/sqsubset.png \
        images/math/sqsubseteq.png \
        images/math/sqsupset.png \
        images/math/sqsupseteq.png \
        images/math/square.png \
        images/math/star.png \
+       images/math/style.png \
+       images/math/sub.png \
        images/math/subset.png \
        images/math/subset2.png \
        images/math/subseteq.png \
@@ -845,6 +849,7 @@ dist_imagesmath_DATA = \
        images/math/succnsim.png \
        images/math/succsim.png \
        images/math/sum.png \
+       images/math/super.png \
        images/math/supset.png \
        images/math/supset2.png \
        images/math/supseteq.png \
@@ -920,6 +925,7 @@ dist_imagesmath_DATA = \
        images/math/vert2.png \
        images/math/view-others.png \
        images/math/vphantom.png \
+       images/math/Vvdash.png \
        images/math/wedge.png \
        images/math/widehat.png \
        images/math/widetilde.png \
@@ -1063,13 +1069,13 @@ dist_layouts_DATA =\
        layouts/logicalmkup.module \
        layouts/ltugboat.layout \
        layouts/lyxmacros.inc \
-       layouts/manpage.layout \
        layouts/memoir.layout \
        layouts/minimalistic.module \
        layouts/moderncv.layout \
        layouts/mwart.layout \
        layouts/mwbk.layout \
        layouts/mwrep.layout \
+       layouts/noweb.module \
        layouts/numarticle.inc \
        layouts/numreport.inc \
        layouts/numrevtex.inc \
@@ -1111,6 +1117,7 @@ dist_layouts_DATA =\
        layouts/svjog.layout \
        layouts/svjour.inc \
        layouts/svprobth.layout \
+       layouts/sweave.module \
        layouts/tarticle.layout \
        layouts/tbook.layout \
        layouts/theorems-ams-extended.module \