qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-05 07:31:54 +02:00
Code

Various changes related to translations

Browse Source
This commit is contained in:
Paul Cercueil 2014-06-12 22:37:08 +02:00
parent 5e22dd5941
commit 917cbf7208
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/browsedialog.cpp
View File

@ -25,7 +25,7 @@ BrowseDialog::BrowseDialog(
btn->setAction(BIND(&BrowseDialog::directoryUp)); btn->setAction(BIND(&BrowseDialog::directoryUp));
buttonBox.add(btn); buttonBox.add(btn);
btn = new IconButton(gmenu2x, ts, "skin:imgs/buttons/accept.png", gmenu2x->tr["Enter folder"]); btn = new IconButton(gmenu2x, ts, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select"]);
btn->setAction(BIND(&BrowseDialog::directoryEnter)); btn->setAction(BIND(&BrowseDialog::directoryEnter));
buttonBox.add(btn); buttonBox.add(btn);

2
src/contextmenu.cpp
View File

@ -60,7 +60,7 @@ ContextMenu::ContextMenu(GMenu2X &gmenu2x, Menu &menu)
} }
if (!app->isOpk()) { if (!app->isOpk()) {
options.push_back(std::make_shared<MenuOption>( options.push_back(std::make_shared<MenuOption>(
tr.translate("Delete $1 link", app->getTitle().c_str(), NULL), tr.translate("Delete $1", app->getTitle().c_str(), NULL),
std::bind(&GMenu2X::deleteLink, &gmenu2x))); std::bind(&GMenu2X::deleteLink, &gmenu2x)));
} }
} }

10
src/gmenu2x.cpp
View File

@ -904,7 +904,7 @@ void GMenu2X::editLink() {
string linkSelScreens = linkApp->getSelectorScreens(); string linkSelScreens = linkApp->getSelectorScreens();
int linkClock = linkApp->clock(); int linkClock = linkApp->clock();
string diagTitle = tr.translate("Edit link: $1",linkTitle.c_str(),NULL); string diagTitle = tr.translate("Edit $1",linkTitle.c_str(),NULL);
string diagIcon = linkApp->getIconPath(); string diagIcon = linkApp->getIconPath();
SettingsDialog sd(this, input, ts, diagTitle, diagIcon); SettingsDialog sd(this, input, ts, diagTitle, diagIcon);
@ -913,18 +913,18 @@ void GMenu2X::editLink() {
sd.addSetting(new MenuSettingString(this, ts, tr["Description"], tr["Link description"], &linkDescription, diagTitle, diagIcon)); sd.addSetting(new MenuSettingString(this, ts, tr["Description"], tr["Link description"], &linkDescription, diagTitle, diagIcon));
sd.addSetting(new MenuSettingMultiString(this, ts, tr["Section"], tr["The section this link belongs to"], &newSection, &menu->getSections())); sd.addSetting(new MenuSettingMultiString(this, ts, tr["Section"], tr["The section this link belongs to"], &newSection, &menu->getSections()));
sd.addSetting(new MenuSettingImage(this, ts, tr["Icon"], sd.addSetting(new MenuSettingImage(this, ts, tr["Icon"],
tr.translate("Select an icon for the link: $1", tr.translate("Select an icon for this link",
linkTitle.c_str(), NULL), &linkIcon, "png")); linkTitle.c_str(), NULL), &linkIcon, "png"));
sd.addSetting(new MenuSettingFile(this, ts, tr["Manual"], sd.addSetting(new MenuSettingFile(this, ts, tr["Manual"],
tr["Select a graphic/textual manual or a readme"], tr["Select a manual or README file"],
&linkManual, "man.png,txt")); &linkManual, "man.png,txt"));
} }
if (!linkApp->isOpk() || !linkApp->getSelectorDir().empty()) { if (!linkApp->isOpk() || !linkApp->getSelectorDir().empty()) {
sd.addSetting(new MenuSettingDir(this, ts, tr["Selector Directory"], tr["Directory to scan for the selector"], &linkSelDir)); sd.addSetting(new MenuSettingDir(this, ts, tr["Selector Directory"], tr["Directory to scan for the selector"], &linkSelDir));
sd.addSetting(new MenuSettingBool(this, ts, tr["Selector Browser"], tr["Allow the selector to change directory"], &linkSelBrowser)); sd.addSetting(new MenuSettingBool(this, ts, tr["Selector Browser"], tr["Allow the selector to change directory"], &linkSelBrowser));
} }
#ifdef ENABLE_CPUFREQ #ifdef ENABLE_CPUFREQ
sd.addSetting(new MenuSettingInt(this, ts, tr["Clock frequency"], tr["Cpu clock frequency to set when launching this link"], &linkClock, cpuFreqMin, confInt["maxClock"], cpuFreqMultiple)); sd.addSetting(new MenuSettingInt(this, ts, tr["Clock frequency"], tr["CPU clock frequency for this link"], &linkClock, cpuFreqMin, confInt["maxClock"], cpuFreqMultiple));
#endif #endif
if (!linkApp->isOpk()) { if (!linkApp->isOpk()) {
sd.addSetting(new MenuSettingString(this, ts, tr["Selector Filter"], tr["Selector filter (Separate values with a comma)"], &linkSelFilter, diagTitle, diagIcon)); sd.addSetting(new MenuSettingString(this, ts, tr["Selector Filter"], tr["Selector filter (Separate values with a comma)"], &linkSelFilter, diagTitle, diagIcon));

2
src/menusettingdir.cpp
View File

@ -41,7 +41,7 @@ MenuSettingDir::MenuSettingDir(
buttonBox.add(btn); buttonBox.add(btn);
btn = new IconButton(gmenu2x, ts, "skin:imgs/buttons/accept.png", btn = new IconButton(gmenu2x, ts, "skin:imgs/buttons/accept.png",
gmenu2x->tr["Select a directory"]); gmenu2x->tr["Select"]);
btn->setAction(BIND(&MenuSettingDir::edit)); btn->setAction(BIND(&MenuSettingDir::edit));
buttonBox.add(btn); buttonBox.add(btn);
} }

2
src/menusettingfile.cpp
View File

@ -41,7 +41,7 @@ MenuSettingFile::MenuSettingFile(
btn->setAction(BIND(&MenuSettingFile::clear)); btn->setAction(BIND(&MenuSettingFile::clear));
buttonBox.add(btn); buttonBox.add(btn);
btn = new IconButton(gmenu2x, ts, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select a file"]); btn = new IconButton(gmenu2x, ts, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select"]);
btn->setAction(BIND(&MenuSettingFile::edit)); btn->setAction(BIND(&MenuSettingFile::edit));
buttonBox.add(btn); buttonBox.add(btn);
} }

