mirror of
git://projects.qi-hardware.com/gmenu2x.git
synced 2024-12-24 19:54:37 +02:00
Various changes related to translations
This commit is contained in:
parent
5e22dd5941
commit
917cbf7208
@ -25,7 +25,7 @@ BrowseDialog::BrowseDialog(
|
||||
btn->setAction(BIND(&BrowseDialog::directoryUp));
|
||||
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));
|
||||
buttonBox.add(btn);
|
||||
|
||||
|
@ -60,7 +60,7 @@ ContextMenu::ContextMenu(GMenu2X &gmenu2x, Menu &menu)
|
||||
}
|
||||
if (!app->isOpk()) {
|
||||
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)));
|
||||
}
|
||||
}
|
||||
|
@ -904,7 +904,7 @@ void GMenu2X::editLink() {
|
||||
string linkSelScreens = linkApp->getSelectorScreens();
|
||||
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();
|
||||
|
||||
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 MenuSettingMultiString(this, ts, tr["Section"], tr["The section this link belongs to"], &newSection, &menu->getSections()));
|
||||
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"));
|
||||
sd.addSetting(new MenuSettingFile(this, ts, tr["Manual"],
|
||||
tr["Select a graphic/textual manual or a readme"],
|
||||
&linkManual, "man.png,txt"));
|
||||
tr["Select a manual or README file"],
|
||||
&linkManual, "man.png,txt"));
|
||||
}
|
||||
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 MenuSettingBool(this, ts, tr["Selector Browser"], tr["Allow the selector to change directory"], &linkSelBrowser));
|
||||
}
|
||||
#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
|
||||
if (!linkApp->isOpk()) {
|
||||
sd.addSetting(new MenuSettingString(this, ts, tr["Selector Filter"], tr["Selector filter (Separate values with a comma)"], &linkSelFilter, diagTitle, diagIcon));
|
||||
|
@ -41,7 +41,7 @@ MenuSettingDir::MenuSettingDir(
|
||||
buttonBox.add(btn);
|
||||
|
||||
btn = new IconButton(gmenu2x, ts, "skin:imgs/buttons/accept.png",
|
||||
gmenu2x->tr["Select a directory"]);
|
||||
gmenu2x->tr["Select"]);
|
||||
btn->setAction(BIND(&MenuSettingDir::edit));
|
||||
buttonBox.add(btn);
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ MenuSettingFile::MenuSettingFile(
|
||||
btn->setAction(BIND(&MenuSettingFile::clear));
|
||||
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));
|
||||
buttonBox.add(btn);
|
||||
}
|
||||
|
@ -67,13 +67,13 @@ int Selector::exec(int startSelection) {
|
||||
|
||||
if (link->getSelectorBrowser()) {
|
||||
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, "left", "", 5)-10)));
|
||||
} else {
|
||||
gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"],
|
||||
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;
|
||||
|
@ -78,7 +78,7 @@ bool WallpaperDialog::exec()
|
||||
uint i, selected = 0, firstElement = 0, iY;
|
||||
|
||||
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"]));
|
||||
|
||||
unsigned int top, height;
|
||||
@ -100,8 +100,8 @@ bool WallpaperDialog::exec()
|
||||
gmenu2x->drawBottomBar(gmenu2x->s);
|
||||
|
||||
drawTitleIcon("icons/wallpaper.png",true);
|
||||
writeTitle("Wallpaper selection");
|
||||
writeSubTitle("Select an image from the list, to use as a wallpaper");
|
||||
writeTitle(gmenu2x->tr["Wallpaper selection"]);
|
||||
writeSubTitle(gmenu2x->tr["Select a wallpaper from the list"]);
|
||||
|
||||
buttonbox.paint(gmenu2x->s, 5);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user