The following patch for 1.3.4cvs (should be easy to port to 1.4.0cvs)
remove all use of non-ascii characters in strings seen by gettext.
Here is a detailed view of the changes:
- the strings in symbol font from xforms dialogs are not translatable
anymore
- removed on occurence of \frac (because of \f)
- use <<text>> instead of «text». If english users find this too ugly,
we may have to provide a en.po (translators to any language are free
to use real guillemets if they can)
- use "90 deg" instead of "90°". This is the part I do not like much
and ideas are welcome
- also change the string "Greek" in symbol font with "abg" in xforms
math panel.
Unless somebody has objections, I think this can be applied. Of
course, a better solution for "90 deg" would be welcome.
JMarc
? po/xforms_l10n.pot-save
Index: po/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/ChangeLog,v
retrieving revision 1.156.2.42
diff -u -p -r1.156.2.42 ChangeLog
--- po/ChangeLog 4 Nov 2003 11:52:02 -0000 1.156.2.42
+++ po/ChangeLog 14 Nov 2003 14:07:52 -0000
@@ -1,3 +1,8 @@
+2003-11-14 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * Makefile.in.in (xforms_l10n.pot): skip entries in symbol font
+ (we do not want to translate them...)
+
2003-11-03 Claus Hindsgaul <[EMAIL PROTECTED]>
* da.po: update
Index: po/Makefile.in.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/Makefile.in.in,v
retrieving revision 1.28.2.2
diff -u -p -r1.28.2.2 Makefile.in.in
--- po/Makefile.in.in 27 May 2003 12:45:51 -0000 1.28.2.2
+++ po/Makefile.in.in 14 Nov 2003 14:07:52 -0000
@@ -218,13 +218,18 @@ $(srcdir)/xforms_l10n.pot: $(top_srcdir)
print "\"Content-Type: text/plain; charset=ISO-8859-1\\n\""; \
print "\"Content-Transfer-Encoding: 8bit\\n\""; \
print "\n"; \
+ skip=0; \
} \
+ /style: 15/ { \
+ skip=1; \
+ } \
/label: / { \
- if (NF > 1) { \
+ if (NF > 1 && skip == 0) { \
line=$$0;\
sub(/label: /,"",line);\
printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", FILENAME, FNR, line);\
}\
+ skip=0; \
}' \
`find $(top_srcdir)/src/frontends/xforms/forms -name \*.fd` > $@
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.389.2.38
diff -u -p -r1.389.2.38 ChangeLog
--- src/frontends/qt2/ChangeLog 4 Nov 2003 11:52:03 -0000 1.389.2.38
+++ src/frontends/qt2/ChangeLog 14 Nov 2003 14:07:52 -0000
@@ -1,3 +1,12 @@
+2003-11-14 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * ui/QMathDialogBase.ui: remove mention of \frac in tooltip, since
+ \f is interpreted by gettext as a special sequence.
+
+ * QDocument.C (build_dialog):
+ * ui/QTabularDialogBase.ui: remove use of latin1 in
+ some translatable strings. It confuses gettext.
+
2003-10-22 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* lyx_gui.C (needs_ugly_metrics_hack): new function. Returns true
Index: src/frontends/qt2/QDocument.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDocument.C,v
retrieving revision 1.33.2.4
diff -u -p -r1.33.2.4 QDocument.C
--- src/frontends/qt2/QDocument.C 13 Nov 2003 15:51:44 -0000 1.33.2.4
+++ src/frontends/qt2/QDocument.C 14 Nov 2003 14:07:52 -0000
@@ -89,8 +89,8 @@ void QDocument::build_dialog()
dialog_->langModule->quoteStyleCO->insertItem(qt_("''text''"));
dialog_->langModule->quoteStyleCO->insertItem(qt_(",,text``"));
dialog_->langModule->quoteStyleCO->insertItem(qt_(",,text''"));
- dialog_->langModule->quoteStyleCO->insertItem(qt_("«text»"));
- dialog_->langModule->quoteStyleCO->insertItem(qt_("»text«"));
+ dialog_->langModule->quoteStyleCO->insertItem(qt_("<<text>>"));
+ dialog_->langModule->quoteStyleCO->insertItem(qt_(">>text<<"));
// packages
for (int n = 0; tex_graphics[n][0]; ++n) {
Index: src/frontends/qt2/ui/QMathDialogBase.ui
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/QMathDialogBase.ui,v
retrieving revision 1.1
diff -u -p -r1.1 QMathDialogBase.ui
--- src/frontends/qt2/ui/QMathDialogBase.ui 13 Jan 2003 10:33:22 -0000 1.1
+++ src/frontends/qt2/ui/QMathDialogBase.ui 14 Nov 2003 14:07:52 -0000
@@ -210,7 +210,7 @@
</property>
<property>
<name>toolTip</name>
- <string>Insert fraction (\frac)</string>
+ <string>Insert fraction</string>
</property>
</widget>
<widget row="1" column="0" >
Index: src/frontends/qt2/ui/QTabularDialogBase.ui
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/QTabularDialogBase.ui,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 QTabularDialogBase.ui
--- src/frontends/qt2/ui/QTabularDialogBase.ui 3 Sep 2003 16:03:59 -0000 1.2.2.1
+++ src/frontends/qt2/ui/QTabularDialogBase.ui 14 Nov 2003 14:07:52 -0000
@@ -408,7 +408,7 @@
</property>
<property stdset="1">
<name>title</name>
- <string>Rotate 90°</string>
+ <string>Rotate 90 deg</string>
</property>
<vbox>
<property stdset="1">
@@ -435,7 +435,7 @@
</property>
<property>
<name>toolTip</name>
- <string>Rotate the table by 90°</string>
+ <string>Rotate the table by 90 deg</string>
</property>
</widget>
<widget>
@@ -450,7 +450,7 @@
</property>
<property>
<name>toolTip</name>
- <string>Rotate this cell by 90°</string>
+ <string>Rotate this cell by 90 deg</string>
</property>
</widget>
</vbox>
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.661.2.11
diff -u -p -r1.661.2.11 ChangeLog
--- src/frontends/xforms/ChangeLog 4 Nov 2003 11:52:03 -0000 1.661.2.11
+++ src/frontends/xforms/ChangeLog 14 Nov 2003 14:07:53 -0000
@@ -1,3 +1,12 @@
+2003-11-14 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * forms/form_maths_panel.fd (label): replace label "Greek" by
+ "abg" for alpha beta gamma.
+
+ * forms/form_tabular.fd (label):
+ * FormDocument.C (build): remove use of latin1 in
+ some translatable strings. This confuses gettext.
+
2003-10-22 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* lyx_gui.C (needs_ugly_metrics_hack): new method, returns false
Index: src/frontends/xforms/FormDocument.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormDocument.C,v
retrieving revision 1.126.2.4
diff -u -p -r1.126.2.4 FormDocument.C
--- src/frontends/xforms/FormDocument.C 13 Nov 2003 15:51:44 -0000 1.126.2.4
+++ src/frontends/xforms/FormDocument.C 14 Nov 2003 14:07:53 -0000
@@ -291,7 +291,7 @@ void FormDocument::build()
fl_addto_choice(language_->choice_quotes_language,
_(" ``text'' | ''text'' | ,,text`` | ,,text'' |"
- " «text» | »text« "));
+ " <<text>> | >>text<< "));
// the document options form
options_.reset(build_document_options(this));
Index: src/frontends/xforms/forms/form_maths_panel.fd
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/forms/form_maths_panel.fd,v
retrieving revision 1.11
diff -u -p -r1.11 form_maths_panel.fd
--- src/frontends/xforms/forms/form_maths_panel.fd 23 Jan 2003 16:23:41 -0000 1.11
+++ src/frontends/xforms/forms/form_maths_panel.fd 14 Nov 2003 14:07:53 -0000
@@ -78,7 +78,7 @@ alignment: FL_ALIGN_CENTER
style: 15
size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Greek
+label: abg
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
Index: src/frontends/xforms/forms/form_tabular.fd
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/forms/form_tabular.fd,v
retrieving revision 1.23
diff -u -p -r1.23 form_tabular.fd
--- src/frontends/xforms/forms/form_tabular.fd 23 Jan 2003 16:23:41 -0000 1.23
+++ src/frontends/xforms/forms/form_tabular.fd 14 Nov 2003 14:07:53 -0000
@@ -281,7 +281,7 @@ alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
-label: Rotate 90°|#9
+label: Rotate 90 deg|#9
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
@@ -1197,7 +1197,7 @@ alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
-label: Rotate 90°|#9
+label: Rotate 90 deg|#9
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