4
src/selector.cpp
View File

@ -67,13 +67,13 @@ int Selector::exec(int startSelection) {
if (link->getSelectorBrowser()) { if (link->getSelectorBrowser()) {
gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"], gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"],
gmenu2x->drawButton(&bg, "accept", gmenu2x->tr["Select a file"], gmenu2x->drawButton(&bg, "accept", gmenu2x->tr["Select"],
gmenu2x->drawButton(&bg, "cancel", gmenu2x->tr["Up one folder"], gmenu2x->drawButton(&bg, "cancel", gmenu2x->tr["Up one folder"],
gmenu2x->drawButton(&bg, "left", "", 5)-10))); gmenu2x->drawButton(&bg, "left", "", 5)-10)));
} else { } else {
gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"], gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"],
gmenu2x->drawButton(&bg, "cancel", "", gmenu2x->drawButton(&bg, "cancel", "",
gmenu2x->drawButton(&bg, "accept", gmenu2x->tr["Select a file"], 5)) - 10); gmenu2x->drawButton(&bg, "accept", gmenu2x->tr["Select"], 5)) - 10);
} }
unsigned int top, height; unsigned int top, height;

6
src/wallpaperdialog.cpp
View File

@ -78,7 +78,7 @@ bool WallpaperDialog::exec()
uint i, selected = 0, firstElement = 0, iY; uint i, selected = 0, firstElement = 0, iY;
ButtonBox buttonbox(gmenu2x); ButtonBox buttonbox(gmenu2x);
buttonbox.add(new IconButton(gmenu2x, ts, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select wallpaper"])); buttonbox.add(new IconButton(gmenu2x, ts, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select"]));
buttonbox.add(new IconButton(gmenu2x, ts, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Exit"])); buttonbox.add(new IconButton(gmenu2x, ts, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Exit"]));
unsigned int top, height; unsigned int top, height;
@ -100,8 +100,8 @@ bool WallpaperDialog::exec()
gmenu2x->drawBottomBar(gmenu2x->s); gmenu2x->drawBottomBar(gmenu2x->s);
drawTitleIcon("icons/wallpaper.png",true); drawTitleIcon("icons/wallpaper.png",true);
writeTitle("Wallpaper selection"); writeTitle(gmenu2x->tr["Wallpaper selection"]);
writeSubTitle("Select an image from the list, to use as a wallpaper"); writeSubTitle(gmenu2x->tr["Select a wallpaper from the list"]);
buttonbox.paint(gmenu2x->s, 5); buttonbox.paint(gmenu2x->s, 5);