anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some fix to ui gettext

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@923 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-07-26 09:09:31 +00:00
parent 5458081c09
commit 17836df605
5 changed files with 253 additions and 454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2000-07-26 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/frontends/gtk/.cvsignore: add MAKEFILE
* src/MenuBackend.C (read): run the label strings through gettext
before storing them in the containers.
* src/ext_l10n.h: new file
* autogen.sh : generate the ext_l10n.h file here
2000-07-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2000-07-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/lyxrc.C (read): do not use LyXLex::lex() to parse set_color * src/lyxrc.C (read): do not use LyXLex::lex() to parse set_color

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2000-07-26 Lars Gullik Bjønnes <larsbj@lyx.org>
* no.po: update a bit for new ui
2000-06-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2000-06-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* fr.po: update from Emmanuel and Jean-Pierre * fr.po: update from Emmanuel and Jean-Pierre

654
po/no.po
View File

File diff suppressed because it is too large Load Diff

37
src/MenuBackend.C
View File

@ -14,6 +14,7 @@
#endif #endif
#include <config.h> #include <config.h>
#include <memory>
#include "support/LAssert.h" #include "support/LAssert.h"
#include "MenuBackend.h" #include "MenuBackend.h"
#include "lyxlex.h" #include "lyxlex.h"
@ -100,7 +101,9 @@ void Menu::read(LyXLex & lex)
// fallback to md_item // fallback to md_item
case md_item: { case md_item: {
lex.next(); lex.next();
string name = _(lex.GetString().c_str()); char * tmp = strdup(lex.GetString().c_str());
string name = _(tmp);
free(tmp);
lex.next(); lex.next();
string command = lex.GetString(); string command = lex.GetString();
add(MenuItem(MenuItem::Command, name, add(MenuItem(MenuItem::Command, name,
@ -119,7 +122,9 @@ void Menu::read(LyXLex & lex)
break; break;
case md_submenu: { case md_submenu: {
lex.next(); lex.next();
string mlabel = _(lex.GetString().c_str()); char * tmp = strdup(lex.GetString().c_str());
string mlabel = _(tmp);
free(tmp);
lex.next(); lex.next();
string mname = lex.GetString(); string mname = lex.GetString();
add(MenuItem(MenuItem::Submenu, mlabel, mname)); add(MenuItem(MenuItem::Submenu, mlabel, mname));
@ -204,10 +209,10 @@ void MenuBackend::defaults()
Menu file("file"); Menu file("file");
file file
.add(MenuItem(MenuItem::Command, N_("New...|N"), "buffer-new")) .add(MenuItem(MenuItem::Command, _("New...|N"), "buffer-new"))
.add(MenuItem(MenuItem::Command, N_("Open...|O"), "buffer-open")) .add(MenuItem(MenuItem::Command, _("Open...|O"), "buffer-open"))
.add(MenuItem(MenuItem::Submenu, N_("Import|I"), "import")) .add(MenuItem(MenuItem::Submenu, _("Import|I"), "import"))
.add(MenuItem(MenuItem::Command, N_("Quit|Q"), "lyx-quit")) .add(MenuItem(MenuItem::Command, _("Quit|Q"), "lyx-quit"))
.add(MenuItem(MenuItem::Separator)) .add(MenuItem(MenuItem::Separator))
.add(MenuItem(MenuItem::Lastfiles)); .add(MenuItem(MenuItem::Lastfiles));
add(file); add(file);
@ -215,17 +220,17 @@ void MenuBackend::defaults()
Menu import("import"); Menu import("import");
import import
.add(MenuItem(MenuItem::Command, .add(MenuItem(MenuItem::Command,
N_("LaTeX...|L"), "buffer-import latex")) _("LaTeX...|L"), "buffer-import latex"))
.add(MenuItem(MenuItem::Command, .add(MenuItem(MenuItem::Command,
N_("LinuxDoc...|L"), "buffer-import linuxdoc")); _("LinuxDoc...|L"), "buffer-import linuxdoc"));
add(import); add(import);
Menu edit("edit"); Menu edit("edit");
edit edit
.add(MenuItem(MenuItem::Command, N_("Cut"), "cut")) .add(MenuItem(MenuItem::Command, _("Cut"), "cut"))
.add(MenuItem(MenuItem::Command, N_("Copy"), "copy")) .add(MenuItem(MenuItem::Command, _("Copy"), "copy"))
.add(MenuItem(MenuItem::Command, N_("Paste"), "paste")) .add(MenuItem(MenuItem::Command, _("Paste"), "paste"))
.add(MenuItem(MenuItem::Command, N_("Emphasize"), "font-emph")); .add(MenuItem(MenuItem::Command, _("Emphasize"), "font-emph"));
add(edit); add(edit);
Menu documents("documents"); Menu documents("documents");
@ -234,14 +239,14 @@ void MenuBackend::defaults()
Menu main("main", true); Menu main("main", true);
main main
.add(MenuItem(MenuItem::Submenu, N_("File|F"), "file")) .add(MenuItem(MenuItem::Submenu, _("File|F"), "file"))
.add(MenuItem(MenuItem::Submenu, N_("Edit|E"), "edit")) .add(MenuItem(MenuItem::Submenu, _("Edit|E"), "edit"))
.add(MenuItem(MenuItem::Submenu, .add(MenuItem(MenuItem::Submenu,
N_("Documents|D"), "documents")); _("Documents|D"), "documents"));
add(main); add(main);
Menu main_nobuffer("main_nobuffer", true); Menu main_nobuffer("main_nobuffer", true);
main_nobuffer.add(MenuItem(MenuItem::Submenu, N_("File|F"), "file")); main_nobuffer.add(MenuItem(MenuItem::Submenu, _("File|F"), "file"));
add(main_nobuffer); add(main_nobuffer);
if (lyxerr.debugging(Debug::GUI)) { if (lyxerr.debugging(Debug::GUI)) {

1
src/frontends/gtk/.cvsignore
View File

@ -1 +1,2 @@
Makefile
Makefile.in Makefile.in