anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix translation of layout names with spaces

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9885 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-04-28 13:08:05 +00:00
parent cf7f310eb9
commit 076c15b63c
11 changed files with 869 additions and 754 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ChangeLog
View File

@ -1,3 +1,9 @@
2005-04-28 Michael Schmitt <michael.schmitt@teststep.org>
* layouts/*.layout:
* layouts/*.inc: All Style, NoStyle and CopyStyle commands
use a _ for spaces instead of quotes
2005-04-25 Martin Vermeer <martin.vermeer@hut.fi> 2005-04-25 Martin Vermeer <martin.vermeer@hut.fi>
* ui/stdmenus.ui: rearrange tabular features stuff * ui/stdmenus.ui: rearrange tabular features stuff

2
lib/layouts/cv.layout
View File

@ -112,7 +112,7 @@ End
Style Right_Header Style Right_Header
CopyStyle "Left Header" CopyStyle Left_Header
LatexName rightheader LatexName rightheader
Margin Right_Address_Box Margin Right_Address_Box
End End

8
lib/layouts/foils.layout
View File

@ -179,7 +179,7 @@ End
Style Restriction Style Restriction
CopyStyle "My Logo" CopyStyle My_Logo
LatexName Restriction LatexName Restriction
LeftMargin Restriction:xx LeftMargin Restriction:xx
LabelString "Restriction:" LabelString "Restriction:"
@ -187,7 +187,7 @@ End
Style Left_Header Style Left_Header
CopyStyle "My Logo" CopyStyle My_Logo
LatexName leftheader LatexName leftheader
LeftMargin Left_Header:xx LeftMargin Left_Header:xx
LabelString "Left Header:" LabelString "Left Header:"
@ -195,7 +195,7 @@ End
Style Right_Header Style Right_Header
CopyStyle "My Logo" CopyStyle My_Logo
LatexName rightheader LatexName rightheader
LeftMargin Right_Header:xx LeftMargin Right_Header:xx
LabelString "Right Header:" LabelString "Right Header:"
@ -203,7 +203,7 @@ End
Style Right_Footer Style Right_Footer
CopyStyle "My Logo" CopyStyle My_Logo
LatexName rightfooter LatexName rightfooter
LeftMargin Right_Footer:xx LeftMargin Right_Footer:xx
LabelString "Right Footer:" LabelString "Right Footer:"

8
lib/layouts/llncs.layout
View File

@ -171,7 +171,7 @@ End
Style TOC_Title Style TOC_Title
CopyStyle "Running LaTeX Title" CopyStyle Running_LaTeX_Title
LatexName toctitle LatexName toctitle
LeftMargin "TOC title:xxx" LeftMargin "TOC title:xxx"
LabelString "TOC title: " LabelString "TOC title: "
@ -200,7 +200,7 @@ End
Style Author_Running Style Author_Running
CopyStyle "Running LaTeX Title" CopyStyle Running_LaTeX_Title
LatexName authorrunning LatexName authorrunning
LeftMargin "Author Running:xxx" LeftMargin "Author Running:xxx"
LabelString "Author Running: " LabelString "Author Running: "
@ -208,7 +208,7 @@ End
Style TOC_Author Style TOC_Author
CopyStyle "Running LaTeX Title" CopyStyle Running_LaTeX_Title
LatexName tocauthor LatexName tocauthor
LeftMargin "TOC Author:xxx" LeftMargin "TOC Author:xxx"
LabelString "TOC Author: " LabelString "TOC Author: "
@ -235,7 +235,7 @@ End
Style Email Style Email
CopyStyle "Running LaTeX Title" CopyStyle Running_LaTeX_Title
LatexName email LatexName email
LeftMargin "Email:xxx" LeftMargin "Email:xxx"
LabelString "Email: " LabelString "Email: "

2
lib/layouts/revtex4.layout
View File

@ -179,7 +179,7 @@ End
Style Author_URL Style Author_URL
CopyStyle "Author Email" CopyStyle Author_Email
PassThru 1 PassThru 1
LatexName homepage LatexName homepage
LabelString "URL: " LabelString "URL: "

12
po/ChangeLog
View File

@ -1,3 +1,15 @@
2005-04-28 Michael Schmitt <michael.schmitt@teststep.org>
* Makefile.in.in (layouts_l10n.pot): replace underscores with
spaces in Style definition; strip quotes
* de.po:
* fr.po: Adjust po files to '_'-less styles in layout files
2005-04-27 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* Makefile.in.in (Makefile): remove quotes and underscores from
Style name.
2005-04-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2005-04-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* nn.po: update from Ingar Pareliussen * nn.po: update from Ingar Pareliussen

4
po/Makefile.in.in
View File

@ -436,6 +436,10 @@ layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*
/^Style / { \ /^Style / { \
line=$$0; \ line=$$0; \
sub(/Style /, "", line); \ sub(/Style /, "", line); \
gsub(/\"/, "", line); \
gsub(/_/, " ", line); \
gsub(/\"/, "", line); \
gsub(/_/, " ", line); \
printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \ printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
fixupfilename(), FNR, line); \ fixupfilename(), FNR, line); \
} \ } \

1529
po/de.po
View File

File diff suppressed because it is too large Load Diff

44
po/fr.po
View File

@ -6417,7 +6417,7 @@ msgid "Conclusion"
msgstr "Conclusion" msgstr "Conclusion"
#: lib/layouts/amsbook.layout:110 #: lib/layouts/amsbook.layout:110
msgid "Chapter_Exercises" msgid "Chapter Exercises"
msgstr "Exercices_Chapitre" msgstr "Exercices_Chapitre"
#: lib/layouts/apa.layout:49 #: lib/layouts/apa.layout:49
@ -6512,7 +6512,7 @@ msgid "SCENE*"
msgstr "SCÈNE*" msgstr "SCÈNE*"
#: lib/layouts/broadway.layout:102 #: lib/layouts/broadway.layout:102
msgid "AT_RISE:" msgid "AT RISE:"
msgstr "LEVER_RIDEAU:" msgstr "LEVER_RIDEAU:"
# ou "Acteur" ou "Intervenant" (Hollywood/Broadway) # ou "Acteur" ou "Intervenant" (Hollywood/Broadway)
@ -6531,7 +6531,7 @@ msgstr "RIDEAU"
#: lib/layouts/broadway.layout:211 lib/layouts/egs.layout:220 #: lib/layouts/broadway.layout:211 lib/layouts/egs.layout:220
#: lib/layouts/hollywood.layout:313 lib/layouts/lyxmacros.inc:62 #: lib/layouts/hollywood.layout:313 lib/layouts/lyxmacros.inc:62
msgid "Right_Address" msgid "Right Address"
msgstr "Adresse_À_Droite" msgstr "Adresse_À_Droite"
#: lib/layouts/chess.layout:32 #: lib/layouts/chess.layout:32
@ -6597,22 +6597,22 @@ msgstr ""
#: lib/layouts/cv.layout:97 lib/layouts/foils.layout:189 #: lib/layouts/cv.layout:97 lib/layouts/foils.layout:189
#: lib/layouts/aguplus.inc:75 #: lib/layouts/aguplus.inc:75
msgid "Left_Header" msgid "Left Header"
msgstr "En-tête_Gauche" msgstr "En-tête_Gauche"
#: lib/layouts/cv.layout:114 lib/layouts/foils.layout:197 #: lib/layouts/cv.layout:114 lib/layouts/foils.layout:197
#: lib/layouts/aguplus.inc:99 #: lib/layouts/aguplus.inc:99
msgid "Right_Header" msgid "Right Header"
msgstr "En-tête_Droite" msgstr "En-tête_Droite"
#: lib/layouts/dinbrief.layout:12 lib/layouts/heb-letter.layout:9 #: lib/layouts/dinbrief.layout:12 lib/layouts/heb-letter.layout:9
#: lib/layouts/stdletter.inc:23 #: lib/layouts/stdletter.inc:23
msgid "My_Address" msgid "My Address"
msgstr "Mon_Adresse" msgstr "Mon_Adresse"
#: lib/layouts/dinbrief.layout:28 lib/layouts/heb-letter.layout:14 #: lib/layouts/dinbrief.layout:28 lib/layouts/heb-letter.layout:14
#: lib/layouts/stdletter.inc:35 #: lib/layouts/stdletter.inc:35
msgid "Send_To_Address" msgid "Send To Address"
msgstr "Envoi_À_Adresse" msgstr "Envoi_À_Adresse"
#: lib/layouts/dinbrief.layout:45 lib/layouts/g-brief-en.layout:203 #: lib/layouts/dinbrief.layout:45 lib/layouts/g-brief-en.layout:203
@ -6677,7 +6677,7 @@ msgid "Verse"
msgstr "Vers" msgstr "Vers"
#: lib/layouts/egs.layout:267 lib/layouts/obsolete.inc:10 #: lib/layouts/egs.layout:267 lib/layouts/obsolete.inc:10
msgid "LaTeX_Title" msgid "LaTeX Title"
msgstr "Titre_LaTeX" msgstr "Titre_LaTeX"
#: lib/layouts/egs.layout:311 #: lib/layouts/egs.layout:311
@ -6713,15 +6713,15 @@ msgstr "LyX-Code"
#: lib/layouts/elsart.layout:132 #: lib/layouts/elsart.layout:132
#, fuzzy #, fuzzy
msgid "Author_Address" msgid "Author Address"
msgstr "Auteur" msgstr "Auteur"
#: lib/layouts/elsart.layout:148 lib/layouts/revtex4.layout:166 #: lib/layouts/elsart.layout:148 lib/layouts/revtex4.layout:166
msgid "Author_Email" msgid "Author Email"
msgstr "EMail_Auteur" msgstr "EMail_Auteur"
#: lib/layouts/elsart.layout:168 lib/layouts/revtex4.layout:180 #: lib/layouts/elsart.layout:168 lib/layouts/revtex4.layout:180
msgid "Author_URL" msgid "Author URL"
msgstr "URL_Auteur" msgstr "URL_Auteur"
#: lib/layouts/elsart.layout:190 lib/layouts/revtex4.layout:159 #: lib/layouts/elsart.layout:190 lib/layouts/revtex4.layout:159
@ -6762,7 +6762,7 @@ msgid "CrossList"
msgstr "ListeCroisée" msgstr "ListeCroisée"
#: lib/layouts/foils.layout:163 #: lib/layouts/foils.layout:163
msgid "My_Logo" msgid "My Logo"
msgstr "Mon_Logo" msgstr "Mon_Logo"
#: lib/layouts/foils.layout:181 #: lib/layouts/foils.layout:181
@ -6771,7 +6771,7 @@ msgstr "Restriction"
# contrainte de longueur # contrainte de longueur
#: lib/layouts/foils.layout:205 #: lib/layouts/foils.layout:205
msgid "Right_Footer" msgid "Right Footer"
msgstr "Pied_Droite" msgstr "Pied_Droite"
#: lib/layouts/foils.layout:296 lib/layouts/siamltex.layout:266 #: lib/layouts/foils.layout:296 lib/layouts/siamltex.layout:266
@ -7118,7 +7118,7 @@ msgid "More"
msgstr "Poursuivre" msgstr "Poursuivre"
#: lib/layouts/hollywood.layout:80 #: lib/layouts/hollywood.layout:80
msgid "FADE_IN:" msgid "FADE IN:"
msgstr "" msgstr ""
#: lib/layouts/hollywood.layout:100 #: lib/layouts/hollywood.layout:100
@ -7139,7 +7139,7 @@ msgid "Transition"
msgstr "Transition" msgstr "Transition"
#: lib/layouts/hollywood.layout:241 #: lib/layouts/hollywood.layout:241
msgid "TITLE_OVER:" msgid "TITLE OVER:"
msgstr "" msgstr ""
#: lib/layouts/hollywood.layout:256 #: lib/layouts/hollywood.layout:256
@ -7147,7 +7147,7 @@ msgid "INTERCUT"
msgstr "" msgstr ""
#: lib/layouts/hollywood.layout:271 #: lib/layouts/hollywood.layout:271
msgid "FADE_OUT" msgid "FADE OUT"
msgstr "" msgstr ""
#: lib/layouts/hollywood.layout:287 #: lib/layouts/hollywood.layout:287
@ -7181,19 +7181,19 @@ msgid "SGML"
msgstr "SGML" msgstr "SGML"
#: lib/layouts/llncs.layout:149 lib/layouts/svjour.inc:174 #: lib/layouts/llncs.layout:149 lib/layouts/svjour.inc:174
msgid "Running_LaTeX_Title" msgid "Running LaTeX Title"
msgstr "Titre_LaTeX_Courant" msgstr "Titre_LaTeX_Courant"
#: lib/layouts/llncs.layout:173 #: lib/layouts/llncs.layout:173
msgid "TOC_Title" msgid "TOC Title"
msgstr "Titre_TdM" msgstr "Titre_TdM"
#: lib/layouts/llncs.layout:202 lib/layouts/svjour.inc:203 #: lib/layouts/llncs.layout:202 lib/layouts/svjour.inc:203
msgid "Author_Running" msgid "Author Running"
msgstr "Auteur_Courant" msgstr "Auteur_Courant"
#: lib/layouts/llncs.layout:210 #: lib/layouts/llncs.layout:210
msgid "TOC_Author" msgid "TOC Author"
msgstr "Auteur_TdM" msgstr "Auteur_TdM"
#: lib/layouts/llncs.layout:386 lib/layouts/svjour.inc:443 #: lib/layouts/llncs.layout:386 lib/layouts/svjour.inc:443
@ -7539,11 +7539,11 @@ msgstr "PlacementTableau"
#: lib/layouts/aguplus.inc:201 #: lib/layouts/aguplus.inc:201
#, fuzzy #, fuzzy
msgid "Table_Caption" msgid "Table Caption"
msgstr "Légende" msgstr "Légende"
#: lib/layouts/amsdefs.inc:167 #: lib/layouts/amsdefs.inc:167
msgid "Current_Address" msgid "Current Address"
msgstr "Adresse_Actuelle" msgstr "Adresse_Actuelle"
#: lib/layouts/amsdefs.inc:204 #: lib/layouts/amsdefs.inc:204

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-28 Michael Schmitt <michael.schmitt@teststep.org>
* lyxlayout.C (Read): transform underscores to spaces in CopyStyle
argument.
2005-04-25 Angus Leeming <leeming@lyx.org> 2005-04-25 Angus Leeming <leeming@lyx.org>
* Bidi.[Ch]: * Bidi.[Ch]:

3
src/lyxlayout.C
View File

@ -207,7 +207,8 @@ bool LyXLayout::Read(LyXLex & lexrc, LyXTextClass const & tclass)
case LT_COPYSTYLE: // initialize with a known style case LT_COPYSTYLE: // initialize with a known style
if (lexrc.next()) { if (lexrc.next()) {
string const style = lexrc.getString(); string const style = subst(lexrc.getString(),
'_', ' ');
if (tclass.hasLayout(style)) { if (tclass.hasLayout(style)) {
string const tmpname = name_; string const tmpname = name_;