Commit Graph

246 Commits

Author SHA1 Message Date
Richard Heck
855af34657 Remerge strings. 2014-04-19 11:59:16 -04:00
Richard Heck
65a049dfa5 Merge branch '2.1.1-staging' into 2.1.x
Conflicts:
	lib/doc/es/EmbeddedObjects.lyx
	lib/doc/es/UserGuide.lyx
	lib/doc/fr/EmbeddedObjects.lyx
	lib/doc/ja/EmbeddedObjects.lyx
	lib/doc/ja/Intro.lyx
	lib/doc/ja/Math.lyx
	lib/doc/ja/Tutorial.lyx
	lib/doc/ja/UserGuide.lyx
	po/ja.po
	src/mathed/InsetMathNest.cpp
2014-04-18 11:08:31 -04:00
Uwe Stöhr
c101313c40 ja.po: update by Koji 2014-04-18 10:53:39 -04:00
Vincent van Ravesteijn
828211cef7 Update po/gmo files 2014-04-13 19:25:59 +02:00
Vincent van Ravesteijn
05662daf5b * ja.po: Fix Graph strings 2014-04-13 19:20:14 +02:00
Vincent van Ravesteijn
710b3fbdea * ja.po: Update from Koji Yokota 2014-04-13 18:51:08 +02:00
Georg Baum
fe080790f1 Improve translation of "Graph" for achemso.layout
As discussed. achemso.layout contains both "Chart" and "Graph", therefore it
does not make sense to use "Graph" in the "Chart" / "Graph" / "Diagram" sense,
but in the mathematical sense like in "graph theory".
Therefore I added the context [[mathematicl]].
All translations are unchanged except the german one, which is now again
"Graph" as in 2.0.0 instead of "Schaubild".
2014-04-10 21:51:05 +02:00
Vincent van Ravesteijn
abb8f01449 * ja.po: Update from Koji Yokota 2014-04-08 21:34:14 +02:00
Uwe Stöhr
10f11c89bf ja.po: translation update by Koji 2014-03-27 00:12:34 +01:00
Vincent van Ravesteijn
819c4a31a6 Update po/gmo files 2014-03-20 11:05:59 +01:00
Juergen Spitzmueller
3d057e4b51 remerge strings 2014-03-09 10:37:39 +01:00
Juergen Spitzmueller
ab97c63fd7 remerge strings 2014-01-27 08:13:04 +01:00
Vincent van Ravesteijn
69cde04565 Update po/gmo files 2013-11-10 15:51:12 +01:00
Vincent van Ravesteijn
e61c21409c Update po/gmo files 2013-10-06 05:52:15 +02:00
Juergen Spitzmueller
054e3334b3 Restore translations after rev c25f339f3f 2013-08-30 11:56:55 +02:00
Scott Kostyshak
cc0e0b1388 Remerge and update of ja.po (from Koji) 2013-08-29 17:57:39 -04:00
Scott Kostyshak
ab891a653c ja.po from Koji 2013-08-27 14:34:05 -04:00
Vincent van Ravesteijn
4c559d0691 Update po/gmo files 2013-08-04 18:05:31 +02:00
Uwe Stöhr
de6f5be5c1 ja.po: translations for LyX 2.1 from Koji 2013-07-27 23:52:25 +02:00
Vincent van Ravesteijn
57fd14ddf3 Remerge po-files
The po-files are now remerged against the versions in branch. This will slightly reduce the effort needed from the translators.
2013-05-22 08:18:25 +02:00
Uwe Stöhr
51260f905e po-files: copy from branch
- copy the latest versions from branch, except of the languages where we already have LyX 2.1-specific translations.
2013-05-21 22:44:15 +02:00
Vincent van Ravesteijn
1896dda52d Remerge po-files 2013-05-21 18:13:46 +02:00
Uwe Stöhr
25e4a1ce6b ja.po: updates for trunk from Koji 2012-11-14 00:30:27 +01:00
Juergen Spitzmueller
1e0f2426ce Fix bug #8069: View/Update other formats button disabled with non-TeX fonts 2012-03-15 12:55:40 +01:00
Uwe Stöhr
19efc2d2e7 ja.po: make it compilable (this file was accidentally truncated in r40749, fixes #8048)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40776 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-19 02:39:47 +00:00
Uwe Stöhr
b6a70a84a8 ja.po: big update for trunk from Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40749 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-14 21:06:51 +00:00
Uwe Stöhr
f1f1117306 - some po-files: remerge
- de.po: translations

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39775 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-27 16:03:14 +00:00
Pavel Sanda
04e91cdcc6 Final remerge of strings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38552 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-28 22:54:57 +00:00
Pavel Sanda
c77eb3adac Layouttranslation ja.po fixes from Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38542 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-28 08:10:41 +00:00
Pavel Sanda
dfa115dc1d Strings remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38512 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-26 10:59:27 +00:00
Pavel Sanda
6de7195c7b * ja.po from Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38452 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-19 07:25:18 +00:00
Pavel Sanda
a2849a18b5 * remerge ja.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38396 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-15 08:16:16 +00:00
Pavel Sanda
ff6c076e45 * ja.po from Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38395 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-15 08:16:14 +00:00
Pavel Sanda
e8656f0ce9 Remerge strings again for the missing one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38367 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-13 17:59:53 +00:00
Pavel Sanda
b7caed2ba6 * ja.po from Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38339 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-11 23:06:28 +00:00
Pavel Sanda
9818cfa43a Remerge strings for RC3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38318 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-08 22:24:26 +00:00
Pavel Sanda
1f27196ce3 * ja.po from Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38305 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-08 12:12:35 +00:00
Pavel Sanda
98d01e9d50 Remerge strings and prepare for string freeze
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38198 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-02 09:48:22 +00:00
Pavel Sanda
67288360c1 Final remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38103 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 21:17:55 +00:00
Pavel Sanda
134e59df42 * ja.po from Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38083 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-27 23:04:26 +00:00
Pavel Sanda
e1ba507d24 Remerge strings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38082 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-27 23:02:58 +00:00
Pavel Sanda
276596105f remerge strings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38030 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 20:28:52 +00:00
Pavel Sanda
eb449ec861 Remerge strings for rc1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37854 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 22:53:13 +00:00
Pavel Sanda
b87318e8ff Remerge all strings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37765 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-23 14:12:18 +00:00
Pavel Sanda
2e33908336 Final string remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37527 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-07 00:45:38 +00:00
Pavel Sanda
85bc038d9d Remerge strings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37499 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-05 01:13:23 +00:00
Enrico Forestieri
dc965e750c Remerge po files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37451 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-03 10:23:01 +00:00
Pavel Sanda
6d342acf06 Remerge strings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37400 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-01 11:22:09 +00:00
Pavel Sanda
ca942c343b Remerge strings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37357 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-28 23:44:26 +00:00
Pavel Sanda
4f84773c29 Final remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37156 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-09 22:48:25 +00:00