Merge from default branch

This commit is contained in:
ffsup2
2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions

View File

@@ -29,11 +29,12 @@ class MultiLangMgr {
MultiLangMgr* fallBack;
public:
MultiLangMgr () : fallBack (NULL) {}
MultiLangMgr (Glib::ustring fname) : fallBack (NULL) { load (fname); }
MultiLangMgr () : fallBack (NULL) {}
MultiLangMgr (Glib::ustring fname) : fallBack (NULL) { load (fname); }
MultiLangMgr (Glib::ustring fname, MultiLangMgr* fb) : fallBack (NULL) { load (fname, fb); }
bool load (Glib::ustring fname, MultiLangMgr* fb = NULL);
bool save (Glib::ustring fname);
bool save (Glib::ustring fname);
Glib::ustring getStr (std::string key);
};