Skip to content

Commit

Permalink
More fixes to PT translations
Browse files Browse the repository at this point in the history
  • Loading branch information
@BernardoGiordano
BernardoGiordano committed Feb 9, 2019
1 parent 95c2c89 commit c903055
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
42 changes: 21 additions & 21 deletions assets/romfs/i18n/pt/gui.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"AWAKENED_ATTACK": "Ataque Despertado",
"AWAKENED_DEFENSE": "Defesa Despertada",
"AWAKENED_HP": "HP Despertado",
"AWAKENED_SPATK": "Ataque ESP. Despertado",
"AWAKENED_SPDEF": "Defesa ESP. Despertada",
"AWAKENED_SPATK": "Ataque Esp. Despertado",
"AWAKENED_SPDEF": "Defesa Esp. Despertada",
"AWAKENED_SPEED": "Velocidade Despertada",
"AWAKENED": "Despertado",
"BAD_INJECT": "Não foi possível Injetar",
Expand Down Expand Up @@ -153,7 +153,7 @@
"EDITOR_CP": "CP: ",
"EDITOR_HIDDEN_POWER": "Hidden Power ",
"EDITOR_IDS": "TID: %i / SID: %i / TSV: %i",
"EDITOR_INST": "Aperte \ue000 para selecionar, \ue001 para voltar",
"EDITOR_INST": "Aperte \ue000 para selecionar,\n\ue001 para voltar",
"EDITOR_MOVES": "ATAQUES",
"EDITOR_NOT_APPLICABLE_GEN": "Não aplicável para essa geração",
"EDITOR_SAVE": "SAVE",
Expand Down Expand Up @@ -207,7 +207,7 @@
"GREAT_ABILITY_RIBBON": "Grande Fita Habilidosa",
"GREEN_RIBBON": "Fita Verde",
"HEART": "Coração",
"HELD_ITEM": "Item Segurado",
"HELD_ITEM": "Item",
"HEX_SELECTED_BYTE": "Byte selecionado:",
"HGSS_POKEBALL": "HGSS Pok\u00e9 Bola",
"HIDDEN_ABILITY?": "Habilidade Escondida?",
Expand All @@ -224,8 +224,8 @@
"HYPER_ATTACK": "Híper Treino de Ataque",
"HYPER_DEFENSE": "Híper Treino de Defesa",
"HYPER_HP": "Hiper Treino de HP",
"HYPER_SPATK": "Híper Treino de Ataque ESP.",
"HYPER_SPDEF": "Híper Treino de Defesa ESP.",
"HYPER_SPATK": "Híper Treino de Ataque Esp.",
"HYPER_SPDEF": "Híper Treino de Defesa Esp.",
"HYPER_SPEED": "Híper Treino de Velocidade",
"INJECT_TO_SLOT": "Injete ao SLOT",
"INVALID_ABILITY": "Habilidade Inválida",
Expand Down Expand Up @@ -408,20 +408,20 @@
"SNOOZE_RIBBON": "Fita da Soneca",
"SORT": "Por em ordem",
"SOUVENIR_RIBBON": "Fita de Souvenir",
"SPATK_EV": "EV de Ataque ESP.",
"SPATK_IV": "IV de Ataque ESP.",
"SPATK_LEVEL_1": "Nível de Ataque ESP. 1",
"SPATK_LEVEL_2": "Nível de Ataque ESP. 2",
"SPATK_LEVEL_3": "Nível de Ataque ESP. 3",
"SPATK.": "ATQ ESP.",
"SPATK": "Ataque ESP.",
"SPATK_EV": "EV de Ataque Esp.",
"SPATK_IV": "IV de Ataque Esp.",
"SPATK_LEVEL_1": "Nível de Ataque Esp. 1",
"SPATK_LEVEL_2": "Nível de Ataque Esp. 2",
"SPATK_LEVEL_3": "Nível de Ataque Esp. 3",
"SPATK.": "Atq. Esp.",
"SPATK": "Ataque Esp.",
"SPDEF_EV": "Sp. Defense EV",
"SPDEF_IV": "Sp. Defense IV",
"SPDEF_LEVEL_1": "Nível de Defesa ESP. 1",
"SPDEF_LEVEL_2": "Nível de Defesa ESP 2",
"SPDEF_LEVEL_3": "Nível de Defesa ESP 3",
"SPDEF.": "DEF ESP.",
"SPDEF": "Defesa ESP.",
"SPDEF_LEVEL_1": "Nível de Defesa Esp. 1",
"SPDEF_LEVEL_2": "Nível de Defesa Esp 2",
"SPDEF_LEVEL_3": "Nível de Defesa Esp 3",
"SPDEF.": "Def. Esp.",
"SPDEF": "Defesa Esp.",
"SPECIAL_RIBBON": "Fita Especial",
"SPECIES": "Espécies",
"SPECIES_NAME": "Nome da Espécie",
Expand Down Expand Up @@ -482,9 +482,9 @@
"VIEW": "Ver",
"WATCH_OUT_THATS_ONE_TRICKY_SECOND_HALF": "Cuidado! Essa é uma segunda metade complicada!",
"WC_CHANGE_SLOT": "Aperte \uE000 para mudar o Slot",
"WC_DUMP1": "Aperte \uE000 para fazer dump\n no Wonder Card",
"WC_DUMP2": "Aperte \uE002 para fazer dump\n no Wonder Card",
"WC_INST1": "Aperte \uE000 para continuar ou \uE001 para retornar.",
"WC_DUMP1": "Aperte \uE000 para fazer dump\nno Wonder Card",
"WC_DUMP2": "Aperte \uE002 para fazer dump\nno Wonder Card",
"WC_INST1": "Aperte \uE000 para continuar\nou \uE001 para retornar.",
"WC_LGPE": "LGPE não guarda Wonder Cards!",
"WC_SWITCH": "\uE004 / \uE005 para trocar multiplos WC.",
"WINNING_RIBBON": "Fita do Vencedor",
Expand Down
28 changes: 14 additions & 14 deletions source/gui/screen/ConfigScreen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ ConfigScreen::ConfigScreen() : oldStorage(Configuration::getInstance().storageSi
tabButtons[0].push_back(new ClickButton(177, 140, 8, 8, [](){ Gui::clearStaticText(); Configuration::getInstance().language(Language::RU); return false; }, ui_sheet_res_null_idx, "", 0.0f, 0));

// Defaults buttons
tabButtons[1].push_back(new Button(112, 38, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().defaultTID(a); }, 5, 0xFFFF); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(112, 62, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().defaultSID(a); }, 5, 0xFFFF); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(112, 86, 15, 12, [](){ Gui::setNextKeyboardFunc(&inputOT); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new ClickButton(112, 110, 15, 12, &countryChoice, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(112, 134, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().day(a); }, 2, 31); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(112, 158, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().month(a); }, 2, 12); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(112, 182, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().year(a); }, 4, 9999); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(122, 38, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().defaultTID(a); }, 5, 0xFFFF); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(122, 62, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().defaultSID(a); }, 5, 0xFFFF); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(122, 86, 15, 12, [](){ Gui::setNextKeyboardFunc(&inputOT); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new ClickButton(122, 110, 15, 12, &countryChoice, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(122, 134, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().day(a); }, 2, 31); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(122, 158, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().month(a); }, 2, 12); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
tabButtons[1].push_back(new Button(122, 182, 15, 12, [](){ Gui::setNextKeyboardFunc([](){ inputNumber([](u16 a){ Configuration::getInstance().year(a); }, 4, 9999); }); return false; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));

// Miscellaneous buttons
tabButtons[2].push_back(new ClickButton(247, 39, 15, 12, [](){ Configuration::getInstance().autoBackup(!Configuration::getInstance().autoBackup()); return true; }, ui_sheet_button_info_detail_editor_light_idx, "", 0.0f, 0));
Expand Down Expand Up @@ -262,9 +262,9 @@ void ConfigScreen::draw() const
Gui::staticText(i18n::localize("MONTH"), 19, 156, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::staticText(i18n::localize("YEAR"), 19, 180, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);

Gui::dynamicText(std::to_string(Configuration::getInstance().defaultTID()), 140, 36, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(std::to_string(Configuration::getInstance().defaultSID()), 140, 60, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(Configuration::getInstance().defaultOT(), 140, 84, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(std::to_string(Configuration::getInstance().defaultTID()), 150, 36, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(std::to_string(Configuration::getInstance().defaultSID()), 150, 60, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(Configuration::getInstance().defaultOT(), 150, 84, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
std::string data;
switch (Configuration::getInstance().nationality())
{
Expand Down Expand Up @@ -293,10 +293,10 @@ void ConfigScreen::draw() const
data = "USA";
break;
}
Gui::dynamicText(i18n::localize(data), 140, 108, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(std::to_string(Configuration::getInstance().day()), 140, 132, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(std::to_string(Configuration::getInstance().month()), 140, 156, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(std::to_string(Configuration::getInstance().year()), 140, 180, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(i18n::localize(data), 150, 108, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(std::to_string(Configuration::getInstance().day()), 150, 132, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(std::to_string(Configuration::getInstance().month()), 150, 156, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);
Gui::dynamicText(std::to_string(Configuration::getInstance().year()), 150, 180, FONT_SIZE_14, FONT_SIZE_14, COLOR_WHITE, TextPosX::LEFT, TextPosY::TOP);

for (Button* button : tabButtons[currentTab])
{
Expand Down

0 comments on commit c903055

Please sign in to comment.